diff --git a/package.json b/package.json index 541a855a..90523bb5 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,6 @@ "node": ">=10.16 <11 || >= 12" }, "devDependencies": { - "@babel/core": "^7.12.3", - "@babel/preset-react": "^7.12.1", "@clusterio/ctl": "file:./packages/ctl", "@clusterio/lib": "file:./packages/lib", "@clusterio/master": "file:packages/master", diff --git a/packages/master/package.json b/packages/master/package.json index fc33c227..81e3faf5 100644 --- a/packages/master/package.json +++ b/packages/master/package.json @@ -37,15 +37,10 @@ }, "devDependencies": { "@clusterio/web_ui": "^2.0.0-alpha.4", - "babel-loader": "^8.1.0", - "css-loader": "^4.3.0", "fast-deep-equal": "^3.1.3", - "file-loader": "^6.2.0", - "null-loader": "^4.0.0", "react": "^16.13.1", "react-dom": "^16.13.1", "react-router-dom": "^5.2.0", - "style-loader": "^1.2.1", "webpack-cli": "^3.3.12", "webpack-dev-middleware": "^3.7.2", "webpack-merge": "^5.2.0" diff --git a/packages/web_ui/package.json b/packages/web_ui/package.json index 8feeae66..5a4fe02a 100644 --- a/packages/web_ui/package.json +++ b/packages/web_ui/package.json @@ -15,17 +15,24 @@ }, "dependencies": { "@ant-design/icons": "^4.2.2", + "@babel/core": "^7.13.8", + "@babel/preset-react": "^7.12.13", "@clusterio/lib": "^2.0.0-alpha.4", "antd": "^4.6.5", + "babel-loader": "^8.2.2", "buffer": "^6.0.2", "clean-webpack-plugin": "^3.0.0", + "css-loader": "^5.1.0", "events": "^3.2.0", + "file-loader": "^6.2.0", + "null-loader": "^4.0.1", "os-browserify": "^0.3.0", "path-browserify": "^1.0.1", "process": "^0.11.10", "react": "^16.13.1", "react-dom": "^16.13.1", "react-router-dom": "^5.2.0", + "style-loader": "^2.0.0", "util": "^0.12.3" }, "publishConfig": { diff --git a/packages/web_ui/webpack.common.js b/packages/web_ui/webpack.common.js index 00dd319c..df0fac39 100644 --- a/packages/web_ui/webpack.common.js +++ b/packages/web_ui/webpack.common.js @@ -34,27 +34,27 @@ module.exports = (env = {}) => ({ rules: [ { test: /node_modules.fs-extra/, - use: "null-loader", + use: require.resolve("null-loader"), }, { test: /node_modules.jsonwebtoken/, - use: "null-loader", + use: require.resolve("null-loader"), }, { test: /node_modules.winston.dist.winston.transports.(http|file)/, - use: "null-loader", + use: require.resolve("null-loader"), }, // Colour library used by winston which doesn't work in browser. { test: /node_modules.colors/, - use: "null-loader", + use: require.resolve("null-loader"), }, { test: /\.css$/, use: [ - "style-loader", + require.resolve("style-loader"), { - loader: "css-loader", + loader: require.resolve("css-loader"), options: { sourceMap: !env.production, }, @@ -73,15 +73,15 @@ module.exports = (env = {}) => ({ test: /\.jsx$/, exclude: /node_modules/, use: { - loader: "babel-loader", + loader: require.resolve("babel-loader"), options: { - presets: ["@babel/preset-react"], + presets: [require.resolve("@babel/preset-react")], }, }, }, { test: /\.png$/, - use: "file-loader", + use: require.resolve("file-loader"), }, ], }, diff --git a/plugins/global_chat/package.json b/plugins/global_chat/package.json index e35634b9..8242a15b 100644 --- a/plugins/global_chat/package.json +++ b/plugins/global_chat/package.json @@ -18,9 +18,6 @@ }, "devDependencies": { "@clusterio/web_ui": "^2.0.0-alpha.4", - "babel-loader": "^8.1.0", - "file-loader": "^6.2.0", - "null-loader": "^4.0.0", "webpack-cli": "^3.3.12", "webpack-merge": "^5.2.0" }, diff --git a/plugins/research_sync/package.json b/plugins/research_sync/package.json index 06a7d90a..6f8562c9 100644 --- a/plugins/research_sync/package.json +++ b/plugins/research_sync/package.json @@ -21,9 +21,6 @@ }, "devDependencies": { "@clusterio/web_ui": "^2.0.0-alpha.4", - "babel-loader": "^8.1.0", - "file-loader": "^6.2.0", - "null-loader": "^4.0.0", "webpack-cli": "^3.3.12", "webpack-merge": "^5.2.0" }, diff --git a/plugins/statistics_exporter/package.json b/plugins/statistics_exporter/package.json index 9cbcf10f..d85555b0 100644 --- a/plugins/statistics_exporter/package.json +++ b/plugins/statistics_exporter/package.json @@ -18,9 +18,6 @@ }, "devDependencies": { "@clusterio/web_ui": "^2.0.0-alpha.4", - "babel-loader": "^8.1.0", - "file-loader": "^6.2.0", - "null-loader": "^4.0.0", "webpack-cli": "^3.3.12", "webpack-merge": "^5.2.0" }, diff --git a/plugins/subspace_storage/package.json b/plugins/subspace_storage/package.json index 91e1ba5e..69ea64f1 100644 --- a/plugins/subspace_storage/package.json +++ b/plugins/subspace_storage/package.json @@ -22,9 +22,6 @@ "devDependencies": { "@clusterio/web_ui": "^2.0.0-alpha.4", "antd": "^4.6.5", - "babel-loader": "^8.1.0", - "file-loader": "^6.2.0", - "null-loader": "^4.0.0", "react": "^16.13.1", "react-dom": "^16.13.1", "webpack-cli": "^3.3.12",