fix comments in import (#964)

* fix comments in import * fix dynamic imports too
FredKSchott · Aug 31, 2020 · 43cf5ce · 43cf5ce
1 parent 3c8ddd5
commit 43cf5ce
Show file tree

Hide file tree

Showing 7 changed files with 2,158 additions and 9 deletions.
diff --git a/snowpack/src/commands/dev.ts b/snowpack/src/commands/dev.ts
@@ -61,7 +61,7 @@ import {
   transformEsmImports,
   transformFileImports,
 } from '../rewrite-imports';
-import {matchImportSpecifier} from '../scan-imports';
+import {matchDynamicImportValue} from '../scan-imports';
 import {CommandOptions, ImportMap, SnowpackBuildMap, SnowpackConfig} from '../types/snowpack';
 import {
   BUILD_CACHE,
@@ -604,7 +604,7 @@ If Snowpack is having trouble detecting the import, add ${colors.bold(
         const resolvedImports = rawImports.map((imp) => {
           let spec = code.substring(imp.s, imp.e);
           if (imp.d > -1) {
-            spec = matchImportSpecifier(spec) || '';
+            spec = matchDynamicImportValue(spec) || '';
           }
           spec = spec.replace(/\?mtime=[0-9]+$/, '');
           return path.posix.resolve(path.posix.dirname(reqPath), spec);

diff --git a/snowpack/src/rewrite-imports.ts b/snowpack/src/rewrite-imports.ts
@@ -1,6 +1,6 @@
 import {SnowpackSourceFile} from './types/snowpack';
 import {HTML_JS_REGEX, CSS_REGEX} from './util';
-import {matchImportSpecifier} from './scan-imports';
+import {matchDynamicImportValue} from './scan-imports';
 
 const {parse} = require('es-module-lexer');
 
@@ -18,7 +18,7 @@ export async function scanCodeImportsExports(code: string): Promise<any[]> {
     // imp.d > -1 === dynamic import
     if (imp.d > -1) {
       const importStatement = code.substring(imp.s, imp.e);
-      return !!matchImportSpecifier(importStatement);
+      return !!matchDynamicImportValue(importStatement);
     }
     return true;
   });
@@ -33,7 +33,7 @@ export async function transformEsmImports(
   for (const imp of imports.reverse()) {
     let spec = rewrittenCode.substring(imp.s, imp.e);
     if (imp.d > -1) {
-      spec = matchImportSpecifier(spec) || '';
+      spec = matchDynamicImportValue(spec) || '';
     }
     let rewrittenImport = replaceImport(spec);
     if (imp.d > -1) {

diff --git a/snowpack/src/scan-imports.ts b/snowpack/src/scan-imports.ts
@@ -36,8 +36,8 @@ function createInstallTarget(specifier: string, all = true): InstallTarget {
   };
 }
 
-export function matchImportSpecifier(importStatement: string) {
-  const matched = importStatement.match(/^\s*('([^']+)'|"([^"]+)")\s*$/m);
+export function matchDynamicImportValue(importStatement: string) {
+  const matched = stripComments(importStatement).match(/^\s*('([^']+)'|"([^"]+)")\s*$/m);
   return matched?.[2] || matched?.[3] || null;
 }
 
@@ -52,7 +52,7 @@ function getWebModuleSpecifierFromCode(code: string, imp: ImportSpecifier) {
   }
   // Dynamic imports: a bit trickier to parse. Today, we only support string literals.
   const importStatement = code.substring(imp.s, imp.e);
-  return matchImportSpecifier(importStatement);
+  return matchDynamicImportValue(importStatement);
 }
 
 /**
@@ -76,7 +76,7 @@ function parseImportStatement(code: string, imp: ImportSpecifier): null | Instal
     return null;
   }
 
-  const importStatement = code.substring(imp.ss, imp.se);
+  const importStatement = stripComments(code.substring(imp.ss, imp.se));
   if (/^import\s+type/.test(importStatement)) {
     return null;
   }