Skip to content

Commit 7560010

Browse files
Merge branch 'tailwindlabs:main' into add-cursor-visual-examples
2 parents fc91c62 + e98b5bc commit 7560010

40 files changed

+4030
-624
lines changed

.github/FUNDING.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
custom: ['https://tailwindcss.com/sponsor']
1+
custom: ["https://tailwindcss.com/sponsor"]

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pnpm-lock.yaml

analyze/nodejs.html

Lines changed: 0 additions & 39 deletions
This file was deleted.

eslint.config.mjs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import nextCoreWebVitals from "eslint-config-next/core-web-vitals";
2+
import nextTypescript from "eslint-config-next/typescript";
3+
4+
const eslintConfig = [
5+
...nextCoreWebVitals,
6+
...nextTypescript,
7+
{
8+
ignores: ["node_modules/**", ".next/**", "out/**", "build/**", "next-env.d.ts"],
9+
},
10+
];
11+
12+
export default eslintConfig;

next.config.ts

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,21 @@
11
import type { NextConfig } from "next";
2+
import createMdx from "@next/mdx";
23

34
const nextConfig = {
45
serverExternalPackages: ["@tailwindcss/node"],
56
pageExtensions: ["js", "jsx", "ts", "tsx", "mdx"],
67
outputFileTracingIncludes: {
78
"/**/*": ["./src/docs/*.mdx"],
89
},
9-
experimental: {
10-
mdxRs: true,
11-
turbo: {
12-
rules: {
13-
// Support import .svg as react components in dev builds
14-
"*.react.svg": {
15-
loaders: ["@svgr/webpack"],
16-
as: "*.js",
17-
},
10+
turbopack: {
11+
rules: {
12+
// Support import .svg as react components in dev builds
13+
"*.react.svg": {
14+
loaders: ["@svgr/webpack"],
15+
as: "*.js",
1816
},
1917
},
2018
},
21-
22-
webpack(config) {
23-
// Find the existing .svg rule used by Next.js and exclude .react.svg files
24-
const existingSvgRule = config.module.rules.find((rule: any) => rule.test?.test?.(".svg"));
25-
existingSvgRule.exclude = /\.react\.svg$/i;
26-
27-
// Support import .svg as react components in production builds
28-
config.module.rules.push({
29-
test: /\.react\.svg$/,
30-
use: ["@svgr/webpack"],
31-
});
32-
33-
// Disable CSS minification
34-
config.optimization.minimizer = config.optimization.minimizer.filter((fn: any) => {
35-
return !fn.toString().includes("CssMinimizerPlugin");
36-
});
37-
38-
return config;
39-
},
40-
4119
async redirects() {
4220
return [
4321
// Docs
@@ -498,5 +476,5 @@ const nextConfig = {
498476
},
499477
} satisfies NextConfig;
500478

501-
const withMDX = require("@next/mdx")();
479+
const withMDX = createMdx();
502480
module.exports = withMDX(nextConfig);

package.json

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
"dev": "next dev --turbopack",
77
"build": "next build",
88
"start": "next start",
9-
"lint": "next lint",
9+
"lint": "eslint .",
1010
"format": "prettier --write \"**/*.{js,jsx,ts,tsx,mdx}\""
1111
},
1212
"dependencies": {
1313
"@docsearch/react": "^3.9.0",
1414
"@headlessui/react": "0.0.0-insiders.b6f355d1",
1515
"@heroicons/react": "^2.2.0",
16-
"@next/mdx": "15.3.0-canary.23",
16+
"@mdx-js/loader": "^3.1.1",
17+
"@next/mdx": "16.1.1",
1718
"@shikijs/transformers": "^1.29.2",
1819
"@tailwindcss/postcss": "^4.1.11",
1920
"clsx": "^2.1.1",
@@ -22,10 +23,10 @@
2223
"feed": "^5.1.0",
2324
"framer-motion": "^12.20.0",
2425
"motion": "^12.20.0",
25-
"next": "15.3.8",
26+
"next": "16.1.1",
2627
"open-graph-scraper-lite": "^2.1.0",
27-
"react": "^19.2.3",
28-
"react-dom": "^19.2.3",
28+
"react": "19.2.3",
29+
"react-dom": "19.2.3",
2930
"shiki": "^1.29.2",
3031
"tailwindcss": "^4.1.18"
3132
},
@@ -35,8 +36,10 @@
3536
"@types/hast": "^3.0.4",
3637
"@types/mdx": "^2.0.13",
3738
"@types/node": "^22.15.33",
38-
"@types/react": "^19.2.7",
39-
"@types/react-dom": "^19.2.3",
39+
"@types/react": "19.2.8",
40+
"@types/react-dom": "19.2.3",
41+
"eslint": "^9.39.2",
42+
"eslint-config-next": "16.1.1",
4043
"hast-util-to-jsx-runtime": "^2.3.6",
4144
"prettier-plugin-svelte": "^3.4.0",
4245
"prettier-plugin-tailwindcss": "0.6.13",
@@ -55,5 +58,11 @@
5558
"@tailwindcss/postcss": {}
5659
}
5760
},
58-
"packageManager": "pnpm@9.14.0"
61+
"packageManager": "pnpm@9.14.0",
62+
"pnpm": {
63+
"overrides": {
64+
"@types/react": "19.2.8",
65+
"@types/react-dom": "19.2.3"
66+
}
67+
}
5968
}

0 commit comments

Comments
 (0)