Merge branch 'canary' into update-with-styled-components-example

vercel · Oct 4, 2024 · 4b87c8c · 4b87c8c
2 parents 566c392 + 8894bed
commit 4b87c8c
Show file tree

Hide file tree

Showing 20 changed files with 85 additions and 36 deletions.
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "15.0.0-canary.177"
+  "version": "15.0.0-canary.178"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "15.0.0-canary.177",
+  "version": "15.0.0-canary.178",
   "keywords": [
     "react",
     "next",

diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "15.0.0-canary.177",
+  "version": "15.0.0-canary.178",
   "description": "ESLint configuration used by Next.js.",
   "main": "index.js",
   "license": "MIT",
@@ -10,7 +10,7 @@
   },
   "homepage": "https://nextjs.org/docs/app/building-your-application/configuring/eslint#eslint-config",
   "dependencies": {
-    "@next/eslint-plugin-next": "15.0.0-canary.177",
+    "@next/eslint-plugin-next": "15.0.0-canary.178",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/eslint-plugin": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "15.0.0-canary.177",
+  "version": "15.0.0-canary.178",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "license": "MIT",

diff --git a/packages/font/package.json b/packages/font/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@next/font",
   "private": true,
-  "version": "15.0.0-canary.177",
+  "version": "15.0.0-canary.178",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "15.0.0-canary.177",
+  "version": "15.0.0-canary.178",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "15.0.0-canary.177",
+  "version": "15.0.0-canary.178",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/...od/transforms/__testfixtures__/next-async-request-api-dynamic-apis/async-api-23.input.tsx b/...od/transforms/__testfixtures__/next-async-request-api-dynamic-apis/async-api-23.input.tsx
@@ -0,0 +1,6 @@
+import { cookies } from 'next/headers'
+
+export type Cookie = ReturnType<typeof cookies>
+export function foo(c: ReturnType<typeof cookies>) {
+  return c
+}
diff --git a/...d/transforms/__testfixtures__/next-async-request-api-dynamic-apis/async-api-23.output.tsx b/...d/transforms/__testfixtures__/next-async-request-api-dynamic-apis/async-api-23.output.tsx
@@ -0,0 +1,7 @@
+import { cookies } from 'next/headers'
+
+export type Cookie = Awaited<ReturnType<typeof cookies>>
+export function foo(c: Awaited<ReturnType<typeof cookies>>) {
+  return c
+}
+
diff --git a/packages/next-codemod/transforms/lib/async-request-api/next-async-dynamic-api.ts b/packages/next-codemod/transforms/lib/async-request-api/next-async-dynamic-api.ts
@@ -205,6 +205,42 @@ export function transformDynamicAPI(
           }
         }
       })
+
+    // Handle type usage of async API, e.g. `type Cookie = ReturnType<typeof cookies>`
+    // convert it to `type Cookie = Awaited<ReturnType<typeof cookies>>`
+    root
+      .find(j.TSTypeReference, {
+        typeName: {
+          type: 'Identifier',
+          name: 'ReturnType',
+        },
+      })
+      .forEach((path) => {
+        const typeParam = path.node.typeParameters?.params[0]
+
+        // Check if the ReturnType is for 'cookies'
+        if (
+          typeParam &&
+          j.TSTypeQuery.check(typeParam) &&
+          j.Identifier.check(typeParam.exprName) &&
+          typeParam.exprName.name === asyncRequestApiName
+        ) {
+          // Replace ReturnType<typeof cookies> with Awaited<ReturnType<typeof cookies>>
+          const awaitedTypeReference = j.tsTypeReference(
+            j.identifier('Awaited'),
+            j.tsTypeParameterInstantiation([
+              j.tsTypeReference(
+                j.identifier('ReturnType'),
+                j.tsTypeParameterInstantiation([typeParam])
+              ),
+            ])
+          )
+
+          j(path).replaceWith(awaitedTypeReference)
+
+          modified = true
+        }
+      })
   }
 
   const isClientComponent = determineClientDirective(root, j)

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "15.0.0-canary.177",
+  "version": "15.0.0-canary.178",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "15.0.0-canary.177",
+  "version": "15.0.0-canary.178",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "15.0.0-canary.177",
+  "version": "15.0.0-canary.178",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "15.0.0-canary.177",
+  "version": "15.0.0-canary.178",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "15.0.0-canary.177",
+  "version": "15.0.0-canary.178",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "15.0.0-canary.177",
+  "version": "15.0.0-canary.178",
   "private": true,
   "scripts": {
     "clean": "node ../../scripts/rm.mjs native",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "15.0.0-canary.177",
+  "version": "15.0.0-canary.178",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -95,7 +95,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "15.0.0-canary.177",
+    "@next/env": "15.0.0-canary.178",
     "@swc/counter": "0.1.3",
     "@swc/helpers": "0.5.13",
     "busboy": "1.6.0",
@@ -159,11 +159,11 @@
     "@jest/types": "29.5.0",
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/triples": "1.2.0",
-    "@next/font": "15.0.0-canary.177",
-    "@next/polyfill-module": "15.0.0-canary.177",
-    "@next/polyfill-nomodule": "15.0.0-canary.177",
-    "@next/react-refresh-utils": "15.0.0-canary.177",
-    "@next/swc": "15.0.0-canary.177",
+    "@next/font": "15.0.0-canary.178",
+    "@next/polyfill-module": "15.0.0-canary.178",
+    "@next/polyfill-nomodule": "15.0.0-canary.178",
+    "@next/react-refresh-utils": "15.0.0-canary.178",
+    "@next/swc": "15.0.0-canary.178",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.41.2",
     "@swc/core": "1.7.0-nightly-20240714.1",

diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "15.0.0-canary.177",
+  "version": "15.0.0-canary.178",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/packages/third-parties/package.json b/packages/third-parties/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/third-parties",
-  "version": "15.0.0-canary.177",
+  "version": "15.0.0-canary.178",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/third-parties"
@@ -26,7 +26,7 @@
     "third-party-capital": "1.0.20"
   },
   "devDependencies": {
-    "next": "15.0.0-canary.177",
+    "next": "15.0.0-canary.178",
     "outdent": "0.8.0",
     "prettier": "2.5.1"
   },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml