diff options
Diffstat (limited to 'packages/integrations/cloudflare/test')
15 files changed, 22 insertions, 47 deletions
diff --git a/packages/integrations/cloudflare/test/fixtures/astro-dev-platform/package.json b/packages/integrations/cloudflare/test/fixtures/astro-dev-platform/package.json index 1d43dd35a..12ae29808 100644 --- a/packages/integrations/cloudflare/test/fixtures/astro-dev-platform/package.json +++ b/packages/integrations/cloudflare/test/fixtures/astro-dev-platform/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^4.16.8" + "astro": "^5.0.0-alpha.8" }, "devDependencies": { "wrangler": "^3.84.0" diff --git a/packages/integrations/cloudflare/test/fixtures/astro-env/astro.config.ts b/packages/integrations/cloudflare/test/fixtures/astro-env/astro.config.ts index 8017c0b6d..b7d556b3b 100644 --- a/packages/integrations/cloudflare/test/fixtures/astro-env/astro.config.ts +++ b/packages/integrations/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/integrations/cloudflare/test/fixtures/astro-env/package.json b/packages/integrations/cloudflare/test/fixtures/astro-env/package.json index dbdf4d129..e4e8e0fa9 100644 --- a/packages/integrations/cloudflare/test/fixtures/astro-env/package.json +++ b/packages/integrations/cloudflare/test/fixtures/astro-env/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^4.16.8" + "astro": "^5.0.0-alpha.8" }, "devDependencies": { "wrangler": "^3.84.0" diff --git a/packages/integrations/cloudflare/test/fixtures/compile-image-service/astro.config.mjs b/packages/integrations/cloudflare/test/fixtures/compile-image-service/astro.config.mjs index 7c569595e..7c98bbb98 100644 --- a/packages/integrations/cloudflare/test/fixtures/compile-image-service/astro.config.mjs +++ b/packages/integrations/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/integrations/cloudflare/test/fixtures/compile-image-service/package.json b/packages/integrations/cloudflare/test/fixtures/compile-image-service/package.json index 64a281c14..08a8fbb11 100644 --- a/packages/integrations/cloudflare/test/fixtures/compile-image-service/package.json +++ b/packages/integrations/cloudflare/test/fixtures/compile-image-service/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^4.16.8" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/cloudflare/test/fixtures/external-image-service/package.json b/packages/integrations/cloudflare/test/fixtures/external-image-service/package.json index 1fb4f7242..d536aee0a 100644 --- a/packages/integrations/cloudflare/test/fixtures/external-image-service/package.json +++ b/packages/integrations/cloudflare/test/fixtures/external-image-service/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^4.16.8" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/cloudflare/test/fixtures/module-loader/astro.config.mjs b/packages/integrations/cloudflare/test/fixtures/module-loader/astro.config.mjs index dd2af8bc2..38365a374 100644 --- a/packages/integrations/cloudflare/test/fixtures/module-loader/astro.config.mjs +++ b/packages/integrations/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/integrations/cloudflare/test/fixtures/module-loader/package.json b/packages/integrations/cloudflare/test/fixtures/module-loader/package.json index 2d6e56598..03790d2ee 100644 --- a/packages/integrations/cloudflare/test/fixtures/module-loader/package.json +++ b/packages/integrations/cloudflare/test/fixtures/module-loader/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^4.16.8" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/cloudflare/test/fixtures/no-output/package.json b/packages/integrations/cloudflare/test/fixtures/no-output/package.json index 72ca4db18..36c5019ef 100644 --- a/packages/integrations/cloudflare/test/fixtures/no-output/package.json +++ b/packages/integrations/cloudflare/test/fixtures/no-output/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^4.16.8" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/cloudflare/test/fixtures/routes-json/astro.config.mjs b/packages/integrations/cloudflare/test/fixtures/routes-json/astro.config.mjs index 6fa5ec5d3..3aaa37d9a 100644 --- a/packages/integrations/cloudflare/test/fixtures/routes-json/astro.config.mjs +++ b/packages/integrations/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/integrations/cloudflare/test/fixtures/routes-json/package.json b/packages/integrations/cloudflare/test/fixtures/routes-json/package.json index 90407d19e..eeb5bfbec 100644 --- a/packages/integrations/cloudflare/test/fixtures/routes-json/package.json +++ b/packages/integrations/cloudflare/test/fixtures/routes-json/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^4.16.8" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/cloudflare/test/fixtures/with-solid-js/package.json b/packages/integrations/cloudflare/test/fixtures/with-solid-js/package.json index 53d01a653..8f3a34596 100644 --- a/packages/integrations/cloudflare/test/fixtures/with-solid-js/package.json +++ b/packages/integrations/cloudflare/test/fixtures/with-solid-js/package.json @@ -5,7 +5,7 @@ "dependencies": { "@astrojs/cloudflare": "workspace:*", "@astrojs/solid-js": "^4.4.2", - "astro": "^4.16.8", + "astro": "^5.0.0-alpha.8", "solid-js": "^1.9.3" } } diff --git a/packages/integrations/cloudflare/test/fixtures/wrangler-preview-platform/package.json b/packages/integrations/cloudflare/test/fixtures/wrangler-preview-platform/package.json index 01713d9ca..a65c1ba46 100644 --- a/packages/integrations/cloudflare/test/fixtures/wrangler-preview-platform/package.json +++ b/packages/integrations/cloudflare/test/fixtures/wrangler-preview-platform/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^4.16.8" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/cloudflare/test/no-output.test.js b/packages/integrations/cloudflare/test/no-output.test.js deleted file mode 100644 index bf5321491..000000000 --- a/packages/integrations/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/integrations/cloudflare/test/routes-json.test.js b/packages/integrations/cloudflare/test/routes-json.test.js index b7494b1c5..ee788721d 100644 --- a/packages/integrations/cloudflare/test/routes-json.test.js +++ b/packages/integrations/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', @@ -167,10 +167,10 @@ describe('_routes.json generation', () => { version: 1, include: [ '/', - '/_image', '/dynamicPages/*', '/mixedPages/dynamic', '/mixedPages/subfolder/dynamic', + '/_image', ], exclude: [ '/_astro/*', |