Netlify Edge: forward requests for static assets (withastro#3170)

* Netlify Edge: forward requests for static assets * Adds a changeset * Don't run edge tests, yet
SiriousHunter · Apr 22, 2022 · ec9b4a9 · ec9b4a9
1 parent 59edc46
commit ec9b4a9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/src/core/app/common.ts b/src/core/app/common.ts
@@ -13,8 +13,11 @@ export function deserializeManifest(serializedManifest: SerializedSSRManifest):
 		route.routeData = deserializeRouteData(serializedRoute.routeData);
 	}
 
+	const assets = new Set<string>(serializedManifest.assets);
+
 	return {
 		...serializedManifest,
+		assets,
 		routes,
 	};
 }
diff --git a/src/core/app/types.ts b/src/core/app/types.ts
@@ -26,10 +26,12 @@ export interface SSRManifest {
 	pageMap: Map<ComponentPath, ComponentInstance>;
 	renderers: SSRLoadedRenderer[];
 	entryModules: Record<string, string>;
+	assets: Set<string>;
 }
 
-export type SerializedSSRManifest = Omit<SSRManifest, 'routes'> & {
+export type SerializedSSRManifest = Omit<SSRManifest, 'routes' | 'assets'> & {
 	routes: SerializedRouteInfo[];
+	assets: string[];
 };
 
 export type AdapterCreateExports<T = any> = (

diff --git a/src/core/build/static-build.ts b/src/core/build/static-build.ts
@@ -10,7 +10,7 @@ import { fileURLToPath } from 'url';
 import * as vite from 'vite';
 import { createBuildInternals } from '../../core/build/internal.js';
 import { info } from '../logger/core.js';
-import { appendForwardSlash, prependForwardSlash } from '../../core/path.js';
+import { prependForwardSlash } from '../../core/path.js';
 import { emptyDir, removeDir } from '../../core/util.js';
 import { rollupPluginAstroBuildCSS } from '../../vite-plugin-build-css/index.js';
 import { vitePluginHoistedScripts } from './vite-plugin-hoisted-scripts.js';

diff --git a/src/core/build/vite-plugin-ssr.ts b/src/core/build/vite-plugin-ssr.ts
@@ -7,6 +7,8 @@ import type { SerializedRouteInfo, SerializedSSRManifest } from '../app/types';
 import { serializeRouteData } from '../routing/index.js';
 import { eachPageData } from './internal.js';
 import { addRollupInput } from './add-rollup-input.js';
+import { fileURLToPath } from 'url';
+import glob from 'fast-glob';
 import { virtualModuleId as pagesVirtualModuleId } from './vite-plugin-pages.js';
 import { BEFORE_HYDRATION_SCRIPT_ID } from '../../vite-plugin-scripts/index.js';
 
@@ -65,11 +67,19 @@ if(_start in adapter) {
 			}
 			return void 0;
 		},
-		generateBundle(_opts, bundle) {
-			const manifest = buildManifest(buildOpts, internals);
+		async generateBundle(_opts, bundle) {
+			const staticFiles = await glob('**/*', {
+				cwd: fileURLToPath(buildOpts.buildConfig.client),
+			});
+
+			const manifest = buildManifest(buildOpts, internals, staticFiles);
+
+
 
 			for (const [_chunkName, chunk] of Object.entries(bundle)) {
-				if (chunk.type === 'asset') continue;
+				if (chunk.type === 'asset') {
+					continue;
+				};
 				if (chunk.modules[resolvedVirtualModuleId]) {
 					const code = chunk.code;
 					chunk.code = code.replace(replaceExp, () => {
@@ -81,7 +91,7 @@ if(_start in adapter) {
 	};
 }
 
-function buildManifest(opts: StaticBuildOptions, internals: BuildInternals): SerializedSSRManifest {
+function buildManifest(opts: StaticBuildOptions, internals: BuildInternals, staticFiles: string[]): SerializedSSRManifest {
 	const { astroConfig } = opts;
 
 	const routes: SerializedRouteInfo[] = [];
@@ -112,6 +122,7 @@ function buildManifest(opts: StaticBuildOptions, internals: BuildInternals): Ser
 		pageMap: null as any,
 		renderers: [],
 		entryModules,
+		assets: staticFiles.map(s => '/' + s)
 	};
 
 	return ssrManifest;