Trim quote from import path

css-modules · Jun 3, 2017 · 1100b7e · 1100b7e
1 parent f3b7f93
commit 1100b7e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/extractICSS.js b/src/extractICSS.js
@@ -1,4 +1,4 @@
-const importPattern = /^:import\(("[^"]*"|'[^']*'|[\w-\.]+)\)$/;
+const importPattern = /^:import\(("[^"]*"|'[^']*'|[^"']+)\)$/;
 
 const getDeclsObject = rule => {
   const object = {};
@@ -16,7 +16,7 @@ const extractICSS = (css, removeRules = true) => {
       if (node.selector.slice(0, 7) === ":import") {
         const matches = importPattern.exec(node.selector);
         if (matches) {
-          const path = matches[1];
+          const path = matches[1].replace(/'|"/g, "");
           const aliases = Object.assign(
             icssImports[path] || {},
             getDeclsObject(node)

diff --git a/test/extractICSS.test.js b/test/extractICSS.test.js
@@ -21,7 +21,7 @@ test("extract :import statements with identifier", () => {
 test("extract :import statements with single quoted path", () => {
   expect(runExtract(`:import('./colors.css') {}`)).toEqual({
     icssImports: {
-      "'./colors.css'": {}
+      "./colors.css": {}
     },
     icssExports: {}
   });
@@ -30,18 +30,18 @@ test("extract :import statements with single quoted path", () => {
 test("extract :import statements with double quoted path", () => {
   expect(runExtract(':import("./colors.css") {}')).toEqual({
     icssImports: {
-      '"./colors.css"': {}
+      "./colors.css": {}
     },
     icssExports: {}
   });
 });
 
-test("extract :import with values", () => {
+test("not extract :import with values", () => {
   expect(
-    runExtract(":import(colors) { i__blue: blue; i__red: red; }")
+    runExtract(":import(./colors.css) { i__blue: blue; i__red: red; }")
   ).toEqual({
     icssImports: {
-      colors: {
+      "./colors.css": {
         i__blue: "blue",
         i__red: "red"
       }
@@ -51,7 +51,7 @@ test("extract :import with values", () => {
 });
 
 test("not extract invalid :import", () => {
-  expect(runExtract(":import(./color.css) {}")).toEqual({
+  expect(runExtract(":import(\\'./colors.css) {}")).toEqual({
     icssImports: {},
     icssExports: {}
   });