next 13.4.13-canary.8 → 13.4.13

package/dist/esm/client/route-loader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/client/route-loader.ts"],"names":["getAssetPathFromRoute","__unsafeCreateTrustedScriptURL","requestIdleCallback","MS_MAX_IDLE_DELAY","withFuture","key","map","generator","entry","get","future","Promise","resolve","resolver","prom","set","then","value","catch","err","delete","ASSET_LOAD_ERROR","Symbol","markAssetError","Object","defineProperty","isAssetError","hasPrefetch","link","document","createElement","window","MSInputMethodContext","documentMode","relList","supports","canPrefetch","getAssetQueryString","process","env","NEXT_DEPLOYMENT_ID","prefetchViaDom","href","as","reject","selector","querySelector","rel","crossOrigin","__NEXT_CROSS_ORIGIN","onload","onerror","Error","head","appendChild","appendScript","src","script","body","devBuildPromise","resolvePromiseWithTimeout","p","ms","cancelled","r","NODE_ENV","setTimeout","getClientBuildManifest","self","__BUILD_MANIFEST","onBuildManifest","cb","__BUILD_MANIFEST_CB","getFilesForRoute","assetPrefix","route","scriptUrl","encodeURI","scripts","css","manifest","allFiles","filter","v","endsWith","createRouteLoader","entrypoints","Map","loadedScripts","styleSheets","routes","maybeExecuteScript","toString","fetchStyleSheet","fetch","res","ok","text","content","whenEntrypoint","onEntrypoint","execute","exports","component","default","error","undefined","input","old","loadRoute","prefetch","devBuildPromiseResolve","all","has","entrypoint","styles","assign","finally","cn","navigator","connection","saveData","test","effectiveType","output"],"mappings":"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"}
+{"version":3,"sources":["../../src/client/route-loader.ts"],"names":["getAssetPathFromRoute","__unsafeCreateTrustedScriptURL","requestIdleCallback","MS_MAX_IDLE_DELAY","withFuture","key","map","generator","entry","get","future","Promise","resolve","resolver","prom","set","then","value","catch","err","delete","ASSET_LOAD_ERROR","Symbol","markAssetError","Object","defineProperty","isAssetError","hasPrefetch","link","document","createElement","window","MSInputMethodContext","documentMode","relList","supports","canPrefetch","getAssetQueryString","process","env","NEXT_DEPLOYMENT_ID","prefetchViaDom","href","as","reject","selector","querySelector","rel","crossOrigin","__NEXT_CROSS_ORIGIN","onload","onerror","Error","head","appendChild","appendScript","src","script","body","devBuildPromise","resolvePromiseWithTimeout","p","ms","cancelled","r","NODE_ENV","setTimeout","getClientBuildManifest","self","__BUILD_MANIFEST","onBuildManifest","cb","__BUILD_MANIFEST_CB","getFilesForRoute","assetPrefix","route","scriptUrl","encodeURI","scripts","css","manifest","allFiles","filter","v","endsWith","createRouteLoader","entrypoints","Map","loadedScripts","styleSheets","routes","maybeExecuteScript","toString","fetchStyleSheet","fetch","res","ok","text","content","whenEntrypoint","onEntrypoint","execute","exports","component","default","error","undefined","input","old","loadRoute","prefetch","devBuildPromiseResolve","all","has","entrypoint","styles","assign","finally","cn","navigator","connection","saveData","test","effectiveType","output"],"mappings":"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"}

package/dist/esm/client/webpack.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const addChunkSuffix = (getOriginalChunk)=>(chunkId)=>{
         return getOriginalChunk(chunkId) + ("" + (process.env.NEXT_DEPLOYMENT_ID ? "?dpl=" + process.env.NEXT_DEPLOYMENT_ID : ""));
     };

package/dist/esm/client/webpack.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/client/webpack.ts"],"names":["addChunkSuffix","getOriginalChunk","chunkId","process","env","NEXT_DEPLOYMENT_ID","getChunkScriptFilename","__webpack_require__","u","getChunkCssFilename","k","getMiniCssFilename","miniCssF","self","__next_require__","__next_set_public_path__","path","__webpack_public_path__"],"mappings":"AAGA,MAAMA,iBACJ,CAACC,mBAA+C,CAACC,UAAiB;QAChE,OACED,iBAAiBC,WACjB,CAAA,AAAC,KACCC,CAAAA,QAAQC,GAAG,CAACC,kBAAkB,GAC1B,AAAC,UAAOF,QAAQC,GAAG,CAACC,kBAAkB,GACtC,EAAE,AAAD,CACN;IAEL;AAEF,6DAA6D;AAC7D,MAAMC,yBAAyBC,oBAAoBC,CAAC;AACpD,oCAAoC;AACpCD,oBAAoBC,CAAC,GAAGR,eAAeM;AAEvC,oCAAoC;AACpC,MAAMG,sBAAsBF,oBAAoBG,CAAC;AACjD,oCAAoC;AACpCH,oBAAoBG,CAAC,GAAGV,eAAeS;AAEvC,oCAAoC;AACpC,MAAME,qBAAqBJ,oBAAoBK,QAAQ;AACvD,oCAAoC;AACpCL,oBAAoBK,QAAQ,GAAGZ,eAAeW;AAI5CE,KAAaC,gBAAgB,GAAGP;AAChCM,KAAaE,wBAAwB,GAAG,CAACC,OAAiB;IAC1D,6DAA6D;IAC7DC,0BAA0BD;AAC5B;AApCA,WAsCS"}
+{"version":3,"sources":["../../src/client/webpack.ts"],"names":["addChunkSuffix","getOriginalChunk","chunkId","process","env","NEXT_DEPLOYMENT_ID","getChunkScriptFilename","__webpack_require__","u","getChunkCssFilename","k","getMiniCssFilename","miniCssF","self","__next_require__","__next_set_public_path__","path","__webpack_public_path__"],"mappings":"AAAA,6DAA6D;AAK7D,MAAMA,iBACJ,CAACC,mBAA+C,CAACC,UAAiB;QAChE,OACED,iBAAiBC,WACjB,CAAA,AAAC,KACCC,CAAAA,QAAQC,GAAG,CAACC,kBAAkB,GAC1B,AAAC,UAAOF,QAAQC,GAAG,CAACC,kBAAkB,GACtC,EAAE,AAAD,CACN;IAEL;AAEF,6DAA6D;AAC7D,MAAMC,yBAAyBC,oBAAoBC,CAAC;AACpD,oCAAoC;AACpCD,oBAAoBC,CAAC,GAAGR,eAAeM;AAEvC,oCAAoC;AACpC,MAAMG,sBAAsBF,oBAAoBG,CAAC;AACjD,oCAAoC;AACpCH,oBAAoBG,CAAC,GAAGV,eAAeS;AAEvC,oCAAoC;AACpC,MAAME,qBAAqBJ,oBAAoBK,QAAQ;AACvD,oCAAoC;AACpCL,oBAAoBK,QAAQ,GAAGZ,eAAeW;AAI5CE,KAAaC,gBAAgB,GAAGP;AAChCM,KAAaE,wBAAwB,GAAG,CAACC,OAAiB;IAC1D,6DAA6D;IAC7DC,0BAA0BD;AAC5B;AArCA,WAuCS"}

