fix(core): correct asset path + fix types

- the bundlegraph asset is not relative to build/
- the resolved manifest in the server only has a selection of manifest keys

Author: wmertens

packages/docs/src/routes/api/qwik-optimizer/api.json

@@ -465,7 +465,7 @@
         }
       ],
       "kind": "Interface",
-      "content": "The metadata of the build. One of its uses is storing where QRL symbols are located.\n\n\n```typescript\nexport interface QwikManifest \n```\n\n\n<table><thead><tr><th>\n\nProperty\n\n\n</th><th>\n\nModifiers\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n[assets?](#)\n\n\n</td><td>\n\n\n</td><td>\n\n{ \\[fileName: string\\]: [QwikAsset](#qwikasset)<!-- -->; }\n\n\n</td><td>\n\n_(Optional)_ All assets\n\n\n</td></tr>\n<tr><td>\n\n[bundleGraph?](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[QwikBundleGraph](#qwikbundlegraph)\n\n\n</td><td>\n\n_(Optional)_ All bundles in a compact graph format with probabilities\n\n\n</td></tr>\n<tr><td>\n\n[bundleGraphPath?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\n\n\n</td><td>\n\n_(Optional)_ The bundle graph fileName\n\n\n</td></tr>\n<tr><td>\n\n[bundles](#)\n\n\n</td><td>\n\n\n</td><td>\n\n{ \\[fileName: string\\]: [QwikBundle](#qwikbundle)<!-- -->; }\n\n\n</td><td>\n\nAll code bundles, used to know the import graph\n\n\n</td></tr>\n<tr><td>\n\n[core?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\n\n\n</td><td>\n\n_(Optional)_ The Qwik core bundle fileName\n\n\n</td></tr>\n<tr><td>\n\n[injections?](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[GlobalInjections](#globalinjections)<!-- -->\\[\\]\n\n\n</td><td>\n\n_(Optional)_ CSS etc to inject in the document head\n\n\n</td></tr>\n<tr><td>\n\n[manifestHash](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\n\n\n</td><td>\n\nContent hash of the manifest, if this changes, the code changed\n\n\n</td></tr>\n<tr><td>\n\n[mapping](#)\n\n\n</td><td>\n\n\n</td><td>\n\n{ \\[symbolName: string\\]: string; }\n\n\n</td><td>\n\nWhere QRLs are located\n\n\n</td></tr>\n<tr><td>\n\n[options?](#)\n\n\n</td><td>\n\n\n</td><td>\n\n{ target?: string; buildMode?: string; entryStrategy?: { type: [EntryStrategy](#entrystrategy)<!-- -->\\['type'\\]; }; }\n\n\n</td><td>\n\n_(Optional)_ The options used to build the manifest\n\n\n</td></tr>\n<tr><td>\n\n[platform?](#)\n\n\n</td><td>\n\n\n</td><td>\n\n{ \\[name: string\\]: string; }\n\n\n</td><td>\n\n_(Optional)_ The platform used to build the manifest\n\n\n</td></tr>\n<tr><td>\n\n[preloader?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\n\n\n</td><td>\n\n_(Optional)_ The preloader bundle fileName\n\n\n</td></tr>\n<tr><td>\n\n[symbols](#)\n\n\n</td><td>\n\n\n</td><td>\n\n{ \\[symbolName: string\\]: [QwikSymbol](#qwiksymbol)<!-- -->; }\n\n\n</td><td>\n\nQRL symbols\n\n\n</td></tr>\n<tr><td>\n\n[version](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\n\n\n</td><td>\n\nThe version of the manifest\n\n\n</td></tr>\n</tbody></table>",
+      "content": "The metadata of the build. One of its uses is storing where QRL symbols are located.\n\n\n```typescript\nexport interface QwikManifest \n```\n\n\n<table><thead><tr><th>\n\nProperty\n\n\n</th><th>\n\nModifiers\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n[assets?](#)\n\n\n</td><td>\n\n\n</td><td>\n\n{ \\[fileName: string\\]: [QwikAsset](#qwikasset)<!-- -->; }\n\n\n</td><td>\n\n_(Optional)_ All assets. The key is the fileName relative to the rootDir\n\n\n</td></tr>\n<tr><td>\n\n[bundleGraph?](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[QwikBundleGraph](#qwikbundlegraph)\n\n\n</td><td>\n\n_(Optional)_ All bundles in a compact graph format with probabilities\n\n\n</td></tr>\n<tr><td>\n\n[bundleGraphAsset?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\n\n\n</td><td>\n\n_(Optional)_ The bundle graph fileName\n\n\n</td></tr>\n<tr><td>\n\n[bundles](#)\n\n\n</td><td>\n\n\n</td><td>\n\n{ \\[fileName: string\\]: [QwikBundle](#qwikbundle)<!-- -->; }\n\n\n</td><td>\n\nAll code bundles, used to know the import graph. The key is the bundle fileName relative to \"build/\"\n\n\n</td></tr>\n<tr><td>\n\n[core?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\n\n\n</td><td>\n\n_(Optional)_ The Qwik core bundle fileName\n\n\n</td></tr>\n<tr><td>\n\n[injections?](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[GlobalInjections](#globalinjections)<!-- -->\\[\\]\n\n\n</td><td>\n\n_(Optional)_ CSS etc to inject in the document head\n\n\n</td></tr>\n<tr><td>\n\n[manifestHash](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\n\n\n</td><td>\n\nContent hash of the manifest, if this changes, the code changed\n\n\n</td></tr>\n<tr><td>\n\n[mapping](#)\n\n\n</td><td>\n\n\n</td><td>\n\n{ \\[symbolName: string\\]: string; }\n\n\n</td><td>\n\nWhere QRLs are located. The key is the symbol name, the value is the bundle fileName\n\n\n</td></tr>\n<tr><td>\n\n[options?](#)\n\n\n</td><td>\n\n\n</td><td>\n\n{ target?: string; buildMode?: string; entryStrategy?: { type: [EntryStrategy](#entrystrategy)<!-- -->\\['type'\\]; }; }\n\n\n</td><td>\n\n_(Optional)_ The options used to build the manifest\n\n\n</td></tr>\n<tr><td>\n\n[platform?](#)\n\n\n</td><td>\n\n\n</td><td>\n\n{ \\[name: string\\]: string; }\n\n\n</td><td>\n\n_(Optional)_ The platform used to build the manifest\n\n\n</td></tr>\n<tr><td>\n\n[preloader?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\n\n\n</td><td>\n\n_(Optional)_ The preloader bundle fileName\n\n\n</td></tr>\n<tr><td>\n\n[symbols](#)\n\n\n</td><td>\n\n\n</td><td>\n\n{ \\[symbolName: string\\]: [QwikSymbol](#qwiksymbol)<!-- -->; }\n\n\n</td><td>\n\nQRL symbols\n\n\n</td></tr>\n<tr><td>\n\n[version](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\n\n\n</td><td>\n\nThe version of the manifest\n\n\n</td></tr>\n</tbody></table>",
       "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/optimizer/src/types.ts",
       "mdFile": "qwik.qwikmanifest.md"
     },
