From 0d47ffd2d38552f3a1ba702f5ff2818da0fb7418 Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Mon, 14 Jun 2021 17:48:28 +0200
Subject: [PATCH] Fix cloning issues (#4646)

* ensure postcss 7 is dropped from dev dependencies as well

Drop incorrect "help" text

* ensure we are cloning nodes

This is an issue in postcss 7 and fixed in postcss 8. However the compat build still suffers form this issue.
---
 scripts/compat.js            | 29 +++++++++--------------------
 src/jit/lib/generateRules.js |  9 ++++-----
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/scripts/compat.js b/scripts/compat.js
index b4fef5789..db7efe341 100644
--- a/scripts/compat.js
+++ b/scripts/compat.js
@@ -37,34 +37,23 @@ if (process.argv.includes('--prepare')) {
   // 5. Remove peerDependencies
   delete packageJson.peerDependencies
 
-  // 6. Use new name
+  // 6. Cleanup devDependencies
+  for (let key in packageJson.devDependencies) {
+    if (key.includes('postcss')) delete packageJson.devDependencies[key]
+  }
+
+  // 7. Use new name
   packageJson.name = '@tailwindcss/postcss7-compat'
 
-  // 7. Make sure you can publish
+  // 8. Make sure you can publish
   packageJson.publishConfig = { access: 'public' }
 
-  // 8. Write package.json with the new contents
+  // 9. Write package.json with the new contents
   fs.writeFileSync(fromRootPath('package.json'), JSON.stringify(packageJson, null, 2), 'utf8')
 
-  // 9. Print some useful information to make publishing easy
+  // 10. Print some useful information to make publishing easy
   console.log()
   console.log('You can safely publish `tailwindcss` in PostCSS 7 compatibility mode:\n')
-  console.log(
-    [
-      // Not necessary, but a quick 'hash', basically the current date/time
-      `git checkout -b compat-${new Date()
-        .toJSON()
-        .replace(/[-:.TZ]/g, '') // Remove weird characters
-        .slice(0, -3)}`, // Remove milliseconds precision
-      'git add .',
-      'git commit -m "compat"',
-      'npm version',
-      'npm publish --tag compat',
-      'npm run compat:restore',
-    ]
-      .map((v) => `  ${v}`)
-      .join('\n')
-  )
   console.log()
 } else if (process.argv.includes('--restore')) {
   if (
diff --git a/src/jit/lib/generateRules.js b/src/jit/lib/generateRules.js
index 7670d0647..c510942b1 100644
--- a/src/jit/lib/generateRules.js
+++ b/src/jit/lib/generateRules.js
@@ -54,7 +54,7 @@ function applyPrefix(matches, context) {
   for (let match of matches) {
     let [meta] = match
     if (meta.options.respectPrefix) {
-      let container = postcss.root({ nodes: [match[1]] })
+      let container = postcss.root({ nodes: [match[1].clone()] })
       container.walkRules((r) => {
         r.selector = prefixSelector(context.tailwindConfig.prefix, r.selector)
       })
@@ -72,7 +72,7 @@ function applyImportant(matches) {
   let result = []
 
   for (let [meta, rule] of matches) {
-    let container = postcss.root({ nodes: [rule] })
+    let container = postcss.root({ nodes: [rule.clone()] })
     container.walkRules((r) => {
       r.selector = updateAllClasses(r.selector, (className) => {
         return `!${className}`
@@ -109,8 +109,7 @@ function applyVariant(variant, matches, context) {
         continue
       }
 
-      let container = postcss.root()
-      container.append(rule.clone())
+      let container = postcss.root({ nodes: [rule.clone()] })
 
       for (let [variantSort, variantFunction] of variantFunctionTuples) {
         let clone = container.clone()
@@ -297,7 +296,7 @@ function generateRules(candidates, context) {
           }
         })
       } else if (typeof context.tailwindConfig.important === 'string') {
-        let container = postcss.root({ nodes: [rule] })
+        let container = postcss.root({ nodes: [rule.clone()] })
         container.walkRules((r) => {
           if (inKeyframes(r)) {
             return