ing

config/app-info.js

@@ -7,20 +7,20 @@ const projectRoot = path.dirname(__dirname, '..');
 
 const channel = getReleaseChannel();
 
-const s = JSON.stringify;
-
 function getReplacements() {
   return {
     __DARWIN__: process.platform === 'darwin',
     __WIN32__: process.platform === 'win32',
     __LINUX__: process.platform === 'linux',
     __DEV__: channel === 'development',
-    __RELEASE_CHANNEL__: s(channel),
+    __RELEASE_CHANNEL__: JSON.stringify(channel),
-    __UPDATES_URL__: s(getUpdatesURL()),
+    __UPDATES_URL__: JSON.stringify(getUpdatesURL()),
-    'process.platform': s(process.platform),
+    'process.platform': JSON.stringify(process.platform),
-    'process.env.NODE_ENV': s(process.env.NODE_ENV || 'development'),
+    'process.env.NODE_ENV': JSON.stringify(
-    'process.env.TEST_ENV': s(process.env.TEST_ENV),
+      process.env.NODE_ENV || 'development'
-  }
+    ),
+    'process.env.TEST_ENV': JSON.stringify(process.env.TEST_ENV)
+  };
 }
 
-exports.getReplacements = getReplacements;
+exports.getReplacements = getReplacements;

config/webpack.config.main.js

@@ -13,8 +13,7 @@ const replacements = getReplacements();
 const EVENT = process.env.npm_lifecycle_event || '';
 const PROD = EVENT.includes('prod');
 
-
+module.exports = (function() {
-module.exports = function () {
   const tsConfigBase = './src/tsconfig.electron.json';
 
   const atlConfig = {
@@ -27,20 +26,17 @@ module.exports = function () {
   config.devtool = PROD ? false : 'cheap-module-source-map';
   config.externals = [nodeExternals()];
   config.entry = {
-    'index': root('src', 'electron', 'main.ts')
+    index: root('src', 'electron', 'main.ts')
   };
   config.output = {
     path: PROD ? root('build', 'dist') : root('build', 'dev'),
     filename: '[name].js',
-    sourceMapFilename: '[file].map',
+    sourceMapFilename: '[file].map'
   };
   config.resolve = {
     extensions: ['.ts', '.tsx', '.mjs', '.js'],
-    modules: [
+    modules: [root(), 'node_modules']
-      root(),
+  };
-      'node_modules',
-    ],
-  }
   config.module = {
     rules: [
       {
@@ -59,23 +55,19 @@ module.exports = function () {
   };
   config.plugins = [
     PROD ? new webpack.NoEmitOnErrorsPlugin() : null,
-    // PROD ? new CopyWebpackPlugin(
-    //   [
-    //     'config/package.json'
-    //   ]
-    // ) : null,
     new webpack.DefinePlugin(
       Object.assign({}, replacements, {
-        __PROCESS_KIND__: JSON.stringify('main'),
+        __PROCESS_KIND__: JSON.stringify('main')
       })
     ),
-    PROD ? null : new ElectronConnectWebpackPlugin({
+    PROD
-      path: root('build', 'dev'),
+      ? null
-      stopOnClose: true,
+      : new ElectronConnectWebpackPlugin({
-      logLevel: 0
+          path: root('build', 'dev'),
-    })
+          stopOnClose: true,
+          logLevel: 0
+        })
   ].filter(plugin => plugin !== null);
 
   return config;
-
+})();
-}();

electron-builder.json

@@ -5,7 +5,7 @@
   "extraMetadata": {
     "name": "overflow-network-scanner"
   },
-  "asar": true,
+  "asar": false,
   "compression": "normal",
   "npmRebuild": false,
   "npmSkipBuildFromSource": false,
@@ -17,19 +17,12 @@
   "files": [
     "packages.json",
     {
-      "filter": [
+      "filter": ["**/*", "!*.ts", "!*.scss", "!yarn.lock"],
-        "**/*",
-        "!*.ts",
-        "!*.scss",
-        "!yarn.lock"
-      ],
       "from": "./build/dist/",
       "to": "."
     },
     {
-      "filter": [
+      "filter": ["**/*"],
-        "**/*"
-      ],
       "from": "config/build/${os}/icon/",
       "to": "./assets/image/icon/"
     }
@@ -44,10 +37,7 @@
     "target": [
       {
         "target": "deb",
-        "arch": [
+        "arch": ["ia32", "x64"]
-          "ia32",
-          "x64"
-        ]
       }
     ],
     "category": "Network;Monitor;",
@@ -64,18 +54,13 @@
     }
   },
   "deb": {
-    "depends": [
+    "depends": ["libpcap0.8"],
-      "libpcap0.8"
-    ],
     "afterInstall": "config/build/linux/debian/after-install.tpl"
   },
   "mac": {
-    "target": [
+    "target": ["dmg"],
-      "dmg"
-    ],
     "category": "public.app-category.utilities",
     "minimumSystemVersion": "10.12.0",
-    "extendInfo": "config/build/mac/Info.plist",
     "icon": "config/build/mac/icon/overflow_1024.icns",
     "extraResources": [
       {
@@ -87,8 +72,8 @@
   "dmg": {
     "background": "config/build/mac/dmg/background.png",
     "icon": "config/build/mac/dmg/icon.icns",
-    "iconSize": 80,
+    "iconSize": 120,
-    "iconTextSize": 12,
+    "iconTextSize": 18,
     "contents": [
       {
         "x": 480,
@@ -107,10 +92,7 @@
     "target": [
       {
         "target": "nsis",
-        "arch": [
+        "arch": ["x64", "ia32"]
-          "x64",
-          "ia32"
-        ]
       }
     ],
     "legalTrademarks": "overFlow",
@@ -133,4 +115,4 @@
     "include": "config/build/windows/nsis/installer.nsh",
     "menuCategory": "overFlow"
   }
-}
+}

package.json

@@ -110,4 +110,4 @@
     "webpack-node-externals": "^1.7.2",
     "zone.js": "^0.8.26"
   }
-}
+}