Add __esModule attribute to named export chunks when preserving modules

rollup · Nov 29, 2019 · 4b07d38 · 4b07d38
1 parent 1fe135f
commit 4b07d38
Show file tree

Hide file tree

Showing 37 changed files with 75 additions and 1 deletion.
diff --git a/src/Chunk.ts b/src/Chunk.ts
@@ -708,7 +708,9 @@ export default class Chunk {
 				hasExports,
 				indentString: this.indentString,
 				intro: addons.intro as string,
-				isEntryModuleFacade: this.facadeModule !== null && this.facadeModule.isEntryPoint,
+				isEntryModuleFacade:
+					this.graph.preserveModules ||
+					(this.facadeModule !== null && this.facadeModule.isEntryPoint),
 				namedExportsMode: this.exportMode !== 'default',
 				outro: addons.outro as string,
 				usesTopLevelAwait,

diff --git a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep1.js b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep1.js
@@ -14,4 +14,6 @@ define(['exports'], function (exports) { 'use strict';
 
 	exports.missing1 = _missingExportShim;
 
+	Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep2.js b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep2.js
@@ -11,4 +11,6 @@ define(['exports'], function (exports) { 'use strict';
 	exports.missing2 = _missingExportShim;
 	exports.previousShimmedExport = _missingExportShim$1;
 
+	Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep1.js b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep1.js
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 var _missingExportShim = void 0;
 
 console.log('This is the output when a missing export is used internally but not reexported');

diff --git a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep2.js b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep2.js
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 var _missingExportShim = void 0;
 
 console.log('This is the output when a missing export is reexported');

diff --git a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/amd/named.js b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/amd/named.js
@@ -4,4 +4,6 @@ define(['exports'], function (exports) { 'use strict';
 
 	exports.value = value;
 
+	Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/cjs/named.js b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/cjs/named.js
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 const value = 'named';
 
 exports.value = value;
diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js
@@ -11,4 +11,6 @@ define(['exports', 'external', './other', './_virtual/_external_commonjs-externa
 	exports.__moduleExports = commonjs;
 	exports.default = commonjs;
 
+	Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/other.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/other.js
@@ -9,4 +9,6 @@ define(['exports'], function (exports) { 'use strict';
 	exports.__moduleExports = other;
 	exports.value = value;
 
+	Object.defineProperty(exports, '__esModule', { value: true });
+
 });
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
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 require('external');
 require('./other.js');
 var _external_commonjsExternal = require('./_virtual/_external_commonjs-external');

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
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 var value = 43;
 
 var other = {

diff --git a/.../chunking-form/samples/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js b/.../chunking-form/samples/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js
@@ -4,4 +4,6 @@ define(['exports'], function (exports) { 'use strict';
 
 	exports.value = value;
 
+	Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/.../chunking-form/samples/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js b/.../chunking-form/samples/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 const value = 'included';
 
 exports.value = value;
diff --git a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/m1.js b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/m1.js
@@ -5,4 +5,6 @@ define(['exports', './m2', './m3'], function (exports, m2, m3) { 'use strict';
 	exports.m2 = m2;
 	exports.m3 = m3;
 
+	Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/m1.js b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/m1.js
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 var m2 = require('./m2.js');
 var m3 = require('./m3.js');
 

diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/dep.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/dep.js
@@ -5,4 +5,6 @@ define(['exports'], function (exports) { 'use strict';
 	exports.bar = foo;
 	exports.foo = foo;
 
+	Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/dep.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/dep.js
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 const foo = 1;
 
 exports.bar = foo;

diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/default.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/default.js
@@ -4,4 +4,6 @@ define(['exports'], function (exports) { 'use strict';
 
 	exports.default = foo;
 
+	Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/named.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/named.js
@@ -4,4 +4,6 @@ define(['exports'], function (exports) { 'use strict';
 
 	exports.value = value;
 
+	Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/default.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/default.js
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 var foo = 'default';
 
 exports.default = foo;
diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/named.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/named.js
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 const value = 'named';
 
 exports.value = value;
diff --git a/...g-form/samples/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js b/...g-form/samples/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js
@@ -4,4 +4,6 @@ define(['exports'], function (exports) { 'use strict';
 
 	exports.Something = Something;
 
+	Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/...g-form/samples/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js b/...g-form/samples/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 const Something = 'Hello World';
 
 exports.Something = Something;
diff --git a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/amd/dep.js b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/amd/dep.js
@@ -6,4 +6,6 @@ define(['exports'], function (exports) { 'use strict';
 
   exports.fn = fn;
 
+  Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/cjs/dep.js b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/cjs/dep.js
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 function fn () {
   console.log('dep fn');
 }

diff --git a/...nking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule b/...nking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule
@@ -4,4 +4,6 @@ define(['exports'], function (exports) { 'use strict';
 
 	exports.virtual = virtual;
 
+	Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/...nking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule b/...nking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 const virtual = "Virtual!";
 
 exports.virtual = virtual;
diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep1.js b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep1.js
@@ -6,4 +6,6 @@ define(['exports'], function (exports) { 'use strict';
 
   exports.fn = fn;
 
+  Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep2.js b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep2.js
@@ -7,4 +7,6 @@ define(['exports', '../lib/lib2'], function (exports, lib2) { 'use strict';
 
   exports.fn = fn;
 
+  Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep3.js b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep3.js
@@ -7,4 +7,6 @@ define(['exports', '../lib/lib1'], function (exports, lib1) { 'use strict';
 
   exports.fn = fn;
 
+  Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib1.js b/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib1.js
@@ -6,4 +6,6 @@ define(['exports'], function (exports) { 'use strict';
 
   exports.fn = fn;
 
+  Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib2.js b/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib2.js
@@ -6,4 +6,6 @@ define(['exports'], function (exports) { 'use strict';
 
   exports.fn = fn;
 
+  Object.defineProperty(exports, '__esModule', { value: true });
+
 });
diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep1.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep1.js
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 function fn () {
   console.log('dep1 fn');
 }

diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep2.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep2.js
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 var lib2 = require('../lib/lib2.js');
 
 function fn () {

diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep3.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep3.js
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 var lib1 = require('../lib/lib1.js');
 
 function fn () {

diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib1.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib1.js
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 function fn () {
   console.log('lib1 fn');
 }

diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib2.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib2.js
@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 function fn () {
   console.log('lib2 fn');
 }