JIT: Assign source to nodes inserted into @tailwind directives

tailwindlabs · May 24, 2021 · 2f15411 · 2f15411
1 parent a2c4490
commit 2f15411
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/jit/lib/expandTailwindAtRules.js b/src/jit/lib/expandTailwindAtRules.js
@@ -252,25 +252,25 @@ export default function expandTailwindAtRules(context, registerDependency, tailw
     // Replace any Tailwind directives with generated CSS
 
     if (layerNodes.base) {
-      layerNodes.base.before(cloneNodes([...baseNodes]))
+      layerNodes.base.before(cloneNodes([...baseNodes], layerNodes.base.source))
       layerNodes.base.remove()
     }
 
     if (layerNodes.components) {
-      layerNodes.components.before(cloneNodes([...componentNodes]))
+      layerNodes.components.before(cloneNodes([...componentNodes], layerNodes.components.source))
       layerNodes.components.remove()
     }
 
     if (layerNodes.utilities) {
-      layerNodes.utilities.before(cloneNodes([...utilityNodes]))
+      layerNodes.utilities.before(cloneNodes([...utilityNodes], layerNodes.utilities.source))
       layerNodes.utilities.remove()
     }
 
     if (layerNodes.variants) {
-      layerNodes.variants.before(cloneNodes([...screenNodes]))
+      layerNodes.variants.before(cloneNodes([...screenNodes], layerNodes.variants.source))
       layerNodes.variants.remove()
     } else {
-      root.append(cloneNodes([...screenNodes]))
+      root.append(cloneNodes([...screenNodes], root.source))
     }
 
     // ---

diff --git a/src/util/cloneNodes.js b/src/util/cloneNodes.js
@@ -1,3 +1,11 @@
-export default function cloneNodes(nodes) {
-  return nodes.map((node) => node.clone())
+export default function cloneNodes(nodes, source) {
+  return nodes.map((node) => {
+    let cloned = node.clone()
+
+    if (source !== undefined) {
+      cloned.source = source
+    }
+
+    return cloned
+  })
 }