fix(lambda-nodejs): banner and footer values not escaped (#14743)

Escape values and use the new CLI options. Closes #13576 BREAKING CHANGE: using `banner` and `footer` now requires `esbuild` >= 0.9.0 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · May 18, 2021 · 81aa612 · 81aa612
1 parent c7469cf
commit 81aa612
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/packages/@aws-cdk/aws-lambda-nodejs/README.md b/packages/@aws-cdk/aws-lambda-nodejs/README.md
@@ -144,8 +144,8 @@ new lambda.NodejsFunction(this, 'my-handler', {
     keepNames: true, // defaults to false
     tsconfig: 'custom-tsconfig.json', // use custom-tsconfig.json instead of default,
     metafile: true, // include meta file, defaults to false
-    banner : '/* comments */', // by default no comments are passed
-    footer : '/* comments */', // by default no comments are passed
+    banner : '/* comments */', // requires esbuild >= 0.9.0, defaults to none
+    footer : '/* comments */', // requires esbuild >= 0.9.0, defaults to none
   },
 });
 ```
@@ -166,7 +166,6 @@ new lambda.NodejsFunction(this, 'my-handler-with-commands', {
     }
     // ...
   }
-
 });
 ```
 

diff --git a/packages/@aws-cdk/aws-lambda-nodejs/lib/bundling.ts b/packages/@aws-cdk/aws-lambda-nodejs/lib/bundling.ts
@@ -153,8 +153,8 @@ export class Bundling implements cdk.BundlingOptions {
       ...this.props.keepNames ? ['--keep-names'] : [],
       ...this.relativeTsconfigPath ? [`--tsconfig=${pathJoin(inputDir, this.relativeTsconfigPath)}`] : [],
       ...this.props.metafile ? [`--metafile=${pathJoin(outputDir, 'index.meta.json')}`] : [],
-      ...this.props.banner ? [`--banner='${this.props.banner}'`] : [],
-      ...this.props.footer ? [`--footer='${this.props.footer}'`] : [],
+      ...this.props.banner ? [`--banner:js=${JSON.stringify(this.props.banner)}`] : [],
+      ...this.props.footer ? [`--footer:js=${JSON.stringify(this.props.footer)}`] : [],
     ].join(' ');
 
     let depsCommand = '';

diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/bundling.test.ts b/packages/@aws-cdk/aws-lambda-nodejs/test/bundling.test.ts
@@ -189,7 +189,7 @@ test('esbuild bundling with esbuild options', () => {
           '--minify --sourcemap --external:aws-sdk --loader:.png=dataurl',
           defineInstructions,
           '--log-level=silent --keep-names --tsconfig=/asset-input/lib/custom-tsconfig.ts',
-          '--metafile=/asset-output/index.meta.json --banner=\'/* comments */\' --footer=\'/* comments */\'',
+          '--metafile=/asset-output/index.meta.json --banner:js="/* comments */" --footer:js="/* comments */"',
         ].join(' '),
       ],
     }),