Skip to content

Commit

Permalink
Merge branch 'main' into conroy/random
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrgrain
mrgrain authored Feb 18, 2025
2 parents 6767913 + 2161721 commit 37953fb
Show file tree
Hide file tree
Showing 17 changed files with 263 additions and 243 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integ.yml
View file

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

3 changes: 3 additions & 0 deletions .github/workflows/pull-request-lint.yml
View file

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

10 changes: 9 additions & 1 deletion .projenrc.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ const repo = configureProject(
mergeQueue: true,
pullRequestLintOptions: {
semanticTitleOptions: {
types: ['feat', 'fix', 'chore', 'refactor'],
types: ['feat', 'fix', 'chore', 'refactor', 'test', 'docs', 'revert'],
},
},
},
Expand Down Expand Up @@ -1000,6 +1000,7 @@ toolkitLib.npmignore?.addPatterns(

toolkitLib.gitignore.addPatterns(
...ADDITIONAL_CLI_IGNORE_PATTERNS,
'docs',
'build-info.json',
'lib/**/*.wasm',
'lib/**/*.yaml',
Expand All @@ -1015,6 +1016,13 @@ for (const tsconfig of [toolkitLib.tsconfigDev]) {
}
}

toolkitLib.addTask('docs', {
exec: 'typedoc lib/index.ts --excludeExternals --excludePrivate --excludeProtected --excludeInternal'
});
toolkitLib.addTask('publish-local', {
exec: './build-tools/package.sh'
});

//////////////////////////////////////////////////////////////////////

const cdkCliWrapper = configureProject(
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cdk-cli-wrapper/package.json
View file

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

34 changes: 17 additions & 17 deletions packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1648,7 +1648,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l

----------------

** @aws-sdk/client-cognito-identity@3.749.0 - https://www.npmjs.com/package/@aws-sdk/client-cognito-identity/v/3.749.0 | Apache-2.0
** @aws-sdk/client-cognito-identity@3.750.0 - https://www.npmjs.com/package/@aws-sdk/client-cognito-identity/v/3.750.0 | Apache-2.0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -4532,7 +4532,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l

----------------

** @aws-sdk/client-sso@3.749.0 - https://www.npmjs.com/package/@aws-sdk/client-sso/v/3.749.0 | Apache-2.0
** @aws-sdk/client-sso@3.750.0 - https://www.npmjs.com/package/@aws-sdk/client-sso/v/3.750.0 | Apache-2.0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -4948,7 +4948,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l

----------------

** @aws-sdk/core@3.749.0 - https://www.npmjs.com/package/@aws-sdk/core/v/3.749.0 | Apache-2.0
** @aws-sdk/core@3.750.0 - https://www.npmjs.com/package/@aws-sdk/core/v/3.750.0 | Apache-2.0

----------------

Expand Down Expand Up @@ -5158,7 +5158,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l

----------------

** @aws-sdk/credential-provider-cognito-identity@3.749.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-cognito-identity/v/3.749.0 | Apache-2.0
** @aws-sdk/credential-provider-cognito-identity@3.750.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-cognito-identity/v/3.750.0 | Apache-2.0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -5569,7 +5569,7 @@ Apache License

----------------

** @aws-sdk/credential-provider-env@3.749.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-env/v/3.749.0 | Apache-2.0
** @aws-sdk/credential-provider-env@3.750.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-env/v/3.750.0 | Apache-2.0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -5778,7 +5778,7 @@ Apache License

----------------

** @aws-sdk/credential-provider-http@3.749.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-http/v/3.749.0 | Apache-2.0
** @aws-sdk/credential-provider-http@3.750.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-http/v/3.750.0 | Apache-2.0

----------------

Expand Down Expand Up @@ -5987,7 +5987,7 @@ Apache License

----------------

** @aws-sdk/credential-provider-ini@3.749.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-ini/v/3.749.0 | Apache-2.0
** @aws-sdk/credential-provider-ini@3.750.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-ini/v/3.750.0 | Apache-2.0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -6397,7 +6397,7 @@ Apache License

----------------

** @aws-sdk/credential-provider-node@3.749.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-node/v/3.749.0 | Apache-2.0
** @aws-sdk/credential-provider-node@3.750.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-node/v/3.750.0 | Apache-2.0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -6807,7 +6807,7 @@ Apache License

----------------

** @aws-sdk/credential-provider-process@3.749.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-process/v/3.749.0 | Apache-2.0
** @aws-sdk/credential-provider-process@3.750.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-process/v/3.750.0 | Apache-2.0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -7217,7 +7217,7 @@ Apache License

----------------

** @aws-sdk/credential-provider-sso@3.749.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-sso/v/3.749.0 | Apache-2.0
** @aws-sdk/credential-provider-sso@3.750.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-sso/v/3.750.0 | Apache-2.0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -7627,7 +7627,7 @@ Apache License

----------------

** @aws-sdk/credential-provider-web-identity@3.749.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-web-identity/v/3.749.0 | Apache-2.0
** @aws-sdk/credential-provider-web-identity@3.750.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-web-identity/v/3.750.0 | Apache-2.0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -8037,7 +8037,7 @@ Apache License

----------------

** @aws-sdk/credential-providers@3.749.0 - https://www.npmjs.com/package/@aws-sdk/credential-providers/v/3.749.0 | Apache-2.0
** @aws-sdk/credential-providers@3.750.0 - https://www.npmjs.com/package/@aws-sdk/credential-providers/v/3.750.0 | Apache-2.0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -8652,7 +8652,7 @@ Apache License

----------------

** @aws-sdk/lib-storage@3.749.0 - https://www.npmjs.com/package/@aws-sdk/lib-storage/v/3.749.0 | Apache-2.0
** @aws-sdk/lib-storage@3.750.0 - https://www.npmjs.com/package/@aws-sdk/lib-storage/v/3.750.0 | Apache-2.0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -11327,7 +11327,7 @@ Apache License

----------------

** @aws-sdk/middleware-user-agent@3.749.0 - https://www.npmjs.com/package/@aws-sdk/middleware-user-agent/v/3.749.0 | Apache-2.0
** @aws-sdk/middleware-user-agent@3.750.0 - https://www.npmjs.com/package/@aws-sdk/middleware-user-agent/v/3.750.0 | Apache-2.0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -11537,7 +11537,7 @@ Apache License

----------------

** @aws-sdk/nested-clients@3.749.0 - https://www.npmjs.com/package/@aws-sdk/nested-clients/v/3.749.0 | Apache-2.0
** @aws-sdk/nested-clients@3.750.0 - https://www.npmjs.com/package/@aws-sdk/nested-clients/v/3.750.0 | Apache-2.0

----------------

Expand Down Expand Up @@ -12157,7 +12157,7 @@ Apache License

----------------

** @aws-sdk/token-providers@3.749.0 - https://www.npmjs.com/package/@aws-sdk/token-providers/v/3.749.0 | Apache-2.0
** @aws-sdk/token-providers@3.750.0 - https://www.npmjs.com/package/@aws-sdk/token-providers/v/3.750.0 | Apache-2.0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -13388,7 +13388,7 @@ Apache License

----------------

** @aws-sdk/util-user-agent-node@3.749.0 - https://www.npmjs.com/package/@aws-sdk/util-user-agent-node/v/3.749.0 | Apache-2.0
** @aws-sdk/util-user-agent-node@3.750.0 - https://www.npmjs.com/package/@aws-sdk/util-user-agent-node/v/3.750.0 | Apache-2.0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cli-lib-alpha/package.json
View file

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

2 changes: 1 addition & 1 deletion packages/@aws-cdk/cloudformation-diff/package.json
View file

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

1 change: 1 addition & 0 deletions packages/@aws-cdk/toolkit/.gitignore
View file

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

16 changes: 16 additions & 0 deletions packages/@aws-cdk/toolkit/.projen/tasks.json
View file

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

10 changes: 4 additions & 6 deletions packages/@aws-cdk/toolkit/build-tools/package.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ commit=$(git rev-parse --short HEAD)
# Toolkit package root
cd "$(dirname $(dirname "$0"))"

rm -rf dist/
mkdir -p dist/js
npm pkg set version=0.0.0-alpha.$commit
npm pkg set dependencies.@aws-cdk/cx-api=$version
npm pkg set dependencies.@aws-cdk/cloudformation-diff=$version
npm pkg set dependencies.@aws-cdk/region-info=$version
yarn package --private
npm pack --pack-destination dist/js
npm pkg set version=$reset
npm pkg set dependencies.@aws-cdk/cx-api=$reset
npm pkg set dependencies.@aws-cdk/cloudformation-diff=$reset
npm pkg set dependencies.@aws-cdk/region-info=$reset
npm pkg set dependencies.@aws-cdk/cloudformation-diff=^$reset
8 changes: 5 additions & 3 deletions packages/@aws-cdk/toolkit/package.json
View file

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

Loading

0 comments on commit 37953fb

Please sign in to comment.