Skip to content

Commit

Permalink
Merge branch 'main' into fix/pkg_mgr_support
Browse files Browse the repository at this point in the history
  • Loading branch information
agdimech committed Dec 5, 2023
2 parents a7f0ced + dea1f5f commit 6939eb4
Show file tree
Hide file tree
Showing 28 changed files with 220 additions and 55 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/blueprints/blueprint-builder/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/blueprints/blueprint/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions packages/blueprints/blueprint/src/blueprint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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/**']);
Expand Down
2 changes: 1 addition & 1 deletion packages/blueprints/sam-serverless-app/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/blueprints/test-blueprint/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/components/dev-environments/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/components/environments/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/components/source-repositories/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/components/workflows/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/top-level/codecatalyst-blueprints/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/utils/blueprint-cli/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/utils/projen-blueprint-component/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/utils/projen-blueprint/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6939eb4

Please sign in to comment.