Add basic test

src/Module.ts

@@ -562,7 +562,6 @@ export default class Module {
 		}
 		if (typeof inlineDynamicImport === 'boolean') {
 			this.inlineDynamicImport = inlineDynamicImport;
-			console.log(this.id, inlineDynamicImport);
 		}
 
 		timeStart('generate ast', 3);
@@ -642,6 +641,7 @@ export default class Module {
 			customTransformCache: this.customTransformCache,
 			dependencies: this.dependencies.map(module => module.id),
 			id: this.id,
+			inlineDynamicImport: this.inlineDynamicImport,
 			moduleSideEffects: this.moduleSideEffects,
 			originalCode: this.originalCode,
 			originalSourcemap: this.originalSourcemap,

src/ModuleLoader.ts

@@ -322,6 +322,9 @@ export class ModuleLoader {
 				if (typeof sourceDescription.moduleSideEffects === 'boolean') {
 					module.moduleSideEffects = sourceDescription.moduleSideEffects;
 				}
+				if (typeof sourceDescription.inlineDynamicImport === 'boolean') {
+					module.inlineDynamicImport = sourceDescription.inlineDynamicImport;
+				}
 				return transform(this.graph, sourceDescription, module);
 			})
 			.then((source: TransformModuleJSON | ModuleJSON) => {

test/chunking-form/samples/inline-dynamic-import/inline-in-various-hooks/_config.js

@@ -0,0 +1,36 @@
+const fs = require('fs');
+const path = require('path');
+
+module.exports = {
+	description: 'inlines dynamic imports marked for inlining',
+	options: {
+		input: 'main.js',
+		plugins: {
+			resolveId(id, importer) {
+				if (id.endsWith('dep-inlined-via-resolveId.js')) {
+					return this.resolve(id, importer, { skipSelf: true }).then(resolution =>
+						Object.assign({}, resolution, { inlineDynamicImport: true })
+					);
+				}
+			},
+			load(id) {
+				if (id.endsWith('dep-inlined-via-load.js')) {
+					return {
+						code: fs.readFileSync(path.resolve(__dirname, 'dep-inlined-via-load.js'), {
+							encoding: 'utf8'
+						}),
+						inlineDynamicImport: true
+					};
+				}
+			},
+			transform(code, id) {
+				if (id.endsWith('dep-inlined-via-transform.js')) {
+					return {
+						code,
+						inlineDynamicImport: true
+					};
+				}
+			}
+		}
+	}
+};

test/chunking-form/samples/inline-dynamic-import/inline-in-various-hooks/_expected/amd/generated-dep-not-inlined.js

@@ -0,0 +1,8 @@
+define(['exports'], function (exports) { 'use strict';
+
+	console.log('not inlined');
+	const value = 'not inlined';
+
+	exports.value = value;
+
+});

test/chunking-form/samples/inline-dynamic-import/inline-in-various-hooks/_expected/amd/main.js

@@ -0,0 +1,34 @@
+define(['require'], function (require) { 'use strict';
+
+	Promise.resolve().then(function () { return depInlinedViaResolveId; }).then(console.log);
+	Promise.resolve().then(function () { return depInlinedViaLoad; }).then(console.log);
+	Promise.resolve().then(function () { return depInlinedViaTransform; }).then(console.log);
+	new Promise(function (resolve, reject) { require(['./generated-dep-not-inlined'], resolve, reject) }).then(console.log);
+
+	console.log('main');
+
+	console.log('resolveId');
+	const value = 'resolveId';
+
+	var depInlinedViaResolveId = /*#__PURE__*/Object.freeze({
+		__proto__: null,
+		value: value
+	});
+
+	console.log('load');
+	const value$1 = 'load';
+
+	var depInlinedViaLoad = /*#__PURE__*/Object.freeze({
+		__proto__: null,
+		value: value$1
+	});
+
+	console.log('transform');
+	const value$2 = 'transform';
+
+	var depInlinedViaTransform = /*#__PURE__*/Object.freeze({
+		__proto__: null,
+		value: value$2
+	});
+
+});

test/chunking-form/samples/inline-dynamic-import/inline-in-various-hooks/_expected/cjs/generated-dep-not-inlined.js

@@ -0,0 +1,6 @@
+'use strict';
+
+console.log('not inlined');
+const value = 'not inlined';
+
+exports.value = value;

test/chunking-form/samples/inline-dynamic-import/inline-in-various-hooks/_expected/cjs/main.js

@@ -0,0 +1,32 @@
+'use strict';
+
+Promise.resolve().then(function () { return depInlinedViaResolveId; }).then(console.log);
+Promise.resolve().then(function () { return depInlinedViaLoad; }).then(console.log);
+Promise.resolve().then(function () { return depInlinedViaTransform; }).then(console.log);
+new Promise(function (resolve) { resolve(require('./generated-dep-not-inlined.js')); }).then(console.log);
+
+console.log('main');
+
+console.log('resolveId');
+const value = 'resolveId';
+
+var depInlinedViaResolveId = /*#__PURE__*/Object.freeze({
+	__proto__: null,
+	value: value
+});
+
+console.log('load');
+const value$1 = 'load';
+
+var depInlinedViaLoad = /*#__PURE__*/Object.freeze({
+	__proto__: null,
+	value: value$1
+});
+
+console.log('transform');
+const value$2 = 'transform';
+
+var depInlinedViaTransform = /*#__PURE__*/Object.freeze({
+	__proto__: null,
+	value: value$2
+});

test/chunking-form/samples/inline-dynamic-import/inline-in-various-hooks/_expected/es/generated-dep-not-inlined.js

@@ -0,0 +1,4 @@
+console.log('not inlined');
+const value = 'not inlined';
+
+export { value };

test/chunking-form/samples/inline-dynamic-import/inline-in-various-hooks/_expected/es/main.js

@@ -0,0 +1,30 @@
+Promise.resolve().then(function () { return depInlinedViaResolveId; }).then(console.log);
+Promise.resolve().then(function () { return depInlinedViaLoad; }).then(console.log);
+Promise.resolve().then(function () { return depInlinedViaTransform; }).then(console.log);
+import('./generated-dep-not-inlined.js').then(console.log);
+
+console.log('main');
+
+console.log('resolveId');
+const value = 'resolveId';
+
+var depInlinedViaResolveId = /*#__PURE__*/Object.freeze({
+	__proto__: null,
+	value: value
+});
+
+console.log('load');
+const value$1 = 'load';
+
+var depInlinedViaLoad = /*#__PURE__*/Object.freeze({
+	__proto__: null,
+	value: value$1
+});
+
+console.log('transform');
+const value$2 = 'transform';
+
+var depInlinedViaTransform = /*#__PURE__*/Object.freeze({
+	__proto__: null,
+	value: value$2
+});

test/chunking-form/samples/inline-dynamic-import/inline-in-various-hooks/_expected/system/generated-dep-not-inlined.js

@@ -0,0 +1,11 @@
+System.register([], function (exports) {
+	'use strict';
+	return {
+		execute: function () {
+
+			console.log('not inlined');
+			const value = exports('value', 'not inlined');
+
+		}
+	};
+});

test/chunking-form/samples/inline-dynamic-import/inline-in-various-hooks/_expected/system/main.js

@@ -0,0 +1,39 @@
+System.register([], function (exports, module) {
+	'use strict';
+	return {
+		execute: function () {
+
+			Promise.resolve().then(function () { return depInlinedViaResolveId; }).then(console.log);
+			Promise.resolve().then(function () { return depInlinedViaLoad; }).then(console.log);
+			Promise.resolve().then(function () { return depInlinedViaTransform; }).then(console.log);
+			module.import('./generated-dep-not-inlined.js').then(console.log);
+
+			console.log('main');
+
+			console.log('resolveId');
+			const value = 'resolveId';
+
+			var depInlinedViaResolveId = /*#__PURE__*/Object.freeze({
+				__proto__: null,
+				value: value
+			});
+
+			console.log('load');
+			const value$1 = 'load';
+
+			var depInlinedViaLoad = /*#__PURE__*/Object.freeze({
+				__proto__: null,
+				value: value$1
+			});
+
+			console.log('transform');
+			const value$2 = 'transform';
+
+			var depInlinedViaTransform = /*#__PURE__*/Object.freeze({
+				__proto__: null,
+				value: value$2
+			});
+
+		}
+	};
+});

test/chunking-form/samples/inline-dynamic-import/inline-in-various-hooks/dep-inlined-via-load.js

@@ -0,0 +1,2 @@
+console.log('load');
+export const value = 'load';

test/chunking-form/samples/inline-dynamic-import/inline-in-various-hooks/dep-inlined-via-resolveId.js

@@ -0,0 +1,2 @@
+console.log('resolveId');
+export const value = 'resolveId';

test/chunking-form/samples/inline-dynamic-import/inline-in-various-hooks/dep-inlined-via-transform.js

@@ -0,0 +1,2 @@
+console.log('transform');
+export const value = 'transform';

test/chunking-form/samples/inline-dynamic-import/inline-in-various-hooks/dep-not-inlined.js

@@ -0,0 +1,2 @@
+console.log('not inlined');
+export const value = 'not inlined';

test/chunking-form/samples/inline-dynamic-import/inline-in-various-hooks/main.js

@@ -0,0 +1,6 @@
+import('./dep-inlined-via-resolveId.js').then(console.log);
+import('./dep-inlined-via-load.js').then(console.log);
+import('./dep-inlined-via-transform.js').then(console.log);
+import('./dep-not-inlined.js').then(console.log);
+
+console.log('main');