-
Notifications
You must be signed in to change notification settings - Fork 27.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[cna] upgrade templates tailwind to v4 (#75407)
Since Tailwind v4 was released, update the create-next-app templates. This PR made change of following process: 1. Remove tailwind config. 2. Update the `globals.css` file. 3. Add `--geist-` font CSS variable to the `globals.css` file. 4. Change `postcss` dependency to `@tailwindcss/postcss`. 5. Update postcss config. 6. Update tests. **Note:** Removed the types for postcss added at #63380 since it requires additional [postcss-load-config](https://www.npmjs.com/package/postcss-load-config) dependency.
- Loading branch information
1 parent
060d9e8
commit 46d0af3
Showing
27 changed files
with
49 additions
and
191 deletions.
There are no files selected for viewing
4 changes: 1 addition & 3 deletions
4
packages/create-next-app/templates/app-tw-empty/js/app/globals.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1 @@ | ||
@tailwind base; | ||
@tailwind components; | ||
@tailwind utilities; | ||
@import "tailwindcss"; |
5 changes: 1 addition & 4 deletions
5
packages/create-next-app/templates/app-tw-empty/js/postcss.config.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,5 @@ | ||
/** @type {import('postcss-load-config').Config} */ | ||
const config = { | ||
plugins: { | ||
tailwindcss: {}, | ||
}, | ||
plugins: ["@tailwindcss/postcss"], | ||
}; | ||
|
||
export default config; |
6 changes: 0 additions & 6 deletions
6
packages/create-next-app/templates/app-tw-empty/js/tailwind.config.mjs
This file was deleted.
Oops, something went wrong.
4 changes: 1 addition & 3 deletions
4
packages/create-next-app/templates/app-tw-empty/ts/app/globals.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1 @@ | ||
@tailwind base; | ||
@tailwind components; | ||
@tailwind utilities; | ||
@import "tailwindcss"; |
5 changes: 1 addition & 4 deletions
5
packages/create-next-app/templates/app-tw-empty/ts/postcss.config.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,5 @@ | ||
/** @type {import('postcss-load-config').Config} */ | ||
const config = { | ||
plugins: { | ||
tailwindcss: {}, | ||
}, | ||
plugins: ["@tailwindcss/postcss"], | ||
}; | ||
|
||
export default config; |
7 changes: 0 additions & 7 deletions
7
packages/create-next-app/templates/app-tw-empty/ts/tailwind.config.ts
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 1 addition & 4 deletions
5
packages/create-next-app/templates/app-tw/js/postcss.config.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,5 @@ | ||
/** @type {import('postcss-load-config').Config} */ | ||
const config = { | ||
plugins: { | ||
tailwindcss: {}, | ||
}, | ||
plugins: ["@tailwindcss/postcss"], | ||
}; | ||
|
||
export default config; |
17 changes: 0 additions & 17 deletions
17
packages/create-next-app/templates/app-tw/js/tailwind.config.mjs
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 1 addition & 4 deletions
5
packages/create-next-app/templates/app-tw/ts/postcss.config.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,5 @@ | ||
/** @type {import('postcss-load-config').Config} */ | ||
const config = { | ||
plugins: { | ||
tailwindcss: {}, | ||
}, | ||
plugins: ["@tailwindcss/postcss"], | ||
}; | ||
|
||
export default config; |
18 changes: 0 additions & 18 deletions
18
packages/create-next-app/templates/app-tw/ts/tailwind.config.ts
This file was deleted.
Oops, something went wrong.
5 changes: 1 addition & 4 deletions
5
packages/create-next-app/templates/default-tw-empty/js/postcss.config.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,5 @@ | ||
/** @type {import('postcss-load-config').Config} */ | ||
const config = { | ||
plugins: { | ||
tailwindcss: {}, | ||
}, | ||
plugins: ["@tailwindcss/postcss"], | ||
}; | ||
|
||
export default config; |
4 changes: 1 addition & 3 deletions
4
packages/create-next-app/templates/default-tw-empty/js/styles/globals.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1 @@ | ||
@tailwind base; | ||
@tailwind components; | ||
@tailwind utilities; | ||
@import "tailwindcss"; |
6 changes: 0 additions & 6 deletions
6
packages/create-next-app/templates/default-tw-empty/js/tailwind.config.mjs
This file was deleted.
Oops, something went wrong.
5 changes: 1 addition & 4 deletions
5
packages/create-next-app/templates/default-tw-empty/ts/postcss.config.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,5 @@ | ||
/** @type {import('postcss-load-config').Config} */ | ||
const config = { | ||
plugins: { | ||
tailwindcss: {}, | ||
}, | ||
plugins: ["@tailwindcss/postcss"], | ||
}; | ||
|
||
export default config; |
4 changes: 1 addition & 3 deletions
4
packages/create-next-app/templates/default-tw-empty/ts/styles/globals.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1 @@ | ||
@tailwind base; | ||
@tailwind components; | ||
@tailwind utilities; | ||
@import "tailwindcss"; |
7 changes: 0 additions & 7 deletions
7
packages/create-next-app/templates/default-tw-empty/ts/tailwind.config.ts
This file was deleted.
Oops, something went wrong.
5 changes: 1 addition & 4 deletions
5
packages/create-next-app/templates/default-tw/js/postcss.config.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,5 @@ | ||
/** @type {import('postcss-load-config').Config} */ | ||
const config = { | ||
plugins: { | ||
tailwindcss: {}, | ||
}, | ||
plugins: ["@tailwindcss/postcss"], | ||
}; | ||
|
||
export default config; |
9 changes: 6 additions & 3 deletions
9
packages/create-next-app/templates/default-tw/js/styles/globals.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 0 additions & 17 deletions
17
packages/create-next-app/templates/default-tw/js/tailwind.config.mjs
This file was deleted.
Oops, something went wrong.
5 changes: 1 addition & 4 deletions
5
packages/create-next-app/templates/default-tw/ts/postcss.config.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,5 @@ | ||
/** @type {import('postcss-load-config').Config} */ | ||
const config = { | ||
plugins: { | ||
tailwindcss: {}, | ||
}, | ||
plugins: ["@tailwindcss/postcss"], | ||
}; | ||
|
||
export default config; |
9 changes: 6 additions & 3 deletions
9
packages/create-next-app/templates/default-tw/ts/styles/globals.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 0 additions & 18 deletions
18
packages/create-next-app/templates/default-tw/ts/tailwind.config.ts
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.