diff --git a/.changeset/eighty-badgers-change.md b/.changeset/eighty-badgers-change.md new file mode 100644 index 000000000..47776dd3e --- /dev/null +++ b/.changeset/eighty-badgers-change.md @@ -0,0 +1,8 @@ +--- +'@astrojs/cloudflare': major +'@astrojs/netlify': major +'@astrojs/vercel': major +'@astrojs/node': major +--- + +Updates internal code to works with Astro 5 changes to hybrid rendering. No changes are necessary to your project, apart from using Astro 5 diff --git a/.gitignore b/.gitignore index f4db98adb..d1de55308 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ package-lock.json .eslintcache .pnpm-store .idea/ +**/fixtures/**/.astro # ignore top-level vscode settings /.vscode/settings.json @@ -20,4 +21,3 @@ package-lock.json # exclude IntelliJ/WebStorm stuff .idea - diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json index 436062f4e..d7726ea77 100644 --- a/packages/cloudflare/package.json +++ b/packages/cloudflare/package.json @@ -40,11 +40,11 @@ "@inox-tools/astro-when": "^0.2.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", "execa": "^8.0.1", diff --git a/packages/cloudflare/src/index.ts b/packages/cloudflare/src/index.ts index c4a42cd94..695af8671 100644 --- a/packages/cloudflare/src/index.ts +++ b/packages/cloudflare/src/index.ts @@ -141,10 +141,10 @@ export default function createIntegration(args?: Options): AstroIntegration { order: 'pre', }); }, - 'astro:config:done': ({ setAdapter, config }) => { - if (config.output === 'static') { - throw new AstroError( - '[@astrojs/cloudflare] `output: "server"` or `output: "hybrid"` is required to use this adapter. Otherwise, this adapter is not necessary to deploy a static site to Cloudflare.' + 'astro:config:done': ({ setAdapter, config, buildOutput, logger }) => { + if (buildOutput === 'static') { + logger.warn( + '[@astrojs/cloudflare] This adapter is intended to be used with server rendered pages, which this project does not contain any of. As such, this adapter is unnecessary.' ); } @@ -156,6 +156,7 @@ export default function createIntegration(args?: Options): AstroIntegration { exports: ['default'], adapterFeatures: { edgeMiddleware: false, + buildOutput: 'server', }, supportedAstroFeatures: { serverOutput: 'stable', diff --git a/packages/cloudflare/src/utils/image-config.ts b/packages/cloudflare/src/utils/image-config.ts index b191be366..21d9ec733 100644 --- a/packages/cloudflare/src/utils/image-config.ts +++ b/packages/cloudflare/src/utils/image-config.ts @@ -1,10 +1,10 @@ -import type { AstroConfig, AstroIntegrationLogger } from 'astro'; +import type { AstroConfig, AstroIntegrationLogger, HookParameters } from 'astro'; import { passthroughImageService, sharpImageService } from 'astro/config'; export function setImageConfig( service: string, config: AstroConfig['image'], - command: 'dev' | 'build' | 'preview', + command: HookParameters<'astro:config:setup'>['command'], logger: AstroIntegrationLogger ) { switch (service) { diff --git a/packages/cloudflare/test/fixtures/astro-dev-platform/package.json b/packages/cloudflare/test/fixtures/astro-dev-platform/package.json index c28d37081..f001946d9 100644 --- a/packages/cloudflare/test/fixtures/astro-dev-platform/package.json +++ b/packages/cloudflare/test/fixtures/astro-dev-platform/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^5.0.0-alpha.0" + "astro": "^5.0.0-alpha.6" }, "devDependencies": { "wrangler": "^3.72.2" diff --git a/packages/cloudflare/test/fixtures/astro-env/astro.config.ts b/packages/cloudflare/test/fixtures/astro-env/astro.config.ts index 8017c0b6d..b7d556b3b 100644 --- a/packages/cloudflare/test/fixtures/astro-env/astro.config.ts +++ b/packages/cloudflare/test/fixtures/astro-env/astro.config.ts @@ -2,13 +2,11 @@ import cloudflare from '@astrojs/cloudflare'; import { defineConfig, envField } from 'astro/config'; export default defineConfig({ - experimental: { - env: { - schema: { - API_URL: envField.string({ context: 'client', access: 'public', optional: true }), - PORT: envField.number({ context: 'server', access: 'public', default: 4321 }), - API_SECRET: envField.string({ context: 'server', access: 'secret' }), - }, + env: { + schema: { + API_URL: envField.string({ context: 'client', access: 'public', optional: true }), + PORT: envField.number({ context: 'server', access: 'public', default: 4321 }), + API_SECRET: envField.string({ context: 'server', access: 'secret' }), }, }, adapter: cloudflare(), diff --git a/packages/cloudflare/test/fixtures/astro-env/package.json b/packages/cloudflare/test/fixtures/astro-env/package.json index 3c0ac3bf8..e1bf4c8e0 100644 --- a/packages/cloudflare/test/fixtures/astro-env/package.json +++ b/packages/cloudflare/test/fixtures/astro-env/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^5.0.0-alpha.0" + "astro": "^5.0.0-alpha.6" }, "devDependencies": { "wrangler": "^3.72.2" diff --git a/packages/cloudflare/test/fixtures/compile-image-service/astro.config.mjs b/packages/cloudflare/test/fixtures/compile-image-service/astro.config.mjs index 7c569595e..7c98bbb98 100644 --- a/packages/cloudflare/test/fixtures/compile-image-service/astro.config.mjs +++ b/packages/cloudflare/test/fixtures/compile-image-service/astro.config.mjs @@ -5,5 +5,5 @@ export default defineConfig({ adapter: cloudflare({ imageService: 'compile', }), - output: 'hybrid', + output: 'static', }); diff --git a/packages/cloudflare/test/fixtures/compile-image-service/package.json b/packages/cloudflare/test/fixtures/compile-image-service/package.json index 337f2282b..b141fbce7 100644 --- a/packages/cloudflare/test/fixtures/compile-image-service/package.json +++ b/packages/cloudflare/test/fixtures/compile-image-service/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^5.0.0-alpha.0" + "astro": "^5.0.0-alpha.6" } } diff --git a/packages/cloudflare/test/fixtures/external-image-service/package.json b/packages/cloudflare/test/fixtures/external-image-service/package.json index 7e4f0c34e..28746837f 100644 --- a/packages/cloudflare/test/fixtures/external-image-service/package.json +++ b/packages/cloudflare/test/fixtures/external-image-service/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^5.0.0-alpha.0" + "astro": "^5.0.0-alpha.6" } } diff --git a/packages/cloudflare/test/fixtures/module-loader/astro.config.mjs b/packages/cloudflare/test/fixtures/module-loader/astro.config.mjs index dd2af8bc2..38365a374 100644 --- a/packages/cloudflare/test/fixtures/module-loader/astro.config.mjs +++ b/packages/cloudflare/test/fixtures/module-loader/astro.config.mjs @@ -3,5 +3,5 @@ import { defineConfig } from 'astro/config'; export default defineConfig({ adapter: cloudflare({}), - output: 'hybrid' + output: 'static' }); diff --git a/packages/cloudflare/test/fixtures/module-loader/package.json b/packages/cloudflare/test/fixtures/module-loader/package.json index 472f43a04..6381b72de 100644 --- a/packages/cloudflare/test/fixtures/module-loader/package.json +++ b/packages/cloudflare/test/fixtures/module-loader/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^5.0.0-alpha.0" + "astro": "^5.0.0-alpha.6" } } diff --git a/packages/cloudflare/test/fixtures/no-output/package.json b/packages/cloudflare/test/fixtures/no-output/package.json index 446cb9dab..e5f40f7b8 100644 --- a/packages/cloudflare/test/fixtures/no-output/package.json +++ b/packages/cloudflare/test/fixtures/no-output/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^5.0.0-alpha.0" + "astro": "^5.0.0-alpha.6" } } diff --git a/packages/cloudflare/test/fixtures/routes-json/astro.config.mjs b/packages/cloudflare/test/fixtures/routes-json/astro.config.mjs index 6fa5ec5d3..3aaa37d9a 100644 --- a/packages/cloudflare/test/fixtures/routes-json/astro.config.mjs +++ b/packages/cloudflare/test/fixtures/routes-json/astro.config.mjs @@ -1,7 +1,7 @@ import { defineConfig } from 'astro/config'; export default defineConfig({ - output: 'hybrid', + output: 'static', redirects: { '/a/redirect': '/', }, diff --git a/packages/cloudflare/test/fixtures/routes-json/package.json b/packages/cloudflare/test/fixtures/routes-json/package.json index d526f29d5..4755e86c6 100644 --- a/packages/cloudflare/test/fixtures/routes-json/package.json +++ b/packages/cloudflare/test/fixtures/routes-json/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^5.0.0-alpha.0" + "astro": "^5.0.0-alpha.6" } } diff --git a/packages/cloudflare/test/fixtures/with-solid-js/package.json b/packages/cloudflare/test/fixtures/with-solid-js/package.json index 79e7ee34d..43090f109 100644 --- a/packages/cloudflare/test/fixtures/with-solid-js/package.json +++ b/packages/cloudflare/test/fixtures/with-solid-js/package.json @@ -5,7 +5,7 @@ "dependencies": { "@astrojs/cloudflare": "workspace:*", "@astrojs/solid-js": "^4.4.1", - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "solid-js": "^1.8.21" } } diff --git a/packages/cloudflare/test/fixtures/wrangler-preview-platform/package.json b/packages/cloudflare/test/fixtures/wrangler-preview-platform/package.json index d006ba799..1cd81fa2a 100644 --- a/packages/cloudflare/test/fixtures/wrangler-preview-platform/package.json +++ b/packages/cloudflare/test/fixtures/wrangler-preview-platform/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^5.0.0-alpha.0" + "astro": "^5.0.0-alpha.6" } } diff --git a/packages/cloudflare/test/no-output.test.js b/packages/cloudflare/test/no-output.test.js deleted file mode 100644 index bf5321491..000000000 --- a/packages/cloudflare/test/no-output.test.js +++ /dev/null @@ -1,23 +0,0 @@ -import * as assert from 'node:assert/strict'; -import { describe, it } from 'node:test'; -import { fileURLToPath } from 'node:url'; -import { astroCli } from './_test-utils.js'; - -const root = new URL('./fixtures/no-output/', import.meta.url); - -describe('MissingOutputConfig', () => { - it('throws during the build', async () => { - let error = undefined; - try { - await astroCli(fileURLToPath(root), 'build'); - } catch (err) { - error = err; - } - assert.notEqual(error, undefined); - assert.ok( - error.message.includes( - '[@astrojs/cloudflare] `output: "server"` or `output: "hybrid"` is required to use this adapter.' - ) - ); - }); -}); diff --git a/packages/cloudflare/test/routes-json.test.js b/packages/cloudflare/test/routes-json.test.js index 7051e29b7..1442ddfed 100644 --- a/packages/cloudflare/test/routes-json.test.js +++ b/packages/cloudflare/test/routes-json.test.js @@ -23,7 +23,7 @@ describe('_routes.json generation', () => { assert.deepEqual(routes, { version: 1, - include: ['/_image', '/a/*'], + include: ['/a/*', '/_image'], exclude: ['/_astro/*', '/redirectme', '/public.txt', '/a', '/a/redirect', '/404', '/b'], }); }); @@ -71,7 +71,7 @@ describe('_routes.json generation', () => { assert.deepEqual(routes, { version: 1, - include: ['/_image'], + include: [], exclude: [], }); }); @@ -101,7 +101,7 @@ describe('_routes.json generation', () => { assert.deepEqual(routes, { version: 1, - include: ['/_image', '/a/*', '/another'], + include: ['/a/*', '/_image', '/another'], exclude: ['/_astro/*', '/redirectme', '/public.txt', '/a', '/a/redirect', '/404', '/b'], }); }); @@ -131,7 +131,7 @@ describe('_routes.json generation', () => { assert.deepEqual(routes, { version: 1, - include: ['/_image', '/a/*'], + include: ['/a/*', '/_image'], exclude: [ '/_astro/*', '/redirectme', diff --git a/packages/netlify/package.json b/packages/netlify/package.json index ff506752c..d22b0d4c7 100644 --- a/packages/netlify/package.json +++ b/packages/netlify/package.json @@ -38,14 +38,14 @@ "esbuild": "^0.23.1" }, "peerDependencies": { - "astro": "^5.0.0-alpha.0" + "astro": "^5.0.0-alpha.6" }, "devDependencies": { "@astrojs/test-utils": "workspace:*", "@netlify/edge-functions": "^2.10.0", "@netlify/edge-handler-types": "^0.34.1", "@types/node": "^20.16.1", - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "astro-scripts": "workspace:*", "cheerio": "1.0.0", "execa": "^8.0.1", diff --git a/packages/netlify/src/index.ts b/packages/netlify/src/index.ts index d2da0fd98..11dfafe51 100644 --- a/packages/netlify/src/index.ts +++ b/packages/netlify/src/index.ts @@ -5,7 +5,13 @@ import { fileURLToPath } from 'node:url'; import { emptyDir } from '@astrojs/internal-helpers/fs'; import { createRedirectsFromAstroRoutes } from '@astrojs/underscore-redirects'; import type { Context } from '@netlify/functions'; -import type { AstroConfig, AstroIntegration, AstroIntegrationLogger, RouteData } from 'astro'; +import type { + AstroConfig, + AstroIntegration, + AstroIntegrationLogger, + HookParameters, + RouteData, +} from 'astro'; import { build } from 'esbuild'; import { copyDependenciesToFunction } from './lib/nft.js'; import type { Args } from './ssr-function.js'; @@ -201,6 +207,8 @@ export default function netlifyIntegration( // Secret used to verify that the caller is the astro-generated edge middleware and not a third-party const middlewareSecret = randomUUID(); + let finalBuildOutput: HookParameters<'astro:config:done'>['buildOutput']; + const TRACE_CACHE = {}; const ssrBuildDir = () => new URL('./.netlify/build/', rootDir); @@ -215,7 +223,7 @@ export default function netlifyIntegration( ]); async function writeRedirects(routes: RouteData[], dir: URL) { - const fallback = _config.output === 'static' ? '/.netlify/static' : '/.netlify/functions/ssr'; + const fallback = finalBuildOutput === 'static' ? '/.netlify/static' : '/.netlify/functions/ssr'; const redirects = createRedirectsFromAstroRoutes({ config: _config, dir, @@ -283,7 +291,7 @@ export default function netlifyIntegration( import { createContext, trySerializeLocals } from 'astro/middleware'; export default async (request, context) => { - const ctx = createContext({ + const ctx = createContext({ request, params: {} }); @@ -294,7 +302,7 @@ export default function netlifyIntegration( request.headers.set("x-astro-middleware-secret", "${middlewareSecret}"); return context.next(); }; - + return onRequest(ctx, next); } @@ -440,10 +448,12 @@ export default function netlifyIntegration( }, }); }, - 'astro:config:done': async ({ config, setAdapter, logger }) => { + 'astro:config:done': async ({ config, setAdapter, logger, buildOutput }) => { rootDir = config.root; _config = config; + finalBuildOutput = buildOutput; + await writeNetlifyFrameworkConfig(config, logger); const edgeMiddleware = integrationConfig?.edgeMiddleware ?? false; @@ -477,7 +487,7 @@ export default function netlifyIntegration( await writeRedirects(routes, dir); logger.info('Emitted _redirects'); - if (_config.output !== 'static') { + if (finalBuildOutput !== 'static') { let notFoundContent = undefined; try { notFoundContent = await readFile(new URL('./404.html', dir), 'utf8'); diff --git a/packages/netlify/test/functions/fixtures/redirects/astro.config.mjs b/packages/netlify/test/functions/fixtures/redirects/astro.config.mjs index 1773ad73e..55613bd91 100644 --- a/packages/netlify/test/functions/fixtures/redirects/astro.config.mjs +++ b/packages/netlify/test/functions/fixtures/redirects/astro.config.mjs @@ -2,10 +2,10 @@ import netlify from '@astrojs/netlify'; import { defineConfig } from 'astro/config'; export default defineConfig({ - output: 'hybrid', + output: 'static', adapter: netlify(), site: `http://example.com`, redirects: { '/other': '/', }, -}); \ No newline at end of file +}); diff --git a/packages/netlify/test/hosted/hosted-astro-project/package.json b/packages/netlify/test/hosted/hosted-astro-project/package.json index 46ed71514..46180c46a 100644 --- a/packages/netlify/test/hosted/hosted-astro-project/package.json +++ b/packages/netlify/test/hosted/hosted-astro-project/package.json @@ -7,6 +7,6 @@ }, "dependencies": { "@astrojs/netlify": "workspace:*", - "astro": "^5.0.0-alpha.0" + "astro": "^5.0.0-alpha.6" } } diff --git a/packages/node/package.json b/packages/node/package.json index 90027f681..b9aa4ea3a 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -30,14 +30,14 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "^5.0.0-alpha.0" + "astro": "^5.0.0-alpha.6" }, "devDependencies": { "@astrojs/test-utils": "workspace:*", "@types/node": "^18.17.8", "@types/send": "^0.17.4", "@types/server-destroy": "^1.0.4", - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "astro-scripts": "workspace:*", "cheerio": "1.0.0", "express": "^4.19.2", diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts index ec7a2ae3f..dbd39e6ea 100644 --- a/packages/node/src/index.ts +++ b/packages/node/src/index.ts @@ -9,6 +9,10 @@ export function getAdapter(options: Options): AstroAdapter { previewEntrypoint: '@astrojs/node/preview.js', exports: ['handler', 'startServer', 'options'], args: options, + adapterFeatures: { + buildOutput: 'server', + edgeMiddleware: false, + }, supportedAstroFeatures: { hybridOutput: 'stable', staticOutput: 'stable', @@ -59,7 +63,7 @@ export default function createIntegration(userOptions: UserOptions): AstroIntegr }, }); }, - 'astro:config:done': ({ setAdapter, config, logger }) => { + 'astro:config:done': ({ setAdapter, config }) => { _options = { ...userOptions, client: config.build.client?.toString(), @@ -69,12 +73,6 @@ export default function createIntegration(userOptions: UserOptions): AstroIntegr assets: config.build.assets, }; setAdapter(getAdapter(_options)); - - if (config.output === 'static') { - logger.warn( - `\`output: "server"\` or \`output: "hybrid"\` is required to use this adapter.` - ); - } }, }, }; diff --git a/packages/node/test/fixtures/api-route/package.json b/packages/node/test/fixtures/api-route/package.json index 00f611ee7..160b7e469 100644 --- a/packages/node/test/fixtures/api-route/package.json +++ b/packages/node/test/fixtures/api-route/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/node/test/fixtures/bad-urls/package.json b/packages/node/test/fixtures/bad-urls/package.json index 994059623..d844ccea2 100644 --- a/packages/node/test/fixtures/bad-urls/package.json +++ b/packages/node/test/fixtures/bad-urls/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/node/test/fixtures/encoded/package.json b/packages/node/test/fixtures/encoded/package.json index c09b8ffdb..3882bc4a1 100644 --- a/packages/node/test/fixtures/encoded/package.json +++ b/packages/node/test/fixtures/encoded/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/node/test/fixtures/errors/package.json b/packages/node/test/fixtures/errors/package.json index d2ba94d58..b17a2a91a 100644 --- a/packages/node/test/fixtures/errors/package.json +++ b/packages/node/test/fixtures/errors/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/node/test/fixtures/headers/package.json b/packages/node/test/fixtures/headers/package.json index 62279c2f4..af673c6d5 100644 --- a/packages/node/test/fixtures/headers/package.json +++ b/packages/node/test/fixtures/headers/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/node/test/fixtures/image/package.json b/packages/node/test/fixtures/image/package.json index 189696f9a..b5b05238d 100644 --- a/packages/node/test/fixtures/image/package.json +++ b/packages/node/test/fixtures/image/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" }, "scripts": { diff --git a/packages/node/test/fixtures/locals/package.json b/packages/node/test/fixtures/locals/package.json index 936fa6d10..136c488b1 100644 --- a/packages/node/test/fixtures/locals/package.json +++ b/packages/node/test/fixtures/locals/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/node/test/fixtures/node-middleware/package.json b/packages/node/test/fixtures/node-middleware/package.json index c40b6d780..23ff56efb 100644 --- a/packages/node/test/fixtures/node-middleware/package.json +++ b/packages/node/test/fixtures/node-middleware/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/node/test/fixtures/prerender-404-500/package.json b/packages/node/test/fixtures/prerender-404-500/package.json index e85b7c94c..9f5e107c7 100644 --- a/packages/node/test/fixtures/prerender-404-500/package.json +++ b/packages/node/test/fixtures/prerender-404-500/package.json @@ -4,7 +4,7 @@ "private": true, "type": "module", "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/node/test/fixtures/prerender/package.json b/packages/node/test/fixtures/prerender/package.json index a457db530..69395eba2 100644 --- a/packages/node/test/fixtures/prerender/package.json +++ b/packages/node/test/fixtures/prerender/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/node/test/fixtures/prerender/src/pages/two.astro b/packages/node/test/fixtures/prerender/src/pages/two.astro index c0e5d07aa..beb6e8d78 100644 --- a/packages/node/test/fixtures/prerender/src/pages/two.astro +++ b/packages/node/test/fixtures/prerender/src/pages/two.astro @@ -1,5 +1,5 @@ --- -export const prerender = import.meta.env.PRERENDER; +export const prerender = true; --- diff --git a/packages/node/test/fixtures/preview-headers/package.json b/packages/node/test/fixtures/preview-headers/package.json index 08c35bdf6..63556d024 100644 --- a/packages/node/test/fixtures/preview-headers/package.json +++ b/packages/node/test/fixtures/preview-headers/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/node/test/fixtures/trailing-slash/astro.config.mjs b/packages/node/test/fixtures/trailing-slash/astro.config.mjs index 7ee28f213..acf78132b 100644 --- a/packages/node/test/fixtures/trailing-slash/astro.config.mjs +++ b/packages/node/test/fixtures/trailing-slash/astro.config.mjs @@ -2,7 +2,7 @@ import node from '@astrojs/node' export default { base: '/some-base', - output: 'hybrid', + output: 'static', trailingSlash: 'never', adapter: node({ mode: 'standalone' }) }; diff --git a/packages/node/test/fixtures/trailing-slash/package.json b/packages/node/test/fixtures/trailing-slash/package.json index 8bc0f20da..ff64fa458 100644 --- a/packages/node/test/fixtures/trailing-slash/package.json +++ b/packages/node/test/fixtures/trailing-slash/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/node/test/fixtures/url/package.json b/packages/node/test/fixtures/url/package.json index 42609de2e..20cc9ae57 100644 --- a/packages/node/test/fixtures/url/package.json +++ b/packages/node/test/fixtures/url/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/node/test/fixtures/well-known-locations/package.json b/packages/node/test/fixtures/well-known-locations/package.json index 29d13cc45..13ae4d63d 100644 --- a/packages/node/test/fixtures/well-known-locations/package.json +++ b/packages/node/test/fixtures/well-known-locations/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/node/test/prerender-404-500.test.js b/packages/node/test/prerender-404-500.test.js index 0cc669c45..1c8a28cdb 100644 --- a/packages/node/test/prerender-404-500.test.js +++ b/packages/node/test/prerender-404-500.test.js @@ -26,10 +26,6 @@ describe('Prerender 404', () => { root: './fixtures/prerender-404-500/', output: 'server', outDir: './dist/server-with-base', - build: { - client: './dist/server-with-base/client', - server: './dist/server-with-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -117,10 +113,6 @@ describe('Prerender 404', () => { root: './fixtures/prerender-404-500/', output: 'server', outDir: './dist/server-without-base', - build: { - client: './dist/server-without-base/client', - server: './dist/server-without-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -185,12 +177,8 @@ describe('Hybrid 404', () => { site: 'https://test.com/', base: '/some-base', root: './fixtures/prerender-404-500/', - output: 'hybrid', + output: 'static', outDir: './dist/hybrid-with-base', - build: { - client: './dist/hybrid-with-base/client', - server: './dist/hybrid-with-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -248,12 +236,8 @@ describe('Hybrid 404', () => { // from being reused site: 'https://test.net/', root: './fixtures/prerender-404-500/', - output: 'hybrid', + output: 'static', outDir: './dist/hybrid-without-base', - build: { - client: './dist/hybrid-without-base/client', - server: './dist/hybrid-without-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); diff --git a/packages/node/test/prerender.test.js b/packages/node/test/prerender.test.js index e4d8cbb4a..311b18bd9 100644 --- a/packages/node/test/prerender.test.js +++ b/packages/node/test/prerender.test.js @@ -22,10 +22,6 @@ describe('Prerendering', () => { root: './fixtures/prerender/', output: 'server', outDir: './dist/with-base', - build: { - client: './dist/with-base/client', - server: './dist/with-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -99,10 +95,6 @@ describe('Prerendering', () => { root: './fixtures/prerender/', output: 'server', outDir: './dist/without-base', - build: { - client: './dist/without-base/client', - server: './dist/without-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -165,10 +157,6 @@ describe('Prerendering', () => { root: './fixtures/prerender/', output: 'server', outDir: './dist/via-integration', - build: { - client: './dist/via-integration/client', - server: './dist/via-integration/server', - }, adapter: nodejs({ mode: 'standalone' }), integrations: [ { @@ -228,10 +216,6 @@ describe('Prerendering', () => { root: './fixtures/prerender/', output: 'server', outDir: './dist/dev', - build: { - client: './dist/dev/client', - server: './dist/dev/server', - }, adapter: nodejs({ mode: 'standalone' }), }); devServer = await fixture.startDevServer(); @@ -276,12 +260,8 @@ describe('Hybrid rendering', () => { fixture = await loadFixture({ base: '/some-base', root: './fixtures/prerender/', - output: 'hybrid', + output: 'static', outDir: './dist/hybrid-with-base', - build: { - client: './dist/hybrid-with-base/client', - server: './dist/hybrid-with-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -351,12 +331,8 @@ describe('Hybrid rendering', () => { process.env.PRERENDER = false; fixture = await loadFixture({ root: './fixtures/prerender/', - output: 'hybrid', + output: 'static', outDir: './dist/hybrid-without-base', - build: { - client: './dist/hybrid-without-base/client', - server: './dist/hybrid-without-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -418,12 +394,8 @@ describe('Hybrid rendering', () => { fixture = await loadFixture({ root: './fixtures/prerender/', - output: 'hybrid', + output: 'static', outDir: './dist/hybrid-shared-modules', - build: { - client: './dist/hybrid-shared-modules/client', - server: './dist/hybrid-shared-modules/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); diff --git a/packages/node/test/trailing-slash.test.js b/packages/node/test/trailing-slash.test.js index 95c6661f5..0ed46e9aa 100644 --- a/packages/node/test/trailing-slash.test.js +++ b/packages/node/test/trailing-slash.test.js @@ -21,13 +21,9 @@ describe('Trailing slash', () => { fixture = await loadFixture({ root: './fixtures/trailing-slash/', base: '/some-base', - output: 'hybrid', + output: 'static', trailingSlash: 'always', outDir: './dist/always-with-base', - build: { - client: './dist/always-with-base/client', - server: './dist/always-with-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -94,13 +90,9 @@ describe('Trailing slash', () => { fixture = await loadFixture({ root: './fixtures/trailing-slash/', - output: 'hybrid', + output: 'static', trailingSlash: 'always', outDir: './dist/always-without-base', - build: { - client: './dist/always-without-base/client', - server: './dist/always-without-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -170,13 +162,9 @@ describe('Trailing slash', () => { fixture = await loadFixture({ root: './fixtures/trailing-slash/', base: '/some-base', - output: 'hybrid', + output: 'static', trailingSlash: 'never', outDir: './dist/never-with-base', - build: { - client: './dist/never-with-base/client', - server: './dist/never-with-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -236,13 +224,9 @@ describe('Trailing slash', () => { fixture = await loadFixture({ root: './fixtures/trailing-slash/', - output: 'hybrid', + output: 'static', trailingSlash: 'never', outDir: './dist/never-without-base', - build: { - client: './dist/never-without-base/client', - server: './dist/never-without-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -305,13 +289,9 @@ describe('Trailing slash', () => { fixture = await loadFixture({ root: './fixtures/trailing-slash/', base: '/some-base', - output: 'hybrid', + output: 'static', trailingSlash: 'ignore', outDir: './dist/ignore-with-base', - build: { - client: './dist/ignore-with-base/client', - server: './dist/ignore-with-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -389,13 +369,9 @@ describe('Trailing slash', () => { fixture = await loadFixture({ root: './fixtures/trailing-slash/', - output: 'hybrid', + output: 'static', trailingSlash: 'ignore', outDir: './dist/ignore-without-base', - build: { - client: './dist/ignore-without-base/client', - server: './dist/ignore-without-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index f895d417e..b51621be3 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -8,7 +8,7 @@ }, "keywords": [], "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "execa": "^8.0.1", "fast-glob": "^3.3.2", "strip-ansi": "^7.1.0" diff --git a/packages/test-utils/test-utils.js b/packages/test-utils/test-utils.js index f04c5077c..812ab7139 100644 --- a/packages/test-utils/test-utils.js +++ b/packages/test-utils/test-utils.js @@ -7,9 +7,6 @@ import fastGlob from 'fast-glob'; import stripAnsi from 'strip-ansi'; import { check } from './node_modules/astro/dist/cli/check/index.js'; import build from './node_modules/astro/dist/core/build/index.js'; -import { RESOLVED_SPLIT_MODULE_ID } from './node_modules/astro/dist/core/build/plugins/plugin-ssr.js'; -import { getVirtualModulePageName } from './node_modules/astro/dist/core/build/plugins/util.js'; -import { makeSplitEntryPointFileName } from './node_modules/astro/dist/core/build/static-build.js'; import { mergeConfig, resolveConfig } from './node_modules/astro/dist/core/config/index.js'; import { dev, preview } from './node_modules/astro/dist/core/index.js'; import { nodeLogDestination } from './node_modules/astro/dist/core/logger/node.js'; @@ -217,15 +214,6 @@ export async function loadFixture(inlineConfig) { app.manifest = manifest; return app; }, - loadEntryPoint: async (pagePath, routes, streaming) => { - const virtualModule = getVirtualModulePageName(RESOLVED_SPLIT_MODULE_ID, pagePath); - const filePath = makeSplitEntryPointFileName(virtualModule, routes); - const url = new URL(`./server/${filePath}?id=${fixtureId}`, config.outDir); - const { createApp, manifest } = await import(url); - const app = createApp(streaming); - app.manifest = manifest; - return app; - }, editFile: async (filePath, newContentsOrCallback) => { const fileUrl = new URL(filePath.replace(/^\//, ''), config.root); const contents = await fs.promises.readFile(fileUrl, 'utf-8'); diff --git a/packages/vercel/package.json b/packages/vercel/package.json index 1a9785f52..2172633f1 100644 --- a/packages/vercel/package.json +++ b/packages/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/vercel/src/lib/prerender.ts b/packages/vercel/src/lib/prerender.ts deleted file mode 100644 index f69f3b5d4..000000000 --- a/packages/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/vercel/src/serverless/adapter.ts b/packages/vercel/src/serverless/adapter.ts index a762103f9..b8cf1f2bc 100644 --- a/packages/vercel/src/serverless/adapter.ts +++ b/packages/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: - `\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: + `\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: // biome-ignore lint/style/noUnusedTemplateLiteral: `\n` + - `\tThe local Node.js version (${major}) is not supported by Vercel Serverless Functions.\n` + - // biome-ignore lint/style/noUnusedTemplateLiteral: - `\tYour project will use Node.js 18 as the runtime instead.\n` + - // biome-ignore lint/style/noUnusedTemplateLiteral: - `\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: + `\tYour project will use Node.js 18 as the runtime instead.\n` + + // biome-ignore lint/style/noUnusedTemplateLiteral: + `\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: // biome-ignore lint/style/noUnusedTemplateLiteral: `\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: - `\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: + `\tConsider upgrading your local version to 18.\n` ); return `nodejs${major}.x`; } diff --git a/packages/vercel/src/static/adapter.ts b/packages/vercel/src/static/adapter.ts index 92c067114..f3149bdb2 100644 --- a/packages/vercel/src/static/adapter.ts +++ b/packages/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/vercel/test/fixtures/basic/package.json b/packages/vercel/test/fixtures/basic/package.json index b809a54bf..d87829b80 100644 --- a/packages/vercel/test/fixtures/basic/package.json +++ b/packages/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/vercel/test/fixtures/image/package.json b/packages/vercel/test/fixtures/image/package.json index 99cff97cc..1c6d91e28 100644 --- a/packages/vercel/test/fixtures/image/package.json +++ b/packages/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/vercel/test/fixtures/isr/package.json b/packages/vercel/test/fixtures/isr/package.json index 295021f3d..dfcafce62 100644 --- a/packages/vercel/test/fixtures/isr/package.json +++ b/packages/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/vercel/test/fixtures/max-duration/package.json b/packages/vercel/test/fixtures/max-duration/package.json index fae5ad11e..e5f1bbb89 100644 --- a/packages/vercel/test/fixtures/max-duration/package.json +++ b/packages/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/vercel/test/fixtures/middleware-with-edge-file/package.json b/packages/vercel/test/fixtures/middleware-with-edge-file/package.json index bf372d239..e32d1a84d 100644 --- a/packages/vercel/test/fixtures/middleware-with-edge-file/package.json +++ b/packages/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/vercel/test/fixtures/middleware-without-edge-file/package.json b/packages/vercel/test/fixtures/middleware-without-edge-file/package.json index 11091eaf8..52d3b5bc0 100644 --- a/packages/vercel/test/fixtures/middleware-without-edge-file/package.json +++ b/packages/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/vercel/test/fixtures/no-output/package.json b/packages/vercel/test/fixtures/no-output/package.json index fe312a26a..3566aa461 100644 --- a/packages/vercel/test/fixtures/no-output/package.json +++ b/packages/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/vercel/test/fixtures/prerendered-error-pages/package.json b/packages/vercel/test/fixtures/prerendered-error-pages/package.json index 242ff09bc..471ba6fbe 100644 --- a/packages/vercel/test/fixtures/prerendered-error-pages/package.json +++ b/packages/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/vercel/test/fixtures/redirects-serverless/astro.config.mjs b/packages/vercel/test/fixtures/redirects-serverless/astro.config.mjs index 1071b7e67..04e8ffa9d 100644 --- a/packages/vercel/test/fixtures/redirects-serverless/astro.config.mjs +++ b/packages/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/vercel/test/fixtures/redirects-serverless/package.json b/packages/vercel/test/fixtures/redirects-serverless/package.json index a7f377a16..393a63a37 100644 --- a/packages/vercel/test/fixtures/redirects-serverless/package.json +++ b/packages/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/vercel/test/fixtures/redirects/package.json b/packages/vercel/test/fixtures/redirects/package.json index d70c3d054..e3e344755 100644 --- a/packages/vercel/test/fixtures/redirects/package.json +++ b/packages/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/vercel/test/fixtures/server-islands/package.json b/packages/vercel/test/fixtures/server-islands/package.json index 6337c17cb..fb8f46eec 100644 --- a/packages/vercel/test/fixtures/server-islands/package.json +++ b/packages/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/vercel/test/fixtures/serverless-prerender/package.json b/packages/vercel/test/fixtures/serverless-prerender/package.json index 693a18348..37f031879 100644 --- a/packages/vercel/test/fixtures/serverless-prerender/package.json +++ b/packages/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/vercel/test/fixtures/serverless-prerender/src/pages/index.astro b/packages/vercel/test/fixtures/serverless-prerender/src/pages/index.astro index b6b833e53..2a976957b 100644 --- a/packages/vercel/test/fixtures/serverless-prerender/src/pages/index.astro +++ b/packages/vercel/test/fixtures/serverless-prerender/src/pages/index.astro @@ -1,5 +1,5 @@ --- -export const prerender = import.meta.env.PRERENDER; +export const prerender = true; --- diff --git a/packages/vercel/test/fixtures/serverless-with-dynamic-routes/package.json b/packages/vercel/test/fixtures/serverless-with-dynamic-routes/package.json index 0cbba16c8..a68346acb 100644 --- a/packages/vercel/test/fixtures/serverless-with-dynamic-routes/package.json +++ b/packages/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/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/index.astro b/packages/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/index.astro index b6b833e53..2a976957b 100644 --- a/packages/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/index.astro +++ b/packages/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; --- diff --git a/packages/vercel/test/fixtures/static-assets/package.json b/packages/vercel/test/fixtures/static-assets/package.json index 883161994..d9182f087 100644 --- a/packages/vercel/test/fixtures/static-assets/package.json +++ b/packages/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/vercel/test/fixtures/static/package.json b/packages/vercel/test/fixtures/static/package.json index 12f4bc90c..5f346f4bb 100644 --- a/packages/vercel/test/fixtures/static/package.json +++ b/packages/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/vercel/test/fixtures/streaming/package.json b/packages/vercel/test/fixtures/streaming/package.json index 5ba8b4e90..8771c7205 100644 --- a/packages/vercel/test/fixtures/streaming/package.json +++ b/packages/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/vercel/test/fixtures/with-speed-insights-enabled/output-as-server/package.json b/packages/vercel/test/fixtures/with-speed-insights-enabled/output-as-server/package.json index 05a795074..fd12a581e 100644 --- a/packages/vercel/test/fixtures/with-speed-insights-enabled/output-as-server/package.json +++ b/packages/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/vercel/test/fixtures/with-speed-insights-enabled/output-as-static/package.json b/packages/vercel/test/fixtures/with-speed-insights-enabled/output-as-static/package.json index a2f343ca8..f29142b7d 100644 --- a/packages/vercel/test/fixtures/with-speed-insights-enabled/output-as-static/package.json +++ b/packages/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/vercel/test/fixtures/with-web-analytics-enabled/output-as-static/package.json b/packages/vercel/test/fixtures/with-web-analytics-enabled/output-as-static/package.json index 4d845331e..f45d660eb 100644 --- a/packages/vercel/test/fixtures/with-web-analytics-enabled/output-as-static/package.json +++ b/packages/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/vercel/test/hosted/hosted-astro-project/package.json b/packages/vercel/test/hosted/hosted-astro-project/package.json index f926c61f7..162ff9456 100644 --- a/packages/vercel/test/hosted/hosted-astro-project/package.json +++ b/packages/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/vercel/test/isr.test.js b/packages/vercel/test/isr.test.js index a8df2c0ef..e20b43da1 100644 --- a/packages/vercel/test/isr.test.js +++ b/packages/vercel/test/isr.test.js @@ -37,10 +37,6 @@ describe('ISR', () => { src: '^/excluded/([^/]+?)$', 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/vercel/test/no-output.test.js b/packages/vercel/test/no-output.test.js deleted file mode 100644 index 34709804d..000000000 --- a/packages/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/vercel/test/serverless-prerender.test.js b/packages/vercel/test/serverless-prerender.test.js index 03ec8c225..140e422bd 100644 --- a/packages/vercel/test/serverless-prerender.test.js +++ b/packages/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/vercel/test/serverless-with-dynamic-routes.test.js b/packages/vercel/test/serverless-with-dynamic-routes.test.js index 7eac7e875..19ae4af1a 100644 --- a/packages/vercel/test/serverless-with-dynamic-routes.test.js +++ b/packages/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(); }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0c2f681d7..c2ede07e4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -73,7 +73,7 @@ importers: version: 4.20240821.1 '@inox-tools/astro-when': specifier: ^0.2.2 - version: 0.2.2(astro@5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4)) + version: 0.2.2(astro@5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4)) esbuild: specifier: ^0.23.1 version: 0.23.1 @@ -97,8 +97,8 @@ importers: specifier: workspace:* version: link:../test-utils astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) astro-scripts: specifier: workspace:* version: link:../../scripts @@ -127,8 +127,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) devDependencies: wrangler: specifier: ^3.72.2 @@ -140,8 +140,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) devDependencies: wrangler: specifier: ^3.72.2 @@ -153,8 +153,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/cloudflare/test/fixtures/external-image-service: dependencies: @@ -162,8 +162,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/cloudflare/test/fixtures/module-loader: dependencies: @@ -171,8 +171,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/cloudflare/test/fixtures/no-output: dependencies: @@ -180,8 +180,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/cloudflare/test/fixtures/routes-json: dependencies: @@ -189,8 +189,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/cloudflare/test/fixtures/with-solid-js: dependencies: @@ -201,8 +201,8 @@ importers: specifier: ^4.4.1 version: 4.4.1(solid-js@1.8.21)(vite@5.4.2(@types/node@22.4.1)) astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) solid-js: specifier: ^1.8.21 version: 1.8.21 @@ -213,8 +213,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/netlify: dependencies: @@ -247,8 +247,8 @@ importers: specifier: ^20.16.1 version: 20.16.1 astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@20.16.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@20.16.1)(rollup@4.21.0)(typescript@5.5.4) astro-scripts: specifier: workspace:* version: link:../../scripts @@ -298,8 +298,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/netlify/test/static/fixtures/redirects: dependencies: @@ -329,8 +329,8 @@ importers: specifier: ^1.0.4 version: 1.0.4 astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@18.19.47)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@18.19.47)(rollup@4.21.0)(typescript@5.5.4) astro-scripts: specifier: workspace:* version: link:../../scripts @@ -350,8 +350,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/node/test/fixtures/bad-urls: dependencies: @@ -359,8 +359,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/node/test/fixtures/encoded: dependencies: @@ -368,8 +368,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/node/test/fixtures/errors: dependencies: @@ -377,8 +377,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/node/test/fixtures/headers: dependencies: @@ -386,8 +386,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/node/test/fixtures/image: dependencies: @@ -395,8 +395,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/node/test/fixtures/locals: dependencies: @@ -404,8 +404,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/node/test/fixtures/node-middleware: dependencies: @@ -413,8 +413,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/node/test/fixtures/prerender: dependencies: @@ -422,8 +422,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/node/test/fixtures/prerender-404-500: dependencies: @@ -431,8 +431,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/node/test/fixtures/preview-headers: dependencies: @@ -440,8 +440,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/node/test/fixtures/trailing-slash: dependencies: @@ -449,8 +449,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/node/test/fixtures/url: dependencies: @@ -458,8 +458,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/node/test/fixtures/well-known-locations: dependencies: @@ -467,14 +467,14 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/test-utils: dependencies: astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) execa: specifier: ^8.0.1 version: 8.0.1 @@ -513,8 +513,8 @@ importers: specifier: workspace:* version: link:../test-utils astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) astro-scripts: specifier: workspace:* version: link:../../scripts @@ -528,8 +528,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/image: dependencies: @@ -537,8 +537,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/isr: dependencies: @@ -546,8 +546,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/max-duration: dependencies: @@ -555,8 +555,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/middleware-with-edge-file: dependencies: @@ -564,8 +564,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/middleware-without-edge-file: dependencies: @@ -573,8 +573,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/no-output: dependencies: @@ -582,8 +582,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/prerendered-error-pages: dependencies: @@ -591,8 +591,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/redirects: dependencies: @@ -600,8 +600,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/redirects-serverless: dependencies: @@ -609,8 +609,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/server-islands: dependencies: @@ -618,8 +618,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/serverless-prerender: dependencies: @@ -627,8 +627,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/serverless-with-dynamic-routes: dependencies: @@ -636,8 +636,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/static: dependencies: @@ -645,8 +645,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/static-assets: dependencies: @@ -654,8 +654,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/streaming: dependencies: @@ -663,8 +663,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/with-speed-insights-enabled/output-as-server: dependencies: @@ -672,8 +672,8 @@ importers: specifier: workspace:* version: link:../../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/with-speed-insights-enabled/output-as-static: dependencies: @@ -681,8 +681,8 @@ importers: specifier: workspace:* version: link:../../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/fixtures/with-web-analytics-enabled/output-as-static: dependencies: @@ -690,8 +690,8 @@ importers: specifier: workspace:* version: link:../../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) packages/vercel/test/hosted/hosted-astro-project: dependencies: @@ -699,8 +699,8 @@ importers: specifier: workspace:* version: link:../../.. astro: - specifier: ^5.0.0-alpha.0 - version: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + specifier: ^5.0.0-alpha.6 + version: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) scripts: dependencies: @@ -738,8 +738,8 @@ packages: prettier-plugin-astro: optional: true - '@astrojs/markdown-remark@6.0.0-alpha.0': - resolution: {integrity: sha512-ojZNNxrOQYxbECLY9GRSXRcwDR0FE656g6ekUGQzRxFFmYir8e44toAjp5gseoRRIR4Z9W66tLXkEOa3kunsgg==} + '@astrojs/markdown-remark@6.0.0-alpha.1': + resolution: {integrity: sha512-lBM4RX8ljVpH3OPGdmeonCd65ATnjbZNgsysOIXyJSkP8RuX/EU2wSY2k8Ait34KjZUegISabpKHD5fslctRsw==} '@astrojs/prism@3.1.0': resolution: {integrity: sha512-Z9IYjuXSArkAUx3N6xj6+Bnvx8OdUSHA8YoOgyepp3+zJmtVYJIl/I18GozdJVW1p5u/CNpl3Km7/gwTJK85cw==} @@ -781,14 +781,6 @@ packages: resolution: {integrity: sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==} engines: {node: '>=6.9.0'} - '@babel/generator@7.25.5': - resolution: {integrity: sha512-abd43wyLfbWoxC6ahM8xTkqLpGB2iWBVyuKC9/srhFunCd1SDNrV1s72bBpK4hLj8KLzHBBcOblvLQZBNw9r3w==} - engines: {node: '>=6.9.0'} - - '@babel/helper-annotate-as-pure@7.24.7': - resolution: {integrity: sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==} - engines: {node: '>=6.9.0'} - '@babel/helper-compilation-targets@7.25.2': resolution: {integrity: sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==} engines: {node: '>=6.9.0'} @@ -851,12 +843,6 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-react-jsx@7.25.2': - resolution: {integrity: sha512-KQsqEAVBpU82NM/B/N9j9WOdphom1SZH3R+2V7INrQUH+V9EBFwZsEJl8eBIVeQE62FxJCc70jzEZwqU7RcVqA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - '@babel/runtime@7.24.1': resolution: {integrity: sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==} engines: {node: '>=6.9.0'} @@ -869,10 +855,6 @@ packages: resolution: {integrity: sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==} engines: {node: '>=6.9.0'} - '@babel/traverse@7.25.4': - resolution: {integrity: sha512-VJ4XsrD+nOvlXyLzmLzUs/0qjFS4sK30te5yEFlvbbUNEgKaVb2BHZUpAL+ttLPQAHNrsI3zZisbfha5Cvr8vg==} - engines: {node: '>=6.9.0'} - '@babel/types@7.25.2': resolution: {integrity: sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==} engines: {node: '>=6.9.0'} @@ -1959,8 +1941,11 @@ packages: cpu: [x64] os: [win32] - '@shikijs/core@1.14.1': - resolution: {integrity: sha512-KyHIIpKNaT20FtFPFjCQB5WVSTpLR/n+jQXhWHWVUMm9MaOaG9BGOG0MSyt7yA4+Lm+4c9rTc03tt3nYzeYSfw==} + '@shikijs/core@1.16.3': + resolution: {integrity: sha512-yETIvrETCeC39gSPIiSADmjri9FwKmxz0QvONMtTIUYlKZe90CJkvcjPksayC2VQOtzOJonEiULUa8v8crUQvA==} + + '@shikijs/vscode-textmate@9.2.2': + resolution: {integrity: sha512-TMp15K+GGYrWlZM8+Lnj9EaHEFmOen0WJBrfa17hF7taDOYthuPPV0GWzfd/9iMij0akS/8Yw2ikquH7uVi/fg==} '@types/babel__core@7.20.5': resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==} @@ -2263,8 +2248,8 @@ packages: peerDependencies: astro: ^4.12.0 - astro@5.0.0-alpha.1: - resolution: {integrity: sha512-gAcv5jiX0Xbx7V1GcqdN8YmB57BhKk781ubwbEWF8wX1dCP9OMWytnzXcWOFvaK1rhp3Dnc0+5B8hLiv+TyKPw==} + astro@5.0.0-alpha.6: + resolution: {integrity: sha512-Qkuy21jtws2V4zceWyXzHqENGEWFEfvX0bAwKZrBR3h6IqMFehs0du/RUpxhmXAKNEVCyBXa0sphApA3r3z7oQ==} engines: {node: ^18.17.1 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0'} hasBin: true @@ -3025,6 +3010,9 @@ packages: hast-util-from-html@2.0.1: resolution: {integrity: sha512-RXQBLMl9kjKVNkJTIO6bZyb2n+cUH8LFaSSzo82jiLT6Tfc+Pt7VQCS+/h3YwG4jaNE2TA2sdJisGWR+aJrp0g==} + hast-util-from-html@2.0.2: + resolution: {integrity: sha512-HwOHwxdt2zC5KQ/CNoybBntRook2zJvfZE/u5/Ap7aLPe22bDqen7KwGkOqOyzL5zIqKwiYX/OTtE0FWgr6XXA==} + hast-util-from-parse5@8.0.1: resolution: {integrity: sha512-Er/Iixbc7IEa7r/XLtuG52zoqn/b3Xng/w6aZQ0xGVxzhw5xUFxcRqdPzP6yFi/4HBYRaifaI5fQ1RH8n0ZeOQ==} @@ -3313,6 +3301,9 @@ packages: magic-string@0.30.11: resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==} + magicast@0.3.5: + resolution: {integrity: sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==} + make-dir@3.1.0: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} engines: {node: '>=8'} @@ -3647,6 +3638,9 @@ packages: resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==} engines: {node: '>=18'} + oniguruma-to-js@0.3.3: + resolution: {integrity: sha512-m90/WEhgs8g4BxG37+Nu3YrMfJDs2YXtYtIllhsEPR+wP3+K4EZk6dDUvy2v2K4MNFDDOYKL4/yqYPXDqyozTQ==} + only-allow@1.2.1: resolution: {integrity: sha512-M7CJbmv7UCopc0neRKdzfoGWaVZC+xC1925GitKH9EAqYFzX9//25Q7oX4+jw0tiCCj+t5l6VZh8UPH23NZkMA==} hasBin: true @@ -3882,6 +3876,9 @@ packages: regenerator-runtime@0.14.1: resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} + regex@4.3.2: + resolution: {integrity: sha512-kK/AA3A9K6q2js89+VMymcboLOlF5lZRCYJv3gzszXFHBr6kO6qLGzbm+UIugBEV8SMMKCTR59txoY6ctRHYVw==} + regexp-ast-analysis@0.7.1: resolution: {integrity: sha512-sZuz1dYW/ZsfG17WSAG7eS85r5a0dDsvg+7BiiYR5o6lKCAtUrEwdmRmaGF6rwVj3LcmAeYkOWKEPlbPzN3Y3A==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} @@ -4078,8 +4075,8 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - shiki@1.14.1: - resolution: {integrity: sha512-FujAN40NEejeXdzPt+3sZ3F2dx1U24BY2XTY01+MG8mbxCiA2XukXdcbyMyLAHJ/1AUUnQd1tZlvIjefWWEJeA==} + shiki@1.16.3: + resolution: {integrity: sha512-GypUE+fEd06FqDs63LSAVlmq7WsahhPQU62cgZxGF+TJT5LjD2k7HTxXj4/CKOVuMM3+wWQ1t4Y5oooeJFRRBQ==} shimmer@1.2.1: resolution: {integrity: sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==} @@ -4227,6 +4224,9 @@ packages: tiny-invariant@1.3.3: resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==} + tinyexec@0.3.0: + resolution: {integrity: sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==} + tmp@0.0.33: resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} engines: {node: '>=0.6.0'} @@ -4258,8 +4258,8 @@ packages: peerDependencies: typescript: '>=4.2.0' - tsconfck@3.1.1: - resolution: {integrity: sha512-00eoI6WY57SvZEVjm13stEVE90VkEdJAFGgpFLTsZbJyW/LwFQ7uQxJHWpZ2hzSWgCPKc9AnBnNP+0X7o3hAmQ==} + tsconfck@3.1.3: + resolution: {integrity: sha512-ulNZP1SVpRDesxeMLON/LtWM8HIgAJEIVpVVhBM6gsmvQ8+Rh+ZG7FWGvHh7Ah3pRABwVJWklWCr/BTZSv0xnQ==} engines: {node: ^18 || >=20} hasBin: true peerDependencies: @@ -4479,6 +4479,14 @@ packages: vite: optional: true + vitefu@1.0.2: + resolution: {integrity: sha512-0/iAvbXyM3RiPPJ4lyD4w6Mjgtf4ejTK6TPvTNG3H32PLwuT0N/ZjJLiXug7ETE/LWtTeHw9WRv7uX/tIKYyKg==} + peerDependencies: + vite: ^3.0.0 || ^4.0.0 || ^5.0.0 + peerDependenciesMeta: + vite: + optional: true + volar-service-css@0.0.61: resolution: {integrity: sha512-Ct9L/w+IB1JU8F4jofcNCGoHy6TF83aiapfZq9A0qYYpq+Kk5dH+ONS+rVZSsuhsunq8UvAuF8Gk6B8IFLfniw==} peerDependencies: @@ -4797,11 +4805,11 @@ snapshots: transitivePeerDependencies: - typescript - '@astrojs/markdown-remark@6.0.0-alpha.0': + '@astrojs/markdown-remark@6.0.0-alpha.1': dependencies: '@astrojs/prism': 3.1.0 github-slugger: 2.0.0 - hast-util-from-html: 2.0.1 + hast-util-from-html: 2.0.2 hast-util-to-text: 4.0.2 import-meta-resolve: 4.1.0 mdast-util-definitions: 6.0.0 @@ -4811,7 +4819,7 @@ snapshots: remark-parse: 11.0.0 remark-rehype: 11.1.0 remark-smartypants: 3.0.2 - shiki: 1.14.1 + shiki: 1.16.3 unified: 11.0.5 unist-util-remove-position: 5.0.0 unist-util-visit: 5.0.0 @@ -4879,23 +4887,12 @@ snapshots: - supports-color '@babel/generator@7.25.0': - dependencies: - '@babel/types': 7.25.2 - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 - jsesc: 2.5.2 - - '@babel/generator@7.25.5': dependencies: '@babel/types': 7.25.4 '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 jsesc: 2.5.2 - '@babel/helper-annotate-as-pure@7.24.7': - dependencies: - '@babel/types': 7.25.4 - '@babel/helper-compilation-targets@7.25.2': dependencies: '@babel/compat-data': 7.25.2 @@ -4906,12 +4903,12 @@ snapshots: '@babel/helper-module-imports@7.18.6': dependencies: - '@babel/types': 7.25.2 + '@babel/types': 7.25.4 '@babel/helper-module-imports@7.24.7': dependencies: '@babel/traverse': 7.25.3 - '@babel/types': 7.25.2 + '@babel/types': 7.25.4 transitivePeerDependencies: - supports-color @@ -4930,7 +4927,7 @@ snapshots: '@babel/helper-simple-access@7.24.7': dependencies: '@babel/traverse': 7.25.3 - '@babel/types': 7.25.2 + '@babel/types': 7.25.4 transitivePeerDependencies: - supports-color @@ -4943,7 +4940,7 @@ snapshots: '@babel/helpers@7.25.0': dependencies: '@babel/template': 7.25.0 - '@babel/types': 7.25.2 + '@babel/types': 7.25.4 '@babel/highlight@7.24.7': dependencies: @@ -4954,7 +4951,7 @@ snapshots: '@babel/parser@7.25.3': dependencies: - '@babel/types': 7.25.2 + '@babel/types': 7.25.4 '@babel/parser@7.25.4': dependencies: @@ -4965,17 +4962,6 @@ snapshots: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-transform-react-jsx@7.25.2(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-annotate-as-pure': 7.24.7 - '@babel/helper-module-imports': 7.24.7 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.25.2) - '@babel/types': 7.25.4 - transitivePeerDependencies: - - supports-color - '@babel/runtime@7.24.1': dependencies: regenerator-runtime: 0.14.1 @@ -4984,7 +4970,7 @@ snapshots: dependencies: '@babel/code-frame': 7.24.7 '@babel/parser': 7.25.3 - '@babel/types': 7.25.2 + '@babel/types': 7.25.4 '@babel/traverse@7.25.3': dependencies: @@ -4992,18 +4978,6 @@ snapshots: '@babel/generator': 7.25.0 '@babel/parser': 7.25.3 '@babel/template': 7.25.0 - '@babel/types': 7.25.2 - debug: 4.3.6 - globals: 11.12.0 - transitivePeerDependencies: - - supports-color - - '@babel/traverse@7.25.4': - dependencies: - '@babel/code-frame': 7.24.7 - '@babel/generator': 7.25.5 - '@babel/parser': 7.25.4 - '@babel/template': 7.25.0 '@babel/types': 7.25.4 debug: 4.3.6 globals: 11.12.0 @@ -5626,10 +5600,10 @@ snapshots: '@img/sharp-win32-x64@0.33.5': optional: true - '@inox-tools/astro-when@0.2.2(astro@5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4))': + '@inox-tools/astro-when@0.2.2(astro@5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4))': dependencies: - astro: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) - astro-integration-kit: 0.16.0(astro@5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4)) + astro: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + astro-integration-kit: 0.16.0(astro@5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4)) debug: 4.3.6 transitivePeerDependencies: - supports-color @@ -5973,9 +5947,14 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.21.0': optional: true - '@shikijs/core@1.14.1': + '@shikijs/core@1.16.3': dependencies: + '@shikijs/vscode-textmate': 9.2.2 '@types/hast': 3.0.4 + oniguruma-to-js: 0.3.3 + regex: 4.3.2 + + '@shikijs/vscode-textmate@9.2.2': {} '@types/babel__core@7.20.5': dependencies: @@ -5987,16 +5966,16 @@ snapshots: '@types/babel__generator@7.6.8': dependencies: - '@babel/types': 7.25.2 + '@babel/types': 7.25.4 '@types/babel__template@7.4.4': dependencies: '@babel/parser': 7.25.3 - '@babel/types': 7.25.2 + '@babel/types': 7.25.4 '@types/babel__traverse@7.20.5': dependencies: - '@babel/types': 7.25.2 + '@babel/types': 7.25.4 '@types/body-parser@1.19.5': dependencies: @@ -6343,27 +6322,21 @@ snapshots: dependencies: tslib: 2.6.2 - astro-integration-kit@0.16.0(astro@5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4)): + astro-integration-kit@0.16.0(astro@5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4)): dependencies: - astro: 5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) + astro: 5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4) pathe: 1.1.2 recast: 0.23.9 - astro@5.0.0-alpha.1(@types/node@18.19.47)(rollup@4.21.0)(typescript@5.5.4): + astro@5.0.0-alpha.6(@types/node@18.19.47)(rollup@4.21.0)(typescript@5.5.4): dependencies: '@astrojs/compiler': 2.10.3 '@astrojs/internal-helpers': 0.4.1 - '@astrojs/markdown-remark': 6.0.0-alpha.0 + '@astrojs/markdown-remark': 6.0.0-alpha.1 '@astrojs/telemetry': 3.1.0 - '@babel/core': 7.25.2 - '@babel/generator': 7.25.5 - '@babel/parser': 7.25.4 - '@babel/plugin-transform-react-jsx': 7.25.2(@babel/core@7.25.2) - '@babel/traverse': 7.25.4 '@babel/types': 7.25.4 '@oslojs/encoding': 0.4.1 '@rollup/pluginutils': 5.1.0(rollup@4.21.0) - '@types/babel__core': 7.20.5 '@types/cookie': 0.6.0 acorn: 8.12.1 aria-query: 5.3.0 @@ -6383,8 +6356,8 @@ snapshots: es-module-lexer: 1.5.4 esbuild: 0.21.5 estree-walker: 3.0.3 - execa: 8.0.1 fast-glob: 3.3.2 + fastq: 1.17.1 flattie: 1.1.1 github-slugger: 2.0.0 gray-matter: 4.0.3 @@ -6393,6 +6366,7 @@ snapshots: js-yaml: 4.1.0 kleur: 4.1.5 magic-string: 0.30.11 + magicast: 0.3.5 micromatch: 4.0.8 mrmime: 2.0.0 neotraverse: 0.6.18 @@ -6404,14 +6378,15 @@ snapshots: prompts: 2.4.2 rehype: 13.0.1 semver: 7.6.3 - shiki: 1.14.1 + shiki: 1.16.3 string-width: 7.2.0 strip-ansi: 7.1.0 - tsconfck: 3.1.1(typescript@5.5.4) + tinyexec: 0.3.0 + tsconfck: 3.1.3(typescript@5.5.4) unist-util-visit: 5.0.0 vfile: 6.0.3 vite: 5.4.2(@types/node@18.19.47) - vitefu: 0.2.5(vite@5.4.2(@types/node@18.19.47)) + vitefu: 1.0.2(vite@5.4.2(@types/node@18.19.47)) which-pm: 3.0.0 xxhash-wasm: 1.0.2 yargs-parser: 21.1.1 @@ -6433,21 +6408,15 @@ snapshots: - terser - typescript - astro@5.0.0-alpha.1(@types/node@20.16.1)(rollup@4.21.0)(typescript@5.5.4): + astro@5.0.0-alpha.6(@types/node@20.16.1)(rollup@4.21.0)(typescript@5.5.4): dependencies: '@astrojs/compiler': 2.10.3 '@astrojs/internal-helpers': 0.4.1 - '@astrojs/markdown-remark': 6.0.0-alpha.0 + '@astrojs/markdown-remark': 6.0.0-alpha.1 '@astrojs/telemetry': 3.1.0 - '@babel/core': 7.25.2 - '@babel/generator': 7.25.5 - '@babel/parser': 7.25.4 - '@babel/plugin-transform-react-jsx': 7.25.2(@babel/core@7.25.2) - '@babel/traverse': 7.25.4 '@babel/types': 7.25.4 '@oslojs/encoding': 0.4.1 '@rollup/pluginutils': 5.1.0(rollup@4.21.0) - '@types/babel__core': 7.20.5 '@types/cookie': 0.6.0 acorn: 8.12.1 aria-query: 5.3.0 @@ -6467,8 +6436,8 @@ snapshots: es-module-lexer: 1.5.4 esbuild: 0.21.5 estree-walker: 3.0.3 - execa: 8.0.1 fast-glob: 3.3.2 + fastq: 1.17.1 flattie: 1.1.1 github-slugger: 2.0.0 gray-matter: 4.0.3 @@ -6477,6 +6446,7 @@ snapshots: js-yaml: 4.1.0 kleur: 4.1.5 magic-string: 0.30.11 + magicast: 0.3.5 micromatch: 4.0.8 mrmime: 2.0.0 neotraverse: 0.6.18 @@ -6488,14 +6458,15 @@ snapshots: prompts: 2.4.2 rehype: 13.0.1 semver: 7.6.3 - shiki: 1.14.1 + shiki: 1.16.3 string-width: 7.2.0 strip-ansi: 7.1.0 - tsconfck: 3.1.1(typescript@5.5.4) + tinyexec: 0.3.0 + tsconfck: 3.1.3(typescript@5.5.4) unist-util-visit: 5.0.0 vfile: 6.0.3 vite: 5.4.2(@types/node@20.16.1) - vitefu: 0.2.5(vite@5.4.2(@types/node@20.16.1)) + vitefu: 1.0.2(vite@5.4.2(@types/node@20.16.1)) which-pm: 3.0.0 xxhash-wasm: 1.0.2 yargs-parser: 21.1.1 @@ -6517,21 +6488,15 @@ snapshots: - terser - typescript - astro@5.0.0-alpha.1(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4): + astro@5.0.0-alpha.6(@types/node@22.4.1)(rollup@4.21.0)(typescript@5.5.4): dependencies: '@astrojs/compiler': 2.10.3 '@astrojs/internal-helpers': 0.4.1 - '@astrojs/markdown-remark': 6.0.0-alpha.0 + '@astrojs/markdown-remark': 6.0.0-alpha.1 '@astrojs/telemetry': 3.1.0 - '@babel/core': 7.25.2 - '@babel/generator': 7.25.5 - '@babel/parser': 7.25.4 - '@babel/plugin-transform-react-jsx': 7.25.2(@babel/core@7.25.2) - '@babel/traverse': 7.25.4 '@babel/types': 7.25.4 '@oslojs/encoding': 0.4.1 '@rollup/pluginutils': 5.1.0(rollup@4.21.0) - '@types/babel__core': 7.20.5 '@types/cookie': 0.6.0 acorn: 8.12.1 aria-query: 5.3.0 @@ -6551,8 +6516,8 @@ snapshots: es-module-lexer: 1.5.4 esbuild: 0.21.5 estree-walker: 3.0.3 - execa: 8.0.1 fast-glob: 3.3.2 + fastq: 1.17.1 flattie: 1.1.1 github-slugger: 2.0.0 gray-matter: 4.0.3 @@ -6561,6 +6526,7 @@ snapshots: js-yaml: 4.1.0 kleur: 4.1.5 magic-string: 0.30.11 + magicast: 0.3.5 micromatch: 4.0.8 mrmime: 2.0.0 neotraverse: 0.6.18 @@ -6572,14 +6538,15 @@ snapshots: prompts: 2.4.2 rehype: 13.0.1 semver: 7.6.3 - shiki: 1.14.1 + shiki: 1.16.3 string-width: 7.2.0 strip-ansi: 7.1.0 - tsconfck: 3.1.1(typescript@5.5.4) + tinyexec: 0.3.0 + tsconfck: 3.1.3(typescript@5.5.4) unist-util-visit: 5.0.0 vfile: 6.0.3 vite: 5.4.2(@types/node@22.4.1) - vitefu: 0.2.5(vite@5.4.2(@types/node@22.4.1)) + vitefu: 1.0.2(vite@5.4.2(@types/node@22.4.1)) which-pm: 3.0.0 xxhash-wasm: 1.0.2 yargs-parser: 21.1.1 @@ -6610,7 +6577,7 @@ snapshots: '@babel/core': 7.25.2 '@babel/helper-module-imports': 7.18.6 '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.25.2) - '@babel/types': 7.25.2 + '@babel/types': 7.25.4 html-entities: 2.3.3 validate-html-nesting: 1.2.2 @@ -7457,6 +7424,15 @@ snapshots: vfile: 6.0.3 vfile-message: 4.0.2 + hast-util-from-html@2.0.2: + dependencies: + '@types/hast': 3.0.4 + devlop: 1.1.0 + hast-util-from-parse5: 8.0.1 + parse5: 7.1.2 + vfile: 6.0.3 + vfile-message: 4.0.2 + hast-util-from-parse5@8.0.1: dependencies: '@types/hast': 3.0.4 @@ -7756,6 +7732,12 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 + magicast@0.3.5: + dependencies: + '@babel/parser': 7.25.4 + '@babel/types': 7.25.4 + source-map-js: 1.2.0 + make-dir@3.1.0: dependencies: semver: 6.3.1 @@ -8248,6 +8230,8 @@ snapshots: dependencies: mimic-function: 5.0.1 + oniguruma-to-js@0.3.3: {} + only-allow@1.2.1: dependencies: which-pm-runs: 1.1.0 @@ -8489,6 +8473,8 @@ snapshots: regenerator-runtime@0.14.1: {} + regex@4.3.2: {} + regexp-ast-analysis@0.7.1: dependencies: '@eslint-community/regexpp': 4.11.0 @@ -8782,9 +8768,10 @@ snapshots: shebang-regex@3.0.0: {} - shiki@1.14.1: + shiki@1.16.3: dependencies: - '@shikijs/core': 1.14.1 + '@shikijs/core': 1.16.3 + '@shikijs/vscode-textmate': 9.2.2 '@types/hast': 3.0.4 shimmer@1.2.1: {} @@ -8931,6 +8918,8 @@ snapshots: tiny-invariant@1.3.3: {} + tinyexec@0.3.0: {} + tmp@0.0.33: dependencies: os-tmpdir: 1.0.2 @@ -8953,7 +8942,7 @@ snapshots: dependencies: typescript: 5.5.4 - tsconfck@3.1.1(typescript@5.5.4): + tsconfck@3.1.3(typescript@5.5.4): optionalDependencies: typescript: 5.5.4 @@ -9168,15 +9157,19 @@ snapshots: '@types/node': 22.4.1 fsevents: 2.3.3 - vitefu@0.2.5(vite@5.4.2(@types/node@18.19.47)): + vitefu@0.2.5(vite@5.4.2(@types/node@22.4.1)): + optionalDependencies: + vite: 5.4.2(@types/node@22.4.1) + + vitefu@1.0.2(vite@5.4.2(@types/node@18.19.47)): optionalDependencies: vite: 5.4.2(@types/node@18.19.47) - vitefu@0.2.5(vite@5.4.2(@types/node@20.16.1)): + vitefu@1.0.2(vite@5.4.2(@types/node@20.16.1)): optionalDependencies: vite: 5.4.2(@types/node@20.16.1) - vitefu@0.2.5(vite@5.4.2(@types/node@22.4.1)): + vitefu@1.0.2(vite@5.4.2(@types/node@22.4.1)): optionalDependencies: vite: 5.4.2(@types/node@22.4.1)