aperx/factorio-clusterio
1
0 Fork 0
mirror of https://github.com/clusterio/clusterio.git synced 2026-11-14 23:24:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

Resolve webpack modules from web_ui

Browse Source 
Remove the need for installing babel and the webpack loaders used in the
webpack.common.js file separately by resolving them from the web_ui
package.  This allows future changes to done to the modules used without
having to update them in each plugin that uses the web_ui common config.
This commit is contained in:
Hornwitser committed 2021-03-01 14:59:59 +01:00
1 parent 9869d92ead
commit 6a29cd9715
8 files changed
+16 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

package.json
-2
View File
@@ -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",
packages/master/package.json
-5
View File
@@ -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"
packages/web_ui/package.json
+7
View File
@@ -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": {
packages/web_ui/webpack.common.js
+9 -9
View File
@@ -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"),
},
],
},
plugins/global_chat/package.json
-3
View File
@@ -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"
},
plugins/research_sync/package.json
-3
View File
@@ -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"
},
plugins/statistics_exporter/package.json
-3
View File
@@ -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"
},
plugins/subspace_storage/package.json
-3
View File
@@ -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",