@@ -625,7 +625,7 @@
         }
       ],
       "kind": "Interface",
-      "content": "```typescript\nexport interface ResolvedManifest \n```\n\n\n<table><thead><tr><th>\n\nProperty\n\n\n</th><th>\n\nModifiers\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n[injections](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[GlobalInjections](#globalinjections)<!-- -->\\[\\]\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[manifest](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[QwikManifest](#qwikmanifest)\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[mapper](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[SymbolMapper](#symbolmapper)\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>",
+      "content": "```typescript\nexport interface ResolvedManifest \n```\n\n\n<table><thead><tr><th>\n\nProperty\n\n\n</th><th>\n\nModifiers\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n[injections](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[GlobalInjections](#globalinjections)<!-- -->\\[\\]\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[manifest](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[ServerQwikManifest](#serverqwikmanifest)\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[mapper](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[SymbolMapper](#symbolmapper)\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>",
       "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/optimizer/src/types.ts",
       "mdFile": "qwik.resolvedmanifest.md"
     },
@@ -657,6 +657,20 @@
       "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/optimizer/src/types.ts",
       "mdFile": "qwik.segmententrystrategy.md"
     },
+    {
+      "name": "ServerQwikManifest",
+      "id": "serverqwikmanifest",
+      "hierarchy": [
+        {
+          "name": "ServerQwikManifest",
+          "id": "serverqwikmanifest"
+        }
+      ],
+      "kind": "TypeAlias",
+      "content": "The manifest values that are needed for SSR.\n\n\n```typescript\nexport type ServerQwikManifest = Pick<QwikManifest, 'manifestHash' | 'injections' | 'bundleGraph' | 'bundleGraphAsset' | 'mapping' | 'preloader' | 'core'>;\n```\n**References:** [QwikManifest](#qwikmanifest)",
+      "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/optimizer/src/types.ts",
+      "mdFile": "qwik.serverqwikmanifest.md"
+    },
     {
       "name": "SingleEntryStrategy",
       "id": "singleentrystrategy",

packages/docs/src/routes/api/qwik-optimizer/index.mdx

@@ -1485,7 +1485,7 @@ Description
 
 </td><td>
 
-_(Optional)_ All assets
+_(Optional)_ All assets. The key is the fileName relative to the rootDir
 
 </td></tr>
 <tr><td>
@@ -1505,7 +1505,7 @@ _(Optional)_ All bundles in a compact graph format with probabilities
 </td></tr>
 <tr><td>
 
-[bundleGraphPath?](#)
+[bundleGraphAsset?](#)
 
 </td><td>
 
@@ -1530,7 +1530,7 @@ _(Optional)_ The bundle graph fileName
 
 </td><td>
 
-All code bundles, used to know the import graph
+All code bundles, used to know the import graph. The key is the bundle fileName relative to "build/"
 
 </td></tr>
 <tr><td>
@@ -1590,7 +1590,7 @@ Content hash of the manifest, if this changes, the code changed
 
 </td><td>
 
-Where QRLs are located
+Where QRLs are located. The key is the symbol name, the value is the bundle fileName
 
 </td></tr>
 <tr><td>
@@ -2490,7 +2490,7 @@ Description
 
 </td><td>
 
-[QwikManifest](#qwikmanifest)
+[ServerQwikManifest](#serverqwikmanifest)
 
 </td><td>
 
@@ -2750,6 +2750,27 @@ _(Optional)_
 
 [Edit this section](https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/optimizer/src/types.ts)
 
+## ServerQwikManifest
+
+The manifest values that are needed for SSR.
+
+```typescript
+export type ServerQwikManifest = Pick<
+  QwikManifest,
+  | "manifestHash"
+  | "injections"
+  | "bundleGraph"
+  | "bundleGraphAsset"
+  | "mapping"
+  | "preloader"
+  | "core"
+>;
+```
+
+**References:** [QwikManifest](#qwikmanifest)
+
+[Edit this section](https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/optimizer/src/types.ts)
+
 ## SingleEntryStrategy
 
 ```typescript

packages/docs/src/routes/api/qwik-server/api.json

@@ -180,7 +180,7 @@
         }
       ],
       "kind": "Interface",
-      "content": "```typescript\nexport interface RenderResult \n```\n\n\n<table><thead><tr><th>\n\nProperty\n\n\n</th><th>\n\nModifiers\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n[isStatic](#)\n\n\n</td><td>\n\n\n</td><td>\n\nboolean\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[manifest?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nQwikManifest\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\n[prefetchResources](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[PrefetchResource](#prefetchresource)<!-- -->\\[\\]\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[snapshotResult](#)\n\n\n</td><td>\n\n\n</td><td>\n\nSnapshotResult \\| undefined\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>",
+      "content": "```typescript\nexport interface RenderResult \n```\n\n\n<table><thead><tr><th>\n\nProperty\n\n\n</th><th>\n\nModifiers\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n[isStatic](#)\n\n\n</td><td>\n\n\n</td><td>\n\nboolean\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[manifest?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nServerQwikManifest\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\n[prefetchResources](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[PrefetchResource](#prefetchresource)<!-- -->\\[\\]\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[snapshotResult](#)\n\n\n</td><td>\n\n\n</td><td>\n\nSnapshotResult \\| undefined\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>",
       "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/server/types.ts",
       "mdFile": "qwik.renderresult.md"
     },
@@ -362,7 +362,7 @@
         }
       ],
       "kind": "TypeAlias",
-      "content": "Auto: Prefetch all possible QRLs used by the document. Default\n\n\n```typescript\nexport type SymbolsToPrefetch = 'auto' | ((opts: {\n    manifest: QwikManifest;\n}) => PrefetchResource[]);\n```\n**References:** [PrefetchResource](#prefetchresource)",
+      "content": "Auto: Prefetch all possible QRLs used by the document. Default\n\n\n```typescript\nexport type SymbolsToPrefetch = 'auto' | ((opts: {\n    manifest: ServerQwikManifest;\n}) => PrefetchResource[]);\n```\n**References:** [PrefetchResource](#prefetchresource)",
       "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/server/types.ts",
       "mdFile": "qwik.symbolstoprefetch.md"
     },

packages/docs/src/routes/api/qwik-server/index.mdx

@@ -832,7 +832,7 @@ boolean
 
 </td><td>
 
-QwikManifest
+ServerQwikManifest
 
 </td><td>
 
@@ -1312,7 +1312,7 @@ Auto: Prefetch all possible QRLs used by the document. Default
 ```typescript
 export type SymbolsToPrefetch =
   | "auto"
-  | ((opts: { manifest: QwikManifest }) => PrefetchResource[]);
+  | ((opts: { manifest: ServerQwikManifest }) => PrefetchResource[]);
 ```
 
 **References:** [PrefetchResource](#prefetchresource)

packages/qwik-city/src/middleware/aws-lambda/middleware.aws-lambda.api.md

@@ -15,6 +15,7 @@ import type { QwikManifest } from '@builder.io/qwik/optimizer';
 import type { RequestHandler } from '@builder.io/qwik-city/middleware/request-handler';
 import type { ResolvedManifest } from '@builder.io/qwik/optimizer';
 import type { ResolveSyncValue } from '@builder.io/qwik-city/middleware/request-handler';
+import type { ServerQwikManifest } from '@builder.io/qwik/optimizer';
 import type { ServerRenderOptions } from '@builder.io/qwik-city/middleware/request-handler';
 import { ServerResponse } from 'http';
 import type { SnapshotResult } from '@builder.io/qwik';

packages/qwik/src/optimizer/src/index.ts

@@ -19,6 +19,7 @@ export type {
   QwikBundle,
   QwikBundleGraph,
   QwikManifest,
+  ServerQwikManifest,
   QwikSymbol,
   ResolvedManifest,
   SegmentAnalysis,

packages/qwik/src/optimizer/src/manifest.ts

@@ -409,7 +409,7 @@ export function generateManifestFromBundles(
     },
     core: undefined,
     preloader: undefined,
-    bundleGraphPath: undefined,
+    bundleGraphAsset: undefined,
     injections,
     mapping: {},
     bundles: {},

packages/qwik/src/optimizer/src/plugins/plugin.ts

@@ -885,7 +885,7 @@ export const isDev = ${JSON.stringify(isDev)};
         mapping: manifest.mapping,
         preloader: manifest.preloader,
         core: manifest.core,
-        bundleGraphPath: manifest.bundleGraphPath,
+        bundleGraphAsset: manifest.bundleGraphAsset,
       };
     }
     return `// @qwik-client-manifest
@@ -968,10 +968,10 @@ export const manifest = ${JSON.stringify(serverManifest)};\n`;
       name: 'bundle-graph.json',
       source: JSON.stringify(bundleGraph),
     });
-    manifest.bundleGraphPath = outputAnalyzer.canonPath(ctx.getFileName(bgAsset));
-    manifest.bundleGraph = bundleGraph;
+    const bgPath = ctx.getFileName(bgAsset);
+    manifest.bundleGraphAsset = bgPath;
     // we already generated the assets list so we need to update it
-    manifest.assets![manifest.bundleGraphPath] = {
+    manifest.assets![bgPath] = {
       name: 'bundle-graph.json',
       size: bundleGraph.length,
     };

packages/qwik/src/optimizer/src/qwik.optimizer.api.md

@@ -192,7 +192,7 @@ export interface QwikManifest {
         [fileName: string]: QwikAsset;
     };
     bundleGraph?: QwikBundleGraph;
-    bundleGraphPath?: string;
+    bundleGraphAsset?: string;
     bundles: {
         [fileName: string]: QwikBundle;
     };
@@ -316,7 +316,7 @@ export interface ResolvedManifest {
     // (undocumented)
     injections: GlobalInjections[];
     // (undocumented)
-    manifest: QwikManifest;
+    manifest: ServerQwikManifest;
     // (undocumented)
     mapper: SymbolMapper;
 }
@@ -361,6 +361,9 @@ interface SegmentEntryStrategy {
 export { SegmentEntryStrategy as HookEntryStrategy }
 export { SegmentEntryStrategy }
 
+// @public
+export type ServerQwikManifest = Pick<QwikManifest, 'manifestHash' | 'injections' | 'bundleGraph' | 'bundleGraphAsset' | 'mapping' | 'preloader' | 'core'>;
+
 // @public (undocumented)
 export interface SingleEntryStrategy {
     // (undocumented)

packages/qwik/src/optimizer/src/types.ts

@@ -219,16 +219,19 @@ export interface QwikManifest {
   manifestHash: string;
   /** QRL symbols */
   symbols: { [symbolName: string]: QwikSymbol };
-  /** Where QRLs are located */
+  /** Where QRLs are located. The key is the symbol name, the value is the bundle fileName */
   mapping: { [symbolName: string]: string };
-  /** All code bundles, used to know the import graph */
+  /**
+   * All code bundles, used to know the import graph. The key is the bundle fileName relative to
+   * "build/"
+   */
   bundles: { [fileName: string]: QwikBundle };
-  /** All assets */
+  /** All assets. The key is the fileName relative to the rootDir */
   assets?: { [fileName: string]: QwikAsset };
   /** All bundles in a compact graph format with probabilities */
   bundleGraph?: QwikBundleGraph;
   /** The bundle graph fileName */
-  bundleGraphPath?: string;
+  bundleGraphAsset?: string;
   /** The preloader bundle fileName */
   preloader?: string;
   /** The Qwik core bundle fileName */
@@ -256,7 +259,7 @@ export type ServerQwikManifest = Pick<
   | 'manifestHash'
   | 'injections'
   | 'bundleGraph'
-  | 'bundleGraphPath'
+  | 'bundleGraphAsset'
   | 'mapping'
   | 'preloader'
   | 'core'
@@ -363,6 +366,6 @@ export interface Path {
 /** @public */
 export interface ResolvedManifest {
   mapper: SymbolMapper;
-  manifest: QwikManifest;
+  manifest: ServerQwikManifest;
   injections: GlobalInjections[];
 }