summaryrefslogtreecommitdiff
path: root/packages/integrations/vercel/src
diff options
context:
space:
mode:
authorGravatar Emanuele Stoppa <ematipico@users.noreply.github.com> 2025-02-07 08:48:46 +0000
committerGravatar astrobot-houston <fred+astrobot@astro.build> 2025-02-07 08:48:46 +0000
commit2e9c12a1d4b75674ad6ea10667b37388a7a10772 (patch)
tree2e9a093cacb773b3ef903283161d90cc259e9e45 /packages/integrations/vercel/src
parentefef4136e36b7b272f39ee9e1d173b44c212ec34 (diff)
downloadastro-2e9c12a1d4b75674ad6ea10667b37388a7a10772.tar.gz
astro-2e9c12a1d4b75674ad6ea10667b37388a7a10772.tar.zst
astro-2e9c12a1d4b75674ad6ea10667b37388a7a10772.zip
[ci] format
Diffstat (limited to 'packages/integrations/vercel/src')
-rw-r--r--packages/integrations/vercel/src/image/shared.ts4
-rw-r--r--packages/integrations/vercel/src/index.ts42
-rw-r--r--packages/integrations/vercel/src/lib/nft.ts8
-rw-r--r--packages/integrations/vercel/src/lib/searchRoot.ts2
-rw-r--r--packages/integrations/vercel/src/serverless/adapter.ts2
-rw-r--r--packages/integrations/vercel/src/serverless/entrypoint.ts2
-rw-r--r--packages/integrations/vercel/src/serverless/middleware.ts10
-rw-r--r--packages/integrations/vercel/src/static/adapter.ts2
8 files changed, 36 insertions, 36 deletions
diff --git a/packages/integrations/vercel/src/image/shared.ts b/packages/integrations/vercel/src/image/shared.ts
index e21b79e6a..eb9681243 100644
--- a/packages/integrations/vercel/src/image/shared.ts
+++ b/packages/integrations/vercel/src/image/shared.ts
@@ -68,7 +68,7 @@ export function getAstroImageConfig(
imagesConfig: VercelImageConfig | undefined,
command: string,
devImageService: DevImageService,
- astroImageConfig: AstroConfig['image']
+ astroImageConfig: AstroConfig['image'],
) {
let devService = '@astrojs/vercel/dev-image-service';
@@ -102,7 +102,7 @@ export function getAstroImageConfig(
export function sharedValidateOptions(
options: ImageTransform,
serviceConfig: Record<string, any>,
- mode: 'development' | 'production'
+ mode: 'development' | 'production',
) {
const vercelImageOptions = serviceConfig as VercelImageConfig;
diff --git a/packages/integrations/vercel/src/index.ts b/packages/integrations/vercel/src/index.ts
index db61b0d3c..4aeb3e568 100644
--- a/packages/integrations/vercel/src/index.ts
+++ b/packages/integrations/vercel/src/index.ts
@@ -205,7 +205,7 @@ export default function vercelAdapter({
'head-inline',
await getInjectableWebAnalyticsContent({
mode: command === 'dev' ? 'development' : 'production',
- })
+ }),
);
}
@@ -240,7 +240,7 @@ export default function vercelAdapter({
imagesConfig,
command,
devImageService,
- config.image
+ config.image,
),
});
},
@@ -253,10 +253,10 @@ export default function vercelAdapter({
if (_buildOutput === 'server') {
if (maxDuration && maxDuration > 900) {
logger.warn(
- `maxDuration is set to ${maxDuration} seconds, which is longer than the maximum allowed duration of 900 seconds.`
+ `maxDuration is set to ${maxDuration} seconds, which is longer than the maximum allowed duration of 900 seconds.`,
);
logger.warn(
- `Please make sure that your plan allows for this duration. See https://vercel.com/docs/functions/serverless-functions/runtimes#maxduration for more information.`
+ `Please make sure that your plan allows for this duration. See https://vercel.com/docs/functions/serverless-functions/runtimes#maxduration for more information.`,
);
}
const vercelConfigPath = new URL('vercel.json', config.root);
@@ -276,7 +276,7 @@ export default function vercelAdapter({
Your "vercel.json" \`trailingSlash\` configuration (set to \`${vercelConfig.trailingSlash}\`) will conflict with your Astro \`trailingSlash\` configuration (set to \`${JSON.stringify(config.trailingSlash)}\`).
This would cause infinite redirects or duplicate content issues.
Please remove the \`trailingSlash\` configuration from your \`vercel.json\` file or Astro config.
-`
+`,
);
}
} catch (_err) {
@@ -289,7 +289,7 @@ export default function vercelAdapter({
edgeMiddleware,
middlewareSecret,
skewProtection,
- })
+ }),
);
} else {
setAdapter(
@@ -298,7 +298,7 @@ export default function vercelAdapter({
middlewareSecret: '',
skewProtection,
buildOutput: _buildOutput,
- })
+ }),
);
}
_config = config;
@@ -319,7 +319,7 @@ export default function vercelAdapter({
patternRegex: routeData.pattern,
},
url,
- ])
+ ]),
);
_middlewareEntryPoint = middlewareEntryPoint;
},
@@ -376,7 +376,7 @@ export default function vercelAdapter({
includeFiles,
logger,
outDir,
- maxDuration
+ maxDuration,
);
// Multiple entrypoint support
@@ -435,7 +435,7 @@ export default function vercelAdapter({
await builder.buildMiddlewareFolder(
_middlewareEntryPoint,
MIDDLEWARE_PATH,
- middlewareSecret
+ middlewareSecret,
);
}
}
@@ -492,7 +492,7 @@ export default function vercelAdapter({
if (error) {
throw new AstroError(
`Error generating redirects: ${error.message}`,
- error.link ? `${error.action ?? 'More info'}: ${error.link}` : undefined
+ error.link ? `${error.action ?? 'More info'}: ${error.link}` : undefined,
);
}
@@ -521,7 +521,7 @@ export default function vercelAdapter({
`Error generating routes: ${normalized.error.message}`,
normalized.error.link
? `${normalized.error.action ?? 'More info'}: ${normalized.error.link}`
- : undefined
+ : undefined,
);
}
@@ -567,7 +567,7 @@ class VercelBuilder {
readonly logger: AstroIntegrationLogger,
readonly outDir: URL,
readonly maxDuration?: number,
- readonly runtime = getRuntime(process, logger)
+ readonly runtime = getRuntime(process, logger),
) {}
async buildServerlessFolder(entry: URL, functionName: string, root: URL) {
@@ -587,7 +587,7 @@ class VercelBuilder {
logger,
root,
},
- NTF_CACHE
+ NTF_CACHE,
);
// Enable ESM
@@ -609,7 +609,7 @@ class VercelBuilder {
await this.buildServerlessFolder(entry, functionName, root);
const prerenderConfig = new URL(
`./functions/${functionName}.prerender-config.json`,
- this.outDir
+ this.outDir,
);
// https://vercel.com/docs/build-output-api/v3/primitives#prerender-configuration-file
await writeJson(prerenderConfig, {
@@ -629,7 +629,7 @@ class VercelBuilder {
new URL(VERCEL_EDGE_MIDDLEWARE_FILE, this.config.srcDir),
new URL('./middleware.mjs', functionFolder),
middlewareSecret,
- this.logger
+ this.logger,
);
await writeJson(new URL(`./.vc-config.json`, functionFolder), {
@@ -648,7 +648,7 @@ function getRuntime(process: NodeJS.Process, logger: AstroIntegrationLogger): Ru
`\n` +
`\tThe local Node.js version (${major}) is not supported by Vercel Serverless Functions.\n` +
`\tYour project will use Node.js 18 as the runtime instead.\n` +
- `\tConsider switching your local version to 18.\n`
+ `\tConsider switching your local version to 18.\n`,
);
return 'nodejs18.x';
}
@@ -658,26 +658,26 @@ function getRuntime(process: NodeJS.Process, logger: AstroIntegrationLogger): Ru
if (support.status === 'retiring') {
if (support.warnDate && new Date() >= support.warnDate) {
logger.warn(
- `Your project is being built for Node.js ${major} as the runtime, which is retiring by ${support.removal}.`
+ `Your project is being built for Node.js ${major} as the runtime, which is retiring by ${support.removal}.`,
);
}
return `nodejs${major}.x`;
}
if (support.status === 'beta') {
logger.warn(
- `Your project is being built for Node.js ${major} as the runtime, which is currently in beta for Vercel Serverless Functions.`
+ `Your project is being built for Node.js ${major} as the runtime, which is currently in beta for Vercel Serverless Functions.`,
);
return `nodejs${major}.x`;
}
if (support.status === 'deprecated') {
const removeDate = new Intl.DateTimeFormat(undefined, { dateStyle: 'long' }).format(
- support.removal
+ support.removal,
);
logger.warn(
`\n` +
`\tYour project is being built for Node.js ${major} as the runtime.\n` +
`\tThis version is deprecated by Vercel Serverless Functions, and scheduled to be disabled on ${removeDate}.\n` +
- `\tConsider upgrading your local version to 18.\n`
+ `\tConsider upgrading your local version to 18.\n`,
);
return `nodejs${major}.x`;
}
diff --git a/packages/integrations/vercel/src/lib/nft.ts b/packages/integrations/vercel/src/lib/nft.ts
index d72979e89..4381943bb 100644
--- a/packages/integrations/vercel/src/lib/nft.ts
+++ b/packages/integrations/vercel/src/lib/nft.ts
@@ -22,7 +22,7 @@ export async function copyDependenciesToFunction(
root: URL;
},
// we want to pass the caching by reference, and not by value
- cache: object
+ cache: object,
): Promise<{ handler: string }> {
const entryPath = fileURLToPath(entry);
logger.info(`Bundling function ${relativePath(fileURLToPath(outDir), entryPath)}`);
@@ -52,11 +52,11 @@ export async function copyDependenciesToFunction(
if (entryPath === file) {
logger.debug(
- `[@astrojs/vercel] The module "${module}" couldn't be resolved. This may not be a problem, but it's worth checking.`
+ `[@astrojs/vercel] The module "${module}" couldn't be resolved. This may not be a problem, but it's worth checking.`,
);
} else {
logger.debug(
- `[@astrojs/vercel] The module "${module}" inside the file "${file}" couldn't be resolved. This may not be a problem, but it's worth checking.`
+ `[@astrojs/vercel] The module "${module}" inside the file "${file}" couldn't be resolved. This may not be a problem, but it's worth checking.`,
);
}
}
@@ -73,7 +73,7 @@ export async function copyDependenciesToFunction(
const commonAncestor = await copyFilesToFolder(
[...result.fileList].map((file) => new URL(file, base)).concat(includeFiles),
outDir,
- excludeFiles
+ excludeFiles,
);
return {
diff --git a/packages/integrations/vercel/src/lib/searchRoot.ts b/packages/integrations/vercel/src/lib/searchRoot.ts
index 832f6e498..e630c8b43 100644
--- a/packages/integrations/vercel/src/lib/searchRoot.ts
+++ b/packages/integrations/vercel/src/lib/searchRoot.ts
@@ -88,7 +88,7 @@ export function searchForPackageRoot(current: string, root = current): string {
*/
export function searchForWorkspaceRoot(
current: string,
- root = searchForPackageRoot(current)
+ root = searchForPackageRoot(current),
): string {
if (hasRootFile(current)) return current;
if (hasWorkspacePackageJSON(current)) return current;
diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts
index 86464f89b..1c12f611a 100644
--- a/packages/integrations/vercel/src/serverless/adapter.ts
+++ b/packages/integrations/vercel/src/serverless/adapter.ts
@@ -4,7 +4,7 @@ import vercelIntegration from '../index.js';
export default function serverless(config: VercelServerlessConfig): AstroIntegration {
console.warn(
- 'The "@astrojs/vercel/serverless" import is deprecated and will be removed in a future release. Please import from "@astrojs/vercel" instead.'
+ 'The "@astrojs/vercel/serverless" import is deprecated and will be removed in a future release. Please import from "@astrojs/vercel" instead.',
);
return vercelIntegration(config);
}
diff --git a/packages/integrations/vercel/src/serverless/entrypoint.ts b/packages/integrations/vercel/src/serverless/entrypoint.ts
index f1f1f256c..5b64fa506 100644
--- a/packages/integrations/vercel/src/serverless/entrypoint.ts
+++ b/packages/integrations/vercel/src/serverless/entrypoint.ts
@@ -15,7 +15,7 @@ setGetEnv((key) => process.env[key]);
export const createExports = (
manifest: SSRManifest,
- { middlewareSecret, skewProtection }: { middlewareSecret: string; skewProtection: boolean }
+ { middlewareSecret, skewProtection }: { middlewareSecret: string; skewProtection: boolean },
) => {
const app = new NodeApp(manifest);
const handler = async (req: IncomingMessage, res: ServerResponse) => {
diff --git a/packages/integrations/vercel/src/serverless/middleware.ts b/packages/integrations/vercel/src/serverless/middleware.ts
index 3980186f5..b1927ca3b 100644
--- a/packages/integrations/vercel/src/serverless/middleware.ts
+++ b/packages/integrations/vercel/src/serverless/middleware.ts
@@ -30,13 +30,13 @@ export async function generateEdgeMiddleware(
vercelEdgeMiddlewareHandlerPath: URL,
outPath: URL,
middlewareSecret: string,
- logger: AstroIntegrationLogger
+ logger: AstroIntegrationLogger,
): Promise<URL> {
const code = edgeMiddlewareTemplate(
astroMiddlewareEntryPointPath,
vercelEdgeMiddlewareHandlerPath,
middlewareSecret,
- logger
+ logger,
);
// https://vercel.com/docs/concepts/functions/edge-middleware#create-edge-middleware
const bundledFilePath = fileURLToPath(outPath);
@@ -77,17 +77,17 @@ function edgeMiddlewareTemplate(
astroMiddlewareEntryPointPath: URL,
vercelEdgeMiddlewareHandlerPath: URL,
middlewareSecret: string,
- logger: AstroIntegrationLogger
+ logger: AstroIntegrationLogger,
) {
const middlewarePath = JSON.stringify(
- fileURLToPath(astroMiddlewareEntryPointPath).replace(/\\/g, '/')
+ fileURLToPath(astroMiddlewareEntryPointPath).replace(/\\/g, '/'),
);
const filePathEdgeMiddleware = fileURLToPath(vercelEdgeMiddlewareHandlerPath);
let handlerTemplateImport = '';
let handlerTemplateCall = '{}';
if (existsSync(filePathEdgeMiddleware + '.js') || existsSync(filePathEdgeMiddleware + '.ts')) {
logger.warn(
- 'Usage of `vercel-edge-middleware.js` is deprecated. You can now use the `waitUntil(promise)` function directly as `ctx.locals.waitUntil(promise)`.'
+ 'Usage of `vercel-edge-middleware.js` is deprecated. You can now use the `waitUntil(promise)` function directly as `ctx.locals.waitUntil(promise)`.',
);
const stringified = JSON.stringify(filePathEdgeMiddleware.replace(/\\/g, '/'));
handlerTemplateImport = `import handler from ${stringified}`;
diff --git a/packages/integrations/vercel/src/static/adapter.ts b/packages/integrations/vercel/src/static/adapter.ts
index 348994902..d140f354d 100644
--- a/packages/integrations/vercel/src/static/adapter.ts
+++ b/packages/integrations/vercel/src/static/adapter.ts
@@ -4,7 +4,7 @@ import vercelIntegration from '../index.js';
export default function staticAdapter(config: VercelServerlessConfig): AstroIntegration {
console.warn(
- 'The "@astrojs/vercel/static" import is deprecated and will be removed in a future release. Please import from "@astrojs/vercel" instead.'
+ 'The "@astrojs/vercel/static" import is deprecated and will be removed in a future release. Please import from "@astrojs/vercel" instead.',
);
return vercelIntegration(config);
}