@next/codemod 15.0.0-canary.176 → 15.0.0-canary.178

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "15.0.0-canary.176",
+  "version": "15.0.0-canary.178",
   "license": "MIT",
   "repository": {
     "type": "git",

package/transforms/lib/async-request-api/next-async-dynamic-api.js

@@ -144,6 +144,30 @@ function transformDynamicAPI(source, api, filePath) {
                 }
             }
         });
+        // 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 = (0, utils_1.determineClientDirective)(root, j);
     // Only transform the valid calls in server or shared components

package/transforms/lib/async-request-api/utils.js

@@ -141,21 +141,18 @@ function insertReactUseImport(root, j) {
     if (!hasReactUseImport) {
         const reactImportDeclaration = root.find(j.ImportDeclaration, {
             source: {
-                type: 'Literal',
                 value: 'react',
             },
         });
         if (reactImportDeclaration.size() > 0) {
+            const importNode = reactImportDeclaration.get().node;
             // Add 'use' to existing 'react' import declaration
-            reactImportDeclaration
-                .get()
-                .node.specifiers.push(j.importSpecifier(j.identifier('use')));
+            importNode.specifiers.push(j.importSpecifier(j.identifier('use')));
         }
         else {
             // Final all type imports to 'react'
             const reactImport = root.find(j.ImportDeclaration, {
                 source: {
-                    type: 'Literal',
                     value: 'react',
                 },
             });