Skip to content

Commit bb0995c

Browse files
committed
Update webpack and associated loaders, node 18.12.0 is now the minimum version required for webpack-dev-server, remove webpack-merge, webpack now supports extending another configuration
1 parent 08fe993 commit bb0995c

File tree

3 files changed

+10
-15
lines changed

3 files changed

+10
-15
lines changed

package.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545
"webvr-polyfill": "^0.10.12"
4646
},
4747
"devDependencies": {
48-
"@babel/core": "^7.17.10",
49-
"babel-loader": "^8.2.5",
48+
"@babel/core": "^7.24.0",
49+
"babel-loader": "^9.1.3",
5050
"babel-plugin-istanbul": "^6.1.1",
5151
"chai": "^4.3.6",
5252
"chai-shallow-deep-equal": "^1.4.0",
5353
"chalk": "^1.1.3",
5454
"cross-env": "^7.0.3",
55-
"css-loader": "^6.7.1",
55+
"css-loader": "^6.10.0",
5656
"eslint": "^8.45.0",
5757
"eslint-config-semistandard": "^17.0.0",
5858
"eslint-config-standard-jsx": "^11.0.0",
@@ -81,12 +81,11 @@
8181
"sinon-chai": "^3.7.0",
8282
"snazzy": "^5.0.0",
8383
"standardx": "^7.0.0",
84-
"style-loader": "^3.3.1",
84+
"style-loader": "^3.3.4",
8585
"too-wordy": "ngokevin/too-wordy",
86-
"webpack": "^5.73.0",
87-
"webpack-cli": "^4.10.0",
88-
"webpack-dev-server": "^4.11.0",
89-
"webpack-merge": "^5.8.0",
86+
"webpack": "^5.91.0",
87+
"webpack-cli": "^5.1.4",
88+
"webpack-dev-server": "^5.0.4",
9089
"write-good": "^1.0.8"
9190
},
9291
"link": true,

webpack.config.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ module.exports = {
3636
test: /\.js$/,
3737
use: {
3838
loader: 'babel-loader'
39-
// options: {
40-
// presets: ['@babel/preset-env'],
41-
// },
4239
}
4340
},
4441
{

webpack.prod.config.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
var path = require('path');
2-
var merge = require('webpack-merge').merge;
3-
var commonConfiguration = require('./webpack.config.js');
42
var TerserPlugin = require('terser-webpack-plugin');
53

6-
module.exports = merge(commonConfiguration, {
4+
module.exports = {
5+
extends: ['webpack.config.js'],
76
output: {
87
library: 'AFRAME',
98
libraryTarget: 'umd',
@@ -28,4 +27,4 @@ module.exports = merge(commonConfiguration, {
2827
})
2928
]
3029
}
31-
});
30+
};

0 commit comments

Comments
 (0)