Emit inline comments inside dynamic import (#2797)

* Emit inline comments inside dynamic import

fixes #2778

* space after import still generates valid JS

* Using findFirstOccurrenceOutsideComment()

src/ast/nodes/Import.ts

@@ -1,5 +1,5 @@
 import MagicString from 'magic-string';
-import { RenderOptions } from '../../utils/renderHelpers';
+import { findFirstOccurrenceOutsideComment, RenderOptions } from '../../utils/renderHelpers';
 import CallExpression from './CallExpression';
 import * as NodeType from './NodeType';
 import { NodeBase } from './shared/Node';
@@ -81,11 +81,13 @@ export default class Import extends NodeBase {
 		if (importMechanism) {
 			const leftMechanism =
 				(this.resolutionInterop && importMechanism.interopLeft) || importMechanism.left;
-			code.overwrite(this.parent.start, this.parent.arguments[0].start, leftMechanism);
+			const leftMechanismEnd =
+				findFirstOccurrenceOutsideComment(code.original, '(', this.parent.callee.end) + 1;
+			code.overwrite(this.parent.start, leftMechanismEnd, leftMechanism);
 
 			const rightMechanism =
 				(this.resolutionInterop && importMechanism.interopRight) || importMechanism.right;
-			code.overwrite(this.parent.arguments[0].end, this.parent.end, rightMechanism);
+			code.overwrite(this.parent.end - 1, this.parent.end, rightMechanism);
 		}
 	}
 

test/chunking-form/samples/dynamic-import-comments/_config.js

@@ -0,0 +1,15 @@
+module.exports = {
+	description: 'should not remove inline comments inside dynamic import',
+	options: {
+		input: 'main.js',
+		onwarn() {},
+		plugins: {
+			resolveDynamicImport() {
+				return false;
+			}
+		},
+		output: {
+			dynamicImportFunction: 'foobar'
+		}
+	}
+};

test/chunking-form/samples/dynamic-import-comments/_expected/amd/main.js

@@ -0,0 +1,7 @@
+define(['require'], function (require) { 'use strict';
+
+	new Promise(function (resolve, reject) { require([
+	/* webpackChunkName: "chunk-name" */
+	'./foo.js'/*suffix*/], resolve, reject) });
+
+});

test/chunking-form/samples/dynamic-import-comments/_expected/cjs/main.js

@@ -0,0 +1,5 @@
+'use strict';
+
+Promise.resolve(require(
+/* webpackChunkName: "chunk-name" */
+'./foo.js'/*suffix*/));

test/chunking-form/samples/dynamic-import-comments/_expected/es/main.js

@@ -0,0 +1,3 @@
+foobar(
+/* webpackChunkName: "chunk-name" */
+'./foo.js'/*suffix*/);

test/chunking-form/samples/dynamic-import-comments/_expected/system/main.js

@@ -0,0 +1,12 @@
+System.register([], function (exports, module) {
+	'use strict';
+	return {
+		execute: function () {
+
+			module.import(
+			/* webpackChunkName: "chunk-name" */
+			'./foo.js'/*suffix*/);
+
+		}
+	};
+});

test/chunking-form/samples/dynamic-import-comments/main.js

@@ -0,0 +1,3 @@
+import /* () should not break */     (
+/* webpackChunkName: "chunk-name" */
+'./foo.js'/*suffix*/);