[AI Improvement] [Task] Upgrade next devDependency from ^14 to ^16 and fix Next.js type imports

package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "15.32.1",
+  "version": "15.32.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "mcpName": "io.github.firebase/firebase-mcp",
@@ -241,7 +241,7 @@
     "googleapis": "^105.0.0",
     "mocha": "^11.7.1",
     "mock-fs": "5.2.0",
-    "next": "15.5.24",
+    "next": "^16.3.7",
     "nock": "^13.0.5",
     "node-mocks-http": "^1.11.0",
     "nyc": "^15.1.0",

src/frameworks/next/constants.ts

@@ -49,50 +49,59 @@ const WEBPACK_LAYERS_NAMES = {
   /**
    * The browser client bundle layer for actions.
    */ actionBrowser: "action-browser",
-  apiNode: "api-node",
-  apiEdge: "api-edge",
+  /**
+   * The layer for the API routes.
+   */ api: "api",
   /**
    * The layer for the middleware code.
    */ middleware: "middleware",
-  instrument: "instrument",
   /**
    * The layer for assets on the edge.
    */ edgeAsset: "edge-asset",
   /**
    * The browser client bundle layer for App directory.
    */ appPagesBrowser: "app-pages-browser",
-  pagesDirBrowser: "pages-dir-browser",
-  pagesDirEdge: "pages-dir-edge",
-  pagesDirNode: "pages-dir-node",
+  /**
+   * The server bundle layer for metadata routes.
+   */ appMetadataRoute: "app-metadata-route",
+  /**
+   * The layer for the server bundle for App Route handlers.
+   */ appRouteHandler: "app-route-handler",
 } as const;
 
 // This is copied from Next.js source code to keep WEBPACK_LAYERS in sync with the Next.js definition.
 export const WEBPACK_LAYERS: typeof NEXTJS_WEBPACK_LAYERS = {
   ...WEBPACK_LAYERS_NAMES,
+  pagesDirBrowser: "pages-dir-browser",
+  pagesDirEdge: "pages-dir-edge",
+  pagesDirNode: "pages-dir-node",
+  apiNode: "api-node",
+  apiEdge: "api-edge",
+  instrument: "instrument",
   GROUP: {
     builtinReact: [WEBPACK_LAYERS_NAMES.reactServerComponents, WEBPACK_LAYERS_NAMES.actionBrowser],
     serverOnly: [
+      WEBPACK_LAYERS_NAMES.middleware,
       WEBPACK_LAYERS_NAMES.reactServerComponents,
       WEBPACK_LAYERS_NAMES.actionBrowser,
-      WEBPACK_LAYERS_NAMES.instrument,
-      WEBPACK_LAYERS_NAMES.middleware,
+      "instrument",
     ],
-    neutralTarget: [WEBPACK_LAYERS_NAMES.apiNode, WEBPACK_LAYERS_NAMES.apiEdge],
+    neutralTarget: ["api-node", "api-edge"],
     clientOnly: [WEBPACK_LAYERS_NAMES.serverSideRendering, WEBPACK_LAYERS_NAMES.appPagesBrowser],
     bundled: [
+      WEBPACK_LAYERS_NAMES.shared,
+      WEBPACK_LAYERS_NAMES.middleware,
       WEBPACK_LAYERS_NAMES.reactServerComponents,
-      WEBPACK_LAYERS_NAMES.actionBrowser,
       WEBPACK_LAYERS_NAMES.serverSideRendering,
+      WEBPACK_LAYERS_NAMES.actionBrowser,
+      "instrument",
       WEBPACK_LAYERS_NAMES.appPagesBrowser,
-      WEBPACK_LAYERS_NAMES.shared,
-      WEBPACK_LAYERS_NAMES.instrument,
-      WEBPACK_LAYERS_NAMES.middleware,
     ],
     appPages: [
       WEBPACK_LAYERS_NAMES.reactServerComponents,
       WEBPACK_LAYERS_NAMES.serverSideRendering,
-      WEBPACK_LAYERS_NAMES.appPagesBrowser,
       WEBPACK_LAYERS_NAMES.actionBrowser,
+      WEBPACK_LAYERS_NAMES.appPagesBrowser,
     ],
   },
 };

src/frameworks/next/index.ts

@@ -12,6 +12,7 @@
 import { IncomingMessage, ServerResponse } from "http";
 import * as clc from "colorette";
 import { fileExistsSync } from "../../fsutils";
