Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump and pin prettier #16382

Merged
merged 4 commits into from
Feb 10, 2025
+41 −46
Merged

Bump and pin prettier #16382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
027f6ec
pin prettier
RobinMalfait Feb 9, 2025
78f1955
bump prettier to 3.5.0
RobinMalfait Feb 9, 2025
b260298
update tests to reflect prettier bump
RobinMalfait Feb 9, 2025
1ea1c29
update integration tests
RobinMalfait Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions integrations/upgrade/js-config.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,9 @@ test(
--width-225px: 225px;

--font-sans: Inter, system-ui, sans-serif;
--font-display: Cabinet Grotesk, ui-sans-serif, system-ui, sans-serif,
'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
--font-display:
Cabinet Grotesk, ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji',
'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';

--radius-4xl: 2rem;

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@types/node": "catalog:",
"postcss": "8.5.1",
"postcss-import": "^16.1.0",
"prettier": "^3.4.2",
"prettier": "catalog:",
"prettier-plugin-embed": "^0.4.15",
"prettier-plugin-organize-imports": "^4.0.0",
"tsup": "^8.3.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/@tailwindcss-upgrade/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"postcss": "^8.4.41",
"postcss-import": "^16.1.0",
"postcss-selector-parser": "^7.0.0",
"prettier": "^3.4.2",
"prettier": "catalog:",
"tree-sitter": "^0.22.4",
"tree-sitter-typescript": "^0.23.2",
"tailwindcss": "workspace:*"
Expand Down
5 changes: 3 additions & 2 deletions packages/tailwindcss/src/css-functions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,9 @@ describe('theme(…)', () => {
expect(
await compileCss(css`
@theme default reference {
--font-family-sans: ui-sans-serif, system-ui, sans-serif, Apple Color Emoji,
Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
--font-family-sans:
ui-sans-serif, system-ui, sans-serif, Apple Color Emoji, Segoe UI Emoji,
Segoe UI Symbol, Noto Color Emoji;
}
.fam {
font-family: theme(fontFamily.sans);
Expand Down
11 changes: 7 additions & 4 deletions packages/tailwindcss/src/utilities.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12545,7 +12545,8 @@ test('font', async () => {
await compileCss(
css`
@theme {
--font-sans: ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
--font-sans:
ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
'Segoe UI Symbol', 'Noto Color Emoji';
--font-weight-bold: 650;
}
Expand Down Expand Up @@ -12617,7 +12618,8 @@ test('font', async () => {
await compileCss(
css`
@theme reference {
--font-sans: ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
--font-sans:
ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
'Segoe UI Symbol', 'Noto Color Emoji';
--font-weight-bold: 650;
}
Expand Down Expand Up @@ -13820,8 +13822,9 @@ test('transition', async () => {
@theme {
--default-transition-timing-function: ease;
--default-transition-duration: 100ms;
--transition-property: color, background-color, border-color, text-decoration-color, fill,
stroke, opacity, box-shadow, transform, filter, backdrop-filter;
--transition-property:
color, background-color, border-color, text-decoration-color, fill, stroke, opacity,
box-shadow, transform, filter, backdrop-filter;
--transition-property-opacity: opacity;
}
@tailwind utilities;
Expand Down
10 changes: 6 additions & 4 deletions packages/tailwindcss/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
@theme default {
--font-sans: ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
'Segoe UI Symbol', 'Noto Color Emoji';
--font-sans:
ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
'Noto Color Emoji';
--font-serif: ui-serif, Georgia, Cambria, 'Times New Roman', Times, serif;
--font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono',
'Courier New', monospace;
--font-mono:
ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New',
monospace;

--color-red-50: oklch(0.971 0.013 17.38);
--color-red-100: oklch(0.936 0.032 17.717);
Expand Down
51 changes: 19 additions & 32 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pnpm-workspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ packages:
catalog:
'@types/node': ^20.14.8
lightningcss: ^1.29.1
prettier: 3.5.0
vite: ^6.0.0