fix css import url resolver

FredKSchott · Sep 8, 2020 · 2966ec4 · 2966ec4
1 parent 9583ded
commit 2966ec4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/snowpack/src/commands/build.ts b/snowpack/src/commands/build.ts
@@ -182,8 +182,11 @@ class FileBuilder {
           return spec;
         }
         // Handle normal "./" & "../" import specifiers
-        const extName = path.extname(resolvedImportUrl);
-        const isProxyImport = extName && extName !== '.js';
+        const importExtName = path.extname(resolvedImportUrl);
+        const isProxyImport =
+          importExtName &&
+          (file.baseExt === '.js' || file.baseExt === '.html') &&
+          importExtName !== '.js';
         const isAbsoluteUrlPath = path.posix.isAbsolute(resolvedImportUrl);
         let resolvedImportPath = removeLeadingSlash(path.normalize(resolvedImportUrl));
         // We treat ".proxy.js" files special: we need to make sure that they exist on disk

diff --git a/snowpack/src/commands/dev.ts b/snowpack/src/commands/dev.ts
@@ -573,7 +573,11 @@ export async function command(commandOptions: CommandOptions) {
             }
             // Support proxy file imports
             const extName = path.extname(resolvedImportUrl);
-            if (extName && extName !== '.js') {
+            if (
+              extName &&
+              (responseExt === '.js' || responseExt === '.html') &&
+              extName !== '.js'
+            ) {
               return resolvedImportUrl + '.proxy.js';
             }
             return resolvedImportUrl;

diff --git a/snowpack/src/rewrite-imports.ts b/snowpack/src/rewrite-imports.ts
@@ -72,7 +72,7 @@ async function transformCssImports(code: string, replaceImport: (specifier: stri
     // Only transform a script element if it contains inlined code / is not empty.
     rewrittenCode = spliceString(
       rewrittenCode,
-      `@import "${replaceImport(spec)}"`,
+      `@import "${replaceImport(spec)}";`,
       match.index,
       match.index + fullMatch.length,
     );

diff --git a/test/build/__snapshots__/build.test.js.snap b/test/build/__snapshots__/build.test.js.snap
@@ -6357,13 +6357,13 @@ export default 'Button';"
 
 exports[`snowpack build resolve-imports: _dist_/components/style.css 1`] = `
 "/* Include 2+ imports to make sure regex isn't borked. */
-@import \\"../../TEST_WMU/css-package-a/style.css.proxy.js\\"
-@import \\"../../TEST_WMU/@css/package-b/style.css.proxy.js\\""
+@import \\"../../TEST_WMU/css-package-a/style.css\\";
+@import \\"../../TEST_WMU/@css/package-b/style.css\\";"
 `;
 
 exports[`snowpack build resolve-imports: _dist_/components/style.css.proxy.js 1`] = `
 "
-const code = \\"/* Include 2+ imports to make sure regex isn't borked. */@import \\\\\\"../../TEST_WMU/css-package-a/style.css.proxy.js\\\\\\"@import \\\\\\"../../TEST_WMU/@css/package-b/style.css.proxy.js\\\\\\"\\";
+const code = \\"/* Include 2+ imports to make sure regex isn't borked. */@import \\\\\\"../../TEST_WMU/css-package-a/style.css\\\\\\";@import \\\\\\"../../TEST_WMU/@css/package-b/style.css\\\\\\";\\";
 const styleEl = document.createElement(\\"style\\");
 const codeEl = document.createTextNode(code);
 styleEl.type = 'text/css';