Merge branch 'main' into next

withastro · Nov 28, 2024 · 21d79c8 · 21d79c8
2 parents 0ba7a39 + 967a2bf
commit 21d79c8
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 46 deletions.
diff --git a/.changeset/curly-bottles-swim.md b/.changeset/curly-bottles-swim.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/cloudflare': patch
+---
+
+Inherits `platformProxy` option types from `wrangler`
diff --git a/.changeset/odd-kiwis-clap.md b/.changeset/odd-kiwis-clap.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/vercel': minor
+---
+
+Add support for Node 22 on Vercel serverless
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - next
+      - legacy
 
 defaults:
   run:

diff --git a/package.json b/package.json
@@ -45,19 +45,19 @@
     "@astrojs/check": "^0.9.4",
     "@biomejs/biome": "1.9.4",
     "@changesets/changelog-github": "^0.5.0",
-    "@changesets/cli": "^2.27.9",
-    "@types/node": "^20.17.4",
+    "@changesets/cli": "^2.27.10",
+    "@types/node": "^22.10.0",
     "esbuild": "^0.24.0",
-    "eslint": "^9.13.0",
+    "eslint": "^9.15.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-no-only-tests": "^3.3.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-regexp": "^2.6.0",
+    "eslint-plugin-regexp": "^2.7.0",
     "only-allow": "^1.2.1",
-    "prettier": "^3.3.3",
+    "prettier": "^3.4.1",
     "prettier-plugin-astro": "^0.14.1",
