test: use Astro v5 and update cloudflare assertions (#460)

* test: use Astro v5 and update cloudflare assertions * disable check origin * disable check origin * update test * fix another test * remove logging * format
withastro · Dec 3, 2024 · 3d94421 · 3d94421
1 parent 7057f09
commit 3d94421
Show file tree

Hide file tree

Showing 56 changed files with 200 additions and 178 deletions.
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@astrojs/test-utils": "workspace:*",
-    "astro": "^5.0.0-alpha.15",
+    "astro": "^5.0.0",
     "astro-scripts": "workspace:*",
     "cheerio": "1.0.0",
     "execa": "^8.0.1",

diff --git 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.8"
+    "astro": "^5.0.0"
   },
   "devDependencies": {
     "wrangler": "^3.84.0"

diff --git 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.8"
+    "astro": "^5.0.0"
   },
   "devDependencies": {
     "wrangler": "^3.84.0"

diff --git 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.8"
+    "astro": "^5.0.0"
   }
 }
diff --git 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.8"
+    "astro": "^5.0.0"
   }
 }
diff --git 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.8"
+    "astro": "^5.0.0"
   }
 }
diff --git 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.8"
+    "astro": "^5.0.0"
   }
 }
diff --git 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.8"
+    "astro": "^5.0.0"
   }
 }
diff --git 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.2",
-    "astro": "^5.0.0-alpha.8",
+    "astro": "^5.0.0",
     "solid-js": "^1.9.3"
   }
 }
diff --git 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.8"
+    "astro": "^5.0.0"
   }
 }
diff --git 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: ['/a/*', '/_image'],
+				include: ['/_image', '/a/*'],
 				exclude: ['/_astro/*', '/redirectme', '/public.txt', '/a', '/a/redirect', '/404', '/b'],
 			});
 		});
