Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 1.x] (security): update webpack-dev-server to address cves #1477

Merged
merged 1 commit into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"*.scss"
],
"scripts": {
"start": "cross-env BABEL_MODULES=false webpack-dev-server --inline --hot --config=src-docs/webpack.config.js",
"start": "cross-env BABEL_MODULES=false webpack-dev-server --hot --config=src-docs/webpack.config.js",
"test-docker": "node ./scripts/test-docker.js",
"sync-docs": "node ./scripts/docs-sync.js",
"build-docs": "cross-env BABEL_MODULES=false cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=4096 webpack --config=src-docs/webpack.config.js",
Expand Down Expand Up @@ -50,6 +50,7 @@
"@babel/cli/chokidar/glob-parent": "^6.0.1",
"@elastic/charts/**/d3-color": "^3.1.0",
"@types/jest/**/ansi-regex": "^5.0.1",
"@types/ws": "8.5.4",
"babel-plugin-add-module-exports/chokidar/glob-parent": "^6.0.1",
"babel-plugin-inline-react-svg/**/ansi-regex": "^5.0.1",
"babel-plugin-inline-react-svg/svgo/js-yaml": "^3.13.1",
Expand Down Expand Up @@ -78,9 +79,6 @@
"sass-lint/merge": "^2.1.1",
"start-server-and-test/**/minimist": "^1.2.6",
"start-server-and-test/wait-on": "^7.1.0",
"webpack-dev-server/**/ansi-regex": "^5.0.1",
"webpack-dev-server/chokidar/glob-parent": "^6.0.1",
"webpack-dev-server/selfsigned": "^2.0.1",
"webpack/**/chokidar/glob-parent": "^6.0.1",
"webpack/terser-webpack-plugin/serialize-javascript": "^3.1.0",
"yo/**/find-versions": "^4.0.0",
Expand Down Expand Up @@ -239,8 +237,8 @@
"typescript": "4.6.4",
"url-loader": "^4.1.0",
"webpack": "npm:@amoo-miki/[email protected]",
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.2",
"yeoman-generator": "^5.8.0",
"yo": "^4.3.1"
},
Expand Down
29 changes: 17 additions & 12 deletions scripts/compile-charts.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,8 @@ const dtsGenerator = require('dts-generator').default;

function compileChartsBundle() {
console.log('Building chart theme module...');
execSync(
'webpack src/themes/charts/themes.ts -o dist/oui_charts_theme.js --output-library-target="commonjs" --config=src/webpack.config.js',
{
stdio: 'inherit',
}
);
webpackCompile('oui_charts_theme.js');

dtsGenerator({
prefix: '',
out: 'dist/oui_charts_theme.d.ts',
Expand All @@ -58,12 +54,8 @@ function compileChartsBundle() {
});

/* OUI -> EUI Aliases */
execSync(
'webpack src/themes/charts/themes.ts -o dist/eui_charts_theme.js --output-library-target="commonjs" --config=src/webpack.config.js',
{
stdio: 'inherit',
}
);
webpackCompile('eui_charts_theme.js');

dtsGenerator({
prefix: '',
out: 'dist/eui_charts_theme.d.ts',
Expand All @@ -84,4 +76,17 @@ function compileChartsBundle() {
console.log(chalk.green('✔ Finished chart theme module'));
}

function webpackCompile(outputFilename) {
execSync(
`webpack ${path.join(__dirname, '../src/themes/charts/themes.ts')} \
-o dist \
--config=src/webpack.config.js \
--env filename=${outputFilename} \
--env library-target=commonjs`,
{
stdio: 'inherit',
}
);
}

compileChartsBundle();
13 changes: 8 additions & 5 deletions src-docs/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/

const path = require('path');
const { ProvidePlugin } = require('webpack');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const CircularDependencyPlugin = require('circular-dependency-plugin');
const babelConfig = require('./.babelrc.js');
Expand Down Expand Up @@ -132,11 +133,13 @@ const webpackConfig = {
failOnError: true,
}),

// run TypeScript during webpack build
// new ForkTsCheckerWebpackPlugin({
// typescript: { configFile: path.resolve(__dirname, '..', 'tsconfig.json') },
// async: false, // makes errors more visible, but potentially less performant
// }),
new ProvidePlugin({
Buffer: ['buffer', 'Buffer'],
}),

new ProvidePlugin({
process: 'process/browser',
}),
],

devServer: isDevelopment
Expand Down
7 changes: 4 additions & 3 deletions src/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const terserPlugin = new TerserPlugin({
sourceMap: true,
});

module.exports = {
module.exports = (env) => ({
mode: isProduction ? 'production' : 'development',

devtool: isProduction ? 'source-map' : 'cheap-module-source-map',
Expand All @@ -73,7 +73,8 @@ module.exports = {

output: {
path: path.resolve(__dirname, '../dist'),
filename: `oui${isProduction ? '.min' : ''}.js`,
filename: env.filename || `oui${isProduction ? '.min' : ''}.js`,
libraryTarget: env['library-target'] || undefined,
},

resolve: {
Expand Down Expand Up @@ -115,4 +116,4 @@ module.exports = {
minimizer: [terserPlugin],
noEmitOnErrors: true,
},
};
});
Loading
Loading