-    "turbo": "^2.2.3",
-    "typescript": "^5.6.3",
-    "typescript-eslint": "^8.12.2"
+    "turbo": "^2.3.3",
+    "typescript": "^5.7.2",
+    "typescript-eslint": "^8.16.0"
   }
 }
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
@@ -30,28 +30,28 @@
   "dependencies": {
     "@astrojs/internal-helpers": "0.4.1",
     "@astrojs/underscore-redirects": "^0.4.0-alpha.0",
-    "@cloudflare/workers-types": "^4.20241022.0",
+    "@cloudflare/workers-types": "^4.20241112.0",
     "@inox-tools/astro-when": "^0.2.4",
     "esbuild": "^0.24.0",
     "estree-walker": "^3.0.3",
-    "magic-string": "^0.30.12",
-    "miniflare": "^3.20241022.0",
+    "magic-string": "^0.30.14",
+    "miniflare": "^3.20241106.1",
     "tiny-glob": "^0.2.9",
-    "wrangler": "^3.84.0"
+    "wrangler": "^3.91.0"
   },
   "peerDependencies": {
     "astro": "^5.0.0"
   },
   "devDependencies": {
     "@astrojs/test-utils": "workspace:*",
-    "astro": "^5.0.0-alpha.8",
+    "astro": "^5.0.0-alpha.15",
     "astro-scripts": "workspace:*",
     "cheerio": "1.0.0",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
-    "rollup": "^4.24.3",
+    "rollup": "^4.27.4",
     "strip-ansi": "^7.1.0",
-    "vite": "6.0.0-beta.2"
+    "vite": "6.0.1"
   },
   "publishConfig": {
     "provenance": true

diff --git a/packages/cloudflare/src/index.ts b/packages/cloudflare/src/index.ts
@@ -12,7 +12,7 @@ import {
 import { createRedirectsFromAstroRoutes } from '@astrojs/underscore-redirects';
 import astroWhen from '@inox-tools/astro-when';
 import { AstroError } from 'astro/errors';
-import { getPlatformProxy } from 'wrangler';
+import { type GetPlatformProxyOptions, getPlatformProxy } from 'wrangler';
 import {
 	type CloudflareModulePluginExtra,
 	cloudflareModuleLoader,
@@ -53,15 +53,9 @@ export type Options = {
 	/**
 	 * Proxy configuration for the platform.
 	 */
-	platformProxy?: {
+	platformProxy?: GetPlatformProxyOptions & {
 		/** Toggle the proxy. Default `undefined`, which equals to `true`. */
 		enabled?: boolean;
-		/** Path to the configuration file. Default `wrangler.toml`. */
-		configPath?: string;
-		/** Enable experimental support for JSON configuration. Default `false`. */
-		experimentalJsonConfig?: boolean;
-		/** Configuration persistence settings. Default '.wrangler/state/v3' */
-		persist?: boolean | { path: string };
 	};
 
 	/**
@@ -91,14 +85,6 @@ function setProcessEnv(config: AstroConfig, env: Record<string, unknown>) {
 	}
 }
 
-function createPlatformProxy(platformProxy: Options['platformProxy']) {
-	return getPlatformProxy({
-		configPath: platformProxy?.configPath,
-		experimentalJsonConfig: platformProxy?.experimentalJsonConfig ?? false,
-		persist: platformProxy?.persist ?? true,
-	});
-}
-
 export default function createIntegration(args?: Options): AstroIntegration {
 	let _config: AstroConfig;
 
@@ -180,7 +166,7 @@ export default function createIntegration(args?: Options): AstroIntegration {
 			},
 			'astro:server:setup': async ({ server }) => {
 				if ((args?.platformProxy?.enabled ?? true) === true) {
-					const platformProxy = await createPlatformProxy(args?.platformProxy);
+					const platformProxy = await getPlatformProxy(args?.platformProxy);
 
 					setProcessEnv(_config, platformProxy.env);
 

diff --git a/packages/netlify/package.json b/packages/netlify/package.json
@@ -34,25 +34,25 @@
     "@astrojs/internal-helpers": "0.4.1",
     "@astrojs/underscore-redirects": "^0.4.0-alpha.0",
     "@netlify/functions": "^2.8.0",
-    "@vercel/nft": "^0.27.5",
+    "@vercel/nft": "^0.27.6",
     "esbuild": "^0.24.0",
-    "vite": "6.0.0"
+    "vite": "6.0.1"
   },
   "peerDependencies": {
     "astro": "^5.0.0"
   },
   "devDependencies": {
     "@astrojs/test-utils": "workspace:*",
-    "@netlify/edge-functions": "^2.11.0",
+    "@netlify/edge-functions": "^2.11.1",
     "@netlify/edge-handler-types": "^0.34.1",
-    "@types/node": "^20.17.4",
-    "astro": "^5.0.0-alpha.8",
+    "@types/node": "^22.10.0",
+    "astro": "^5.0.0-alpha.15",
     "astro-scripts": "workspace:*",
     "cheerio": "1.0.0",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
     "strip-ansi": "^7.1.0",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   },
   "astro": {
     "external": true

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.8"
+    "astro": "^5.0.0-alpha.15"
   }
 }
diff --git a/packages/node/package.json b/packages/node/package.json
@@ -34,10 +34,10 @@
   },
   "devDependencies": {
     "@astrojs/test-utils": "workspace:*",
-    "@types/node": "^18.19.62",
+    "@types/node": "^22.10.0",
     "@types/send": "^0.17.4",
     "@types/server-destroy": "^1.0.4",
-    "astro": "^5.0.0-alpha.8",
+    "astro": "^5.0.0-alpha.15",
     "astro-scripts": "workspace:*",
     "cheerio": "1.0.0",
     "express": "^4.21.1",

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.8",
+    "astro": "^5.0.0-alpha.15",
     "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
@@ -37,9 +37,9 @@
   },
   "dependencies": {
     "@astrojs/internal-helpers": "^0.4.1",
-    "@vercel/analytics": "^1.3.2",
+    "@vercel/analytics": "^1.4.1",
     "@vercel/edge": "^1.1.2",
-    "@vercel/nft": "^0.27.5",
+    "@vercel/nft": "^0.27.6",
     "esbuild": "^0.24.0",
     "fast-glob": "^3.3.2"
   },
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@astrojs/test-utils": "workspace:*",
-    "astro": "^5.0.0-alpha.8",
+    "astro": "^5.0.0-alpha.15",
     "astro-scripts": "workspace:*",
     "cheerio": "1.0.0"
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ on: @@
       push:
         branches:
           - main
-          - next
+          - legacy
     defaults:
       run:
@@ Expand Down @@