Update some packaging-related configurations; remove some old files that are no longer needed.

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "switchhosts",
   "productName": "SwitchHosts",
-  "version": "4.0.0",
+  "version": "4.2.0.6098",
   "description": "Switch hosts quickly!",
   "main": "./main.js",
   "author": {
@@ -10,8 +10,7 @@
     "url": "https://github.com/oldj/SwitchHosts"
   },
   "homepage": "https://switchhosts.vercel.app",
-  "scripts": {
-  },
+  "scripts": {},
   "license": "Apache-2.0",
   "dependencies": {}
-}
+}

scripts/entitlements.mac.plist

@@ -4,5 +4,7 @@
     <dict>
         <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
         <true/>
+        <key>com.apple.security.cs.allow-jit</key>
+        <true/>
     </dict>
 </plist>

scripts/make.js

@@ -37,7 +37,7 @@ const TARGET_PLATFORMS_configs = {
     win: ['nsis:ia32', 'nsis:x64', 'portable:ia32'],
   },
   all: {
-    mac: ['dmg:x64', 'dmg:arm64', 'dmg:universal'],
+    mac: ['dmg:x64', 'dmg:arm64'],
     linux: [
       'AppImage:x64',
       'deb:x64',
@@ -100,14 +100,21 @@ const afterMake = async () => {
 const doMake = async () => {
   console.log('-> make...')
 
+  const { MAKE_FOR } = process.env
   let targets = TARGET_PLATFORMS_configs.all
-  if (process.env.MAKE_FOR === 'dev') {
-    targets = TARGET_PLATFORMS_configs.macs
-  } else if (process.env.MAKE_FOR === 'mac') {
+
+  cfg_common.compression = 'maximum'
+  if (MAKE_FOR && MAKE_FOR !== 'all') {
+    cfg_common.compression = 'store'
+  }
+
+  if (MAKE_FOR === 'dev') {
     targets = TARGET_PLATFORMS_configs.mac
-  } else if (process.env.MAKE_FOR === 'win') {
+  } else if (MAKE_FOR === 'mac') {
+    targets = TARGET_PLATFORMS_configs.macs
+  } else if (MAKE_FOR === 'win') {
     targets = TARGET_PLATFORMS_configs.win
-  } else if (process.env.MAKE_FOR === 'linux') {
+  } else if (MAKE_FOR === 'linux') {
     targets = TARGET_PLATFORMS_configs.linux
   }
 

scripts/version_up.js

@@ -9,8 +9,20 @@ const path = require('path')
 
 const version_file = path.join(path.dirname(__dirname), 'src', 'version.json')
 const version = require(version_file)
+const app_package = require('../app/package.json')
 
-version[3]++
+const versionInc = (v) => {
+  return ++v
+}
+
+version[3] = versionInc(version[3])
 
 console.log(`version -> ${version.slice(0, 3).join('.')}(${version[3]})`)
 fs.writeFileSync(version_file, `[${version.join(', ')}]`)
+
+app_package.version = version.slice(0, 3).join('.') + '.' + version[3]
+fs.writeFileSync(
+  path.join(path.dirname(__dirname), 'app', 'package.json'),
+  JSON.stringify(app_package, null, 2),
+  'utf8',
+)

scripts/webpack.base.config.js

@@ -1,20 +0,0 @@
-'use strict'
-
-const path = require('path')
-
-module.exports = {
-  mode: 'development',
-  output: {
-    path: path.resolve(__dirname, '..', 'build'),
-    filename: '[name].js',
-  },
-  node: {
-    __dirname: false,
-    __filename: false,
-  },
-  resolve: {
-    extensions: ['.tsx', '.ts', '.js', '.json'],
-  },
-  devtool: 'source-map',
-  plugins: [],
-}

scripts/webpack.main.config.js

@@ -1,55 +0,0 @@
-const webpack = require('webpack')
-const { merge } = require('webpack-merge')
-const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin')
-const CopyPlugin = require('copy-webpack-plugin')
-const nodeExternals = require('webpack-node-externals')
-
-const baseConfig = require('./webpack.base.config')
-
-module.exports = merge(baseConfig, {
-  target: 'electron-main',
-  entry: {
-    main: './src/main/main.ts',
-    preload: './src/main/preload.ts',
-  },
-  resolve: {
-    plugins: [new TsconfigPathsPlugin({})],
-  },
-  externals: [nodeExternals()],
-  module: {
-    rules: [
-      {
-        test: /\.ts$/,
-        exclude: /node_modules/,
-        loader: 'babel-loader',
-        options: {
-          cacheDirectory: true,
-          babelrc: false,
-          presets: [
-            ['@babel/preset-env', { targets: 'maintained node versions' }],
-            '@babel/preset-typescript',
-          ],
-          plugins: [
-            ['@babel/plugin-proposal-decorators', { legacy: true }],
-            ['@babel/plugin-proposal-class-properties', { loose: true }],
-            ['@babel/plugin-proposal-private-methods', { loose: true }],
-            [
-              '@babel/plugin-proposal-private-property-in-object',
-              { loose: true },
-            ],
-          ],
-        },
-      },
-    ],
-  },
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify(
-        process.env.NODE_ENV || 'development',
-      ),
-    }),
-    new CopyPlugin({
-      patterns: [{ from: 'src/assets', to: 'assets' }],
-    }),
-  ],
-})

scripts/webpack.main.prod.config.js

@@ -1,7 +0,0 @@
-const { merge } = require('webpack-merge')
-
-const baseConfig = require('./webpack.main.config')
-
-module.exports = merge(baseConfig, {
-  mode: 'production',
-})

src/main/libs/tracer.ts

@@ -18,12 +18,14 @@ class Tracer {
 
     let send_usage_data = await configGet('send_usage_data')
     if (send_usage_data) {
-      console.log('send usage data...')
-      await GET(`${server_url}/api/tick/`, {
-        sid: global.session_id,
-        t: 1,
-        a: this.data.join(','),
-      })
+      // Tracking is temporarily disabled.
+      console.log('Tracking is temporarily disabled.')
+      // console.log('send usage data...')
+      // await GET(`${server_url}/api/tick/`, {
+      //   sid: global.session_id,
+      //   t: 1,
+      //   a: this.data.join(','),
+      // })
     }
 
     this.data = []

src/version.json

@@ -1 +1 @@
-[4, 2, 0, 6092]
+[4, 2, 0, 6098]