From ac5003397203678b46a744f96c15074769f26d6d Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 15 Feb 2019 14:07:41 +0100 Subject: [PATCH] Add tests for other hashing situations and fix addon hashing --- src/Chunk.ts | 4 +++- src/utils/addons.ts | 5 +---- ...1113-amd.js => chunk-main2-c2e7408c-amd.js} | 0 .../_expected/amd/entry-main1-843c034d-amd.js | 5 +++++ .../_expected/amd/entry-main1-a0f4fde5-amd.js | 5 ----- .../_expected/amd/entry-main2-237cd19a-amd.js | 7 +++++++ .../_expected/amd/entry-main2-5396b748-amd.js | 7 ------- ...b27d-cjs.js => chunk-main2-ae5ee0ea-cjs.js} | 0 .../_expected/cjs/entry-main1-3cd10506-cjs.js | 5 ----- .../_expected/cjs/entry-main1-8470b59b-cjs.js | 5 +++++ .../_expected/cjs/entry-main2-adea0dbb-cjs.js | 7 +++++++ .../_expected/cjs/entry-main2-fd8c1a13-cjs.js | 7 ------- ...9135-esm.js => chunk-main2-f2de568c-esm.js} | 0 .../_expected/es/entry-main1-5a1ab158-esm.js | 3 --- .../_expected/es/entry-main1-a05c10d4-esm.js | 3 +++ .../_expected/es/entry-main2-2206abfa-esm.js | 1 + .../_expected/es/entry-main2-2f78d4f8-esm.js | 1 - ...ystem.js => chunk-main2-878d81e1-system.js} | 0 ...ystem.js => entry-main1-ea6917a8-system.js} | 2 +- ...ystem.js => entry-main2-f2a7f0d8-system.js} | 2 +- .../_expected/amd/{00e68f7b.js => cf76c9a8.js} | 0 .../_expected/cjs/{0d12e680.js => eaec11b1.js} | 0 .../_expected/es/{1249effd.js => 413045cf.js} | 0 .../system/{5845a025.js => 21fc5b1e.js} | 0 .../_config.js | 6 +++--- .../code-splitting-named-inputs/_config.js | 6 +++--- test/file-hashes/index.js | 18 ++++++++++-------- test/file-hashes/samples/banner/_config.js | 16 ++++++++++++++++ .../_expected/amd/generated-chunk.js | 0 .../_expected/amd/generated-chunk2.js | 0 .../_expected/amd/main1.js | 0 .../_expected/amd/main2.js | 0 .../_expected/amd/main3.js | 0 .../_expected/cjs/generated-chunk.js | 0 .../_expected/cjs/generated-chunk2.js | 0 .../_expected/cjs/main1.js | 0 .../_expected/cjs/main2.js | 0 .../_expected/cjs/main3.js | 0 .../_expected/es/generated-chunk.js | 0 .../_expected/es/generated-chunk2.js | 0 .../_expected/es/main1.js | 0 .../_expected/es/main2.js | 0 .../_expected/es/main3.js | 0 .../_expected/system/generated-chunk.js | 0 .../_expected/system/generated-chunk2.js | 0 .../_expected/system/main1.js | 0 .../_expected/system/main2.js | 0 .../_expected/system/main3.js | 0 test/file-hashes/samples/banner/main.js | 1 + test/file-hashes/samples/content/_config.js | 11 +++++++++++ .../content/_expected/amd/generated-chunk.js | 5 +++++ .../content/_expected/amd/generated-chunk2.js | 5 +++++ .../samples/content/_expected/amd/main1.js | 7 +++++++ .../samples/content/_expected/amd/main2.js | 5 +++++ .../samples/content/_expected/amd/main3.js | 5 +++++ .../content/_expected/cjs/generated-chunk.js | 3 +++ .../content/_expected/cjs/generated-chunk2.js | 3 +++ .../samples/content/_expected/cjs/main1.js | 5 +++++ .../samples/content/_expected/cjs/main2.js | 3 +++ .../samples/content/_expected/cjs/main3.js | 3 +++ .../content/_expected/es/generated-chunk.js | 1 + .../content/_expected/es/generated-chunk2.js | 1 + .../samples/content/_expected/es/main1.js | 3 +++ .../samples/content/_expected/es/main2.js | 1 + .../samples/content/_expected/es/main3.js | 1 + .../_expected/system/generated-chunk.js | 10 ++++++++++ .../_expected/system/generated-chunk2.js | 10 ++++++++++ .../samples/content/_expected/system/main1.js | 12 ++++++++++++ .../samples/content/_expected/system/main2.js | 10 ++++++++++ .../samples/content/_expected/system/main3.js | 10 ++++++++++ test/file-hashes/samples/content/dep1.js | 1 + test/file-hashes/samples/content/dep2.js | 1 + test/file-hashes/samples/content/main1.js | 3 +++ test/file-hashes/samples/content/main2.js | 3 +++ .../samples/dependency-content/_config.js | 10 ++++++++++ .../_expected/amd/generated-chunk.js | 5 +++++ .../_expected/amd/generated-chunk2.js | 5 +++++ .../dependency-content/_expected/amd/main1.js | 7 +++++++ .../dependency-content/_expected/amd/main2.js | 5 +++++ .../dependency-content/_expected/amd/main3.js | 5 +++++ .../_expected/cjs/generated-chunk.js | 3 +++ .../_expected/cjs/generated-chunk2.js | 3 +++ .../dependency-content/_expected/cjs/main1.js | 5 +++++ .../dependency-content/_expected/cjs/main2.js | 3 +++ .../dependency-content/_expected/cjs/main3.js | 3 +++ .../_expected/es/generated-chunk.js | 1 + .../_expected/es/generated-chunk2.js | 1 + .../dependency-content/_expected/es/main1.js | 3 +++ .../dependency-content/_expected/es/main2.js | 1 + .../dependency-content/_expected/es/main3.js | 1 + .../_expected/system/generated-chunk.js | 10 ++++++++++ .../_expected/system/generated-chunk2.js | 10 ++++++++++ .../_expected/system/main1.js | 12 ++++++++++++ .../_expected/system/main2.js | 10 ++++++++++ .../_expected/system/main3.js | 10 ++++++++++ .../samples/dependency-content/dep1.js | 1 + .../samples/dependency-content/dep2.js | 1 + .../samples/dependency-content/main1.js | 3 +++ .../samples/dependency-content/main2.js | 3 +++ test/file-hashes/samples/exports/_config.js | 10 ++++++++++ .../exports/_expected/amd/generated-chunk.js | 5 +++++ .../exports/_expected/amd/generated-chunk2.js | 5 +++++ .../samples/exports/_expected/amd/main1.js | 7 +++++++ .../samples/exports/_expected/amd/main2.js | 5 +++++ .../samples/exports/_expected/amd/main3.js | 5 +++++ .../exports/_expected/cjs/generated-chunk.js | 3 +++ .../exports/_expected/cjs/generated-chunk2.js | 3 +++ .../samples/exports/_expected/cjs/main1.js | 5 +++++ .../samples/exports/_expected/cjs/main2.js | 3 +++ .../samples/exports/_expected/cjs/main3.js | 3 +++ .../exports/_expected/es/generated-chunk.js | 1 + .../exports/_expected/es/generated-chunk2.js | 1 + .../samples/exports/_expected/es/main1.js | 3 +++ .../samples/exports/_expected/es/main2.js | 1 + .../samples/exports/_expected/es/main3.js | 1 + .../_expected/system/generated-chunk.js | 10 ++++++++++ .../_expected/system/generated-chunk2.js | 10 ++++++++++ .../samples/exports/_expected/system/main1.js | 12 ++++++++++++ .../samples/exports/_expected/system/main2.js | 10 ++++++++++ .../samples/exports/_expected/system/main3.js | 10 ++++++++++ .../{respects-exports => exports}/dep.js | 0 .../{respects-exports => exports}/main1.js | 0 .../{respects-exports => exports}/main2.js | 0 .../{respects-exports => exports}/other.js | 0 .../external-dependency-names/_config.js | 13 +++++++++++++ .../_expected/amd/generated-chunk.js | 5 +++++ .../_expected/amd/generated-chunk2.js | 5 +++++ .../_expected/amd/main1.js | 7 +++++++ .../_expected/amd/main2.js | 5 +++++ .../_expected/amd/main3.js | 5 +++++ .../_expected/cjs/generated-chunk.js | 3 +++ .../_expected/cjs/generated-chunk2.js | 3 +++ .../_expected/cjs/main1.js | 5 +++++ .../_expected/cjs/main2.js | 3 +++ .../_expected/cjs/main3.js | 3 +++ .../_expected/es/generated-chunk.js | 1 + .../_expected/es/generated-chunk2.js | 1 + .../_expected/es/main1.js | 3 +++ .../_expected/es/main2.js | 1 + .../_expected/es/main3.js | 1 + .../_expected/system/generated-chunk.js | 10 ++++++++++ .../_expected/system/generated-chunk2.js | 10 ++++++++++ .../_expected/system/main1.js | 12 ++++++++++++ .../_expected/system/main2.js | 10 ++++++++++ .../_expected/system/main3.js | 10 ++++++++++ .../external-dependency-names/main1a.js | 3 +++ .../external-dependency-names/main1b.js | 3 +++ .../external-dependency-names/main2a.js | 3 +++ .../external-dependency-names/main2b.js | 3 +++ test/file-hashes/samples/footer/_config.js | 16 ++++++++++++++++ .../footer/_expected/amd/generated-chunk.js | 5 +++++ .../footer/_expected/amd/generated-chunk2.js | 5 +++++ .../samples/footer/_expected/amd/main1.js | 7 +++++++ .../samples/footer/_expected/amd/main2.js | 5 +++++ .../samples/footer/_expected/amd/main3.js | 5 +++++ .../footer/_expected/cjs/generated-chunk.js | 3 +++ .../footer/_expected/cjs/generated-chunk2.js | 3 +++ .../samples/footer/_expected/cjs/main1.js | 5 +++++ .../samples/footer/_expected/cjs/main2.js | 3 +++ .../samples/footer/_expected/cjs/main3.js | 3 +++ .../footer/_expected/es/generated-chunk.js | 1 + .../footer/_expected/es/generated-chunk2.js | 1 + .../samples/footer/_expected/es/main1.js | 3 +++ .../samples/footer/_expected/es/main2.js | 1 + .../samples/footer/_expected/es/main3.js | 1 + .../footer/_expected/system/generated-chunk.js | 10 ++++++++++ .../_expected/system/generated-chunk2.js | 10 ++++++++++ .../samples/footer/_expected/system/main1.js | 12 ++++++++++++ .../samples/footer/_expected/system/main2.js | 10 ++++++++++ .../samples/footer/_expected/system/main3.js | 10 ++++++++++ test/file-hashes/samples/footer/main.js | 1 + test/file-hashes/samples/format/_config.js | 16 ++++++++++++++++ .../format/_expected/amd/generated-chunk.js | 5 +++++ .../format/_expected/amd/generated-chunk2.js | 5 +++++ .../samples/format/_expected/amd/main1.js | 7 +++++++ .../samples/format/_expected/amd/main2.js | 5 +++++ .../samples/format/_expected/amd/main3.js | 5 +++++ .../format/_expected/cjs/generated-chunk.js | 3 +++ .../format/_expected/cjs/generated-chunk2.js | 3 +++ .../samples/format/_expected/cjs/main1.js | 5 +++++ .../samples/format/_expected/cjs/main2.js | 3 +++ .../samples/format/_expected/cjs/main3.js | 3 +++ .../format/_expected/es/generated-chunk.js | 1 + .../format/_expected/es/generated-chunk2.js | 1 + .../samples/format/_expected/es/main1.js | 3 +++ .../samples/format/_expected/es/main2.js | 1 + .../samples/format/_expected/es/main3.js | 1 + .../format/_expected/system/generated-chunk.js | 10 ++++++++++ .../_expected/system/generated-chunk2.js | 10 ++++++++++ .../samples/format/_expected/system/main1.js | 12 ++++++++++++ .../samples/format/_expected/system/main2.js | 10 ++++++++++ .../samples/format/_expected/system/main3.js | 10 ++++++++++ test/file-hashes/samples/format/main.js | 1 + test/file-hashes/samples/intro/_config.js | 16 ++++++++++++++++ .../intro/_expected/amd/generated-chunk.js | 5 +++++ .../intro/_expected/amd/generated-chunk2.js | 5 +++++ .../samples/intro/_expected/amd/main1.js | 7 +++++++ .../samples/intro/_expected/amd/main2.js | 5 +++++ .../samples/intro/_expected/amd/main3.js | 5 +++++ .../intro/_expected/cjs/generated-chunk.js | 3 +++ .../intro/_expected/cjs/generated-chunk2.js | 3 +++ .../samples/intro/_expected/cjs/main1.js | 5 +++++ .../samples/intro/_expected/cjs/main2.js | 3 +++ .../samples/intro/_expected/cjs/main3.js | 3 +++ .../intro/_expected/es/generated-chunk.js | 1 + .../intro/_expected/es/generated-chunk2.js | 1 + .../samples/intro/_expected/es/main1.js | 3 +++ .../samples/intro/_expected/es/main2.js | 1 + .../samples/intro/_expected/es/main3.js | 1 + .../intro/_expected/system/generated-chunk.js | 10 ++++++++++ .../intro/_expected/system/generated-chunk2.js | 10 ++++++++++ .../samples/intro/_expected/system/main1.js | 12 ++++++++++++ .../samples/intro/_expected/system/main2.js | 10 ++++++++++ .../samples/intro/_expected/system/main3.js | 10 ++++++++++ test/file-hashes/samples/intro/main.js | 1 + test/file-hashes/samples/outro/_config.js | 16 ++++++++++++++++ .../outro/_expected/amd/generated-chunk.js | 5 +++++ .../outro/_expected/amd/generated-chunk2.js | 5 +++++ .../samples/outro/_expected/amd/main1.js | 7 +++++++ .../samples/outro/_expected/amd/main2.js | 5 +++++ .../samples/outro/_expected/amd/main3.js | 5 +++++ .../outro/_expected/cjs/generated-chunk.js | 3 +++ .../outro/_expected/cjs/generated-chunk2.js | 3 +++ .../samples/outro/_expected/cjs/main1.js | 5 +++++ .../samples/outro/_expected/cjs/main2.js | 3 +++ .../samples/outro/_expected/cjs/main3.js | 3 +++ .../outro/_expected/es/generated-chunk.js | 1 + .../outro/_expected/es/generated-chunk2.js | 1 + .../samples/outro/_expected/es/main1.js | 3 +++ .../samples/outro/_expected/es/main2.js | 1 + .../samples/outro/_expected/es/main3.js | 1 + .../outro/_expected/system/generated-chunk.js | 10 ++++++++++ .../outro/_expected/system/generated-chunk2.js | 10 ++++++++++ .../samples/outro/_expected/system/main1.js | 12 ++++++++++++ .../samples/outro/_expected/system/main2.js | 10 ++++++++++ .../samples/outro/_expected/system/main3.js | 10 ++++++++++ test/file-hashes/samples/outro/main.js | 1 + .../samples/respects-exports/_config.js | 10 ---------- test/misc/bundle-information.js | 8 ++++---- test/misc/misc.js | 4 ++-- 240 files changed, 1037 insertions(+), 65 deletions(-) rename test/chunking-form/samples/filenames-patterns/_expected/amd/{chunk-main2-dda51113-amd.js => chunk-main2-c2e7408c-amd.js} (100%) create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-843c034d-amd.js delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-a0f4fde5-amd.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-237cd19a-amd.js delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-5396b748-amd.js rename test/chunking-form/samples/filenames-patterns/_expected/cjs/{chunk-main2-9301b27d-cjs.js => chunk-main2-ae5ee0ea-cjs.js} (100%) delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-3cd10506-cjs.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-8470b59b-cjs.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-adea0dbb-cjs.js delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-fd8c1a13-cjs.js rename test/chunking-form/samples/filenames-patterns/_expected/es/{chunk-main2-bee79135-esm.js => chunk-main2-f2de568c-esm.js} (100%) delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-5a1ab158-esm.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-a05c10d4-esm.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-2206abfa-esm.js delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-2f78d4f8-esm.js rename test/chunking-form/samples/filenames-patterns/_expected/system/{chunk-main2-441b49d2-system.js => chunk-main2-878d81e1-system.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/system/{entry-main1-2422e801-system.js => entry-main1-ea6917a8-system.js} (74%) rename test/chunking-form/samples/filenames-patterns/_expected/system/{entry-main2-2ad41703-system.js => entry-main2-f2a7f0d8-system.js} (70%) rename test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/amd/{00e68f7b.js => cf76c9a8.js} (100%) rename test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/cjs/{0d12e680.js => eaec11b1.js} (100%) rename test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/es/{1249effd.js => 413045cf.js} (100%) rename test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/system/{5845a025.js => 21fc5b1e.js} (100%) create mode 100644 test/file-hashes/samples/banner/_config.js rename test/file-hashes/samples/{respects-exports => banner}/_expected/amd/generated-chunk.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/amd/generated-chunk2.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/amd/main1.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/amd/main2.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/amd/main3.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/cjs/generated-chunk.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/cjs/generated-chunk2.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/cjs/main1.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/cjs/main2.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/cjs/main3.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/es/generated-chunk.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/es/generated-chunk2.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/es/main1.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/es/main2.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/es/main3.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/system/generated-chunk.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/system/generated-chunk2.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/system/main1.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/system/main2.js (100%) rename test/file-hashes/samples/{respects-exports => banner}/_expected/system/main3.js (100%) create mode 100644 test/file-hashes/samples/banner/main.js create mode 100644 test/file-hashes/samples/content/_config.js create mode 100644 test/file-hashes/samples/content/_expected/amd/generated-chunk.js create mode 100644 test/file-hashes/samples/content/_expected/amd/generated-chunk2.js create mode 100644 test/file-hashes/samples/content/_expected/amd/main1.js create mode 100644 test/file-hashes/samples/content/_expected/amd/main2.js create mode 100644 test/file-hashes/samples/content/_expected/amd/main3.js create mode 100644 test/file-hashes/samples/content/_expected/cjs/generated-chunk.js create mode 100644 test/file-hashes/samples/content/_expected/cjs/generated-chunk2.js create mode 100644 test/file-hashes/samples/content/_expected/cjs/main1.js create mode 100644 test/file-hashes/samples/content/_expected/cjs/main2.js create mode 100644 test/file-hashes/samples/content/_expected/cjs/main3.js create mode 100644 test/file-hashes/samples/content/_expected/es/generated-chunk.js create mode 100644 test/file-hashes/samples/content/_expected/es/generated-chunk2.js create mode 100644 test/file-hashes/samples/content/_expected/es/main1.js create mode 100644 test/file-hashes/samples/content/_expected/es/main2.js create mode 100644 test/file-hashes/samples/content/_expected/es/main3.js create mode 100644 test/file-hashes/samples/content/_expected/system/generated-chunk.js create mode 100644 test/file-hashes/samples/content/_expected/system/generated-chunk2.js create mode 100644 test/file-hashes/samples/content/_expected/system/main1.js create mode 100644 test/file-hashes/samples/content/_expected/system/main2.js create mode 100644 test/file-hashes/samples/content/_expected/system/main3.js create mode 100644 test/file-hashes/samples/content/dep1.js create mode 100644 test/file-hashes/samples/content/dep2.js create mode 100644 test/file-hashes/samples/content/main1.js create mode 100644 test/file-hashes/samples/content/main2.js create mode 100644 test/file-hashes/samples/dependency-content/_config.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/amd/generated-chunk.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/amd/generated-chunk2.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/amd/main1.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/amd/main2.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/amd/main3.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/cjs/generated-chunk.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/cjs/generated-chunk2.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/cjs/main1.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/cjs/main2.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/cjs/main3.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/es/generated-chunk.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/es/generated-chunk2.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/es/main1.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/es/main2.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/es/main3.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/system/generated-chunk.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/system/generated-chunk2.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/system/main1.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/system/main2.js create mode 100644 test/file-hashes/samples/dependency-content/_expected/system/main3.js create mode 100644 test/file-hashes/samples/dependency-content/dep1.js create mode 100644 test/file-hashes/samples/dependency-content/dep2.js create mode 100644 test/file-hashes/samples/dependency-content/main1.js create mode 100644 test/file-hashes/samples/dependency-content/main2.js create mode 100644 test/file-hashes/samples/exports/_config.js create mode 100644 test/file-hashes/samples/exports/_expected/amd/generated-chunk.js create mode 100644 test/file-hashes/samples/exports/_expected/amd/generated-chunk2.js create mode 100644 test/file-hashes/samples/exports/_expected/amd/main1.js create mode 100644 test/file-hashes/samples/exports/_expected/amd/main2.js create mode 100644 test/file-hashes/samples/exports/_expected/amd/main3.js create mode 100644 test/file-hashes/samples/exports/_expected/cjs/generated-chunk.js create mode 100644 test/file-hashes/samples/exports/_expected/cjs/generated-chunk2.js create mode 100644 test/file-hashes/samples/exports/_expected/cjs/main1.js create mode 100644 test/file-hashes/samples/exports/_expected/cjs/main2.js create mode 100644 test/file-hashes/samples/exports/_expected/cjs/main3.js create mode 100644 test/file-hashes/samples/exports/_expected/es/generated-chunk.js create mode 100644 test/file-hashes/samples/exports/_expected/es/generated-chunk2.js create mode 100644 test/file-hashes/samples/exports/_expected/es/main1.js create mode 100644 test/file-hashes/samples/exports/_expected/es/main2.js create mode 100644 test/file-hashes/samples/exports/_expected/es/main3.js create mode 100644 test/file-hashes/samples/exports/_expected/system/generated-chunk.js create mode 100644 test/file-hashes/samples/exports/_expected/system/generated-chunk2.js create mode 100644 test/file-hashes/samples/exports/_expected/system/main1.js create mode 100644 test/file-hashes/samples/exports/_expected/system/main2.js create mode 100644 test/file-hashes/samples/exports/_expected/system/main3.js rename test/file-hashes/samples/{respects-exports => exports}/dep.js (100%) rename test/file-hashes/samples/{respects-exports => exports}/main1.js (100%) rename test/file-hashes/samples/{respects-exports => exports}/main2.js (100%) rename test/file-hashes/samples/{respects-exports => exports}/other.js (100%) create mode 100644 test/file-hashes/samples/external-dependency-names/_config.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/amd/generated-chunk.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/amd/generated-chunk2.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/amd/main1.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/amd/main2.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/amd/main3.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/cjs/generated-chunk.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/cjs/generated-chunk2.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/cjs/main1.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/cjs/main2.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/cjs/main3.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/es/generated-chunk.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/es/generated-chunk2.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/es/main1.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/es/main2.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/es/main3.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/system/generated-chunk.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/system/generated-chunk2.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/system/main1.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/system/main2.js create mode 100644 test/file-hashes/samples/external-dependency-names/_expected/system/main3.js create mode 100644 test/file-hashes/samples/external-dependency-names/main1a.js create mode 100644 test/file-hashes/samples/external-dependency-names/main1b.js create mode 100644 test/file-hashes/samples/external-dependency-names/main2a.js create mode 100644 test/file-hashes/samples/external-dependency-names/main2b.js create mode 100644 test/file-hashes/samples/footer/_config.js create mode 100644 test/file-hashes/samples/footer/_expected/amd/generated-chunk.js create mode 100644 test/file-hashes/samples/footer/_expected/amd/generated-chunk2.js create mode 100644 test/file-hashes/samples/footer/_expected/amd/main1.js create mode 100644 test/file-hashes/samples/footer/_expected/amd/main2.js create mode 100644 test/file-hashes/samples/footer/_expected/amd/main3.js create mode 100644 test/file-hashes/samples/footer/_expected/cjs/generated-chunk.js create mode 100644 test/file-hashes/samples/footer/_expected/cjs/generated-chunk2.js create mode 100644 test/file-hashes/samples/footer/_expected/cjs/main1.js create mode 100644 test/file-hashes/samples/footer/_expected/cjs/main2.js create mode 100644 test/file-hashes/samples/footer/_expected/cjs/main3.js create mode 100644 test/file-hashes/samples/footer/_expected/es/generated-chunk.js create mode 100644 test/file-hashes/samples/footer/_expected/es/generated-chunk2.js create mode 100644 test/file-hashes/samples/footer/_expected/es/main1.js create mode 100644 test/file-hashes/samples/footer/_expected/es/main2.js create mode 100644 test/file-hashes/samples/footer/_expected/es/main3.js create mode 100644 test/file-hashes/samples/footer/_expected/system/generated-chunk.js create mode 100644 test/file-hashes/samples/footer/_expected/system/generated-chunk2.js create mode 100644 test/file-hashes/samples/footer/_expected/system/main1.js create mode 100644 test/file-hashes/samples/footer/_expected/system/main2.js create mode 100644 test/file-hashes/samples/footer/_expected/system/main3.js create mode 100644 test/file-hashes/samples/footer/main.js create mode 100644 test/file-hashes/samples/format/_config.js create mode 100644 test/file-hashes/samples/format/_expected/amd/generated-chunk.js create mode 100644 test/file-hashes/samples/format/_expected/amd/generated-chunk2.js create mode 100644 test/file-hashes/samples/format/_expected/amd/main1.js create mode 100644 test/file-hashes/samples/format/_expected/amd/main2.js create mode 100644 test/file-hashes/samples/format/_expected/amd/main3.js create mode 100644 test/file-hashes/samples/format/_expected/cjs/generated-chunk.js create mode 100644 test/file-hashes/samples/format/_expected/cjs/generated-chunk2.js create mode 100644 test/file-hashes/samples/format/_expected/cjs/main1.js create mode 100644 test/file-hashes/samples/format/_expected/cjs/main2.js create mode 100644 test/file-hashes/samples/format/_expected/cjs/main3.js create mode 100644 test/file-hashes/samples/format/_expected/es/generated-chunk.js create mode 100644 test/file-hashes/samples/format/_expected/es/generated-chunk2.js create mode 100644 test/file-hashes/samples/format/_expected/es/main1.js create mode 100644 test/file-hashes/samples/format/_expected/es/main2.js create mode 100644 test/file-hashes/samples/format/_expected/es/main3.js create mode 100644 test/file-hashes/samples/format/_expected/system/generated-chunk.js create mode 100644 test/file-hashes/samples/format/_expected/system/generated-chunk2.js create mode 100644 test/file-hashes/samples/format/_expected/system/main1.js create mode 100644 test/file-hashes/samples/format/_expected/system/main2.js create mode 100644 test/file-hashes/samples/format/_expected/system/main3.js create mode 100644 test/file-hashes/samples/format/main.js create mode 100644 test/file-hashes/samples/intro/_config.js create mode 100644 test/file-hashes/samples/intro/_expected/amd/generated-chunk.js create mode 100644 test/file-hashes/samples/intro/_expected/amd/generated-chunk2.js create mode 100644 test/file-hashes/samples/intro/_expected/amd/main1.js create mode 100644 test/file-hashes/samples/intro/_expected/amd/main2.js create mode 100644 test/file-hashes/samples/intro/_expected/amd/main3.js create mode 100644 test/file-hashes/samples/intro/_expected/cjs/generated-chunk.js create mode 100644 test/file-hashes/samples/intro/_expected/cjs/generated-chunk2.js create mode 100644 test/file-hashes/samples/intro/_expected/cjs/main1.js create mode 100644 test/file-hashes/samples/intro/_expected/cjs/main2.js create mode 100644 test/file-hashes/samples/intro/_expected/cjs/main3.js create mode 100644 test/file-hashes/samples/intro/_expected/es/generated-chunk.js create mode 100644 test/file-hashes/samples/intro/_expected/es/generated-chunk2.js create mode 100644 test/file-hashes/samples/intro/_expected/es/main1.js create mode 100644 test/file-hashes/samples/intro/_expected/es/main2.js create mode 100644 test/file-hashes/samples/intro/_expected/es/main3.js create mode 100644 test/file-hashes/samples/intro/_expected/system/generated-chunk.js create mode 100644 test/file-hashes/samples/intro/_expected/system/generated-chunk2.js create mode 100644 test/file-hashes/samples/intro/_expected/system/main1.js create mode 100644 test/file-hashes/samples/intro/_expected/system/main2.js create mode 100644 test/file-hashes/samples/intro/_expected/system/main3.js create mode 100644 test/file-hashes/samples/intro/main.js create mode 100644 test/file-hashes/samples/outro/_config.js create mode 100644 test/file-hashes/samples/outro/_expected/amd/generated-chunk.js create mode 100644 test/file-hashes/samples/outro/_expected/amd/generated-chunk2.js create mode 100644 test/file-hashes/samples/outro/_expected/amd/main1.js create mode 100644 test/file-hashes/samples/outro/_expected/amd/main2.js create mode 100644 test/file-hashes/samples/outro/_expected/amd/main3.js create mode 100644 test/file-hashes/samples/outro/_expected/cjs/generated-chunk.js create mode 100644 test/file-hashes/samples/outro/_expected/cjs/generated-chunk2.js create mode 100644 test/file-hashes/samples/outro/_expected/cjs/main1.js create mode 100644 test/file-hashes/samples/outro/_expected/cjs/main2.js create mode 100644 test/file-hashes/samples/outro/_expected/cjs/main3.js create mode 100644 test/file-hashes/samples/outro/_expected/es/generated-chunk.js create mode 100644 test/file-hashes/samples/outro/_expected/es/generated-chunk2.js create mode 100644 test/file-hashes/samples/outro/_expected/es/main1.js create mode 100644 test/file-hashes/samples/outro/_expected/es/main2.js create mode 100644 test/file-hashes/samples/outro/_expected/es/main3.js create mode 100644 test/file-hashes/samples/outro/_expected/system/generated-chunk.js create mode 100644 test/file-hashes/samples/outro/_expected/system/generated-chunk2.js create mode 100644 test/file-hashes/samples/outro/_expected/system/main1.js create mode 100644 test/file-hashes/samples/outro/_expected/system/main2.js create mode 100644 test/file-hashes/samples/outro/_expected/system/main3.js create mode 100644 test/file-hashes/samples/outro/main.js delete mode 100644 test/file-hashes/samples/respects-exports/_config.js diff --git a/src/Chunk.ts b/src/Chunk.ts index af5b4f7f047..b94e489e568 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -705,7 +705,9 @@ export default class Chunk { private computeContentHashWithDependencies(addons: Addons, options: OutputOptions): string { const hash = sha256(); - hash.update(addons.hash); + hash.update( + [addons.intro, addons.outro, addons.banner, addons.footer].map(addon => addon || '').join(':') + ); hash.update(options.format); hash.update(Object.keys(this.exportNames).join(',')); this.visitDependencies(dep => { diff --git a/src/utils/addons.ts b/src/utils/addons.ts index d4705048ffc..f2e29c359ef 100644 --- a/src/utils/addons.ts +++ b/src/utils/addons.ts @@ -7,7 +7,6 @@ export interface Addons { outro?: string; banner?: string; footer?: string; - hash: Uint8Array; } function evalIfFn(strOrFn: string | (() => string | Promise)): string | Promise { @@ -38,9 +37,7 @@ export function createAddons(graph: Graph, options: OutputOptions): Promise { diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-dda51113-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-c2e7408c-amd.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-dda51113-amd.js rename to test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-c2e7408c-amd.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-843c034d-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-843c034d-amd.js new file mode 100644 index 00000000000..904284bc5d5 --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-843c034d-amd.js @@ -0,0 +1,5 @@ +define(['./chunk-main2-c2e7408c-amd.js'], function (main2) { 'use strict'; + + main2.log(main2.dep); + +}); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-a0f4fde5-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-a0f4fde5-amd.js deleted file mode 100644 index 49064a5c726..00000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-a0f4fde5-amd.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./chunk-main2-dda51113-amd.js'], function (main2) { 'use strict'; - - main2.log(main2.dep); - -}); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-237cd19a-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-237cd19a-amd.js new file mode 100644 index 00000000000..6aaf90c0fb9 --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-237cd19a-amd.js @@ -0,0 +1,7 @@ +define(['./chunk-main2-c2e7408c-amd.js'], function (main2) { 'use strict'; + + + + return main2.log; + +}); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-5396b748-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-5396b748-amd.js deleted file mode 100644 index 646ec109059..00000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-5396b748-amd.js +++ /dev/null @@ -1,7 +0,0 @@ -define(['./chunk-main2-dda51113-amd.js'], function (main2) { 'use strict'; - - - - return main2.log; - -}); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-9301b27d-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-ae5ee0ea-cjs.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-9301b27d-cjs.js rename to test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-ae5ee0ea-cjs.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-3cd10506-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-3cd10506-cjs.js deleted file mode 100644 index b4e293492ac..00000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-3cd10506-cjs.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var main2 = require('./chunk-main2-9301b27d-cjs.js'); - -main2.log(main2.dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-8470b59b-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-8470b59b-cjs.js new file mode 100644 index 00000000000..154eaa8cb52 --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-8470b59b-cjs.js @@ -0,0 +1,5 @@ +'use strict'; + +var main2 = require('./chunk-main2-ae5ee0ea-cjs.js'); + +main2.log(main2.dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-adea0dbb-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-adea0dbb-cjs.js new file mode 100644 index 00000000000..bfd6d69f29d --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-adea0dbb-cjs.js @@ -0,0 +1,7 @@ +'use strict'; + +var main2 = require('./chunk-main2-ae5ee0ea-cjs.js'); + + + +module.exports = main2.log; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-fd8c1a13-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-fd8c1a13-cjs.js deleted file mode 100644 index 15201047222..00000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-fd8c1a13-cjs.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -var main2 = require('./chunk-main2-9301b27d-cjs.js'); - - - -module.exports = main2.log; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-bee79135-esm.js b/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-f2de568c-esm.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-bee79135-esm.js rename to test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-f2de568c-esm.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-5a1ab158-esm.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-5a1ab158-esm.js deleted file mode 100644 index 6663901d931..00000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-5a1ab158-esm.js +++ /dev/null @@ -1,3 +0,0 @@ -import { a as log, b as dep } from './chunk-main2-bee79135-esm.js'; - -log(dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-a05c10d4-esm.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-a05c10d4-esm.js new file mode 100644 index 00000000000..11fab6a8c0e --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-a05c10d4-esm.js @@ -0,0 +1,3 @@ +import { a as log, b as dep } from './chunk-main2-f2de568c-esm.js'; + +log(dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-2206abfa-esm.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-2206abfa-esm.js new file mode 100644 index 00000000000..1be583cefb9 --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-2206abfa-esm.js @@ -0,0 +1 @@ +export { a as default } from './chunk-main2-f2de568c-esm.js'; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-2f78d4f8-esm.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-2f78d4f8-esm.js deleted file mode 100644 index 378a2efbaf5..00000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-2f78d4f8-esm.js +++ /dev/null @@ -1 +0,0 @@ -export { a as default } from './chunk-main2-bee79135-esm.js'; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-441b49d2-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-878d81e1-system.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-441b49d2-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-878d81e1-system.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-2422e801-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-ea6917a8-system.js similarity index 74% rename from test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-2422e801-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-ea6917a8-system.js index f3f7d131066..6a18693f4ee 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-2422e801-system.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-ea6917a8-system.js @@ -1,4 +1,4 @@ -System.register(['./chunk-main2-441b49d2-system.js'], function (exports, module) { +System.register(['./chunk-main2-878d81e1-system.js'], function (exports, module) { 'use strict'; var log, dep; return { diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-2ad41703-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-f2a7f0d8-system.js similarity index 70% rename from test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-2ad41703-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-f2a7f0d8-system.js index 81739879cb5..e807429b31b 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-2ad41703-system.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-f2a7f0d8-system.js @@ -1,4 +1,4 @@ -System.register(['./chunk-main2-441b49d2-system.js'], function (exports, module) { +System.register(['./chunk-main2-878d81e1-system.js'], function (exports, module) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/amd/00e68f7b.js b/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/amd/cf76c9a8.js similarity index 100% rename from test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/amd/00e68f7b.js rename to test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/amd/cf76c9a8.js diff --git a/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/cjs/0d12e680.js b/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/cjs/eaec11b1.js similarity index 100% rename from test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/cjs/0d12e680.js rename to test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/cjs/eaec11b1.js diff --git a/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/es/1249effd.js b/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/es/413045cf.js similarity index 100% rename from test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/es/1249effd.js rename to test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/es/413045cf.js diff --git a/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/system/5845a025.js b/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/system/21fc5b1e.js similarity index 100% rename from test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/system/5845a025.js rename to test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/system/21fc5b1e.js diff --git a/test/cli/samples/code-splitting-named-default-inputs/_config.js b/test/cli/samples/code-splitting-named-default-inputs/_config.js index 8a98ebc0613..41e9b7c794d 100644 --- a/test/cli/samples/code-splitting-named-default-inputs/_config.js +++ b/test/cli/samples/code-splitting-named-default-inputs/_config.js @@ -17,13 +17,13 @@ module.exports = { assert.equal( code, '\n' + - `${color}//→ entry1-a47394dc.js:${standard}\n` + + `${color}//→ entry1-d8c4343d.js:${standard}\n` + "console.log('main1');\n" + '\n' + - `${color}//→ Entry 2-d6c85f3f.js:${standard}\n` + + `${color}//→ Entry 2-99f48ca0.js:${standard}\n` + "console.log('main2');\n" + '\n' + - `${color}//→ main3-22d8845f.js:${standard}\n` + + `${color}//→ main3-a6240449.js:${standard}\n` + "console.log('main3');\n" ); } diff --git a/test/cli/samples/code-splitting-named-inputs/_config.js b/test/cli/samples/code-splitting-named-inputs/_config.js index 372741e5703..dc4affb2b36 100644 --- a/test/cli/samples/code-splitting-named-inputs/_config.js +++ b/test/cli/samples/code-splitting-named-inputs/_config.js @@ -17,13 +17,13 @@ module.exports = { assert.equal( code, '\n' + - `${color}//→ entry1-a47394dc.js:${standard}\n` + + `${color}//→ entry1-d8c4343d.js:${standard}\n` + "console.log('main1');\n" + '\n' + - `${color}//→ Entry 2-d6c85f3f.js:${standard}\n` + + `${color}//→ Entry 2-99f48ca0.js:${standard}\n` + "console.log('main2');\n" + '\n' + - `${color}//→ main3-22d8845f.js:${standard}\n` + + `${color}//→ main3-a6240449.js:${standard}\n` + "console.log('main3');\n" ); } diff --git a/test/file-hashes/index.js b/test/file-hashes/index.js index 8228a28a8e1..d61319318d0 100644 --- a/test/file-hashes/index.js +++ b/test/file-hashes/index.js @@ -29,7 +29,7 @@ runTestSuiteWithSamples('file hashes', path.resolve(__dirname, 'samples'), (dir, assert.equal( hashMap1[name], hashMap2[name], - `Expected hashes for chunk containing "${name}" to be equal but they were different.` + `Expected hashes for chunk "${name}" to be equal but they were different.` ); } for (const name of config.expectedDifferentHashes || []) { @@ -37,7 +37,7 @@ runTestSuiteWithSamples('file hashes', path.resolve(__dirname, 'samples'), (dir, assert.notEqual( hashMap1[name], hashMap2[name], - `Expected hashes for chunk containing "${name}" to be different but they were equal.` + `Expected hashes for chunk "${name}" to be different but they were equal.` ); } }); @@ -48,11 +48,13 @@ runTestSuiteWithSamples('file hashes', path.resolve(__dirname, 'samples'), (dir, function mapGeneratedToHashMap(generated) { const hashMap = {}; - const dirLength = process.cwd().length + 1; for (const chunk of generated.output) { - for (const moduleName of Object.keys(chunk.modules)) { - hashMap[moduleName.slice(dirLength)] = chunk.fileName; + let name = chunk.name; + let index = 1; + while (hashMap[name]) { + name = `${chunk.name}${index++}`; } + hashMap[name] = chunk.fileName; } return hashMap; } @@ -61,9 +63,9 @@ function checkChunkExists(hashMap1, hashMap2, name) { [hashMap1, hashMap2].forEach((hashMap, index) => assert.ok( hashMap[name], - `Bundle ${index} did not contain a chunk containing module "${name}", found chunks for modules: ${Object.keys( - hashMap - ).join(', ')}` + `Bundle ${index + 1} did not contain chunk "${name}", found chunks: ${Object.keys(hashMap) + .map(key => `"${key}"`) + .join(', ')}` ) ); } diff --git a/test/file-hashes/samples/banner/_config.js b/test/file-hashes/samples/banner/_config.js new file mode 100644 index 00000000000..1221f74883c --- /dev/null +++ b/test/file-hashes/samples/banner/_config.js @@ -0,0 +1,16 @@ +module.exports = { + description: 'creates different hashes if the banner differs', + options1: { + input: 'main', + output: { + banner: 'console.log(1);' + } + }, + options2: { + input: 'main', + output: { + banner: 'console.log(2);' + } + }, + expectedDifferentHashes: ['main'] +}; diff --git a/test/file-hashes/samples/respects-exports/_expected/amd/generated-chunk.js b/test/file-hashes/samples/banner/_expected/amd/generated-chunk.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/amd/generated-chunk.js rename to test/file-hashes/samples/banner/_expected/amd/generated-chunk.js diff --git a/test/file-hashes/samples/respects-exports/_expected/amd/generated-chunk2.js b/test/file-hashes/samples/banner/_expected/amd/generated-chunk2.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/amd/generated-chunk2.js rename to test/file-hashes/samples/banner/_expected/amd/generated-chunk2.js diff --git a/test/file-hashes/samples/respects-exports/_expected/amd/main1.js b/test/file-hashes/samples/banner/_expected/amd/main1.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/amd/main1.js rename to test/file-hashes/samples/banner/_expected/amd/main1.js diff --git a/test/file-hashes/samples/respects-exports/_expected/amd/main2.js b/test/file-hashes/samples/banner/_expected/amd/main2.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/amd/main2.js rename to test/file-hashes/samples/banner/_expected/amd/main2.js diff --git a/test/file-hashes/samples/respects-exports/_expected/amd/main3.js b/test/file-hashes/samples/banner/_expected/amd/main3.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/amd/main3.js rename to test/file-hashes/samples/banner/_expected/amd/main3.js diff --git a/test/file-hashes/samples/respects-exports/_expected/cjs/generated-chunk.js b/test/file-hashes/samples/banner/_expected/cjs/generated-chunk.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/cjs/generated-chunk.js rename to test/file-hashes/samples/banner/_expected/cjs/generated-chunk.js diff --git a/test/file-hashes/samples/respects-exports/_expected/cjs/generated-chunk2.js b/test/file-hashes/samples/banner/_expected/cjs/generated-chunk2.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/cjs/generated-chunk2.js rename to test/file-hashes/samples/banner/_expected/cjs/generated-chunk2.js diff --git a/test/file-hashes/samples/respects-exports/_expected/cjs/main1.js b/test/file-hashes/samples/banner/_expected/cjs/main1.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/cjs/main1.js rename to test/file-hashes/samples/banner/_expected/cjs/main1.js diff --git a/test/file-hashes/samples/respects-exports/_expected/cjs/main2.js b/test/file-hashes/samples/banner/_expected/cjs/main2.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/cjs/main2.js rename to test/file-hashes/samples/banner/_expected/cjs/main2.js diff --git a/test/file-hashes/samples/respects-exports/_expected/cjs/main3.js b/test/file-hashes/samples/banner/_expected/cjs/main3.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/cjs/main3.js rename to test/file-hashes/samples/banner/_expected/cjs/main3.js diff --git a/test/file-hashes/samples/respects-exports/_expected/es/generated-chunk.js b/test/file-hashes/samples/banner/_expected/es/generated-chunk.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/es/generated-chunk.js rename to test/file-hashes/samples/banner/_expected/es/generated-chunk.js diff --git a/test/file-hashes/samples/respects-exports/_expected/es/generated-chunk2.js b/test/file-hashes/samples/banner/_expected/es/generated-chunk2.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/es/generated-chunk2.js rename to test/file-hashes/samples/banner/_expected/es/generated-chunk2.js diff --git a/test/file-hashes/samples/respects-exports/_expected/es/main1.js b/test/file-hashes/samples/banner/_expected/es/main1.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/es/main1.js rename to test/file-hashes/samples/banner/_expected/es/main1.js diff --git a/test/file-hashes/samples/respects-exports/_expected/es/main2.js b/test/file-hashes/samples/banner/_expected/es/main2.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/es/main2.js rename to test/file-hashes/samples/banner/_expected/es/main2.js diff --git a/test/file-hashes/samples/respects-exports/_expected/es/main3.js b/test/file-hashes/samples/banner/_expected/es/main3.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/es/main3.js rename to test/file-hashes/samples/banner/_expected/es/main3.js diff --git a/test/file-hashes/samples/respects-exports/_expected/system/generated-chunk.js b/test/file-hashes/samples/banner/_expected/system/generated-chunk.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/system/generated-chunk.js rename to test/file-hashes/samples/banner/_expected/system/generated-chunk.js diff --git a/test/file-hashes/samples/respects-exports/_expected/system/generated-chunk2.js b/test/file-hashes/samples/banner/_expected/system/generated-chunk2.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/system/generated-chunk2.js rename to test/file-hashes/samples/banner/_expected/system/generated-chunk2.js diff --git a/test/file-hashes/samples/respects-exports/_expected/system/main1.js b/test/file-hashes/samples/banner/_expected/system/main1.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/system/main1.js rename to test/file-hashes/samples/banner/_expected/system/main1.js diff --git a/test/file-hashes/samples/respects-exports/_expected/system/main2.js b/test/file-hashes/samples/banner/_expected/system/main2.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/system/main2.js rename to test/file-hashes/samples/banner/_expected/system/main2.js diff --git a/test/file-hashes/samples/respects-exports/_expected/system/main3.js b/test/file-hashes/samples/banner/_expected/system/main3.js similarity index 100% rename from test/file-hashes/samples/respects-exports/_expected/system/main3.js rename to test/file-hashes/samples/banner/_expected/system/main3.js diff --git a/test/file-hashes/samples/banner/main.js b/test/file-hashes/samples/banner/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/file-hashes/samples/banner/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/file-hashes/samples/content/_config.js b/test/file-hashes/samples/content/_config.js new file mode 100644 index 00000000000..f47889d1bef --- /dev/null +++ b/test/file-hashes/samples/content/_config.js @@ -0,0 +1,11 @@ +module.exports = { + description: 'creates different hashes if the content differs', + options1: { + input: { main: 'main1', dep: 'dep1' } + }, + options2: { + input: { main: 'main2', dep: 'dep2' } + }, + expectedDifferentHashes: ['main'], + expectedEqualHashes: ['dep'] +}; diff --git a/test/file-hashes/samples/content/_expected/amd/generated-chunk.js b/test/file-hashes/samples/content/_expected/amd/generated-chunk.js new file mode 100644 index 00000000000..ed41892cfe1 --- /dev/null +++ b/test/file-hashes/samples/content/_expected/amd/generated-chunk.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main4'); + +}); diff --git a/test/file-hashes/samples/content/_expected/amd/generated-chunk2.js b/test/file-hashes/samples/content/_expected/amd/generated-chunk2.js new file mode 100644 index 00000000000..db3f430c9aa --- /dev/null +++ b/test/file-hashes/samples/content/_expected/amd/generated-chunk2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main5'); + +}); diff --git a/test/file-hashes/samples/content/_expected/amd/main1.js b/test/file-hashes/samples/content/_expected/amd/main1.js new file mode 100644 index 00000000000..97a0f22a858 --- /dev/null +++ b/test/file-hashes/samples/content/_expected/amd/main1.js @@ -0,0 +1,7 @@ +define(['require'], function (require) { 'use strict'; + + console.log('main1'); + new Promise(function (resolve, reject) { require(['./generated-chunk.js'], resolve, reject) }); + new Promise(function (resolve, reject) { require(['./generated-chunk2.js'], resolve, reject) }); + +}); diff --git a/test/file-hashes/samples/content/_expected/amd/main2.js b/test/file-hashes/samples/content/_expected/amd/main2.js new file mode 100644 index 00000000000..b58286ca58e --- /dev/null +++ b/test/file-hashes/samples/content/_expected/amd/main2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main2'); + +}); diff --git a/test/file-hashes/samples/content/_expected/amd/main3.js b/test/file-hashes/samples/content/_expected/amd/main3.js new file mode 100644 index 00000000000..cac48c4d722 --- /dev/null +++ b/test/file-hashes/samples/content/_expected/amd/main3.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main3'); + +}); diff --git a/test/file-hashes/samples/content/_expected/cjs/generated-chunk.js b/test/file-hashes/samples/content/_expected/cjs/generated-chunk.js new file mode 100644 index 00000000000..d27ed956b79 --- /dev/null +++ b/test/file-hashes/samples/content/_expected/cjs/generated-chunk.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main4'); diff --git a/test/file-hashes/samples/content/_expected/cjs/generated-chunk2.js b/test/file-hashes/samples/content/_expected/cjs/generated-chunk2.js new file mode 100644 index 00000000000..e7b2d35b4e8 --- /dev/null +++ b/test/file-hashes/samples/content/_expected/cjs/generated-chunk2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main5'); diff --git a/test/file-hashes/samples/content/_expected/cjs/main1.js b/test/file-hashes/samples/content/_expected/cjs/main1.js new file mode 100644 index 00000000000..ffb10b14b6d --- /dev/null +++ b/test/file-hashes/samples/content/_expected/cjs/main1.js @@ -0,0 +1,5 @@ +'use strict'; + +console.log('main1'); +Promise.resolve(require('./generated-chunk.js')); +Promise.resolve(require('./generated-chunk2.js')); diff --git a/test/file-hashes/samples/content/_expected/cjs/main2.js b/test/file-hashes/samples/content/_expected/cjs/main2.js new file mode 100644 index 00000000000..33fe6f320c2 --- /dev/null +++ b/test/file-hashes/samples/content/_expected/cjs/main2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main2'); diff --git a/test/file-hashes/samples/content/_expected/cjs/main3.js b/test/file-hashes/samples/content/_expected/cjs/main3.js new file mode 100644 index 00000000000..fae32f0b7f2 --- /dev/null +++ b/test/file-hashes/samples/content/_expected/cjs/main3.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main3'); diff --git a/test/file-hashes/samples/content/_expected/es/generated-chunk.js b/test/file-hashes/samples/content/_expected/es/generated-chunk.js new file mode 100644 index 00000000000..f517bece900 --- /dev/null +++ b/test/file-hashes/samples/content/_expected/es/generated-chunk.js @@ -0,0 +1 @@ +console.log('main4'); diff --git a/test/file-hashes/samples/content/_expected/es/generated-chunk2.js b/test/file-hashes/samples/content/_expected/es/generated-chunk2.js new file mode 100644 index 00000000000..1807e01f88e --- /dev/null +++ b/test/file-hashes/samples/content/_expected/es/generated-chunk2.js @@ -0,0 +1 @@ +console.log('main5'); diff --git a/test/file-hashes/samples/content/_expected/es/main1.js b/test/file-hashes/samples/content/_expected/es/main1.js new file mode 100644 index 00000000000..de1c78214cd --- /dev/null +++ b/test/file-hashes/samples/content/_expected/es/main1.js @@ -0,0 +1,3 @@ +console.log('main1'); +import('./generated-chunk.js'); +import('./generated-chunk2.js'); diff --git a/test/file-hashes/samples/content/_expected/es/main2.js b/test/file-hashes/samples/content/_expected/es/main2.js new file mode 100644 index 00000000000..ac653633351 --- /dev/null +++ b/test/file-hashes/samples/content/_expected/es/main2.js @@ -0,0 +1 @@ +console.log('main2'); diff --git a/test/file-hashes/samples/content/_expected/es/main3.js b/test/file-hashes/samples/content/_expected/es/main3.js new file mode 100644 index 00000000000..f44c9f26848 --- /dev/null +++ b/test/file-hashes/samples/content/_expected/es/main3.js @@ -0,0 +1 @@ +console.log('main3'); diff --git a/test/file-hashes/samples/content/_expected/system/generated-chunk.js b/test/file-hashes/samples/content/_expected/system/generated-chunk.js new file mode 100644 index 00000000000..ad30223d53c --- /dev/null +++ b/test/file-hashes/samples/content/_expected/system/generated-chunk.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main4'); + + } + }; +}); diff --git a/test/file-hashes/samples/content/_expected/system/generated-chunk2.js b/test/file-hashes/samples/content/_expected/system/generated-chunk2.js new file mode 100644 index 00000000000..a5cc43bcc37 --- /dev/null +++ b/test/file-hashes/samples/content/_expected/system/generated-chunk2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main5'); + + } + }; +}); diff --git a/test/file-hashes/samples/content/_expected/system/main1.js b/test/file-hashes/samples/content/_expected/system/main1.js new file mode 100644 index 00000000000..fe72dd01fb6 --- /dev/null +++ b/test/file-hashes/samples/content/_expected/system/main1.js @@ -0,0 +1,12 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main1'); + module.import('./generated-chunk.js'); + module.import('./generated-chunk2.js'); + + } + }; +}); diff --git a/test/file-hashes/samples/content/_expected/system/main2.js b/test/file-hashes/samples/content/_expected/system/main2.js new file mode 100644 index 00000000000..80e8224ee07 --- /dev/null +++ b/test/file-hashes/samples/content/_expected/system/main2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main2'); + + } + }; +}); diff --git a/test/file-hashes/samples/content/_expected/system/main3.js b/test/file-hashes/samples/content/_expected/system/main3.js new file mode 100644 index 00000000000..9e741c363b7 --- /dev/null +++ b/test/file-hashes/samples/content/_expected/system/main3.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main3'); + + } + }; +}); diff --git a/test/file-hashes/samples/content/dep1.js b/test/file-hashes/samples/content/dep1.js new file mode 100644 index 00000000000..b74a9837c07 --- /dev/null +++ b/test/file-hashes/samples/content/dep1.js @@ -0,0 +1 @@ +console.log('dep'); diff --git a/test/file-hashes/samples/content/dep2.js b/test/file-hashes/samples/content/dep2.js new file mode 100644 index 00000000000..b74a9837c07 --- /dev/null +++ b/test/file-hashes/samples/content/dep2.js @@ -0,0 +1 @@ +console.log('dep'); diff --git a/test/file-hashes/samples/content/main1.js b/test/file-hashes/samples/content/main1.js new file mode 100644 index 00000000000..7fb68233f35 --- /dev/null +++ b/test/file-hashes/samples/content/main1.js @@ -0,0 +1,3 @@ +import './dep1'; + +console.log('main1'); diff --git a/test/file-hashes/samples/content/main2.js b/test/file-hashes/samples/content/main2.js new file mode 100644 index 00000000000..6c39d576b9c --- /dev/null +++ b/test/file-hashes/samples/content/main2.js @@ -0,0 +1,3 @@ +import './dep2'; + +console.log('main2'); diff --git a/test/file-hashes/samples/dependency-content/_config.js b/test/file-hashes/samples/dependency-content/_config.js new file mode 100644 index 00000000000..4a468eacb04 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_config.js @@ -0,0 +1,10 @@ +module.exports = { + description: 'creates different hashes if the content of dependencies differs', + options1: { + input: { main: 'main1', dep: 'dep1' } + }, + options2: { + input: { main: 'main2', dep: 'dep2' } + }, + expectedDifferentHashes: ['main', 'dep'] +}; diff --git a/test/file-hashes/samples/dependency-content/_expected/amd/generated-chunk.js b/test/file-hashes/samples/dependency-content/_expected/amd/generated-chunk.js new file mode 100644 index 00000000000..ed41892cfe1 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/amd/generated-chunk.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main4'); + +}); diff --git a/test/file-hashes/samples/dependency-content/_expected/amd/generated-chunk2.js b/test/file-hashes/samples/dependency-content/_expected/amd/generated-chunk2.js new file mode 100644 index 00000000000..db3f430c9aa --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/amd/generated-chunk2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main5'); + +}); diff --git a/test/file-hashes/samples/dependency-content/_expected/amd/main1.js b/test/file-hashes/samples/dependency-content/_expected/amd/main1.js new file mode 100644 index 00000000000..97a0f22a858 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/amd/main1.js @@ -0,0 +1,7 @@ +define(['require'], function (require) { 'use strict'; + + console.log('main1'); + new Promise(function (resolve, reject) { require(['./generated-chunk.js'], resolve, reject) }); + new Promise(function (resolve, reject) { require(['./generated-chunk2.js'], resolve, reject) }); + +}); diff --git a/test/file-hashes/samples/dependency-content/_expected/amd/main2.js b/test/file-hashes/samples/dependency-content/_expected/amd/main2.js new file mode 100644 index 00000000000..b58286ca58e --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/amd/main2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main2'); + +}); diff --git a/test/file-hashes/samples/dependency-content/_expected/amd/main3.js b/test/file-hashes/samples/dependency-content/_expected/amd/main3.js new file mode 100644 index 00000000000..cac48c4d722 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/amd/main3.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main3'); + +}); diff --git a/test/file-hashes/samples/dependency-content/_expected/cjs/generated-chunk.js b/test/file-hashes/samples/dependency-content/_expected/cjs/generated-chunk.js new file mode 100644 index 00000000000..d27ed956b79 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/cjs/generated-chunk.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main4'); diff --git a/test/file-hashes/samples/dependency-content/_expected/cjs/generated-chunk2.js b/test/file-hashes/samples/dependency-content/_expected/cjs/generated-chunk2.js new file mode 100644 index 00000000000..e7b2d35b4e8 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/cjs/generated-chunk2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main5'); diff --git a/test/file-hashes/samples/dependency-content/_expected/cjs/main1.js b/test/file-hashes/samples/dependency-content/_expected/cjs/main1.js new file mode 100644 index 00000000000..ffb10b14b6d --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/cjs/main1.js @@ -0,0 +1,5 @@ +'use strict'; + +console.log('main1'); +Promise.resolve(require('./generated-chunk.js')); +Promise.resolve(require('./generated-chunk2.js')); diff --git a/test/file-hashes/samples/dependency-content/_expected/cjs/main2.js b/test/file-hashes/samples/dependency-content/_expected/cjs/main2.js new file mode 100644 index 00000000000..33fe6f320c2 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/cjs/main2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main2'); diff --git a/test/file-hashes/samples/dependency-content/_expected/cjs/main3.js b/test/file-hashes/samples/dependency-content/_expected/cjs/main3.js new file mode 100644 index 00000000000..fae32f0b7f2 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/cjs/main3.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main3'); diff --git a/test/file-hashes/samples/dependency-content/_expected/es/generated-chunk.js b/test/file-hashes/samples/dependency-content/_expected/es/generated-chunk.js new file mode 100644 index 00000000000..f517bece900 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/es/generated-chunk.js @@ -0,0 +1 @@ +console.log('main4'); diff --git a/test/file-hashes/samples/dependency-content/_expected/es/generated-chunk2.js b/test/file-hashes/samples/dependency-content/_expected/es/generated-chunk2.js new file mode 100644 index 00000000000..1807e01f88e --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/es/generated-chunk2.js @@ -0,0 +1 @@ +console.log('main5'); diff --git a/test/file-hashes/samples/dependency-content/_expected/es/main1.js b/test/file-hashes/samples/dependency-content/_expected/es/main1.js new file mode 100644 index 00000000000..de1c78214cd --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/es/main1.js @@ -0,0 +1,3 @@ +console.log('main1'); +import('./generated-chunk.js'); +import('./generated-chunk2.js'); diff --git a/test/file-hashes/samples/dependency-content/_expected/es/main2.js b/test/file-hashes/samples/dependency-content/_expected/es/main2.js new file mode 100644 index 00000000000..ac653633351 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/es/main2.js @@ -0,0 +1 @@ +console.log('main2'); diff --git a/test/file-hashes/samples/dependency-content/_expected/es/main3.js b/test/file-hashes/samples/dependency-content/_expected/es/main3.js new file mode 100644 index 00000000000..f44c9f26848 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/es/main3.js @@ -0,0 +1 @@ +console.log('main3'); diff --git a/test/file-hashes/samples/dependency-content/_expected/system/generated-chunk.js b/test/file-hashes/samples/dependency-content/_expected/system/generated-chunk.js new file mode 100644 index 00000000000..ad30223d53c --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/system/generated-chunk.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main4'); + + } + }; +}); diff --git a/test/file-hashes/samples/dependency-content/_expected/system/generated-chunk2.js b/test/file-hashes/samples/dependency-content/_expected/system/generated-chunk2.js new file mode 100644 index 00000000000..a5cc43bcc37 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/system/generated-chunk2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main5'); + + } + }; +}); diff --git a/test/file-hashes/samples/dependency-content/_expected/system/main1.js b/test/file-hashes/samples/dependency-content/_expected/system/main1.js new file mode 100644 index 00000000000..fe72dd01fb6 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/system/main1.js @@ -0,0 +1,12 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main1'); + module.import('./generated-chunk.js'); + module.import('./generated-chunk2.js'); + + } + }; +}); diff --git a/test/file-hashes/samples/dependency-content/_expected/system/main2.js b/test/file-hashes/samples/dependency-content/_expected/system/main2.js new file mode 100644 index 00000000000..80e8224ee07 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/system/main2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main2'); + + } + }; +}); diff --git a/test/file-hashes/samples/dependency-content/_expected/system/main3.js b/test/file-hashes/samples/dependency-content/_expected/system/main3.js new file mode 100644 index 00000000000..9e741c363b7 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/_expected/system/main3.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main3'); + + } + }; +}); diff --git a/test/file-hashes/samples/dependency-content/dep1.js b/test/file-hashes/samples/dependency-content/dep1.js new file mode 100644 index 00000000000..6aa6066cec9 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/dep1.js @@ -0,0 +1 @@ +console.log('dep1'); diff --git a/test/file-hashes/samples/dependency-content/dep2.js b/test/file-hashes/samples/dependency-content/dep2.js new file mode 100644 index 00000000000..f5325d80e8a --- /dev/null +++ b/test/file-hashes/samples/dependency-content/dep2.js @@ -0,0 +1 @@ +console.log('dep2'); diff --git a/test/file-hashes/samples/dependency-content/main1.js b/test/file-hashes/samples/dependency-content/main1.js new file mode 100644 index 00000000000..9a3b277b78a --- /dev/null +++ b/test/file-hashes/samples/dependency-content/main1.js @@ -0,0 +1,3 @@ +import './dep1'; + +console.log('main'); diff --git a/test/file-hashes/samples/dependency-content/main2.js b/test/file-hashes/samples/dependency-content/main2.js new file mode 100644 index 00000000000..973fcaf3719 --- /dev/null +++ b/test/file-hashes/samples/dependency-content/main2.js @@ -0,0 +1,3 @@ +import './dep2'; + +console.log('main'); diff --git a/test/file-hashes/samples/exports/_config.js b/test/file-hashes/samples/exports/_config.js new file mode 100644 index 00000000000..2c6c7425f28 --- /dev/null +++ b/test/file-hashes/samples/exports/_config.js @@ -0,0 +1,10 @@ +module.exports = { + description: 'creates different hashes if the generated exports differ', + options1: { + input: ['main1', 'other'] + }, + options2: { + input: ['main2', 'other'] + }, + expectedDifferentHashes: ['chunk'] +}; diff --git a/test/file-hashes/samples/exports/_expected/amd/generated-chunk.js b/test/file-hashes/samples/exports/_expected/amd/generated-chunk.js new file mode 100644 index 00000000000..ed41892cfe1 --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/amd/generated-chunk.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main4'); + +}); diff --git a/test/file-hashes/samples/exports/_expected/amd/generated-chunk2.js b/test/file-hashes/samples/exports/_expected/amd/generated-chunk2.js new file mode 100644 index 00000000000..db3f430c9aa --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/amd/generated-chunk2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main5'); + +}); diff --git a/test/file-hashes/samples/exports/_expected/amd/main1.js b/test/file-hashes/samples/exports/_expected/amd/main1.js new file mode 100644 index 00000000000..97a0f22a858 --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/amd/main1.js @@ -0,0 +1,7 @@ +define(['require'], function (require) { 'use strict'; + + console.log('main1'); + new Promise(function (resolve, reject) { require(['./generated-chunk.js'], resolve, reject) }); + new Promise(function (resolve, reject) { require(['./generated-chunk2.js'], resolve, reject) }); + +}); diff --git a/test/file-hashes/samples/exports/_expected/amd/main2.js b/test/file-hashes/samples/exports/_expected/amd/main2.js new file mode 100644 index 00000000000..b58286ca58e --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/amd/main2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main2'); + +}); diff --git a/test/file-hashes/samples/exports/_expected/amd/main3.js b/test/file-hashes/samples/exports/_expected/amd/main3.js new file mode 100644 index 00000000000..cac48c4d722 --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/amd/main3.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main3'); + +}); diff --git a/test/file-hashes/samples/exports/_expected/cjs/generated-chunk.js b/test/file-hashes/samples/exports/_expected/cjs/generated-chunk.js new file mode 100644 index 00000000000..d27ed956b79 --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/cjs/generated-chunk.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main4'); diff --git a/test/file-hashes/samples/exports/_expected/cjs/generated-chunk2.js b/test/file-hashes/samples/exports/_expected/cjs/generated-chunk2.js new file mode 100644 index 00000000000..e7b2d35b4e8 --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/cjs/generated-chunk2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main5'); diff --git a/test/file-hashes/samples/exports/_expected/cjs/main1.js b/test/file-hashes/samples/exports/_expected/cjs/main1.js new file mode 100644 index 00000000000..ffb10b14b6d --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/cjs/main1.js @@ -0,0 +1,5 @@ +'use strict'; + +console.log('main1'); +Promise.resolve(require('./generated-chunk.js')); +Promise.resolve(require('./generated-chunk2.js')); diff --git a/test/file-hashes/samples/exports/_expected/cjs/main2.js b/test/file-hashes/samples/exports/_expected/cjs/main2.js new file mode 100644 index 00000000000..33fe6f320c2 --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/cjs/main2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main2'); diff --git a/test/file-hashes/samples/exports/_expected/cjs/main3.js b/test/file-hashes/samples/exports/_expected/cjs/main3.js new file mode 100644 index 00000000000..fae32f0b7f2 --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/cjs/main3.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main3'); diff --git a/test/file-hashes/samples/exports/_expected/es/generated-chunk.js b/test/file-hashes/samples/exports/_expected/es/generated-chunk.js new file mode 100644 index 00000000000..f517bece900 --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/es/generated-chunk.js @@ -0,0 +1 @@ +console.log('main4'); diff --git a/test/file-hashes/samples/exports/_expected/es/generated-chunk2.js b/test/file-hashes/samples/exports/_expected/es/generated-chunk2.js new file mode 100644 index 00000000000..1807e01f88e --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/es/generated-chunk2.js @@ -0,0 +1 @@ +console.log('main5'); diff --git a/test/file-hashes/samples/exports/_expected/es/main1.js b/test/file-hashes/samples/exports/_expected/es/main1.js new file mode 100644 index 00000000000..de1c78214cd --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/es/main1.js @@ -0,0 +1,3 @@ +console.log('main1'); +import('./generated-chunk.js'); +import('./generated-chunk2.js'); diff --git a/test/file-hashes/samples/exports/_expected/es/main2.js b/test/file-hashes/samples/exports/_expected/es/main2.js new file mode 100644 index 00000000000..ac653633351 --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/es/main2.js @@ -0,0 +1 @@ +console.log('main2'); diff --git a/test/file-hashes/samples/exports/_expected/es/main3.js b/test/file-hashes/samples/exports/_expected/es/main3.js new file mode 100644 index 00000000000..f44c9f26848 --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/es/main3.js @@ -0,0 +1 @@ +console.log('main3'); diff --git a/test/file-hashes/samples/exports/_expected/system/generated-chunk.js b/test/file-hashes/samples/exports/_expected/system/generated-chunk.js new file mode 100644 index 00000000000..ad30223d53c --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/system/generated-chunk.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main4'); + + } + }; +}); diff --git a/test/file-hashes/samples/exports/_expected/system/generated-chunk2.js b/test/file-hashes/samples/exports/_expected/system/generated-chunk2.js new file mode 100644 index 00000000000..a5cc43bcc37 --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/system/generated-chunk2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main5'); + + } + }; +}); diff --git a/test/file-hashes/samples/exports/_expected/system/main1.js b/test/file-hashes/samples/exports/_expected/system/main1.js new file mode 100644 index 00000000000..fe72dd01fb6 --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/system/main1.js @@ -0,0 +1,12 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main1'); + module.import('./generated-chunk.js'); + module.import('./generated-chunk2.js'); + + } + }; +}); diff --git a/test/file-hashes/samples/exports/_expected/system/main2.js b/test/file-hashes/samples/exports/_expected/system/main2.js new file mode 100644 index 00000000000..80e8224ee07 --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/system/main2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main2'); + + } + }; +}); diff --git a/test/file-hashes/samples/exports/_expected/system/main3.js b/test/file-hashes/samples/exports/_expected/system/main3.js new file mode 100644 index 00000000000..9e741c363b7 --- /dev/null +++ b/test/file-hashes/samples/exports/_expected/system/main3.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main3'); + + } + }; +}); diff --git a/test/file-hashes/samples/respects-exports/dep.js b/test/file-hashes/samples/exports/dep.js similarity index 100% rename from test/file-hashes/samples/respects-exports/dep.js rename to test/file-hashes/samples/exports/dep.js diff --git a/test/file-hashes/samples/respects-exports/main1.js b/test/file-hashes/samples/exports/main1.js similarity index 100% rename from test/file-hashes/samples/respects-exports/main1.js rename to test/file-hashes/samples/exports/main1.js diff --git a/test/file-hashes/samples/respects-exports/main2.js b/test/file-hashes/samples/exports/main2.js similarity index 100% rename from test/file-hashes/samples/respects-exports/main2.js rename to test/file-hashes/samples/exports/main2.js diff --git a/test/file-hashes/samples/respects-exports/other.js b/test/file-hashes/samples/exports/other.js similarity index 100% rename from test/file-hashes/samples/respects-exports/other.js rename to test/file-hashes/samples/exports/other.js diff --git a/test/file-hashes/samples/external-dependency-names/_config.js b/test/file-hashes/samples/external-dependency-names/_config.js new file mode 100644 index 00000000000..bd54ccd0dd9 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_config.js @@ -0,0 +1,13 @@ +module.exports = { + description: 'creates different hashes if the names of external dependencies differ', + options1: { + input: { mainA: 'main1a', mainB: 'main1b' }, + external: ['external', 'external1'] + }, + options2: { + input: { mainA: 'main2a', mainB: 'main2b' }, + external: ['external', 'external2'] + }, + expectedEqualHashes: ['mainA'], + expectedDifferentHashes: ['mainB'] +}; diff --git a/test/file-hashes/samples/external-dependency-names/_expected/amd/generated-chunk.js b/test/file-hashes/samples/external-dependency-names/_expected/amd/generated-chunk.js new file mode 100644 index 00000000000..ed41892cfe1 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/amd/generated-chunk.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main4'); + +}); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/amd/generated-chunk2.js b/test/file-hashes/samples/external-dependency-names/_expected/amd/generated-chunk2.js new file mode 100644 index 00000000000..db3f430c9aa --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/amd/generated-chunk2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main5'); + +}); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/amd/main1.js b/test/file-hashes/samples/external-dependency-names/_expected/amd/main1.js new file mode 100644 index 00000000000..97a0f22a858 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/amd/main1.js @@ -0,0 +1,7 @@ +define(['require'], function (require) { 'use strict'; + + console.log('main1'); + new Promise(function (resolve, reject) { require(['./generated-chunk.js'], resolve, reject) }); + new Promise(function (resolve, reject) { require(['./generated-chunk2.js'], resolve, reject) }); + +}); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/amd/main2.js b/test/file-hashes/samples/external-dependency-names/_expected/amd/main2.js new file mode 100644 index 00000000000..b58286ca58e --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/amd/main2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main2'); + +}); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/amd/main3.js b/test/file-hashes/samples/external-dependency-names/_expected/amd/main3.js new file mode 100644 index 00000000000..cac48c4d722 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/amd/main3.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main3'); + +}); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/cjs/generated-chunk.js b/test/file-hashes/samples/external-dependency-names/_expected/cjs/generated-chunk.js new file mode 100644 index 00000000000..d27ed956b79 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/cjs/generated-chunk.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main4'); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/cjs/generated-chunk2.js b/test/file-hashes/samples/external-dependency-names/_expected/cjs/generated-chunk2.js new file mode 100644 index 00000000000..e7b2d35b4e8 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/cjs/generated-chunk2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main5'); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/cjs/main1.js b/test/file-hashes/samples/external-dependency-names/_expected/cjs/main1.js new file mode 100644 index 00000000000..ffb10b14b6d --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/cjs/main1.js @@ -0,0 +1,5 @@ +'use strict'; + +console.log('main1'); +Promise.resolve(require('./generated-chunk.js')); +Promise.resolve(require('./generated-chunk2.js')); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/cjs/main2.js b/test/file-hashes/samples/external-dependency-names/_expected/cjs/main2.js new file mode 100644 index 00000000000..33fe6f320c2 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/cjs/main2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main2'); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/cjs/main3.js b/test/file-hashes/samples/external-dependency-names/_expected/cjs/main3.js new file mode 100644 index 00000000000..fae32f0b7f2 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/cjs/main3.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main3'); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/es/generated-chunk.js b/test/file-hashes/samples/external-dependency-names/_expected/es/generated-chunk.js new file mode 100644 index 00000000000..f517bece900 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/es/generated-chunk.js @@ -0,0 +1 @@ +console.log('main4'); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/es/generated-chunk2.js b/test/file-hashes/samples/external-dependency-names/_expected/es/generated-chunk2.js new file mode 100644 index 00000000000..1807e01f88e --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/es/generated-chunk2.js @@ -0,0 +1 @@ +console.log('main5'); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/es/main1.js b/test/file-hashes/samples/external-dependency-names/_expected/es/main1.js new file mode 100644 index 00000000000..de1c78214cd --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/es/main1.js @@ -0,0 +1,3 @@ +console.log('main1'); +import('./generated-chunk.js'); +import('./generated-chunk2.js'); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/es/main2.js b/test/file-hashes/samples/external-dependency-names/_expected/es/main2.js new file mode 100644 index 00000000000..ac653633351 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/es/main2.js @@ -0,0 +1 @@ +console.log('main2'); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/es/main3.js b/test/file-hashes/samples/external-dependency-names/_expected/es/main3.js new file mode 100644 index 00000000000..f44c9f26848 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/es/main3.js @@ -0,0 +1 @@ +console.log('main3'); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/system/generated-chunk.js b/test/file-hashes/samples/external-dependency-names/_expected/system/generated-chunk.js new file mode 100644 index 00000000000..ad30223d53c --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/system/generated-chunk.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main4'); + + } + }; +}); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/system/generated-chunk2.js b/test/file-hashes/samples/external-dependency-names/_expected/system/generated-chunk2.js new file mode 100644 index 00000000000..a5cc43bcc37 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/system/generated-chunk2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main5'); + + } + }; +}); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/system/main1.js b/test/file-hashes/samples/external-dependency-names/_expected/system/main1.js new file mode 100644 index 00000000000..fe72dd01fb6 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/system/main1.js @@ -0,0 +1,12 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main1'); + module.import('./generated-chunk.js'); + module.import('./generated-chunk2.js'); + + } + }; +}); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/system/main2.js b/test/file-hashes/samples/external-dependency-names/_expected/system/main2.js new file mode 100644 index 00000000000..80e8224ee07 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/system/main2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main2'); + + } + }; +}); diff --git a/test/file-hashes/samples/external-dependency-names/_expected/system/main3.js b/test/file-hashes/samples/external-dependency-names/_expected/system/main3.js new file mode 100644 index 00000000000..9e741c363b7 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/_expected/system/main3.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main3'); + + } + }; +}); diff --git a/test/file-hashes/samples/external-dependency-names/main1a.js b/test/file-hashes/samples/external-dependency-names/main1a.js new file mode 100644 index 00000000000..cedb294ffee --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/main1a.js @@ -0,0 +1,3 @@ +import 'external'; + +console.log('main'); diff --git a/test/file-hashes/samples/external-dependency-names/main1b.js b/test/file-hashes/samples/external-dependency-names/main1b.js new file mode 100644 index 00000000000..83a6cb712d2 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/main1b.js @@ -0,0 +1,3 @@ +import 'external1'; + +console.log('main'); diff --git a/test/file-hashes/samples/external-dependency-names/main2a.js b/test/file-hashes/samples/external-dependency-names/main2a.js new file mode 100644 index 00000000000..cedb294ffee --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/main2a.js @@ -0,0 +1,3 @@ +import 'external'; + +console.log('main'); diff --git a/test/file-hashes/samples/external-dependency-names/main2b.js b/test/file-hashes/samples/external-dependency-names/main2b.js new file mode 100644 index 00000000000..ff71d9a9dc4 --- /dev/null +++ b/test/file-hashes/samples/external-dependency-names/main2b.js @@ -0,0 +1,3 @@ +import 'external2'; + +console.log('main'); diff --git a/test/file-hashes/samples/footer/_config.js b/test/file-hashes/samples/footer/_config.js new file mode 100644 index 00000000000..2cd86e34536 --- /dev/null +++ b/test/file-hashes/samples/footer/_config.js @@ -0,0 +1,16 @@ +module.exports = { + description: 'creates different hashes if the footer differs', + options1: { + input: 'main', + output: { + footer: 'console.log(1);' + } + }, + options2: { + input: 'main', + output: { + footer: 'console.log(2);' + } + }, + expectedDifferentHashes: ['main'] +}; diff --git a/test/file-hashes/samples/footer/_expected/amd/generated-chunk.js b/test/file-hashes/samples/footer/_expected/amd/generated-chunk.js new file mode 100644 index 00000000000..ed41892cfe1 --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/amd/generated-chunk.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main4'); + +}); diff --git a/test/file-hashes/samples/footer/_expected/amd/generated-chunk2.js b/test/file-hashes/samples/footer/_expected/amd/generated-chunk2.js new file mode 100644 index 00000000000..db3f430c9aa --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/amd/generated-chunk2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main5'); + +}); diff --git a/test/file-hashes/samples/footer/_expected/amd/main1.js b/test/file-hashes/samples/footer/_expected/amd/main1.js new file mode 100644 index 00000000000..97a0f22a858 --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/amd/main1.js @@ -0,0 +1,7 @@ +define(['require'], function (require) { 'use strict'; + + console.log('main1'); + new Promise(function (resolve, reject) { require(['./generated-chunk.js'], resolve, reject) }); + new Promise(function (resolve, reject) { require(['./generated-chunk2.js'], resolve, reject) }); + +}); diff --git a/test/file-hashes/samples/footer/_expected/amd/main2.js b/test/file-hashes/samples/footer/_expected/amd/main2.js new file mode 100644 index 00000000000..b58286ca58e --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/amd/main2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main2'); + +}); diff --git a/test/file-hashes/samples/footer/_expected/amd/main3.js b/test/file-hashes/samples/footer/_expected/amd/main3.js new file mode 100644 index 00000000000..cac48c4d722 --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/amd/main3.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main3'); + +}); diff --git a/test/file-hashes/samples/footer/_expected/cjs/generated-chunk.js b/test/file-hashes/samples/footer/_expected/cjs/generated-chunk.js new file mode 100644 index 00000000000..d27ed956b79 --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/cjs/generated-chunk.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main4'); diff --git a/test/file-hashes/samples/footer/_expected/cjs/generated-chunk2.js b/test/file-hashes/samples/footer/_expected/cjs/generated-chunk2.js new file mode 100644 index 00000000000..e7b2d35b4e8 --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/cjs/generated-chunk2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main5'); diff --git a/test/file-hashes/samples/footer/_expected/cjs/main1.js b/test/file-hashes/samples/footer/_expected/cjs/main1.js new file mode 100644 index 00000000000..ffb10b14b6d --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/cjs/main1.js @@ -0,0 +1,5 @@ +'use strict'; + +console.log('main1'); +Promise.resolve(require('./generated-chunk.js')); +Promise.resolve(require('./generated-chunk2.js')); diff --git a/test/file-hashes/samples/footer/_expected/cjs/main2.js b/test/file-hashes/samples/footer/_expected/cjs/main2.js new file mode 100644 index 00000000000..33fe6f320c2 --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/cjs/main2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main2'); diff --git a/test/file-hashes/samples/footer/_expected/cjs/main3.js b/test/file-hashes/samples/footer/_expected/cjs/main3.js new file mode 100644 index 00000000000..fae32f0b7f2 --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/cjs/main3.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main3'); diff --git a/test/file-hashes/samples/footer/_expected/es/generated-chunk.js b/test/file-hashes/samples/footer/_expected/es/generated-chunk.js new file mode 100644 index 00000000000..f517bece900 --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/es/generated-chunk.js @@ -0,0 +1 @@ +console.log('main4'); diff --git a/test/file-hashes/samples/footer/_expected/es/generated-chunk2.js b/test/file-hashes/samples/footer/_expected/es/generated-chunk2.js new file mode 100644 index 00000000000..1807e01f88e --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/es/generated-chunk2.js @@ -0,0 +1 @@ +console.log('main5'); diff --git a/test/file-hashes/samples/footer/_expected/es/main1.js b/test/file-hashes/samples/footer/_expected/es/main1.js new file mode 100644 index 00000000000..de1c78214cd --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/es/main1.js @@ -0,0 +1,3 @@ +console.log('main1'); +import('./generated-chunk.js'); +import('./generated-chunk2.js'); diff --git a/test/file-hashes/samples/footer/_expected/es/main2.js b/test/file-hashes/samples/footer/_expected/es/main2.js new file mode 100644 index 00000000000..ac653633351 --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/es/main2.js @@ -0,0 +1 @@ +console.log('main2'); diff --git a/test/file-hashes/samples/footer/_expected/es/main3.js b/test/file-hashes/samples/footer/_expected/es/main3.js new file mode 100644 index 00000000000..f44c9f26848 --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/es/main3.js @@ -0,0 +1 @@ +console.log('main3'); diff --git a/test/file-hashes/samples/footer/_expected/system/generated-chunk.js b/test/file-hashes/samples/footer/_expected/system/generated-chunk.js new file mode 100644 index 00000000000..ad30223d53c --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/system/generated-chunk.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main4'); + + } + }; +}); diff --git a/test/file-hashes/samples/footer/_expected/system/generated-chunk2.js b/test/file-hashes/samples/footer/_expected/system/generated-chunk2.js new file mode 100644 index 00000000000..a5cc43bcc37 --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/system/generated-chunk2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main5'); + + } + }; +}); diff --git a/test/file-hashes/samples/footer/_expected/system/main1.js b/test/file-hashes/samples/footer/_expected/system/main1.js new file mode 100644 index 00000000000..fe72dd01fb6 --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/system/main1.js @@ -0,0 +1,12 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main1'); + module.import('./generated-chunk.js'); + module.import('./generated-chunk2.js'); + + } + }; +}); diff --git a/test/file-hashes/samples/footer/_expected/system/main2.js b/test/file-hashes/samples/footer/_expected/system/main2.js new file mode 100644 index 00000000000..80e8224ee07 --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/system/main2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main2'); + + } + }; +}); diff --git a/test/file-hashes/samples/footer/_expected/system/main3.js b/test/file-hashes/samples/footer/_expected/system/main3.js new file mode 100644 index 00000000000..9e741c363b7 --- /dev/null +++ b/test/file-hashes/samples/footer/_expected/system/main3.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main3'); + + } + }; +}); diff --git a/test/file-hashes/samples/footer/main.js b/test/file-hashes/samples/footer/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/file-hashes/samples/footer/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/file-hashes/samples/format/_config.js b/test/file-hashes/samples/format/_config.js new file mode 100644 index 00000000000..22bfa8f6e97 --- /dev/null +++ b/test/file-hashes/samples/format/_config.js @@ -0,0 +1,16 @@ +module.exports = { + description: 'creates different hashes if the format differs', + options1: { + input: 'main', + output: { + format: 'esm' + } + }, + options2: { + input: 'main', + output: { + format: 'cjs' + } + }, + expectedDifferentHashes: ['main'] +}; diff --git a/test/file-hashes/samples/format/_expected/amd/generated-chunk.js b/test/file-hashes/samples/format/_expected/amd/generated-chunk.js new file mode 100644 index 00000000000..ed41892cfe1 --- /dev/null +++ b/test/file-hashes/samples/format/_expected/amd/generated-chunk.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main4'); + +}); diff --git a/test/file-hashes/samples/format/_expected/amd/generated-chunk2.js b/test/file-hashes/samples/format/_expected/amd/generated-chunk2.js new file mode 100644 index 00000000000..db3f430c9aa --- /dev/null +++ b/test/file-hashes/samples/format/_expected/amd/generated-chunk2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main5'); + +}); diff --git a/test/file-hashes/samples/format/_expected/amd/main1.js b/test/file-hashes/samples/format/_expected/amd/main1.js new file mode 100644 index 00000000000..97a0f22a858 --- /dev/null +++ b/test/file-hashes/samples/format/_expected/amd/main1.js @@ -0,0 +1,7 @@ +define(['require'], function (require) { 'use strict'; + + console.log('main1'); + new Promise(function (resolve, reject) { require(['./generated-chunk.js'], resolve, reject) }); + new Promise(function (resolve, reject) { require(['./generated-chunk2.js'], resolve, reject) }); + +}); diff --git a/test/file-hashes/samples/format/_expected/amd/main2.js b/test/file-hashes/samples/format/_expected/amd/main2.js new file mode 100644 index 00000000000..b58286ca58e --- /dev/null +++ b/test/file-hashes/samples/format/_expected/amd/main2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main2'); + +}); diff --git a/test/file-hashes/samples/format/_expected/amd/main3.js b/test/file-hashes/samples/format/_expected/amd/main3.js new file mode 100644 index 00000000000..cac48c4d722 --- /dev/null +++ b/test/file-hashes/samples/format/_expected/amd/main3.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main3'); + +}); diff --git a/test/file-hashes/samples/format/_expected/cjs/generated-chunk.js b/test/file-hashes/samples/format/_expected/cjs/generated-chunk.js new file mode 100644 index 00000000000..d27ed956b79 --- /dev/null +++ b/test/file-hashes/samples/format/_expected/cjs/generated-chunk.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main4'); diff --git a/test/file-hashes/samples/format/_expected/cjs/generated-chunk2.js b/test/file-hashes/samples/format/_expected/cjs/generated-chunk2.js new file mode 100644 index 00000000000..e7b2d35b4e8 --- /dev/null +++ b/test/file-hashes/samples/format/_expected/cjs/generated-chunk2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main5'); diff --git a/test/file-hashes/samples/format/_expected/cjs/main1.js b/test/file-hashes/samples/format/_expected/cjs/main1.js new file mode 100644 index 00000000000..ffb10b14b6d --- /dev/null +++ b/test/file-hashes/samples/format/_expected/cjs/main1.js @@ -0,0 +1,5 @@ +'use strict'; + +console.log('main1'); +Promise.resolve(require('./generated-chunk.js')); +Promise.resolve(require('./generated-chunk2.js')); diff --git a/test/file-hashes/samples/format/_expected/cjs/main2.js b/test/file-hashes/samples/format/_expected/cjs/main2.js new file mode 100644 index 00000000000..33fe6f320c2 --- /dev/null +++ b/test/file-hashes/samples/format/_expected/cjs/main2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main2'); diff --git a/test/file-hashes/samples/format/_expected/cjs/main3.js b/test/file-hashes/samples/format/_expected/cjs/main3.js new file mode 100644 index 00000000000..fae32f0b7f2 --- /dev/null +++ b/test/file-hashes/samples/format/_expected/cjs/main3.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main3'); diff --git a/test/file-hashes/samples/format/_expected/es/generated-chunk.js b/test/file-hashes/samples/format/_expected/es/generated-chunk.js new file mode 100644 index 00000000000..f517bece900 --- /dev/null +++ b/test/file-hashes/samples/format/_expected/es/generated-chunk.js @@ -0,0 +1 @@ +console.log('main4'); diff --git a/test/file-hashes/samples/format/_expected/es/generated-chunk2.js b/test/file-hashes/samples/format/_expected/es/generated-chunk2.js new file mode 100644 index 00000000000..1807e01f88e --- /dev/null +++ b/test/file-hashes/samples/format/_expected/es/generated-chunk2.js @@ -0,0 +1 @@ +console.log('main5'); diff --git a/test/file-hashes/samples/format/_expected/es/main1.js b/test/file-hashes/samples/format/_expected/es/main1.js new file mode 100644 index 00000000000..de1c78214cd --- /dev/null +++ b/test/file-hashes/samples/format/_expected/es/main1.js @@ -0,0 +1,3 @@ +console.log('main1'); +import('./generated-chunk.js'); +import('./generated-chunk2.js'); diff --git a/test/file-hashes/samples/format/_expected/es/main2.js b/test/file-hashes/samples/format/_expected/es/main2.js new file mode 100644 index 00000000000..ac653633351 --- /dev/null +++ b/test/file-hashes/samples/format/_expected/es/main2.js @@ -0,0 +1 @@ +console.log('main2'); diff --git a/test/file-hashes/samples/format/_expected/es/main3.js b/test/file-hashes/samples/format/_expected/es/main3.js new file mode 100644 index 00000000000..f44c9f26848 --- /dev/null +++ b/test/file-hashes/samples/format/_expected/es/main3.js @@ -0,0 +1 @@ +console.log('main3'); diff --git a/test/file-hashes/samples/format/_expected/system/generated-chunk.js b/test/file-hashes/samples/format/_expected/system/generated-chunk.js new file mode 100644 index 00000000000..ad30223d53c --- /dev/null +++ b/test/file-hashes/samples/format/_expected/system/generated-chunk.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main4'); + + } + }; +}); diff --git a/test/file-hashes/samples/format/_expected/system/generated-chunk2.js b/test/file-hashes/samples/format/_expected/system/generated-chunk2.js new file mode 100644 index 00000000000..a5cc43bcc37 --- /dev/null +++ b/test/file-hashes/samples/format/_expected/system/generated-chunk2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main5'); + + } + }; +}); diff --git a/test/file-hashes/samples/format/_expected/system/main1.js b/test/file-hashes/samples/format/_expected/system/main1.js new file mode 100644 index 00000000000..fe72dd01fb6 --- /dev/null +++ b/test/file-hashes/samples/format/_expected/system/main1.js @@ -0,0 +1,12 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main1'); + module.import('./generated-chunk.js'); + module.import('./generated-chunk2.js'); + + } + }; +}); diff --git a/test/file-hashes/samples/format/_expected/system/main2.js b/test/file-hashes/samples/format/_expected/system/main2.js new file mode 100644 index 00000000000..80e8224ee07 --- /dev/null +++ b/test/file-hashes/samples/format/_expected/system/main2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main2'); + + } + }; +}); diff --git a/test/file-hashes/samples/format/_expected/system/main3.js b/test/file-hashes/samples/format/_expected/system/main3.js new file mode 100644 index 00000000000..9e741c363b7 --- /dev/null +++ b/test/file-hashes/samples/format/_expected/system/main3.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main3'); + + } + }; +}); diff --git a/test/file-hashes/samples/format/main.js b/test/file-hashes/samples/format/main.js new file mode 100644 index 00000000000..ad1d380d6cc --- /dev/null +++ b/test/file-hashes/samples/format/main.js @@ -0,0 +1 @@ +export const x = 1; diff --git a/test/file-hashes/samples/intro/_config.js b/test/file-hashes/samples/intro/_config.js new file mode 100644 index 00000000000..20b856275a2 --- /dev/null +++ b/test/file-hashes/samples/intro/_config.js @@ -0,0 +1,16 @@ +module.exports = { + description: 'creates different hashes if the intro differs', + options1: { + input: 'main', + output: { + intro: 'console.log(1);' + } + }, + options2: { + input: 'main', + output: { + intro: 'console.log(2);' + } + }, + expectedDifferentHashes: ['main'] +}; diff --git a/test/file-hashes/samples/intro/_expected/amd/generated-chunk.js b/test/file-hashes/samples/intro/_expected/amd/generated-chunk.js new file mode 100644 index 00000000000..ed41892cfe1 --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/amd/generated-chunk.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main4'); + +}); diff --git a/test/file-hashes/samples/intro/_expected/amd/generated-chunk2.js b/test/file-hashes/samples/intro/_expected/amd/generated-chunk2.js new file mode 100644 index 00000000000..db3f430c9aa --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/amd/generated-chunk2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main5'); + +}); diff --git a/test/file-hashes/samples/intro/_expected/amd/main1.js b/test/file-hashes/samples/intro/_expected/amd/main1.js new file mode 100644 index 00000000000..97a0f22a858 --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/amd/main1.js @@ -0,0 +1,7 @@ +define(['require'], function (require) { 'use strict'; + + console.log('main1'); + new Promise(function (resolve, reject) { require(['./generated-chunk.js'], resolve, reject) }); + new Promise(function (resolve, reject) { require(['./generated-chunk2.js'], resolve, reject) }); + +}); diff --git a/test/file-hashes/samples/intro/_expected/amd/main2.js b/test/file-hashes/samples/intro/_expected/amd/main2.js new file mode 100644 index 00000000000..b58286ca58e --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/amd/main2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main2'); + +}); diff --git a/test/file-hashes/samples/intro/_expected/amd/main3.js b/test/file-hashes/samples/intro/_expected/amd/main3.js new file mode 100644 index 00000000000..cac48c4d722 --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/amd/main3.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main3'); + +}); diff --git a/test/file-hashes/samples/intro/_expected/cjs/generated-chunk.js b/test/file-hashes/samples/intro/_expected/cjs/generated-chunk.js new file mode 100644 index 00000000000..d27ed956b79 --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/cjs/generated-chunk.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main4'); diff --git a/test/file-hashes/samples/intro/_expected/cjs/generated-chunk2.js b/test/file-hashes/samples/intro/_expected/cjs/generated-chunk2.js new file mode 100644 index 00000000000..e7b2d35b4e8 --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/cjs/generated-chunk2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main5'); diff --git a/test/file-hashes/samples/intro/_expected/cjs/main1.js b/test/file-hashes/samples/intro/_expected/cjs/main1.js new file mode 100644 index 00000000000..ffb10b14b6d --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/cjs/main1.js @@ -0,0 +1,5 @@ +'use strict'; + +console.log('main1'); +Promise.resolve(require('./generated-chunk.js')); +Promise.resolve(require('./generated-chunk2.js')); diff --git a/test/file-hashes/samples/intro/_expected/cjs/main2.js b/test/file-hashes/samples/intro/_expected/cjs/main2.js new file mode 100644 index 00000000000..33fe6f320c2 --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/cjs/main2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main2'); diff --git a/test/file-hashes/samples/intro/_expected/cjs/main3.js b/test/file-hashes/samples/intro/_expected/cjs/main3.js new file mode 100644 index 00000000000..fae32f0b7f2 --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/cjs/main3.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main3'); diff --git a/test/file-hashes/samples/intro/_expected/es/generated-chunk.js b/test/file-hashes/samples/intro/_expected/es/generated-chunk.js new file mode 100644 index 00000000000..f517bece900 --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/es/generated-chunk.js @@ -0,0 +1 @@ +console.log('main4'); diff --git a/test/file-hashes/samples/intro/_expected/es/generated-chunk2.js b/test/file-hashes/samples/intro/_expected/es/generated-chunk2.js new file mode 100644 index 00000000000..1807e01f88e --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/es/generated-chunk2.js @@ -0,0 +1 @@ +console.log('main5'); diff --git a/test/file-hashes/samples/intro/_expected/es/main1.js b/test/file-hashes/samples/intro/_expected/es/main1.js new file mode 100644 index 00000000000..de1c78214cd --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/es/main1.js @@ -0,0 +1,3 @@ +console.log('main1'); +import('./generated-chunk.js'); +import('./generated-chunk2.js'); diff --git a/test/file-hashes/samples/intro/_expected/es/main2.js b/test/file-hashes/samples/intro/_expected/es/main2.js new file mode 100644 index 00000000000..ac653633351 --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/es/main2.js @@ -0,0 +1 @@ +console.log('main2'); diff --git a/test/file-hashes/samples/intro/_expected/es/main3.js b/test/file-hashes/samples/intro/_expected/es/main3.js new file mode 100644 index 00000000000..f44c9f26848 --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/es/main3.js @@ -0,0 +1 @@ +console.log('main3'); diff --git a/test/file-hashes/samples/intro/_expected/system/generated-chunk.js b/test/file-hashes/samples/intro/_expected/system/generated-chunk.js new file mode 100644 index 00000000000..ad30223d53c --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/system/generated-chunk.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main4'); + + } + }; +}); diff --git a/test/file-hashes/samples/intro/_expected/system/generated-chunk2.js b/test/file-hashes/samples/intro/_expected/system/generated-chunk2.js new file mode 100644 index 00000000000..a5cc43bcc37 --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/system/generated-chunk2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main5'); + + } + }; +}); diff --git a/test/file-hashes/samples/intro/_expected/system/main1.js b/test/file-hashes/samples/intro/_expected/system/main1.js new file mode 100644 index 00000000000..fe72dd01fb6 --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/system/main1.js @@ -0,0 +1,12 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main1'); + module.import('./generated-chunk.js'); + module.import('./generated-chunk2.js'); + + } + }; +}); diff --git a/test/file-hashes/samples/intro/_expected/system/main2.js b/test/file-hashes/samples/intro/_expected/system/main2.js new file mode 100644 index 00000000000..80e8224ee07 --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/system/main2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main2'); + + } + }; +}); diff --git a/test/file-hashes/samples/intro/_expected/system/main3.js b/test/file-hashes/samples/intro/_expected/system/main3.js new file mode 100644 index 00000000000..9e741c363b7 --- /dev/null +++ b/test/file-hashes/samples/intro/_expected/system/main3.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main3'); + + } + }; +}); diff --git a/test/file-hashes/samples/intro/main.js b/test/file-hashes/samples/intro/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/file-hashes/samples/intro/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/file-hashes/samples/outro/_config.js b/test/file-hashes/samples/outro/_config.js new file mode 100644 index 00000000000..c0859f7f010 --- /dev/null +++ b/test/file-hashes/samples/outro/_config.js @@ -0,0 +1,16 @@ +module.exports = { + description: 'creates different hashes if the outro differs', + options1: { + input: 'main', + output: { + outro: 'console.log(1);' + } + }, + options2: { + input: 'main', + output: { + outro: 'console.log(2);' + } + }, + expectedDifferentHashes: ['main'] +}; diff --git a/test/file-hashes/samples/outro/_expected/amd/generated-chunk.js b/test/file-hashes/samples/outro/_expected/amd/generated-chunk.js new file mode 100644 index 00000000000..ed41892cfe1 --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/amd/generated-chunk.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main4'); + +}); diff --git a/test/file-hashes/samples/outro/_expected/amd/generated-chunk2.js b/test/file-hashes/samples/outro/_expected/amd/generated-chunk2.js new file mode 100644 index 00000000000..db3f430c9aa --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/amd/generated-chunk2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main5'); + +}); diff --git a/test/file-hashes/samples/outro/_expected/amd/main1.js b/test/file-hashes/samples/outro/_expected/amd/main1.js new file mode 100644 index 00000000000..97a0f22a858 --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/amd/main1.js @@ -0,0 +1,7 @@ +define(['require'], function (require) { 'use strict'; + + console.log('main1'); + new Promise(function (resolve, reject) { require(['./generated-chunk.js'], resolve, reject) }); + new Promise(function (resolve, reject) { require(['./generated-chunk2.js'], resolve, reject) }); + +}); diff --git a/test/file-hashes/samples/outro/_expected/amd/main2.js b/test/file-hashes/samples/outro/_expected/amd/main2.js new file mode 100644 index 00000000000..b58286ca58e --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/amd/main2.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main2'); + +}); diff --git a/test/file-hashes/samples/outro/_expected/amd/main3.js b/test/file-hashes/samples/outro/_expected/amd/main3.js new file mode 100644 index 00000000000..cac48c4d722 --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/amd/main3.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main3'); + +}); diff --git a/test/file-hashes/samples/outro/_expected/cjs/generated-chunk.js b/test/file-hashes/samples/outro/_expected/cjs/generated-chunk.js new file mode 100644 index 00000000000..d27ed956b79 --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/cjs/generated-chunk.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main4'); diff --git a/test/file-hashes/samples/outro/_expected/cjs/generated-chunk2.js b/test/file-hashes/samples/outro/_expected/cjs/generated-chunk2.js new file mode 100644 index 00000000000..e7b2d35b4e8 --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/cjs/generated-chunk2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main5'); diff --git a/test/file-hashes/samples/outro/_expected/cjs/main1.js b/test/file-hashes/samples/outro/_expected/cjs/main1.js new file mode 100644 index 00000000000..ffb10b14b6d --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/cjs/main1.js @@ -0,0 +1,5 @@ +'use strict'; + +console.log('main1'); +Promise.resolve(require('./generated-chunk.js')); +Promise.resolve(require('./generated-chunk2.js')); diff --git a/test/file-hashes/samples/outro/_expected/cjs/main2.js b/test/file-hashes/samples/outro/_expected/cjs/main2.js new file mode 100644 index 00000000000..33fe6f320c2 --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/cjs/main2.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main2'); diff --git a/test/file-hashes/samples/outro/_expected/cjs/main3.js b/test/file-hashes/samples/outro/_expected/cjs/main3.js new file mode 100644 index 00000000000..fae32f0b7f2 --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/cjs/main3.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main3'); diff --git a/test/file-hashes/samples/outro/_expected/es/generated-chunk.js b/test/file-hashes/samples/outro/_expected/es/generated-chunk.js new file mode 100644 index 00000000000..f517bece900 --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/es/generated-chunk.js @@ -0,0 +1 @@ +console.log('main4'); diff --git a/test/file-hashes/samples/outro/_expected/es/generated-chunk2.js b/test/file-hashes/samples/outro/_expected/es/generated-chunk2.js new file mode 100644 index 00000000000..1807e01f88e --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/es/generated-chunk2.js @@ -0,0 +1 @@ +console.log('main5'); diff --git a/test/file-hashes/samples/outro/_expected/es/main1.js b/test/file-hashes/samples/outro/_expected/es/main1.js new file mode 100644 index 00000000000..de1c78214cd --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/es/main1.js @@ -0,0 +1,3 @@ +console.log('main1'); +import('./generated-chunk.js'); +import('./generated-chunk2.js'); diff --git a/test/file-hashes/samples/outro/_expected/es/main2.js b/test/file-hashes/samples/outro/_expected/es/main2.js new file mode 100644 index 00000000000..ac653633351 --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/es/main2.js @@ -0,0 +1 @@ +console.log('main2'); diff --git a/test/file-hashes/samples/outro/_expected/es/main3.js b/test/file-hashes/samples/outro/_expected/es/main3.js new file mode 100644 index 00000000000..f44c9f26848 --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/es/main3.js @@ -0,0 +1 @@ +console.log('main3'); diff --git a/test/file-hashes/samples/outro/_expected/system/generated-chunk.js b/test/file-hashes/samples/outro/_expected/system/generated-chunk.js new file mode 100644 index 00000000000..ad30223d53c --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/system/generated-chunk.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main4'); + + } + }; +}); diff --git a/test/file-hashes/samples/outro/_expected/system/generated-chunk2.js b/test/file-hashes/samples/outro/_expected/system/generated-chunk2.js new file mode 100644 index 00000000000..a5cc43bcc37 --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/system/generated-chunk2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main5'); + + } + }; +}); diff --git a/test/file-hashes/samples/outro/_expected/system/main1.js b/test/file-hashes/samples/outro/_expected/system/main1.js new file mode 100644 index 00000000000..fe72dd01fb6 --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/system/main1.js @@ -0,0 +1,12 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main1'); + module.import('./generated-chunk.js'); + module.import('./generated-chunk2.js'); + + } + }; +}); diff --git a/test/file-hashes/samples/outro/_expected/system/main2.js b/test/file-hashes/samples/outro/_expected/system/main2.js new file mode 100644 index 00000000000..80e8224ee07 --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/system/main2.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main2'); + + } + }; +}); diff --git a/test/file-hashes/samples/outro/_expected/system/main3.js b/test/file-hashes/samples/outro/_expected/system/main3.js new file mode 100644 index 00000000000..9e741c363b7 --- /dev/null +++ b/test/file-hashes/samples/outro/_expected/system/main3.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + console.log('main3'); + + } + }; +}); diff --git a/test/file-hashes/samples/outro/main.js b/test/file-hashes/samples/outro/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/file-hashes/samples/outro/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/file-hashes/samples/respects-exports/_config.js b/test/file-hashes/samples/respects-exports/_config.js deleted file mode 100644 index 0a575de5c29..00000000000 --- a/test/file-hashes/samples/respects-exports/_config.js +++ /dev/null @@ -1,10 +0,0 @@ -module.exports = { - description: 'creates different hashes if the content is equal but the generated exports differ', - options1: { - input: ['main1', 'other'] - }, - options2: { - input: ['main2', 'other'] - }, - expectedDifferentHashes: ['dep.js'] -}; diff --git a/test/misc/bundle-information.js b/test/misc/bundle-information.js index 44f11d2aee9..2c63a984d00 100644 --- a/test/misc/bundle-information.js +++ b/test/misc/bundle-information.js @@ -26,14 +26,14 @@ describe('The bundle object', () => { .then(({ output }) => { assert.deepEqual( output.map(chunk => chunk.fileName), - ['input1-02f7855a.js', 'input2-253c4620.js', 'generated-chunk-d6db1a1e.js'], + ['input1-6b4c6b1b.js', 'input2-95ec3647.js', 'generated-chunk-e9283962.js'], 'fileName' ); assert.deepEqual( output.map(chunk => chunk.code), [ - `import './generated-chunk-d6db1a1e.js';\n\nconsole.log("input1");const out = true;\n\nexport { out };\n`, - `import './generated-chunk-d6db1a1e.js';\n\nconsole.log("input2");var input2 = 42;\n\nexport default input2;\n`, + `import './generated-chunk-e9283962.js';\n\nconsole.log("input1");const out = true;\n\nexport { out };\n`, + `import './generated-chunk-e9283962.js';\n\nconsole.log("input2");var input2 = 42;\n\nexport default input2;\n`, 'console.log("shared");\n' ], 'code' @@ -48,7 +48,7 @@ describe('The bundle object', () => { ); assert.deepEqual( output.map(chunk => chunk.imports), - [['generated-chunk-d6db1a1e.js'], ['generated-chunk-d6db1a1e.js'], []], + [['generated-chunk-e9283962.js'], ['generated-chunk-e9283962.js'], []], 'imports' ); assert.deepEqual(output.map(chunk => chunk.dynamicImports), [[], [], []], 'dynamicImports'); diff --git a/test/misc/misc.js b/test/misc/misc.js index 803d6430ec8..e0f23574c09 100644 --- a/test/misc/misc.js +++ b/test/misc/misc.js @@ -86,8 +86,8 @@ describe('misc', () => { assert.deepEqual(output.map(({ fileName }) => fileName), [ 'main1.js', 'main2.js', - 'chunk-82df00d2.js', - 'chunk-b9217e30.js' + 'chunk-9d1272f4.js', + 'chunk-80285050.js' ]); }); });