fix: support webpack@5 (#477)

evilebottnawi · web-flow · commit 903a56ea3fa0 · 2019-12-25T16:41:09.000+03:00
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -56,7 +56,6 @@ jobs:
         node-10-canary:
           node_version: ^10.13.0
           webpack_version: next
-          continue_on_error: true
     steps:
       - task: NodeTool@0
         inputs:
@@ -78,7 +77,7 @@ jobs:
         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" || $(continue_on_error)
+      - script: npm run test:coverage -- --ci --reporters="default" --reporters="jest-junit"
         displayName: 'Run tests with coverage'
       - task: PublishTestResults@2
         inputs:
@@ -114,7 +113,6 @@ jobs:
         node-10-canary:
           node_version: ^10.13.0
           webpack_version: next
-          continue_on_error: true
     steps:
       - task: NodeTool@0
         inputs:
@@ -136,7 +134,7 @@ jobs:
         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" || $(continue_on_error)
+      - script: npm run test:coverage -- --ci --reporters="default" --reporters="jest-junit"
         displayName: 'Run tests with coverage'
       - task: PublishTestResults@2
         inputs:
@@ -172,7 +170,6 @@ jobs:
         node-10-canary:
           node_version: ^10.13.0
           webpack_version: next
-          continue_on_error: true
     steps:
       - script: 'git config --global core.autocrlf input'
         displayName: 'Config git core.autocrlf'
@@ -197,7 +194,7 @@ jobs:
         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" || $(continue_on_error)
+      - script: npm run test:coverage -- --ci --reporters="default" --reporters="jest-junit"
         displayName: 'Run tests with coverage'
       - task: PublishTestResults@2
         inputs:
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "webpack": "^4.4.0"
+    "webpack": "^4.4.0 || ^5.0.0"
   },
   "dependencies": {
     "loader-utils": "^1.1.0",
@@ -72,7 +72,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^1.19.1",
     "standard-version": "^7.0.1",
-    "webpack": "^4.41.3",
+    "webpack": "^4.41.4",
     "webpack-cli": "^3.3.6",
     "webpack-dev-server": "^3.7.2"
   },
