summaryrefslogtreecommitdiff
path: root/packages/integrations/netlify/src
diff options
context:
space:
mode:
Diffstat (limited to 'packages/integrations/netlify/src')
-rw-r--r--packages/integrations/netlify/src/index.ts30
1 files changed, 13 insertions, 17 deletions
diff --git a/packages/integrations/netlify/src/index.ts b/packages/integrations/netlify/src/index.ts
index d411813de..6dccc4e51 100644
--- a/packages/integrations/netlify/src/index.ts
+++ b/packages/integrations/netlify/src/index.ts
@@ -99,7 +99,7 @@ export function remotePatternToRegex(
return regexStr;
}
-async function writeNetlifyDeployConfig(config: AstroConfig, logger: AstroIntegrationLogger) {
+async function writeNetlifyFrameworkConfig(config: AstroConfig, logger: AstroIntegrationLogger) {
const remoteImages: Array<string> = [];
// Domains get a simple regex match
remoteImages.push(
@@ -113,7 +113,7 @@ async function writeNetlifyDeployConfig(config: AstroConfig, logger: AstroIntegr
);
// See https://docs.netlify.com/image-cdn/create-integration/
- const deployConfigDir = new URL('.netlify/deploy/v1/', config.root);
+ const deployConfigDir = new URL('.netlify/v1/', config.root);
await mkdir(deployConfigDir, { recursive: true });
await writeFile(
new URL('./config.json', deployConfigDir),
@@ -192,8 +192,8 @@ export default function netlifyIntegration(
const TRACE_CACHE = {};
const ssrBuildDir = () => new URL('./.netlify/build/', rootDir);
- const ssrOutputDir = () => new URL('./.netlify/functions-internal/ssr/', rootDir);
- const middlewareOutputDir = () => new URL('.netlify/edge-functions/middleware/', rootDir);
+ const ssrOutputDir = () => new URL('./.netlify/v1/functions/ssr/', rootDir);
+ const middlewareOutputDir = () => new URL('.netlify/v1/edge-functions/middleware/', rootDir);
const cleanFunctions = async () =>
await Promise.all([
@@ -250,19 +250,15 @@ export default function netlifyIntegration(
cacheOnDemandPages: Boolean(integrationConfig?.cacheOnDemandPages),
notFoundContent,
})});
- export const config = { name: "Astro SSR", generator: "@astrojs/netlify@${packageVersion}", path: "/*", preferStatic: true };
- `
- );
-
- await writeFile(
- new URL('.netlify/functions-internal/ssr/ssr.json', rootDir),
- JSON.stringify({
- config: {
+ export const config = {
+ includedFiles: ['**/*'],
+ name: 'Astro SSR',
nodeBundler: 'none',
- includedFiles: [fileURLToPath(new URL('.netlify/functions-internal/ssr/**/*', rootDir))],
- },
- version: 1,
- })
+ generator: '@astrojs/netlify@${packageVersion}',
+ path: '/*',
+ preferStatic: true,
+ };
+ `
);
}
@@ -425,7 +421,7 @@ export default function netlifyIntegration(
_config = config;
if (config.image?.domains?.length || config.image?.remotePatterns?.length) {
- await writeNetlifyDeployConfig(config, logger);
+ await writeNetlifyFrameworkConfig(config, logger);
}
const edgeMiddleware = integrationConfig?.edgeMiddleware ?? false;