diff options
author | 2025-02-07 08:59:05 +0000 | |
---|---|---|
committer | 2025-02-07 08:59:05 +0000 | |
commit | 9b8042a1ed2068c398d77a73503b82d3e68424d1 (patch) | |
tree | 960627bc09d455e04fcf75b11d0452349b35e6d4 /packages/integrations/cloudflare/src | |
parent | a7776b8036155143ca99790233800667dc1b6abc (diff) | |
download | astro-9b8042a1ed2068c398d77a73503b82d3e68424d1.tar.gz astro-9b8042a1ed2068c398d77a73503b82d3e68424d1.tar.zst astro-9b8042a1ed2068c398d77a73503b82d3e68424d1.zip |
chore: move cloudflare adapter to core monorepo
Diffstat (limited to 'packages/integrations/cloudflare/src')
8 files changed, 28 insertions, 28 deletions
diff --git a/packages/integrations/cloudflare/src/entrypoints/image-service.ts b/packages/integrations/cloudflare/src/entrypoints/image-service.ts index 08907bd20..fa970c45f 100644 --- a/packages/integrations/cloudflare/src/entrypoints/image-service.ts +++ b/packages/integrations/cloudflare/src/entrypoints/image-service.ts @@ -29,7 +29,7 @@ const service: ExternalImageService = { import.meta.env.BASE_URL, '/cdn-cgi/image', resizingParams.join(','), - imageSource + imageSource, ); return imageEndpoint; diff --git a/packages/integrations/cloudflare/src/entrypoints/server.ts b/packages/integrations/cloudflare/src/entrypoints/server.ts index 4680b9e59..d9ae17be0 100644 --- a/packages/integrations/cloudflare/src/entrypoints/server.ts +++ b/packages/integrations/cloudflare/src/entrypoints/server.ts @@ -29,7 +29,7 @@ export function createExports(manifest: SSRManifest) { const fetch = async ( request: Request & CLOUDFLARE_REQUEST, env: Env, - context: ExecutionContext + context: ExecutionContext, ) => { const { pathname } = new URL(request.url); @@ -42,7 +42,7 @@ export function createExports(manifest: SSRManifest) { if (!routeData) { // https://developers.cloudflare.com/pages/functions/api-reference/#envassetsfetch const asset = await env.ASSETS.fetch( - request.url.replace(/index.html$/, '').replace(/\.html$/, '') + request.url.replace(/index.html$/, '').replace(/\.html$/, ''), ); if (asset.status !== 404) { return asset; @@ -52,7 +52,7 @@ export function createExports(manifest: SSRManifest) { Reflect.set( request, Symbol.for('astro.clientAddress'), - request.headers.get('cf-connecting-ip') + request.headers.get('cf-connecting-ip'), ); process.env.ASTRO_STUDIO_APP_TOKEN ??= (() => { @@ -71,7 +71,7 @@ export function createExports(manifest: SSRManifest) { // Currently not available: https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions passThroughOnException: () => { throw new Error( - '`passThroughOnException` is currently not available in Cloudflare Pages. See https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions.' + '`passThroughOnException` is currently not available in Cloudflare Pages. See https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions.', ); }, props: {}, diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts index e66b20627..d38594f15 100644 --- a/packages/integrations/cloudflare/src/index.ts +++ b/packages/integrations/cloudflare/src/index.ts @@ -95,7 +95,7 @@ export default function createIntegration(args?: Options): AstroIntegration { let finalBuildOutput: HookParameters<'astro:config:done'>['buildOutput']; const cloudflareModulePlugin: PluginOption & CloudflareModulePluginExtra = cloudflareModuleLoader( - args?.cloudflareModules ?? true + args?.cloudflareModules ?? true, ); let _routes: IntegrationResolvedRoute[]; @@ -155,7 +155,7 @@ export default function createIntegration(args?: Options): AstroIntegration { '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.' + '[@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.', ); } @@ -203,7 +203,7 @@ export default function createIntegration(args?: Options): AstroIntegration { // Currently not available: https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions passThroughOnException: () => { throw new AstroError( - '`passThroughOnException` is currently not available in Cloudflare Pages. See https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions.' + '`passThroughOnException` is currently not available in Cloudflare Pages. See https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions.', ); }, }, @@ -267,7 +267,7 @@ export default function createIntegration(args?: Options): AstroIntegration { await rename(new URL(file, _config.build.client), new URL(file, _config.outDir)); } catch (e) { logger.error( - `There was an error moving ${file} to the root of the output directory.` + `There was an error moving ${file} to the root of the output directory.`, ); } } @@ -326,7 +326,7 @@ export default function createIntegration(args?: Options): AstroIntegration { pages, redirects, args?.routes?.extend?.include, - args?.routes?.extend?.exclude + args?.routes?.extend?.exclude, ); } @@ -336,8 +336,8 @@ export default function createIntegration(args?: Options): AstroIntegration { Array.from( _routes .filter((route) => route.type === 'redirect') - .map((route) => [route, ''] as const) - ) + .map((route) => [route, ''] as const), + ), ), dir, buildOutput: finalBuildOutput, diff --git a/packages/integrations/cloudflare/src/utils/assets.ts b/packages/integrations/cloudflare/src/utils/assets.ts index d43271e09..21ba28690 100644 --- a/packages/integrations/cloudflare/src/utils/assets.ts +++ b/packages/integrations/cloudflare/src/utils/assets.ts @@ -67,7 +67,7 @@ export function isRemoteAllowed( { domains = [], remotePatterns = [], - }: Partial<Pick<AstroConfig['image'], 'domains' | 'remotePatterns'>> + }: Partial<Pick<AstroConfig['image'], 'domains' | 'remotePatterns'>>, ): boolean { if (!isRemotePath(src)) return false; diff --git a/packages/integrations/cloudflare/src/utils/cloudflare-module-loader.ts b/packages/integrations/cloudflare/src/utils/cloudflare-module-loader.ts index 185c1615e..0b6f82cf3 100644 --- a/packages/integrations/cloudflare/src/utils/cloudflare-module-loader.ts +++ b/packages/integrations/cloudflare/src/utils/cloudflare-module-loader.ts @@ -26,7 +26,7 @@ export type ModuleType = 'CompiledWasm' | 'Text' | 'Data'; * @returns Vite plugin with additional extension method to hook into astro build */ export function cloudflareModuleLoader( - enabled: boolean + enabled: boolean, ): PluginOption & CloudflareModulePluginExtra { /** * It's likely that eventually cloudflare will add support for custom extensions, like they do in vanilla cloudflare workers, @@ -55,7 +55,7 @@ export function cloudflareModuleLoader( rollupOptions: { // mark the wasm files as external so that they are not bundled and instead are loaded from the files external: extensions.map( - (x) => new RegExp(`^${MAGIC_STRING}.+${escapeRegExp(x)}.mjs$`, 'i') + (x) => new RegExp(`^${MAGIC_STRING}.+${escapeRegExp(x)}.mjs$`, 'i'), ), }, }, @@ -71,7 +71,7 @@ export function cloudflareModuleLoader( } if (!enabled) { throw new Error( - `Cloudflare module loading is experimental. The ${maybeExtension} module cannot be loaded unless you add \`cloudflareModules: true\` to your astro config.` + `Cloudflare module loading is experimental. The ${maybeExtension} module cannot be loaded unless you add \`cloudflareModules: true\` to your astro config.`, ); } @@ -140,7 +140,7 @@ export function cloudflareModuleLoader( nodejsImport: relativePath, }); return `./${relativePath}`; - } + }, ); } diff --git a/packages/integrations/cloudflare/src/utils/generate-routes-json.ts b/packages/integrations/cloudflare/src/utils/generate-routes-json.ts index 8828fd52f..f12782b7b 100644 --- a/packages/integrations/cloudflare/src/utils/generate-routes-json.ts +++ b/packages/integrations/cloudflare/src/utils/generate-routes-json.ts @@ -47,7 +47,7 @@ async function writeRoutesFileToOutDir( _config: AstroConfig, logger: AstroIntegrationLogger, include: string[], - exclude: string[] + exclude: string[], ) { try { await writeFile( @@ -59,9 +59,9 @@ async function writeRoutesFileToOutDir( exclude: exclude, }, null, - 2 + 2, ), - 'utf-8' + 'utf-8', ); } catch (error) { logger.error("There was an error writing the '_routes.json' file to the output directory."); @@ -182,7 +182,7 @@ export async function createRoutesFile( | { pattern: string; }[] - | undefined + | undefined, ) { const includePaths: string[][] = []; const excludePaths: string[][] = []; @@ -197,7 +197,7 @@ export async function createRoutesFile( [{ content: _config.build.assets, dynamic: false, spread: false }], [{ content: '', dynamic: true, spread: false }], ], - _config + _config, ); excludePaths.push(assetsPath); @@ -328,9 +328,9 @@ export async function createRoutesFile( CLOUDFLARE_COMBINED_LIMIT - EXTENDED_INCLUDE_RULES_COUNT - EXTENDED_EXCLUDE_RULES_COUNT - - 1 + 1, ) - .concat(excludeExtends?.map((entry) => entry.pattern) ?? []) + .concat(excludeExtends?.map((entry) => entry.pattern) ?? []), ); } else { await writeRoutesFileToOutDir( @@ -343,7 +343,7 @@ export async function createRoutesFile( ? deduplicatedExcludePaths .map((path) => `${prependForwardSlash(path.join('/'))}`) .concat(excludeExtends?.map((entry) => entry.pattern) ?? []) - : [] + : [], ); } } diff --git a/packages/integrations/cloudflare/src/utils/image-config.ts b/packages/integrations/cloudflare/src/utils/image-config.ts index 58e0f76a0..f9ed1a709 100644 --- a/packages/integrations/cloudflare/src/utils/image-config.ts +++ b/packages/integrations/cloudflare/src/utils/image-config.ts @@ -5,7 +5,7 @@ export function setImageConfig( service: string, config: AstroConfig['image'], command: HookParameters<'astro:config:setup'>['command'], - logger: AstroIntegrationLogger + logger: AstroIntegrationLogger, ) { switch (service) { case 'passthrough': @@ -35,7 +35,7 @@ export function setImageConfig( default: if (config.service.entrypoint === 'astro/assets/services/sharp') { logger.warn( - `The current configuration does not support image optimization. To allow your project to build with the original, unoptimized images, the image service has been automatically switched to the 'noop' option. See https://docs.astro.build/en/reference/configuration-reference/#imageservice` + `The current configuration does not support image optimization. To allow your project to build with the original, unoptimized images, the image service has been automatically switched to the 'noop' option. See https://docs.astro.build/en/reference/configuration-reference/#imageservice`, ); return { ...config, service: passthroughImageService() }; } diff --git a/packages/integrations/cloudflare/src/utils/non-server-chunk-detector.ts b/packages/integrations/cloudflare/src/utils/non-server-chunk-detector.ts index 4b14e7087..16ba2aed9 100644 --- a/packages/integrations/cloudflare/src/utils/non-server-chunk-detector.ts +++ b/packages/integrations/cloudflare/src/utils/non-server-chunk-detector.ts @@ -75,7 +75,7 @@ export class NonServerChunkDetector { // Any chunk not flagged as used on the server is a non-server chunk this.nonServerChunks = Array.from(chunkToDependencies.keys()).filter( - (chunk) => !chunkDecisions.get(chunk) + (chunk) => !chunkDecisions.get(chunk), ); } |