+import { loadStreamJson } from "../../streamJson";
 
 import { select } from "../../prompt";
 import { FirebaseError } from "../../error";
@@ -41,7 +42,7 @@
   isRewriteSupportedByHosting,
   isUsingImageOptimization,
   isUsingMiddleware,
-  getProductionDependencyNames,
+  allDependencyNames,
   getMiddlewareMatcherRegexes,
   getNonStaticRoutes,
   getNonStaticServerComponents,
@@ -58,12 +59,13 @@
   getNextVersionRaw,
   isNextJsVersionVulnerable,
 } from "./utils";
-import { NODE_VERSION, SHARP_VERSION, I18N_ROOT } from "../constants";
+import { NODE_VERSION, NPM_COMMAND_TIMEOUT_MILLIES, SHARP_VERSION, I18N_ROOT } from "../constants";
 import type {
   AppPathRoutesManifest,
   AppPathsManifest,
   HostingHeadersWithSource,
   RoutesManifest,
+  NpmLsDepdendency,
   MiddlewareManifest,
   ActionManifest,
   CustomBuildOptions,
@@ -97,13 +99,13 @@
 const DEFAULT_NUMBER_OF_REASONS_TO_LIST = 5;
 
 function getReactVersion(cwd: string): string | undefined {
   return findDependency("react-dom", { cwd, omitDev: false })?.version;
 }
 
 /**
  * Returns whether this codebase is a Next.js backend.
  */
 export async function discover(dir: string) {
   if (!(await pathExists(join(dir, "package.json")))) return;
   const version = getNextVersion(dir);
   if (!(await whichNextConfigFile(dir)) && !version) return;
@@ -160,10 +162,10 @@
 
   const nextBuild = new Promise((resolve, reject) => {
     const buildProcess = spawn(cli, ["build"], { cwd: dir, env });
     buildProcess.stdout?.on("data", (data) => logger.info(data.toString()));
     buildProcess.stderr?.on("data", (data) => logger.info(data.toString()));
     buildProcess.on("error", (err) => {
       reject(new FirebaseError(`Unable to build your Next.js app: ${err}`));
     });
     buildProcess.on("exit", (code) => {
       resolve(code);
@@ -513,11 +515,11 @@
           {
             srcRoute: null,
             initialRevalidateSeconds: false,
-            initialExpireSeconds: undefined,
             dataRoute: "",
             experimentalPPR: false,
-            renderingMode: undefined,
             prefetchDataRoute: "",
+            initialExpireSeconds: undefined,
+            renderingMode: undefined,
             allowHeader: [],
           },
         ];
@@ -658,7 +660,28 @@
         throw new FirebaseError(`Failed to load esbuild from path: ${esbuildPath}`);
       }
 
-      const productionDeps = await getProductionDependencyNames(sourceDir);
+      const { chain, parser, pick, streamObject } = await loadStreamJson();
+      const productionDeps = await new Promise<string[]>((resolve) => {
+        const dependencies: string[] = [];
+        const npmLs = spawn("npm", ["ls", "--omit=dev", "--all", "--json=true"], {
+          cwd: sourceDir,
+          timeout: NPM_COMMAND_TIMEOUT_MILLIES,
+        });
+        const pipeline = chain([
+          npmLs.stdout,
+          parser({ packValues: false, packKeys: true, streamValues: false }),
+          pick({ filter: "dependencies" }),
+          streamObject(),
+          ({ key, value }: { key: string; value: NpmLsDepdendency }) => [
+            key,
+            ...allDependencyNames(value),
+          ],
+        ]);
+        pipeline.on("data", (it: string) => dependencies.push(it));
+        pipeline.on("end", () => {
+          resolve([...new Set(dependencies)]);
+        });
+      });
 
       // Mark all production deps as externals, so they aren't bundled
       // DevDeps won't be included in the Cloud Function, so they should be bundled

src/frameworks/next/interfaces.ts

@@ -92,8 +92,8 @@ export type MiddlewareManifest = MiddlewareManifestV1 | MiddlewareManifestV2 | M
 export type MiddlewareManifestV2 = {
   version: 2;
   sortedMiddleware: string[];
-  middleware: { [page: string]: Omit<EdgeFunctionDefinition, "env"> };
-  functions: { [page: string]: Omit<EdgeFunctionDefinition, "env"> };
+  middleware: { [page: string]: EdgeFunctionDefinition };
+  functions: { [page: string]: EdgeFunctionDefinition };
 };
 
 /**
@@ -109,16 +109,17 @@ export type MiddlewareManifestV3 = {
 };
 
 /**
- * Type required for MiddlewareManifestV3
+ * Type required for MiddlewareManifestV2 and MiddlewareManifestV3
  *
  * @see https://github.com/vercel/next.js/blob/3352f9ee9342b40aaded91c340e7e11650aa4867/packages/next/src/build/webpack/plugins/middleware-plugin.ts#L44-L53
  */
-interface EdgeFunctionDefinition {
+export interface EdgeFunctionDefinition {
   files: string[];
   name: string;
   page: string;
   matchers: ProxyMatcherNext16[];
-  env: Record<string, string>;
+  entrypoint?: string;
+  env?: Record<string, string>;
   wasm?: AssetBinding[];
   assets?: AssetBinding[];
   regions?: string[] | string;
@@ -210,8 +211,9 @@ export interface MiddlewareManifestV1 {
 
 export interface ImagesManifest {
   version: number;
-  images: ImageConfigComplete & {
+  images: Partial<ImageConfigComplete> & {
     sizes: number[];
+    unoptimized: boolean;
   };
 }
 

src/frameworks/next/testing/app.ts

@@ -32,22 +32,22 @@ export const prerenderManifest: PrerenderManifest = {
   routes: {
     "/": {
       initialRevalidateSeconds: false,
-      initialExpireSeconds: undefined,
       srcRoute: "/",
       dataRoute: "/index.rsc",
       experimentalPPR: false,
-      renderingMode: undefined,
       prefetchDataRoute: "",
+      initialExpireSeconds: undefined,
+      renderingMode: undefined,
       allowHeader: [],
     },
     "/api/static": {
       initialRevalidateSeconds: false,
-      initialExpireSeconds: undefined,
       srcRoute: "/api/static",
       dataRoute: "",
       experimentalPPR: false,
-      renderingMode: undefined,
       prefetchDataRoute: "",
+      initialExpireSeconds: undefined,
+      renderingMode: undefined,
       allowHeader: [],
     },
   },

src/frameworks/next/utils.ts

@@ -16,15 +16,12 @@ import type {
   RoutesManifestRedirect,
   RoutesManifestHeader,
   MiddlewareManifest,
-  MiddlewareManifestV1,
-  MiddlewareManifestV2,
   AppPathsManifest,
   HostingHeadersWithSource,
   AppPathRoutesManifest,
   ActionManifest,
   NextConfigFileName,
   FunctionsConfigManifest,
-  MiddlewareManifestV3,
 } from "./interfaces";
 import {
   APP_PATH_ROUTES_MANIFEST,
@@ -387,21 +384,18 @@ export function getMiddlewareMatcherRegexes(
   middlewareManifest: MiddlewareManifest,
   functionsConfigManifest: FunctionsConfigManifest,
 ): RegExp[] {
-  const middlewareObjectValues = Object.values(middlewareManifest.middleware);
   const middlewareMatchers: Record<"regexp", string>[] = [];
 
   if (middlewareManifest.version === 1) {
+    const values = Object.values(middlewareManifest.middleware);
     middlewareMatchers.push(
-      ...middlewareObjectValues.map((page: MiddlewareManifestV1["middleware"][string]) => ({
+      ...values.map((page) => ({
         regexp: page.regexp,
       })),
     );
   } else if (middlewareManifest.version === 2) {
-    middlewareMatchers.push(
-      ...middlewareObjectValues
-        .map((page: MiddlewareManifestV2["middleware"][string]) => page.matchers)
-        .flat(),
-    );
+    const values = Object.values(middlewareManifest.middleware);
+    middlewareMatchers.push(...values.map((page) => page.matchers || []).flat());
   } else if (middlewareManifest.version === 3) {
     if (functionsConfigManifest?.functions?.["/_middleware"]) {
       // matchers from proxy.js
@@ -410,11 +404,8 @@ export function getMiddlewareMatcherRegexes(
       );
     } else {
       // matchers from middleware.js
-      middlewareMatchers.push(
-        ...middlewareObjectValues
-          .map((page: MiddlewareManifestV3["middleware"][string]) => page.matchers)
-          .flat(),
-      );
+      const values = Object.values(middlewareManifest.middleware);
+      middlewareMatchers.push(...values.map((page) => page.matchers || []).flat());
     }
   }