feat(hybrid): overwrite static files

natemoo-re · natemoo-re · commit d278f949ce0c · 2022-11-03T19:49:27.000-05:00
diff --git a/examples/minimal/astro.config.mjs b/examples/minimal/astro.config.mjs
@@ -1,10 +1,4 @@
 import { defineConfig } from 'astro/config';
-import node from '@astrojs/node';
 
 // https://astro.build/config
-export default defineConfig({
-	output: 'server',
-	adapter: node({
-		mode: 'standalone'
-	})
-});
+export default defineConfig({});
diff --git a/examples/minimal/src/pages/api/endpoint.ts b/examples/minimal/src/pages/api/endpoint.ts
diff --git a/examples/minimal/src/pages/index.astro b/examples/minimal/src/pages/index.astro
@@ -1,5 +1,4 @@
 ---
-export const output = 'static';
 ---
 
 <html lang="en">
diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts
@@ -282,7 +282,7 @@ async function cleanStaticOutput(opts: StaticBuildOptions, internals: BuildInter
 				if (!allStaticFiles.has(filename.replace('server/', ''))) {
 					return;
 				}
-				// TODO: update file
+				await fs.promises.writeFile(url, 'export const _ = null;', { encoding: 'utf-8' });
 			})
 		);
 		// Map directories heads from the .mjs files
diff --git a/packages/astro/src/core/build/vite-plugin-ssr.ts b/packages/astro/src/core/build/vite-plugin-ssr.ts
@@ -13,6 +13,7 @@ import { pagesVirtualModuleId } from '../app/index.js';
 import { serializeRouteData } from '../routing/index.js';
 import { addRollupInput } from './add-rollup-input.js';
 import { eachServerPageData, eachStaticPageData, sortedCSS } from './internal.js';
+import { getOutFile, getOutFolder } from './common.js';
 
 export const virtualModuleId = '@astrojs-ssr-virtual-entry';
 const resolvedVirtualModuleId = '\0' + virtualModuleId;
@@ -134,12 +135,16 @@ function buildManifest(
 	}
 
 	for (const pageData of eachStaticPageData(internals)) {
+		const outFolder = getOutFolder(opts.settings.config, pageData.route.pathname!, pageData.route.type);
+		const outFile = getOutFile(opts.settings.config, outFolder, pageData.route.pathname!, pageData.route.type);
+		const file = outFile.toString().replace(opts.settings.config.build.client.toString(), '');
 		routes.push({
-			file: `../client/${pageData.route.pathname}.html`,
+			file,
 			links: [],
 			scripts: [],
 			routeData: serializeRouteData(pageData.route, settings.config.trailingSlash),
 		});
+		staticFiles.push(file);
 	}
 
 	for (const pageData of eachServerPageData(internals)) {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`---`
`2`		`-export const output = 'static';`
`3`	`2`	`---`
`4`	`3`
`5`	`4`	`<html lang="en">`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ async function cleanStaticOutput(opts: StaticBuildOptions, internals: BuildInter`
`282`	`282`	`if (!allStaticFiles.has(filename.replace('server/', ''))) {`
`283`	`283`	`return;`
`284`	`284`	`}`
`285`		`- // TODO: update file`
	`285`	`+ await fs.promises.writeFile(url, 'export const _ = null;', { encoding: 'utf-8' });`
`286`	`286`	`})`
`287`	`287`	`);`
`288`	`288`	`// Map directories heads from the .mjs files`