From cf30154e51751b783dcf1b74bdab7f52aa074a35 Mon Sep 17 00:00:00 2001 From: absidue <48293849+absidue@users.noreply.github.com> Date: Sun, 6 Nov 2022 09:17:33 +0100 Subject: [PATCH] Remove unused worker (#2804) --- _scripts/dev-runner.js | 43 +++++++------------- _scripts/webpack.workers.config.js | 65 ------------------------------ package.json | 3 +- src/utilities/workerSample.js | 0 4 files changed, 15 insertions(+), 96 deletions(-) delete mode 100644 _scripts/webpack.workers.config.js delete mode 100644 src/utilities/workerSample.js diff --git a/_scripts/dev-runner.js b/_scripts/dev-runner.js index 24857459b..24322bdc9 100644 --- a/_scripts/dev-runner.js +++ b/_scripts/dev-runner.js @@ -12,7 +12,6 @@ const { spawn } = require('child_process') const mainConfig = require('./webpack.main.config') const rendererConfig = require('./webpack.renderer.config') const webConfig = require('./webpack.web.config') -const workersConfig = require('./webpack.workers.config') let electronProcess = null let manualRestart = null @@ -72,41 +71,27 @@ async function restartElectron() { } function startMain() { - const webpackSetup = webpack([mainConfig, workersConfig]) + const compiler = webpack(mainConfig) + const { name } = compiler - webpackSetup.compilers.forEach(compiler => { - const { name } = compiler + compiler.hooks.afterEmit.tap('afterEmit', async () => { + console.log(`\nCompiled ${name} script!`) - switch (name) { - case 'workers': - compiler.hooks.afterEmit.tap('afterEmit', async () => { - console.log(`\nCompiled ${name} script!`) - console.log(`\nWatching file changes for ${name} script...`) - }) - break - case 'main': - default: - compiler.hooks.afterEmit.tap('afterEmit', async () => { - console.log(`\nCompiled ${name} script!`) + manualRestart = true + await restartElectron() + setTimeout(() => { + manualRestart = false + }, 2500) - manualRestart = true - await restartElectron() - setTimeout(() => { - manualRestart = false - }, 2500) - - console.log(`\nWatching file changes for ${name} script...`) - }) - break - } + console.log(`\nWatching file changes for ${name} script...`) }) - webpackSetup.watch({ + compiler.watch({ aggregateTimeout: 500, }, - err => { - if (err) console.error(err) - }) + err => { + if (err) console.error(err) + }) } function startRenderer(callback) { diff --git a/_scripts/webpack.workers.config.js b/_scripts/webpack.workers.config.js deleted file mode 100644 index 1ac26a191..000000000 --- a/_scripts/webpack.workers.config.js +++ /dev/null @@ -1,65 +0,0 @@ -const path = require('path') -const webpack = require('webpack') - -const { - dependencies, - devDependencies, - productName, -} = require('../package.json') - -const externals = Object.keys(dependencies).concat(Object.keys(devDependencies)) -const isDevMode = process.env.NODE_ENV === 'development' - -const config = { - name: 'workers', - mode: process.env.NODE_ENV, - devtool: isDevMode ? 'eval-cheap-module-source-map' : false, - entry: { - workerSample: path.join(__dirname, '../src/utilities/workerSample.js'), - }, - output: { - libraryTarget: 'commonjs2', - path: path.join(__dirname, '../dist'), - filename: '[name].js', - }, - externals: externals, - module: { - rules: [ - { - test: /\.js$/, - use: 'babel-loader', - exclude: /node_modules/, - }, - ], - }, - node: { - __dirname: isDevMode, - __filename: isDevMode, - global: isDevMode, - }, - plugins: [ - // new WriteFilePlugin(), - new webpack.DefinePlugin({ - 'process.env.PRODUCT_NAME': JSON.stringify(productName), - }), - ], - resolve: { - alias: { - '@': path.join(__dirname, '../src/'), - src: path.join(__dirname, '../src/'), - }, - extensions: ['.js', '.json'], - }, - target: 'node', -} - -/** - * Adjust rendererConfig for production settings - */ -if (isDevMode) { - // any dev only config -} else { - // any producation only config -} - -module.exports = config diff --git a/package.json b/package.json index 2a60dbf9d..567a72222 100644 --- a/package.json +++ b/package.json @@ -33,11 +33,10 @@ "dev-runner": "node _scripts/dev-runner.js", "lint-fix": "eslint --fix --ext .js,.vue ./", "lint": "eslint --ext .js,.vue ./", - "pack": "run-p pack:main pack:renderer pack:workers", + "pack": "run-p pack:main pack:renderer", "pack:main": "webpack --mode=production --node-env=production --config _scripts/webpack.main.config.js", "pack:renderer": "webpack --mode=production --node-env=production --config _scripts/webpack.renderer.config.js", "pack:web": "webpack --mode=production --node-env=production --config _scripts/webpack.web.config.js", - "pack:workers": "webpack --mode=production --node-env=production --config _scripts/webpack.workers.config.js", "postinstall": "yarn run --silent rebuild:electron", "prettier": "prettier --write \"{src,_scripts}/**/*.{js,vue}\"", "rebuild:electron": "electron-builder install-app-deps", diff --git a/src/utilities/workerSample.js b/src/utilities/workerSample.js deleted file mode 100644 index e69de29bb..000000000