package/dist/esm/lib/format-server-error.js

@@ -8,7 +8,9 @@ const invalidServerComponentReactHooks = [
     "useRef",
     "useState",
     "useSyncExternalStore",
-    "useTransition"
+    "useTransition",
+    "experimental_useOptimistic",
+    "useOptimistic"
 ];
 function setMessage(error, message) {
     error.message = message;
@@ -34,7 +36,8 @@ ${addedMessage}`);
         return;
     }
     for (const clientHook of invalidServerComponentReactHooks){
-        if (error.message.includes(`${clientHook} is not a function`)) {
+        const regex = new RegExp(`\\b${clientHook}\\b.*is not a function`);
+        if (regex.test(error.message)) {
             setMessage(error, `${clientHook} only works in Client Components. Add the "use client" directive at the top of the file to use it. Read more: https://nextjs.org/docs/messages/react-client-hook-in-server-component`);
             return;
         }

package/dist/esm/lib/format-server-error.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/format-server-error.ts"],"names":["invalidServerComponentReactHooks","setMessage","error","message","stack","lines","split","join","formatServerError","includes","addedMessage","clientHook"],"mappings":"AAAA,MAAMA,mCAAmC;IACvC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;CACD;AAED,SAASC,WAAWC,KAAY,EAAEC,OAAe,EAAQ;IACvDD,MAAMC,OAAO,GAAGA;IAChB,IAAID,MAAME,KAAK,EAAE;QACf,MAAMC,QAAQH,MAAME,KAAK,CAACE,KAAK,CAAC;QAChCD,KAAK,CAAC,EAAE,GAAGF;QACXD,MAAME,KAAK,GAAGC,MAAME,IAAI,CAAC;IAC3B,CAAC;AACH;AAEA,OAAO,SAASC,kBAAkBN,KAAY,EAAQ;IACpD,IAAI,OAAOA,CAAAA,gBAAAA,KAAAA,IAAAA,MAAOC,OAAO,AAAD,MAAM,UAAU;IAExC,IACED,MAAMC,OAAO,CAACM,QAAQ,CACpB,+DAEF;QACA,MAAMC,eACJ;QAEF,qEAAqE;QACrE,IAAIR,MAAMC,OAAO,CAACM,QAAQ,CAACC,eAAe;QAE1CT,WACEC,OACA,CAAC,EAAEA,MAAMC,OAAO,CAAC;;AAEvB,EAAEO,aAAa,CAAC;QAEZ;IACF,CAAC;IAED,IAAIR,MAAMC,OAAO,CAACM,QAAQ,CAAC,oCAAoC;QAC7DR,WACEC,OACA;QAEF;IACF,CAAC;IAED,KAAK,MAAMS,cAAcX,iCAAkC;QACzD,IAAIE,MAAMC,OAAO,CAACM,QAAQ,CAAC,CAAC,EAAEE,WAAW,kBAAkB,CAAC,GAAG;YAC7DV,WACEC,OACA,CAAC,EAAES,WAAW,oLAAoL,CAAC;YAErM;QACF,CAAC;IACH;AACF,CAAC"}
+{"version":3,"sources":["../../src/lib/format-server-error.ts"],"names":["invalidServerComponentReactHooks","setMessage","error","message","stack","lines","split","join","formatServerError","includes","addedMessage","clientHook","regex","RegExp","test"],"mappings":"AAAA,MAAMA,mCAAmC;IACvC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;CACD;AAED,SAASC,WAAWC,KAAY,EAAEC,OAAe,EAAQ;IACvDD,MAAMC,OAAO,GAAGA;IAChB,IAAID,MAAME,KAAK,EAAE;QACf,MAAMC,QAAQH,MAAME,KAAK,CAACE,KAAK,CAAC;QAChCD,KAAK,CAAC,EAAE,GAAGF;QACXD,MAAME,KAAK,GAAGC,MAAME,IAAI,CAAC;IAC3B,CAAC;AACH;AAEA,OAAO,SAASC,kBAAkBN,KAAY,EAAQ;IACpD,IAAI,OAAOA,CAAAA,gBAAAA,KAAAA,IAAAA,MAAOC,OAAO,AAAD,MAAM,UAAU;IAExC,IACED,MAAMC,OAAO,CAACM,QAAQ,CACpB,+DAEF;QACA,MAAMC,eACJ;QAEF,qEAAqE;QACrE,IAAIR,MAAMC,OAAO,CAACM,QAAQ,CAACC,eAAe;QAE1CT,WACEC,OACA,CAAC,EAAEA,MAAMC,OAAO,CAAC;;AAEvB,EAAEO,aAAa,CAAC;QAEZ;IACF,CAAC;IAED,IAAIR,MAAMC,OAAO,CAACM,QAAQ,CAAC,oCAAoC;QAC7DR,WACEC,OACA;QAEF;IACF,CAAC;IAED,KAAK,MAAMS,cAAcX,iCAAkC;QACzD,MAAMY,QAAQ,IAAIC,OAAO,CAAC,GAAG,EAAEF,WAAW,sBAAsB,CAAC;QACjE,IAAIC,MAAME,IAAI,CAACZ,MAAMC,OAAO,GAAG;YAC7BF,WACEC,OACA,CAAC,EAAES,WAAW,oLAAoL,CAAC;YAErM;QACF,CAAC;IACH;AACF,CAAC"}

