From ec1d7d4b85b212dcaed034fc9dbd0a3c17edfe71 Mon Sep 17 00:00:00 2001 From: Philipp Spiess Date: Tue, 18 Feb 2025 11:57:51 +0100 Subject: [PATCH] Upgrade: Use latest tag for packages (#16620) --- CHANGELOG.md | 1 + integrations/upgrade/index.test.ts | 18 +++++++++--------- packages/@tailwindcss-upgrade/src/index.ts | 2 +- .../src/migrate-postcss.ts | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ad10731b..2bab5f8c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Pin exact versions of `tailwindcss` and `@tailwindcss/*` ([#16623](https://github.com/tailwindlabs/tailwindcss/pull/16623)) - Upgrade: Report errors when updating dependencies ([#16504](https://github.com/tailwindlabs/tailwindcss/pull/16504)) - Upgrade: Ensure a `darkMode` JS config setting with block syntax converts to use `@slot` ([#16507](https://github.com/tailwindlabs/tailwindcss/pull/16507)) +- Upgrade: Ensure to upgrade to the latest version of `tailwindcss` and `@tailwindcss/postcss` ([#16620](https://github.com/tailwindlabs/tailwindcss/pull/16620)) ## [4.0.6] - 2025-02-10 diff --git a/integrations/upgrade/index.test.ts b/integrations/upgrade/index.test.ts index 7fb857b31..1ba696cb3 100644 --- a/integrations/upgrade/index.test.ts +++ b/integrations/upgrade/index.test.ts @@ -146,7 +146,7 @@ test( let packageJsonContent = await fs.read('package.json') let packageJson = JSON.parse(packageJsonContent) expect(packageJson.dependencies).toMatchObject({ - tailwindcss: expect.stringContaining('4.0.0'), + tailwindcss: expect.stringMatching(/^\^4/), }) // Ensure the v4 project compiles correctly @@ -657,12 +657,12 @@ test( let packageJsonContent = await fs.read('package.json') let packageJson = JSON.parse(packageJsonContent) expect(packageJson.dependencies).toMatchObject({ - tailwindcss: expect.stringContaining('4.0.0'), + tailwindcss: expect.stringMatching(/^\^4/), }) expect(packageJson.dependencies).not.toHaveProperty('autoprefixer') expect(packageJson.dependencies).not.toHaveProperty('postcss-import') expect(packageJson.dependencies).toMatchObject({ - '@tailwindcss/postcss': expect.stringContaining('4.0.0'), + '@tailwindcss/postcss': expect.stringMatching(/^\^4/), }) }, ) @@ -709,7 +709,7 @@ test( let packageJsonContent = await fs.read('package.json') let packageJson = JSON.parse(packageJsonContent) expect(packageJson.dependencies).toMatchObject({ - '@tailwindcss/postcss': expect.stringContaining('4.0.0'), + '@tailwindcss/postcss': expect.stringMatching(/^\^4/), }) }, ) @@ -756,7 +756,7 @@ test( let packageJsonContent = await fs.read('package.json') let packageJson = JSON.parse(packageJsonContent) expect(packageJson.devDependencies).toMatchObject({ - '@tailwindcss/postcss': expect.stringContaining('4.0.0'), + '@tailwindcss/postcss': expect.stringMatching(/^\^4/), }) }, ) @@ -824,12 +824,12 @@ test( `) expect(packageJson.dependencies).toMatchObject({ - tailwindcss: expect.stringContaining('4.0.0'), + tailwindcss: expect.stringMatching(/^\^4/), }) expect(packageJson.dependencies).not.toHaveProperty('autoprefixer') expect(packageJson.dependencies).not.toHaveProperty('postcss-import') expect(packageJson.dependencies).toMatchObject({ - '@tailwindcss/postcss': expect.stringContaining('4.0.0'), + '@tailwindcss/postcss': expect.stringMatching(/^\^4/), }) }, ) @@ -901,12 +901,12 @@ test( let packageJsonContent = await fs.read('package.json') let packageJson = JSON.parse(packageJsonContent) expect(packageJson.dependencies).toMatchObject({ - tailwindcss: expect.stringContaining('4.0.0'), + tailwindcss: expect.stringMatching(/^\^4/), }) expect(packageJson.dependencies).not.toHaveProperty('autoprefixer') expect(packageJson.dependencies).not.toHaveProperty('postcss-import') expect(packageJson.dependencies).toMatchObject({ - '@tailwindcss/postcss': expect.stringContaining('4.0.0'), + '@tailwindcss/postcss': expect.stringMatching(/^\^4/), }) }, ) diff --git a/packages/@tailwindcss-upgrade/src/index.ts b/packages/@tailwindcss-upgrade/src/index.ts index 945b48ab4..9069b4ea8 100644 --- a/packages/@tailwindcss-upgrade/src/index.ts +++ b/packages/@tailwindcss-upgrade/src/index.ts @@ -276,7 +276,7 @@ async function run() { try { // Upgrade Tailwind CSS - await pkg(base).add(['tailwindcss@next']) + await pkg(base).add(['tailwindcss@latest']) success(`Updated package: ${highlight('tailwindcss')}`, { prefix: '↳ ' }) } catch {} diff --git a/packages/@tailwindcss-upgrade/src/migrate-postcss.ts b/packages/@tailwindcss-upgrade/src/migrate-postcss.ts index 2804bae10..0d49c2ad2 100644 --- a/packages/@tailwindcss-upgrade/src/migrate-postcss.ts +++ b/packages/@tailwindcss-upgrade/src/migrate-postcss.ts @@ -102,7 +102,7 @@ export async function migratePostCSSConfig(base: string) { if (location !== null) { try { - await pkg(base).add(['@tailwindcss/postcss@next'], location) + await pkg(base).add(['@tailwindcss/postcss@latest'], location) success(`Installed package: ${highlight('@tailwindcss/postcss')}`, { prefix: '↳ ' }) } catch {} }