mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-21 16:13:12 +09:00
Add context to webpack configs
Fix the issue with paths resolving incorrectly for the webpack config when running the master server with the --dev option from the project root folder through either npx clusteriomaster or node packages/master
This commit is contained in:
1 parent
690e566556
commit
019ffc25f0
11 files changed
+7
-10
No files matched your search
@@ -21,6 +21,8 @@
|
|||||||
"node": ">=10.16 <11 || >= 12"
|
"node": ">=10.16 <11 || >= 12"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@babel/core": "^7.12.3",
|
||||||
|
"@babel/preset-react": "^7.12.1",
|
||||||
"@clusterio/ctl": "file:./packages/ctl",
|
"@clusterio/ctl": "file:./packages/ctl",
|
||||||
"@clusterio/lib": "file:./packages/lib",
|
"@clusterio/lib": "file:./packages/lib",
|
||||||
"@clusterio/master": "file:packages/master",
|
"@clusterio/master": "file:packages/master",
|
||||||
|
|||||||
@@ -35,8 +35,6 @@
|
|||||||
"yargs": "^14.2.0"
|
"yargs": "^14.2.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.11.6",
|
|
||||||
"@babel/preset-react": "^7.10.4",
|
|
||||||
"@clusterio/web_ui": "^2.0.0-alpha.1",
|
"@clusterio/web_ui": "^2.0.0-alpha.1",
|
||||||
"babel-loader": "^8.1.0",
|
"babel-loader": "^8.1.0",
|
||||||
"css-loader": "^4.3.0",
|
"css-loader": "^4.3.0",
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ const { merge } = require("webpack-merge");
|
|||||||
const common = require("@clusterio/web_ui/webpack.common");
|
const common = require("@clusterio/web_ui/webpack.common");
|
||||||
|
|
||||||
module.exports = (env = {}) => merge(common(env), {
|
module.exports = (env = {}) => merge(common(env), {
|
||||||
|
context: __dirname,
|
||||||
entry: "./web/index.jsx",
|
entry: "./web/index.jsx",
|
||||||
devServer: {
|
devServer: {
|
||||||
contentBase: "./static",
|
contentBase: "./static",
|
||||||
|
|||||||
@@ -17,8 +17,6 @@
|
|||||||
"@clusterio/lib": "^2.0.0-alpha.0"
|
"@clusterio/lib": "^2.0.0-alpha.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.11.6",
|
|
||||||
"@babel/preset-react": "^7.10.4",
|
|
||||||
"@clusterio/web_ui": "^2.0.0-alpha.1",
|
"@clusterio/web_ui": "^2.0.0-alpha.1",
|
||||||
"babel-loader": "^8.1.0",
|
"babel-loader": "^8.1.0",
|
||||||
"null-loader": "^4.0.0",
|
"null-loader": "^4.0.0",
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ const { merge } = require("webpack-merge");
|
|||||||
const common = require("@clusterio/web_ui/webpack.common");
|
const common = require("@clusterio/web_ui/webpack.common");
|
||||||
|
|
||||||
module.exports = (env = {}) => merge(common(env), {
|
module.exports = (env = {}) => merge(common(env), {
|
||||||
|
context: __dirname,
|
||||||
entry: "./web/index.jsx",
|
entry: "./web/index.jsx",
|
||||||
output: {
|
output: {
|
||||||
filename: "bundle.js",
|
filename: "bundle.js",
|
||||||
|
|||||||
@@ -20,8 +20,6 @@
|
|||||||
"fs-extra": "^8.1.0"
|
"fs-extra": "^8.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.11.6",
|
|
||||||
"@babel/preset-react": "^7.10.4",
|
|
||||||
"@clusterio/web_ui": "^2.0.0-alpha.1",
|
"@clusterio/web_ui": "^2.0.0-alpha.1",
|
||||||
"babel-loader": "^8.1.0",
|
"babel-loader": "^8.1.0",
|
||||||
"null-loader": "^4.0.0",
|
"null-loader": "^4.0.0",
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ const { merge } = require("webpack-merge");
|
|||||||
const common = require("@clusterio/web_ui/webpack.common");
|
const common = require("@clusterio/web_ui/webpack.common");
|
||||||
|
|
||||||
module.exports = (env = {}) => merge(common(env), {
|
module.exports = (env = {}) => merge(common(env), {
|
||||||
|
context: __dirname,
|
||||||
entry: "./web/index.jsx",
|
entry: "./web/index.jsx",
|
||||||
output: {
|
output: {
|
||||||
filename: "bundle.js",
|
filename: "bundle.js",
|
||||||
|
|||||||
@@ -17,8 +17,6 @@
|
|||||||
"@clusterio/lib": "^2.0.0-alpha.0"
|
"@clusterio/lib": "^2.0.0-alpha.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.11.6",
|
|
||||||
"@babel/preset-react": "^7.10.4",
|
|
||||||
"@clusterio/web_ui": "^2.0.0-alpha.1",
|
"@clusterio/web_ui": "^2.0.0-alpha.1",
|
||||||
"babel-loader": "^8.1.0",
|
"babel-loader": "^8.1.0",
|
||||||
"null-loader": "^4.0.0",
|
"null-loader": "^4.0.0",
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ const { merge } = require("webpack-merge");
|
|||||||
const common = require("@clusterio/web_ui/webpack.common");
|
const common = require("@clusterio/web_ui/webpack.common");
|
||||||
|
|
||||||
module.exports = (env = {}) => merge(common(env), {
|
module.exports = (env = {}) => merge(common(env), {
|
||||||
|
context: __dirname,
|
||||||
entry: "./web/index.jsx",
|
entry: "./web/index.jsx",
|
||||||
output: {
|
output: {
|
||||||
filename: "bundle.js",
|
filename: "bundle.js",
|
||||||
|
|||||||
@@ -20,8 +20,6 @@
|
|||||||
"fs-extra": "^8.1.0"
|
"fs-extra": "^8.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.11.6",
|
|
||||||
"@babel/preset-react": "^7.10.4",
|
|
||||||
"@clusterio/web_ui": "^2.0.0-alpha.1",
|
"@clusterio/web_ui": "^2.0.0-alpha.1",
|
||||||
"antd": "^4.6.5",
|
"antd": "^4.6.5",
|
||||||
"babel-loader": "^8.1.0",
|
"babel-loader": "^8.1.0",
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ const { merge } = require("webpack-merge");
|
|||||||
const common = require("@clusterio/web_ui/webpack.common");
|
const common = require("@clusterio/web_ui/webpack.common");
|
||||||
|
|
||||||
module.exports = (env = {}) => merge(common(env), {
|
module.exports = (env = {}) => merge(common(env), {
|
||||||
|
context: __dirname,
|
||||||
entry: "./web/index.jsx",
|
entry: "./web/index.jsx",
|
||||||
output: {
|
output: {
|
||||||
filename: "bundle.js",
|
filename: "bundle.js",
|
||||||
|
|||||||
Reference in new issue
Block a user