chore: upgrade nextjs to 16.1.0 (#404)

mnahkies · web-flow · commit f4a378b1ff54 · 2025-12-22T14:38:06.000Z
- replaces the webpack config with turbopack equivalent
- requires introduction of a new `web` entrypoint, that doesn't export
things that rely on nodejs
diff --git a/e2e/package.json b/e2e/package.json
@@ -27,7 +27,7 @@
   "devDependencies": {
     "@jest/globals": "^30.2.0",
     "@nahkies/openapi-code-generator": "workspace:*",
-    "@types/express": "^5.0.5",
+    "@types/express": "^5.0.6",
     "@types/koa": "^3.0.1",
     "@types/koa__router": "^12.0.5",
     "expect": "^30.2.0",
diff --git a/integration-tests/typescript-express/package.json b/integration-tests/typescript-express/package.json
@@ -18,7 +18,7 @@
     "zod": "^3.25.74"
   },
   "devDependencies": {
-    "@types/express": "^5.0.5",
+    "@types/express": "^5.0.6",
     "typescript": "^5.9.3"
   }
 }
diff --git a/packages/documentation/next.config.mjs b/packages/documentation/next.config.mjs
@@ -1,5 +1,4 @@
 import nextra from "nextra"
-import NodePolyfillPlugin from "node-polyfill-webpack-plugin"
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
@@ -9,33 +8,10 @@ const nextConfig = {
   images: {
     unoptimized: true,
   },
-  webpack: (config) => {
-    config.experiments = {...config.experiments, syncWebAssembly: true}
-
-    /**
-     * Webpack doesn't support `node:` prefixed imports, so rewrite them to be
-     * plain imports, allowing the NodePolyfillPlugin to do its job correctly.
-     */
-    config.plugins.push({
-      apply(compiler) {
-        compiler.hooks.normalModuleFactory.tap("RewriteNodeProtocol", (nmf) => {
-          nmf.hooks.beforeResolve.tap("RewriteNodeProtocol", (result) => {
-            if (result?.request?.startsWith("node:")) {
-              result.request = result.request.replace(/^node:/, "")
-            }
-          })
-        })
-      },
-    })
-
-    config.plugins.push(new NodePolyfillPlugin())
-
-    config.module.rules.push({
-      test: /@biomejs\/wasm-nodejs/i,
-      use: "null-loader",
-    })
-
-    return config
+  turbopack: {
+    resolveAlias: {
+      "next-mdx-import-source-file": "./src/mdx-components.tsx",
+    },
   },
 }
 
diff --git a/packages/documentation/package.json b/packages/documentation/package.json
@@ -32,23 +32,21 @@
     "lodash": "^4.17.21",
     "monaco-editor": "^0.55.1",
     "monaco-editor-auto-typings": "^0.4.6",
-    "next": "15.5.9",
+    "next": "^16.1.0",
     "nextra": "^4.6.1",
     "nextra-theme-docs": "^4.6.1",
-    "node-polyfill-webpack-plugin": "^4.1.0",
     "react": "19.2.3",
     "react-dom": "19.2.3",
-    "react-hook-form": "^7.66.1",
+    "react-hook-form": "^7.68.0",
     "tslib": "^2.8.1",
     "zod": "^3.25.74"
   },
   "devDependencies": {
-    "@types/lodash": "^4.17.20",
+    "@types/lodash": "^4.17.21",
     "@types/node": "22.16.5",
-    "@types/react": "^19.2.2",
+    "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.2",
     "gh-pages": "^6.3.0",
-    "null-loader": "^4.0.1",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "webpack": "5.103.0"
diff --git a/packages/documentation/src/lib/playground.tsx b/packages/documentation/src/lib/playground.tsx
@@ -2,7 +2,7 @@
 
 import {zodResolver} from "@hookform/resolvers/zod"
 import {Editor, type Monaco, useMonaco} from "@monaco-editor/react"
-import {type Config, WebFsAdaptor} from "@nahkies/openapi-code-generator"
+import {type Config, WebFsAdaptor} from "@nahkies/openapi-code-generator/web"
 import type {editor} from "monaco-editor"
 import type {AutoTypingsCore} from "monaco-editor-auto-typings/lib/AutoTypingsCore"
 import {Callout} from "nextra/components"
diff --git a/packages/documentation/src/lib/playground/config-form.tsx b/packages/documentation/src/lib/playground/config-form.tsx
@@ -1,5 +1,5 @@
 import {zodResolver} from "@hookform/resolvers/zod"
-import {type Config, configSchema} from "@nahkies/openapi-code-generator"
+import {type Config, configSchema} from "@nahkies/openapi-code-generator/web"
 import type React from "react"
 import {useEffect} from "react"
 import {useForm} from "react-hook-form"
diff --git a/packages/documentation/src/lib/playground/utils.ts b/packages/documentation/src/lib/playground/utils.ts
@@ -1,5 +1,5 @@
 import type {Monaco} from "@monaco-editor/react"
-import type {WebFsAdaptor} from "@nahkies/openapi-code-generator"
+import type {WebFsAdaptor} from "@nahkies/openapi-code-generator/web"
 
 export function createOrUpdateModel(
   {filename, value}: {filename: string; value: string},
diff --git a/packages/documentation/src/lib/playground/worker/types.ts b/packages/documentation/src/lib/playground/worker/types.ts
@@ -1,4 +1,4 @@
-import type {Config} from "@nahkies/openapi-code-generator"
+import type {Config} from "@nahkies/openapi-code-generator/web"
 
 export type WorkerMessage = {type: "generate"; config: Config; input: string}
 export type WorkerResult = {files: Map<string, string>; elapsed: number}
diff --git a/packages/documentation/src/lib/playground/worker/worker.ts b/packages/documentation/src/lib/playground/worker/worker.ts
@@ -5,7 +5,7 @@ import {
   TypescriptFormatterPrettier,
   TypespecLoader,
   WebFsAdaptor,
-} from "@nahkies/openapi-code-generator"
+} from "@nahkies/openapi-code-generator/web"
 import _ from "lodash"
 import type {
   Monad,
diff --git a/packages/documentation/tsconfig.json b/packages/documentation/tsconfig.json
@@ -11,7 +11,7 @@
     "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "preserve",
+    "jsx": "react-jsx",
     "incremental": true,
     "plugins": [
       {
@@ -27,7 +27,8 @@
     "**/*.tsx",
     ".next/types/**/*.ts",
     "next-env.d.ts",
-    "dist/types/**/*.ts"
+    "dist/types/**/*.ts",
+    ".next/dev/types/**/*.ts"
   ],
   "exclude": ["node_modules"]
 }
diff --git a/packages/openapi-code-generator/package.json b/packages/openapi-code-generator/package.json
@@ -26,31 +26,37 @@
       "require": "./dist/index.js",
       "default": "./dist/index.js"
     },
-    "./cli": "./dist/cli.js"
+    "./cli": "./dist/cli.js",
+    "./web": {
+      "types": "./dist/web.d.ts",
+      "import": "./dist/web.js",
+      "require": "./dist/web.js",
+      "default": "./dist/web.js"
+    }
   },
   "scripts": {
     "clean": "rm -rf ./dist && rm tsconfig.tsbuildinfo",
     "build": "tsc -p ./tsconfig.json",
     "test": "jest"
   },
   "devDependencies": {
-    "@azure-tools/typespec-autorest": "0.62.0",
-    "@azure-tools/typespec-azure-core": "0.62.0",
-    "@azure-tools/typespec-azure-resource-manager": "0.62.0",
-    "@azure-tools/typespec-client-generator-core": "0.62.0",
+    "@azure-tools/typespec-autorest": "0.63.0",
+    "@azure-tools/typespec-azure-core": "0.63.0",
+    "@azure-tools/typespec-azure-resource-manager": "0.63.0",
+    "@azure-tools/typespec-client-generator-core": "0.63.0",
     "@jest/globals": "^30.2.0",
     "@types/js-yaml": "^4.0.9",
-    "@types/lodash": "^4.17.20",
-    "@typespec/compiler": "^1.5.0",
-    "@typespec/events": "0.76.0",
-    "@typespec/http": "^1.6.0",
-    "@typespec/openapi": "^1.6.0",
-    "@typespec/openapi3": "^1.6.0",
-    "@typespec/rest": "0.76.0",
-    "@typespec/sse": "0.76.0",
-    "@typespec/streams": "0.76.0",
-    "@typespec/versioning": "0.76.0",
-    "@typespec/xml": "0.76.0",
+    "@types/lodash": "^4.17.21",
+    "@typespec/compiler": "^1.7.0",
+    "@typespec/events": "0.77.0",
+    "@typespec/http": "^1.7.0",
+    "@typespec/openapi": "^1.7.0",
+    "@typespec/openapi3": "^1.7.0",
+    "@typespec/rest": "0.77.0",
+    "@typespec/sse": "0.77.0",
+    "@typespec/streams": "0.77.0",
+    "@typespec/versioning": "0.77.0",
+    "@typespec/xml": "0.77.0",
     "joi": "^18.0.2",
     "piscina": "^5.1.4",
     "tsx": "^4.21.0"
diff --git a/packages/openapi-code-generator/src/generate.ts b/packages/openapi-code-generator/src/generate.ts
@@ -0,0 +1,97 @@
+import type {Config} from "./config"
+import type {IFsAdaptor} from "./core/file-system/fs-adaptor"
+import {Input} from "./core/input"
+import type {IFormatter} from "./core/interfaces"
+import {GenericLoader} from "./core/loaders/generic.loader"
+import type {TypespecLoader} from "./core/loaders/typespec.loader"
+import {logger} from "./core/logger"
+import {OpenapiLoader} from "./core/openapi-loader"
+import type {OpenapiValidator} from "./core/openapi-validator"
+import {templates} from "./templates"
+import type {OpenapiGenerator} from "./templates.types"
+import {TypescriptEmitter} from "./typescript/common/typescript-emitter"
+
+function enumExtensibility(
+  config: Config,
+  generator: OpenapiGenerator,
+): "open" | "closed" {
+  if (config.enumExtensibility) {
+    return config.enumExtensibility
+  }
+
+  if (generator.type === "client") {
+    return "open"
+  }
+
+  if (generator.type === "server") {
+    return "closed"
+  }
+
+  throw new Error(`Unsupported generator type '${generator.type}'`)
+}
+
+export async function generate(
+  config: Config,
+  fsAdaptor: IFsAdaptor,
+  formatter: IFormatter,
+  validator: OpenapiValidator,
+  typespecLoader: TypespecLoader,
+) {
+  logger.time("program starting")
+  logger.info(`running on input file '${config.input}'`)
+  logger.time("load files")
+
+  const genericLoader = new GenericLoader(
+    fsAdaptor,
+    config.remoteSpecRequestHeaders,
+  )
+  const loader = await OpenapiLoader.create(
+    {
+      entryPoint: config.input,
+      fileType: config.inputType,
+      titleOverride: config.overrideSpecificationTitle,
+    },
+    validator,
+    genericLoader,
+    typespecLoader,
+  )
+
+  const generator = templates[config.template]
+
+  const input = new Input(
+    loader,
+    {
+      extractInlineSchemas: config.extractInlineSchemas,
+      enumExtensibility: enumExtensibility(config, generator),
+    },
+    generator.syntheticNameGenerator,
+  )
+
+  const emitter = new TypescriptEmitter(fsAdaptor, formatter, {
+    destinationDirectory: config.output,
+    allowUnusedImports: config.allowUnusedImports,
+  })
+
+  if (
+    config.tsIsEsmProject &&
+    !config.tsCompilerOptions.rewriteRelativeImportExtensions
+  ) {
+    logger.warn(
+      `Generating in ESM mode, but typescript compiler option "rewriteRelativeImportExtensions" is not set to true. This may result in broken imports.`,
+    )
+  }
+
+  await generator.run({
+    input,
+    emitter,
+    schemaBuilder: config.schemaBuilder,
+    enableRuntimeResponseValidation: config.enableRuntimeResponseValidation,
+    enableTypedBasePaths: config.enableTypedBasePaths,
+    compilerOptions: config.tsCompilerOptions,
+    groupingStrategy: config.groupingStrategy,
+    filenameConvention: config.filenameConvention,
+    isEsmProject: config.tsIsEsmProject,
+    allowAny: config.tsAllowAny,
+    serverImplementationMethod: config.tsServerImplementationMethod,
+  })
+}
diff --git a/packages/openapi-code-generator/src/index.ts b/packages/openapi-code-generator/src/index.ts
diff --git a/packages/openapi-code-generator/src/web.ts b/packages/openapi-code-generator/src/web.ts
diff --git a/packages/typescript-express-runtime/package.json b/packages/typescript-express-runtime/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"zod": "^3.25.74"`
`19`	`19`	`},`
`20`	`20`	`"devDependencies": {`
`21`		`- "@types/express": "^5.0.5",`
	`21`	`+ "@types/express": "^5.0.6",`
`22`	`22`	`"typescript": "^5.9.3"`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type {Config} from "@nahkies/openapi-code-generator"`
	`1`	`+import type {Config} from "@nahkies/openapi-code-generator/web"`
`2`	`2`
`3`	`3`	`export type WorkerMessage = {type: "generate"; config: Config; input: string}`
`4`	`4`	`export type WorkerResult = {files: Map<string, string>; elapsed: number}`