From 2e2fa6bf87850b82912d840b88d86dedf9617b25 Mon Sep 17 00:00:00 2001 From: Ivan Plesskih Date: Fri, 30 Oct 2020 19:12:05 +0500 Subject: [PATCH] Updated tests, changed info after transform --- src/ExternalModule.ts | 3 ++- src/Module.ts | 1 + .../implicitly-dependent-emitted-entry/_config.js | 6 ++++-- .../implicitly-dependent-entry/_config.js | 6 ++++-- .../multiple-dependencies/_config.js | 9 ++++++--- .../single-dependency/_config.js | 6 ++++-- .../deprecated/manual-chunks-info/_config.js | 12 ++++++++---- .../samples/manual-chunks-info/_config.js | 12 ++++++++---- .../samples/module-parsed-hook/_config.js | 6 ++++-- .../samples/plugin-module-information/_config.js | 15 ++++++++++----- .../non-default-export/_config.js | 5 +++++ 11 files changed, 56 insertions(+), 25 deletions(-) diff --git a/src/ExternalModule.ts b/src/ExternalModule.ts index aef2796394f..f5ffba4bbb2 100644 --- a/src/ExternalModule.ts +++ b/src/ExternalModule.ts @@ -58,7 +58,8 @@ export default class ExternalModule { }, isEntry: false, isExternal: true, - meta + meta, + syntheticNamedExports: false }; } diff --git a/src/Module.ts b/src/Module.ts index 37276e5667b..438357be22a 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -805,6 +805,7 @@ export default class Module { } if (syntheticNamedExports != null) { this.syntheticNamedExports = syntheticNamedExports; + this.info.syntheticNamedExports = syntheticNamedExports; } if (meta != null) { this.info.meta = { ...this.info.meta, ...meta }; diff --git a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_config.js b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_config.js index 41961b92aee..6564522f9b9 100644 --- a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_config.js +++ b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_config.js @@ -80,7 +80,8 @@ module.exports = { importers: [], isEntry: true, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }); assert.deepStrictEqual(JSON.parse(JSON.stringify(this.getModuleInfo(ID_DEP))), { ast: { @@ -138,7 +139,8 @@ module.exports = { importers: [], isEntry: true, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }); }, generateBundle(options, bundle) { diff --git a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_config.js b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_config.js index c3646c4f721..1a44bf6a0bf 100644 --- a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_config.js +++ b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_config.js @@ -76,7 +76,8 @@ module.exports = { importers: [], isEntry: true, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }); assert.deepStrictEqual(JSON.parse(JSON.stringify(this.getModuleInfo(ID_DEP))), { ast: { @@ -134,7 +135,8 @@ module.exports = { importers: [], isEntry: true, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }); }, generateBundle(options, bundle) { diff --git a/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_config.js b/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_config.js index 8cb1f3e1b3b..8ae1e81d181 100644 --- a/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_config.js +++ b/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_config.js @@ -125,7 +125,8 @@ module.exports = { importers: [], isEntry: true, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }); assert.deepStrictEqual(JSON.parse(JSON.stringify(this.getModuleInfo(ID_MAIN2))), { ast: { @@ -219,7 +220,8 @@ module.exports = { importers: [], isEntry: true, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }); assert.deepStrictEqual(JSON.parse(JSON.stringify(this.getModuleInfo(ID_DEP))), { ast: { @@ -312,7 +314,8 @@ module.exports = { importers: [], isEntry: false, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }); } } diff --git a/test/chunking-form/samples/implicit-dependencies/single-dependency/_config.js b/test/chunking-form/samples/implicit-dependencies/single-dependency/_config.js index 1cf66ad7870..1ef3f4bf156 100644 --- a/test/chunking-form/samples/implicit-dependencies/single-dependency/_config.js +++ b/test/chunking-form/samples/implicit-dependencies/single-dependency/_config.js @@ -75,7 +75,8 @@ module.exports = { importers: [], isEntry: true, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }); assert.deepStrictEqual(JSON.parse(JSON.stringify(this.getModuleInfo(ID_DEP))), { ast: { @@ -133,7 +134,8 @@ module.exports = { importers: [], isEntry: false, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }); }, generateBundle(options, bundle) { diff --git a/test/function/samples/deprecated/manual-chunks-info/_config.js b/test/function/samples/deprecated/manual-chunks-info/_config.js index 2b1476b517b..f6ef4e03eb2 100644 --- a/test/function/samples/deprecated/manual-chunks-info/_config.js +++ b/test/function/samples/deprecated/manual-chunks-info/_config.js @@ -111,7 +111,8 @@ module.exports = { importers: [], isEntry: true, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }, { ast: null, @@ -126,7 +127,8 @@ module.exports = { importers: [getId('main')], isEntry: false, isExternal: true, - meta: {} + meta: {}, + syntheticNamedExports: false }, { ast: { @@ -154,7 +156,8 @@ module.exports = { importers: [getId('dynamic'), getId('main')], isEntry: false, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }, { ast: { @@ -226,7 +229,8 @@ module.exports = { importers: [], isEntry: false, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false } ] ); diff --git a/test/function/samples/manual-chunks-info/_config.js b/test/function/samples/manual-chunks-info/_config.js index 7f56a4a17ec..28cb13fb36c 100644 --- a/test/function/samples/manual-chunks-info/_config.js +++ b/test/function/samples/manual-chunks-info/_config.js @@ -110,7 +110,8 @@ module.exports = { importers: [], isEntry: true, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }, { ast: null, @@ -125,7 +126,8 @@ module.exports = { importers: [getId('main')], isEntry: false, isExternal: true, - meta: {} + meta: {}, + syntheticNamedExports: false }, { ast: { @@ -153,7 +155,8 @@ module.exports = { importers: [getId('dynamic'), getId('main')], isEntry: false, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }, { ast: { @@ -225,7 +228,8 @@ module.exports = { importers: [], isEntry: false, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false } ] ); diff --git a/test/function/samples/module-parsed-hook/_config.js b/test/function/samples/module-parsed-hook/_config.js index 4b5c11e0d90..ffe1a6c8b89 100644 --- a/test/function/samples/module-parsed-hook/_config.js +++ b/test/function/samples/module-parsed-hook/_config.js @@ -58,7 +58,8 @@ module.exports = { importers: [], isEntry: true, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }, { ast: { @@ -102,7 +103,8 @@ module.exports = { importers: [ID_MAIN], isEntry: false, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false } ]); } diff --git a/test/function/samples/plugin-module-information/_config.js b/test/function/samples/plugin-module-information/_config.js index 24e8e472dfc..a36ae8a13af 100644 --- a/test/function/samples/plugin-module-information/_config.js +++ b/test/function/samples/plugin-module-information/_config.js @@ -27,7 +27,8 @@ module.exports = { importers: [], isEntry: id === ID_MAIN, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }); }, renderStart() { @@ -172,7 +173,8 @@ module.exports = { importers: [], isEntry: true, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }, { ast: { @@ -247,7 +249,8 @@ module.exports = { importers: [ID_MAIN, ID_NESTED], isEntry: false, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false }, { ast: null, @@ -262,7 +265,8 @@ module.exports = { importers: [ID_FOO], isEntry: false, isExternal: true, - meta: {} + meta: {}, + syntheticNamedExports: false }, { ast: { @@ -340,7 +344,8 @@ module.exports = { importers: [], isEntry: false, isExternal: false, - meta: {} + meta: {}, + syntheticNamedExports: false } ] ); diff --git a/test/function/samples/synthetic-named-exports/non-default-export/_config.js b/test/function/samples/synthetic-named-exports/non-default-export/_config.js index 542cebf33bf..c29db5a5bc4 100644 --- a/test/function/samples/synthetic-named-exports/non-default-export/_config.js +++ b/test/function/samples/synthetic-named-exports/non-default-export/_config.js @@ -9,6 +9,11 @@ module.exports = { if (id.endsWith('dep.js')) { return { code, syntheticNamedExports: '__synthetic' }; } + }, + moduleParsed({id, syntheticNamedExports}) { + if (id.endsWith('dep.js')) { + assert.strictEqual(syntheticNamedExports, '__synthetic'); + } } } ]