diff options
author | 2024-03-13 15:09:55 +0000 | |
---|---|---|
committer | 2024-03-13 15:09:55 +0000 | |
commit | 95f88e5014e085d6567e81c0c67509afc082ad2a (patch) | |
tree | aea313154789bd6fdcb026d1f496c6a1a746c339 /packages/integrations/cloudflare/src | |
parent | 9a6a7dd9334f5dd8ae624e941b4ff6fa2bf5585f (diff) | |
download | astro-95f88e5014e085d6567e81c0c67509afc082ad2a.tar.gz astro-95f88e5014e085d6567e81c0c67509afc082ad2a.tar.zst astro-95f88e5014e085d6567e81c0c67509afc082ad2a.zip |
chore: update biome to the latest (#183)
* chore: biome safe fixes
* chore: biome unsafe fixes
* chore: update Biome, and use Biome in CI
* chore: fix merge conflicts
Diffstat (limited to 'packages/integrations/cloudflare/src')
7 files changed, 36 insertions, 34 deletions
diff --git a/packages/integrations/cloudflare/src/entrypoints/server.advanced.ts b/packages/integrations/cloudflare/src/entrypoints/server.advanced.ts index 35fa98fd4..f5c596a7d 100644 --- a/packages/integrations/cloudflare/src/entrypoints/server.advanced.ts +++ b/packages/integrations/cloudflare/src/entrypoints/server.advanced.ts @@ -1,7 +1,7 @@ import type { + Request as CFRequest, CacheStorage, ExecutionContext, - Request as CFRequest, } from '@cloudflare/workers-types'; import type { SSRManifest } from 'astro'; import { App } from 'astro/app'; diff --git a/packages/integrations/cloudflare/src/entrypoints/server.directory.ts b/packages/integrations/cloudflare/src/entrypoints/server.directory.ts index 7a4ebadc5..97ff80705 100644 --- a/packages/integrations/cloudflare/src/entrypoints/server.directory.ts +++ b/packages/integrations/cloudflare/src/entrypoints/server.directory.ts @@ -1,4 +1,4 @@ -import type { CacheStorage, EventContext, Request as CFRequest } from '@cloudflare/workers-types'; +import type { Request as CFRequest, CacheStorage, EventContext } from '@cloudflare/workers-types'; import type { SSRManifest } from 'astro'; import { App } from 'astro/app'; import { getProcessEnvProxy, isNode } from '../util.js'; diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts index 6fc4d3553..511b85452 100644 --- a/packages/integrations/cloudflare/src/index.ts +++ b/packages/integrations/cloudflare/src/index.ts @@ -583,34 +583,35 @@ export default function createIntegration(args?: Options): AstroIntegration { ); break; - default: { - const includeStrategyLength = includeStrategy - ? includeStrategy.include.length + includeStrategy.exclude.length - : Infinity; - - const excludeStrategyLength = excludeStrategy - ? excludeStrategy.include.length + excludeStrategy.exclude.length - : Infinity; - - const winningStrategy = notFoundIsSSR - ? excludeStrategy - : includeStrategyLength <= excludeStrategyLength - ? includeStrategy - : excludeStrategy; - - await fs.promises.writeFile( - new URL('./_routes.json', _config.outDir), - JSON.stringify( - { - version: 1, - ...winningStrategy, - }, - null, - 2 - ) - ); - } - break; + default: + { + const includeStrategyLength = includeStrategy + ? includeStrategy.include.length + includeStrategy.exclude.length + : Number.POSITIVE_INFINITY; + + const excludeStrategyLength = excludeStrategy + ? excludeStrategy.include.length + excludeStrategy.exclude.length + : Number.POSITIVE_INFINITY; + + const winningStrategy = notFoundIsSSR + ? excludeStrategy + : includeStrategyLength <= excludeStrategyLength + ? includeStrategy + : excludeStrategy; + + await fs.promises.writeFile( + new URL('./_routes.json', _config.outDir), + JSON.stringify( + { + version: 1, + ...winningStrategy, + }, + null, + 2 + ) + ); + } + break; } } }, diff --git a/packages/integrations/cloudflare/src/utils/local-runtime.ts b/packages/integrations/cloudflare/src/utils/local-runtime.ts index f7040b33f..e9e5aab88 100644 --- a/packages/integrations/cloudflare/src/utils/local-runtime.ts +++ b/packages/integrations/cloudflare/src/utils/local-runtime.ts @@ -9,9 +9,9 @@ import type { AstroConfig, AstroIntegrationLogger } from 'astro'; import type { ExternalServer, Json, ReplaceWorkersTypes, WorkerOptions } from 'miniflare'; import type { Options } from '../index.js'; -import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'fs'; import assert from 'node:assert'; -import { fileURLToPath } from 'url'; +import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'node:fs'; +import { fileURLToPath } from 'node:url'; import TOML from '@iarna/toml'; import { AstroError } from 'astro/errors'; import dotenv from 'dotenv'; diff --git a/packages/integrations/cloudflare/src/utils/parser.ts b/packages/integrations/cloudflare/src/utils/parser.ts index 5140b22a1..0bae2c673 100644 --- a/packages/integrations/cloudflare/src/utils/parser.ts +++ b/packages/integrations/cloudflare/src/utils/parser.ts @@ -123,6 +123,7 @@ function getVarsForDev(config: any, configPath: string | undefined): any { function parseConfig() { if (_wrangler) return _wrangler; + // biome-ignore lint/suspicious/noImplicitAnyLet: correct usage let rawConfig; const configPath = findWranglerToml(process.cwd(), false); // false = args.experimentalJsonConfig if (!configPath) { diff --git a/packages/integrations/cloudflare/src/utils/rewriteWasmImportPath.ts b/packages/integrations/cloudflare/src/utils/rewriteWasmImportPath.ts index b16b01088..c266f19b1 100644 --- a/packages/integrations/cloudflare/src/utils/rewriteWasmImportPath.ts +++ b/packages/integrations/cloudflare/src/utils/rewriteWasmImportPath.ts @@ -1,5 +1,5 @@ import { basename } from 'node:path'; -import esbuild from 'esbuild'; +import type esbuild from 'esbuild'; /** * diff --git a/packages/integrations/cloudflare/src/utils/sharpBundlePatch.ts b/packages/integrations/cloudflare/src/utils/sharpBundlePatch.ts index d0aceccf8..ea9015be2 100644 --- a/packages/integrations/cloudflare/src/utils/sharpBundlePatch.ts +++ b/packages/integrations/cloudflare/src/utils/sharpBundlePatch.ts @@ -1,4 +1,4 @@ -import esbuild from 'esbuild'; +import type esbuild from 'esbuild'; export function patchSharpBundle(): esbuild.Plugin { return { |