@@ -101,7 +101,7 @@ describe('_routes.json generation', () => {
 
 			assert.deepEqual(routes, {
 				version: 1,
-				include: ['/a/*', '/_image', '/another'],
+				include: ['/_image', '/a/*', '/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: ['/a/*', '/_image'],
+				include: ['/_image', '/a/*'],
 				exclude: [
 					'/_astro/*',
 					'/redirectme',
@@ -167,10 +167,10 @@ describe('_routes.json generation', () => {
 				version: 1,
 				include: [
 					'/',
+					'/_image',
 					'/dynamicPages/*',
 					'/mixedPages/dynamic',
 					'/mixedPages/subfolder/dynamic',
-					'/_image',
 				],
 				exclude: [
 					'/_astro/*',
@@ -234,7 +234,7 @@ describe('_routes.json generation', () => {
 
 			assert.deepEqual(routes, {
 				version: 1,
-				include: ['/dynamic', '/_image'],
+				include: ['/_image', '/dynamic'],
 				exclude: [],
 			});
 		});

diff --git a/packages/netlify/package.json b/packages/netlify/package.json
@@ -46,7 +46,7 @@
     "@netlify/edge-functions": "^2.11.1",
     "@netlify/edge-handler-types": "^0.34.1",
     "@types/node": "^22.10.0",
-    "astro": "^5.0.0-alpha.15",
+    "astro": "^5.0.0",
     "astro-scripts": "workspace:*",
     "cheerio": "1.0.0",
     "execa": "^8.0.1",

diff --git a/packages/netlify/test/functions/fixtures/cookies/astro.config.mjs b/packages/netlify/test/functions/fixtures/cookies/astro.config.mjs
@@ -5,4 +5,7 @@ export default defineConfig({
   output: 'server',
   adapter: netlify(),
   site: `http://example.com`,
+  security: {
+    checkOrigin: false
+  }
 });
diff --git 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.15"
+    "astro": "^5.0.0"
   }
 }
diff --git a/packages/node/package.json b/packages/node/package.json
@@ -37,7 +37,7 @@
     "@types/node": "^22.10.0",
     "@types/send": "^0.17.4",
     "@types/server-destroy": "^1.0.4",
-    "astro": "^5.0.0-alpha.15",
+    "astro": "^5.0.0",
     "astro-scripts": "workspace:*",
     "cheerio": "1.0.0",
     "express": "^4.21.1",

diff --git a/packages/node/test/fixtures/api-route/astro.config.mjs b/packages/node/test/fixtures/api-route/astro.config.mjs
@@ -0,0 +1,7 @@
+import { defineConfig} from "astro/config";
+
+export default defineConfig({
+    security: {
+        checkOrigin: false
+    }
+})
diff --git 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.8",
+    "astro": "^5.0.0",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git a/packages/node/test/fixtures/api-route/src/pages/redirect.ts b/packages/node/test/fixtures/api-route/src/pages/redirect.ts
@@ -1,4 +1,4 @@
-import { APIContext } from 'astro';
+import type { APIContext } from 'astro';
 
 export async function GET({ redirect }: APIContext) {
     return redirect('/destination');

diff --git a/packages/node/test/fixtures/api-route/src/pages/response-redirect.ts b/packages/node/test/fixtures/api-route/src/pages/response-redirect.ts
@@ -1,4 +1,4 @@
-import { APIContext } from 'astro';
+import type { APIContext } from 'astro';
 
 export async function GET({ url: requestUrl }: APIContext) {
     return Response.redirect(new URL('/destination', requestUrl), 307);

diff --git 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.8",
+    "astro": "^5.0.0",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git 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.8",
+    "astro": "^5.0.0",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git 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.8",
+    "astro": "^5.0.0",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git 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.8",
+    "astro": "^5.0.0",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git 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.8",
+    "astro": "^5.0.0",
     "@astrojs/node": "workspace:*"
   },
   "scripts": {

diff --git a/packages/node/test/fixtures/locals/astro.config.mjs b/packages/node/test/fixtures/locals/astro.config.mjs
@@ -0,0 +1,7 @@
+import {defineConfig} from "astro/config";
+
+export default defineConfig({
+    security: {
+        checkOrigin:false
+    }
+})
diff --git 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.8",
+    "astro": "^5.0.0",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git 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.8",
+    "astro": "^5.0.0",
     "@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
@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "astro": "^5.0.0-alpha.8",
+    "astro": "^5.0.0",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git 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.8",
+    "astro": "^5.0.0",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git 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.8",
+    "astro": "^5.0.0",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git 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.8",
+    "astro": "^5.0.0",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git 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.8",
+    "astro": "^5.0.0",
     "@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
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "astro": "^5.0.0-alpha.8",
+    "astro": "^5.0.0",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git a/packages/node/test/node-middleware.test.js b/packages/node/test/node-middleware.test.js
@@ -66,7 +66,7 @@ describe('behavior from middleware, middleware', () => {
 		const { handler } = await fixture.loadAdapterEntryModule();
 		const app = express();
 		app.use(handler);
-		server = app.listen(8888);
+		server = app.listen(8889);
 	});
 
 	after(async () => {
@@ -76,10 +76,10 @@ describe('behavior from middleware, middleware', () => {
 		delete process.env.PRERENDER;
 	});
 
-	it('when mode is standalone', async () => {
-		// biome-ignore lint/style/noUnusedTemplateLiteral: <explanation>
-		const res = await fetch(`http://localhost:8888/ssr`);
+	it('when mode is middleware', async () => {
+		const res = await fetch('http://localhost:8889/ssr');
 
+		console.log(res);
 		assert.equal(res.status, 200);
 
 		const html = await res.text();

diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
@@ -8,7 +8,7 @@
   },
   "keywords": [],
   "dependencies": {
-    "astro": "^5.0.0-alpha.15",
+    "astro": "^5.0.0",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
     "strip-ansi": "^7.1.0"

diff --git a/packages/vercel/package.json b/packages/vercel/package.json
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@astrojs/test-utils": "workspace:*",
-    "astro": "^5.0.0-alpha.15",
+    "astro": "^5.0.0",
     "astro-scripts": "workspace:*",
     "cheerio": "1.0.0"
   },

diff --git 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.8"
+    "astro": "^5.0.0"
   }
 }
diff --git 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.8"
+    "astro": "^5.0.0"
   }
 }
diff --git 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.8"
+    "astro": "^5.0.0"
   }
 }
diff --git 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.8"
+    "astro": "^5.0.0"
   }
 }