cdk-nextjs 0.7.10 → 0.7.12

package/lib/runtime/server.mjs

@@ -25416,7 +25416,7 @@ var require_dist_cjs13 = __commonJS({
   "node_modules/.pnpm/@aws-sdk+credential-provider-web-identity@3.972.78/node_modules/@aws-sdk/credential-provider-web-identity/dist-cjs/index.js"(exports) {
     var { setCredentialFeature: setCredentialFeature2 } = (init_client3(), __toCommonJS(client_exports2));
     var { CredentialsProviderError: CredentialsProviderError2, externalDataInterceptor: externalDataInterceptor2 } = (init_config2(), __toCommonJS(config_exports));
-    var { readFileSync: readFileSync3 } = __require("node:fs");
+    var { readFileSync: readFileSync2 } = __require("node:fs");
     var fromWebToken = (init) => async (awsIdentityProperties) => {
       init.logger?.debug("@aws-sdk/credential-provider-web-identity - fromWebToken");
       const { roleArn, roleSessionName, webIdentityToken, providerId, policyArns, policy, durationSeconds } = init;
@@ -25457,7 +25457,7 @@ var require_dist_cjs13 = __commonJS({
       }
       const credentials = await fromWebToken({
         ...init,
-        webIdentityToken: externalDataInterceptor2?.getTokenRecord?.()[webIdentityTokenFile] ?? readFileSync3(webIdentityTokenFile, { encoding: "ascii" }),
+        webIdentityToken: externalDataInterceptor2?.getTokenRecord?.()[webIdentityTokenFile] ?? readFileSync2(webIdentityTokenFile, { encoding: "ascii" }),
         roleArn,
         roleSessionName
       })(awsIdentityProperties);
@@ -35918,7 +35918,7 @@ var require_dist = __commonJS({
       if (typeof e5 !== "undefined") e5.ab = __dirname + "/";
       var t = {};
       e5.r(t);
-      e5.d(t, { detectDomainLocale: () => detectDomainLocale2, detectLocale: () => detectLocale2, getAcceptLanguageLocale: () => getAcceptLanguageLocale, getCookieLocale: () => getCookieLocale, normalizeLocalePath: () => normalizeLocalePath, resolveRoutes: () => resolveRoutes2, responseToMiddlewareResult: () => responseToMiddlewareResult2 });
+      e5.d(t, { detectDomainLocale: () => detectDomainLocale2, detectLocale: () => detectLocale2, getAcceptLanguageLocale: () => getAcceptLanguageLocale, getCookieLocale: () => getCookieLocale, normalizeLocalePath: () => normalizeLocalePath2, resolveRoutes: () => resolveRoutes2, responseToMiddlewareResult: () => responseToMiddlewareResult2 });
       function matchesCondition(e6, t8) {
         if (e6 === void 0) {
           return { matched: false };
@@ -36117,7 +36117,7 @@ var require_dist = __commonJS({
         }
         return void 0;
       }
-      function normalizeLocalePath(e6, t8) {
+      function normalizeLocalePath2(e6, t8) {
         if (!t8 || t8.length === 0) {
           return { pathname: e6 };
         }
@@ -36201,7 +36201,7 @@ var require_dist = __commonJS({
       }
       function detectLocale2(e6) {
         const { pathname: t8, hostname: n4, cookieHeader: a5, acceptLanguageHeader: s2, i18n: r5 } = e6;
-        const o3 = normalizeLocalePath(t8, r5.locales);
+        const o3 = normalizeLocalePath2(t8, r5.locales);
         if (o3.detectedLocale) {
           return { locale: o3.detectedLocale, pathnameWithoutLocale: o3.pathname, localeInPath: true };
         }
@@ -36486,7 +36486,7 @@ var require_dist = __commonJS({
             const t9 = f5.hostname;
             const a6 = h5.get("cookie") || void 0;
             const s4 = h5.get("accept-language") || void 0;
-            const r6 = normalizeLocalePath(e7, l3.locales);
+            const r6 = normalizeLocalePath2(e7, l3.locales);
             const o4 = !!r6.detectedLocale;
             const i6 = detectDomainLocale2(l3.domains, t9);
             const c6 = i6?.defaultLocale || l3.defaultLocale;
@@ -36877,9 +36877,249 @@ var require_dist = __commonJS({
   }
 });
 
+// package.json
+var require_package = __commonJS({
+  "package.json"(exports, module) {
+    module.exports = {
+      name: "cdk-nextjs",
+      description: "Deploy Next.js apps on AWS with CDK",
+      repository: {
+        type: "git",
+        url: "https://github.com/cdklabs/cdk-nextjs.git"
+      },
+      scripts: {
+        build: "pnpm dlx projen build",
+        bump: "pnpm dlx projen bump",
+        "bump:releasable-commits": "pnpm dlx projen bump:releasable-commits",
+        bundle: "pnpm dlx projen bundle",
+        "bundle:adapter/adapter": "pnpm dlx projen bundle:adapter/adapter",
+        "bundle:adapter/adapter:watch": "pnpm dlx projen bundle:adapter/adapter:watch",
+        "bundle:adapter/cache-handler": "pnpm dlx projen bundle:adapter/cache-handler",
+        "bundle:adapter/cache-handler:watch": "pnpm dlx projen bundle:adapter/cache-handler:watch",
+        "bundle:adapter/use-cache-default-handler": "pnpm dlx projen bundle:adapter/use-cache-default-handler",
+        "bundle:adapter/use-cache-default-handler:watch": "pnpm dlx projen bundle:adapter/use-cache-default-handler:watch",
+        "bundle:adapter/use-cache-remote-handler": "pnpm dlx projen bundle:adapter/use-cache-remote-handler",
+        "bundle:adapter/use-cache-remote-handler:watch": "pnpm dlx projen bundle:adapter/use-cache-remote-handler:watch",
+        "bundle:lambdas/post-deploy/post-deploy.lambda": "pnpm dlx projen bundle:lambdas/post-deploy/post-deploy.lambda",
+        "bundle:lambdas/post-deploy/post-deploy.lambda:watch": "pnpm dlx projen bundle:lambdas/post-deploy/post-deploy.lambda:watch",
+        "bundle:lambdas/redeploy-stage/redeploy-stage.lambda": "pnpm dlx projen bundle:lambdas/redeploy-stage/redeploy-stage.lambda",
+        "bundle:lambdas/redeploy-stage/redeploy-stage.lambda:watch": "pnpm dlx projen bundle:lambdas/redeploy-stage/redeploy-stage.lambda:watch",
+        "bundle:nextjs-build/patch-fetch": "pnpm dlx projen bundle:nextjs-build/patch-fetch",
+        "bundle:nextjs-build/patch-fetch:watch": "pnpm dlx projen bundle:nextjs-build/patch-fetch:watch",
+        "bundle:runtime/lambda": "pnpm dlx projen bundle:runtime/lambda",
+        "bundle:runtime/lambda:watch": "pnpm dlx projen bundle:runtime/lambda:watch",
+        "bundle:runtime/server": "pnpm dlx projen bundle:runtime/server",
+        "bundle:runtime/server:watch": "pnpm dlx projen bundle:runtime/server:watch",
+        clobber: "pnpm dlx projen clobber",
+        compat: "pnpm dlx projen compat",
+        compile: "pnpm dlx projen compile",
+        default: "pnpm dlx projen default",
+        docgen: "pnpm dlx projen docgen",
+        eject: "pnpm dlx projen eject",
+        eslint: "pnpm dlx projen eslint",
+        integ: "pnpm dlx projen integ",
+        "integ:update": "pnpm dlx projen integ:update",
+        package: "pnpm dlx projen package",
+        "package-all": "pnpm dlx projen package-all",
+        "package:js": "pnpm dlx projen package:js",
+        "post-compile": "pnpm dlx projen post-compile",
+        "post-upgrade": "pnpm dlx projen post-upgrade",
+        "pre-compile": "pnpm dlx projen pre-compile",
+        release: "pnpm dlx projen release",
+        "rosetta:extract": "pnpm dlx projen rosetta:extract",
+        test: "pnpm dlx projen test",
+        "test:watch": "pnpm dlx projen test:watch",
+        unbump: "pnpm dlx projen unbump",
+        upgrade: "pnpm dlx projen upgrade",
+        "upgrade-cdklabs-projen-project-types": "pnpm dlx projen upgrade-cdklabs-projen-project-types",
+        "upgrade-dev-deps": "pnpm dlx projen upgrade-dev-deps",
+        watch: "pnpm dlx projen watch",
+        projen: "pnpm dlx projen"
+      },
+      author: {
+        name: "Amazon Web Services",
+        email: "aws-cdk-dev@amazon.com",
+        organization: true
+      },
+      devDependencies: {
+        "@aws-cdk/integ-runner": "latest",
+        "@aws-cdk/integ-tests-alpha": "latest",
+        "@aws-crypto/sha256-js": "^5.2.0",
+        "@aws-sdk/client-api-gateway": "^3.1141.0",
+        "@aws-sdk/client-cloudfront": "^3.1141.0",
+        "@aws-sdk/client-dynamodb": "^3.1141.0",
+        "@aws-sdk/client-s3": "^3.1141.0",
+        "@aws-sdk/client-ssm": "^3.1141.0",
+        "@aws-sdk/lib-storage": "^3.1141.0",
+        "@mrgrain/jsii-struct-builder": "^0.7.64",
+        "@next/routing": "16.4.0",
+        "@smithy/signature-v4": "^2.3.0",
+        "@types/aws-lambda": "^8.10.163",
+        "@types/debug": "^4.1.13",
+        "@types/jest": "^29.5.14",
+        "@types/mime-types": "^2.1.4",
+        "@types/node": "^24",
+        "@typescript-eslint/eslint-plugin": "^8",
+        "@typescript-eslint/parser": "^8",
+        "aws-cdk": "^2.1143.0",
+        "aws-cdk-lib": "2.261.0",
+        "cdk-nag": "^2.38.2",
+        "cdklabs-projen-project-types": "^0.6.17",
+        "commit-and-tag-version": "^12",
+        constructs: "10.5.1",
+        debug: "^4.4.3",
+        esbuild: "^0.28.2",
+        eslint: "^9",
+        "eslint-config-prettier": "^9.1.2",
+        "eslint-import-resolver-typescript": "^3.10.1",
+        "eslint-plugin-import": "^2.32.0",
+        "eslint-plugin-prettier": "^5.5.6",
+        jest: "^29.7.0",
+        "jest-junit": "^17",
+        jsii: "~6.0.4",
+        "jsii-diff": "^1.140.0",
+        "jsii-docgen": "^10.5.0",
+        "jsii-pacmak": "^1.140.0",
+        "jsii-rosetta": "~5.9.67",
+        "mime-types": "^2.1.35",
+        next: "^16.4.0",
+        prettier: "^3.9.9",
+        projen: "^0.101.6",
+        "ts-jest": "^29.4.14",
+        "ts-node": "^10.9.2",
+        typescript: "^5.9.3",
+        undici: "^6.29.0"
+      },
+      peerDependencies: {
+        "aws-cdk-lib": "^2.261.0",
+        constructs: "^10.5.1"
+      },
+      pnpm: {
+        onlyBuiltDependencies: [
+          "esbuild",
+          "unrs-resolver",
+          "sharp"
+        ],
+        overrides: {
+          postcss: "^8.5.23",
+          browserslist: "^4.28.7",
+          "js-yaml@3": "^3.15.1",
+          "js-yaml@4": "^4.3.1",
+          "brace-expansion@1": "^1.1.21",
+          "brace-expansion@5": "^5.0.12",
+          "@babel/core": "^7.29.6",
+          sharp: "^0.35.5",
+          "source-map-js": "^1.2.2"
+        }
+      },
+      keywords: [
+        "aws",
+        "aws-cdk",
+        "cdk",
+        "next",
+        "next.js",
+        "nextjs"
+      ],
+      devEngines: {
+        packageManager: {
+          name: "pnpm",
+          version: "10.32.1",
+          onFail: "ignore"
+        }
+      },
+      main: "lib/index.js",
+      license: "Apache-2.0",
+      stability: "stable",
+      publishConfig: {
+        access: "public"
+      },
+      version: "0.7.12",
+      packageManager: "pnpm@10.32.1",
+      jest: {
+        coverageProvider: "v8",
+        testPathIgnorePatterns: [
+          "/node_modules/",
+          "/cdk.out/"
+        ],
+        testMatch: [
+          "<rootDir>/@(src|test)/**/*(*.)@(spec|test).ts?(x)",
+          "<rootDir>/@(src|test)/**/__tests__/**/*.ts?(x)",
+          "<rootDir>/@(projenrc)/**/*(*.)@(spec|test).ts?(x)",
+          "<rootDir>/@(projenrc)/**/__tests__/**/*.ts?(x)"
+        ],
+        clearMocks: true,
+        collectCoverage: true,
+        coverageReporters: [
+          "json",
+          "lcov",
+          "clover",
+          "cobertura",
+          "text"
+        ],
+        coverageDirectory: "coverage",
+        coveragePathIgnorePatterns: [
+          "/node_modules/",
+          "/cdk.out/"
+        ],
+        watchPathIgnorePatterns: [
+          "/node_modules/"
+        ],
+        reporters: [
+          "default",
+          [
+            "jest-junit",
+            {
+              outputDirectory: "test-reports"
+            }
+          ]
+        ],
+        transform: {
+          "^.+\\.[t]sx?$": [
+            "ts-jest",
+            {
+              tsconfig: "test/tsconfig.json"
+            }
+          ]
+        }
+      },
+      types: "lib/index.d.ts",
+      jsii: {
+        outdir: "dist",
+        targets: {},
+        tsconfig: "tsconfig.json",
+        validateTsconfig: "strict"
+      },
+      exports: {
+        ".": {
+          types: "./lib/index.d.ts",
+          import: "./lib/index.js",
+          default: "./lib/index.js"
+        },
+        "./adapter": {
+          import: "./lib/adapter/adapter.mjs",
+          default: "./lib/adapter/adapter.mjs"
+        },
+        "./cache-handler": {
+          import: "./lib/adapter/cache-handler.mjs",
+          default: "./lib/adapter/cache-handler.mjs"
+        },
+        "./cache-handlers/default": {
+          import: "./lib/adapter/use-cache-default-handler.mjs",
+          default: "./lib/adapter/use-cache-default-handler.mjs"
+        },
+        "./cache-handlers/remote": {
+          import: "./lib/adapter/use-cache-remote-handler.mjs",
+          default: "./lib/adapter/use-cache-remote-handler.mjs"
+        }
+      },
+      "//": '~~ Generated by projen. To modify, edit .projenrc.ts and run "pnpm dlx projen".'
+    };
+  }
+});
+
 // src/runtime/server.mts
 import { dirname as dirname2 } from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
+import { fileURLToPath } from "node:url";
 
 // src/runtime/core.ts
 import { readFile as readFile3 } from "node:fs/promises";
@@ -37547,8 +37787,7 @@ function requestLocale(manifest, url) {
   const i18n = asI18n(manifest.config.i18n);
   if (!i18n) return void 0;
   const pathname = withoutPathPrefix(url.pathname, manifest.config.basePath);
-  const segment = (pathname.split("/")[1] ?? "").toLowerCase();
-  return i18n.locales.find((candidate) => candidate.toLowerCase() === segment) ?? (0, import_routing.detectDomainLocale)(i18n.domains, url.hostname)?.defaultLocale ?? i18n.defaultLocale;
+  return (0, import_routing.normalizeLocalePath)(pathname, i18n.locales).detectedLocale ?? (0, import_routing.detectDomainLocale)(i18n.domains, url.hostname)?.defaultLocale ?? i18n.defaultLocale;
 }
 
 // src/runtime/entrypoints.ts
@@ -38032,9 +38271,8 @@ function padEmptyBody() {
 }
 
 // src/runtime/image.ts
-import { readFileSync as readFileSync2 } from "node:fs";
 import { isAbsolute as isAbsolutePath, join as join9 } from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
+import { pathToFileURL } from "node:url";
 
 // src/runtime/image-utils.ts
 var import_client_s32 = __toESM(require_dist_cjs16());
@@ -38072,6 +38310,7 @@ async function fetchFromS3(s32, bucket, url, location, maximumBody) {
   return {
     buffer: Buffer.concat(chunks),
     contentType: response.ContentType || null,
+    cacheControl: response.CacheControl || null,
     etag: response.ETag || ""
   };
 }
@@ -38105,6 +38344,9 @@ function resolveErrorResponse(error2, ImageError) {
   return { statusCode: 500, message: "Internal Server Error" };
 }
 
+// src/cdk-nextjs-version.ts
+var CDK_NEXTJS_VERSION = require_package().version;
+
 // src/runtime/next-modules.ts
 import { createRequire as createRequire2 } from "node:module";
 import { join as join8 } from "node:path";
@@ -38164,13 +38406,13 @@ var RuntimeImageOptimizer = class {
    * off.
    */
   isEnabled() {
-    this.loaded ??= loadImageRuntime(this.options);
-    const { imagesConfig } = this.loaded;
-    return imagesConfig.loader === "default" && !imagesConfig.unoptimized;
+    const images = manifestImages(this.options.manifest);
+    return images.loader === "default" && !images.unoptimized;
   }
   async handle(req, res, url, waitUntil) {
     this.loaded ??= loadImageRuntime(this.options);
-    const { next, nextConfig, imagesConfig } = this.loaded;
+    const { next, nextConfig } = this.loaded;
+    const imagesConfig = nextConfig.images;
     const {
       ImageError,
       ImageOptimizerCache,
@@ -38320,7 +38562,10 @@ var RuntimeImageOptimizer = class {
         return {
           buffer: result.buffer,
           contentType: result.contentType,
-          cacheControl: null,
+          // The object's own, as `fetchInternalImage` passes on the file's
+          // `Cache-Control`: the optimizer keeps the result for its max-age, a
+          // year for an immutable `_next/static/media` file.
+          cacheControl: result.cacheControl,
           // Encoded as for a route's response: `fetchInternalImage` does too.
           etag: extractEtag(result.etag, result.buffer)
         };
@@ -38405,9 +38650,8 @@ function newImageResponseCache(ResponseCache) {
   }
 }
 function cacheHandlerUrl(distDir, cacheHandler) {
-  const path = cacheHandler.startsWith("file://") ? fileURLToPath(cacheHandler) : cacheHandler;
   return pathToFileURL(
-    isAbsolutePath(path) ? path : join9(distDir, path)
+    isAbsolutePath(cacheHandler) ? cacheHandler : join9(distDir, cacheHandler)
   ).toString();
 }
 function deferWrites(images, waitUntil) {
@@ -38427,29 +38671,29 @@ function sendText(res, statusCode, body) {
   res.setHeader("Content-Type", "text/plain");
   res.end(body);
 }
-function loadImageRuntime({ deploymentRoot, manifest }) {
+function manifestImages(manifest) {
+  if (manifest.cdkNextjsVersion !== CDK_NEXTJS_VERSION) {
+    throw new Error(
+      `The adapter manifest was written by cdk-nextjs ${manifest.cdkNextjsVersion ?? "(unknown)"}, but this runtime is cdk-nextjs ${CDK_NEXTJS_VERSION}. Rebuild the app with this version.`
+    );
+  }
+  return manifest.config.images;
+}
+function loadImageRuntime({ manifest }) {
   const next = {
-    configShared: nextModule("next/dist/server/config-shared.js"),
-    imageConfig: nextModule("next/dist/shared/lib/image-config.js"),
     optimizer: nextModule("next/dist/server/image-optimizer.js"),
     serveStatic: nextModule("next/dist/server/serve-static.js")
   };
-  const path = join9(
-    deploymentRoot,
-    manifest.relativeProjectDir,
-    manifest.config.distDir,
-    "required-server-files.json"
-  );
-  const required = JSON.parse(readFileSync2(path, "utf-8"));
-  const nextConfig = next.configShared.getNextConfigRuntime(required.config);
-  return {
-    next,
-    nextConfig,
-    imagesConfig: {
-      ...next.imageConfig.imageConfigDefault,
-      ...nextConfig.images
-    }
+  const { config } = manifest;
+  const nextConfig = {
+    basePath: config.basePath,
+    assetPrefix: config.assetPrefix,
+    images: manifestImages(manifest),
+    experimental: config.experimental,
+    cacheHandler: config.cacheHandler ?? void 0,
+    cacheMaxMemorySize: config.cacheMaxMemorySize
   };
+  return { next, nextConfig };
 }
 
 // src/runtime/middleware.ts
@@ -39702,7 +39946,7 @@ var PORT = Number(process.env.PORT ?? 3e3);
 var HOSTNAME = process.env.HOSTNAME ?? "0.0.0.0";
 async function main() {
   const runtime = await loadRuntime(
-    deploymentRootOf(dirname2(fileURLToPath2(import.meta.url)))
+    deploymentRootOf(dirname2(fileURLToPath(import.meta.url)))
   );
   const { server, shutdown } = createRuntimeServer(runtime, {
     trustCloudFrontProto: process.env.CDK_NEXTJS_TRUST_CLOUDFRONT_PROTO === "1"

package/package.json

@@ -84,7 +84,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.7.10",
+  "version": "0.7.12",
   "jest": {
     "coverageProvider": "v8",
     "testPathIgnorePatterns": [

package/scripts/capture-adapter-fixture.mjs

@@ -173,6 +173,10 @@ const __captureAdapter = {
           trailingSlash: config.trailingSlash,
           assetPrefix: config.assetPrefix,
           i18n: config.i18n,
+          images: config.images,
+          experimental: config.experimental,
+          cacheHandler: config.cacheHandler,
+          cacheMaxMemorySize: config.cacheMaxMemorySize,
         },
       }),
     );
@@ -308,7 +312,15 @@ function trim(raw, { app, name }) {
     distDir: rewrite(raw.distDir),
     nextVersion: raw.nextVersion,
     buildId: raw.buildId,
-    config: raw.config,
+    // The adapter's `cacheHandler` and Next's `images.loaderFile` are absolute.
+    config: {
+      ...raw.config,
+      cacheHandler: rewrite(raw.config.cacheHandler),
+      images: raw.config.images && {
+        ...raw.config.images,
+        loaderFile: rewrite(raw.config.images.loaderFile),
+      },
+    },
   };
 }
 

package/scripts/zero-config-build.mjs

@@ -329,7 +329,11 @@ function check(appDir, adapterPath, { label, distDir, buildArgs, forbid }) {
   // `output: "standalone"`.
   const adapterDir = join(dist, "cdk-nextjs-adapter");
   const manifest = readJson(join(adapterDir, "manifest.json"));
-  assert(manifest.version === 1, `manifest version ${manifest.version}`);
+  const { version } = readJson(join(repoRoot, "package.json"));
+  assert(
+    manifest.cdkNextjsVersion === version,
+    `manifest stamped cdk-nextjs ${manifest.cdkNextjsVersion}, not ${version}`,
+  );
   for (const route of ["/", "/isr/[id]"]) {
     assert(
       manifest.entrypoints[route],