Skip to content

Commit 442742e

Browse files
committed
dev: fix the React Material and Vanilla example dev setup
We recently updated Typescript. The new version is incompatible to our (pretty old) webpack dev-server setup. We now update Webpack throughout the whole repository, fixing the webpack dev-server setup in the process.
1 parent 3a68d0c commit 442742e

File tree

8 files changed

+4931
-13759
lines changed

8 files changed

+4931
-13759
lines changed

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343
"source-map-loader": "^0.2.4",
4444
"source-map-support": "0.5.16",
4545
"style-loader": "^1.0.1",
46-
"ts-loader": "^6.2.1",
46+
"ts-loader": "^9.5.1",
4747
"ts-node": "^10.4.0",
4848
"tslib": "^2.5.0",
4949
"typescript": "~4.9.5",
50-
"webpack": "^4.41.2",
51-
"webpack-merge": "^4.2.2"
50+
"webpack": "^5.78.0",
51+
"webpack-merge": "^5.10.0"
5252
},
5353
"pnpm": {
5454
"overrides": {

packages/angular-material/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
"protractor": "^7.0.0",
131131
"rimraf": "^3.0.2",
132132
"rxjs": "^6.6.0",
133-
"ts-loader": "^6.2.1",
133+
"ts-loader": "^9.5.1",
134134
"tslib": "^2.5.0",
135135
"typedoc": "~0.25.3",
136136
"typescript": "~4.9.5",

packages/material-renderers/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"scripts": {
3939
"build": "rollup -c rollup.config.js",
4040
"build:examples-app": "rollup -c rollup.example.config.js",
41-
"dev": "webpack --config webpack/webpack.dev.js && webpack-dev-server --config webpack/webpack.dev.js --env=dev --inline",
41+
"dev": "webpack-dev-server --config webpack/webpack.dev.js --env=dev",
4242
"clean": "rimraf lib coverage dist .nyc_output example/dist 2> /dev/null",
4343
"lint": "eslint .",
4444
"lint:fix": "eslint --fix .",
@@ -134,12 +134,12 @@
134134
"rollup-plugin-visualizer": "^5.4.1",
135135
"source-map-loader": "^0.2.4",
136136
"ts-jest": "^27.1.4",
137-
"ts-loader": "^6.2.1",
137+
"ts-loader": "^9.5.1",
138138
"tslib": "^2.5.0",
139139
"typedoc": "~0.25.3",
140140
"typescript": "~4.9.5",
141-
"webpack": "^4.41.2",
142-
"webpack-cli": "^3.2.1",
143-
"webpack-dev-server": "^3.9.0"
141+
"webpack": "^5.78.0",
142+
"webpack-cli": "^5.1.4",
143+
"webpack-dev-server": "^4.15.1"
144144
}
145145
}

packages/material-renderers/webpack/webpack.dev.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const merge = require('webpack-merge');
1+
const merge = require('webpack-merge').merge;
22
const baseConfig = require('../../../webpack/webpack.dev.base.js');
33
var copyWebpackPlugin = require('copy-webpack-plugin');
44

packages/vanilla-renderers/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"scripts": {
1313
"build": "rollup -c rollup.config.js",
1414
"build:examples-app": "rollup -c rollup.example.config.js",
15-
"dev": "webpack --config ./webpack/webpack.dev.js && webpack-dev-server --config webpack/webpack.dev.js --env=dev --inline",
15+
"dev": "webpack-dev-server --config webpack/webpack.dev.js --env=dev",
1616
"clean": "rimraf lib coverage dist .nyc_output example/dist 2> /dev/null",
1717
"lint": "eslint .",
1818
"lint:fix": "eslint --fix .",
@@ -88,13 +88,13 @@
8888
"source-map-loader": "^0.2.4",
8989
"source-map-support": "0.5.16",
9090
"ts-jest": "^27.1.4",
91-
"ts-loader": "^6.2.1",
91+
"ts-loader": "^9.5.1",
9292
"ts-node": "^10.4.0",
9393
"tslib": "^2.5.0",
9494
"typedoc": "~0.25.3",
95-
"webpack": "^4.41.2",
96-
"webpack-cli": "^3.2.1",
97-
"webpack-dev-server": "^3.9.0"
95+
"webpack": "^5.78.0",
96+
"webpack-cli": "^5.1.4",
97+
"webpack-dev-server": "^4.15.1"
9898
},
9999
"jest": {
100100
"moduleFileExtensions": [

packages/vanilla-renderers/webpack/webpack.dev.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const merge = require('webpack-merge');
1+
const merge = require('webpack-merge').merge;
22
const baseConfig = require('../../../webpack/webpack.dev.base.js');
33
var copyWebpackPlugin = require('copy-webpack-plugin');
44

0 commit comments

Comments
 (0)