This commit is contained in:
crusader 2018-10-02 17:54:45 +09:00
parent 4695d7042c
commit d6387fc33c
8 changed files with 1334 additions and 57 deletions

View File

@ -1,18 +0,0 @@
{
"name": "overflow-network-scanner-app",
"version": "0.0.1",
"author": {
"name": "LOAFLE",
"email": "rnd@loafle.com",
"url": "https://www.loafle.com"
},
"homepage": "https://www.loafle.com",
"description": "Desktop App for overFlow Network Scanner",
"dependencies": {
"electron-devtools-installer": "^2.2.4",
"electron-window-state": "^5.0.1",
"file-url": "^2.0.2",
"rxjs": "^6.2.2",
"sqlite3": "^4.0.2"
}
}

View File

@ -1,6 +1,7 @@
const path = require('path');
const webpack = require('webpack');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const ElectronConnectWebpackPlugin = require('electron-connect-webpack-plugin');
const nodeExternals = require('webpack-node-externals');
@ -37,7 +38,7 @@ module.exports = function () {
extensions: ['.ts', '.tsx', '.mjs', '.js'],
modules: [
root(),
'node_modules'
'node_modules',
],
}
config.module = {
@ -58,11 +59,11 @@ module.exports = function () {
};
config.plugins = [
PROD ? new webpack.NoEmitOnErrorsPlugin() : null,
PROD ? new CopyWebpackPlugin(
[
'config/package.json'
]
) : null,
// PROD ? new CopyWebpackPlugin(
// [
// 'config/package.json'
// ]
// ) : null,
new webpack.DefinePlugin(
Object.assign({}, replacements, {
__PROCESS_KIND__: JSON.stringify('main'),

View File

@ -18,6 +18,11 @@ module.exports = function (config) {
filename: '[name].js',
crossOriginLoading: false,
};
// config.resolve.modules = [
// root(),
// root('build', 'dist', 'node_modules'),
// 'node_modules',
// ];
config.plugins.push(
new webpack.DefinePlugin(

View File

@ -8,7 +8,7 @@
"npmSkipBuildFromSource": false,
"artifactName": "${name}-${version}-${os}-${arch}.${ext}",
"directories": {
"app": "./build/dist",
"buildResources": "./config/build/${os}/icon",
"output": "./build/package"
},
"files": [
@ -17,26 +17,12 @@
"**/*",
"!*.ts",
"!*.scss",
"!*.code-workspace",
"!@overflow/",
"!build/",
"!config/",
"!e2e/",
"!src/",
"!.editorconfig",
"!.gitignore",
"!angular.json",
"!karma.conf.js",
"!LICENSE.md",
"!package.json",
"!package-lock.json",
"!README.md",
"!tsconfig.json",
"!tslint.json",
"!webpack.js",
"!yarn.lock"
]
}
],
"from": "./build/dist/",
"to": "."
},
"packages.json"
],
"extraFiles": [
{
@ -48,7 +34,10 @@
"target": [
{
"target": "deb",
"arch": ["x64"]
"arch": [
"ia32",
"x64"
]
}
],
"executableName": "overFlow-NetworkScanner",
@ -71,7 +60,9 @@
"minimumSystemVersion": "10.12.0",
"extendInfo": "config/build/darwin/Info.plist",
"icon": "config/build/darwin/icon/icon.icns",
"target": ["dmg"],
"target": [
"dmg"
],
"extraFiles": [
{
"from": "build/nrfjprog/unpacked/nrfjprog",
@ -101,7 +92,10 @@
"target": [
{
"target": "nsis",
"arch": ["x64", "ia32"]
"arch": [
"x64",
"ia32"
]
}
],
"legalTrademarks": "overFlow",

View File

@ -1,6 +1,7 @@
{
"name": "overflow-network-scanner-app",
"version": "0.0.1",
"private": true,
"author": {
"name": "LOAFLE",
"email": "rnd@loafle.com",
@ -9,7 +10,7 @@
"homepage": "https://www.loafle.com",
"description": "Desktop App for overFlow Network Scanner",
"scripts": {
"postinstall": "npm-run-all -s electron:builder:init electron:builder:install-app-deps",
"postinstall": "npm-run-all -s electron:builder:install-app-deps",
"ng": "ng",
"start": "npm-run-all start:electron:hmr",
"start:hmr": "ng serve --configuration hmr",
@ -23,13 +24,16 @@
"lint": "ng lint",
"e2e": "ng e2e",
"wait-on:build:main:dev": "wait-on http-get://localhost:4200/ && npm-run-all build:main:dev",
"electron:builder:init": "cpx config/package.json build/dist/",
"electron:builder:install-app-deps": "electron-builder install-app-deps",
"electron:builder:linux": "cross-env NODE_ENV=production npm-run-all build && electron-builder build --linux"
"electron:builder:packaging": "cross-env NODE_ENV=production npm-run-all build && electron-builder build",
"electron:builder:windows": "npm-run-all electron:builder:packaging -- --windows",
"electron:builder:macos": "npm-run-all electron:builder:packaging -- --macos",
"electron:builder:linux": "npm-run-all electron:builder:packaging -- --linux"
},
"private": true,
"dependencies": {
"electron-devtools-installer": "^2.2.4",
"electron-window-state": "^5.0.1",
"file-url": "^2.0.2",
"rxjs": "^6.2.2",
"sqlite3": "^4.0.2"
},
@ -77,9 +81,7 @@
"electron-connect": "^0.6.3",
"electron-connect-webpack-plugin": "^0.1.1",
"electron-debug": "^2.0.0",
"electron-window-state": "^5.0.1",
"file-uri-to-path": "^1.0.0",
"file-url": "^2.0.2",
"fs-extra": "^7.0.0",
"ip-cidr": "^2.0.0",
"jasmine-core": "~2.99.1",

View File

@ -74,7 +74,7 @@ export class AppWindow {
'build',
'linux',
'icon',
'overflow_512_shadow.png'
'overflow_512_outline2.png'
);
}

View File

@ -1,6 +1,8 @@
import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import * as Path from 'path';
import { AppModule } from './app/app.module';
import { environment } from './environments/environment';
@ -16,7 +18,7 @@ if (environment.production) {
const bootstrap = () => platformBrowserDynamic().bootstrapModule(AppModule);
if (environment.hmr) {
if (module[ 'hot' ]) {
if (module['hot']) {
hmrBootstrap(module, bootstrap);
} else {
console.error('HMR is not enabled for webpack-dev-server!');

1291
yarn.lock

File diff suppressed because it is too large Load Diff