diff --git a/jccm/forge.config.js b/jccm/forge.config.js index ab95ebf..b6a8a0c 100644 --- a/jccm/forge.config.js +++ b/jccm/forge.config.js @@ -6,14 +6,12 @@ const { FuseV1Options, FuseVersion } = require('@electron/fuses'); console.log(`Current working directory: ${process.cwd()}`); const entitlements = '/Users/srho/electron-test/juniper-jccm-project/jccm/entitlements.plist'; - module.exports = { packagerConfig: { asar: true, icon: './assets/icons/AppIcon', // Path without the extension osxSign: { 'hardened-runtime': true, - identity: `Developer ID Application: ${process.env.APPLE_DEVELOPER_NAME} (${process.env.APPLE_DEVELOPER_TEAM_ID})`, }, osxNotarize: { appleId: process.env.APPLE_ID, @@ -66,7 +64,6 @@ module.exports = { out: path.join(__dirname, 'out/make/darwin-arm64'), name: 'jccm-darwin-arm64', arch: 'arm64', - platforms: ['darwin'], }, }, { @@ -78,34 +75,19 @@ module.exports = { out: path.join(__dirname, 'out/make/darwin-x64'), name: 'jccm-darwin-x64', arch: 'x64', - platforms: ['darwin'], }, }, - { - name: '@electron-forge/maker-pkg', - config: { - identity: `Developer ID Installer: ${process.env.APPLE_DEVELOPER_NAME} (${process.env.APPLE_DEVELOPER_TEAM_ID})`, - overwrite: true, - out: path.join(__dirname, 'out/make/macos-pkg'), - name: 'jccm-darwin-arm64', - icon: path.join(__dirname, 'assets/icons/AppIcon.icns'), // Use the same icon as for DMG - arch: 'arm64', - platforms: ['darwin'], - } - }, - { - name: '@electron-forge/maker-pkg', - config: { - identity: `Developer ID Installer: ${process.env.APPLE_DEVELOPER_NAME} (${process.env.APPLE_DEVELOPER_TEAM_ID})`, - overwrite: true, - out: path.join(__dirname, 'out/make/macos-pkg'), - name: 'jccm-darwin-x64', - icon: path.join(__dirname, 'assets/icons/AppIcon.icns'), // Use the same icon as for DMG - arch: 'x64', - platforms: ['darwin'], - } - } - + // { + // name: '@electron-forge/maker-pkg', + // config: { + // identity: `Developer ID Installer: ${process.env.APPLE_DEVELOPER_NAME} (${process.env.APPLE_DEVELOPER_TEAM_ID})`, + // overwrite: true, + // out: path.join(__dirname, 'out/make/macos-pkg'), + // name: 'jccm-macos-pkg', + // icon: path.join(__dirname, 'assets/icons/AppIcon.icns'), // Use the same icon as for DMG + // arch: ['x64', 'arm64'] // Support both architectures + // } + // } ], plugins: [ { diff --git a/jccm/package.json b/jccm/package.json index 4211968..95f033b 100644 --- a/jccm/package.json +++ b/jccm/package.json @@ -8,12 +8,6 @@ "start": "pkill -9 node; nodemon --watch ./src --ext js,json --ignore ./src/Frontend/ --exec 'electron-forge start'", "package": "electron-forge package", "make": "electron-forge make", - "make:dmg": "electron-forge make --platform=darwin --arch=arm64 --arch=x64 --targets=@electron-forge/maker-dmg", - "make:pkg": "electron-forge make --platform=darwin --arch=arm64 --arch=x64 --targets=@electron-forge/maker-pkg", - "make:arm64-darwin-dmg": "electron-forge make --platform=darwin --arch=arm64 --targets=@electron-forge/maker-dmg", - "make:x64-darwin-dmg": "electron-forge make --platform=darwin --arch=x64 --targets=@electron-forge/maker-dmg", - "make:arm64-darwin-pkg": "electron-forge make --platform=darwin --arch=arm64 --targets=@electron-forge/maker-pkg", - "make:x64-darwin-pkg": "electron-forge make --platform=darwin --arch=x64 --targets=@electron-forge/maker-pkg", "publish": "electron-forge publish", "lint": "echo \"No linting configured\"" }, @@ -21,7 +15,6 @@ "@electron-forge/cli": "^7.4.0", "@electron-forge/maker-deb": "^7.4.0", "@electron-forge/maker-dmg": "^7.4.0", - "@electron-forge/maker-pkg": "^7.4.0", "@electron-forge/maker-rpm": "^7.4.0", "@electron-forge/maker-squirrel": "^7.4.0", "@electron-forge/maker-zip": "^7.4.0", @@ -29,7 +22,6 @@ "@electron-forge/plugin-fuses": "^7.4.0", "@electron-forge/plugin-webpack": "^7.4.0", "@electron/fuses": "^1.8.0", - "@electron/universal": "^2.0.1", "@vercel/webpack-asset-relocator-loader": "1.7.3", "concurrently": "^8.2.2", "css-loader": "^6.0.0", @@ -38,9 +30,7 @@ "nodemon": "^3.1.0", "stream-browserify": "^3.0.0", "style-loader": "^3.0.0", - "svg-inline-loader": "^0.8.2", - "uglify-js": "^3.19.1", - "webpack-node-externals": "^3.0.0" + "svg-inline-loader": "^0.8.2" }, "keywords": [], "author": { @@ -95,4 +85,4 @@ "xterm-addon-fit": "^0.8.0", "zustand": "^4.5.2" } -} \ No newline at end of file +} diff --git a/jccm/webpack.main.config copy.js b/jccm/webpack.main.config copy.js deleted file mode 100644 index eb84eb0..0000000 --- a/jccm/webpack.main.config copy.js +++ /dev/null @@ -1,34 +0,0 @@ -const webpack = require('webpack'); - -module.exports = { - stats: 'verbose', - - /** - * This is the main entry point for your application, it's the first file - * that runs in the main process. - */ - target: 'electron-main', // Ensures Webpack is aware this is for the Electron main process - entry: './src/main.js', - // Put your normal webpack config below here - module: { - rules: require('./webpack.rules'), - }, - resolve: { - extensions: ['.js', '.jsx', '.json'], - fallback: { - fs: false, // Tells Webpack to ignore 'fs' module - path: require.resolve('path-browserify'), // Provides a polyfill for 'path' - buffer: require.resolve('buffer/'), // Provides a polyfill for 'buffer' - os: require.resolve('os-browserify/browser'), // Provides a polyfill for 'os' - }, - }, - node: { - __dirname: false, // It's often useful to not mess with __dirname in Electron - __filename: false, // Same for __filename - }, - plugins: [ - new webpack.ProvidePlugin({ - Buffer: ['buffer', 'Buffer'], - }), - ], -}; diff --git a/jccm/webpack.renderer.config copy.js b/jccm/webpack.renderer.config copy.js deleted file mode 100644 index 012ee52..0000000 --- a/jccm/webpack.renderer.config copy.js +++ /dev/null @@ -1,46 +0,0 @@ -const webpack = require('webpack'); // Require webpack at the top -const rules = require('./webpack.rules'); -const path = require('path'); - -rules.push({ - test: /\.svg$/, - use: 'svg-inline-loader', -}); - -rules.push({ - test: /\.css$/, - use: [{ loader: 'style-loader' }, { loader: 'css-loader' }], -}); - -module.exports = { - // Specify the development mode for better debugging and HMR support - mode: 'development', - module: { - rules, - }, - resolve: { - extensions: ['.js', '.jsx', '.json'], - fallback: { - fs: false, // Tells Webpack to ignore 'fs' module - path: require.resolve('path-browserify'), // Provides a polyfill for 'path' - buffer: require.resolve('buffer/'), // Provides a polyfill for 'buffer' - os: require.resolve('os-browserify/browser'), // Provides a polyfill for 'os' - }, - }, - plugins: [ - new webpack.HotModuleReplacementPlugin(), // Add the Hot Module Replacement plugin - new webpack.ProvidePlugin({ - Buffer: ['buffer', 'Buffer'], - }), - ], - devServer: { - contentBase: path.join(__dirname, 'dist'), // Output directory - hot: true, // Enable HMR on the server - host: '127.0.0.1', // Bind to IPv4 address - allowedHosts: [ - '127.0.0.1' - ], - }, - // Set target to 'web' for HMR to work properly - target: 'web', -}; diff --git a/jccm/webpack.rules copy.js b/jccm/webpack.rules copy.js deleted file mode 100644 index 5773695..0000000 --- a/jccm/webpack.rules copy.js +++ /dev/null @@ -1,46 +0,0 @@ -module.exports = [ - // Add support for native node modules - { - // We're specifying native_modules in the test because the asset relocator loader generates a - // "fake" .node file which is really a cjs file. - test: /native_modules[/\\].+\.node$/, - use: 'node-loader', - }, - { - test: /[/\\]node_modules[/\\].+\.(m?js|node)$/, - parser: { amd: false }, - use: { - loader: '@vercel/webpack-asset-relocator-loader', - options: { - outputAssetBase: 'native_modules', - }, - }, - }, - { - test: /\.(js|jsx)$/, - exclude: /node_modules/, - use: { - loader: 'babel-loader', - options: { - presets: ['@babel/preset-env', '@babel/preset-react'], - }, - }, - }, - - // Put your webpack loader rules in this array. This is where you would put - // your ts-loader configuration for instance: - /** - * Typescript Example: - * - * { - * test: /\.tsx?$/, - * exclude: /(node_modules|.webpack)/, - * loaders: [{ - * loader: 'ts-loader', - * options: { - * transpileOnly: true - * } - * }] - * } - */ -];