Skip to content

Commit 5d450d9

Browse files
authored
Merge branch 'tailwindlabs:main' into dotnet
2 parents aa7775f + f87f6c5 commit 5d450d9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1572
-366
lines changed

next.config.ts

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,19 +463,31 @@ const nextConfig = {
463463
// Tailwind UI
464464
{
465465
source: "/components",
466-
destination: "https://tailwindui.com/components",
466+
destination: "https://tailwindcss.com/plus/ui-blocks",
467467
permanent: false,
468468
},
469469
{
470470
source: "/components/:slug",
471-
destination: "https://tailwindui.com/components",
471+
destination: "https://tailwindcss.com/plus/ui-blocks",
472472
permanent: false,
473473
},
474474

475475
// External Links
476476
{ source: "/discord", destination: "https://discord.gg/7NF8GNe", permanent: false },
477477
];
478478
},
479+
async rewrites() {
480+
return ["plus", "plus-assets", "vendor", "nova-api"].flatMap((path) => [
481+
{
482+
source: `/${path}`,
483+
destination: `https://tailwindui.com/${path}`,
484+
},
485+
{
486+
source: `/${path}/:path*`,
487+
destination: `https://tailwindui.com/${path}/:path*`,
488+
},
489+
]);
490+
},
479491
} satisfies NextConfig;
480492

481493
const withMDX = require("@next/mdx")();

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,24 @@
1515
"@heroicons/react": "^2.2.0",
1616
"@next/mdx": "^15.1.6",
1717
"@shikijs/transformers": "^1.26.1",
18-
"@tailwindcss/postcss": "4.0.0",
18+
"@tailwindcss/postcss": "^4.0.9",
1919
"@types/mdx": "^2.0.13",
2020
"clsx": "^2.1.1",
2121
"dedent": "^1.5.3",
2222
"fathom-client": "^3.7.2",
2323
"feed": "^4.2.2",
2424
"framer-motion": "^11.16.0",
25+
"motion": "^12.4.7",
2526
"next": "15.1.6",
2627
"open-graph-scraper-lite": "^2.1.0",
2728
"react": "^19.0.0",
2829
"react-dom": "^19.0.0",
2930
"shiki": "^1.26.1",
30-
"tailwindcss": "4.0.7"
31+
"tailwindcss": "^4.0.12"
3132
},
3233
"devDependencies": {
3334
"@svgr/webpack": "^8.1.0",
34-
"@tailwindcss/node": "4.0.0-beta.9",
35+
"@tailwindcss/node": "^4.0.9",
3536
"@types/hast": "^3.0.4",
3637
"@types/node": "^22.10.5",
3738
"@types/react": "^19.0.3",

0 commit comments

Comments
 (0)