webpack upgrade

This commit is contained in:
Alexey Kasyanchuk 2021-01-05 23:51:54 +03:00
parent 4b763c9377
commit 894391542a
5 changed files with 521 additions and 1616 deletions

View File

@ -1,5 +1,5 @@
const path = require("path"); const path = require("path");
const merge = require("webpack-merge"); const { merge } = require("webpack-merge");
const base = require("./webpack.base.config"); const base = require("./webpack.base.config");
module.exports = env => { module.exports = env => {

View File

@ -3,6 +3,10 @@ const nodeExternals = require("webpack-node-externals");
const FriendlyErrorsWebpackPlugin = require("friendly-errors-webpack-plugin"); const FriendlyErrorsWebpackPlugin = require("friendly-errors-webpack-plugin");
module.exports = env => { module.exports = env => {
if(env && env.test)
env = 'test'
else if(env && env.production)
env = 'production'
return { return {
mode: env == 'test' ? 'production' : (env || 'development'), mode: env == 'test' ? 'production' : (env || 'development'),
target: "node", target: "node",

View File

@ -1,4 +1,4 @@
const merge = require("webpack-merge"); const { merge } = require("webpack-merge");
const jetpack = require("fs-jetpack"); const jetpack = require("fs-jetpack");
const base = require("./webpack.base.config"); const base = require("./webpack.base.config");

2119
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -96,7 +96,7 @@
}, },
"scripts": { "scripts": {
"postinstall": "electron-builder install-app-deps", "postinstall": "electron-builder install-app-deps",
"pretest": "webpack --config=build/webpack.app.config.js --env=test --display=none && webpack --config=build/webpack.tests.config.js --env=test --display=none", "pretest": "webpack --config=build/webpack.app.config.js --env=test --no-stats && webpack --config=build/webpack.tests.config.js --env=test --no-stats",
"test": "mocha temp/tests.js --require @babel/core/lib --require source-map-support/register", "test": "mocha temp/tests.js --require @babel/core/lib --require source-map-support/register",
"start": "node build/start.js", "start": "node build/start.js",
"prebuild": "webpack --config=build/webpack.app.config.js --env=production", "prebuild": "webpack --config=build/webpack.app.config.js --env=production",
@ -169,9 +169,9 @@
"style-loader": "^0.23.1", "style-loader": "^0.23.1",
"sw-precache-webpack-plugin": "^0.11.5", "sw-precache-webpack-plugin": "^0.11.5",
"url-loader": "^2.1.0", "url-loader": "^2.1.0",
"webpack": "^4.36.1", "webpack": "^5.11.1",
"webpack-cli": "^3.3.6", "webpack-cli": "^4.3.1",
"webpack-merge": "^4.2.1", "webpack-merge": "^5.7.3",
"webpack-node-externals": "^1.7.2" "webpack-node-externals": "^2.5.2"
} }
} }