Merge branch 'tailwindlabs:main' into fix-list-style-type-playground-mismatch

Author: Ahmed-aleryani

.github/FUNDING.yml

@@ -1 +1 @@
-custom: ['https://tailwindcss.com/sponsor']
+custom: ["https://tailwindcss.com/sponsor"]

.prettierignore

@@ -0,0 +1 @@
+pnpm-lock.yaml

analyze/nodejs.html

@@ -0,0 +1,12 @@
+import nextCoreWebVitals from "eslint-config-next/core-web-vitals";
+import nextTypescript from "eslint-config-next/typescript";
+
+const eslintConfig = [
+  ...nextCoreWebVitals,
+  ...nextTypescript,
+  {
+    ignores: ["node_modules/**", ".next/**", "out/**", "build/**", "next-env.d.ts"],
+  },
+];
+
+export default eslintConfig;

eslint.config.mjs

@@ -1,43 +1,21 @@
 import type { NextConfig } from "next";
+import createMdx from "@next/mdx";
 
 const nextConfig = {
   serverExternalPackages: ["@tailwindcss/node"],
   pageExtensions: ["js", "jsx", "ts", "tsx", "mdx"],
   outputFileTracingIncludes: {
     "/**/*": ["./src/docs/*.mdx"],
   },
-  experimental: {
-    mdxRs: true,
-    turbo: {
-      rules: {
-        // Support import .svg as react components in dev builds
-        "*.react.svg": {
-          loaders: ["@svgr/webpack"],
-          as: "*.js",
-        },
+  turbopack: {
+    rules: {
+      // Support import .svg as react components in dev builds
+      "*.react.svg": {
+        loaders: ["@svgr/webpack"],
+        as: "*.js",
       },
     },
   },
-
-  webpack(config) {
-    // Find the existing .svg rule used by Next.js and exclude .react.svg files
-    const existingSvgRule = config.module.rules.find((rule: any) => rule.test?.test?.(".svg"));
-    existingSvgRule.exclude = /\.react\.svg$/i;
-
-    // Support import .svg as react components in production builds
-    config.module.rules.push({
-      test: /\.react\.svg$/,
-      use: ["@svgr/webpack"],
-    });
-
-    // Disable CSS minification
-    config.optimization.minimizer = config.optimization.minimizer.filter((fn: any) => {
-      return !fn.toString().includes("CssMinimizerPlugin");
-    });
-
-    return config;
-  },
-
   async redirects() {
     return [
       // Docs
@@ -498,5 +476,5 @@ const nextConfig = {
   },
 } satisfies NextConfig;
 
-const withMDX = require("@next/mdx")();
+const withMDX = createMdx();
 module.exports = withMDX(nextConfig);

next.config.ts

@@ -6,14 +6,15 @@
     "dev": "next dev --turbopack",
     "build": "next build",
     "start": "next start",
-    "lint": "next lint",
+    "lint": "eslint .",
     "format": "prettier --write \"**/*.{js,jsx,ts,tsx,mdx}\""
   },
   "dependencies": {
     "@docsearch/react": "^3.9.0",
     "@headlessui/react": "0.0.0-insiders.b6f355d1",
     "@heroicons/react": "^2.2.0",
-    "@next/mdx": "15.3.0-canary.23",
+    "@mdx-js/loader": "^3.1.1",
+    "@next/mdx": "16.1.1",
     "@shikijs/transformers": "^1.29.2",
     "@tailwindcss/postcss": "^4.1.11",
     "clsx": "^2.1.1",
@@ -22,10 +23,10 @@
     "feed": "^5.1.0",
     "framer-motion": "^12.20.0",
     "motion": "^12.20.0",
-    "next": "15.3.8",
+    "next": "16.1.1",
     "open-graph-scraper-lite": "^2.1.0",
-    "react": "^19.2.3",
-    "react-dom": "^19.2.3",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
     "shiki": "^1.29.2",
     "tailwindcss": "^4.1.18"
   },
@@ -35,8 +36,10 @@
     "@types/hast": "^3.0.4",
     "@types/mdx": "^2.0.13",
     "@types/node": "^22.15.33",
-    "@types/react": "^19.2.7",
-    "@types/react-dom": "^19.2.3",
+    "@types/react": "19.2.8",
+    "@types/react-dom": "19.2.3",
+    "eslint": "^9.39.2",
+    "eslint-config-next": "16.1.1",
     "hast-util-to-jsx-runtime": "^2.3.6",
     "prettier-plugin-svelte": "^3.4.0",
     "prettier-plugin-tailwindcss": "0.6.13",
@@ -55,5 +58,11 @@
       "@tailwindcss/postcss": {}
     }
   },
-  "packageManager": "pnpm@9.14.0"
+  "packageManager": "pnpm@9.14.0",
+  "pnpm": {
+    "overrides": {
+      "@types/react": "19.2.8",
+      "@types/react-dom": "19.2.3"
+    }
+  }
 }