diff --git a/cdk/arch/lambda-s3.ts b/cdk/arch/lambda-s3.ts index 57967baf..35b1248d 100644 --- a/cdk/arch/lambda-s3.ts +++ b/cdk/arch/lambda-s3.ts @@ -20,11 +20,9 @@ import { environment, lambdaRuntime, memorySize, - stream, + stream } from '../external/params' -import { - lambdaModifier -} from '../external/cdk-modifiers' +import { lambdaModifier } from '../external/cdk-modifiers' export class CDKStack extends Stack { constructor(scope: Construct, id: string, props?: StackProps) { @@ -43,10 +41,10 @@ export class CDKStack extends Stack { memorySize, timeout: Duration.seconds(30), environment - }); - + }) + // allow custom modification of CDK lambda function - lambdaModifier(lambdaFunction); + lambdaModifier(lambdaFunction) const lambdaURL = lambdaFunction.addFunctionUrl({ authType: aws_lambda.FunctionUrlAuthType.NONE, diff --git a/cdk/external/cdk-modifiers.ts b/cdk/external/cdk-modifiers.ts index 3fcb58cc..ce305134 100644 --- a/cdk/external/cdk-modifiers.ts +++ b/cdk/external/cdk-modifiers.ts @@ -1,4 +1,6 @@ /* $$__ADAPTER_IMPORTS__$$ */ import * as cdk from 'aws-cdk-lib' -export const lambdaModifier = (lambdaFunction: cdk.aws_lambda.Function) => {} /* $$__LAMBDA_MODIFIER__$$ */ +export const lambdaModifier = ( + lambdaFunction: cdk.aws_lambda.Function +) => {} /* $$__LAMBDA_MODIFIER__$$ */ diff --git a/package.json b/package.json index f33ac419..adbf32ec 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "repository": { "type": "git", "url": "git+https://github.com/jill64/sveltekit-adapter-aws.git", - "image": "https://opengraph.githubassets.com/000accb0cba21a8e7aeb7efe51fb468efe71c43a52fa53f55a0006fa70f840a7/jill64/sveltekit-adapter-aws" + "image": "https://opengraph.githubassets.com/1489952fa61841934c190807d164afd94b9086578affd2d39f61cbbc04d29741/jill64/sveltekit-adapter-aws" }, "publishConfig": { "access": "public" diff --git a/packages/adapter/src/steps/setup.ts b/packages/adapter/src/steps/setup.ts index 74a8abd1..198d3caa 100644 --- a/packages/adapter/src/steps/setup.ts +++ b/packages/adapter/src/steps/setup.ts @@ -71,7 +71,7 @@ export const setup = async ({ builder, tmp, options }: Context) => { __DOMAIN_NAME__: options.domain?.fqdn ?? '', __CERTIFICATE_ARN__: options.domain?.certificateArn ?? '', __LAMBDA_RUNTIME__: options.runtime ?? 'NODE_LATEST', - '{} /* $$__ENVIRONMENT__$$ */': JSON.stringify(options.env ?? {}), + '{} /* $$__ENVIRONMENT__$$ */': JSON.stringify(options.env ?? {}) } ) @@ -80,7 +80,9 @@ export const setup = async ({ builder, tmp, options }: Context) => { path.join(options.out, 'external', 'cdk-modifiers.ts'), { '/* $$__ADAPTER_IMPORTS__$$ */': options.adapterImports?.join('\n') ?? '', - '(lambdaFunction: cdk.aws_lambda.Function) => {} /* $$__LAMBDA_MODIFIER__$$ */': options.lambdaModifier?.toString() ?? '(lambdaFunction: cdk.aws_lambda.Function) => {}' + '(lambdaFunction: cdk.aws_lambda.Function) => {} /* $$__LAMBDA_MODIFIER__$$ */': + options.lambdaModifier?.toString() ?? + '(lambdaFunction: cdk.aws_lambda.Function) => {}' } ) diff --git a/packages/adapter/src/types/AdapterOptions.ts b/packages/adapter/src/types/AdapterOptions.ts index fce9e7e9..eefa70f3 100644 --- a/packages/adapter/src/types/AdapterOptions.ts +++ b/packages/adapter/src/types/AdapterOptions.ts @@ -91,7 +91,7 @@ export type AdapterOptions = { certificateArn: string } /** - * Adds imports to the adapter params.ts to allow things like `lambdaModifier` + * Adds imports to the adapter params.ts to allow things like `lambdaModifier` * to access types * @example ["import { Stack } from 'aws-cdk-lib'"] */ @@ -107,5 +107,5 @@ export type AdapterOptions = { * } * ``` */ - lambdaModifier?: (lambdaFunction: aws_lambda.Function) => { } + lambdaModifier?: (lambdaFunction: aws_lambda.Function) => {} } diff --git a/packages/site/svelte.config.js b/packages/site/svelte.config.js index 217561b9..10fba683 100644 --- a/packages/site/svelte.config.js +++ b/packages/site/svelte.config.js @@ -31,10 +31,10 @@ const config = { KEY3: 'VALUE3' }, stream: process.env.BUFFERED_RESPONSE !== 'TRUE', - adapterImports: [ "import { Stack } from 'aws-cdk-lib'" ], + adapterImports: ["import { Stack } from 'aws-cdk-lib'"], lambdaModifier: (fn) => { const stack = Stack.of(fn) - fn.addEnvironment("abc", "def") + fn.addEnvironment('abc', 'def') } }) }