fix: multiline imports are not working

theKashey · Jun 22, 2020 · ab2da95 · ab2da95
1 parent 6399672
commit ab2da95
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 1 deletion.
diff --git a/__tests__/utils.spec.ts b/__tests__/utils.spec.ts
@@ -91,6 +91,37 @@ describe('scanForImports', () => {
     ]);
   });
 
+  it('should match support multiline imports', () => {
+    const imports = {};
+    remapImports(
+      [
+        {
+          file: 'a',
+          content: `
+            blabla;import(
+            /* webpackChunkName: "chunk-a" */
+            "./a.js"
+            );
+            something else
+            import(
+             // ts-ignore
+             "./b.js"
+            );
+            `,
+        },
+      ],
+      root,
+      root,
+      (a, b) => a + b,
+      imports,
+      () => true
+    );
+    expect(Object.values(imports)).toEqual([
+      `[() => import(/* webpackChunkName: \"chunk-a\" */'${rel}/a.js'), 'chunk-a', '${rel}/a.js', false] /* from .a */`,
+      `[() => import('${rel}/b.js'), '', '${rel}/b.js', false] /* from .a */`,
+    ]);
+  });
+
   it('should remove webpackPrefetch and webpackPreload', () => {
     const imports = {};
     remapImports(

diff --git a/src/scanners/scanForImports.ts b/src/scanners/scanForImports.ts
@@ -11,7 +11,19 @@ const RESOLVE_EXTENSIONS = ['.js', '.jsx', '.ts', '.tsx', '.mjs'];
 
 const trimImport = (str: string) => str.replace(/['"]/g, '');
 
-const getImports = getMatchString(`(['"]?[\\w-/.@]+['"]?)\\)`, 1);
+const getImportMatch = getMatchString(`(['"]?[\\w-/.@]+['"]?)\\)`, 1);
+const getImports = (str: string) =>
+  getImportMatch(
+    str
+      // remove comments
+      .replace(/\/\*([^\*]*)\*\//gi, '')
+      .replace(/\/\/(.*)/gi, '')
+      // remove new lines
+      .replace(/\n/gi, '')
+      // remove spaces?
+      .replace(/[\s]+\)/i, ')')
+  );
+
 const getComment = getMatchString(/\/\*.*\*\// as any, 0);
 
 const getChunkName = getMatchString('webpackChunkName: "([^"]*)"', 1);