From 7e92e95021c4bd09d78321c2d0d7ac6d712bf709 Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Mon, 27 Nov 2017 16:50:36 +0530
Subject: [PATCH] fix: insert relative imports for CSS files and support
 absolute path in outDir (#180)

* fix: insert relative imports for CSS files, #178

* fix: support absolute path in output directory
---
 .../preval-extract/exctraction.spec.js        |  8 +---
 src/babel/preval-extract/extractStyles.js     | 38 ++++++++++++-------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/babel/__integration-tests__/preval-extract/exctraction.spec.js b/src/babel/__integration-tests__/preval-extract/exctraction.spec.js
index a427fba2b..8905e82d2 100644
--- 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
index 5587b974d..e4c0981cb 100644
--- a/src/babel/preval-extract/extractStyles.js
+++ b/src/babel/preval-extract/extractStyles.js
@@ -18,13 +18,16 @@ const withPreamble = data =>
  * Get output filename with directory structure from source preserved inside
  * custom outDir.
  */
-function getOutputFilename(relativeFilename: string, outDir: string): string {
+function getOutputFilename(
+  relativeFilename: string,
+  absOutDir: string
+): string {
   const basename = /(.+)\..+$/.exec(path.basename(relativeFilename))[1];
   const relativeOutputFilename = path.join(
     path.dirname(relativeFilename),
     `${basename}.css`
   );
-  return path.join(process.cwd(), outDir, relativeOutputFilename);
+  return path.join(absOutDir, relativeOutputFilename);
 }
 
 let stylesCache = {};
@@ -95,21 +98,28 @@ export default function extractStyles(
   const relativeCurrentFilename = relativeToCwd(currentFilename);
   const absCurrentFilename = makeAbsolute(currentFilename);
 
-  const { single, cache, extract, outDir, filename: basename } = {
-    cache: true,
-    extract: true,
-    single: false,
-    outDir: '.linaria-cache',
-    filename: 'styles.css',
-    ...options,
-  };
+  const {
+    single = false,
+    cache = true,
+    extract = true,
+    outDir = '.linaria-cache',
+    filename: basename = 'styles.css',
+  } = options;
+
+  const absOutDir = path.isAbsolute(outDir)
+    ? outDir
+    : path.join(process.cwd(), outDir);
 
   // If single === true, we compute filename from outDir and filename options,
   // since there will be only one file, otherwise we need to reconstruct directory
   // structure inside outDir. In that case filename option is discard.
   const filename = single
-    ? path.join(process.cwd(), outDir, basename)
-    : getOutputFilename(relativeCurrentFilename, outDir);
+    ? path.join(absOutDir, basename)
+    : getOutputFilename(relativeCurrentFilename, absOutDir);
+  const importPath = `./${path.relative(
+    path.dirname(absCurrentFilename),
+    filename
+  )}`;
 
   if (!extract) {
     return;
@@ -132,7 +142,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 +156,7 @@ export default function extractStyles(
     );
   } else {
     outputStylesToFile(filename, withPreamble(data));
-    addRequireForCss(types, program, filename);
+    addRequireForCss(types, program, importPath);
   }
 }