summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/integrations/vercel/package.json22
-rw-r--r--packages/integrations/vercel/src/lib/prerender.ts5
-rw-r--r--packages/integrations/vercel/src/serverless/adapter.ts77
-rw-r--r--packages/integrations/vercel/src/static/adapter.ts6
-rw-r--r--packages/integrations/vercel/test/fixtures/basic/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/image/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/isr/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/max-duration/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/middleware-with-edge-file/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/middleware-without-edge-file/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/no-output/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/prerendered-error-pages/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/redirects-serverless/astro.config.mjs2
-rw-r--r--packages/integrations/vercel/test/fixtures/redirects-serverless/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/redirects/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/server-islands/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/serverless-prerender/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/serverless-prerender/src/pages/index.astro2
-rw-r--r--packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/index.astro2
-rw-r--r--packages/integrations/vercel/test/fixtures/static-assets/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/static/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/streaming/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-server/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-static/package.json2
-rw-r--r--packages/integrations/vercel/test/fixtures/with-web-analytics-enabled/output-as-static/package.json2
-rw-r--r--packages/integrations/vercel/test/hosted/hosted-astro-project/package.json2
-rw-r--r--packages/integrations/vercel/test/isr.test.js8
-rw-r--r--packages/integrations/vercel/test/no-output.test.js25
-rw-r--r--packages/integrations/vercel/test/serverless-prerender.test.js2
-rw-r--r--packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js2
31 files changed, 72 insertions, 121 deletions
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json
index 1a9785f52..2172633f1 100644
--- a/packages/integrations/vercel/package.json
+++ b/packages/integrations/vercel/package.json
@@ -10,10 +10,7 @@
"url": "https://github.com/withastro/adapters.git",
"directory": "packages/vercel"
},
- "keywords": [
- "withastro",
- "astro-adapter"
- ],
+ "keywords": ["withastro", "astro-adapter"],
"bugs": "https://github.com/withastro/adapters/issues",
"homepage": "https://docs.astro.build/en/guides/integrations-guide/vercel/",
"exports": {
@@ -30,18 +27,11 @@
},
"typesVersions": {
"*": {
- "serverless": [
- "dist/serverless/adapter.d.ts"
- ],
- "static": [
- "dist/static/adapter.d.ts"
- ]
+ "serverless": ["dist/serverless/adapter.d.ts"],
+ "static": ["dist/static/adapter.d.ts"]
}
},
- "files": [
- "dist",
- "types.d.ts"
- ],
+ "files": ["dist", "types.d.ts"],
"scripts": {
"build": "tsc",
"test": "astro-scripts test --timeout 50000 \"test/**/!(hosted).test.js\"",
@@ -57,11 +47,11 @@
"web-vitals": "^3.5.2"
},
"peerDependencies": {
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
},
"devDependencies": {
"@astrojs/test-utils": "workspace:*",
- "astro": "^5.0.0-alpha.0",
+ "astro": "^5.0.0-alpha.6",
"astro-scripts": "workspace:*",
"cheerio": "1.0.0"
},
diff --git a/packages/integrations/vercel/src/lib/prerender.ts b/packages/integrations/vercel/src/lib/prerender.ts
deleted file mode 100644
index f69f3b5d4..000000000
--- a/packages/integrations/vercel/src/lib/prerender.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type { AstroConfig } from 'astro';
-
-export function isServerLikeOutput(config: AstroConfig) {
- return config.output === 'server' || config.output === 'hybrid';
-}
diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts
index a762103f9..b8cf1f2bc 100644
--- a/packages/integrations/vercel/src/serverless/adapter.ts
+++ b/packages/integrations/vercel/src/serverless/adapter.ts
@@ -84,6 +84,7 @@ function getAdapter({
args: { middlewareSecret, skewProtection },
adapterFeatures: {
edgeMiddleware,
+ buildOutput: 'server',
},
supportedAstroFeatures: {
hybridOutput: 'stable',
@@ -235,10 +236,10 @@ export default function vercelServerless({
if (vercelConfig.trailingSlash === true && config.trailingSlash === 'always') {
logger.warn(
'\n' +
- `\tYour "vercel.json" \`trailingSlash\` configuration (set to \`true\`) will conflict with your Astro \`trailinglSlash\` configuration (set to \`"always"\`).\n` +
- // biome-ignore lint/style/noUnusedTemplateLiteral: <explanation>
- `\tThis would cause infinite redirects under certain conditions and throw an \`ERR_TOO_MANY_REDIRECTS\` error.\n` +
- `\tTo prevent this, your Astro configuration is updated to \`"ignore"\` during builds.\n`
+ `\tYour "vercel.json" \`trailingSlash\` configuration (set to \`true\`) will conflict with your Astro \`trailinglSlash\` configuration (set to \`"always"\`).\n` +
+ // biome-ignore lint/style/noUnusedTemplateLiteral: <explanation>
+ `\tThis would cause infinite redirects under certain conditions and throw an \`ERR_TOO_MANY_REDIRECTS\` error.\n` +
+ `\tTo prevent this, your Astro configuration is updated to \`"ignore"\` during builds.\n`
);
updateConfig({
trailingSlash: 'ignore',
@@ -280,12 +281,6 @@ export default function vercelServerless({
_config = config;
_buildTempFolder = config.build.server;
_serverEntry = config.build.serverEntry;
-
- if (config.output === 'static') {
- throw new AstroError(
- '`output: "server"` or `output: "hybrid"` is required to use the serverless adapter.'
- );
- }
},
'astro:build:ssr': async ({ entryPoints, middlewareEntryPoint }) => {
_entryPoints = new Map(
@@ -394,31 +389,31 @@ export default function vercelServerless({
...routeDefinitions,
...(fourOhFourRoute
? [
- {
- src: '/.*',
- dest: fourOhFourRoute.prerender
- ? '/404.html'
- : _middlewareEntryPoint
- ? MIDDLEWARE_PATH
- : NODE_PATH,
- status: 404,
- },
- ]
+ {
+ src: '/.*',
+ dest: fourOhFourRoute.prerender
+ ? '/404.html'
+ : _middlewareEntryPoint
+ ? MIDDLEWARE_PATH
+ : NODE_PATH,
+ status: 404,
+ },
+ ]
: []),
],
...(imageService || imagesConfig
? {
- images: imagesConfig
- ? {
- ...imagesConfig,
- domains: [...imagesConfig.domains, ..._config.image.domains],
- remotePatterns: [
- ...(imagesConfig.remotePatterns ?? []),
- ..._config.image.remotePatterns,
- ],
- }
- : getDefaultImageConfig(_config.image),
- }
+ images: imagesConfig
+ ? {
+ ...imagesConfig,
+ domains: [...imagesConfig.domains, ..._config.image.domains],
+ remotePatterns: [
+ ...(imagesConfig.remotePatterns ?? []),
+ ..._config.image.remotePatterns,
+ ],
+ }
+ : getDefaultImageConfig(_config.image),
+ }
: {}),
});
@@ -451,7 +446,7 @@ class VercelBuilder {
readonly logger: AstroIntegrationLogger,
readonly maxDuration?: number,
readonly runtime = getRuntime(process, logger)
- ) { }
+ ) {}
async buildServerlessFolder(entry: URL, functionName: string) {
const { config, includeFiles, excludeFiles, logger, NTF_CACHE, runtime, maxDuration } = this;
@@ -531,11 +526,11 @@ function getRuntime(process: NodeJS.Process, logger: AstroIntegrationLogger): Ru
// biome-ignore lint/style/useTemplate: <explanation>
// biome-ignore lint/style/noUnusedTemplateLiteral: <explanation>
`\n` +
- `\tThe local Node.js version (${major}) is not supported by Vercel Serverless Functions.\n` +
- // biome-ignore lint/style/noUnusedTemplateLiteral: <explanation>
- `\tYour project will use Node.js 18 as the runtime instead.\n` +
- // biome-ignore lint/style/noUnusedTemplateLiteral: <explanation>
- `\tConsider switching your local version to 18.\n`
+ `\tThe local Node.js version (${major}) is not supported by Vercel Serverless Functions.\n` +
+ // biome-ignore lint/style/noUnusedTemplateLiteral: <explanation>
+ `\tYour project will use Node.js 18 as the runtime instead.\n` +
+ // biome-ignore lint/style/noUnusedTemplateLiteral: <explanation>
+ `\tConsider switching your local version to 18.\n`
);
return 'nodejs18.x';
}
@@ -564,10 +559,10 @@ function getRuntime(process: NodeJS.Process, logger: AstroIntegrationLogger): Ru
// biome-ignore lint/style/useTemplate: <explanation>
// biome-ignore lint/style/noUnusedTemplateLiteral: <explanation>
`\n` +
- `\tYour project is being built for Node.js ${major} as the runtime.\n` +
- `\tThis version is deprecated by Vercel Serverless Functions, and scheduled to be disabled on ${removeDate}.\n` +
- // biome-ignore lint/style/noUnusedTemplateLiteral: <explanation>
- `\tConsider upgrading your local version to 18.\n`
+ `\tYour project is being built for Node.js ${major} as the runtime.\n` +
+ `\tThis version is deprecated by Vercel Serverless Functions, and scheduled to be disabled on ${removeDate}.\n` +
+ // biome-ignore lint/style/noUnusedTemplateLiteral: <explanation>
+ `\tConsider upgrading your local version to 18.\n`
);
return `nodejs${major}.x`;
}
diff --git a/packages/integrations/vercel/src/static/adapter.ts b/packages/integrations/vercel/src/static/adapter.ts
index 92c067114..f3149bdb2 100644
--- a/packages/integrations/vercel/src/static/adapter.ts
+++ b/packages/integrations/vercel/src/static/adapter.ts
@@ -7,7 +7,6 @@ import {
getAstroImageConfig,
getDefaultImageConfig,
} from '../image/shared.js';
-import { isServerLikeOutput } from '../lib/prerender.js';
import { getRedirects } from '../lib/redirects.js';
import {
type VercelSpeedInsightsConfig,
@@ -34,6 +33,7 @@ function getAdapter(): AstroAdapter {
envGetSecret: 'unsupported',
},
adapterFeatures: {
+ buildOutput: 'static',
edgeMiddleware: false,
},
};
@@ -100,10 +100,6 @@ export default function vercelStatic({
'astro:config:done': ({ setAdapter, config }) => {
setAdapter(getAdapter());
_config = config;
-
- if (isServerLikeOutput(config)) {
- throw new Error(`${PACKAGE_NAME} should be used with output: 'static'`);
- }
},
'astro:build:start': async () => {
// Ensure to have `.vercel/output` empty.
diff --git a/packages/integrations/vercel/test/fixtures/basic/package.json b/packages/integrations/vercel/test/fixtures/basic/package.json
index b809a54bf..d87829b80 100644
--- a/packages/integrations/vercel/test/fixtures/basic/package.json
+++ b/packages/integrations/vercel/test/fixtures/basic/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/image/package.json b/packages/integrations/vercel/test/fixtures/image/package.json
index 99cff97cc..1c6d91e28 100644
--- a/packages/integrations/vercel/test/fixtures/image/package.json
+++ b/packages/integrations/vercel/test/fixtures/image/package.json
@@ -7,6 +7,6 @@
},
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/isr/package.json b/packages/integrations/vercel/test/fixtures/isr/package.json
index 295021f3d..dfcafce62 100644
--- a/packages/integrations/vercel/test/fixtures/isr/package.json
+++ b/packages/integrations/vercel/test/fixtures/isr/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/max-duration/package.json b/packages/integrations/vercel/test/fixtures/max-duration/package.json
index fae5ad11e..e5f1bbb89 100644
--- a/packages/integrations/vercel/test/fixtures/max-duration/package.json
+++ b/packages/integrations/vercel/test/fixtures/max-duration/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/middleware-with-edge-file/package.json b/packages/integrations/vercel/test/fixtures/middleware-with-edge-file/package.json
index bf372d239..e32d1a84d 100644
--- a/packages/integrations/vercel/test/fixtures/middleware-with-edge-file/package.json
+++ b/packages/integrations/vercel/test/fixtures/middleware-with-edge-file/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/middleware-without-edge-file/package.json b/packages/integrations/vercel/test/fixtures/middleware-without-edge-file/package.json
index 11091eaf8..52d3b5bc0 100644
--- a/packages/integrations/vercel/test/fixtures/middleware-without-edge-file/package.json
+++ b/packages/integrations/vercel/test/fixtures/middleware-without-edge-file/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/no-output/package.json b/packages/integrations/vercel/test/fixtures/no-output/package.json
index fe312a26a..3566aa461 100644
--- a/packages/integrations/vercel/test/fixtures/no-output/package.json
+++ b/packages/integrations/vercel/test/fixtures/no-output/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/prerendered-error-pages/package.json b/packages/integrations/vercel/test/fixtures/prerendered-error-pages/package.json
index 242ff09bc..471ba6fbe 100644
--- a/packages/integrations/vercel/test/fixtures/prerendered-error-pages/package.json
+++ b/packages/integrations/vercel/test/fixtures/prerendered-error-pages/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/redirects-serverless/astro.config.mjs b/packages/integrations/vercel/test/fixtures/redirects-serverless/astro.config.mjs
index 1071b7e67..04e8ffa9d 100644
--- a/packages/integrations/vercel/test/fixtures/redirects-serverless/astro.config.mjs
+++ b/packages/integrations/vercel/test/fixtures/redirects-serverless/astro.config.mjs
@@ -2,6 +2,6 @@ import vercel from '@astrojs/vercel/serverless';
import { defineConfig } from 'astro/config';
export default defineConfig({
- output: 'hybrid',
+ output: 'static',
adapter: vercel(),
});
diff --git a/packages/integrations/vercel/test/fixtures/redirects-serverless/package.json b/packages/integrations/vercel/test/fixtures/redirects-serverless/package.json
index a7f377a16..393a63a37 100644
--- a/packages/integrations/vercel/test/fixtures/redirects-serverless/package.json
+++ b/packages/integrations/vercel/test/fixtures/redirects-serverless/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/redirects/package.json b/packages/integrations/vercel/test/fixtures/redirects/package.json
index d70c3d054..e3e344755 100644
--- a/packages/integrations/vercel/test/fixtures/redirects/package.json
+++ b/packages/integrations/vercel/test/fixtures/redirects/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/server-islands/package.json b/packages/integrations/vercel/test/fixtures/server-islands/package.json
index 6337c17cb..fb8f46eec 100644
--- a/packages/integrations/vercel/test/fixtures/server-islands/package.json
+++ b/packages/integrations/vercel/test/fixtures/server-islands/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/serverless-prerender/package.json b/packages/integrations/vercel/test/fixtures/serverless-prerender/package.json
index 693a18348..37f031879 100644
--- a/packages/integrations/vercel/test/fixtures/serverless-prerender/package.json
+++ b/packages/integrations/vercel/test/fixtures/serverless-prerender/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/serverless-prerender/src/pages/index.astro b/packages/integrations/vercel/test/fixtures/serverless-prerender/src/pages/index.astro
index b6b833e53..2a976957b 100644
--- a/packages/integrations/vercel/test/fixtures/serverless-prerender/src/pages/index.astro
+++ b/packages/integrations/vercel/test/fixtures/serverless-prerender/src/pages/index.astro
@@ -1,5 +1,5 @@
---
-export const prerender = import.meta.env.PRERENDER;
+export const prerender = true;
---
<html>
diff --git a/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json
index 0cbba16c8..a68346acb 100644
--- a/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json
+++ b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/index.astro b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/index.astro
index b6b833e53..2a976957b 100644
--- a/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/index.astro
+++ b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/index.astro
@@ -1,5 +1,5 @@
---
-export const prerender = import.meta.env.PRERENDER;
+export const prerender = true;
---
<html>
diff --git a/packages/integrations/vercel/test/fixtures/static-assets/package.json b/packages/integrations/vercel/test/fixtures/static-assets/package.json
index 883161994..d9182f087 100644
--- a/packages/integrations/vercel/test/fixtures/static-assets/package.json
+++ b/packages/integrations/vercel/test/fixtures/static-assets/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/static/package.json b/packages/integrations/vercel/test/fixtures/static/package.json
index 12f4bc90c..5f346f4bb 100644
--- a/packages/integrations/vercel/test/fixtures/static/package.json
+++ b/packages/integrations/vercel/test/fixtures/static/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/streaming/package.json b/packages/integrations/vercel/test/fixtures/streaming/package.json
index 5ba8b4e90..8771c7205 100644
--- a/packages/integrations/vercel/test/fixtures/streaming/package.json
+++ b/packages/integrations/vercel/test/fixtures/streaming/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-server/package.json b/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-server/package.json
index 05a795074..fd12a581e 100644
--- a/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-server/package.json
+++ b/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-server/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-static/package.json b/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-static/package.json
index a2f343ca8..f29142b7d 100644
--- a/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-static/package.json
+++ b/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-static/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/fixtures/with-web-analytics-enabled/output-as-static/package.json b/packages/integrations/vercel/test/fixtures/with-web-analytics-enabled/output-as-static/package.json
index 4d845331e..f45d660eb 100644
--- a/packages/integrations/vercel/test/fixtures/with-web-analytics-enabled/output-as-static/package.json
+++ b/packages/integrations/vercel/test/fixtures/with-web-analytics-enabled/output-as-static/package.json
@@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/hosted/hosted-astro-project/package.json b/packages/integrations/vercel/test/hosted/hosted-astro-project/package.json
index f926c61f7..162ff9456 100644
--- a/packages/integrations/vercel/test/hosted/hosted-astro-project/package.json
+++ b/packages/integrations/vercel/test/hosted/hosted-astro-project/package.json
@@ -7,6 +7,6 @@
},
"dependencies": {
"@astrojs/vercel": "workspace:*",
- "astro": "^5.0.0-alpha.0"
+ "astro": "^5.0.0-alpha.6"
}
}
diff --git a/packages/integrations/vercel/test/isr.test.js b/packages/integrations/vercel/test/isr.test.js
index a8df2c0ef..e20b43da1 100644
--- a/packages/integrations/vercel/test/isr.test.js
+++ b/packages/integrations/vercel/test/isr.test.js
@@ -38,10 +38,6 @@ describe('ISR', () => {
dest: '_render',
},
{
- src: '^\\/_image$',
- dest: '_render',
- },
- {
src: '^\\/excluded\\/([^/]+?)\\/?$',
dest: '/_isr?x_astro_path=$0',
},
@@ -53,6 +49,10 @@ describe('ISR', () => {
src: '^\\/two\\/?$',
dest: '/_isr?x_astro_path=$0',
},
+ {
+ src: '^\\/_image$',
+ dest: '_render',
+ },
]);
});
});
diff --git a/packages/integrations/vercel/test/no-output.test.js b/packages/integrations/vercel/test/no-output.test.js
deleted file mode 100644
index 34709804d..000000000
--- a/packages/integrations/vercel/test/no-output.test.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import assert from 'node:assert/strict';
-import { before, describe, it } from 'node:test';
-import { loadFixture } from './test-utils.js';
-
-describe('Missing output config', () => {
- /** @type {import('./test-utils').Fixture} */
- let fixture;
-
- before(async () => {
- fixture = await loadFixture({
- root: './fixtures/no-output/',
- });
- });
-
- it('throws during the build', async () => {
- let error = undefined;
- try {
- await fixture.build();
- } catch (err) {
- error = err;
- }
- assert.notEqual(error, undefined);
- assert.match(error.message, /output: "server"/);
- });
-});
diff --git a/packages/integrations/vercel/test/serverless-prerender.test.js b/packages/integrations/vercel/test/serverless-prerender.test.js
index 03ec8c225..140e422bd 100644
--- a/packages/integrations/vercel/test/serverless-prerender.test.js
+++ b/packages/integrations/vercel/test/serverless-prerender.test.js
@@ -44,7 +44,7 @@ describe('Serverless hybrid rendering', () => {
process.env.PRERENDER = true;
fixture = await loadFixture({
root: './fixtures/serverless-prerender/',
- output: 'hybrid',
+ output: 'static',
});
await fixture.build();
});
diff --git a/packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js b/packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js
index 7eac7e875..19ae4af1a 100644
--- a/packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js
+++ b/packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js
@@ -10,7 +10,7 @@ describe('Serverless with dynamic routes', () => {
process.env.PRERENDER = true;
fixture = await loadFixture({
root: './fixtures/serverless-with-dynamic-routes/',
- output: 'hybrid',
+ output: 'static',
});
await fixture.build();
});