diff --git a/test/TestCases.test.js b/test/TestCases.test.js
@@ -26,10 +26,14 @@ function compareDirectory(actual, expected) {
 }
 
 function compareWarning(actual, expectedFile) {
-  if (!fs.existsSync(expectedFile)) return;
+  if (!fs.existsSync(expectedFile)) {
+    return;
+  }
+
+  // eslint-disable-next-line global-require, import/no-dynamic-require
+  const expected = require(expectedFile);
 
-  const expected = require(expectedFile); // eslint-disable-line global-require,import/no-dynamic-require
-  expect(actual).toBe(expected);
+  expect(actual.trim()).toBe(expected.trim());
 }
 
 describe('TestCases', () => {
@@ -97,8 +101,19 @@ describe('TestCases', () => {
           }
 
           const expectedDirectory = path.resolve(directoryForCase, 'expected');
+          const expectedDirectoryByVersion = path.join(
+            expectedDirectory,
+            `webpack-${webpack.version[0]}`
+          );
 
-          compareDirectory(outputDirectoryForCase, expectedDirectory);
+          if (fs.existsSync(expectedDirectoryByVersion)) {
+            compareDirectory(
+              outputDirectoryForCase,
+              expectedDirectoryByVersion
+            );
+          } else {
+            compareDirectory(outputDirectoryForCase, expectedDirectory);
+          }
 
           const expectedWarning = path.resolve(directoryForCase, 'warnings.js');
           const actualWarning = stats.toString({
diff --git a/test/cases/composes-async/index.js b/test/cases/composes-async/index.js
@@ -1,2 +1,4 @@
+/* eslint-disable-next-line no-unused-expressions */
 import(/* webpackChunkName: "async-1" */ './async-1.css');
+/* eslint-disable-next-line no-unused-expressions */
 import(/* webpackChunkName: "async-2" */ './async-2.css');
diff --git a/test/cases/hmr/expected/webpack-4/main.css b/test/cases/hmr/expected/webpack-4/main.css
diff --git a/test/cases/hmr/expected/webpack-4/main.js b/test/cases/hmr/expected/webpack-4/main.js
diff --git a/test/cases/hmr/expected/webpack-5/main.css b/test/cases/hmr/expected/webpack-5/main.css
@@ -0,0 +1,24 @@
+@import url(https://some/other/external/css);
+@import url(https://some/external/css);
+body {
+  background: red;
+}
+
+.c {
+  background: red;
+}
+
+.c {
+  color: yellow;
+}
+
+.b {
+  background: red;
+}
+
+.b {
+  color: yellow;
+}
+
+
+
diff --git a/test/cases/hmr/expected/webpack-5/main.js b/test/cases/hmr/expected/webpack-5/main.js
@@ -0,0 +1,7 @@
+/******/ (() => { // webpackBootstrap
+/******/ 	/************************************************************************/
+// extracted by mini-css-extract-plugin
+    if(false) { var cssReload; }
+  
+/******/ })()
+;
diff --git a/test/cases/js-hash/expected/style.922798e08e96756adb4a.1.css b/test/cases/js-hash/expected/style.922798e08e96756adb4a.1.css
diff --git a/test/cases/js-hash/expected/style.fe78b7a6c50df391f00c.2.css b/test/cases/js-hash/expected/style.fe78b7a6c50df391f00c.2.css
diff --git a/test/cases/js-hash/index.js b/test/cases/js-hash/index.js
@@ -1 +1,2 @@
+/* eslint-disable-next-line no-unused-expressions */
 import(/* webpackChunkName: "style" */ './style.css');
diff --git a/test/cases/js-hash/webpack.config.js b/test/cases/js-hash/webpack.config.js
@@ -32,11 +32,11 @@ module.exports = [1, 2].map((n) => {
       ],
     },
     output: {
-      filename: `[name].[contenthash].js`,
+      filename: `[name].[contenthash].${n}.js`,
     },
     plugins: [
       new Self({
-        filename: `[name].[chunkhash].css`,
+        filename: `[name].[contenthash].${n}.css`,
       }),
     ],
   };
diff --git a/test/cases/multiple-entry/index-one.js b/test/cases/multiple-entry/index-one.js
@@ -1,4 +1,5 @@
 import './a.css';
 import './b.css';
 
+/* eslint-disable-next-line no-unused-expressions */
 import(/* webpackChunkName: 'async-one' */ './async-one');
diff --git a/test/cases/multiple-entry/index-two.js b/test/cases/multiple-entry/index-two.js
@@ -1,4 +1,5 @@
 import './b.css';
 import './a.css';
 
+/* eslint-disable-next-line no-unused-expressions */
 import(/* webpackChunkName: 'async-two' */ './async-two');
diff --git a/test/cases/shared-import/index.js b/test/cases/shared-import/index.js
@@ -1,4 +1,5 @@
 import './a.css';
 import './b.css';
 
+/* eslint-disable-next-line no-unused-expressions */
 import('./c.css');
diff --git a/test/cases/simple-async-load-css-fallback/index.js b/test/cases/simple-async-load-css-fallback/index.js
@@ -1,5 +1,7 @@
 import './a.css';
 import './b.css';
 
+/* eslint-disable-next-line no-unused-expressions */
 import(/* webpackChunkName: 'async-one' */ './async-one');
+/* eslint-disable-next-line no-unused-expressions */
 import(/* webpackChunkName: 'async-two' */ './async-two');
diff --git a/test/cases/simple-async-load-css/index.js b/test/cases/simple-async-load-css/index.js
@@ -1,5 +1,7 @@
 import './a.css';
 import './b.css';
 
+/* eslint-disable-next-line no-unused-expressions */
 import(/* webpackChunkName: 'async-one' */ './async-one');
+/* eslint-disable-next-line no-unused-expressions */
 import(/* webpackChunkName: 'async-two' */ './async-two');
diff --git a/test/cases/simple-async-source-map/index.js b/test/cases/simple-async-source-map/index.js
@@ -1,5 +1,7 @@
 import './main.css';
 
+/* eslint-disable-next-line no-unused-expressions */
 import('./async');
 
+/* eslint-disable-next-line no-unused-expressions */
 import('./async.css');
diff --git a/test/cases/simple-async/index.js b/test/cases/simple-async/index.js
@@ -1,5 +1,7 @@
 import './main.css';
 
+/* eslint-disable-next-line no-unused-expressions */
 import('./async');
 
+/* eslint-disable-next-line no-unused-expressions */
 import('./async.css');
diff --git a/test/cases/split-chunks-single/entry1.js b/test/cases/split-chunks-single/entry1.js
@@ -3,5 +3,7 @@ import './e1.css';
 import './e2.css';
 import './f.css';
 
+/* eslint-disable-next-line no-unused-expressions */
 import('./chunk1');
+/* eslint-disable-next-line no-unused-expressions */
 import('./chunk2');
diff --git a/test/cases/split-chunks/expected/vendors.css b/test/cases/split-chunks/expected/vendors.css
diff --git a/test/cases/split-chunks/webpack.config.js b/test/cases/split-chunks/webpack.config.js
@@ -15,6 +15,7 @@ module.exports = {
       chunks: 'all',
       cacheGroups: {
         vendors: {
+          name: 'vendors',
           test: /node_modules/,
           enforce: true,
         },
