From 32aba37a235653614cab0b71456e39e2437af79d Mon Sep 17 00:00:00 2001 From: samcx Date: Fri, 3 Jan 2025 13:31:36 -0800 Subject: [PATCH 1/5] chore(examples): switch to next.config.ts --- examples/reproduction-template-pages/next.config.js | 6 ------ examples/reproduction-template-pages/next.config.ts | 8 ++++++++ examples/reproduction-template/next.config.mjs | 8 -------- examples/reproduction-template/next.config.ts | 8 ++++++++ 4 files changed, 16 insertions(+), 14 deletions(-) delete mode 100644 examples/reproduction-template-pages/next.config.js create mode 100644 examples/reproduction-template-pages/next.config.ts delete mode 100644 examples/reproduction-template/next.config.mjs create mode 100644 examples/reproduction-template/next.config.ts diff --git a/examples/reproduction-template-pages/next.config.js b/examples/reproduction-template-pages/next.config.js deleted file mode 100644 index 37ddbdb8fad73..0000000000000 --- a/examples/reproduction-template-pages/next.config.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @type {import("next").NextConfig} */ -const nextConfig = { - reactStrictMode: true, -}; - -module.exports = nextConfig; diff --git a/examples/reproduction-template-pages/next.config.ts b/examples/reproduction-template-pages/next.config.ts new file mode 100644 index 0000000000000..3915163597162 --- /dev/null +++ b/examples/reproduction-template-pages/next.config.ts @@ -0,0 +1,8 @@ +import type { NextConfig } from "next"; + +const nextConfig: NextConfig = { + /* config options here */ + reactStrictMode: true, +}; + +export default nextConfig; diff --git a/examples/reproduction-template/next.config.mjs b/examples/reproduction-template/next.config.mjs deleted file mode 100644 index 11d69c34ddd0e..0000000000000 --- a/examples/reproduction-template/next.config.mjs +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @type {import('next').NextConfig} - */ -const nextConfig = { - reactStrictMode: true, -}; - -export default nextConfig; diff --git a/examples/reproduction-template/next.config.ts b/examples/reproduction-template/next.config.ts new file mode 100644 index 0000000000000..3915163597162 --- /dev/null +++ b/examples/reproduction-template/next.config.ts @@ -0,0 +1,8 @@ +import type { NextConfig } from "next"; + +const nextConfig: NextConfig = { + /* config options here */ + reactStrictMode: true, +}; + +export default nextConfig; From 4e873d284f8ae345db0c5a9c60c73b675f75fbde Mon Sep 17 00:00:00 2001 From: samcx Date: Fri, 3 Jan 2025 13:32:41 -0800 Subject: [PATCH 2/5] chore(examples): update .gitignore --- examples/reproduction-template-pages/.gitignore | 5 +++-- examples/reproduction-template/.gitignore | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/examples/reproduction-template-pages/.gitignore b/examples/reproduction-template-pages/.gitignore index 8777267507c0e..5ef6a52078020 100644 --- a/examples/reproduction-template-pages/.gitignore +++ b/examples/reproduction-template-pages/.gitignore @@ -28,9 +28,10 @@ npm-debug.log* yarn-debug.log* yarn-error.log* +.pnpm-debug.log* -# local env files -.env*.local +# env files (can opt-in for committing if needed) +.env* # vercel .vercel diff --git a/examples/reproduction-template/.gitignore b/examples/reproduction-template/.gitignore index e413cdb9e6f43..5ef6a52078020 100644 --- a/examples/reproduction-template/.gitignore +++ b/examples/reproduction-template/.gitignore @@ -2,7 +2,7 @@ # dependencies /node_modules -/.pnp0 +/.pnp .pnp.* .yarn/* !.yarn/patches @@ -28,9 +28,10 @@ npm-debug.log* yarn-debug.log* yarn-error.log* +.pnpm-debug.log* -# local env files -.env*.local +# env files (can opt-in for committing if needed) +.env* # vercel .vercel From 4451350f36bf5ee6f87a62742a9c5aafb30674da Mon Sep 17 00:00:00 2001 From: samcx Date: Fri, 3 Jan 2025 13:32:57 -0800 Subject: [PATCH 3/5] chore(examples): update tsconfig.json --- .../reproduction-template-pages/tsconfig.json | 21 ++++++++++++------- examples/reproduction-template/tsconfig.json | 14 +++++++------ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/examples/reproduction-template-pages/tsconfig.json b/examples/reproduction-template-pages/tsconfig.json index 1563f3e878573..d8b93235f205e 100644 --- a/examples/reproduction-template-pages/tsconfig.json +++ b/examples/reproduction-template-pages/tsconfig.json @@ -1,20 +1,27 @@ { "compilerOptions": { - "target": "es5", + "target": "ES2017", "lib": ["dom", "dom.iterable", "esnext"], "allowJs": true, "skipLibCheck": true, - "strict": false, - "forceConsistentCasingInFileNames": true, + "strict": true, "noEmit": true, - "incremental": true, "esModuleInterop": true, "module": "esnext", - "moduleResolution": "node", + "moduleResolution": "bundler", "resolveJsonModule": true, "isolatedModules": true, - "jsx": "preserve" + "jsx": "preserve", + "incremental": true, + "plugins": [ + { + "name": "next" + } + ], + "paths": { + "@/*": ["./*"] + } }, - "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"], + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], "exclude": ["node_modules"] } diff --git a/examples/reproduction-template/tsconfig.json b/examples/reproduction-template/tsconfig.json index af566b49c13e5..d8b93235f205e 100644 --- a/examples/reproduction-template/tsconfig.json +++ b/examples/reproduction-template/tsconfig.json @@ -1,24 +1,26 @@ { "compilerOptions": { - "target": "es5", + "target": "ES2017", "lib": ["dom", "dom.iterable", "esnext"], "allowJs": true, "skipLibCheck": true, - "strict": false, - "forceConsistentCasingInFileNames": true, + "strict": true, "noEmit": true, - "incremental": true, "esModuleInterop": true, "module": "esnext", - "moduleResolution": "node", + "moduleResolution": "bundler", "resolveJsonModule": true, "isolatedModules": true, "jsx": "preserve", + "incremental": true, "plugins": [ { "name": "next" } - ] + ], + "paths": { + "@/*": ["./*"] + } }, "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], "exclude": ["node_modules"] From 0e7a6096ee8aea14af8c743adc576ff1f9ed2c78 Mon Sep 17 00:00:00 2001 From: samcx Date: Fri, 3 Jan 2025 13:33:14 -0800 Subject: [PATCH 4/5] chore(examples): update App layout --- examples/reproduction-template/app/layout.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/examples/reproduction-template/app/layout.tsx b/examples/reproduction-template/app/layout.tsx index 78cbcf1c7e14c..c46cb020b58ef 100644 --- a/examples/reproduction-template/app/layout.tsx +++ b/examples/reproduction-template/app/layout.tsx @@ -1,7 +1,10 @@ -export default function RootLayout({ children }) { +export default function RootLayout({ + children, +}: Readonly<{ + children: React.ReactNode; +}>) { return ( - - + {children} ); From 0e77c7b70aeb154dd2a04596bb5d99d3a1ab3fcf Mon Sep 17 00:00:00 2001 From: samcx Date: Fri, 3 Jan 2025 13:35:06 -0800 Subject: [PATCH 5/5] chore(examples): update package.json --- examples/reproduction-template-pages/package.json | 10 +++++----- examples/reproduction-template/package.json | 7 +++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/examples/reproduction-template-pages/package.json b/examples/reproduction-template-pages/package.json index e4b0d84a6b749..d37e611be27ce 100644 --- a/examples/reproduction-template-pages/package.json +++ b/examples/reproduction-template-pages/package.json @@ -7,12 +7,12 @@ }, "dependencies": { "next": "canary", - "react": "19.0.0-beta-04b058868c-20240508", - "react-dom": "19.0.0-beta-04b058868c-20240508" + "react": "^19.0.0", + "react-dom": "^19.0.0" }, "devDependencies": { - "@types/node": "20.4.5", - "@types/react": "18.2.18", - "typescript": "5.1.3" + "@types/node": "^22", + "@types/react": "^19", + "typescript": "^5" } } diff --git a/examples/reproduction-template/package.json b/examples/reproduction-template/package.json index beb694aaccd5b..d37e611be27ce 100644 --- a/examples/reproduction-template/package.json +++ b/examples/reproduction-template/package.json @@ -11,9 +11,8 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@types/node": "20.12.12", - "@types/react": "18.3.3", - "@types/react-dom": "18.3.0", - "typescript": "5.3.3" + "@types/node": "^22", + "@types/react": "^19", + "typescript": "^5" } }