Merge 68fb1e8 into 7c6da54

crates/next-core/js/package.json

@@ -12,7 +12,7 @@
     "@vercel/turbopack-runtime": "latest",
     "anser": "^2.1.1",
     "css.escape": "^1.5.1",
-    "next": "13.1.7-canary.30",
+    "next": "13.2.4-canary.6",
     "platform": "1.3.6",
     "react-dom": "^18.2.0",
     "react": "^18.2.0",

crates/next-core/js/src/entry/app-renderer.tsx

@@ -137,32 +137,32 @@ async function runOperation(renderData: RenderData) {
     tree = [info.segment, { children: tree }, components];
   }
 
-  const proxyMethodsForModule = (
-    id: string,
-    css: boolean
-  ): ProxyHandler<FlightManifest[""]> => ({
-    get(target, name, receiver) {
-      return {
-        id,
-        chunks: JSON.parse(id)[1],
-        name,
-      };
-    },
-  });
-  const proxyMethods = (css: boolean): ProxyHandler<FlightManifest> => {
+  const proxyMethods = (): ProxyHandler<FlightManifest> => {
     return {
-      get(target, name, receiver) {
-        if (name === "__ssr_module_mapping__") {
+      get(_target, key: string) {
+        if (key === "__ssr_module_mapping__") {
           return manifest;
         }
-        if (name === "__entry_css_files__") {
+        if (key === "__entry_css_files__") {
           return __entry_css_files__;
         }
-        return new Proxy({}, proxyMethodsForModule(name as string, css));
+
+        // The key is a `${file}#${name}`, but `file` can contain `#` itself.
+        let pos = key.lastIndexOf("#");
+        if (pos === -1) pos = key.length;
+
+        const file = key.slice(0, pos);
+        const name = key.slice(pos + 1);
+
+        return {
+          id: file,
+          chunks: JSON.parse(file)[1],
+          name: name || "*",
+        };
       },
     };
   };
-  const manifest: FlightManifest = new Proxy({} as any, proxyMethods(false));
+  const manifest: FlightManifest = new Proxy({} as any, proxyMethods());
   const serverCSSManifest: FlightCSSManifest = {};
   const __entry_css_files__: FlightManifest["__entry_css_files__"] = {};
   for (const [key, chunks] of Object.entries(layoutInfoChunks)) {