From e55af8a23233b6335f45b7a04b9d026990fb616c Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Wed, 12 Oct 2022 17:25:51 -0400 Subject: Node.js standalone mode + support for astro preview (#5056) * wip * Deprecate buildConfig and move to config.build * Implement the standalone server * Stay backwards compat * Add changesets * correctly merge URLs * Get config earlier * update node tests * Return the preview server * update remaining tests * swap usage and config ordering * Update packages/astro/src/@types/astro.ts Co-authored-by: Sarah Rainsberger * Update .changeset/metal-pumas-walk.md Co-authored-by: Sarah Rainsberger * Update .changeset/metal-pumas-walk.md Co-authored-by: Sarah Rainsberger * Update .changeset/stupid-points-refuse.md Co-authored-by: Sarah Rainsberger * Update .changeset/stupid-points-refuse.md Co-authored-by: Sarah Rainsberger * Link to build.server config Co-authored-by: Fred K. Schott Co-authored-by: Sarah Rainsberger --- .../netlify/src/integration-functions.ts | 28 ++++++++++++++-------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'packages/integrations/netlify/src/integration-functions.ts') diff --git a/packages/integrations/netlify/src/integration-functions.ts b/packages/integrations/netlify/src/integration-functions.ts index d78fb1f32..025250bc1 100644 --- a/packages/integrations/netlify/src/integration-functions.ts +++ b/packages/integrations/netlify/src/integration-functions.ts @@ -22,19 +22,25 @@ function netlifyFunctions({ }: NetlifyFunctionsOptions = {}): AstroIntegration { let _config: AstroConfig; let entryFile: string; + let needsBuildConfig = false; return { name: '@astrojs/netlify', hooks: { - 'astro:config:setup': ({ config }) => { - if (dist) { - config.outDir = dist; - } else { - config.outDir = new URL('./dist/', config.root); - } + 'astro:config:setup': ({ config, updateConfig }) => { + needsBuildConfig = !config.build.client; + const outDir = dist ?? new URL('./dist/', config.root); + updateConfig({ + outDir, + build: { + client: outDir, + server: new URL('./.netlify/functions-internal/', config.root), + } + }); }, 'astro:config:done': ({ config, setAdapter }) => { setAdapter(getAdapter({ binaryMediaTypes })); _config = config; + entryFile = config.build.serverEntry.replace(/\.m?js/, ''); if (config.output === 'static') { console.warn(`[@astrojs/netlify] \`output: "server"\` is required to use this adapter.`); @@ -43,10 +49,12 @@ function netlifyFunctions({ ); } }, - 'astro:build:start': async ({ buildConfig }) => { - entryFile = buildConfig.serverEntry.replace(/\.m?js/, ''); - buildConfig.client = _config.outDir; - buildConfig.server = new URL('./.netlify/functions-internal/', _config.root); + 'astro:build:start': ({ buildConfig }) => { + if(needsBuildConfig) { + buildConfig.client = _config.outDir; + buildConfig.server = new URL('./.netlify/functions-internal/', _config.root); + entryFile = buildConfig.serverEntry.replace(/\.m?js/, ''); + } }, 'astro:build:done': async ({ routes, dir }) => { await createRedirects(routes, dir, entryFile, false); -- cgit v1.2.3