improve ESM import scanner

FredKSchott · Jun 1, 2020 · 265418e · 265418e
1 parent 3c10d00
commit 265418e
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 1 deletion.
diff --git a/src/scan-imports.ts b/src/scan-imports.ts
@@ -16,7 +16,7 @@ const WEB_MODULES_TOKEN_LENGTH = WEB_MODULES_TOKEN.length;
 // (?!.*(:\/\/)) - Ignore if previous match was a protocol (ex: http://)
 const BARE_SPECIFIER_REGEX = /^[@\w](?!.*(:\/\/))/;
 
-const ESM_IMPORT_REGEX = /import(?:["'\s]*([\w*${}\n\r\t, ]+)["'\s]from\s*)?["'\s]["'\s](.*?)["'\s].*(;?)$/gm;
+const ESM_IMPORT_REGEX = /import(?:["'\s]*([\w*${}\n\r\t, ]+)\s*from\s*)?\s*["'](.*?)["']/gm;
 const ESM_DYNAMIC_IMPORT_REGEX = /import\((?:['"].+['"]|`[^$]+`)\)/gm;
 const HAS_NAMED_IMPORTS_REGEX = /^[\w\s\,]*\{(.*)\}/s;
 const SPLIT_NAMED_IMPORTS_REGEX = /\bas\s+\w+|,/s;

diff --git a/test/integration/include/dir/h.ts b/test/integration/include/dir/h.ts
@@ -0,0 +1,2 @@
+// test 8: Work even if no semicolons
+import * as pkg from 'package-02'
diff --git a/test/integration/include/expected-install/import-map.json b/test/integration/include/expected-install/import-map.json
@@ -3,6 +3,7 @@
     "array-flatten": "./array-flatten.js",
     "http-vue-loader/src/httpVueLoader.js": "./http-vue-loader/src/httpVueLoader.js",
     "package-01": "./package-01.js",
+    "package-02": "./package-02.js",
     "vue-router": "./vue-router.js",
     "vue/dist/vue.esm.browser.js": "./vue/dist/vue.esm.browser.js"
   }

diff --git a/test/integration/include/expected-install/package-02.js b/test/integration/include/expected-install/package-02.js
@@ -0,0 +1,3 @@
+function test() {}
+
+export { test };
diff --git a/test/integration/include/expected-output.txt b/test/integration/include/expected-output.txt
@@ -4,5 +4,6 @@
     ├─ array-flatten.js    XXXX KB    XXXX KB    XXXX KB
     ├─ http-vue-loader/src/httpVueLoader.js    XXXX KB    XXXX KB    XXXX KB
     ├─ package-01.js    XXXX KB    XXXX KB    XXXX KB
+    ├─ package-02.js    XXXX KB    XXXX KB    XXXX KB
     ├─ vue-router.js    XXXX KB    XXXX KB    XXXX KB
     └─ vue/dist/vue.esm.browser.js    XXXX KB    XXXX KB    XXXX KB
diff --git a/test/integration/include/node_modules/package-02/README.md b/test/integration/include/node_modules/package-02/README.md
diff --git a/test/integration/include/node_modules/package-02/index.js b/test/integration/include/node_modules/package-02/index.js
diff --git a/test/integration/include/node_modules/package-02/package.json b/test/integration/include/node_modules/package-02/package.json