From 04282069d13f6ff215deb7b702152037cd810622 Mon Sep 17 00:00:00 2001
From: evilebottnawi <sheo13666q@gmail.com>
Date: Wed, 18 Dec 2019 12:48:42 +0300
Subject: [PATCH] fix: support webpack@5

---
 azure-pipelines.yml | 71 +++++++++++++++++++++++++++++++--------------
 package.json        |  2 +-
 2 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8977de369e..523d7394ec 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,10 +2,13 @@ trigger:
   - master
   - next
 
+variables:
+  npm_config_cache: $(Pipeline.Workspace)/.npm
+
 jobs:
   - job: Lint
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-latest
     steps:
       - task: NodeTool@0
         inputs:
@@ -20,10 +23,12 @@ jobs:
           node -v
           npm -v
         displayName: 'Print versions'
-      - task: Npm@1
+      - task: CacheBeta@1
         inputs:
-          command: custom
-          customCommand: ci
+          key: npm | $(Agent.OS) | package-lock.json
+          path: $(npm_config_cache)
+        displayName: 'Cache npm'
+      - script: npm ci
         displayName: 'Install dependencies'
       - script: npm run lint
         displayName: 'Run lint'
@@ -34,10 +39,13 @@ jobs:
 
   - job: Linux
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-latest
     strategy:
-      maxParallel: 5
+      maxParallel: 6
       matrix:
+        node-13:
+          node_version: ^13.0.0
+          webpack_version: latest
         node-12:
           node_version: ^12.0.0
           webpack_version: latest
@@ -50,6 +58,9 @@ jobs:
         node-6:
           node_version: ^6.9.0
           webpack_version: latest
+        node-10-canary:
+          node_version: ^10.13.0
+          webpack_version: next
     steps:
       - task: NodeTool@0
         inputs:
@@ -64,14 +75,16 @@ jobs:
           node -v
           npm -v
         displayName: 'Print versions'
-      - task: Npm@1
+      - task: CacheBeta@1
         inputs:
-          command: custom
-          customCommand: ci
+          key: npm | $(Agent.OS) | package-lock.json
+          path: $(npm_config_cache)
+        displayName: 'Cache npm'
+      - script: npm ci
         displayName: 'Install dependencies'
       - script: npm i webpack@$(webpack_version)
         displayName: 'Install "webpack@$(webpack_version)"'
-      - script: npm run test:coverage -- --ci --reporters="default" --reporters="jest-junit"
+      - script: npm run test:coverage -- --ci --reporters="default" --reporters="jest-junit" || $(continue_on_error)
         displayName: 'Run tests with coverage'
       - task: PublishTestResults@2
         inputs:
@@ -85,10 +98,13 @@ jobs:
 
   - job: macOS
     pool:
-      vmImage: macOS-10.14
+      vmImage: macOS-latest
     strategy:
-      maxParallel: 5
+      maxParallel: 6
       matrix:
+        node-13:
+          node_version: ^13.0.0
+          webpack_version: latest
         node-12:
           node_version: ^12.0.0
           webpack_version: latest
@@ -101,6 +117,9 @@ jobs:
         node-6:
           node_version: ^6.9.0
           webpack_version: latest
+        node-10-canary:
+          node_version: ^10.13.0
+          webpack_version: next
     steps:
       - task: NodeTool@0
         inputs:
@@ -115,14 +134,16 @@ jobs:
           node -v
           npm -v
         displayName: 'Print versions'
-      - task: Npm@1
+      - task: CacheBeta@1
         inputs:
-          command: custom
-          customCommand: ci
+          key: npm | $(Agent.OS) | package-lock.json
+          path: $(npm_config_cache)
+        displayName: 'Cache npm'
+      - script: npm ci
         displayName: 'Install dependencies'
       - script: npm i webpack@$(webpack_version)
         displayName: 'Install "webpack@$(webpack_version)"'
-      - script: npm run test:coverage -- --ci --reporters="default" --reporters="jest-junit"
+      - script: npm run test:coverage -- --ci --reporters="default" --reporters="jest-junit" || $(continue_on_error)
         displayName: 'Run tests with coverage'
       - task: PublishTestResults@2
         inputs:
@@ -136,10 +157,13 @@ jobs:
 
   - job: Windows
     pool:
-      vmImage: windows-2019
+      vmImage: windows-latest
     strategy:
-      maxParallel: 5
+      maxParallel: 6
       matrix:
+        node-13:
+          node_version: ^13.0.0
+          webpack_version: latest
         node-12:
           node_version: ^12.0.0
           webpack_version: latest
@@ -152,6 +176,9 @@ jobs:
         node-6:
           node_version: ^6.9.0
           webpack_version: latest
+        node-10-canary:
+          node_version: ^10.13.0
+          webpack_version: next
     steps:
       - script: 'git config --global core.autocrlf input'
         displayName: 'Config git core.autocrlf'
@@ -169,10 +196,12 @@ jobs:
           node -v
           npm -v
         displayName: 'Print versions'
-      - task: Npm@1
+      - task: CacheBeta@1
         inputs:
-          command: custom
-          customCommand: ci
+          key: npm | $(Agent.OS) | package-lock.json
+          path: $(npm_config_cache)
+        displayName: 'Cache npm'
+      - script: npm ci
         displayName: 'Install dependencies'
       - script: npm i webpack@$(webpack_version)
         displayName: 'Install "webpack@$(webpack_version)"'
diff --git a/package.json b/package.json
index 55d0e9b7f1..344425e573 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,7 @@
     "webpack-cli": "^3.3.10"
   },
   "peerDependencies": {
-    "webpack": "^4.0.0"
+    "webpack": "^4.0.0 || ^5.0.0"
   },
   "author": "Tobias Koppers @sokra",
   "bugs": "https://github.com/webpack/webpack-dev-server/issues",