Skip to content

Commit e83f811

Browse files
committed
[Girder] Upgrading to Webpack 5.2.0
See: https://webpack.js.org/migrate/5/
1 parent 73eb5ab commit e83f811

File tree

3 files changed

+1229
-1152
lines changed

3 files changed

+1229
-1152
lines changed

package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,30 @@
3131
"dependencies": {
3232
"@babel/cli": "^7.4.4",
3333
"@babel/core": "^7.4.5",
34-
"@babel/plugin-proposal-class-properties": "^7.4.4",
35-
"@babel/plugin-proposal-object-rest-spread": "^7.4.4",
36-
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
37-
"@babel/plugin-transform-modules-commonjs": "^7.4.4",
34+
"@babel/plugin-proposal-class-properties": "^7.10.4",
35+
"@babel/plugin-proposal-object-rest-spread": "^7.11.0",
36+
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
37+
"@babel/plugin-transform-modules-commonjs": "^7.10.4",
3838
"@babel/preset-env": "^7.4.5",
3939
"@babel/preset-react": "^7.0.0",
4040
"axios": "^0.19.0",
4141
"babel-core": "^7.0.0-bridge.0",
4242
"babel-eslint": "^10.0.1",
4343
"babel-jest": "^24.8.0",
44-
"babel-loader": "^8.0.6",
45-
"babel-plugin-module-resolver": "^3.2.0",
46-
"case-sensitive-paths-webpack-plugin": "^2.1.2",
47-
"copy-webpack-plugin": "^5.0.5",
44+
"babel-loader": "^8.1.0",
45+
"babel-plugin-module-resolver": "^4.0.0",
46+
"case-sensitive-paths-webpack-plugin": "^2.3.0",
47+
"copy-webpack-plugin": "^6.0.3",
4848
"core-js": "3",
49-
"css-loader": "^3.2.1",
49+
"css-loader": "^4.2.0",
5050
"html-react-parser": "^0.9.2",
5151
"i18n-js": "^3.2.2",
5252
"jquery": "^3.3.1",
5353
"jquery-ujs": "^1.2.2",
54-
"mini-css-extract-plugin": "^0.8.0",
54+
"mini-css-extract-plugin": "^0.9.0",
5555
"node-sass": "^4.13.0",
5656
"prop-types": "^15.6.1",
57-
"rails-erb-loader": "^5.4.1",
57+
"rails-erb-loader": "^5.5.2",
5858
"react": "^16.4.0",
5959
"react-dom": "^16.4.0",
6060
"react-on-rails": "^11.3.0",
@@ -63,9 +63,9 @@
6363
"react-transition-group": "^4.3.0",
6464
"react_ujs": "^2.4.4",
6565
"redux": "^4.0.5",
66-
"sass-loader": "^8.0.0",
67-
"webpack": "^4.41.2",
66+
"sass-loader": "^9.0.2",
67+
"webpack": "^5.2.0",
6868
"webpack-assets-manifest": "^3.1.1",
69-
"webpack-cli": "^3.3.9"
69+
"webpack-cli": "3.3.12"
7070
}
7171
}

webpack.config.js

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,6 @@ const config = {
5757
resolveLoader: {
5858
modules: ['node_modules']
5959
},
60-
node: {
61-
dgram: 'empty',
62-
fs: 'empty',
63-
net: 'empty',
64-
tls: 'empty',
65-
child_process: 'empty'
66-
},
6760
devtool: 'cheap-module-source-map',
6861
devServer: {
6962
clientLogLevel: 'none',
@@ -221,13 +214,15 @@ const config = {
221214
filename: '[name]-[contenthash].css',
222215
chunkFilename: '[name]-[contenthash].chunk.css'
223216
}),
224-
new CopyPlugin([
225-
{
226-
from: '**/*',
227-
context: `${ASSETS_DIR}/images`,
228-
to: IMAGES_DIR
229-
}
230-
]),
217+
new CopyPlugin({
218+
patterns: [
219+
{
220+
from: '**/*',
221+
context: `${ASSETS_DIR}/images`,
222+
to: IMAGES_DIR
223+
}
224+
]
225+
}),
231226
new WebpackAssetsManifest({
232227
integrity: false,
233228
entrypoints: false,

0 commit comments

Comments
 (0)