package/dist/esm/lib/metadata/metadata.js

@@ -6,67 +6,96 @@ import { IconsMetadata } from "./generate/icons";
 import { accumulateMetadata, resolveMetadata } from "./resolve-metadata";
 import { MetaFilter } from "./generate/meta";
 import { createDefaultMetadata } from "./default-metadata";
-// Generate the actual React elements from the resolved metadata.
-export async function MetadataTree({ tree , pathname , searchParams , getDynamicParamFromSegment , appUsingSizeAdjust , errorType  }) {
+// Use a promise to share the status of the metadata resolving,
+// returning two components `MetadataTree` and `MetadataOutlet`
+// `MetadataTree` is the one that will be rendered at first in the content sequence for metadata tags.
+// `MetadataOutlet` is the one that will be rendered under error boundaries for metadata resolving errors.
+// In this way we can let the metadata tags always render successfully,
+// and the error will be caught by the error boundary and trigger fallbacks.
+export function createMetadataComponents({ tree , pathname , searchParams , getDynamicParamFromSegment , appUsingSizeAdjust , errorType  }) {
     const metadataContext = {
         pathname
     };
-    const resolvedMetadata = await resolveMetadata({
-        tree,
-        parentParams: {},
-        metadataItems: [],
-        searchParams,
-        getDynamicParamFromSegment,
-        errorConvention: errorType === "redirect" ? undefined : errorType
+    let resolve;
+    // Only use promise.resolve here to avoid unhandled rejections
+    const metadataErrorResolving = new Promise((res)=>{
+        resolve = res;
     });
-    let metadata = undefined;
-    const defaultMetadata = createDefaultMetadata();
-    // Skip for redirect case as for the temporary redirect case we don't need the metadata on client
-    if (errorType === "redirect") {
-        metadata = defaultMetadata;
-    } else {
-        metadata = await accumulateMetadata(resolvedMetadata, metadataContext);
+    async function MetadataTree() {
+        const defaultMetadata = createDefaultMetadata();
+        let metadata = defaultMetadata;
+        try {
+            const resolvedMetadata = await resolveMetadata({
+                tree,
+                parentParams: {},
+                metadataItems: [],
+                searchParams,
+                getDynamicParamFromSegment,
+                errorConvention: errorType === "redirect" ? undefined : errorType
+            });
+            // Skip for redirect case as for the temporary redirect case we don't need the metadata on client
+            if (errorType === "redirect") {
+                metadata = defaultMetadata;
+            } else {
+                metadata = await accumulateMetadata(resolvedMetadata, metadataContext);
+            }
+            resolve(undefined);
+        } catch (error) {
+            resolve(error);
+        }
+        const elements = MetaFilter([
+            BasicMetadata({
+                metadata
+            }),
+            AlternatesMetadata({
+                alternates: metadata.alternates
+            }),
+            ItunesMeta({
+                itunes: metadata.itunes
+            }),
+            FormatDetectionMeta({
+                formatDetection: metadata.formatDetection
+            }),
+            VerificationMeta({
+                verification: metadata.verification
+            }),
+            AppleWebAppMeta({
+                appleWebApp: metadata.appleWebApp
+            }),
+            OpenGraphMetadata({
+                openGraph: metadata.openGraph
+            }),
+            TwitterMetadata({
+                twitter: metadata.twitter
+            }),
+            AppLinksMeta({
+                appLinks: metadata.appLinks
+            }),
+            IconsMetadata({
+                icons: metadata.icons
+            })
+        ]);
+        if (appUsingSizeAdjust) elements.push(/*#__PURE__*/ React.createElement("meta", {
+            name: "next-size-adjust"
+        }));
+        return /*#__PURE__*/ React.createElement(React.Fragment, null, elements.map((el, index)=>{
+            return /*#__PURE__*/ React.cloneElement(el, {
+                key: index
+            });
+        }));
     }
-    const elements = MetaFilter([
-        BasicMetadata({
-            metadata
-        }),
-        AlternatesMetadata({
-            alternates: metadata.alternates
-        }),
-        ItunesMeta({
-            itunes: metadata.itunes
-        }),
-        FormatDetectionMeta({
-            formatDetection: metadata.formatDetection
-        }),
-        VerificationMeta({
-            verification: metadata.verification
-        }),
-        AppleWebAppMeta({
-            appleWebApp: metadata.appleWebApp
-        }),
-        OpenGraphMetadata({
-            openGraph: metadata.openGraph
-        }),
-        TwitterMetadata({
-            twitter: metadata.twitter
-        }),
-        AppLinksMeta({
-            appLinks: metadata.appLinks
-        }),
-        IconsMetadata({
-            icons: metadata.icons
-        })
-    ]);
-    if (appUsingSizeAdjust) elements.push(/*#__PURE__*/ React.createElement("meta", {
-        name: "next-size-adjust"
-    }));
-    return /*#__PURE__*/ React.createElement(React.Fragment, null, elements.map((el, index)=>{
-        return /*#__PURE__*/ React.cloneElement(el, {
-            key: index
-        });
-    }));
+    async function MetadataOutlet() {
+        const error = await metadataErrorResolving;
+        if (error) {
+            throw error;
+        }
+        return null;
+    }
+    // @ts-expect-error async server components
+    return [
+        MetadataTree,
+        MetadataOutlet
+    ];
 }
 
 //# sourceMappingURL=metadata.js.map

package/dist/esm/lib/metadata/metadata.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/metadata/metadata.tsx"],"names":["React","AppleWebAppMeta","FormatDetectionMeta","ItunesMeta","BasicMetadata","VerificationMeta","AlternatesMetadata","OpenGraphMetadata","TwitterMetadata","AppLinksMeta","IconsMetadata","accumulateMetadata","resolveMetadata","MetaFilter","createDefaultMetadata","MetadataTree","tree","pathname","searchParams","getDynamicParamFromSegment","appUsingSizeAdjust","errorType","metadataContext","resolvedMetadata","parentParams","metadataItems","errorConvention","undefined","metadata","defaultMetadata","elements","alternates","itunes","formatDetection","verification","appleWebApp","openGraph","twitter","appLinks","icons","push","meta","name","map","el","index","cloneElement","key"],"mappings":"AAGA,OAAOA,WAAW,QAAO;AACzB,SACEC,eAAe,EACfC,mBAAmB,EACnBC,UAAU,EACVC,aAAa,EACbC,gBAAgB,QACX,mBAAkB;AACzB,SAASC,kBAAkB,QAAQ,uBAAsB;AACzD,SACEC,iBAAiB,EACjBC,eAAe,EACfC,YAAY,QACP,uBAAsB;AAC7B,SAASC,aAAa,QAAQ,mBAAkB;AAChD,SAASC,kBAAkB,EAAEC,eAAe,QAAQ,qBAAoB;AACxE,SAASC,UAAU,QAAQ,kBAAiB;AAE5C,SAASC,qBAAqB,QAAQ,qBAAoB;AAE1D,iEAAiE;AACjE,OAAO,eAAeC,aAAa,EACjCC,KAAI,EACJC,SAAQ,EACRC,aAAY,EACZC,2BAA0B,EAC1BC,mBAAkB,EAClBC,UAAS,EAQV,EAAE;IACD,MAAMC,kBAAkB;QACtBL;IACF;IAEA,MAAMM,mBAAmB,MAAMX,gBAAgB;QAC7CI;QACAQ,cAAc,CAAC;QACfC,eAAe,EAAE;QACjBP;QACAC;QACAO,iBAAiBL,cAAc,aAAaM,YAAYN,SAAS;IACnE;IACA,IAAIO,WAAyCD;IAE7C,MAAME,kBAAkBf;IACxB,iGAAiG;IACjG,IAAIO,cAAc,YAAY;QAC5BO,WAAWC;IACb,OAAO;QACLD,WAAW,MAAMjB,mBAAmBY,kBAAkBD;IACxD,CAAC;IAED,MAAMQ,WAAWjB,WAAW;QAC1BT,cAAc;YAAEwB;QAAS;QACzBtB,mBAAmB;YAAEyB,YAAYH,SAASG,UAAU;QAAC;QACrD5B,WAAW;YAAE6B,QAAQJ,SAASI,MAAM;QAAC;QACrC9B,oBAAoB;YAAE+B,iBAAiBL,SAASK,eAAe;QAAC;QAChE5B,iBAAiB;YAAE6B,cAAcN,SAASM,YAAY;QAAC;QACvDjC,gBAAgB;YAAEkC,aAAaP,SAASO,WAAW;QAAC;QACpD5B,kBAAkB;YAAE6B,WAAWR,SAASQ,SAAS;QAAC;QAClD5B,gBAAgB;YAAE6B,SAAST,SAASS,OAAO;QAAC;QAC5C5B,aAAa;YAAE6B,UAAUV,SAASU,QAAQ;QAAC;QAC3C5B,cAAc;YAAE6B,OAAOX,SAASW,KAAK;QAAC;KACvC;IAED,IAAInB,oBAAoBU,SAASU,IAAI,eAAC,oBAACC;QAAKC,MAAK;;IAEjD,qBACE,0CACGZ,SAASa,GAAG,CAAC,CAACC,IAAIC,QAAU;QAC3B,qBAAO7C,MAAM8C,YAAY,CAACF,IAA0B;YAAEG,KAAKF;QAAM;IACnE;AAGN,CAAC"}
+{"version":3,"sources":["../../../src/lib/metadata/metadata.tsx"],"names":["React","AppleWebAppMeta","FormatDetectionMeta","ItunesMeta","BasicMetadata","VerificationMeta","AlternatesMetadata","OpenGraphMetadata","TwitterMetadata","AppLinksMeta","IconsMetadata","accumulateMetadata","resolveMetadata","MetaFilter","createDefaultMetadata","createMetadataComponents","tree","pathname","searchParams","getDynamicParamFromSegment","appUsingSizeAdjust","errorType","metadataContext","resolve","metadataErrorResolving","Promise","res","MetadataTree","defaultMetadata","metadata","resolvedMetadata","parentParams","metadataItems","errorConvention","undefined","error","elements","alternates","itunes","formatDetection","verification","appleWebApp","openGraph","twitter","appLinks","icons","push","meta","name","map","el","index","cloneElement","key","MetadataOutlet"],"mappings":"AAGA,OAAOA,WAAW,QAAO;AACzB,SACEC,eAAe,EACfC,mBAAmB,EACnBC,UAAU,EACVC,aAAa,EACbC,gBAAgB,QACX,mBAAkB;AACzB,SAASC,kBAAkB,QAAQ,uBAAsB;AACzD,SACEC,iBAAiB,EACjBC,eAAe,EACfC,YAAY,QACP,uBAAsB;AAC7B,SAASC,aAAa,QAAQ,mBAAkB;AAChD,SAASC,kBAAkB,EAAEC,eAAe,QAAQ,qBAAoB;AACxE,SAASC,UAAU,QAAQ,kBAAiB;AAE5C,SAASC,qBAAqB,QAAQ,qBAAoB;AAE1D,+DAA+D;AAC/D,+DAA+D;AAC/D,sGAAsG;AACtG,0GAA0G;AAC1G,uEAAuE;AACvE,4EAA4E;AAC5E,OAAO,SAASC,yBAAyB,EACvCC,KAAI,EACJC,SAAQ,EACRC,aAAY,EACZC,2BAA0B,EAC1BC,mBAAkB,EAClBC,UAAS,EAQV,EAA8C;IAC7C,MAAMC,kBAAkB;QACtBL;IACF;IAEA,IAAIM;IACJ,8DAA8D;IAC9D,MAAMC,yBAAyB,IAAIC,QAA2B,CAACC,MAAQ;QACrEH,UAAUG;IACZ;IAEA,eAAeC,eAAe;QAC5B,MAAMC,kBAAkBd;QACxB,IAAIe,WAAyCD;QAC7C,IAAI;YACF,MAAME,mBAAmB,MAAMlB,gBAAgB;gBAC7CI;gBACAe,cAAc,CAAC;gBACfC,eAAe,EAAE;gBACjBd;gBACAC;gBACAc,iBAAiBZ,cAAc,aAAaa,YAAYb,SAAS;YACnE;YAEA,iGAAiG;YACjG,IAAIA,cAAc,YAAY;gBAC5BQ,WAAWD;YACb,OAAO;gBACLC,WAAW,MAAMlB,mBAAmBmB,kBAAkBR;YACxD,CAAC;YACDC,QAAQW;QACV,EAAE,OAAOC,OAAY;YACnBZ,QAAQY;QACV;QAEA,MAAMC,WAAWvB,WAAW;YAC1BT,cAAc;gBAAEyB;YAAS;YACzBvB,mBAAmB;gBAAE+B,YAAYR,SAASQ,UAAU;YAAC;YACrDlC,WAAW;gBAAEmC,QAAQT,SAASS,MAAM;YAAC;YACrCpC,oBAAoB;gBAAEqC,iBAAiBV,SAASU,eAAe;YAAC;YAChElC,iBAAiB;gBAAEmC,cAAcX,SAASW,YAAY;YAAC;YACvDvC,gBAAgB;gBAAEwC,aAAaZ,SAASY,WAAW;YAAC;YACpDlC,kBAAkB;gBAAEmC,WAAWb,SAASa,SAAS;YAAC;YAClDlC,gBAAgB;gBAAEmC,SAASd,SAASc,OAAO;YAAC;YAC5ClC,aAAa;gBAAEmC,UAAUf,SAASe,QAAQ;YAAC;YAC3ClC,cAAc;gBAAEmC,OAAOhB,SAASgB,KAAK;YAAC;SACvC;QAED,IAAIzB,oBAAoBgB,SAASU,IAAI,eAAC,oBAACC;YAAKC,MAAK;;QAEjD,qBACE,0CACGZ,SAASa,GAAG,CAAC,CAACC,IAAIC,QAAU;YAC3B,qBAAOnD,MAAMoD,YAAY,CAACF,IAA0B;gBAAEG,KAAKF;YAAM;QACnE;IAGN;IAEA,eAAeG,iBAAiB;QAC9B,MAAMnB,QAAQ,MAAMX;QACpB,IAAIW,OAAO;YACT,MAAMA,MAAK;QACb,CAAC;QACD,OAAO,IAAI;IACb;IAEA,2CAA2C;IAC3C,OAAO;QAACR;QAAc2B;KAAe;AACvC,CAAC"}

package/dist/esm/lib/metadata/types/metadata-interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/metadata/types/metadata-interface.ts"],"names":[],"mappings":"AAAA,WAyjBuE"}
+{"version":3,"sources":["../../../../src/lib/metadata/types/metadata-interface.ts"],"names":[],"mappings":"AAAA,WA0jBuE"}

package/dist/esm/server/app-render/app-render.js

@@ -6,7 +6,7 @@ import { renderToInitialStream, createBufferedTransformStream, continueFromIniti
 import { canSegmentBeOverridden, matchSegment } from "../../client/components/match-segments";
 import { stripInternalQueries } from "../internal-utils";
 import { NEXT_ROUTER_PREFETCH, NEXT_ROUTER_STATE_TREE, RSC } from "../../client/components/app-router-headers";
-import { MetadataTree } from "../../lib/metadata/metadata";
+import { createMetadataComponents } from "../../lib/metadata/metadata";
 import { RequestAsyncStorageWrapper } from "../async-storage/request-async-storage-wrapper";
 import { StaticGenerationAsyncStorageWrapper } from "../async-storage/static-generation-async-storage-wrapper";
 import { isClientReference } from "../../lib/client-reference";
@@ -48,17 +48,17 @@ function createNotFoundLoaderTree(loaderTree) {
     ];
 }
 // Find the closest matched component in the loader tree for a given component type
-function findMatchedComponent(loaderTree, componentType, depth, result) {
-    const [, parallelRoutes, components] = loaderTree;
+function findMatchedComponent(loaderTree, componentType, result) {
+    const [segment, parallelRoutes, components] = loaderTree;
     const childKeys = Object.keys(parallelRoutes);
     result = components[componentType] || result;
     // reached the end of the tree
-    if (depth <= 0 || childKeys.length === 0) {
+    if (segment === "__DEFAULT__" || segment === "__PAGE__") {
         return result;
     }
     for (const key of childKeys){
         const childTree = parallelRoutes[key];
-        const matchedComponent = findMatchedComponent(childTree, componentType, depth - 1, result);
+        const matchedComponent = findMatchedComponent(childTree, componentType, result);
         if (matchedComponent) {
             return matchedComponent;
         }
@@ -105,6 +105,11 @@ function hasLoadingComponentInTree(tree) {
 export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts) {
     const isFlight = req.headers[RSC.toLowerCase()] !== undefined;
     const pathname = validateURL(req.url);
+    // A unique request timestamp used by development to ensure that it's
+    // consistent and won't change during this request. This is important to
+    // avoid that resources can be deduped by React Float if the same resource is
+    // rendered or preloaded multiple times: `<link href="a.css?v={Date.now()}"/>`.
+    const DEV_REQUEST_TS = Date.now();
     const { buildManifest , subresourceIntegrityManifest , serverActionsManifest , ComponentMod , dev , nextFontManifest , supportsDynamicHTML , nextConfigOutput , serverActionsBodySizeLimit  } = renderOpts;
     const appUsingSizeAdjust = !!(nextFontManifest == null ? void 0 : nextFontManifest.appUsingSizeAdjust);
     const clientReferenceManifest = renderOpts.clientReferenceManifest;
@@ -259,7 +264,7 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
             const isDev = process.env.NODE_ENV === "development";
             let qs = "";
             if (isDev && addTimestamp) {
-                qs += `?v=${Date.now()}`;
+                qs += `?v=${DEV_REQUEST_TS}`;
             }
             if (renderOpts.deploymentId) {
                 qs += `${isDev ? "&" : "?"}dpl=${renderOpts.deploymentId}`;
@@ -364,7 +369,7 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
         };
         /**
      * Use the provided loader tree to create the React Component tree.
-     */ const createComponentTree = async ({ createSegmentPath , loaderTree: tree , parentParams , firstItem , rootLayoutIncluded , injectedCSS , injectedFontPreloadTags , asNotFound  })=>{
+     */ const createComponentTree = async ({ createSegmentPath , loaderTree: tree , parentParams , firstItem , rootLayoutIncluded , injectedCSS , injectedFontPreloadTags , asNotFound , metadataOutlet  })=>{
             const { page , layoutOrPagePath , segment , components , parallelRoutes  } = parseLoaderTree(tree);
             const { layout , template , error , loading , "not-found": notFound  } = components;
             const injectedCSSWithCurrentLayout = new Set(injectedCSS);
@@ -405,7 +410,9 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
                 filePath: notFound[1],
                 getComponent: notFound[0],
                 injectedCSS: injectedCSSWithCurrentLayout
-            }) : [];
+            }) : [
+                rootLayoutIncluded ? undefined : DefaultNotFound
+            ];
             let dynamic = layoutOrPageMod == null ? void 0 : layoutOrPageMod.dynamic;
             if (nextConfigOutput === "export") {
                 if (!dynamic || dynamic === "auto") {
@@ -538,7 +545,8 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
                     rootLayoutIncluded: rootLayoutIncludedAtThisLevelOrAbove,
                     injectedCSS: injectedCSSWithCurrentLayout,
                     injectedFontPreloadTags: injectedFontPreloadTagsWithCurrentLayout,
-                    asNotFound
+                    asNotFound,
+                    metadataOutlet
                 });
                 const childProp = {
                     current: /*#__PURE__*/ React.createElement(ChildComponent, null),
@@ -585,7 +593,7 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
             if (NotFound && asNotFound && // In development, it could hit the parallel-route-default not found, so we only need to check the segment.
             // Or if there's no parallel routes means it reaches the end.
             (segment === "__DEFAULT__" && !parallelRouteMap.length || // For production build the original pathname is /_not-found, always render not-found component.
-            renderOpts.originalPathname === "/_not-found")) {
+            !renderOpts.dev && renderOpts.originalPathname === "/_not-found")) {
                 notFoundComponent = {
                     children: /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement("meta", {
                         name: "robots",
@@ -619,7 +627,7 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
             }
             return {
                 Component: ()=>{
-                    return /*#__PURE__*/ React.createElement(React.Fragment, null, isPage && isClientComponent && isStaticGeneration ? /*#__PURE__*/ React.createElement(StaticGenerationSearchParamsBailoutProvider, {
+                    return /*#__PURE__*/ React.createElement(React.Fragment, null, isPage ? metadataOutlet : null, isPage && isClientComponent && isStaticGeneration ? /*#__PURE__*/ React.createElement(StaticGenerationSearchParamsBailoutProvider, {
                         propsForComponent: props,
                         Component: Component
                     }) : /*#__PURE__*/ React.createElement(Component, props), null);
@@ -632,7 +640,7 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
             /**
        * Use router state to decide at what common layout to render the page.
        * This can either be the common layout between two pages or a specific place to start rendering from using the "refetch" marker in the tree.
-       */ const walkTreeWithFlightRouterState = async ({ createSegmentPath , loaderTreeToFilter , parentParams , isFirst , flightRouterState , parentRendered , rscPayloadHead , injectedCSS , injectedFontPreloadTags , rootLayoutIncluded , asNotFound  })=>{
+       */ const walkTreeWithFlightRouterState = async ({ createSegmentPath , loaderTreeToFilter , parentParams , isFirst , flightRouterState , parentRendered , rscPayloadHead , injectedCSS , injectedFontPreloadTags , rootLayoutIncluded , asNotFound , metadataOutlet  })=>{
                 const [segment, parallelRoutes, components] = loaderTreeToFilter;
                 const parallelRoutesKeys = Object.keys(parallelRoutes);
                 const { layout  } = components;
@@ -677,7 +685,8 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
                                     injectedFontPreloadTags,
                                     // This is intentionally not "rootLayoutIncludedAtThisLevelOrAbove" as createComponentTree starts at the current level and does a check for "rootLayoutAtThisLevel" too.
                                     rootLayoutIncluded,
-                                    asNotFound
+                                    asNotFound,
+                                    metadataOutlet
                                 });
                                 return /*#__PURE__*/ React.createElement(Component, null);
                             }),
@@ -729,7 +738,8 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
                         injectedCSS: injectedCSSWithCurrentLayout,
                         injectedFontPreloadTags: injectedFontPreloadTagsWithCurrentLayout,
                         rootLayoutIncluded: rootLayoutIncludedAtThisLevelOrAbove,
-                        asNotFound
+                        asNotFound,
+                        metadataOutlet
                     });
                     return path.map((item)=>{
                         // we don't need to send over default routes in the flight data
@@ -748,27 +758,34 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
             };
             // Flight data that is going to be passed to the browser.
             // Currently a single item array but in the future multiple patches might be combined in a single request.
-            const flightData = (options == null ? void 0 : options.skipFlight) ? null : (await walkTreeWithFlightRouterState({
-                createSegmentPath: (child)=>child,
-                loaderTreeToFilter: loaderTree,
-                parentParams: {},
-                flightRouterState: providedFlightRouterState,
-                isFirst: true,
-                // For flight, render metadata inside leaf page
-                rscPayloadHead: /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(MetadataTree, {
-                    key: requestId,
+            let flightData = null;
+            if (!(options == null ? void 0 : options.skipFlight)) {
+                const [MetadataTree, MetadataOutlet] = createMetadataComponents({
                     tree: loaderTree,
-                    pathname: pathname,
+                    pathname,
                     searchParams: providedSearchParams,
-                    getDynamicParamFromSegment: getDynamicParamFromSegment,
-                    appUsingSizeAdjust: appUsingSizeAdjust
-                })),
-                injectedCSS: new Set(),
-                injectedFontPreloadTags: new Set(),
-                rootLayoutIncluded: false,
-                asNotFound: pagePath === "/404" || (options == null ? void 0 : options.asNotFound)
-            })).map((path)=>path.slice(1)) // remove the '' (root) segment
-            ;
+                    getDynamicParamFromSegment,
+                    appUsingSizeAdjust
+                });
+                flightData = (await walkTreeWithFlightRouterState({
+                    createSegmentPath: (child)=>child,
+                    loaderTreeToFilter: loaderTree,
+                    parentParams: {},
+                    flightRouterState: providedFlightRouterState,
+                    isFirst: true,
+                    // For flight, render metadata inside leaf page
+                    rscPayloadHead: // Adding requestId as react key to make metadata remount for each render
+                    /*#__PURE__*/ React.createElement(MetadataTree, {
+                        key: requestId
+                    }),
+                    injectedCSS: new Set(),
+                    injectedFontPreloadTags: new Set(),
+                    rootLayoutIncluded: false,
+                    asNotFound: pagePath === "/404" || (options == null ? void 0 : options.asNotFound),
+                    metadataOutlet: /*#__PURE__*/ React.createElement(MetadataOutlet, null)
+                })).map((path)=>path.slice(1)) // remove the '' (root) segment
+                ;
+            }
             const buildIdFlightDataPair = [
                 renderOpts.buildId,
                 flightData
@@ -810,13 +827,8 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
                 getTree: ()=>createFlightRouterStateFromLoaderTree(loaderTree, getDynamicParamFromSegment, query)
             }
         } : {};
-        async function getNotFound(tree, injectedCSS, requestPathname) {
-            // `depth` represents how many layers we need to search into the tree.
-            // For instance:
-            // pathname '/abc' will be 0 depth, means stop at the root level
-            // pathname '/abc/def' will be 1 depth, means stop at the first level
-            const depth = requestPathname.split("/").length - 2;
-            const notFound = findMatchedComponent(tree, "not-found", depth);
+        async function getNotFound(tree, injectedCSS) {
+            const notFound = findMatchedComponent(tree, "not-found");
             const [NotFound, notFoundStyles] = notFound ? await createComponentAndStyles({
                 filePath: notFound[1],
                 getComponent: notFound[0],
@@ -849,6 +861,15 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
                 // Create full component tree from root to leaf.
                 const injectedCSS = new Set();
                 const injectedFontPreloadTags = new Set();
+                const initialTree = createFlightRouterStateFromLoaderTree(loaderTreeToRender, getDynamicParamFromSegment, query);
+                const [MetadataTree, MetadataOutlet] = createMetadataComponents({
+                    tree: loaderTreeToRender,
+                    errorType: props.asNotFound ? "not-found" : undefined,
+                    pathname: pathname,
+                    searchParams: providedSearchParams,
+                    getDynamicParamFromSegment: getDynamicParamFromSegment,
+                    appUsingSizeAdjust: appUsingSizeAdjust
+                });
                 const { Component: ComponentTree , styles  } = await createComponentTree({
                     createSegmentPath: (child)=>child,
                     loaderTree: loaderTreeToRender,
@@ -857,26 +878,18 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
                     injectedCSS,
                     injectedFontPreloadTags,
                     rootLayoutIncluded: false,
-                    asNotFound: props.asNotFound
+                    asNotFound: props.asNotFound,
+                    metadataOutlet: /*#__PURE__*/ React.createElement(MetadataOutlet, null)
                 });
-                const createMetadata = (errorType)=>// Adding key={requestId} to make metadata remount for each render
-                    // @ts-expect-error allow to use async server component
-                    /*#__PURE__*/ React.createElement(MetadataTree, {
-                        key: requestId,
-                        tree: loaderTreeToRender,
-                        errorType: errorType,
-                        pathname: pathname,
-                        searchParams: providedSearchParams,
-                        getDynamicParamFromSegment: getDynamicParamFromSegment,
-                        appUsingSizeAdjust: appUsingSizeAdjust
-                    });
-                const initialTree = createFlightRouterStateFromLoaderTree(loaderTreeToRender, getDynamicParamFromSegment, query);
                 return /*#__PURE__*/ React.createElement(React.Fragment, null, styles, /*#__PURE__*/ React.createElement(AppRouter, {
                     buildId: renderOpts.buildId,
                     assetPrefix: assetPrefix,
                     initialCanonicalUrl: pathname,
                     initialTree: initialTree,
-                    initialHead: createMetadata(props.asNotFound ? "not-found" : undefined),
+                    initialHead: // Adding requestId as react key to make metadata remount for each render
+                    /*#__PURE__*/ React.createElement(MetadataTree, {
+                        key: requestId
+                    }),
                     globalErrorComponent: GlobalError
                 }, /*#__PURE__*/ React.createElement(ComponentTree, null)));
             }, ComponentMod, serverComponentsRenderOpts, serverComponentsErrorHandler, nonce);
@@ -960,9 +973,15 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
                         // Include hydration scripts in the HTML
                         bootstrapScripts: [
                             ...subresourceIntegrityManifest ? buildManifest.rootMainFiles.map((src)=>({
-                                    src: `${assetPrefix}/_next/` + src + getAssetQueryString(false),
+                                    src: `${assetPrefix}/_next/` + src + // Always include the timestamp query in development
+                                    // as Safari caches them during the same session, no
+                                    // matter what cache headers are set.
+                                    getAssetQueryString(true),
                                     integrity: subresourceIntegrityManifest[src]
-                                })) : buildManifest.rootMainFiles.map((src)=>`${assetPrefix}/_next/` + src + getAssetQueryString(false))
+                                })) : buildManifest.rootMainFiles.map((src)=>`${assetPrefix}/_next/` + src + // Always include the timestamp query in development
+                                // as Safari caches them during the same session, no
+                                // matter what cache headers are set.
+                                getAssetQueryString(true))
                         ]
                     }
                 });
@@ -1001,10 +1020,6 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
                     res.setHeader("Location", getURLFromRedirectError(err));
                 }
                 const is404 = res.statusCode === 404;
-                const injectedCSS = new Set();
-                const injectedFontPreloadTags = new Set();
-                const [RootLayout, rootStyles] = await getRootLayout(tree, injectedCSS, injectedFontPreloadTags);
-                const [NotFound, notFoundStyles] = await getNotFound(tree, injectedCSS, pathname);
                 // Preserve the existing RSC inline chunks from the page rendering.
                 // For 404 errors: the metadata from layout can be skipped with the error page.
                 // For other errors (such as redirection): it can still be re-thrown on client.
@@ -1022,22 +1037,28 @@ export async function renderToHTMLOrFlight(req, res, pagePath, query, renderOpts
                     content: "not-found"
                 }));
                 const ErrorPage = createServerComponentRenderer(async ()=>{
-                    const head = /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(MetadataTree, {
-                        key: requestId,
-                        tree: tree,
-                        pathname: pathname,
-                        errorType: errorType,
+                    const [MetadataTree, MetadataOutlet] = createMetadataComponents({
+                        tree,
+                        pathname,
+                        errorType,
                         searchParams: providedSearchParams,
-                        getDynamicParamFromSegment: getDynamicParamFromSegment,
-                        appUsingSizeAdjust: appUsingSizeAdjust
+                        getDynamicParamFromSegment,
+                        appUsingSizeAdjust
+                    });
+                    const head = /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(MetadataTree, {
+                        key: requestId
                     }), errorMeta);
                     const notFoundLoaderTree = is404 ? createNotFoundLoaderTree(tree) : tree;
                     const initialTree = createFlightRouterStateFromLoaderTree(notFoundLoaderTree, getDynamicParamFromSegment, query);
+                    const injectedCSS = new Set();
+                    const injectedFontPreloadTags = new Set();
+                    const [RootLayout, rootStyles] = await getRootLayout(tree, injectedCSS, injectedFontPreloadTags);
+                    const [NotFound, notFoundStyles] = await getNotFound(!renderOpts.dev && renderOpts.originalPathname === "/_not-found" ? notFoundLoaderTree : tree, injectedCSS);
                     const GlobalNotFound = NotFound || DefaultNotFound;
                     const ErrorLayout = RootLayout || ErrorHtml;
                     const notFoundElement = /*#__PURE__*/ React.createElement(ErrorLayout, {
                         params: {}
-                    }, rootStyles, notFoundStyles, /*#__PURE__*/ React.createElement(GlobalNotFound, null));
+                    }, /*#__PURE__*/ React.createElement(MetadataOutlet, null), rootStyles, notFoundStyles, /*#__PURE__*/ React.createElement(GlobalNotFound, null));
                     // For metadata notFound error there's no global not found boundary on top
                     // so we create a not found page with AppRouter
                     return /*#__PURE__*/ React.createElement(AppRouter, {