fix: insert relative imports for CSS files, #178

callstack · Nov 26, 2017 · 908dcd7 · 908dcd7
1 parent 8c94761
commit 908dcd7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/babel/__integration-tests__/preval-extract/exctraction.spec.js b/src/babel/__integration-tests__/preval-extract/exctraction.spec.js
@@ -65,12 +65,8 @@ describe('preval-extract babel plugin with extraction enabled', () => {
       { filename: filename2 }
     );
 
-    expect(transpiled1).toMatch(
-      `require('${path.join(process.cwd(), '.linaria-cache/test1.css')}')`
-    );
-    expect(transpiled2).toMatch(
-      `require('${path.join(process.cwd(), '.linaria-cache/test2.css')}')`
-    );
+    expect(transpiled1).toMatch(`require('./.linaria-cache/test1.css')`);
+    expect(transpiled2).toMatch(`require('./.linaria-cache/test2.css')`);
 
     expect(data1).toMatchSnapshot();
     expect(data2).toMatchSnapshot();

diff --git a/src/babel/preval-extract/extractStyles.js b/src/babel/preval-extract/extractStyles.js
@@ -110,6 +110,10 @@ export default function extractStyles(
   const filename = single
     ? path.join(process.cwd(), outDir, basename)
     : getOutputFilename(relativeCurrentFilename, outDir);
+  const importPath = `./${path.relative(
+    path.dirname(absCurrentFilename),
+    filename
+  )}`;
 
   if (!extract) {
     return;
@@ -132,7 +136,7 @@ export default function extractStyles(
       stylesCache[absCurrentFilename] = data;
     } else {
       if (hasCachedStyles(filename, data)) {
-        addRequireForCss(types, program, filename);
+        addRequireForCss(types, program, importPath);
         return;
       }
       stylesCache[filename] = data;
@@ -146,7 +150,7 @@ export default function extractStyles(
     );
   } else {
     outputStylesToFile(filename, withPreamble(data));
-    addRequireForCss(types, program, filename);
+    addRequireForCss(types, program, importPath);
   }
 }