Support dynamic imports in cjs output and make default

rollup · Oct 4, 2022 · 1e5f448 · 1e5f448
1 parent 5812006
commit 1e5f448
Show file tree

Hide file tree

Showing 37 changed files with 83 additions and 174 deletions.
diff --git a/src/ast/nodes/ImportExpression.ts b/src/ast/nodes/ImportExpression.ts
@@ -134,6 +134,7 @@ export default class ImportExpression extends NodeBase {
 		{
 			compact,
 			dynamicImportFunction,
+			dynamicImportInCjs,
 			format,
 			generatedCode: { arrowFunctions },
 			interop
@@ -156,6 +157,9 @@ export default class ImportExpression extends NodeBase {
 		const hasDynamicTarget = !this.resolution || typeof this.resolution === 'string';
 		switch (format) {
 			case 'cjs': {
+				if (resolution instanceof ExternalModule && dynamicImportInCjs) {
+					return { helper: null, mechanism: null };
+				}
 				const helper = getInteropHelper(resolution, exportMode, interop);
 				let left = `require(`;
 				let right = `)`;

diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts
@@ -613,6 +613,7 @@ export interface OutputOptions {
 	dir?: string;
 	/** @deprecated Use the "renderDynamicImport" plugin hook instead. */
 	dynamicImportFunction?: string;
+	dynamicImportInCjs?: boolean;
 	entryFileNames?: string | ((chunkInfo: PreRenderedChunk) => string);
 	esModule?: boolean | 'if-default-prop';
 	exports?: 'default' | 'named' | 'none' | 'auto';
@@ -663,6 +664,7 @@ export interface NormalizedOutputOptions {
 	dir: string | undefined;
 	/** @deprecated Use the "renderDynamicImport" plugin hook instead. */
 	dynamicImportFunction: string | undefined;
+	dynamicImportInCjs: boolean;
 	entryFileNames: string | ((chunkInfo: PreRenderedChunk) => string);
 	esModule: boolean | 'if-default-prop';
 	exports: 'default' | 'named' | 'none' | 'auto';

diff --git a/src/utils/options/mergeOptions.ts b/src/utils/options/mergeOptions.ts
@@ -231,6 +231,7 @@ function mergeOutputOptions(
 		compact: getOption('compact'),
 		dir: getOption('dir'),
 		dynamicImportFunction: getOption('dynamicImportFunction'),
+		dynamicImportInCjs: getOption('dynamicImportInCjs'),
 		entryFileNames: getOption('entryFileNames'),
 		esModule: getOption('esModule'),
 		exports: getOption('exports'),

diff --git a/src/utils/options/normalizeOutputOptions.ts b/src/utils/options/normalizeOutputOptions.ts
@@ -43,6 +43,7 @@ export function normalizeOutputOptions(
 		compact,
 		dir: getDir(config, file),
 		dynamicImportFunction: getDynamicImportFunction(config, inputOptions, format),
+		dynamicImportInCjs: config.dynamicImportInCjs ?? true,
 		entryFileNames: getEntryFileNames(config, unsetOptions),
 		esModule: config.esModule ?? 'if-default-prop',
 		exports: getExports(config, unsetOptions),

diff --git a/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js
@@ -1,22 +1,5 @@
 'use strict';
 
-function _interopNamespaceDefault(e) {
-	var n = Object.create(null);
-	if (e) {
-		Object.keys(e).forEach(function (k) {
-			if (k !== 'default') {
-				var d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		});
-	}
-	n.default = e;
-	return Object.freeze(n);
-}
-
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(
+import /* () should not break */     (
 /* webpackChunkName: "chunk-name" */
-'./foo.js'/*suffix*/)); });
+'./foo.js'/*suffix*/);
diff --git a/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js
@@ -1,20 +1,3 @@
 'use strict';
 
-function _interopNamespaceDefault(e) {
-	var n = Object.create(null);
-	if (e) {
-		Object.keys(e).forEach(function (k) {
-			if (k !== 'default') {
-				var d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		});
-	}
-	n.default = e;
-	return Object.freeze(n);
-}
-
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./foo.js')); }).then(result => console.log(result));
+import('./foo.js').then(result => console.log(result));
diff --git a/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js
@@ -1,20 +1,3 @@
 'use strict';
 
-function _interopNamespaceDefault(e) {
-	var n = Object.create(null);
-	if (e) {
-		Object.keys(e).forEach(function (k) {
-			if (k !== 'default') {
-				var d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		});
-	}
-	n.default = e;
-	return Object.freeze(n);
-}
-
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./foo.js')); });
+import('./foo.js');
diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js
@@ -2,23 +2,6 @@
 
 var dep = require('./generated-dep.js');
 
-function _interopNamespaceDefault(e) {
-	var n = Object.create(null);
-	if (e) {
-		Object.keys(e).forEach(function (k) {
-			if (k !== 'default') {
-				var d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		});
-	}
-	n.default = e;
-	return Object.freeze(n);
-}
-
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./ext\'ernal')); });
+import('./ext\'ernal');
 
 console.log('main', dep.value);
diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js
@@ -2,24 +2,7 @@
 
 var dep = require('./generated-dep.js');
 
-function _interopNamespaceDefault(e) {
-	var n = Object.create(null);
-	if (e) {
-		Object.keys(e).forEach(function (k) {
-			if (k !== 'default') {
-				var d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		});
-	}
-	n.default = e;
-	return Object.freeze(n);
-}
-
 console.log('main1', dep.value);
 
 Promise.resolve().then(function () { return require('./generated-dynamic.js'); }).then(result => console.log(result));
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./external.js')); }).then(result => console.log(result));
+import('./external.js').then(result => console.log(result));
diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js
@@ -2,24 +2,7 @@
 
 var dep = require('../generated-dep.js');
 
-function _interopNamespaceDefault(e) {
-	var n = Object.create(null);
-	if (e) {
-		Object.keys(e).forEach(function (k) {
-			if (k !== 'default') {
-				var d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		});
-	}
-	n.default = e;
-	return Object.freeze(n);
-}
-
 console.log('main2', dep.value);
 
 Promise.resolve().then(function () { return require('../generated-dynamic.js'); }).then(result => console.log(result));
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('../external.js')); }).then(result => console.log(result));
+import('../external.js').then(result => console.log(result));
diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js
@@ -24,10 +24,10 @@ function _interopNamespaceDefault(e) {
 
 // nested
 Promise.resolve().then(function () { return existing; });
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./direct-relative-external')); });
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-relative-external')); });
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('direct-absolute-external')); });
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-absolute-external')); });
+import('./direct-relative-external');
+import('to-indirect-relative-external');
+import('direct-absolute-external');
+import('to-indirect-absolute-external');
 
 const value = 'existing';
 console.log('existing');
@@ -39,12 +39,12 @@ var existing = /*#__PURE__*/Object.freeze({
 
 //main
 Promise.resolve().then(function () { return existing; });
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./direct-relative-external')); });
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-relative-external')); });
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('direct-absolute-external')); });
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-absolute-external')); });
+import('./direct-relative-external');
+import('to-indirect-relative-external');
+import('direct-absolute-external');
+import('to-indirect-absolute-external');
 
 (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })('dynamic-direct-external' + unknown);
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-dynamic-indirect-external')); });
+import('to-dynamic-indirect-external');
 Promise.resolve().then(function () { return existing; });
 (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })('my' + 'replacement');
