diff options
11 files changed, 22 insertions, 36 deletions
diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index f5f56e07d..d792c4db4 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -30,13 +30,13 @@ "dependencies": { "@astrojs/internal-helpers": "0.4.1", "@astrojs/underscore-redirects": "^0.3.4", - "@cloudflare/workers-types": "^4.20241022.0", + "@cloudflare/workers-types": "^4.20241112.0", "esbuild": "^0.21.5", "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", "@inox-tools/astro-when": "^0.2.4" }, "peerDependencies": { @@ -44,14 +44,14 @@ }, "devDependencies": { "@astrojs/test-utils": "workspace:*", - "astro": "^4.16.8", + "astro": "^4.16.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": "^5.4.10" + "vite": "^5.4.11" }, "publishConfig": { "provenance": true diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts index 4facef327..46bb9912e 100644 --- a/packages/integrations/cloudflare/src/index.ts +++ b/packages/integrations/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; @@ -184,7 +170,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/integrations/cloudflare/test/fixtures/astro-dev-platform/package.json b/packages/integrations/cloudflare/test/fixtures/astro-dev-platform/package.json index 1d43dd35a..df1c8b6d6 100644 --- a/packages/integrations/cloudflare/test/fixtures/astro-dev-platform/package.json +++ b/packages/integrations/cloudflare/test/fixtures/astro-dev-platform/package.json @@ -4,9 +4,9 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^4.16.8" + "astro": "^4.16.15" }, "devDependencies": { - "wrangler": "^3.84.0" + "wrangler": "^3.91.0" } } diff --git a/packages/integrations/cloudflare/test/fixtures/astro-env/package.json b/packages/integrations/cloudflare/test/fixtures/astro-env/package.json index dbdf4d129..4771356d3 100644 --- a/packages/integrations/cloudflare/test/fixtures/astro-env/package.json +++ b/packages/integrations/cloudflare/test/fixtures/astro-env/package.json @@ -4,9 +4,9 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "astro": "^4.16.8" + "astro": "^4.16.15" }, "devDependencies": { - "wrangler": "^3.84.0" + "wrangler": "^3.91.0" } } 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..c4e48285a 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": "^4.16.15" } } 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..215e135d3 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": "^4.16.15" } } diff --git a/packages/integrations/cloudflare/test/fixtures/module-loader/package.json b/packages/integrations/cloudflare/test/fixtures/module-loader/package.json index 2d6e56598..9eb556973 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": "^4.16.15" } } diff --git a/packages/integrations/cloudflare/test/fixtures/no-output/package.json b/packages/integrations/cloudflare/test/fixtures/no-output/package.json index 72ca4db18..7d330e557 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": "^4.16.15" } } diff --git a/packages/integrations/cloudflare/test/fixtures/routes-json/package.json b/packages/integrations/cloudflare/test/fixtures/routes-json/package.json index 90407d19e..c7e5d4d87 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": "^4.16.15" } } 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..d109ee4ad 100644 --- a/packages/integrations/cloudflare/test/fixtures/with-solid-js/package.json +++ b/packages/integrations/cloudflare/test/fixtures/with-solid-js/package.json @@ -4,8 +4,8 @@ "private": true, "dependencies": { "@astrojs/cloudflare": "workspace:*", - "@astrojs/solid-js": "^4.4.2", - "astro": "^4.16.8", + "@astrojs/solid-js": "^4.4.4", + "astro": "^4.16.15", "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..f5c903265 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": "^4.16.15" } } |