Skip to content

Commit 0428206

Browse files
fix: support webpack@5
1 parent 3203688 commit 0428206

File tree

2 files changed

+51
-22
lines changed

2 files changed

+51
-22
lines changed

azure-pipelines.yml

Lines changed: 50 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ trigger:
22
- master
33
- next
44

5+
variables:
6+
npm_config_cache: $(Pipeline.Workspace)/.npm
7+
58
jobs:
69
- job: Lint
710
pool:
8-
vmImage: ubuntu-16.04
11+
vmImage: ubuntu-latest
912
steps:
1013
- task: NodeTool@0
1114
inputs:
@@ -20,10 +23,12 @@ jobs:
2023
node -v
2124
npm -v
2225
displayName: 'Print versions'
23-
- task: Npm@1
26+
- task: CacheBeta@1
2427
inputs:
25-
command: custom
26-
customCommand: ci
28+
key: npm | $(Agent.OS) | package-lock.json
29+
path: $(npm_config_cache)
30+
displayName: 'Cache npm'
31+
- script: npm ci
2732
displayName: 'Install dependencies'
2833
- script: npm run lint
2934
displayName: 'Run lint'
@@ -34,10 +39,13 @@ jobs:
3439

3540
- job: Linux
3641
pool:
37-
vmImage: ubuntu-16.04
42+
vmImage: ubuntu-latest
3843
strategy:
39-
maxParallel: 5
44+
maxParallel: 6
4045
matrix:
46+
node-13:
47+
node_version: ^13.0.0
48+
webpack_version: latest
4149
node-12:
4250
node_version: ^12.0.0
4351
webpack_version: latest
@@ -50,6 +58,9 @@ jobs:
5058
node-6:
5159
node_version: ^6.9.0
5260
webpack_version: latest
61+
node-10-canary:
62+
node_version: ^10.13.0
63+
webpack_version: next
5364
steps:
5465
- task: NodeTool@0
5566
inputs:
@@ -64,14 +75,16 @@ jobs:
6475
node -v
6576
npm -v
6677
displayName: 'Print versions'
67-
- task: Npm@1
78+
- task: CacheBeta@1
6879
inputs:
69-
command: custom
70-
customCommand: ci
80+
key: npm | $(Agent.OS) | package-lock.json
81+
path: $(npm_config_cache)
82+
displayName: 'Cache npm'
83+
- script: npm ci
7184
displayName: 'Install dependencies'
7285
- script: npm i webpack@$(webpack_version)
7386
displayName: 'Install "webpack@$(webpack_version)"'
74-
- script: npm run test:coverage -- --ci --reporters="default" --reporters="jest-junit"
87+
- script: npm run test:coverage -- --ci --reporters="default" --reporters="jest-junit" || $(continue_on_error)
7588
displayName: 'Run tests with coverage'
7689
- task: PublishTestResults@2
7790
inputs:
@@ -85,10 +98,13 @@ jobs:
8598

8699
- job: macOS
87100
pool:
88-
vmImage: macOS-10.14
101+
vmImage: macOS-latest
89102
strategy:
90-
maxParallel: 5
103+
maxParallel: 6
91104
matrix:
105+
node-13:
106+
node_version: ^13.0.0
107+
webpack_version: latest
92108
node-12:
93109
node_version: ^12.0.0
94110
webpack_version: latest
@@ -101,6 +117,9 @@ jobs:
101117
node-6:
102118
node_version: ^6.9.0
103119
webpack_version: latest
120+
node-10-canary:
121+
node_version: ^10.13.0
122+
webpack_version: next
104123
steps:
105124
- task: NodeTool@0
106125
inputs:
@@ -115,14 +134,16 @@ jobs:
115134
node -v
116135
npm -v
117136
displayName: 'Print versions'
118-
- task: Npm@1
137+
- task: CacheBeta@1
119138
inputs:
120-
command: custom
121-
customCommand: ci
139+
key: npm | $(Agent.OS) | package-lock.json
140+
path: $(npm_config_cache)
141+
displayName: 'Cache npm'
142+
- script: npm ci
122143
displayName: 'Install dependencies'
123144
- script: npm i webpack@$(webpack_version)
124145
displayName: 'Install "webpack@$(webpack_version)"'
125-
- script: npm run test:coverage -- --ci --reporters="default" --reporters="jest-junit"
146+
- script: npm run test:coverage -- --ci --reporters="default" --reporters="jest-junit" || $(continue_on_error)
126147
displayName: 'Run tests with coverage'
127148
- task: PublishTestResults@2
128149
inputs:
@@ -136,10 +157,13 @@ jobs:
136157

137158
- job: Windows
138159
pool:
139-
vmImage: windows-2019
160+
vmImage: windows-latest
140161
strategy:
141-
maxParallel: 5
162+
maxParallel: 6
142163
matrix:
164+
node-13:
165+
node_version: ^13.0.0
166+
webpack_version: latest
143167
node-12:
144168
node_version: ^12.0.0
145169
webpack_version: latest
@@ -152,6 +176,9 @@ jobs:
152176
node-6:
153177
node_version: ^6.9.0
154178
webpack_version: latest
179+
node-10-canary:
180+
node_version: ^10.13.0
181+
webpack_version: next
155182
steps:
156183
- script: 'git config --global core.autocrlf input'
157184
displayName: 'Config git core.autocrlf'
@@ -169,10 +196,12 @@ jobs:
169196
node -v
170197
npm -v
171198
displayName: 'Print versions'
172-
- task: Npm@1
199+
- task: CacheBeta@1
173200
inputs:
174-
command: custom
175-
customCommand: ci
201+
key: npm | $(Agent.OS) | package-lock.json
202+
path: $(npm_config_cache)
203+
displayName: 'Cache npm'
204+
- script: npm ci
176205
displayName: 'Install dependencies'
177206
- script: npm i webpack@$(webpack_version)
178207
displayName: 'Install "webpack@$(webpack_version)"'

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"webpack-cli": "^3.3.10"
115115
},
116116
"peerDependencies": {
117-
"webpack": "^4.0.0"
117+
"webpack": "^4.0.0 || ^5.0.0"
118118
},
119119
"author": "Tobias Koppers @sokra",
120120
"bugs": "https://github.com/webpack/webpack-dev-server/issues",

0 commit comments

Comments
 (0)