Fix test

tailwindlabs · Oct 10, 2024 · ffd7417 · ffd7417
1 parent bbb0a8e
commit ffd7417
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/integrations/upgrade/index.test.ts b/integrations/upgrade/index.test.ts
@@ -390,7 +390,7 @@ test(
     },
   },
   async ({ fs, exec }) => {
-    console.log(await exec('npx @tailwindcss/upgrade'))
+    await exec('npx @tailwindcss/upgrade')
 
     await fs.expectFileToContain('src/index.css', css`@import 'tailwindcss';`)
     await fs.expectFileToContain(
@@ -465,7 +465,7 @@ test(
     },
   },
   async ({ fs, exec }) => {
-    console.log(await exec('npx @tailwindcss/upgrade'))
+    await exec('npx @tailwindcss/upgrade')
 
     await fs.expectFileToContain('src/index.css', css`@import 'tailwindcss';`)
     await fs.expectFileToContain(
@@ -476,16 +476,18 @@ test(
       `,
     )
 
-    let packageJsonContent = await fs.read('.postcssrc.json')
-    let packageJson = JSON.parse(packageJsonContent)
-    expect(packageJson).toMatchInlineSnapshot(`
+    let jsonConfigContent = await fs.read('.postcssrc.json')
+    let jsonConfig = JSON.parse(jsonConfigContent)
+    expect(jsonConfig).toMatchInlineSnapshot(`
       {
         "plugins": {
           "@tailwindcss/postcss": {},
         },
       }
     `)
 
+    let packageJsonContent = await fs.read('package.json')
+    let packageJson = JSON.parse(packageJsonContent)
     expect(packageJson.dependencies).toMatchObject({
       tailwindcss: expect.stringContaining('4.0.0'),
     })

diff --git a/packages/@tailwindcss-upgrade/src/migrate-postcss.ts b/packages/@tailwindcss-upgrade/src/migrate-postcss.ts
@@ -59,7 +59,7 @@ export async function migratePostCSSConfig(base: string) {
   // Priority 3: JSON based postcss config files
   let jsonConfigPath = await detectJSONConfigPath(base)
   let jsonConfig: null | any = null
-  if (jsonConfigPath) {
+  if (!didMigrate && jsonConfigPath) {
     try {
       jsonConfig = JSON.parse(await fs.readFile(jsonConfigPath, 'utf-8'))
     } catch {}