Merge remote-tracking branch 'origin/master' into wip-rewrite--courte…

…ous-antelope-d8443985a8

.github/workflows/ci.yaml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         node-version: [14.x, 16.x, 18.x]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v3
       with:

lib/parse-styles.js

@@ -83,7 +83,7 @@ async function resolveImportId(result, stmt, options, state, postcss) {
     )
 
     return
-  } else if (dataURL.isValid(stmt.from[stmt.from.length - 1])) {
+  } else if (dataURL.isValid(stmt.from.slice(-1))) {
     // Data urls can't be used as a base url to resolve imports.
     // Skip inlining and warn.
     stmt.children = []
@@ -93,6 +93,7 @@ async function resolveImportId(result, stmt, options, state, postcss) {
         node: stmt.node,
       }
     )
+
     return
   }
 
@@ -166,6 +167,10 @@ async function loadImportContent(
     return
   }
 
+  if (from.includes(filename)) {
+    return
+  }
+
   const content = await options.load(filename, options)
 
   if (content.trim() === "" && options.warnOnEmpty) {

test/fixtures/cyclical-skip-duplicates.css

@@ -0,0 +1,4 @@
+@import "cyclical-a.css";
+@import "cyclical-b.css";
+
+@import "cyclical-screen.css" screen;

test/fixtures/cyclical-skip-duplicates.expected.css

@@ -0,0 +1,26 @@
+
+
+.b {
+  color: red;
+}
+
+.a {
+  color: blue;
+}
+
+@media screen {
+
+  @media all {
+
+.a {
+  color: aquamarine;
+}
+  }
+}
+
+@media screen {
+
+.a {
+  color: pink;
+}
+}

test/fixtures/cyclical.css

@@ -1,2 +1,4 @@
 @import "cyclical-a.css";
 @import "cyclical-b.css";
+
+@import "cyclical-screen.css" screen;

test/fixtures/cyclical.expected.css

@@ -15,3 +15,20 @@
 .b {
   color: red;
 }
+
+@media screen {
+
+  @media all {
+
+.a {
+  color: aquamarine;
+}
+  }
+}
+
+@media screen {
+
+.a {
+  color: pink;
+}
+}

test/fixtures/imports/cyclical-all.css

@@ -0,0 +1,5 @@
+@import url(cyclical-screen.css) screen;
+
+.a {
+  color: aquamarine;
+}

test/fixtures/imports/cyclical-screen.css

@@ -0,0 +1,5 @@
+@import url(cyclical-all.css) all;
+
+.a {
+  color: pink;
+}

test/import.js

@@ -13,13 +13,18 @@ const atImport = require("..")
 // internal tooling
 const checkFixture = require("./helpers/check-fixture")
 
-test("should import stylsheets", checkFixture, "simple")
+test("should import stylesheets", checkFixture, "simple")
 
-test("should not import a stylsheet twice", checkFixture, "no-duplicate")
+test("should not import a stylesheet twice", checkFixture, "no-duplicate")
 
-test("should be able to import a stylsheet twice", checkFixture, "duplicates", {
-  skipDuplicates: false,
-})
+test(
+  "should be able to import a stylesheet twice",
+  checkFixture,
+  "duplicates",
+  {
+    skipDuplicates: false,
+  }
+)
 
 test(
   "should be able to import a stylesheet with cyclical dependencies",
@@ -30,7 +35,16 @@ test(
   }
 )
 
-test("should import stylsheets with same content", checkFixture, "same")
+test(
+  "should be able to import a stylesheet with cyclical dependencies and skip duplicates is true",
+  checkFixture,
+  "cyclical-skip-duplicates",
+  {
+    skipDuplicates: true,
+  }
+)
+
+test("should import stylesheets with same content", checkFixture, "same")
 
 test("should ignore & adjust external import", checkFixture, "ignore")