Apply feedback

Author: philipp-spiess

integrations/upgrade/index.test.ts

@@ -1,4 +1,3 @@
-import { stripVTControlCharacters } from 'node:util'
 import { expect } from 'vitest'
 import { candidate, css, html, js, json, test, ts } from '../utils'
 
@@ -2266,10 +2265,6 @@ test(
       e.toString(),
     )
 
-    output = stripVTControlCharacters(output)
-      .replace(/tailwindcss v(.*)/g, 'tailwindcss') // Remove the version number from the error message
-      .replace(/\\/g, '/') // Make Windows paths look like Unix paths
-
     expect(output).toMatch(
       /Tailwind CSS v.* found. The migration tool can only be run on v3 projects./,
     )

packages/@tailwindcss-upgrade/src/index.ts

@@ -62,7 +62,7 @@ async function run() {
 
     // Require an installed `tailwindcss` version < 4
     let tailwindVersion = await getPackageVersion('tailwindcss', base)
-    if (tailwindVersion && Number(tailwindVersion.split('.')[0]) > 3) {
+    if (tailwindVersion && Number(tailwindVersion.split('.')[0]) !== 3) {
       error(
         `Tailwind CSS v${tailwindVersion} found. The migration tool can only be run on v3 projects.`,
       )

packages/@tailwindcss-upgrade/src/utils/package-version.ts

@@ -1,15 +1,13 @@
 import fs from 'node:fs/promises'
-import { resolve } from 'node:path'
 
 /**
  * Resolves the version string of an npm dependency installed in the based
  * directory.
  */
 export async function getPackageVersion(pkg: string, base: string): Promise<string | null> {
   try {
-    console.log('getPackageVersion', pkg, base)
-    const packageJson = resolve(base, 'node_modules', pkg, 'package.json')
-    const { version } = JSON.parse(await fs.readFile(packageJson, 'utf8'))
+    let packageJson = require.resolve(`${pkg}/package.json`, { paths: [base] })
+    let { version } = JSON.parse(await fs.readFile(packageJson, 'utf8'))
     return version
   } catch {
     return null