diff --git a/test/form/samples/deconflict-format-specific-globals/_config.js b/test/form/samples/deconflict-format-specific-globals/_config.js
@@ -5,7 +5,8 @@ module.exports = {
 		output: {
 			globals: { external: 'external' },
 			name: 'bundle',
-			interop: 'auto'
+			interop: 'auto',
+			dynamicImportInCjs: false
 		}
 	}
 };
diff --git a/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js b/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js
@@ -20,4 +20,4 @@ function _interopNamespaceDefault(e) {
 (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(`${globalThis.unknown}`);
 (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(`My ${globalThis.unknown}`);
 (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })('./seven.js');
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./seven.js')); });
+import('./seven.js');
diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_config.js b/test/form/samples/generated-code-compact/arrow-functions-false/_config.js
@@ -25,7 +25,8 @@ module.exports = {
 				return 'compat';
 			},
 			name: 'bundle',
-			noConflict: true
+			noConflict: true,
+			dynamicImportInCjs: false
 		}
 	},
 	expectedWarnings: ['DEPRECATED_FEATURE']

diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_config.js b/test/form/samples/generated-code-compact/arrow-functions-true/_config.js
@@ -25,7 +25,8 @@ module.exports = {
 				return 'compat';
 			},
 			name: 'bundle',
-			noConflict: true
+			noConflict: true,
+			dynamicImportInCjs: false
 		}
 	},
 	expectedWarnings: ['DEPRECATED_FEATURE']

diff --git a/test/form/samples/generated-code/arrow-functions-false/_config.js b/test/form/samples/generated-code/arrow-functions-false/_config.js
@@ -24,7 +24,8 @@ module.exports = {
 				return 'compat';
 			},
 			name: 'bundle',
