From c84e8b8e3efa0008e02c1df10250d6706bfc98d9 Mon Sep 17 00:00:00 2001 From: matthewp Date: Mon, 17 Jul 2023 13:15:32 +0000 Subject: [PATCH] [ci] format --- packages/integrations/cloudflare/src/index.ts | 47 +++++++++---------- .../cloudflare/src/server.directory.ts | 4 +- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts index 3385acd0d..22439c4ac 100644 --- a/packages/integrations/cloudflare/src/index.ts +++ b/packages/integrations/cloudflare/src/index.ts @@ -21,15 +21,15 @@ interface BuildConfig { export function getAdapter(isModeDirectory: boolean): AstroAdapter { return isModeDirectory ? { - name: '@astrojs/cloudflare', - serverEntrypoint: '@astrojs/cloudflare/server.directory.js', - exports: ['onRequest', 'manifest'], - } + name: '@astrojs/cloudflare', + serverEntrypoint: '@astrojs/cloudflare/server.directory.js', + exports: ['onRequest', 'manifest'], + } : { - name: '@astrojs/cloudflare', - serverEntrypoint: '@astrojs/cloudflare/server.advanced.js', - exports: ['default'], - }; + name: '@astrojs/cloudflare', + serverEntrypoint: '@astrojs/cloudflare/server.advanced.js', + exports: ['default'], + }; } const SHIM = `globalThis.process = { @@ -114,7 +114,7 @@ export default function createIntegration(args?: Options): AstroIntegration { if (isModeDirectory && _buildConfig.split) { const entryPointsURL = [..._entryPoints.values()]; const entryPaths = entryPointsURL.map((entry) => fileURLToPath(entry)); - const outputUrl = new URL('$astro', _buildConfig.server) + const outputUrl = new URL('$astro', _buildConfig.server); const outputDir = fileURLToPath(outputUrl); await esbuild.build({ @@ -135,38 +135,37 @@ export default function createIntegration(args?: Options): AstroIntegration { }, }); - const outputFiles: Array = ( - await glob(`**/*`, { - cwd: outputDir, - filesOnly: true, - }) - ) + const outputFiles: Array = await glob(`**/*`, { + cwd: outputDir, + filesOnly: true, + }); // move the files into the functions folder // & make sure the file names match Cloudflare syntax for routing for (const outputFile of outputFiles) { const path = outputFile.split(sep); - const finalSegments = path.map((segment) => segment - .replace(/(\_)(\w+)(\_)/g, (_, __, prop) => { - return `[${prop}]`; - }) - .replace(/(\_\-\-\-)(\w+)(\_)/g, (_, __, prop) => { - return `[[${prop}]]`; - }) + const finalSegments = path.map((segment) => + segment + .replace(/(\_)(\w+)(\_)/g, (_, __, prop) => { + return `[${prop}]`; + }) + .replace(/(\_\-\-\-)(\w+)(\_)/g, (_, __, prop) => { + return `[[${prop}]]`; + }) ); finalSegments[finalSegments.length - 1] = finalSegments[finalSegments.length - 1] .replace('entry.', '') .replace(/(.*)\.(\w+)\.(\w+)$/g, (_, fileName, __, newExt) => { return `${fileName}.${newExt}`; - }) + }); const finalDirPath = finalSegments.slice(0, -1).join(sep); const finalPath = finalSegments.join(sep); const newDirUrl = new URL(finalDirPath, functionsUrl); - await fs.promises.mkdir(newDirUrl, { recursive: true }) + await fs.promises.mkdir(newDirUrl, { recursive: true }); const oldFileUrl = new URL(`$astro/${outputFile}`, outputUrl); const newFileUrl = new URL(finalPath, functionsUrl); diff --git a/packages/integrations/cloudflare/src/server.directory.ts b/packages/integrations/cloudflare/src/server.directory.ts index e6cc104f9..50607b65a 100644 --- a/packages/integrations/cloudflare/src/server.directory.ts +++ b/packages/integrations/cloudflare/src/server.directory.ts @@ -26,7 +26,9 @@ export function createExports(manifest: SSRManifest) { if (manifest.assets.has(pathname)) { // we need this so the page does not error // https://developers.cloudflare.com/pages/platform/functions/advanced-mode/#set-up-a-function - return (runtimeEnv.env as EventContext['env']).ASSETS.fetch(request); + return (runtimeEnv.env as EventContext['env']).ASSETS.fetch( + request + ); } let routeData = app.match(request, { matchNotFound: true });