Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(lambda-nodejs): Allow setting mainFields for esbuild #18569

Merged
merged 7 commits into from
Jan 21, 2022
Merged

feat(lambda-nodejs): Allow setting mainFields for esbuild #18569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ae24181
Allow setting mainFields for esbuild
revmischa Jan 20, 2022
fe0eb75
indent
revmischa Jan 20, 2022
65c71d0
applying suggestions
revmischa Jan 20, 2022
775b492
README
revmischa Jan 21, 2022
95fbabf
bleh
revmischa Jan 21, 2022
62c012f
simplify dox
revmischa Jan 21, 2022
3debc2a
Merge branch 'master' into nodejs-mainfields
revmischa Jan 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/@aws-cdk/aws-lambda-nodejs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ new lambda.NodejsFunction(this, 'my-handler', {
footer: '/* comments */', // requires esbuild >= 0.9.0, defaults to none
charset: lambda.Charset.UTF8, // do not escape non-ASCII characters, defaults to Charset.ASCII
format: lambda.OutputFormat.ESM, // ECMAScript module output format, defaults to OutputFormat.CJS (OutputFormat.ESM requires Node.js 14.x)
mainFields: ['module', 'main'], // prefer ECMAScript versions of dependencies
},
});
```
Expand Down
1 change: 1 addition & 0 deletions packages/@aws-cdk/aws-lambda-nodejs/lib/bundling.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ export class Bundling implements cdk.BundlingOptions {
...this.props.banner ? [`--banner:js=${JSON.stringify(this.props.banner)}`] : [],
...this.props.footer ? [`--footer:js=${JSON.stringify(this.props.footer)}`] : [],
...this.props.charset ? [`--charset=${this.props.charset}`] : [],
...this.props.mainFields ? [`--main-fields=${this.props.mainFields.join(',')}`] : [],
];

let depsCommand = '';
Expand Down
8 changes: 8 additions & 0 deletions packages/@aws-cdk/aws-lambda-nodejs/lib/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,14 @@ export interface BundlingOptions {
* @default OutputFormat.CJS
*/
readonly format?: OutputFormat;

/**
* How to determine the entry point for modules.
* Try ['module', 'main'] to default to ES module versions.
*
* @default ['main', 'module']
*/
readonly mainFields?: string[];
}

/**
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-lambda-nodejs/test/bundling.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ test('esbuild bundling with esbuild options', () => {
footer: '/* comments */',
charset: Charset.UTF8,
forceDockerBundling: true,
mainFields: ['module', 'main'],
define: {
'process.env.KEY': JSON.stringify('VALUE'),
'process.env.BOOL': 'true',
Expand All @@ -224,7 +225,7 @@ test('esbuild bundling with esbuild options', () => {
defineInstructions,
'--log-level=silent --keep-names --tsconfig=/asset-input/lib/custom-tsconfig.ts',
'--metafile=/asset-output/index.meta.json --banner:js="/* comments */" --footer:js="/* comments */"',
'--charset=utf8',
'--charset=utf8 --main-fields=module,main',
].join(' '),
],
}),
Expand Down