Merge branch 'main' into fix/pkg_mgr_support

aws · Dec 5, 2023 · caffe49 · caffe49
2 parents a7f0ced + dea1f5f
commit caffe49
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 15 deletions.
diff --git a/.yarn/cache/word-wrap-npm-1.2.3-7fb15ab002-30b48f91fc.zip b/.yarn/cache/word-wrap-npm-1.2.3-7fb15ab002-30b48f91fc.zip
diff --git a/.yarn/cache/word-wrap-npm-1.2.5-42d00c4b09-f93ba3586f.zip b/.yarn/cache/word-wrap-npm-1.2.5-42d00c4b09-f93ba3586f.zip
diff --git a/packages/blueprints/blueprint-builder/package.json b/packages/blueprints/blueprint-builder/package.json
diff --git a/packages/blueprints/blueprint/package.json b/packages/blueprints/blueprint/package.json
diff --git a/packages/blueprints/blueprint/src/blueprint.ts b/packages/blueprints/blueprint/src/blueprint.ts
@@ -135,6 +135,19 @@ export class Blueprint extends Project {
     }
     maxIdlength = Math.max(maxIdlength, FALLBACK_STRATEGY_ID.length);
 
+    /**
+     * copy all non-src file from proposedBundle into the resolved bundle
+     * only src is merge constructed.
+     */
+    const supersetNonSourcePaths: string[] = filepathSet([proposedBundle], ['**/*', '!src/**']);
+    for (const filepath of supersetNonSourcePaths) {
+      const outputPath = path.join(this.outdir, filepath);
+      fs.mkdirSync(path.dirname(outputPath), { recursive: true });
+      const filecontent = fs.readFileSync(path.join(proposedBundle, filepath));
+      fs.writeFileSync(outputPath, filecontent);
+    }
+
+
     //2. construct the superset of files between [ancestorBundle, existingBundle, proposedBundle]/src
     // only consider files under the source code 'src'
     const supersetSourcePaths: string[] = filepathSet([ancestorBundle, existingBundle, proposedBundle], ['src/**']);

diff --git a/packages/blueprints/sam-serverless-app/package.json b/packages/blueprints/sam-serverless-app/package.json
diff --git a/packages/blueprints/test-blueprint/package.json b/packages/blueprints/test-blueprint/package.json
diff --git a/packages/components/dev-environments/package.json b/packages/components/dev-environments/package.json
diff --git a/packages/components/environments/package.json b/packages/components/environments/package.json
diff --git a/packages/components/source-repositories/package.json b/packages/components/source-repositories/package.json
diff --git a/packages/components/workflows/package.json b/packages/components/workflows/package.json
diff --git a/packages/top-level/codecatalyst-blueprints/package.json b/packages/top-level/codecatalyst-blueprints/package.json
diff --git a/packages/utils/blueprint-cli/package.json b/packages/utils/blueprint-cli/package.json
diff --git a/packages/utils/projen-blueprint-component/package.json b/packages/utils/projen-blueprint-component/package.json
diff --git a/packages/utils/projen-blueprint/package.json b/packages/utils/projen-blueprint/package.json
diff --git a/yarn.lock b/yarn.lock
@@ -13682,9 +13682,9 @@ __metadata:
   linkType: hard
 
 "word-wrap@npm:~1.2.3":
-  version: 1.2.3
-  resolution: "word-wrap@npm:1.2.3"
-  checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f
+  version: 1.2.5
+  resolution: "word-wrap@npm:1.2.5"
+  checksum: f93ba3586fc181f94afdaff3a6fef27920b4b6d9eaefed0f428f8e07adea2a7f54a5f2830ce59406c8416f033f86902b91eb824072354645eea687dff3691ccb
   languageName: node
   linkType: hard