Merge branch 'main' into conroy/markdown

aws · Feb 18, 2025 · 262b4b6 · 262b4b6
2 parents a4eafc6 + 4d3cdd5
commit 262b4b6
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 6 deletions.
diff --git a/.projenrc.ts b/.projenrc.ts
@@ -637,7 +637,8 @@ const cli = configureProject(
       ],
       'camelcase@^6', // Non-ESM
       cdkAssets,
-      'cdk-from-cfn',
+      // A version that is guaranteed to still work on Node 16
+      'cdk-from-cfn@0.162.1',
       'chalk@^4',
       'chokidar@^3',
       'decamelize@^5', // Non-ESM
@@ -704,6 +705,13 @@ cli.eslint?.addOverride({
 // Do include all .ts files inside init-templates
 cli.npmignore?.addPatterns('!lib/init-templates/**/*.ts');
 
+// Exclude other scripts and files from the npm package
+cli.npmignore?.addPatterns(
+  'images/',
+  'CONTRIBUTING.md',
+  'generate.sh',
+);
+
 cli.gitignore.addPatterns(...ADDITIONAL_CLI_IGNORE_PATTERNS);
 
 // People should not have imported from the `aws-cdk` package, but they have in the past.
@@ -834,7 +842,7 @@ const cliLib = configureProject(
 );
 
 // Do include all .ts files inside init-templates
-cli.npmignore?.addPatterns('!lib/init-templates/**/*.ts');
+cliLib.npmignore?.addPatterns('!lib/init-templates/**/*.ts');
 
 cliLib.gitignore.addPatterns(
   ...ADDITIONAL_CLI_IGNORE_PATTERNS,

diff --git a/packages/@aws-cdk/cli-lib-alpha/.npmignore b/packages/@aws-cdk/cli-lib-alpha/.npmignore
diff --git a/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES b/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES
@@ -23884,7 +23884,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ----------------
 
-** cdk-from-cfn@0.189.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.189.0 | MIT OR Apache-2.0
+** cdk-from-cfn@0.162.1 - https://www.npmjs.com/package/cdk-from-cfn/v/0.162.1 | MIT OR Apache-2.0
 
 ----------------
 

diff --git a/packages/aws-cdk/.npmignore b/packages/aws-cdk/.npmignore
diff --git a/packages/aws-cdk/.projen/deps.json b/packages/aws-cdk/.projen/deps.json
diff --git a/packages/aws-cdk/.projen/tasks.json b/packages/aws-cdk/.projen/tasks.json
diff --git a/packages/aws-cdk/THIRD_PARTY_LICENSES b/packages/aws-cdk/THIRD_PARTY_LICENSES
@@ -23677,7 +23677,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ----------------
 
-** cdk-from-cfn@0.189.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.189.0 | MIT OR Apache-2.0
+** cdk-from-cfn@0.162.1 - https://www.npmjs.com/package/cdk-from-cfn/v/0.162.1 | MIT OR Apache-2.0
 
 ----------------
 

diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json
diff --git a/yarn.lock b/yarn.lock
-Original file line number
+Diff line change
@@ Expand Up @@
     ----------------
-    ** cdk-from-cfn@0.189.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.189.0 | MIT OR Apache-2.0
+    ** cdk-from-cfn@0.162.1 - https://www.npmjs.com/package/cdk-from-cfn/v/0.162.1 | MIT OR Apache-2.0
     ----------------
@@ Expand Down @@