From 260e107a4e125e5e8238c98a21540ec27fc10981 Mon Sep 17 00:00:00 2001 From: Ben Scott Date: Sun, 14 Nov 2021 12:09:24 +0000 Subject: [PATCH] Fix existing tests - virtual files now have a .js extension by default - systemjs module references include this file extension - amd module references omit this file extension. this seems to be consistent with amd output of other chunks --- ...s-exports => other.js_commonjs-exports.js} | 0 ...s-exports => other.js_commonjs-exports.js} | 0 .../_expected/cjs/commonjs.js | 2 +- .../_expected/cjs/other.js | 2 +- ...s-exports => other.js_commonjs-exports.js} | 0 .../_expected/es/commonjs.js | 2 +- .../_expected/es/other.js | 4 ++-- ...s-exports => other.js_commonjs-exports.js} | 0 .../_expected/system/commonjs.js | 2 +- .../_expected/system/other.js | 2 +- .../{_virtualModule => _virtualModule.js} | 0 .../{_virtualModule => _virtualModule.js} | 0 .../_expected/cjs/main.js | 2 +- .../{_virtualModule => _virtualModule.js} | 0 .../_expected/es/main.js | 2 +- .../{_virtualModule => _virtualModule.js} | 0 .../_expected/system/main.js | 2 +- ...s-exports => other.js_commonjs-exports.js} | 0 ...s-exports => other.js_commonjs-exports.js} | 0 .../_expected/cjs/commonjs.js | 2 +- .../_expected/cjs/other.js | 2 +- ...s-exports => other.js_commonjs-exports.js} | 0 .../_expected/es/commonjs.js | 2 +- .../_expected/es/other.js | 4 ++-- ...s-exports => other.js_commonjs-exports.js} | 0 .../_expected/system/commonjs.js | 2 +- .../_expected/system/other.js | 2 +- ...s-exports => index.js_commonjs-exports.js} | 0 ...s-exports => index.js_commonjs-exports.js} | 0 .../_expected/cjs/below/module.js | 2 +- .../@my-scope/my-base-pkg/index.js | 2 +- .../_expected/cjs/under-build.js | 2 +- ...s-exports => index.js_commonjs-exports.js} | 0 .../_expected/es/below/module.js | 2 +- .../@my-scope/my-base-pkg/index.js | 4 ++-- .../_expected/es/under-build.js | 2 +- ...s-exports => index.js_commonjs-exports.js} | 0 .../_expected/system/below/module.js | 2 +- .../@my-scope/my-base-pkg/index.js | 2 +- .../_expected/system/under-build.js | 2 +- .../{_virtualModule => _virtualModule.js} | 0 .../{_virtualModule => _virtualModule.js} | 0 .../_expected/cjs/main.js | 2 +- .../{_virtualModule => _virtualModule.js} | 0 .../_expected/es/main.js | 2 +- .../{_virtualModule => _virtualModule.js} | 0 .../_expected/system/main.js | 2 +- .../virtual-modules/_config.js | 2 +- .../virtual-modules/_config.js | 2 +- test/misc/bundle-information.js | 19 ++++++++++++------- 50 files changed, 44 insertions(+), 39 deletions(-) rename test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/_virtual/{other.js_commonjs-exports => other.js_commonjs-exports.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/_virtual/{other.js_commonjs-exports => other.js_commonjs-exports.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/_virtual/{other.js_commonjs-exports => other.js_commonjs-exports.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/_virtual/{other.js_commonjs-exports => other.js_commonjs-exports.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/amd/_virtual/{_virtualModule => _virtualModule.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/_virtual/{_virtualModule => _virtualModule.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/es/_virtual/{_virtualModule => _virtualModule.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/system/_virtual/{_virtualModule => _virtualModule.js} (100%) rename test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/{other.js_commonjs-exports => other.js_commonjs-exports.js} (100%) rename test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/{other.js_commonjs-exports => other.js_commonjs-exports.js} (100%) rename test/chunking-form/samples/preserve-modules-commonjs/_expected/es/_virtual/{other.js_commonjs-exports => other.js_commonjs-exports.js} (100%) rename test/chunking-form/samples/preserve-modules-commonjs/_expected/system/_virtual/{other.js_commonjs-exports => other.js_commonjs-exports.js} (100%) rename test/chunking-form/samples/preserve-modules-root/_expected/amd/_virtual/{index.js_commonjs-exports => index.js_commonjs-exports.js} (100%) rename test/chunking-form/samples/preserve-modules-root/_expected/cjs/_virtual/{index.js_commonjs-exports => index.js_commonjs-exports.js} (100%) rename test/chunking-form/samples/preserve-modules-root/_expected/es/_virtual/{index.js_commonjs-exports => index.js_commonjs-exports.js} (100%) rename test/chunking-form/samples/preserve-modules-root/_expected/system/_virtual/{index.js_commonjs-exports => index.js_commonjs-exports.js} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/{_virtualModule => _virtualModule.js} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/{_virtualModule => _virtualModule.js} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules/_expected/es/_virtual/{_virtualModule => _virtualModule.js} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules/_expected/system/_virtual/{_virtualModule => _virtualModule.js} (100%) diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/_virtual/other.js_commonjs-exports b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/_virtual/other.js_commonjs-exports.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/_virtual/other.js_commonjs-exports rename to test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/_virtual/other.js_commonjs-exports.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/_virtual/other.js_commonjs-exports b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/_virtual/other.js_commonjs-exports.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/_virtual/other.js_commonjs-exports rename to test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/_virtual/other.js_commonjs-exports.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js index 9d8a2671e86..4f3a50071b2 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js @@ -2,7 +2,7 @@ var require$$0 = require('external'); require('./other.js'); -var other = require('./_virtual/other.js_commonjs-exports'); +var other = require('./_virtual/other.js_commonjs-exports.js'); function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/other.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/other.js index a514a7d358f..0c28672ba27 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/other.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/other.js @@ -1,6 +1,6 @@ 'use strict'; -var other = require('./_virtual/other.js_commonjs-exports'); +var other = require('./_virtual/other.js_commonjs-exports.js'); other.__exports.value = 43; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/_virtual/other.js_commonjs-exports b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/_virtual/other.js_commonjs-exports.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/_virtual/other.js_commonjs-exports rename to test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/_virtual/other.js_commonjs-exports.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/commonjs.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/commonjs.js index a301391b5fc..643dfd6b0ac 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/commonjs.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/commonjs.js @@ -1,6 +1,6 @@ import require$$0 from 'external'; import './other.js'; -import { __exports as other } from './_virtual/other.js_commonjs-exports'; +import { __exports as other } from './_virtual/other.js_commonjs-exports.js'; const external = require$$0; const { value } = other; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/other.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/other.js index f9d6ad0cb3c..180a5f6c9d5 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/other.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/other.js @@ -1,4 +1,4 @@ -import { __exports as other } from './_virtual/other.js_commonjs-exports'; -export { __exports as default } from './_virtual/other.js_commonjs-exports'; +import { __exports as other } from './_virtual/other.js_commonjs-exports.js'; +export { __exports as default } from './_virtual/other.js_commonjs-exports.js'; other.value = 43; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/_virtual/other.js_commonjs-exports b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/_virtual/other.js_commonjs-exports.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/_virtual/other.js_commonjs-exports rename to test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/_virtual/other.js_commonjs-exports.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js index 0df36bf9a75..e5183e581cc 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js @@ -1,4 +1,4 @@ -System.register(['external', './other.js', './_virtual/other.js_commonjs-exports'], (function (exports) { +System.register(['external', './other.js', './_virtual/other.js_commonjs-exports.js'], (function (exports) { 'use strict'; var require$$0, other; return { diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js index 0c908825185..6fd8ed491ce 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js @@ -1,4 +1,4 @@ -System.register(['./_virtual/other.js_commonjs-exports'], (function (exports) { +System.register(['./_virtual/other.js_commonjs-exports.js'], (function (exports) { 'use strict'; var other; return { diff --git a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule rename to test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule rename to test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/main.js index c32672f1b85..a3d4133c5c7 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var _virtualModule = require('./_virtual/_virtualModule'); +var _virtualModule = require('./_virtual/_virtualModule.js'); assert.equal(_virtualModule.virtual, 'Virtual!'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/es/_virtual/_virtualModule b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/es/_virtual/_virtualModule.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/es/_virtual/_virtualModule rename to test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/es/_virtual/_virtualModule.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/es/main.js b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/es/main.js index 6bb75abdf27..96f7b331789 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/es/main.js @@ -1,3 +1,3 @@ -import { virtual } from './_virtual/_virtualModule'; +import { virtual } from './_virtual/_virtualModule.js'; assert.equal(virtual, 'Virtual!'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/system/_virtual/_virtualModule b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/system/_virtual/_virtualModule.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/system/_virtual/_virtualModule rename to test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/system/_virtual/_virtualModule.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/system/main.js index eed2c557e47..f92fd60397b 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./_virtual/_virtualModule'], (function () { +System.register(['./_virtual/_virtualModule.js'], (function () { 'use strict'; var virtual; return { diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js_commonjs-exports b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js_commonjs-exports.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js_commonjs-exports rename to test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js_commonjs-exports.js diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js_commonjs-exports b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js_commonjs-exports.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js_commonjs-exports rename to test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js_commonjs-exports.js diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js index 9d8a2671e86..4f3a50071b2 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js @@ -2,7 +2,7 @@ var require$$0 = require('external'); require('./other.js'); -var other = require('./_virtual/other.js_commonjs-exports'); +var other = require('./_virtual/other.js_commonjs-exports.js'); function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/other.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/other.js index a514a7d358f..0c28672ba27 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/other.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/other.js @@ -1,6 +1,6 @@ 'use strict'; -var other = require('./_virtual/other.js_commonjs-exports'); +var other = require('./_virtual/other.js_commonjs-exports.js'); other.__exports.value = 43; diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/_virtual/other.js_commonjs-exports b/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/_virtual/other.js_commonjs-exports.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-commonjs/_expected/es/_virtual/other.js_commonjs-exports rename to test/chunking-form/samples/preserve-modules-commonjs/_expected/es/_virtual/other.js_commonjs-exports.js diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/commonjs.js index a301391b5fc..643dfd6b0ac 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/commonjs.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/commonjs.js @@ -1,6 +1,6 @@ import require$$0 from 'external'; import './other.js'; -import { __exports as other } from './_virtual/other.js_commonjs-exports'; +import { __exports as other } from './_virtual/other.js_commonjs-exports.js'; const external = require$$0; const { value } = other; diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/other.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/other.js index f9d6ad0cb3c..180a5f6c9d5 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/other.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/other.js @@ -1,4 +1,4 @@ -import { __exports as other } from './_virtual/other.js_commonjs-exports'; -export { __exports as default } from './_virtual/other.js_commonjs-exports'; +import { __exports as other } from './_virtual/other.js_commonjs-exports.js'; +export { __exports as default } from './_virtual/other.js_commonjs-exports.js'; other.value = 43; diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/_virtual/other.js_commonjs-exports b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/_virtual/other.js_commonjs-exports.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-commonjs/_expected/system/_virtual/other.js_commonjs-exports rename to test/chunking-form/samples/preserve-modules-commonjs/_expected/system/_virtual/other.js_commonjs-exports.js diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js index 0df36bf9a75..e5183e581cc 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js @@ -1,4 +1,4 @@ -System.register(['external', './other.js', './_virtual/other.js_commonjs-exports'], (function (exports) { +System.register(['external', './other.js', './_virtual/other.js_commonjs-exports.js'], (function (exports) { 'use strict'; var require$$0, other; return { diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js index 0c908825185..6fd8ed491ce 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js @@ -1,4 +1,4 @@ -System.register(['./_virtual/other.js_commonjs-exports'], (function (exports) { +System.register(['./_virtual/other.js_commonjs-exports.js'], (function (exports) { 'use strict'; var other; return { diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/amd/_virtual/index.js_commonjs-exports b/test/chunking-form/samples/preserve-modules-root/_expected/amd/_virtual/index.js_commonjs-exports.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-root/_expected/amd/_virtual/index.js_commonjs-exports rename to test/chunking-form/samples/preserve-modules-root/_expected/amd/_virtual/index.js_commonjs-exports.js diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/cjs/_virtual/index.js_commonjs-exports b/test/chunking-form/samples/preserve-modules-root/_expected/cjs/_virtual/index.js_commonjs-exports.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-root/_expected/cjs/_virtual/index.js_commonjs-exports rename to test/chunking-form/samples/preserve-modules-root/_expected/cjs/_virtual/index.js_commonjs-exports.js diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/cjs/below/module.js b/test/chunking-form/samples/preserve-modules-root/_expected/cjs/below/module.js index e3a47727a0d..24502570011 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/cjs/below/module.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/cjs/below/module.js @@ -1,7 +1,7 @@ 'use strict'; require('../custom_modules/@my-scope/my-base-pkg/index.js'); -var index = require('../_virtual/index.js_commonjs-exports'); +var index = require('../_virtual/index.js_commonjs-exports.js'); const base2 = index.__exports; diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/cjs/custom_modules/@my-scope/my-base-pkg/index.js b/test/chunking-form/samples/preserve-modules-root/_expected/cjs/custom_modules/@my-scope/my-base-pkg/index.js index 64f5ebacc3f..5766b8f61f1 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/cjs/custom_modules/@my-scope/my-base-pkg/index.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/cjs/custom_modules/@my-scope/my-base-pkg/index.js @@ -1,6 +1,6 @@ 'use strict'; -var index = require('../../../_virtual/index.js_commonjs-exports'); +var index = require('../../../_virtual/index.js_commonjs-exports.js'); Object.defineProperty(index.__exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/cjs/under-build.js b/test/chunking-form/samples/preserve-modules-root/_expected/cjs/under-build.js index 60f12b2b07f..dc269d6be5c 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/cjs/under-build.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/cjs/under-build.js @@ -1,7 +1,7 @@ 'use strict'; require('./custom_modules/@my-scope/my-base-pkg/index.js'); -var index = require('./_virtual/index.js_commonjs-exports'); +var index = require('./_virtual/index.js_commonjs-exports.js'); const base = index.__exports; diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/es/_virtual/index.js_commonjs-exports b/test/chunking-form/samples/preserve-modules-root/_expected/es/_virtual/index.js_commonjs-exports.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-root/_expected/es/_virtual/index.js_commonjs-exports rename to test/chunking-form/samples/preserve-modules-root/_expected/es/_virtual/index.js_commonjs-exports.js diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/es/below/module.js b/test/chunking-form/samples/preserve-modules-root/_expected/es/below/module.js index b0b5587c304..594640e5d5a 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/es/below/module.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/es/below/module.js @@ -1,5 +1,5 @@ import '../custom_modules/@my-scope/my-base-pkg/index.js'; -import { __exports as myBasePkg } from '../_virtual/index.js_commonjs-exports'; +import { __exports as myBasePkg } from '../_virtual/index.js_commonjs-exports.js'; const base2 = myBasePkg; diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/es/custom_modules/@my-scope/my-base-pkg/index.js b/test/chunking-form/samples/preserve-modules-root/_expected/es/custom_modules/@my-scope/my-base-pkg/index.js index 5c1ff69b019..d77cdc8b84e 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/es/custom_modules/@my-scope/my-base-pkg/index.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/es/custom_modules/@my-scope/my-base-pkg/index.js @@ -1,5 +1,5 @@ -import { __exports as myBasePkg } from '../../../_virtual/index.js_commonjs-exports'; -export { __exports as default } from '../../../_virtual/index.js_commonjs-exports'; +import { __exports as myBasePkg } from '../../../_virtual/index.js_commonjs-exports.js'; +export { __exports as default } from '../../../_virtual/index.js_commonjs-exports.js'; Object.defineProperty(myBasePkg, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/es/under-build.js b/test/chunking-form/samples/preserve-modules-root/_expected/es/under-build.js index 17be990060c..4bc029cb9f9 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/es/under-build.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/es/under-build.js @@ -1,5 +1,5 @@ import './custom_modules/@my-scope/my-base-pkg/index.js'; -import { __exports as myBasePkg } from './_virtual/index.js_commonjs-exports'; +import { __exports as myBasePkg } from './_virtual/index.js_commonjs-exports.js'; const base = myBasePkg; diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/system/_virtual/index.js_commonjs-exports b/test/chunking-form/samples/preserve-modules-root/_expected/system/_virtual/index.js_commonjs-exports.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-root/_expected/system/_virtual/index.js_commonjs-exports rename to test/chunking-form/samples/preserve-modules-root/_expected/system/_virtual/index.js_commonjs-exports.js diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module.js b/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module.js index 9544e4c8178..baeb375c26d 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module.js @@ -1,4 +1,4 @@ -System.register(['../custom_modules/@my-scope/my-base-pkg/index.js', '../_virtual/index.js_commonjs-exports'], (function (exports) { +System.register(['../custom_modules/@my-scope/my-base-pkg/index.js', '../_virtual/index.js_commonjs-exports.js'], (function (exports) { 'use strict'; var myBasePkg; return { diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js b/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js index 840aa037c93..6151b15c986 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js @@ -1,4 +1,4 @@ -System.register(['../../../_virtual/index.js_commonjs-exports'], (function (exports) { +System.register(['../../../_virtual/index.js_commonjs-exports.js'], (function (exports) { 'use strict'; var myBasePkg; return { diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build.js b/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build.js index 178399de6aa..ff4a383d998 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build.js @@ -1,4 +1,4 @@ -System.register(['./custom_modules/@my-scope/my-base-pkg/index.js', './_virtual/index.js_commonjs-exports'], (function (exports) { +System.register(['./custom_modules/@my-scope/my-base-pkg/index.js', './_virtual/index.js_commonjs-exports.js'], (function (exports) { 'use strict'; var myBasePkg; return { diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule rename to test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule rename to test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/main.js index c32672f1b85..a3d4133c5c7 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var _virtualModule = require('./_virtual/_virtualModule'); +var _virtualModule = require('./_virtual/_virtualModule.js'); assert.equal(_virtualModule.virtual, 'Virtual!'); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/es/_virtual/_virtualModule b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/es/_virtual/_virtualModule.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules/_expected/es/_virtual/_virtualModule rename to test/chunking-form/samples/preserve-modules-virtual-modules/_expected/es/_virtual/_virtualModule.js diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/es/main.js b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/es/main.js index 6bb75abdf27..96f7b331789 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/es/main.js +++ b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/es/main.js @@ -1,3 +1,3 @@ -import { virtual } from './_virtual/_virtualModule'; +import { virtual } from './_virtual/_virtualModule.js'; assert.equal(virtual, 'Virtual!'); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/system/_virtual/_virtualModule b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/system/_virtual/_virtualModule.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules/_expected/system/_virtual/_virtualModule rename to test/chunking-form/samples/preserve-modules-virtual-modules/_expected/system/_virtual/_virtualModule.js diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/system/main.js index eed2c557e47..f92fd60397b 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./_virtual/_virtualModule'], (function () { +System.register(['./_virtual/_virtualModule.js'], (function () { 'use strict'; var virtual; return { diff --git a/test/function/samples/deprecated/preserveModules/virtual-modules/_config.js b/test/function/samples/deprecated/preserveModules/virtual-modules/_config.js index 47d4dfa4303..ece89c970b4 100644 --- a/test/function/samples/deprecated/preserveModules/virtual-modules/_config.js +++ b/test/function/samples/deprecated/preserveModules/virtual-modules/_config.js @@ -26,7 +26,7 @@ module.exports = { return bundle.generate({ format: 'es' }).then(generated => assert.deepEqual( generated.output.map(chunk => chunk.fileName), - ['main.js', '_virtual/_virtualModule', 'lib/lib.js'] + ['main.js', '_virtual/_virtualModule.js', 'lib/lib.js'] ) ); } diff --git a/test/function/samples/preserve-modules/virtual-modules/_config.js b/test/function/samples/preserve-modules/virtual-modules/_config.js index 8965977575f..6749601a266 100644 --- a/test/function/samples/preserve-modules/virtual-modules/_config.js +++ b/test/function/samples/preserve-modules/virtual-modules/_config.js @@ -23,7 +23,7 @@ module.exports = { return bundle.generate({ format: 'es', preserveModules: true }).then(generated => assert.deepEqual( generated.output.map(chunk => chunk.fileName), - ['main.js', '_virtual/_virtualModule', 'lib/lib.js'] + ['main.js', '_virtual/_virtualModule.js', 'lib/lib.js'] ) ); } diff --git a/test/misc/bundle-information.js b/test/misc/bundle-information.js index e45ac2fa5e3..69c24e226ce 100644 --- a/test/misc/bundle-information.js +++ b/test/misc/bundle-information.js @@ -480,7 +480,12 @@ describe('The bundle object', () => { .then(({ output }) => { assert.deepEqual( output.map(chunk => chunk.fileName), - ['_virtual/input', '_virtual/dynamic1', '_virtual/other', '_virtual/dynamic2'], + [ + '_virtual/input.js', + '_virtual/dynamic1.js', + '_virtual/other.js', + '_virtual/dynamic2.js' + ], 'fileName' ); assert.deepEqual( @@ -491,9 +496,9 @@ describe('The bundle object', () => { assert.deepEqual( output.map(chunk => chunk.code), [ - `import { other } from './other'; + `import { other } from './other.js'; -console.log(other);Promise.all([import('./dynamic1'), import('./dynamic2')]).then(([{dynamic1}, {dynamic2}]) => console.log(dynamic1, dynamic2));\n`, +console.log(other);Promise.all([import('./dynamic1.js'), import('./dynamic2.js')]).then(([{dynamic1}, {dynamic2}]) => console.log(dynamic1, dynamic2));\n`, 'const dynamic1 = "dynamic1";\n\nexport { dynamic1 };\n', 'const other = "other";\n\nexport { other };\n', 'const dynamic2 = "dynamic2";\n\nexport { dynamic2 };\n' @@ -507,12 +512,12 @@ console.log(other);Promise.all([import('./dynamic1'), import('./dynamic2')]).the ); assert.deepEqual( output.map(chunk => chunk.imports), - [['_virtual/other'], [], [], []], + [['_virtual/other.js'], [], [], []], 'imports' ); assert.deepEqual( output.map(chunk => chunk.importedBindings), - [{ '_virtual/other': ['other'] }, {}, {}, {}], + [{ '_virtual/other.js': ['other'] }, {}, {}, {}], 'importedBindings' ); assert.deepEqual( @@ -522,7 +527,7 @@ console.log(other);Promise.all([import('./dynamic1'), import('./dynamic2')]).the ); assert.deepEqual( output.map(chunk => chunk.dynamicImports), - [['_virtual/dynamic1', '_virtual/dynamic2'], [], [], []], + [['_virtual/dynamic1.js', '_virtual/dynamic2.js'], [], [], []], 'dynamicImports' ); assert.deepEqual( @@ -530,7 +535,7 @@ console.log(other);Promise.all([import('./dynamic1'), import('./dynamic2')]).the [ { input: { - code: "console.log(other);Promise.all([import('./dynamic1'), import('./dynamic2')]).then(([{dynamic1}, {dynamic2}]) => console.log(dynamic1, dynamic2));", + code: "console.log(other);Promise.all([import('./dynamic1.js'), import('./dynamic2.js')]).then(([{dynamic1}, {dynamic2}]) => console.log(dynamic1, dynamic2));", originalLength: 169, removedExports: [], renderedExports: [],