-			noConflict: true
+			noConflict: true,
+			dynamicImportInCjs: false
 		}
 	},
 	expectedWarnings: ['DEPRECATED_FEATURE']

diff --git a/test/form/samples/generated-code/arrow-functions-true/_config.js b/test/form/samples/generated-code/arrow-functions-true/_config.js
@@ -24,7 +24,8 @@ module.exports = {
 				return 'compat';
 			},
 			name: 'bundle',
-			noConflict: true
+			noConflict: true,
+			dynamicImportInCjs: false
 		}
 	},
 	expectedWarnings: ['DEPRECATED_FEATURE']

diff --git a/test/form/samples/interop-per-dependency-no-freeze/_config.js b/test/form/samples/interop-per-dependency-no-freeze/_config.js
@@ -9,7 +9,8 @@ module.exports = {
 			},
 			globals(id) {
 				return id.replace('-', '');
-			}
+			},
+			dynamicImportInCjs: false
 		}
 	}
 };
diff --git a/test/form/samples/interop-per-dependency-no-live-binding/_config.js b/test/form/samples/interop-per-dependency-no-live-binding/_config.js
@@ -13,7 +13,8 @@ module.exports = {
 				checkedIds.add(id);
 				return id.split('-')[1];
 			},
-			format: 'cjs'
+			format: 'cjs',
+			dynamicImportInCjs: false
 		}
 	}
 };
diff --git a/test/form/samples/interop-per-dependency/_config.js b/test/form/samples/interop-per-dependency/_config.js
@@ -11,7 +11,8 @@ module.exports = {
 			},
 			globals(id) {
 				return id.replace('-', '');
-			}
+			},
+			dynamicImportInCjs: false
 		}
 	}
 };
diff --git a/test/form/samples/no-external-live-bindings-compact/_config.js b/test/form/samples/no-external-live-bindings-compact/_config.js
@@ -9,7 +9,8 @@ module.exports = {
 			},
 			compact: true,
 			externalLiveBindings: false,
-			name: 'bundle'
+			name: 'bundle',
+			dynamicImportInCjs: false
 		}
 	}
 };
diff --git a/test/form/samples/no-external-live-bindings/_config.js b/test/form/samples/no-external-live-bindings/_config.js
@@ -8,7 +8,8 @@ module.exports = {
 				external2: 'external2'
 			},
 			externalLiveBindings: false,
-			name: 'bundle'
+			name: 'bundle',
+			dynamicImportInCjs: false
 		}
 	}
 };
diff --git a/test/form/samples/paths-function/_expected/cjs.js b/test/form/samples/paths-function/_expected/cjs.js
@@ -2,23 +2,6 @@
 
 var foo = require('https://unpkg.com/foo');
 
-function _interopNamespaceDefault(e) {
-	var n = Object.create(null);
-	if (e) {
-		Object.keys(e).forEach(function (k) {
-			if (k !== 'default') {
-				var d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		});
-	}
-	n.default = e;
-	return Object.freeze(n);
-}
-
 assert.equal(foo, 42);
 
-Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('https://unpkg.com/foo')); }).then(({ default: foo }) => assert.equal(foo, 42));
+import('https://unpkg.com/foo').then(({ default: foo }) => assert.equal(foo, 42));
diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js b/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js
@@ -2,26 +2,9 @@
 
 var myExternal = require('external');
 
-function _interopNamespaceDefault(e) {
-	var n = Object.create(null);
-	if (e) {
-		Object.keys(e).forEach(function (k) {
-			if (k !== 'default') {
-				var d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		});
-	}
-	n.default = e;
-	return Object.freeze(n);
-}
-
 const test = () => myExternal;
 
-const someDynamicImport = () => Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('external')); });
+const someDynamicImport = () => import('external');
 
 exports.someDynamicImport = someDynamicImport;
 exports.test = test;
diff --git a/test/function/samples/catch-dynamic-import-failure/_config.js b/test/function/samples/catch-dynamic-import-failure/_config.js
@@ -10,7 +10,7 @@ module.exports = {
 		return exports.then(result => {
 			assert.strictEqual(result[0].message, 'exists-named');
 			assert.strictEqual(result[1].message, 'exists-default');
-			const expectedError = "Cannot find module 'does-not-exist'";
+			const expectedError = "Cannot find package 'does-not-exist'";
 			assert.strictEqual(result[2].message.slice(0, expectedError.length), expectedError);
 		});
 	}