From 1d085668121abe6be83c28c212a02c181c16d2b8 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Tue, 6 Sep 2022 07:19:38 +0200 Subject: [PATCH] [v3.0] Use ASCII characters for hash placeholders (#4631) * Use ASCII characters for hash placeholders * Back to 8 character hashes with base-64 encoding --- src/utils/base64.ts | 2 +- src/utils/hashPlaceholders.ts | 12 +++++++----- .../_expected/{main-e4b393dd.js => main-70712c1f.js} | 0 .../{main-amd-db420a01.js => main-amd-f0570656.js} | 0 .../{main-cjs-319b4e92.js => main-cjs-e39bf23f.js} | 0 .../es/{main-es-2d953d94.js => main-es-d43a43b5.js} | 0 ...in-system-8af9e572.js => main-system-5684b811.js} | 0 ...in-5940aabc-amd.js => entry-main-70ac024b-amd.js} | 0 ...in-9cf3a232-cjs.js => entry-main-780766d3-cjs.js} | 0 ...main-8d825d29-es.js => entry-main-080ad38c-es.js} | 0 ...44e01-system.js => entry-main-5d41b5c4-system.js} | 0 ...1-f9abc9cf-amd.js => entry-main1-94fe149e-amd.js} | 0 ...2-85af4452-amd.js => entry-main2-16bafa95-amd.js} | 0 ...1-5f74b9d5-cjs.js => entry-main1-2934d4fa-cjs.js} | 0 ...2-1558fcfd-cjs.js => entry-main2-523204ff-cjs.js} | 0 ...in1-0a8075b5-es.js => entry-main1-6f12c5b2-es.js} | 0 ...in2-fb2a74f2-es.js => entry-main2-a9b323b4-es.js} | 0 ...e20b-system.js => entry-main1-720299cf-system.js} | 0 ...3da5-system.js => entry-main2-c3cb1622-system.js} | 0 .../samples/hashing/hash-size/_config.js | 2 +- .../amd/{main1-07dd83.js => main1-eb0f074f.js} | 0 .../amd/{main2-3eb7d864c1.js => main2-b24fb22e7f.js} | 0 .../cjs/{main1-ebd270.js => main1-87405ba3.js} | 0 .../cjs/{main2-4c56283430.js => main2-b2c59bdf14.js} | 0 .../es/{main1-126f2a.js => main1-bcca55a1.js} | 0 .../es/{main2-064a8187cc.js => main2-83d7b451fa.js} | 0 .../system/{main1-415c92.js => main1-122e0961.js} | 0 .../{main2-606a1eb4a0.js => main2-ed4d8c97a2.js} | 0 .../samples/hashing/random-match/_config.js | 2 +- ...7\271\356\223\2231234\356\217\214\357\207\276.js" | 6 ------ .../amd/entry-a38385ce-a38385ce-!~{123}~.js | 6 ++++++ .../cjs/entry-55937672-55937672-!~{123}~.js | 4 ++++ ...7\271\356\223\2231234\356\217\214\357\207\276.js" | 4 ---- .../_expected/es/entry-3e8c77bc-3e8c77bc-!~{123}~.js | 2 ++ ...7\271\356\223\2231234\356\217\214\357\207\276.js" | 2 -- .../system/entry-49c9800c-49c9800c-!~{123}~.js | 4 ++-- .../samples/hashing/random-match/main.js | 4 ++-- .../{main-amd-c6b04a3d.js => main-amd-addffa50.js} | 0 .../{main-cjs-7c9c9af9.js => main-cjs-cb43c6df.js} | 0 .../es/{main-es-a7c9a9b3.js => main-es-f8350081.js} | 0 ...in-system-c34198fc.js => main-system-d08bfef5.js} | 0 .../{main-amd-7efb1bed.mjs => main-amd-30156411.mjs} | 0 .../{main-cjs-f7b1940b.mjs => main-cjs-23637a85.mjs} | 0 .../{main-es-fd922f49.mjs => main-es-956265de.mjs} | 0 ...-system-a8e7f87b.mjs => main-system-36e9b93b.mjs} | 0 ...try-main2-16af9d90.js => entry-main2-4c3da82f.js} | 0 ...try-main2-a19dc55f.js => entry-main2-a3a04675.js} | 0 ...try-main2-5a17c9e2.js => entry-main2-7827261c.js} | 0 ...try-main2-d4227ff0.js => entry-main2-f1bbcc21.js} | 0 ...chunk-dep2-5e5c0a2b.js => chunk-dep2-88c5c49b.js} | 4 ++-- ...try-main1-92387c07.js => entry-main1-87907a68.js} | 10 +++++----- ...try-main2-8423cd41.js => entry-main2-71e00327.js} | 10 +++++----- ...chunk-dep2-b09f6eac.js => chunk-dep2-970ee28f.js} | 4 ++-- ...try-main1-465ee0c3.js => entry-main1-6d518561.js} | 10 +++++----- ...try-main2-333fdc53.js => entry-main2-a4b8e424.js} | 10 +++++----- ...chunk-dep2-124edba5.js => chunk-dep2-f4e7f39c.js} | 4 ++-- ...try-main1-b12147aa.js => entry-main1-bb9f9ac2.js} | 10 +++++----- ...try-main2-09746024.js => entry-main2-2ba44c5c.js} | 10 +++++----- ...chunk-dep2-6579036d.js => chunk-dep2-ea1348fd.js} | 4 ++-- ...try-main1-331def45.js => entry-main1-118e1de4.js} | 10 +++++----- ...try-main2-7bacea36.js => entry-main2-34191286.js} | 10 +++++----- .../samples/hashing/minimum-hash-size/_config.js | 2 +- test/misc/bundle-information.js | 2 +- test/misc/misc.js | 2 +- 64 files changed, 77 insertions(+), 75 deletions(-) rename test/browser/samples/supports-hashes/_expected/{main-e4b393dd.js => main-70712c1f.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/{main-amd-db420a01.js => main-amd-f0570656.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/{main-cjs-319b4e92.js => main-cjs-e39bf23f.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/{main-es-2d953d94.js => main-es-d43a43b5.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/{main-system-8af9e572.js => main-system-5684b811.js} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/{entry-main-5940aabc-amd.js => entry-main-70ac024b-amd.js} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/{entry-main-9cf3a232-cjs.js => entry-main-780766d3-cjs.js} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/{entry-main-8d825d29-es.js => entry-main-080ad38c-es.js} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/{entry-main-12044e01-system.js => entry-main-5d41b5c4-system.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/amd/{entry-main1-f9abc9cf-amd.js => entry-main1-94fe149e-amd.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/amd/{entry-main2-85af4452-amd.js => entry-main2-16bafa95-amd.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/cjs/{entry-main1-5f74b9d5-cjs.js => entry-main1-2934d4fa-cjs.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/cjs/{entry-main2-1558fcfd-cjs.js => entry-main2-523204ff-cjs.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/es/{entry-main1-0a8075b5-es.js => entry-main1-6f12c5b2-es.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/es/{entry-main2-fb2a74f2-es.js => entry-main2-a9b323b4-es.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/system/{entry-main1-9f23e20b-system.js => entry-main1-720299cf-system.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/system/{entry-main2-e9563da5-system.js => entry-main2-c3cb1622-system.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/amd/{main1-07dd83.js => main1-eb0f074f.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/amd/{main2-3eb7d864c1.js => main2-b24fb22e7f.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/cjs/{main1-ebd270.js => main1-87405ba3.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/cjs/{main2-4c56283430.js => main2-b2c59bdf14.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/es/{main1-126f2a.js => main1-bcca55a1.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/es/{main2-064a8187cc.js => main2-83d7b451fa.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/system/{main1-415c92.js => main1-122e0961.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/system/{main2-606a1eb4a0.js => main2-ed4d8c97a2.js} (100%) delete mode 100644 "test/chunking-form/samples/hashing/random-match/_expected/amd/entry-45acd559-45acd559-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" create mode 100644 test/chunking-form/samples/hashing/random-match/_expected/amd/entry-a38385ce-a38385ce-!~{123}~.js create mode 100644 test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55937672-55937672-!~{123}~.js delete mode 100644 "test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55c0e99e-55c0e99e-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" create mode 100644 test/chunking-form/samples/hashing/random-match/_expected/es/entry-3e8c77bc-3e8c77bc-!~{123}~.js delete mode 100644 "test/chunking-form/samples/hashing/random-match/_expected/es/entry-866d3e85-866d3e85-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" rename "test/chunking-form/samples/hashing/random-match/_expected/system/entry-74248106-74248106-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" => test/chunking-form/samples/hashing/random-match/_expected/system/entry-49c9800c-49c9800c-!~{123}~.js (53%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{main-amd-c6b04a3d.js => main-amd-addffa50.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/{main-cjs-7c9c9af9.js => main-cjs-cb43c6df.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/{main-es-a7c9a9b3.js => main-es-f8350081.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{main-system-c34198fc.js => main-system-d08bfef5.js} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/{main-amd-7efb1bed.mjs => main-amd-30156411.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/{main-cjs-f7b1940b.mjs => main-cjs-23637a85.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/{main-es-fd922f49.mjs => main-es-956265de.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/{main-system-a8e7f87b.mjs => main-system-36e9b93b.mjs} (100%) rename test/chunking-form/samples/render-chunk-transform/_expected/amd/{entry-main2-16af9d90.js => entry-main2-4c3da82f.js} (100%) rename test/chunking-form/samples/render-chunk-transform/_expected/cjs/{entry-main2-a19dc55f.js => entry-main2-a3a04675.js} (100%) rename test/chunking-form/samples/render-chunk-transform/_expected/es/{entry-main2-5a17c9e2.js => entry-main2-7827261c.js} (100%) rename test/chunking-form/samples/render-chunk-transform/_expected/system/{entry-main2-d4227ff0.js => entry-main2-f1bbcc21.js} (100%) rename test/chunking-form/samples/render-chunk/_expected/amd/{chunk-dep2-5e5c0a2b.js => chunk-dep2-88c5c49b.js} (87%) rename test/chunking-form/samples/render-chunk/_expected/amd/{entry-main1-92387c07.js => entry-main1-87907a68.js} (83%) rename test/chunking-form/samples/render-chunk/_expected/amd/{entry-main2-8423cd41.js => entry-main2-71e00327.js} (83%) rename test/chunking-form/samples/render-chunk/_expected/cjs/{chunk-dep2-b09f6eac.js => chunk-dep2-970ee28f.js} (89%) rename test/chunking-form/samples/render-chunk/_expected/cjs/{entry-main1-465ee0c3.js => entry-main1-6d518561.js} (88%) rename test/chunking-form/samples/render-chunk/_expected/cjs/{entry-main2-333fdc53.js => entry-main2-a4b8e424.js} (88%) rename test/chunking-form/samples/render-chunk/_expected/es/{chunk-dep2-124edba5.js => chunk-dep2-f4e7f39c.js} (85%) rename test/chunking-form/samples/render-chunk/_expected/es/{entry-main1-b12147aa.js => entry-main1-bb9f9ac2.js} (82%) rename test/chunking-form/samples/render-chunk/_expected/es/{entry-main2-09746024.js => entry-main2-2ba44c5c.js} (82%) rename test/chunking-form/samples/render-chunk/_expected/system/{chunk-dep2-6579036d.js => chunk-dep2-ea1348fd.js} (87%) rename test/chunking-form/samples/render-chunk/_expected/system/{entry-main1-331def45.js => entry-main1-118e1de4.js} (84%) rename test/chunking-form/samples/render-chunk/_expected/system/{entry-main2-7bacea36.js => entry-main2-34191286.js} (84%) diff --git a/src/utils/base64.ts b/src/utils/base64.ts index 6a8ec75c66f..13849e353c1 100644 --- a/src/utils/base64.ts +++ b/src/utils/base64.ts @@ -5,7 +5,7 @@ export function toBase64(num: number): string { let outStr = ''; do { const curDigit = num % base; - num = Math.floor(num / base); + num = (num / base) | 0; outStr = chars[curDigit] + outStr; } while (num !== 0); return outStr; diff --git a/src/utils/hashPlaceholders.ts b/src/utils/hashPlaceholders.ts index a83b4cdda42..65f452da167 100644 --- a/src/utils/hashPlaceholders.ts +++ b/src/utils/hashPlaceholders.ts @@ -1,8 +1,9 @@ +import { toBase64 } from './base64'; import { errFailedValidation, error } from './error'; // Four random characters from the private use area to minimize risk of conflicts -const hashPlaceholderLeft = '\uf7f9\ue4d3'; -const hashPlaceholderRight = '\ue3cc\uf1fe'; +const hashPlaceholderLeft = '!~{'; +const hashPlaceholderRight = '}~'; const hashPlaceholderOverhead = hashPlaceholderLeft.length + hashPlaceholderRight.length; // This is the size of a sha256 @@ -21,7 +22,7 @@ export const getHashPlaceholderGenerator = (): HashPlaceholderGenerator => { ) ); } - const placeholder = `${hashPlaceholderLeft}${String(++nextIndex).padStart( + const placeholder = `${hashPlaceholderLeft}${toBase64(++nextIndex).padStart( hashSize - hashPlaceholderOverhead, '0' )}${hashPlaceholderRight}`; @@ -32,13 +33,14 @@ export const getHashPlaceholderGenerator = (): HashPlaceholderGenerator => { ) ); } - nextIndex++; return placeholder; }; }; const REPLACER_REGEX = new RegExp( - `${hashPlaceholderLeft}\\d{1,${maxHashSize - hashPlaceholderOverhead}}${hashPlaceholderRight}`, + `${hashPlaceholderLeft}[0-9a-zA-Z_$]{1,${ + maxHashSize - hashPlaceholderOverhead + }}${hashPlaceholderRight}`, 'g' ); diff --git a/test/browser/samples/supports-hashes/_expected/main-e4b393dd.js b/test/browser/samples/supports-hashes/_expected/main-70712c1f.js similarity index 100% rename from test/browser/samples/supports-hashes/_expected/main-e4b393dd.js rename to test/browser/samples/supports-hashes/_expected/main-70712c1f.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-db420a01.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-f0570656.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-db420a01.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-f0570656.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-319b4e92.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-e39bf23f.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-319b4e92.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-e39bf23f.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-2d953d94.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-d43a43b5.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-2d953d94.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-d43a43b5.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-8af9e572.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-5684b811.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-8af9e572.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-5684b811.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-5940aabc-amd.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-70ac024b-amd.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-5940aabc-amd.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-70ac024b-amd.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9cf3a232-cjs.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-780766d3-cjs.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9cf3a232-cjs.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-780766d3-cjs.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-8d825d29-es.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-080ad38c-es.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-8d825d29-es.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-080ad38c-es.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-12044e01-system.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-5d41b5c4-system.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-12044e01-system.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-5d41b5c4-system.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-f9abc9cf-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-94fe149e-amd.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-f9abc9cf-amd.js rename to test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-94fe149e-amd.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-85af4452-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-16bafa95-amd.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-85af4452-amd.js rename to test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-16bafa95-amd.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-5f74b9d5-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-2934d4fa-cjs.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-5f74b9d5-cjs.js rename to test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-2934d4fa-cjs.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-1558fcfd-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-523204ff-cjs.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-1558fcfd-cjs.js rename to test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-523204ff-cjs.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-0a8075b5-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-6f12c5b2-es.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-0a8075b5-es.js rename to test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-6f12c5b2-es.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-fb2a74f2-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-a9b323b4-es.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-fb2a74f2-es.js rename to test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-a9b323b4-es.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-9f23e20b-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-720299cf-system.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-9f23e20b-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-720299cf-system.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-e9563da5-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-c3cb1622-system.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-e9563da5-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-c3cb1622-system.js diff --git a/test/chunking-form/samples/hashing/hash-size/_config.js b/test/chunking-form/samples/hashing/hash-size/_config.js index fbbb3adc5bf..885a12e5409 100644 --- a/test/chunking-form/samples/hashing/hash-size/_config.js +++ b/test/chunking-form/samples/hashing/hash-size/_config.js @@ -12,7 +12,7 @@ module.exports = { ], output: { entryFileNames: ({ name }) => - name === 'main1' ? '[name]-[hash:6].js' : '[name]-[hash:10].js', + name === 'main1' ? '[name]-[hash:8].js' : '[name]-[hash:10].js', chunkFileNames: '[name]-[hash:14].js', assetFileNames: '[name]-[hash:18][extname]' } diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-07dd83.js b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-eb0f074f.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-07dd83.js rename to test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-eb0f074f.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-3eb7d864c1.js b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-b24fb22e7f.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-3eb7d864c1.js rename to test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-b24fb22e7f.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-ebd270.js b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-87405ba3.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-ebd270.js rename to test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-87405ba3.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-4c56283430.js b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-b2c59bdf14.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-4c56283430.js rename to test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-b2c59bdf14.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/main1-126f2a.js b/test/chunking-form/samples/hashing/hash-size/_expected/es/main1-bcca55a1.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/es/main1-126f2a.js rename to test/chunking-form/samples/hashing/hash-size/_expected/es/main1-bcca55a1.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/main2-064a8187cc.js b/test/chunking-form/samples/hashing/hash-size/_expected/es/main2-83d7b451fa.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/es/main2-064a8187cc.js rename to test/chunking-form/samples/hashing/hash-size/_expected/es/main2-83d7b451fa.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-415c92.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-122e0961.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/system/main1-415c92.js rename to test/chunking-form/samples/hashing/hash-size/_expected/system/main1-122e0961.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-606a1eb4a0.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-ed4d8c97a2.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/system/main2-606a1eb4a0.js rename to test/chunking-form/samples/hashing/hash-size/_expected/system/main2-ed4d8c97a2.js diff --git a/test/chunking-form/samples/hashing/random-match/_config.js b/test/chunking-form/samples/hashing/random-match/_config.js index 0d4d25ea5af..939d7935703 100644 --- a/test/chunking-form/samples/hashing/random-match/_config.js +++ b/test/chunking-form/samples/hashing/random-match/_config.js @@ -2,7 +2,7 @@ module.exports = { description: 'leaves random hash matches untransformed', options: { output: { - entryFileNames: 'entry-[hash]-\uf7f9\ue4d30001\ue3cc\uf1fe-\uf7f9\ue4d31234\ue3cc\uf1fe.js' + entryFileNames: 'entry-[hash]-!~{001}~-!~{123}~.js' } } }; diff --git "a/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-45acd559-45acd559-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" "b/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-45acd559-45acd559-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" deleted file mode 100644 index 02f8a5233cc..00000000000 --- "a/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-45acd559-45acd559-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" +++ /dev/null @@ -1,6 +0,0 @@ -define((function () { 'use strict'; - - console.log('replaced: 45acd559'); - console.log('not replaced: 1234'); - -})); diff --git a/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-a38385ce-a38385ce-!~{123}~.js b/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-a38385ce-a38385ce-!~{123}~.js new file mode 100644 index 00000000000..dea40a5e37e --- /dev/null +++ b/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-a38385ce-a38385ce-!~{123}~.js @@ -0,0 +1,6 @@ +define((function () { 'use strict'; + + console.log('replaced: a38385ce'); + console.log('not replaced: !~{123}~'); + +})); diff --git a/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55937672-55937672-!~{123}~.js b/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55937672-55937672-!~{123}~.js new file mode 100644 index 00000000000..7040251a7df --- /dev/null +++ b/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55937672-55937672-!~{123}~.js @@ -0,0 +1,4 @@ +'use strict'; + +console.log('replaced: 55937672'); +console.log('not replaced: !~{123}~'); diff --git "a/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55c0e99e-55c0e99e-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" "b/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55c0e99e-55c0e99e-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" deleted file mode 100644 index 1a49ad3d57e..00000000000 --- "a/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55c0e99e-55c0e99e-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" +++ /dev/null @@ -1,4 +0,0 @@ -'use strict'; - -console.log('replaced: 55c0e99e'); -console.log('not replaced: 1234'); diff --git a/test/chunking-form/samples/hashing/random-match/_expected/es/entry-3e8c77bc-3e8c77bc-!~{123}~.js b/test/chunking-form/samples/hashing/random-match/_expected/es/entry-3e8c77bc-3e8c77bc-!~{123}~.js new file mode 100644 index 00000000000..23eae93eadc --- /dev/null +++ b/test/chunking-form/samples/hashing/random-match/_expected/es/entry-3e8c77bc-3e8c77bc-!~{123}~.js @@ -0,0 +1,2 @@ +console.log('replaced: 3e8c77bc'); +console.log('not replaced: !~{123}~'); diff --git "a/test/chunking-form/samples/hashing/random-match/_expected/es/entry-866d3e85-866d3e85-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" "b/test/chunking-form/samples/hashing/random-match/_expected/es/entry-866d3e85-866d3e85-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" deleted file mode 100644 index ceee8366c1a..00000000000 --- "a/test/chunking-form/samples/hashing/random-match/_expected/es/entry-866d3e85-866d3e85-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" +++ /dev/null @@ -1,2 +0,0 @@ -console.log('replaced: 866d3e85'); -console.log('not replaced: 1234'); diff --git "a/test/chunking-form/samples/hashing/random-match/_expected/system/entry-74248106-74248106-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" b/test/chunking-form/samples/hashing/random-match/_expected/system/entry-49c9800c-49c9800c-!~{123}~.js similarity index 53% rename from "test/chunking-form/samples/hashing/random-match/_expected/system/entry-74248106-74248106-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" rename to test/chunking-form/samples/hashing/random-match/_expected/system/entry-49c9800c-49c9800c-!~{123}~.js index 447bcd2b513..8fc7815674e 100644 --- "a/test/chunking-form/samples/hashing/random-match/_expected/system/entry-74248106-74248106-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" +++ b/test/chunking-form/samples/hashing/random-match/_expected/system/entry-49c9800c-49c9800c-!~{123}~.js @@ -3,8 +3,8 @@ System.register([], (function () { return { execute: (function () { - console.log('replaced: 74248106'); - console.log('not replaced: 1234'); + console.log('replaced: 49c9800c'); + console.log('not replaced: !~{123}~'); }) }; diff --git a/test/chunking-form/samples/hashing/random-match/main.js b/test/chunking-form/samples/hashing/random-match/main.js index f1cafc1f36a..21de10d404e 100644 --- a/test/chunking-form/samples/hashing/random-match/main.js +++ b/test/chunking-form/samples/hashing/random-match/main.js @@ -1,2 +1,2 @@ -console.log('replaced: 0001'); -console.log('not replaced: 1234'); +console.log('replaced: !~{001}~'); +console.log('not replaced: !~{123}~'); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-c6b04a3d.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-addffa50.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-c6b04a3d.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-addffa50.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-7c9c9af9.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-cb43c6df.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-7c9c9af9.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-cb43c6df.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-a7c9a9b3.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-f8350081.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-a7c9a9b3.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-f8350081.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-c34198fc.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-d08bfef5.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-c34198fc.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-d08bfef5.js diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-7efb1bed.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-30156411.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-7efb1bed.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-30156411.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-f7b1940b.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-23637a85.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-f7b1940b.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-23637a85.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-fd922f49.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-956265de.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-fd922f49.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-956265de.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-a8e7f87b.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-36e9b93b.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-a8e7f87b.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-36e9b93b.mjs diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-16af9d90.js b/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-4c3da82f.js similarity index 100% rename from test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-16af9d90.js rename to test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-4c3da82f.js diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-a19dc55f.js b/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-a3a04675.js similarity index 100% rename from test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-a19dc55f.js rename to test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-a3a04675.js diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-5a17c9e2.js b/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-7827261c.js similarity index 100% rename from test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-5a17c9e2.js rename to test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-7827261c.js diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-d4227ff0.js b/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-f1bbcc21.js similarity index 100% rename from test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-d4227ff0.js rename to test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-f1bbcc21.js diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-5e5c0a2b.js b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-88c5c49b.js similarity index 87% rename from test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-5e5c0a2b.js rename to test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-88c5c49b.js index f97c4e7a250..df6077cdab8 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-5e5c0a2b.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-88c5c49b.js @@ -20,7 +20,7 @@ console.log({ "name": "dep2", "type": "chunk", "dynamicImports": [], - "fileName": "chunk-dep2-5e5c0a2b.js", + "fileName": "chunk-dep2-88c5c49b.js", "implicitlyLoadedBefore": [], "importedBindings": {}, "imports": [], @@ -39,5 +39,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-92387c07.js","chunk-dep2-5e5c0a2b.js","entry-main2-8423cd41.js"]) +console.log('all chunks', ["entry-main1-87907a68.js","chunk-dep2-88c5c49b.js","entry-main2-71e00327.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-92387c07.js b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-87907a68.js similarity index 83% rename from test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-92387c07.js rename to test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-87907a68.js index c6bd70f656b..a8ef7fad868 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-92387c07.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-87907a68.js @@ -1,4 +1,4 @@ -define(['require', './chunk-dep2-5e5c0a2b'], (function (require, dep2) { 'use strict'; +define(['require', './chunk-dep2-88c5c49b'], (function (require, dep2) { 'use strict'; var num = 1; console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href); @@ -20,15 +20,15 @@ console.log({ "name": "main1", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main1-92387c07.js", + "fileName": "entry-main1-87907a68.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-5e5c0a2b.js": [ + "chunk-dep2-88c5c49b.js": [ "num" ] }, "imports": [ - "chunk-dep2-5e5c0a2b.js" + "chunk-dep2-88c5c49b.js" ], "modules": { "**/dep1.js": { @@ -52,5 +52,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-92387c07.js","chunk-dep2-5e5c0a2b.js","entry-main2-8423cd41.js"]) +console.log('all chunks', ["entry-main1-87907a68.js","chunk-dep2-88c5c49b.js","entry-main2-71e00327.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-8423cd41.js b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-71e00327.js similarity index 83% rename from test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-8423cd41.js rename to test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-71e00327.js index 578b4551443..33f959ffeca 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-8423cd41.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-71e00327.js @@ -1,4 +1,4 @@ -define(['require', './chunk-dep2-5e5c0a2b'], (function (require, dep2) { 'use strict'; +define(['require', './chunk-dep2-88c5c49b'], (function (require, dep2) { 'use strict'; var num = 3; console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href); @@ -20,15 +20,15 @@ console.log({ "name": "main2", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main2-8423cd41.js", + "fileName": "entry-main2-71e00327.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-5e5c0a2b.js": [ + "chunk-dep2-88c5c49b.js": [ "num" ] }, "imports": [ - "chunk-dep2-5e5c0a2b.js" + "chunk-dep2-88c5c49b.js" ], "modules": { "**/dep3.js": { @@ -52,5 +52,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-92387c07.js","chunk-dep2-5e5c0a2b.js","entry-main2-8423cd41.js"]) +console.log('all chunks', ["entry-main1-87907a68.js","chunk-dep2-88c5c49b.js","entry-main2-71e00327.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-b09f6eac.js b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-970ee28f.js similarity index 89% rename from test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-b09f6eac.js rename to test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-970ee28f.js index 6b0cc7cac14..886925ecbef 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-b09f6eac.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-970ee28f.js @@ -18,7 +18,7 @@ console.log({ "name": "dep2", "type": "chunk", "dynamicImports": [], - "fileName": "chunk-dep2-b09f6eac.js", + "fileName": "chunk-dep2-970ee28f.js", "implicitlyLoadedBefore": [], "importedBindings": {}, "imports": [], @@ -37,5 +37,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-465ee0c3.js","chunk-dep2-b09f6eac.js","entry-main2-333fdc53.js"]) +console.log('all chunks', ["entry-main1-6d518561.js","chunk-dep2-970ee28f.js","entry-main2-a4b8e424.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-465ee0c3.js b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-6d518561.js similarity index 88% rename from test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-465ee0c3.js rename to test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-6d518561.js index e6b7bdc31a7..65b10a44e02 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-465ee0c3.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-6d518561.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./chunk-dep2-b09f6eac.js'); +var dep2 = require('./chunk-dep2-970ee28f.js'); var num = 1; console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href)); @@ -20,15 +20,15 @@ console.log({ "name": "main1", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main1-465ee0c3.js", + "fileName": "entry-main1-6d518561.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-b09f6eac.js": [ + "chunk-dep2-970ee28f.js": [ "num" ] }, "imports": [ - "chunk-dep2-b09f6eac.js" + "chunk-dep2-970ee28f.js" ], "modules": { "**/dep1.js": { @@ -52,5 +52,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-465ee0c3.js","chunk-dep2-b09f6eac.js","entry-main2-333fdc53.js"]) +console.log('all chunks', ["entry-main1-6d518561.js","chunk-dep2-970ee28f.js","entry-main2-a4b8e424.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-333fdc53.js b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-a4b8e424.js similarity index 88% rename from test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-333fdc53.js rename to test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-a4b8e424.js index bc352138c16..4a2059addab 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-333fdc53.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-a4b8e424.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./chunk-dep2-b09f6eac.js'); +var dep2 = require('./chunk-dep2-970ee28f.js'); var num = 3; console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href)); @@ -20,15 +20,15 @@ console.log({ "name": "main2", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main2-333fdc53.js", + "fileName": "entry-main2-a4b8e424.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-b09f6eac.js": [ + "chunk-dep2-970ee28f.js": [ "num" ] }, "imports": [ - "chunk-dep2-b09f6eac.js" + "chunk-dep2-970ee28f.js" ], "modules": { "**/dep3.js": { @@ -52,5 +52,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-465ee0c3.js","chunk-dep2-b09f6eac.js","entry-main2-333fdc53.js"]) +console.log('all chunks', ["entry-main1-6d518561.js","chunk-dep2-970ee28f.js","entry-main2-a4b8e424.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-124edba5.js b/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-f4e7f39c.js similarity index 85% rename from test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-124edba5.js rename to test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-f4e7f39c.js index fa3b4d492e1..652d84443be 100644 --- a/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-124edba5.js +++ b/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-f4e7f39c.js @@ -16,7 +16,7 @@ console.log({ "name": "dep2", "type": "chunk", "dynamicImports": [], - "fileName": "chunk-dep2-124edba5.js", + "fileName": "chunk-dep2-f4e7f39c.js", "implicitlyLoadedBefore": [], "importedBindings": {}, "imports": [], @@ -35,5 +35,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-b12147aa.js","chunk-dep2-124edba5.js","entry-main2-09746024.js"]) +console.log('all chunks', ["entry-main1-bb9f9ac2.js","chunk-dep2-f4e7f39c.js","entry-main2-2ba44c5c.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-b12147aa.js b/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-bb9f9ac2.js similarity index 82% rename from test/chunking-form/samples/render-chunk/_expected/es/entry-main1-b12147aa.js rename to test/chunking-form/samples/render-chunk/_expected/es/entry-main1-bb9f9ac2.js index 7408471db99..a3b29723c87 100644 --- a/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-b12147aa.js +++ b/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-bb9f9ac2.js @@ -1,4 +1,4 @@ -import { n as num$1 } from './chunk-dep2-124edba5.js'; +import { n as num$1 } from './chunk-dep2-f4e7f39c.js'; var num = 1; console.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href); @@ -18,15 +18,15 @@ console.log({ "name": "main1", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main1-b12147aa.js", + "fileName": "entry-main1-bb9f9ac2.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-124edba5.js": [ + "chunk-dep2-f4e7f39c.js": [ "n" ] }, "imports": [ - "chunk-dep2-124edba5.js" + "chunk-dep2-f4e7f39c.js" ], "modules": { "**/dep1.js": { @@ -50,5 +50,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-b12147aa.js","chunk-dep2-124edba5.js","entry-main2-09746024.js"]) +console.log('all chunks', ["entry-main1-bb9f9ac2.js","chunk-dep2-f4e7f39c.js","entry-main2-2ba44c5c.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-09746024.js b/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-2ba44c5c.js similarity index 82% rename from test/chunking-form/samples/render-chunk/_expected/es/entry-main2-09746024.js rename to test/chunking-form/samples/render-chunk/_expected/es/entry-main2-2ba44c5c.js index 4e3198988da..236c4a13e69 100644 --- a/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-09746024.js +++ b/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-2ba44c5c.js @@ -1,4 +1,4 @@ -import { n as num$1 } from './chunk-dep2-124edba5.js'; +import { n as num$1 } from './chunk-dep2-f4e7f39c.js'; var num = 3; console.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href); @@ -18,15 +18,15 @@ console.log({ "name": "main2", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main2-09746024.js", + "fileName": "entry-main2-2ba44c5c.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-124edba5.js": [ + "chunk-dep2-f4e7f39c.js": [ "n" ] }, "imports": [ - "chunk-dep2-124edba5.js" + "chunk-dep2-f4e7f39c.js" ], "modules": { "**/dep3.js": { @@ -50,5 +50,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-b12147aa.js","chunk-dep2-124edba5.js","entry-main2-09746024.js"]) +console.log('all chunks', ["entry-main1-bb9f9ac2.js","chunk-dep2-f4e7f39c.js","entry-main2-2ba44c5c.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-6579036d.js b/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-ea1348fd.js similarity index 87% rename from test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-6579036d.js rename to test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-ea1348fd.js index 8c87c7a8501..1b1d50b11ab 100644 --- a/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-6579036d.js +++ b/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-ea1348fd.js @@ -23,7 +23,7 @@ console.log({ "name": "dep2", "type": "chunk", "dynamicImports": [], - "fileName": "chunk-dep2-6579036d.js", + "fileName": "chunk-dep2-ea1348fd.js", "implicitlyLoadedBefore": [], "importedBindings": {}, "imports": [], @@ -42,5 +42,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-331def45.js","chunk-dep2-6579036d.js","entry-main2-7bacea36.js"]) +console.log('all chunks', ["entry-main1-118e1de4.js","chunk-dep2-ea1348fd.js","entry-main2-34191286.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-331def45.js b/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-118e1de4.js similarity index 84% rename from test/chunking-form/samples/render-chunk/_expected/system/entry-main1-331def45.js rename to test/chunking-form/samples/render-chunk/_expected/system/entry-main1-118e1de4.js index ac113775c07..b9f812cb33b 100644 --- a/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-331def45.js +++ b/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-118e1de4.js @@ -1,4 +1,4 @@ -System.register(['./chunk-dep2-6579036d.js'], (function (exports, module) { +System.register(['./chunk-dep2-ea1348fd.js'], (function (exports, module) { 'use strict'; var num$1; return { @@ -29,15 +29,15 @@ console.log({ "name": "main1", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main1-331def45.js", + "fileName": "entry-main1-118e1de4.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-6579036d.js": [ + "chunk-dep2-ea1348fd.js": [ "n" ] }, "imports": [ - "chunk-dep2-6579036d.js" + "chunk-dep2-ea1348fd.js" ], "modules": { "**/dep1.js": { @@ -61,5 +61,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-331def45.js","chunk-dep2-6579036d.js","entry-main2-7bacea36.js"]) +console.log('all chunks', ["entry-main1-118e1de4.js","chunk-dep2-ea1348fd.js","entry-main2-34191286.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-7bacea36.js b/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-34191286.js similarity index 84% rename from test/chunking-form/samples/render-chunk/_expected/system/entry-main2-7bacea36.js rename to test/chunking-form/samples/render-chunk/_expected/system/entry-main2-34191286.js index 9e0d0ca1dff..35fa3d4cfe2 100644 --- a/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-7bacea36.js +++ b/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-34191286.js @@ -1,4 +1,4 @@ -System.register(['./chunk-dep2-6579036d.js'], (function (exports, module) { +System.register(['./chunk-dep2-ea1348fd.js'], (function (exports, module) { 'use strict'; var num$1; return { @@ -29,15 +29,15 @@ console.log({ "name": "main2", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main2-7bacea36.js", + "fileName": "entry-main2-34191286.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-6579036d.js": [ + "chunk-dep2-ea1348fd.js": [ "n" ] }, "imports": [ - "chunk-dep2-6579036d.js" + "chunk-dep2-ea1348fd.js" ], "modules": { "**/dep3.js": { @@ -61,5 +61,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-331def45.js","chunk-dep2-6579036d.js","entry-main2-7bacea36.js"]) +console.log('all chunks', ["entry-main1-118e1de4.js","chunk-dep2-ea1348fd.js","entry-main2-34191286.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/function/samples/hashing/minimum-hash-size/_config.js b/test/function/samples/hashing/minimum-hash-size/_config.js index 3058b420ce9..9ef9dfcf253 100644 --- a/test/function/samples/hashing/minimum-hash-size/_config.js +++ b/test/function/samples/hashing/minimum-hash-size/_config.js @@ -4,6 +4,6 @@ module.exports = { generateError: { code: 'VALIDATION_ERROR', message: - 'To generate hashes for this number of chunks (currently 1), you need a minimum hash size of 5, received 3. Check the "output.chunkFileNames" option.' + 'To generate hashes for this number of chunks (currently 1), you need a minimum hash size of 6, received 3. Check the "output.chunkFileNames" option.' } }; diff --git a/test/misc/bundle-information.js b/test/misc/bundle-information.js index b329ef62a3f..75f5cbca2ce 100644 --- a/test/misc/bundle-information.js +++ b/test/misc/bundle-information.js @@ -28,7 +28,7 @@ describe('The bundle object', () => { .then(({ output }) => { assert.deepEqual( output.map(chunk => chunk.fileName), - ['input1-7af41723.js', 'input2-95f92690.js', 'generated-shared-4eca6591.js'], + ['input1-fffbf648.js', 'input2-ee435193.js', 'generated-shared-4eca6591.js'], 'fileName' ); assert.deepEqual( diff --git a/test/misc/misc.js b/test/misc/misc.js index 8cc269e1c9f..368974e6ace 100644 --- a/test/misc/misc.js +++ b/test/misc/misc.js @@ -111,7 +111,7 @@ describe('misc', () => { assert.equal(warnings.length, 0); assert.deepEqual( output.map(({ fileName }) => fileName), - ['main1.js', 'main2.js', 'dep-00b63b6d.js', 'dyndep-d5d54b59.js'] + ['main1.js', 'main2.js', 'dep-9394ae8f.js', 'dyndep-d5d54b59.js'] ); }); });