Merge branch 'aws:mainline' into fix/spec-api-custom-resource-payload…

…-size
aws · Jun 17, 2024 · 3c20cf4 · 3c20cf4
2 parents 00c1396 + cc4f95a
commit 3c20cf4
Show file tree

Hide file tree

Showing 20 changed files with 92 additions and 95 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/docs/.gitignore b/docs/.gitignore
diff --git a/packages/aws-arch/.gitignore b/packages/aws-arch/.gitignore
diff --git a/packages/cdk-graph-plugin-diagram/.gitignore b/packages/cdk-graph-plugin-diagram/.gitignore
diff --git a/packages/cdk-graph-plugin-threat-composer/.gitignore b/packages/cdk-graph-plugin-threat-composer/.gitignore
diff --git a/packages/cdk-graph/.gitignore b/packages/cdk-graph/.gitignore
diff --git a/packages/cloudscape-react-ts-website/.gitignore b/packages/cloudscape-react-ts-website/.gitignore
diff --git a/packages/identity/.gitignore b/packages/identity/.gitignore
diff --git a/packages/infrastructure/.gitignore b/packages/infrastructure/.gitignore
diff --git a/...rastructure/test/projects/typescript/__snapshots__/infrastructure-ts-project.test.ts.snap b/...rastructure/test/projects/typescript/__snapshots__/infrastructure-ts-project.test.ts.snap
diff --git a/packages/monorepo/.gitignore b/packages/monorepo/.gitignore
diff --git a/packages/monorepo/src/components/nx-configurator.ts b/packages/monorepo/src/components/nx-configurator.ts
@@ -537,12 +537,9 @@ export class NxConfigurator extends Component implements INxProjectCore {
    */
   private _addLicenses() {
     [this.project, ...this.project.subprojects]
-      .filter(
-        (p) =>
-          !this.licenseOptions?.disableDefaultLicenses &&
-          p.components.find((c) => c instanceof License) === undefined
-      )
+      .filter(() => !this.licenseOptions?.disableDefaultLicenses)
       .forEach((p) => {
+        p.tryRemoveFile("LICENSE");
         if (!this.licenseOptions) {
           new License(p, {
             spdx: DEFAULT_LICENSE,