Skip to content

Commit

Permalink
Upgrades webpack-dev-server and webpack-cli
Browse files Browse the repository at this point in the history
* Upgrades `webpack-cli` from v3.3.10 to v4.9.2
  * [CHANGELOG](https://github.com/webpack/webpack-cli/blob/webpack-cli%404.9.2/CHANGELOG.md)
  * `webpack-cli` changed the way that the `--env` flag is parsed. See
webpack/webpack-cli#1216 for more information.
* Upgrades `webpack-dev-server` from v3.11.2 to v4.7.4
  * [CHANGELOG](https://github.com/webpack/webpack-dev-server/blob/v4.7.4/CHANGELOG.md)
  * [Migration guide](https://github.com/webpack/webpack-dev-server/blob/master/migration-v4.md)

Resolves opensearch-project#1065

Signed-off-by: Tommy Markley <markleyt@amazon.com>
  • Loading branch information
Tommy Markley committed Feb 9, 2022
1 parent 6db875f commit 29b1910
Show file tree
Hide file tree
Showing 6 changed files with 462 additions and 337 deletions.
2 changes: 1 addition & 1 deletion packages/osd-interpreter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
"supports-color": "^7.0.0",
"url-loader": "^2.2.0",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10"
"webpack-cli": "^4.9.2"
}
}
2 changes: 1 addition & 1 deletion packages/osd-monaco/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
"supports-color": "^7.0.0",
"typescript": "4.0.2",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10"
"webpack-cli": "^4.9.2"
}
}
4 changes: 2 additions & 2 deletions packages/osd-monaco/scripts/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ run(
await del(TARGET_BUILD_DIR);

const cwd = ROOT_DIR;
const env = { ...process.env };
const env = { ...process.env, dev: !!flags.dev, prod: !flags.dev };
if (supportsColor.stdout) {
env.FORCE_COLOR = 'true';
}

await procRunner.run('worker', {
cmd: 'webpack',
args: ['--config', WEBPACK_CONFIG_PATH, flags.dev ? '--env.dev' : '--env.prod'],
args: ['--config', WEBPACK_CONFIG_PATH],
wait: true,
env,
cwd,
Expand Down
2 changes: 1 addition & 1 deletion packages/osd-pm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"typescript": "4.0.2",
"unlazy-loader": "^0.1.3",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10",
"webpack-cli": "^4.9.2",
"write-pkg": "^4.0.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/osd-ui-framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@
"sinon": "^7.4.2",
"style-loader": "^1.1.3",
"webpack": "^4.41.5",
"webpack-dev-server": "^3.11.2"
"webpack-dev-server": "^4.7.4"
}
}
Loading

0 comments on commit 29b1910

Please sign in to comment.