Skip to content

Commit

Permalink
feat(CdkConstructLibrary): jsii 5.3 [CLK-469895] (#246)
Browse files Browse the repository at this point in the history
  • Loading branch information
ahammond authored Feb 20, 2024
1 parent 17b0891 commit 04289e9
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 12 deletions.
26 changes: 17 additions & 9 deletions src/clickup-cdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,23 @@ export module clickupCdk {
const authorAddress = options.authorAddress || clickupTs.defaults.authorAddress;
// Theoretically we should be able to just take a default here, but for some reason this is required.
const repositoryUrl = options.repositoryUrl || `https://github.com/${name.substring(1)}.git`;
const mergedOptions = merge(clickupTs.defaults, { jsiiVersion: '5.0.*' }, options, {
authorName,
authorAddress,
name,
repositoryUrl,
renovatebotOptions: renovateWorkflow.getRenovateOptions(options.renovateOptionsConfig),
cdkDiffOptions: cdkDiffWorkflow.getCDKDiffOptions(options.cdkDiffOptionsConfig),
codecovBypassOptions: codecovBypassWorkflow.getCodecovBypassOptions(options.codecovBypassOptionsConfig),
});
const mergedOptions = merge(
clickupTs.defaults,
{
jsiiVersion: '~5.3.0', // Force JSII upgrade CLK-469895
typescriptVersion: '~5.3.0',
},
options,
{
authorName,
authorAddress,
name,
repositoryUrl,
renovatebotOptions: renovateWorkflow.getRenovateOptions(options.renovateOptionsConfig),
cdkDiffOptions: cdkDiffWorkflow.getCDKDiffOptions(options.cdkDiffOptionsConfig),
codecovBypassOptions: codecovBypassWorkflow.getCodecovBypassOptions(options.codecovBypassOptionsConfig),
},
);
super(mergedOptions);
clickupTs.fixTsNodeDeps(this.package);
codecov.addCodeCovYml(this);
Expand Down
6 changes: 3 additions & 3 deletions test/__snapshots__/clickup-cdk.test.ts.snap

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

0 comments on commit 04289e9

Please sign in to comment.