@opennextjs/aws 3.4.1 → 3.4.2

package/dist/adapters/cache.js

@@ -28,14 +28,14 @@ export default class Cache {
     async getFetchCache(key, softTags, tags) {
         debug("get fetch cache", { key, softTags, tags });
         try {
-            const { value, lastModified } = await globalThis.incrementalCache.get(key, true);
-            const _lastModified = await globalThis.tagCache.getLastModified(key, lastModified);
+            const cachedEntry = await globalThis.incrementalCache.get(key, true);
+            if (cachedEntry?.value === undefined)
+                return null;
+            const _lastModified = await globalThis.tagCache.getLastModified(key, cachedEntry?.lastModified);
             if (_lastModified === -1) {
                 // If some tags are stale we need to force revalidation
                 return null;
             }
-            if (value === undefined)
-                return null;
             // For cases where we don't have tags, we need to ensure that the soft tags are not being revalidated
             // We only need to check for the path as it should already contain all the tags
             if ((tags ?? []).length === 0) {
@@ -44,7 +44,7 @@ export default class Cache {
                     !tag.endsWith("layout") &&
                     !tag.endsWith("page"));
                 if (path) {
-                    const pathLastModified = await globalThis.tagCache.getLastModified(path.replace("_N_T_/", ""), lastModified);
+                    const pathLastModified = await globalThis.tagCache.getLastModified(path.replace("_N_T_/", ""), cachedEntry.lastModified);
                     if (pathLastModified === -1) {
                         // In case the path has been revalidated, we don't want to use the fetch cache
                         return null;
@@ -53,7 +53,7 @@ export default class Cache {
             }
             return {
                 lastModified: _lastModified,
-                value: value,
+                value: cachedEntry.value,
             };
         }
         catch (e) {
@@ -64,13 +64,17 @@ export default class Cache {
     }
     async getIncrementalCache(key) {
         try {
-            const { value: cacheData, lastModified } = await globalThis.incrementalCache.get(key, false);
-            const meta = cacheData?.meta;
-            const _lastModified = await globalThis.tagCache.getLastModified(key, lastModified);
+            const cachedEntry = await globalThis.incrementalCache.get(key, false);
+            if (!cachedEntry?.value) {
+                return null;
+            }
+            const meta = cachedEntry.value.meta;
+            const _lastModified = await globalThis.tagCache.getLastModified(key, cachedEntry?.lastModified);
             if (_lastModified === -1) {
                 // If some tags are stale we need to force revalidation
                 return null;
             }
+            const cacheData = cachedEntry?.value;
             const requestId = globalThis.__openNextAls.getStore()?.requestId ?? "";
             globalThis.lastModified[requestId] = _lastModified;
             if (cacheData?.type === "route") {

package/dist/build/createAssets.js

@@ -45,7 +45,7 @@ export function createCacheAssets(options) {
     logger.info("Bundling cache assets...");
     const { appBuildOutputPath, outputDir } = options;
     const packagePath = buildHelper.getPackagePath(options);
-    const buildId = buildHelper.getBuildId(appBuildOutputPath);
+    const buildId = buildHelper.getBuildId(options);
     let useTagCache = false;
     // Copy pages to cache folder
     const dotNextPath = path.join(appBuildOutputPath, ".next/standalone", packagePath);

package/dist/build/generateOutput.js

@@ -167,7 +167,7 @@ export async function generateOutput(options) {
         const patterns = "patterns" in value ? value.patterns : ["*"];
         patterns.forEach((pattern) => {
             behaviors.push({
-                pattern: prefixer(pattern.replace(/BUILD_ID/, getBuildId(appBuildOutputPath))),
+                pattern: prefixer(pattern.replace(/BUILD_ID/, getBuildId(options))),
                 origin: value.placement === "global" ? undefined : key,
                 edgeFunction: value.placement === "global"
                     ? key

package/dist/build/helper.d.ts

@@ -48,7 +48,7 @@ export declare function traverseFiles(root: string, conditionFn: (paths: Travers
  */
 export declare function removeFiles(root: string, conditionFn: (paths: TraversePath) => boolean): void;
 export declare function getHtmlPages(dotNextPath: string): Set<string>;
-export declare function getBuildId(dotNextPath: string): string;
+export declare function getBuildId(options: BuildOptions): string;
 export declare function getOpenNextVersion(): string;
 export declare function getNextVersion(appPath: string): string;
 /**

package/dist/build/helper.js

@@ -101,12 +101,15 @@ export function esbuildSync(esbuildOptions, options) {
 }
 export async function esbuildAsync(esbuildOptions, options) {
     const { openNextVersion, debug, minify } = options;
+    // Dump ESBuild build metadata to file in debug mode
+    const metafile = debug && esbuildOptions.outfile !== undefined;
     const result = await buildAsync({
         target: "esnext",
         format: "esm",
         platform: "node",
         bundle: true,
         minify,
+        metafile,
         mainFields: ["module", "main"],
         sourcemap: debug ? "inline" : false,
         sourcesContent: false,
@@ -129,6 +132,10 @@ export async function esbuildAsync(esbuildOptions, options) {
         result.errors.forEach((error) => logger.error(error));
         throw new Error(`There was a problem bundling ${esbuildOptions.entryPoints[0]}.`);
     }
+    if (result.metafile) {
+        const metaFile = `${esbuildOptions.outfile}.meta.json`;
+        fs.writeFileSync(metaFile, JSON.stringify(result.metafile, null, 2));
+    }
 }
 /**
  * Recursively traverse files in a directory and call `callbackFn` when `conditionFn` returns true
@@ -180,9 +187,9 @@ export function getHtmlPages(dotNextPath) {
         .map(([_, value]) => value.replace(/^pages\//, ""))
         .reduce((acc, page) => acc.add(page), new Set());
 }
-export function getBuildId(dotNextPath) {
+export function getBuildId(options) {
     return fs
-        .readFileSync(path.join(dotNextPath, ".next/BUILD_ID"), "utf-8")
+        .readFileSync(path.join(options.appBuildOutputPath, ".next/BUILD_ID"), "utf-8")
         .trim();
 }
 export function getOpenNextVersion() {

package/dist/core/routing/cacheInterceptor.js

@@ -120,7 +120,10 @@ export async function cacheInterceptor(event) {
         try {
             const cachedData = await globalThis.incrementalCache.get(localizedPath);
             debug("cached data in interceptor", cachedData);
-            if (cachedData.value?.type === "app") {
+            if (!cachedData?.value) {
+                return event;
+            }
+            if (cachedData?.value?.type === "app") {
                 // We need to check the tag cache now
                 const _lastModified = await globalThis.tagCache.getLastModified(localizedPath, cachedData.lastModified);
                 if (_lastModified === -1) {
@@ -129,7 +132,7 @@ export async function cacheInterceptor(event) {
                 }
             }
             const host = event.headers.host;
-            switch (cachedData.value?.type) {
+            switch (cachedData?.value?.type) {
                 case "app":
                 case "page":
                     return generateResult(event, localizedPath, cachedData.value, cachedData.lastModified);

package/dist/core/routing/matcher.js

@@ -166,8 +166,9 @@ export function handleRewrites(event, rewrites) {
     };
 }
 function handleTrailingSlashRedirect(event) {
-    const url = new URL(event.url, "http://localhost");
-    const emptyBody = emptyReadableStream();
+    // When rawPath is `//domain`, `url.host` would be `domain`.
+    // https://github.com/opennextjs/opennextjs-aws/issues/355
+    const url = new URL(event.rawPath, "http://localhost");
     if (
     // Someone is trying to redirect to a different origin, let's not do that
     url.host !== "localhost" ||
@@ -176,6 +177,7 @@ function handleTrailingSlashRedirect(event) {
         event.rawPath.startsWith("/api/")) {
         return false;
     }
+    const emptyBody = emptyReadableStream();
     if (NextConfig.trailingSlash &&
         !event.headers["x-nextjs-data"] &&
         !event.rawPath.endsWith("/") &&

package/dist/overrides/incrementalCache/multi-tier-ddb-s3.js

@@ -77,7 +77,7 @@ const multiTierCache = {
             }
         }
         const result = await S3Cache.get(key, isFetch);
-        if (result.value) {
+        if (result?.value) {
             localCache.set(key, {
                 value: result.value,
                 lastModified: result.lastModified ?? Date.now(),

package/dist/overrides/proxyExternalRequest/fetch.js

@@ -3,7 +3,8 @@ const fetchProxy = {
     name: "fetch-proxy",
     // @ts-ignore
     proxy: async (internalEvent) => {
-        const { url, headers, method, body } = internalEvent;
+        const { url, headers: eventHeaders, method, body } = internalEvent;
+        const headers = Object.fromEntries(Object.entries(eventHeaders).filter(([key]) => key.toLowerCase() !== "cf-connecting-ip"));
         const response = await fetch(url, {
             method,
             headers,

package/dist/overrides/wrappers/cloudflare-node.js

@@ -26,6 +26,11 @@ const handler = async (handler, converter) => async (request, env, ctx) => {
             for (const cookie of cookies) {
                 responseHeaders.append("Set-Cookie", cookie);
             }
+            // TODO(vicb): this is a workaround to make PPR work with `wrangler dev`
+            // See https://github.com/cloudflare/workers-sdk/issues/8004
+            if (url.hostname === "localhost") {
+                responseHeaders.set("Content-Encoding", "identity");
+            }
             const { readable, writable } = new TransformStream({
                 transform(chunk, controller) {
                     controller.enqueue(Uint8Array.from(chunk.chunk ?? chunk));

package/dist/types/overrides.d.ts

@@ -41,7 +41,7 @@ export type CacheValue<IsFetch extends boolean> = (IsFetch extends true ? FetchC
     revalidate?: number | false;
 };
 export type IncrementalCache = {
-    get<IsFetch extends boolean = false>(key: string, isFetch?: IsFetch): Promise<WithLastModified<CacheValue<IsFetch>>>;
+    get<IsFetch extends boolean = false>(key: string, isFetch?: IsFetch): Promise<WithLastModified<CacheValue<IsFetch>> | null>;
     set<IsFetch extends boolean = false>(key: string, value: CacheValue<IsFetch>, isFetch?: IsFetch): Promise<void>;
     delete(key: string): Promise<void>;
     name: string;

package/package.json

@@ -3,7 +3,7 @@
     "access": "public"
   },
   "name": "@opennextjs/aws",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "bin": {
     "open-next": "./dist/index.js"
   },