From 06906cd74eed99bfac935c94b72bca6065995ac4 Mon Sep 17 00:00:00 2001 From: lilnasy <69170106+lilnasy@users.noreply.github.com> Date: Fri, 29 Dec 2023 22:41:08 +0000 Subject: [PATCH] remove getVercelOutput --- packages/integrations/vercel/src/lib/fs.ts | 2 -- packages/integrations/vercel/src/static/adapter.ts | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/integrations/vercel/src/lib/fs.ts b/packages/integrations/vercel/src/lib/fs.ts index b3dadcfc2ed50..152ee7d7c0d3f 100644 --- a/packages/integrations/vercel/src/lib/fs.ts +++ b/packages/integrations/vercel/src/lib/fs.ts @@ -31,8 +31,6 @@ export async function getFilesFromFolder(dir: URL) { return files; } -export const getVercelOutput = (root: URL) => new URL('./.vercel/output/', root); - /** * Copies files into a folder keeping the folder structure intact. * The resulting file tree will start at the common ancestor. diff --git a/packages/integrations/vercel/src/static/adapter.ts b/packages/integrations/vercel/src/static/adapter.ts index cbd7cb51ad93c..90ac8261e348c 100644 --- a/packages/integrations/vercel/src/static/adapter.ts +++ b/packages/integrations/vercel/src/static/adapter.ts @@ -6,7 +6,7 @@ import { type DevImageService, type VercelImageConfig, } from '../image/shared.js'; -import { emptyDir, getVercelOutput, writeJson } from '../lib/fs.js'; +import { emptyDir, writeJson } from '../lib/fs.js'; import { isServerLikeOutput } from '../lib/prerender.js'; import { getRedirects } from '../lib/redirects.js'; import { @@ -72,7 +72,7 @@ export default function vercelStatic({ if (command === 'build' && speedInsights?.enabled) { injectScript('page', 'import "@astrojs/vercel/speed-insights"'); } - const outDir = new URL('./static/', getVercelOutput(config.root)); + const outDir = new URL('./.vercel/output/static', config.root); updateConfig({ outDir, build: { @@ -103,12 +103,12 @@ export default function vercelStatic({ // Ensure to have `.vercel/output` empty. // This is because, when building to static, outDir = .vercel/output/static/, // so .vercel/output itself won't get cleaned. - await emptyDir(getVercelOutput(_config.root)); + await emptyDir(new URL('./.vercel/output/', _config.root)); }, 'astro:build:done': async ({ routes }) => { // Output configuration // https://vercel.com/docs/build-output-api/v3#build-output-configuration - await writeJson(new URL(`./config.json`, getVercelOutput(_config.root)), { + await writeJson(new URL('./.vercel/output/config.json', _config.root), { version: 3, routes: [ ...getRedirects(routes, _config),