Missing edge for multiple targets (parcel-bundler#8854)

* fix
marcins · Feb 27, 2023 · 0cf2aff · 0cf2aff
1 parent 359f6bb
commit 0cf2aff
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 1 deletion.
diff --git a/packages/core/core/src/public/MutableBundleGraph.js b/packages/core/core/src/public/MutableBundleGraph.js
@@ -120,7 +120,17 @@ export default class MutableBundleGraph
       resolvedNodeId,
       bundleGraphEdgeTypes.references,
     );
-    this.#graph._graph.removeEdge(dependencyNodeId, resolvedNodeId);
+    if (
+      // This check is needed for multiple targets, when we go over the same nodes twice
+      this.#graph._graph.hasEdge(
+        dependencyNodeId,
+        resolvedNodeId,
+        bundleGraphEdgeTypes.null,
+      )
+    ) {
+      //nullEdgeType
+      this.#graph._graph.removeEdge(dependencyNodeId, resolvedNodeId);
+    }
 
     if (dependency.isEntry) {
       this.#graph._graph.addEdge(

diff --git a/packages/core/integration-tests/test/integration/scss-html-import/fa-regular-400.ttf b/packages/core/integration-tests/test/integration/scss-html-import/fa-regular-400.ttf
diff --git a/packages/core/integration-tests/test/integration/scss-html-import/package.json b/packages/core/integration-tests/test/integration/scss-html-import/package.json
@@ -0,0 +1,18 @@
+{
+    "name": "scss-import-targets",
+    "private": true,
+    "targets": {
+        "target1": {
+            "source": [
+                "./target1.html"
+            ],
+            "distDir": "./target1/"
+        },
+        "target2": {
+            "source": [
+                "./target2.html"
+            ],
+            "distDir": "./target2/"
+        }
+    }
+}
diff --git a/packages/core/integration-tests/test/integration/scss-html-import/style.scss b/packages/core/integration-tests/test/integration/scss-html-import/style.scss
@@ -0,0 +1,4 @@
+@font-face {
+  font-family: 'Font Awesome 6 Free';
+  src: url('fa-regular-400.ttf') format('truetype');
+}
diff --git a/packages/core/integration-tests/test/integration/scss-html-import/target1.html b/packages/core/integration-tests/test/integration/scss-html-import/target1.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <title>What's going on here</title>
+        <link href="style.scss" rel="stylesheet" type="text/css" />
+    </head>
+    <body></body>
+</html>
diff --git a/packages/core/integration-tests/test/integration/scss-html-import/target2.html b/packages/core/integration-tests/test/integration/scss-html-import/target2.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <title>What's going on here</title>
+        <link href="style.scss" rel="stylesheet" type="text/css" />
+    </head>
+    <body></body>
+</html>
diff --git a/packages/core/integration-tests/test/integration/scss-html-import/yarn.lock b/packages/core/integration-tests/test/integration/scss-html-import/yarn.lock
diff --git a/packages/core/integration-tests/test/sass.js b/packages/core/integration-tests/test/sass.js
@@ -79,6 +79,34 @@ describe('sass', function () {
     assert(css.includes('.bar'));
   });
 
+  it('should support scss imports in html for >1 target', async function () {
+    //Repro copied from https://github.com/parcel-bundler/parcel/issues/8754
+    let b = await bundle(path.join(__dirname, '/integration/scss-html-import'));
+
+    assertBundles(b, [
+      {
+        name: 'target1.html',
+        assets: ['target1.html'],
+      },
+      {
+        assets: ['style.scss'],
+      },
+      {
+        name: 'target2.html',
+        assets: ['target2.html'],
+      },
+      {
+        assets: ['style.scss'],
+      },
+      {
+        assets: ['fa-regular-400.ttf'],
+      },
+      {
+        assets: ['fa-regular-400.ttf'],
+      },
+    ]);
+  });
+
   it('should support requiring empty scss files', async function () {
     let b = await bundle(
       path.join(__dirname, '/integration/scss-empty/index.js'),