Merge pull request #14594 from webpack/ci/node-17

sokra · web-flow · commit 42b4ffb01aa9 · 2021-10-29T15:56:36.000+02:00
run CI on node 17
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,8 +21,8 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: 16.x
-          cache: 'yarn'
+          node-version: 17.x
+          cache: "yarn"
       - run: yarn --frozen-lockfile
       - uses: actions/cache@v1
         with:
@@ -37,8 +37,8 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: 16.x
-          cache: 'yarn'
+          node-version: 17.x
+          cache: "yarn"
       - run: yarn --frozen-lockfile
       - run: yarn link --frozen-lockfile || true
       - run: yarn link webpack --frozen-lockfile
@@ -54,8 +54,8 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: 16.x
-          cache: 'yarn'
+          node-version: 17.x
+          cache: "yarn"
       - run: yarn --frozen-lockfile
       - run: yarn link --frozen-lockfile || true
       - run: yarn link webpack --frozen-lockfile
@@ -75,9 +75,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version: [10.x, 16.x]
+        node-version: [10.x, 17.x]
         part: [a, b]
         include:
+          - os: ubuntu-latest
+            node-version: 16.x
+            part: a
           - os: ubuntu-latest
             node-version: 14.x
             part: a
@@ -91,7 +94,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
-          cache: 'yarn'
+          cache: "yarn"
       - run: yarn --frozen-lockfile
       - run: yarn link --frozen-lockfile || true
       - run: yarn link webpack --frozen-lockfile
diff --git a/test/WasmHashes.unittest.js b/test/WasmHashes.unittest.js
@@ -15,7 +15,10 @@ const wasmHashes = {
 		const createMd4Hash = require("../lib/util/hash/md4");
 		return {
 			createHash: createMd4Hash,
-			createReferenceHash: async () => createHash("md4"),
+			createReferenceHash:
+				parseInt(process.version.slice(1), 10) < 17
+					? async () => createHash("md4")
+					: createMd4Hash,
 			regExp: /^[0-9a-f]{32}$/
 		};
 	}
diff --git a/test/__snapshots__/StatsTestCases.basictest.js.snap b/test/__snapshots__/StatsTestCases.basictest.js.snap
@@ -952,9 +952,9 @@ webpack x.x.x compiled successfully in X ms"
 
 exports[`StatsTestCases should print correct stats for exclude-with-loader 1`] = `
 "hidden assets 34 bytes 1 asset
-asset bundle.js 5.28 KiB [emitted] (name: main)
+asset bundle.js 5.25 KiB [emitted] (name: main)
 runtime modules 1.72 KiB 5 modules
-hidden modules 123 bytes 2 modules
+hidden modules 99 bytes 2 modules
 cacheable modules 119 bytes
   ./index.js 77 bytes [built] [code generated]
   ./a.txt 42 bytes [built] [code generated]
diff --git a/test/statsCases/exclude-with-loader/webpack.config.js b/test/statsCases/exclude-with-loader/webpack.config.js
@@ -18,6 +18,9 @@ module.exports = {
 			{
 				test: /\.json/,
 				loader: "file-loader",
+				options: {
+					name: "[sha256:hash:8].[ext]"
+				},
 				type: "javascript/auto"
 			}
 		]
diff --git a/test/statsCases/real-content-hash/test.config.js b/test/statsCases/real-content-hash/test.config.js
@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const crypto = require("crypto");
+const createHash = require("../../../lib/util/createHash");
 
 const hashedFiles = {
 	"file.jpg": a => a.name.endsWith(".jpg"),
@@ -31,8 +31,7 @@ module.exports = {
 				const asset = statsData.assets.find(hashedFiles[name]);
 				expect(asset).not.toBe(undefined);
 				const content = fs.readFileSync(path.resolve(__dirname, "a", name));
-				const hash = crypto
-					.createHash("md4")
+				const hash = createHash("md4")
 					.update(content)
 					.digest("hex")
 					.slice(0, 20);

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@ module.exports = {`
`18`	`18`	`{`
`19`	`19`	`test: /\.json/,`
`20`	`20`	`loader: "file-loader",`
	`21`	`+ options: {`
	`22`	`+ name: "[sha256:hash:8].[ext]"`
	`23`	`+ },`
`21`	`24`	`type: "javascript/auto"`
`22`	`25`	`}`
`23`	`26`	`]`