diff --git a/src/utils/deconflictChunk.ts b/src/utils/deconflictChunk.ts index d6c5f43be67..4b2db098e32 100644 --- a/src/utils/deconflictChunk.ts +++ b/src/utils/deconflictChunk.ts @@ -36,6 +36,7 @@ export function deconflictChunk( Object.assign(usedNames, forbiddenNames); Object.assign(usedNames, formatGlobals); addUsedGlobalNames(usedNames, modules); + deconflictTopLevelVariables(usedNames, modules); DECONFLICT_IMPORTED_VARIABLES_BY_FORMAT[format]( usedNames, imports, @@ -43,7 +44,6 @@ export function deconflictChunk( interop, preserveModules ); - deconflictTopLevelVariables(usedNames, modules); for (const module of modules) { module.scope.deconflict(forbiddenNames); @@ -126,8 +126,8 @@ function deconflictTopLevelVariables(usedNames: NameCollection, modules: Module[ const variable = moduleVariables[name]; if ( variable.included && - !// this will only happen for exports in some formats - ( + // this will only happen for exports in some formats + !( variable.renderBaseName || (variable instanceof ExportDefaultVariable && variable.referencesOriginal()) ) diff --git a/test/chunking-form/samples/basic-chunking/_expected/es/main1.js b/test/chunking-form/samples/basic-chunking/_expected/es/main1.js index cb8fc18ee65..6d4f2531150 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/es/main1.js +++ b/test/chunking-form/samples/basic-chunking/_expected/es/main1.js @@ -1,13 +1,13 @@ -import { a as fn } from './generated-chunk.js'; +import { a as fn$1 } from './generated-chunk.js'; -function fn$1 () { +function fn () { console.log('dep1 fn'); } class Main1 { constructor () { - fn$1(); fn(); + fn$1(); } } diff --git a/test/chunking-form/samples/basic-chunking/_expected/es/main2.js b/test/chunking-form/samples/basic-chunking/_expected/es/main2.js index 9d1a5289463..ac6858dc5af 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/es/main2.js +++ b/test/chunking-form/samples/basic-chunking/_expected/es/main2.js @@ -1,18 +1,18 @@ -import { a as fn } from './generated-chunk.js'; +import { a as fn$2 } from './generated-chunk.js'; -function fn$1 () { +function fn () { console.log('lib1 fn'); } -function fn$2 () { - fn$1(); +function fn$1 () { + fn(); console.log('dep3 fn'); } class Main2 { constructor () { + fn$1(); fn$2(); - fn(); } } diff --git a/test/chunking-form/samples/basic-chunking/_expected/system/main1.js b/test/chunking-form/samples/basic-chunking/_expected/system/main1.js index 3e5709e5f85..f99f3442d10 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/system/main1.js +++ b/test/chunking-form/samples/basic-chunking/_expected/system/main1.js @@ -1,20 +1,20 @@ System.register(['./generated-chunk.js'], function (exports, module) { 'use strict'; - var fn; + var fn$1; return { setters: [function (module) { - fn = module.a; + fn$1 = module.a; }], execute: function () { - function fn$1 () { + function fn () { console.log('dep1 fn'); } class Main1 { constructor () { - fn$1(); fn(); + fn$1(); } } exports('default', Main1); diff --git a/test/chunking-form/samples/basic-chunking/_expected/system/main2.js b/test/chunking-form/samples/basic-chunking/_expected/system/main2.js index f765c580575..25e963f1174 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/system/main2.js +++ b/test/chunking-form/samples/basic-chunking/_expected/system/main2.js @@ -1,25 +1,25 @@ System.register(['./generated-chunk.js'], function (exports, module) { 'use strict'; - var fn; + var fn$2; return { setters: [function (module) { - fn = module.a; + fn$2 = module.a; }], execute: function () { - function fn$1 () { + function fn () { console.log('lib1 fn'); } - function fn$2 () { - fn$1(); + function fn$1 () { + fn(); console.log('dep3 fn'); } class Main2 { constructor () { + fn$1(); fn$2(); - fn(); } } exports('default', Main2); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk2.js index 0f002866c53..2b1b3288238 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk2.js @@ -1,8 +1,8 @@ -import { a as x } from './generated-chunk.js'; -import { a as x$1 } from './generated-chunk3.js'; +import { a as x$1 } from './generated-chunk.js'; +import { a as x$2 } from './generated-chunk3.js'; -var x$2 = x + 1; +var x = x$1 + 1; -var y = x$1 + 1; +var y = x$2 + 1; -export { x$2 as a, y as b }; +export { x as a, y as b }; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk2.js index c186a80b419..94f6c6b5d9c 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk2.js @@ -1,17 +1,17 @@ System.register(['./generated-chunk.js', './generated-chunk3.js'], function (exports, module) { 'use strict'; - var x, x$1; + var x$1, x$2; return { setters: [function (module) { - x = module.a; - }, function (module) { x$1 = module.a; + }, function (module) { + x$2 = module.a; }], execute: function () { - var x$2 = exports('a', x + 1); + var x = exports('a', x$1 + 1); - var y = exports('b', x$1 + 1); + var y = exports('b', x$2 + 1); } }; diff --git a/test/chunking-form/samples/chunking-compact/_expected/es/main1.js b/test/chunking-form/samples/chunking-compact/_expected/es/main1.js index c75e3edd0f1..4d1a855433b 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-compact/_expected/es/main1.js @@ -1,8 +1,8 @@ -import {a as fn}from'./generated-chunk.js';function fn$1 () { +import {a as fn$1}from'./generated-chunk.js';function fn () { console.log('dep1 fn'); }class Main1 { constructor () { - fn$1(); fn(); + fn$1(); } }export default Main1; \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-compact/_expected/es/main2.js b/test/chunking-form/samples/chunking-compact/_expected/es/main2.js index 52563c681cc..e72705fd87e 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-compact/_expected/es/main2.js @@ -1,12 +1,12 @@ -import {a as fn$1}from'./generated-chunk.js';import {fn}from'external';function fn$2 () { +import {a as fn$3}from'./generated-chunk.js';import {fn as fn$2}from'external';function fn () { console.log('lib1 fn'); - fn(); -}function fn$3 () { fn$2(); +}function fn$1 () { + fn(); console.log('dep3 fn'); }class Main2 { constructor () { - fn$3(); fn$1(); + fn$3(); } }export default Main2; \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-compact/_expected/system/main1.js b/test/chunking-form/samples/chunking-compact/_expected/system/main1.js index 02c6f81d1e4..ae68d73b0a0 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-compact/_expected/system/main1.js @@ -1,8 +1,8 @@ -System.register(['./generated-chunk.js'],function(exports,module){'use strict';var fn;return{setters:[function(module){fn=module.a;}],execute:function(){function fn$1 () { +System.register(['./generated-chunk.js'],function(exports,module){'use strict';var fn$1;return{setters:[function(module){fn$1=module.a;}],execute:function(){function fn () { console.log('dep1 fn'); }class Main1 { constructor () { - fn$1(); fn(); + fn$1(); } } exports('default', Main1);}}}); \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-compact/_expected/system/main2.js b/test/chunking-form/samples/chunking-compact/_expected/system/main2.js index 7108d0e52fb..d58784a5a7a 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-compact/_expected/system/main2.js @@ -1,12 +1,12 @@ -System.register(['./generated-chunk.js','external'],function(exports,module){'use strict';var fn$1,fn;return{setters:[function(module){fn$1=module.a;},function(module){fn=module.fn;}],execute:function(){function fn$2 () { +System.register(['./generated-chunk.js','external'],function(exports,module){'use strict';var fn$3,fn$2;return{setters:[function(module){fn$3=module.a;},function(module){fn$2=module.fn;}],execute:function(){function fn () { console.log('lib1 fn'); - fn(); -}function fn$3 () { fn$2(); +}function fn$1 () { + fn(); console.log('dep3 fn'); }class Main2 { constructor () { - fn$3(); fn$1(); + fn$3(); } } exports('default', Main2);}}}); \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-externals/_expected/es/main1.js b/test/chunking-form/samples/chunking-externals/_expected/es/main1.js index cb8fc18ee65..6d4f2531150 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-externals/_expected/es/main1.js @@ -1,13 +1,13 @@ -import { a as fn } from './generated-chunk.js'; +import { a as fn$1 } from './generated-chunk.js'; -function fn$1 () { +function fn () { console.log('dep1 fn'); } class Main1 { constructor () { - fn$1(); fn(); + fn$1(); } } diff --git a/test/chunking-form/samples/chunking-externals/_expected/es/main2.js b/test/chunking-form/samples/chunking-externals/_expected/es/main2.js index 405ddf00b64..3743c96a40c 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-externals/_expected/es/main2.js @@ -1,20 +1,20 @@ -import { a as fn$1 } from './generated-chunk.js'; -import { fn } from 'external'; +import { a as fn$3 } from './generated-chunk.js'; +import { fn as fn$2 } from 'external'; -function fn$2 () { +function fn () { console.log('lib1 fn'); - fn(); + fn$2(); } -function fn$3 () { - fn$2(); +function fn$1 () { + fn(); console.log('dep3 fn'); } class Main2 { constructor () { - fn$3(); fn$1(); + fn$3(); } } diff --git a/test/chunking-form/samples/chunking-externals/_expected/system/main1.js b/test/chunking-form/samples/chunking-externals/_expected/system/main1.js index 3e5709e5f85..f99f3442d10 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-externals/_expected/system/main1.js @@ -1,20 +1,20 @@ System.register(['./generated-chunk.js'], function (exports, module) { 'use strict'; - var fn; + var fn$1; return { setters: [function (module) { - fn = module.a; + fn$1 = module.a; }], execute: function () { - function fn$1 () { + function fn () { console.log('dep1 fn'); } class Main1 { constructor () { - fn$1(); fn(); + fn$1(); } } exports('default', Main1); diff --git a/test/chunking-form/samples/chunking-externals/_expected/system/main2.js b/test/chunking-form/samples/chunking-externals/_expected/system/main2.js index 001e0e6fc54..f418094a95e 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-externals/_expected/system/main2.js @@ -1,28 +1,28 @@ System.register(['./generated-chunk.js', 'external'], function (exports, module) { 'use strict'; - var fn$1, fn; + var fn$3, fn$2; return { setters: [function (module) { - fn$1 = module.a; + fn$3 = module.a; }, function (module) { - fn = module.fn; + fn$2 = module.fn; }], execute: function () { - function fn$2 () { + function fn () { console.log('lib1 fn'); - fn(); + fn$2(); } - function fn$3 () { - fn$2(); + function fn$1 () { + fn(); console.log('dep3 fn'); } class Main2 { constructor () { - fn$3(); fn$1(); + fn$3(); } } exports('default', Main2); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js b/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js index 6208c9d11d2..f3bb708d5ae 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js @@ -1,13 +1,13 @@ -import { a as fn } from './generated-chunk.js'; +import { a as fn$1 } from './generated-chunk.js'; -function fn$1 () { +function fn () { console.log('dep1 fn'); } class Main1 { constructor () { - fn$1(); fn(); + fn$1(); } } diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js.map index 09cdeda88c6..1b7f25f6a93 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js.map +++ b/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js.map @@ -1 +1 @@ -{"version":3,"file":"main1.js","sources":["../../dep1.js","../../main1.js"],"sourcesContent":["export function fn () {\n console.log('dep1 fn');\n}","import { fn } from './dep1.js';\nimport { fn as fn2 } from './dep2.js';\n\nexport default class Main1 {\n constructor () {\n fn();\n fn2();\n }\n}"],"names":["fn","fn2"],"mappings":";;AAAO,SAASA,IAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;CACxB,DCCc,MAAM,KAAK,CAAC;EACzB,WAAW,CAAC,GAAG;IACbA,IAAE,EAAE,CAAC;IACLC,EAAG,EAAE,CAAC;GACP;;;;;"} \ No newline at end of file +{"version":3,"file":"main1.js","sources":["../../dep1.js","../../main1.js"],"sourcesContent":["export function fn () {\n console.log('dep1 fn');\n}","import { fn } from './dep1.js';\nimport { fn as fn2 } from './dep2.js';\n\nexport default class Main1 {\n constructor () {\n fn();\n fn2();\n }\n}"],"names":["fn2"],"mappings":";;AAAO,SAAS,EAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;CACxB,DCCc,MAAM,KAAK,CAAC;EACzB,WAAW,CAAC,GAAG;IACb,EAAE,EAAE,CAAC;IACLA,IAAG,EAAE,CAAC;GACP;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js b/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js index 0e4653e679e..808d3dfd2f8 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js @@ -1,18 +1,18 @@ -import { a as fn } from './generated-chunk.js'; +import { a as fn$2 } from './generated-chunk.js'; -function fn$1 () { +function fn () { console.log('lib1 fn'); } -function fn$2 () { - fn$1(); +function fn$1 () { + fn(); console.log('dep3 fn'); } class Main2 { constructor () { + fn$1(); fn$2(); - fn(); } } diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js.map index 2878e424e64..bfa2f78f99f 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js.map +++ b/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js.map @@ -1 +1 @@ -{"version":3,"file":"main2.js","sources":["../../lib1.js","../../dep3.js","../../main2.js"],"sourcesContent":["export function fn () {\n console.log('lib1 fn');\n}\n\nexport function treeshaked () {\n console.log('this is tree shaken!');\n}","import { fn as libfn, treeshaked } from './lib1.js';\n\nexport function fn () {\n libfn();\n console.log('dep3 fn');\n}\n\nexport default treeshaked;","import { fn } from './dep2.js';\nimport { fn as fn2, default as treeshaked } from './dep3.js';\n\nif (false) {\n treeshaked();\n}\n\nexport default class Main2 {\n constructor () {\n fn2();\n fn();\n }\n}"],"names":["fn","libfn","fn2"],"mappings":";;AAAO,SAASA,IAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;CACxB;;ACAM,SAASA,IAAE,IAAI;EACpBC,IAAK,EAAE,CAAC;EACR,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;CACxB;;ACEc,MAAM,KAAK,CAAC;EACzB,WAAW,CAAC,GAAG;IACbC,IAAG,EAAE,CAAC;IACN,EAAE,EAAE,CAAC;GACN;;;;;"} \ No newline at end of file +{"version":3,"file":"main2.js","sources":["../../lib1.js","../../dep3.js","../../main2.js"],"sourcesContent":["export function fn () {\n console.log('lib1 fn');\n}\n\nexport function treeshaked () {\n console.log('this is tree shaken!');\n}","import { fn as libfn, treeshaked } from './lib1.js';\n\nexport function fn () {\n libfn();\n console.log('dep3 fn');\n}\n\nexport default treeshaked;","import { fn } from './dep2.js';\nimport { fn as fn2, default as treeshaked } from './dep3.js';\n\nif (false) {\n treeshaked();\n}\n\nexport default class Main2 {\n constructor () {\n fn2();\n fn();\n }\n}"],"names":["fn","libfn","fn2"],"mappings":";;AAAO,SAAS,EAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;CACxB;;ACAM,SAASA,IAAE,IAAI;EACpBC,EAAK,EAAE,CAAC;EACR,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;CACxB;;ACEc,MAAM,KAAK,CAAC;EACzB,WAAW,CAAC,GAAG;IACbC,IAAG,EAAE,CAAC;IACNF,IAAE,EAAE,CAAC;GACN;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js b/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js index d8c34be1ee6..e3e50420418 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js @@ -1,20 +1,20 @@ System.register(['./generated-chunk.js'], function (exports, module) { 'use strict'; - var fn; + var fn$1; return { setters: [function (module) { - fn = module.a; + fn$1 = module.a; }], execute: function () { - function fn$1 () { + function fn () { console.log('dep1 fn'); } class Main1 { constructor () { - fn$1(); fn(); + fn$1(); } } exports('default', Main1); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js.map index 01e3e947e98..2ddddbf16b7 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js.map +++ b/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js.map @@ -1 +1 @@ -{"version":3,"file":"main1.js","sources":["../../dep1.js","../../main1.js"],"sourcesContent":["export function fn () {\n console.log('dep1 fn');\n}","import { fn } from './dep1.js';\nimport { fn as fn2 } from './dep2.js';\n\nexport default class Main1 {\n constructor () {\n fn();\n fn2();\n }\n}"],"names":["fn","fn2"],"mappings":";;;;;;;;;MAAO,SAASA,IAAE,IAAI;MACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;MACzB;;OAAC,DCCc,MAAM,KAAK,CAAC;MAC3B,EAAE,WAAW,CAAC,GAAG;MACjB,IAAIA,IAAE,EAAE,CAAC;MACT,IAAIC,EAAG,EAAE,CAAC;MACV,GAAG;MACH;;;;;;"} \ No newline at end of file +{"version":3,"file":"main1.js","sources":["../../dep1.js","../../main1.js"],"sourcesContent":["export function fn () {\n console.log('dep1 fn');\n}","import { fn } from './dep1.js';\nimport { fn as fn2 } from './dep2.js';\n\nexport default class Main1 {\n constructor () {\n fn();\n fn2();\n }\n}"],"names":["fn2"],"mappings":";;;;;;;;;MAAO,SAAS,EAAE,IAAI;MACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;MACzB;;OAAC,DCCc,MAAM,KAAK,CAAC;MAC3B,EAAE,WAAW,CAAC,GAAG;MACjB,IAAI,EAAE,EAAE,CAAC;MACT,IAAIA,IAAG,EAAE,CAAC;MACV,GAAG;MACH;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js b/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js index 7fb97a6239c..723a0fb9c85 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js @@ -1,25 +1,25 @@ System.register(['./generated-chunk.js'], function (exports, module) { 'use strict'; - var fn; + var fn$2; return { setters: [function (module) { - fn = module.a; + fn$2 = module.a; }], execute: function () { - function fn$1 () { + function fn () { console.log('lib1 fn'); } - function fn$2 () { - fn$1(); + function fn$1 () { + fn(); console.log('dep3 fn'); } class Main2 { constructor () { + fn$1(); fn$2(); - fn(); } } exports('default', Main2); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js.map index 294acd6bda4..e168c3004c7 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js.map +++ b/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js.map @@ -1 +1 @@ -{"version":3,"file":"main2.js","sources":["../../lib1.js","../../dep3.js","../../main2.js"],"sourcesContent":["export function fn () {\n console.log('lib1 fn');\n}\n\nexport function treeshaked () {\n console.log('this is tree shaken!');\n}","import { fn as libfn, treeshaked } from './lib1.js';\n\nexport function fn () {\n libfn();\n console.log('dep3 fn');\n}\n\nexport default treeshaked;","import { fn } from './dep2.js';\nimport { fn as fn2, default as treeshaked } from './dep3.js';\n\nif (false) {\n treeshaked();\n}\n\nexport default class Main2 {\n constructor () {\n fn2();\n fn();\n }\n}"],"names":["fn","libfn","fn2"],"mappings":";;;;;;;;;MAAO,SAASA,IAAE,IAAI;MACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;MACzB,CAAC;;MCAM,SAASA,IAAE,IAAI;MACtB,EAAEC,IAAK,EAAE,CAAC;MACV,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;MACzB,CAAC;;MCEc,MAAM,KAAK,CAAC;MAC3B,EAAE,WAAW,CAAC,GAAG;MACjB,IAAIC,IAAG,EAAE,CAAC;MACV,IAAI,EAAE,EAAE,CAAC;MACT,GAAG;MACH;;;;;;"} \ No newline at end of file +{"version":3,"file":"main2.js","sources":["../../lib1.js","../../dep3.js","../../main2.js"],"sourcesContent":["export function fn () {\n console.log('lib1 fn');\n}\n\nexport function treeshaked () {\n console.log('this is tree shaken!');\n}","import { fn as libfn, treeshaked } from './lib1.js';\n\nexport function fn () {\n libfn();\n console.log('dep3 fn');\n}\n\nexport default treeshaked;","import { fn } from './dep2.js';\nimport { fn as fn2, default as treeshaked } from './dep3.js';\n\nif (false) {\n treeshaked();\n}\n\nexport default class Main2 {\n constructor () {\n fn2();\n fn();\n }\n}"],"names":["fn","libfn","fn2"],"mappings":";;;;;;;;;MAAO,SAAS,EAAE,IAAI;MACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;MACzB,CAAC;;MCAM,SAASA,IAAE,IAAI;MACtB,EAAEC,EAAK,EAAE,CAAC;MACV,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;MACzB,CAAC;;MCEc,MAAM,KAAK,CAAC;MAC3B,EAAE,WAAW,CAAC,GAAG;MACjB,IAAIC,IAAG,EAAE,CAAC;MACV,IAAIF,IAAE,EAAE,CAAC;MACT,GAAG;MACH;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/circular-entry-points/_expected/es/main1.js b/test/chunking-form/samples/circular-entry-points/_expected/es/main1.js index 1b41b8707a3..42544cfe1a8 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/es/main1.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/es/main1.js @@ -1,13 +1,13 @@ -import { p } from './main2.js'; +import { p as p$1 } from './main2.js'; class C { fn (num) { - console.log(num - p); + console.log(num - p$1); } } -var p$1 = 42; +var p = 42; -new C().fn(p$1); +new C().fn(p); -export { p$1 as p }; +export { p }; diff --git a/test/chunking-form/samples/circular-entry-points/_expected/es/main2.js b/test/chunking-form/samples/circular-entry-points/_expected/es/main2.js index 450549fc074..9c6d6a82ad4 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/es/main2.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/es/main2.js @@ -1,13 +1,13 @@ -import { p } from './main1.js'; +import { p as p$1 } from './main1.js'; class C { fn (num) { - console.log(num - p); + console.log(num - p$1); } } -var p$1 = 43; +var p = 43; -new C().fn(p$1); +new C().fn(p); -export { p$1 as p }; +export { p }; diff --git a/test/chunking-form/samples/circular-entry-points/_expected/system/main1.js b/test/chunking-form/samples/circular-entry-points/_expected/system/main1.js index 18b99439199..836d351f7a4 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/system/main1.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/system/main1.js @@ -1,21 +1,21 @@ System.register(['./main2.js'], function (exports, module) { 'use strict'; - var p; + var p$1; return { setters: [function (module) { - p = module.p; + p$1 = module.p; }], execute: function () { class C { fn (num) { - console.log(num - p); + console.log(num - p$1); } } - var p$1 = exports('p', 42); + var p = exports('p', 42); - new C().fn(p$1); + new C().fn(p); } }; diff --git a/test/chunking-form/samples/circular-entry-points/_expected/system/main2.js b/test/chunking-form/samples/circular-entry-points/_expected/system/main2.js index 5a668e84329..3d24b81c863 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/system/main2.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/system/main2.js @@ -1,21 +1,21 @@ System.register(['./main1.js'], function (exports, module) { 'use strict'; - var p; + var p$1; return { setters: [function (module) { - p = module.p; + p$1 = module.p; }], execute: function () { class C { fn (num) { - console.log(num - p); + console.log(num - p$1); } } - var p$1 = exports('p', 43); + var p = exports('p', 43); - new C().fn(p$1); + new C().fn(p); } }; diff --git a/test/chunking-form/samples/manual-chunks/_expected/es/generated-deps2and3.js b/test/chunking-form/samples/manual-chunks/_expected/es/generated-deps2and3.js index 5553f9d81f9..d9be84c542f 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/es/generated-deps2and3.js +++ b/test/chunking-form/samples/manual-chunks/_expected/es/generated-deps2and3.js @@ -1,17 +1,17 @@ -import { a as fn } from './generated-lib1.js'; +import { a as fn$3 } from './generated-lib1.js'; -function fn$1 () { +function fn () { console.log('lib2 fn'); } -function fn$2 () { - fn$1(); +function fn$1 () { + fn(); console.log('dep2 fn'); } -function fn$3 () { - fn(); +function fn$2 () { + fn$3(); console.log('dep3 fn'); } -export { fn$2 as a, fn$3 as b }; +export { fn$1 as a, fn$2 as b }; diff --git a/test/chunking-form/samples/manual-chunks/_expected/es/main.js b/test/chunking-form/samples/manual-chunks/_expected/es/main.js index bd4665fa093..676f34a10e9 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/es/main.js +++ b/test/chunking-form/samples/manual-chunks/_expected/es/main.js @@ -1,15 +1,15 @@ -import { a as fn, b as fn$1 } from './generated-deps2and3.js'; +import { a as fn$1, b as fn$2 } from './generated-deps2and3.js'; import './generated-lib1.js'; -function fn$2 () { +function fn () { console.log('dep1 fn'); } class Main { constructor () { - fn$2(); fn(); fn$1(); + fn$2(); } } diff --git a/test/chunking-form/samples/manual-chunks/_expected/system/generated-deps2and3.js b/test/chunking-form/samples/manual-chunks/_expected/system/generated-deps2and3.js index 7fe6746bb8b..844ae56c574 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/system/generated-deps2and3.js +++ b/test/chunking-form/samples/manual-chunks/_expected/system/generated-deps2and3.js @@ -1,28 +1,28 @@ System.register(['./generated-lib1.js'], function (exports, module) { 'use strict'; - var fn; + var fn$3; return { setters: [function (module) { - fn = module.a; + fn$3 = module.a; }], execute: function () { exports({ - a: fn$2, - b: fn$3 + a: fn$1, + b: fn$2 }); - function fn$1 () { + function fn () { console.log('lib2 fn'); } - function fn$2 () { - fn$1(); + function fn$1 () { + fn(); console.log('dep2 fn'); } - function fn$3 () { - fn(); + function fn$2 () { + fn$3(); console.log('dep3 fn'); } diff --git a/test/chunking-form/samples/manual-chunks/_expected/system/main.js b/test/chunking-form/samples/manual-chunks/_expected/system/main.js index 1c07e7716a3..e8d21361a0a 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/system/main.js +++ b/test/chunking-form/samples/manual-chunks/_expected/system/main.js @@ -1,22 +1,22 @@ System.register(['./generated-deps2and3.js', './generated-lib1.js'], function (exports, module) { 'use strict'; - var fn, fn$1; + var fn$1, fn$2; return { setters: [function (module) { - fn = module.a; - fn$1 = module.b; + fn$1 = module.a; + fn$2 = module.b; }, function () {}], execute: function () { - function fn$2 () { + function fn () { console.log('dep1 fn'); } class Main { constructor () { - fn$2(); fn(); fn$1(); + fn$2(); } } exports('default', Main); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/generated-index.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/generated-index.js index 9b004ebccc7..cbc8db134cb 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/generated-index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/generated-index.js @@ -1,14 +1,14 @@ -define(['exports', './hsl2hsv.js'], function (exports, hsl2hsv) { 'use strict'; +define(['exports', './hsl2hsv.js'], function (exports, hsl2hsv$1) { 'use strict'; - var hsl2hsv$1 = 'asdf'; + var hsl2hsv = 'asdf'; - console.log(hsl2hsv$1); + console.log(hsl2hsv); var lib = /*#__PURE__*/Object.freeze({ - hsl2hsv: hsl2hsv.default + hsl2hsv: hsl2hsv$1.default }); - exports.hsl2hsv = hsl2hsv.default; + exports.hsl2hsv = hsl2hsv$1.default; exports.lib = lib; }); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js index 60f6d952bf6..c51c47b4df8 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js @@ -1,8 +1,8 @@ -define(['exports', './hsl2hsv.js', './generated-index.js'], function (exports, hsl2hsv, index) { 'use strict'; +define(['exports', './hsl2hsv.js', './generated-index.js'], function (exports, hsl2hsv$1, index) { 'use strict'; - exports.hsl2hsv = hsl2hsv.default; + exports.hsl2hsv = hsl2hsv$1.default; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js index 895f9d9905c..71dd02c2f28 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js @@ -1,6 +1,6 @@ -define(['exports', './hsl2hsv.js', './generated-index.js'], function (exports, hsl2hsv, index) { 'use strict'; +define(['exports', './hsl2hsv.js', './generated-index.js'], function (exports, hsl2hsv$1, index) { 'use strict'; - console.log(hsl2hsv.p); + console.log(hsl2hsv$1.p); var main = new Map(Object.entries(index.lib)); exports.default = main; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-index.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-index.js index 0b3ca132f28..dd171505ad1 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-index.js @@ -1,14 +1,14 @@ 'use strict'; -var hsl2hsv = require('./hsl2hsv.js'); +var hsl2hsv$1 = require('./hsl2hsv.js'); -var hsl2hsv$1 = 'asdf'; +var hsl2hsv = 'asdf'; -console.log(hsl2hsv$1); +console.log(hsl2hsv); var lib = /*#__PURE__*/Object.freeze({ - hsl2hsv: hsl2hsv.default + hsl2hsv: hsl2hsv$1.default }); -exports.hsl2hsv = hsl2hsv.default; +exports.hsl2hsv = hsl2hsv$1.default; exports.lib = lib; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js index c2a0180929c..cd95edf7d26 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js @@ -2,9 +2,9 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var hsl2hsv = require('./hsl2hsv.js'); +var hsl2hsv$1 = require('./hsl2hsv.js'); require('./generated-index.js'); -exports.hsl2hsv = hsl2hsv.default; +exports.hsl2hsv = hsl2hsv$1.default; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js index 2ca1ab022e7..f56ee42c2ad 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js @@ -2,10 +2,10 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var hsl2hsv = require('./hsl2hsv.js'); +var hsl2hsv$1 = require('./hsl2hsv.js'); var index = require('./generated-index.js'); -console.log(hsl2hsv.p); +console.log(hsl2hsv$1.p); var main = new Map(Object.entries(index.lib)); exports.default = main; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/es/generated-index.js b/test/chunking-form/samples/namespace-reexports/_expected/es/generated-index.js index 3ac4915370c..fdae9a7b094 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/es/generated-index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/es/generated-index.js @@ -1,12 +1,12 @@ -import hsl2hsv from './hsl2hsv.js'; +import hsl2hsv$1 from './hsl2hsv.js'; export { default as b } from './hsl2hsv.js'; -var hsl2hsv$1 = 'asdf'; +var hsl2hsv = 'asdf'; -console.log(hsl2hsv$1); +console.log(hsl2hsv); var lib = /*#__PURE__*/Object.freeze({ - hsl2hsv: hsl2hsv + hsl2hsv: hsl2hsv$1 }); export { lib as a }; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/system/generated-index.js b/test/chunking-form/samples/namespace-reexports/_expected/system/generated-index.js index d0a0491b975..e0ee5ac921d 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/system/generated-index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/system/generated-index.js @@ -1,19 +1,19 @@ System.register(['./hsl2hsv.js'], function (exports, module) { 'use strict'; - var hsl2hsv; + var hsl2hsv$1; return { setters: [function (module) { - hsl2hsv = module.default; + hsl2hsv$1 = module.default; exports('b', module.default); }], execute: function () { - var hsl2hsv$1 = 'asdf'; + var hsl2hsv = 'asdf'; - console.log(hsl2hsv$1); + console.log(hsl2hsv); var lib = /*#__PURE__*/Object.freeze({ - hsl2hsv: hsl2hsv + hsl2hsv: hsl2hsv$1 }); exports('a', lib); diff --git a/test/chunking-form/samples/preserve-modules/_expected/es/deps/dep2.js b/test/chunking-form/samples/preserve-modules/_expected/es/deps/dep2.js index 1a6bce7872f..233b8235a07 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/es/deps/dep2.js +++ b/test/chunking-form/samples/preserve-modules/_expected/es/deps/dep2.js @@ -1,8 +1,8 @@ -import { fn } from '../lib/lib2.js'; +import { fn as fn$1 } from '../lib/lib2.js'; -function fn$1 () { - fn(); +function fn () { + fn$1(); console.log('dep2 fn'); } -export { fn$1 as fn }; +export { fn }; diff --git a/test/chunking-form/samples/preserve-modules/_expected/es/deps/dep3.js b/test/chunking-form/samples/preserve-modules/_expected/es/deps/dep3.js index 37a799dca5c..e01b47ef194 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/es/deps/dep3.js +++ b/test/chunking-form/samples/preserve-modules/_expected/es/deps/dep3.js @@ -1,8 +1,8 @@ -import { fn } from '../lib/lib1.js'; +import { fn as fn$1 } from '../lib/lib1.js'; -function fn$1 () { - fn(); +function fn () { + fn$1(); console.log('dep3 fn'); } -export { fn$1 as fn }; +export { fn }; diff --git a/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep2.js b/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep2.js index a0de7bf50a0..2346c04ce26 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep2.js +++ b/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep2.js @@ -1,16 +1,16 @@ System.register(['../lib/lib2.js'], function (exports, module) { 'use strict'; - var fn; + var fn$1; return { setters: [function (module) { - fn = module.fn; + fn$1 = module.fn; }], execute: function () { - exports('fn', fn$1); + exports('fn', fn); - function fn$1 () { - fn(); + function fn () { + fn$1(); console.log('dep2 fn'); } diff --git a/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep3.js b/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep3.js index a6ad419f143..3e8250b3b5b 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep3.js +++ b/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep3.js @@ -1,16 +1,16 @@ System.register(['../lib/lib1.js'], function (exports, module) { 'use strict'; - var fn; + var fn$1; return { setters: [function (module) { - fn = module.fn; + fn$1 = module.fn; }], execute: function () { - exports('fn', fn$1); + exports('fn', fn); - function fn$1 () { - fn(); + function fn () { + fn$1(); console.log('dep3 fn'); } diff --git a/test/form/samples/external-deshadowing/_expected/amd.js b/test/form/samples/external-deshadowing/_expected/amd.js index 4f3add24cc4..ddf292350fa 100644 --- a/test/form/samples/external-deshadowing/_expected/amd.js +++ b/test/form/samples/external-deshadowing/_expected/amd.js @@ -1,16 +1,16 @@ -define(['exports', 'a', 'b'], function (exports, a, Test) { 'use strict'; +define(['exports', 'a', 'b'], function (exports, a, Test$1) { 'use strict'; - Test = Test && Test.hasOwnProperty('default') ? Test['default'] : Test; + Test$1 = Test$1 && Test$1.hasOwnProperty('default') ? Test$1['default'] : Test$1; - const Test$1 = () => { + const Test = () => { console.log(a.Test); }; const Test1 = () => { - console.log(Test); + console.log(Test$1); }; - exports.Test = Test$1; + exports.Test = Test; exports.Test1 = Test1; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/external-deshadowing/_expected/cjs.js b/test/form/samples/external-deshadowing/_expected/cjs.js index 22b1da93995..dba5d8ef93f 100644 --- a/test/form/samples/external-deshadowing/_expected/cjs.js +++ b/test/form/samples/external-deshadowing/_expected/cjs.js @@ -5,15 +5,15 @@ Object.defineProperty(exports, '__esModule', { value: true }); function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; } var a = require('a'); -var Test = _interopDefault(require('b')); +var Test$1 = _interopDefault(require('b')); -const Test$1 = () => { +const Test = () => { console.log(a.Test); }; const Test1 = () => { - console.log(Test); + console.log(Test$1); }; -exports.Test = Test$1; +exports.Test = Test; exports.Test1 = Test1; diff --git a/test/form/samples/external-deshadowing/_expected/es.js b/test/form/samples/external-deshadowing/_expected/es.js index 2ef2beb8a4d..5ad8833d3c4 100644 --- a/test/form/samples/external-deshadowing/_expected/es.js +++ b/test/form/samples/external-deshadowing/_expected/es.js @@ -1,12 +1,12 @@ -import { Test } from 'a'; -import Test$1 from 'b'; +import { Test as Test$1 } from 'a'; +import Test$1$1 from 'b'; -const Test$2 = () => { - console.log(Test); +const Test = () => { + console.log(Test$1); }; const Test1 = () => { - console.log(Test$1); + console.log(Test$1$1); }; -export { Test$2 as Test, Test1 }; +export { Test, Test1 }; diff --git a/test/form/samples/external-deshadowing/_expected/iife.js b/test/form/samples/external-deshadowing/_expected/iife.js index 93c2a4475dc..2a6e6f66ee7 100644 --- a/test/form/samples/external-deshadowing/_expected/iife.js +++ b/test/form/samples/external-deshadowing/_expected/iife.js @@ -1,19 +1,19 @@ -var myBundle = (function (exports, a, Test) { +var myBundle = (function (exports, a, Test$1) { 'use strict'; - Test = Test && Test.hasOwnProperty('default') ? Test['default'] : Test; + Test$1 = Test$1 && Test$1.hasOwnProperty('default') ? Test$1['default'] : Test$1; - const Test$1 = () => { + const Test = () => { console.log(a.Test); }; const Test1 = () => { - console.log(Test); + console.log(Test$1); }; - exports.Test = Test$1; + exports.Test = Test; exports.Test1 = Test1; return exports; -}({}, a, Test)); +}({}, a, Test$1)); diff --git a/test/form/samples/external-deshadowing/_expected/system.js b/test/form/samples/external-deshadowing/_expected/system.js index 15fccaded78..cbfb0157a2f 100644 --- a/test/form/samples/external-deshadowing/_expected/system.js +++ b/test/form/samples/external-deshadowing/_expected/system.js @@ -1,20 +1,20 @@ System.register('myBundle', ['a', 'b'], function (exports, module) { 'use strict'; - var Test, Test$1; + var Test$1, Test$1$1; return { setters: [function (module) { - Test = module.Test; + Test$1 = module.Test; }, function (module) { - Test$1 = module.default; + Test$1$1 = module.default; }], execute: function () { - const Test$2 = exports('Test', () => { - console.log(Test); + const Test = exports('Test', () => { + console.log(Test$1); }); const Test1 = exports('Test1', () => { - console.log(Test$1); + console.log(Test$1$1); }); } diff --git a/test/form/samples/external-deshadowing/_expected/umd.js b/test/form/samples/external-deshadowing/_expected/umd.js index 8d2072edebb..853b3144677 100644 --- a/test/form/samples/external-deshadowing/_expected/umd.js +++ b/test/form/samples/external-deshadowing/_expected/umd.js @@ -1,20 +1,20 @@ (function (global, factory) { typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('a'), require('b')) : typeof define === 'function' && define.amd ? define(['exports', 'a', 'b'], factory) : - (global = global || self, factory(global.myBundle = {}, global.a, global.Test)); -}(this, function (exports, a, Test) { 'use strict'; + (global = global || self, factory(global.myBundle = {}, global.a, global.Test$1)); +}(this, function (exports, a, Test$1) { 'use strict'; - Test = Test && Test.hasOwnProperty('default') ? Test['default'] : Test; + Test$1 = Test$1 && Test$1.hasOwnProperty('default') ? Test$1['default'] : Test$1; - const Test$1 = () => { + const Test = () => { console.log(a.Test); }; const Test1 = () => { - console.log(Test); + console.log(Test$1); }; - exports.Test = Test$1; + exports.Test = Test; exports.Test1 = Test1; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/external-import-alias-shadow/_expected/es.js b/test/form/samples/external-import-alias-shadow/_expected/es.js index 2750231146c..4cd40fd9981 100644 --- a/test/form/samples/external-import-alias-shadow/_expected/es.js +++ b/test/form/samples/external-import-alias-shadow/_expected/es.js @@ -1,7 +1,7 @@ -import { parse } from 'acorn'; +import { parse as parse$1 } from 'acorn'; -function parse$1(source) { - return parse(source, { ecmaVersion: 6 }); +function parse(source) { + return parse$1(source, { ecmaVersion: 6 }); } -console.log(parse$1('foo')); +console.log(parse('foo')); diff --git a/test/form/samples/external-import-alias-shadow/_expected/system.js b/test/form/samples/external-import-alias-shadow/_expected/system.js index 6c926769e44..4342c7cb32a 100644 --- a/test/form/samples/external-import-alias-shadow/_expected/system.js +++ b/test/form/samples/external-import-alias-shadow/_expected/system.js @@ -1,17 +1,17 @@ System.register(['acorn'], function (exports, module) { 'use strict'; - var parse; + var parse$1; return { setters: [function (module) { - parse = module.parse; + parse$1 = module.parse; }], execute: function () { - function parse$1(source) { - return parse(source, { ecmaVersion: 6 }); + function parse(source) { + return parse$1(source, { ecmaVersion: 6 }); } - console.log(parse$1('foo')); + console.log(parse('foo')); } }; diff --git a/test/form/samples/import-specifier-deshadowing/_expected/es.js b/test/form/samples/import-specifier-deshadowing/_expected/es.js index 69e46dd87c8..9cfd965e950 100644 --- a/test/form/samples/import-specifier-deshadowing/_expected/es.js +++ b/test/form/samples/import-specifier-deshadowing/_expected/es.js @@ -1,11 +1,11 @@ -import { Sticky } from 'react-sticky'; +import { Sticky as Sticky$1 } from 'react-sticky'; -var Sticky$1 = function () { - function Sticky$1() {} +var Sticky = function () { + function Sticky() {} - Sticky$1.foo = Sticky; + Sticky.foo = Sticky$1; - return Sticky$1; + return Sticky; }(); -export default Sticky$1; +export default Sticky; diff --git a/test/form/samples/import-specifier-deshadowing/_expected/system.js b/test/form/samples/import-specifier-deshadowing/_expected/system.js index 0e902424f41..1e45c67cb31 100644 --- a/test/form/samples/import-specifier-deshadowing/_expected/system.js +++ b/test/form/samples/import-specifier-deshadowing/_expected/system.js @@ -1,18 +1,18 @@ System.register('Sticky', ['react-sticky'], function (exports, module) { 'use strict'; - var Sticky; + var Sticky$1; return { setters: [function (module) { - Sticky = module.Sticky; + Sticky$1 = module.Sticky; }], execute: function () { - var Sticky$1 = exports('default', function () { - function Sticky$1() {} + var Sticky = exports('default', function () { + function Sticky() {} - Sticky$1.foo = Sticky; + Sticky.foo = Sticky$1; - return Sticky$1; + return Sticky; }()); }