Skip to content

Commit

Permalink
chore(release): 1.48.0 (#3254)
Browse files Browse the repository at this point in the history
  • Loading branch information
aws-cdk-automation authored Dec 13, 2021
1 parent 86d2c33 commit 05dd13a
Show file tree
Hide file tree
Showing 57 changed files with 1,917 additions and 951 deletions.
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ jobs:
python: '3.6'
- java: '8'
dotnet: '6.0.x'
dotnet-prerelease: true
go: '1.16'
node: '12'
os: ubuntu-latest
Expand Down
10 changes: 8 additions & 2 deletions .mergify/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@ pull_request_rules:
queue:
name: default
method: squash
commit_message: title+body
commit_message_template: |-
{{ title }} (#{{ number }})
{{ body }}
comment:
message: Merging (with squash)...
conditions:
Expand Down Expand Up @@ -130,7 +133,10 @@ pull_request_rules:
queue:
name: default
method: merge
commit_message: title+body
commit_message_template: |-
{{ title }} (#{{ number }})
{{ body }}
comment:
message: Merging (no-squash)...
conditions:
Expand Down
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,32 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [1.48.0](https://github.com/aws/jsii/compare/v1.45.0...v1.48.0) (2021-12-13)


### Features

* **reflect:** add `allTypes` accessor ([#3194](https://github.com/aws/jsii/issues/3194)) ([41f301a](https://github.com/aws/jsii/commit/41f301a8304bd1ed6ed7ec4e31bd23ffd1a2ed8b))
* **rosetta:** metadata tag for fixtures in docs ([#3200](https://github.com/aws/jsii/issues/3200)) ([8cefa8b](https://github.com/aws/jsii/commit/8cefa8bc8c9554913960b48226531aff874ee247))
* **rosetta:** generate rosetta tablets next to each assembly ([#3223](https://github.com/aws/jsii/issues/3223)) ([1e7b604](https://github.com/aws/jsii/commit/1e7b604c15a0083f27ceafd8ca32ff9b6cf61759))
* **rosetta:** reuse output file as additional cache and introduce `--infuse` option for `extract` ([#3210](https://github.com/aws/jsii/issues/3210)) ([ccb3c57](https://github.com/aws/jsii/commit/ccb3c57b834225f16ec619f55a7976e59b7a53c3))


### Bug Fixes

* improve compatibility with restricted-export modules ([#3205](https://github.com/aws/jsii/issues/3205)) ([31a7172](https://github.com/aws/jsii/commit/31a71721bfaff28876ce0554230e63803591e112))
* **jsii:** constants can't mix letters and digits ([#3209](https://github.com/aws/jsii/issues/3209)) ([a444e29](https://github.com/aws/jsii/commit/a444e2993b73dc002586e2c4a3446121c279eb65)), closes [#3208](https://github.com/aws/jsii/issues/3208)
* **jsii:** correctly identify types regardless of import method ([#3233](https://github.com/aws/jsii/issues/3233)) ([aa37d62](https://github.com/aws/jsii/commit/aa37d623f866d2b2a3802a90578e8e85227b37b1)), closes [aws/aws-cdk#17860](https://github.com/aws/aws-cdk/issues/17860)
* **jsii:** deprecation message is not displayed for deprecated classes ([#3206](https://github.com/aws/jsii/issues/3206)) ([3841538](https://github.com/aws/jsii/commit/3841538179226b67c756ca8689ac1a3de4bec521))
* **jsii:** handle imports from libraries compiled with old jsii ([#3245](https://github.com/aws/jsii/issues/3245)) ([133d1cf](https://github.com/aws/jsii/commit/133d1cf371367b1516b175aa9ed904eb701fac0f)), closes [#3233](https://github.com/aws/jsii/issues/3233) [#3233](https://github.com/aws/jsii/issues/3233)
* **jsii:** symbolid for single-valued enums is incorrect ([#3234](https://github.com/aws/jsii/issues/3234)) ([83d3fc8](https://github.com/aws/jsii/commit/83d3fc805874a72b7a76d08f62e8b10121b4777b))
* **pacmak:** don't automatically translate examples without asking ([#3219](https://github.com/aws/jsii/issues/3219)) ([937f8c3](https://github.com/aws/jsii/commit/937f8c3753bec27269ce9213a6bc55fea79647b0))
* **rosetta:** `extract` ignores `--compile` option ([#3193](https://github.com/aws/jsii/issues/3193)) ([639c510](https://github.com/aws/jsii/commit/639c510ba6d07b26bf35d0c8d3c9cdcced6d916a))
* **rosetta:** classes are not correctly identified if package uses an outDir ([#3225](https://github.com/aws/jsii/issues/3225)) ([05631a7](https://github.com/aws/jsii/commit/05631a723b8c08d8d82e9ec50c6adaee1e2d693e))
* **rosetta:** enum resolution breaks for properties ([#3190](https://github.com/aws/jsii/issues/3190)) ([3b49066](https://github.com/aws/jsii/commit/3b49066e4dd960385709dbdce1d9c1fbfb2f20cf))
* **rosetta:** infuse drops first assembly ([#3243](https://github.com/aws/jsii/issues/3243)) ([29a6a84](https://github.com/aws/jsii/commit/29a6a848e2cada2a695d0d1a852c6c53c24d35ac))
* **rosetta:** use `--compile` flag by default ([#3218](https://github.com/aws/jsii/issues/3218)) ([9df7950](https://github.com/aws/jsii/commit/9df7950f263aae045877accb45007e0f9a5b03bd))

## [1.47.0](https://github.com/aws/jsii/compare/v1.45.0...v1.47.0) (2021-12-06)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ necessary `tsconfig.json` is automatically created so the **TypeScript** compile

## Generate Targets

Once you are satisfied with the library, bindings in all supproted languages can be generated by running `jsii-pacmak`,
Once you are satisfied with the library, bindings in all supported languages can be generated by running `jsii-pacmak`,
typically by using the `package` script from the [Set Up](set-up.md) step. Publishable artifacts will be generated and
placed in per-language sub-directories of the `dist` folder:

Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"rejectCycles": true
}
},
"version": "1.47.0"
"version": "1.48.0"
}
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
"compliance": "(cd tools/jsii-compliance && yarn report)"
},
"devDependencies": {
"@jest/types": "^27.2.5",
"@typescript-eslint/eslint-plugin": "^5.4.0",
"@typescript-eslint/parser": "^5.4.0",
"@jest/types": "^27.4.2",
"@typescript-eslint/eslint-plugin": "^5.6.0",
"@typescript-eslint/parser": "^5.6.0",
"all-contributors-cli": "^6.20.0",
"eslint": "^8.3.0",
"eslint": "^8.4.1",
"eslint-config-prettier": "^8.3.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-import-resolver-typescript": "^2.5.0",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-prettier": "^4.0.0",
"jest-circus": "^27.3.1",
"jest-config": "^27.3.1",
"jest-circus": "^27.4.4",
"jest-config": "^27.4.4",
"lerna": "^4.0.0",
"prettier": "^2.4.1",
"prettier": "^2.5.1",
"standard-version": "^9.3.2",
"ts-jest": "^27.0.7",
"ts-jest": "^27.1.1",
"ts-node": "^10.4.0",
"typescript": "~3.9.10"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/check-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@
"@types/chalk": "^2.2.0",
"@types/jest": "^27.0.3",
"@types/node": "^12.20.37",
"jest": "^27.3.1"
"jest": "^27.4.4"
}
}
4 changes: 2 additions & 2 deletions packages/@jsii/go-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
"@types/fs-extra": "^9.0.13",
"@types/node": "^12.20.37",
"codemaker": "^0.0.0",
"eslint": "^8.3.0",
"eslint": "^8.4.1",
"fs-extra": "^9.1.0",
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^3.20.120",
"prettier": "^2.4.1",
"prettier": "^2.5.1",
"ts-node": "^10.4.0",
"typescript": "~3.9.10"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/@jsii/integ-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@octokit/rest": "^18.12.0",
"dotenv": "^8.6.0",
"fs-extra": "^9.1.0",
"jest": "^27.3.1",
"jest": "^27.4.4",
"jsii": "^0.0.0",
"jsii-pacmak": "^0.0.0",
"jsii-rosetta": "^0.0.0",
Expand All @@ -32,8 +32,8 @@
"@types/jest": "^27.0.3",
"@types/node": "^12.20.37",
"@types/tar": "^6.1.1",
"eslint": "^8.3.0",
"prettier": "^2.4.1",
"eslint": "^8.4.1",
"prettier": "^2.5.1",
"typescript": "~3.9.10"
}
}
8 changes: 4 additions & 4 deletions packages/@jsii/kernel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
"@types/jest": "^27.0.3",
"@types/node": "^12.20.37",
"@types/tar": "^6.1.1",
"eslint": "^8.3.0",
"jest": "^27.3.1",
"eslint": "^8.4.1",
"jest": "^27.4.4",
"jest-expect-message": "^1.0.2",
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^3.20.120",
"prettier": "^2.4.1",
"ts-jest": "^27.0.7",
"prettier": "^2.5.1",
"ts-jest": "^27.1.1",
"typescript": "~3.9.10"
}
}
10 changes: 5 additions & 5 deletions packages/@jsii/runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@
"@scope/jsii-calc-lib": "^0.0.0",
"@types/jest": "^27.0.3",
"@types/node": "^12.20.37",
"eslint": "^8.3.0",
"jest": "^27.3.1",
"eslint": "^8.4.1",
"jest": "^27.4.4",
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^3.20.120",
"prettier": "^2.4.1",
"prettier": "^2.5.1",
"source-map-loader": "^3.0.0",
"ts-jest": "^27.0.7",
"ts-jest": "^27.1.1",
"typescript": "~3.9.10",
"webpack": "^5.64.3",
"webpack": "^5.65.0",
"webpack-cli": "^4.9.1"
}
}
31 changes: 28 additions & 3 deletions packages/@jsii/spec/lib/configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export interface Config {
/**
* Output directory of typescript compiler
*/
outdir: string;
outdir?: string;

/**
* Determines the format of the jsii toolchain version string that will be
Expand All @@ -19,12 +19,12 @@ export interface Config {
* short - only the version number of jsii will be used
* example: 0.14.3
*/
versionFormat: 'full' | 'short';
versionFormat?: 'full' | 'short';

/**
* Defines which target languages the module supports.
*/
targets: {
targets?: {
java?: {
/*
* generated maven package name
Expand Down Expand Up @@ -87,6 +87,16 @@ export interface Config {
metadata?: {
[key: string]: any;
};

/**
* TypeScript compiler options
*/
tsc?: {
outDir?: string;
rootDir?: string;

[key: string]: any;
};
}

/**
Expand Down Expand Up @@ -146,5 +156,20 @@ export interface PackageJson {
*/
stability?: Stability;

/**
* Run-time dependencies that are private to this assembly
*/
dependencies?: Record<string, string>;

/**
* Run-time dependencies that will be shared with other assemblies
*/
peerDependencies?: Record<string, string>;

/**
* Build-time dependencies
*/
devDependencies?: Record<string, string>;

[key: string]: unknown;
}
6 changes: 3 additions & 3 deletions packages/@jsii/spec/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
"devDependencies": {
"@types/jest": "^27.0.3",
"@types/node": "^12.20.37",
"eslint": "^8.3.0",
"jest": "^27.3.1",
"eslint": "^8.4.1",
"jest": "^27.4.4",
"jsii-build-tools": "^0.0.0",
"prettier": "^2.4.1",
"prettier": "^2.5.1",
"typescript": "~3.9.10",
"typescript-json-schema": "^0.52.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/@scope/jsii-calc-base-of-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"jsii": "^0.0.0",
"jsii-build-tools": "^0.0.0",
"jsii-rosetta": "^0.0.0",
"prettier": "^2.4.1"
"prettier": "^2.5.1"
},
"jsii": {
"outdir": "dist",
Expand Down
5 changes: 3 additions & 2 deletions packages/@scope/jsii-calc-base-of-base/test/assembly.jsii
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"rosetta": {
"strict": true
}
}
},
"tscRootDir": "."
},
"name": "@scope/jsii-calc-base-of-base",
"repository": {
Expand Down Expand Up @@ -165,5 +166,5 @@
}
},
"version": "2.1.1",
"fingerprint": "6Qes5fbC/YvlKQaK6Oqw0RGgsr/feI/vaRWDYXJJaU8="
"fingerprint": "BYVFW3VSnno85aN3BfEZ3Px9cEKhgfteosHUXjQW0rw="
}
2 changes: 1 addition & 1 deletion packages/@scope/jsii-calc-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"jsii": "^0.0.0",
"jsii-build-tools": "^0.0.0",
"jsii-rosetta": "^0.0.0",
"prettier": "^2.4.1"
"prettier": "^2.5.1"
},
"jsii": {
"metadata": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@scope/jsii-calc-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"jsii": "^0.0.0",
"jsii-build-tools": "^0.0.0",
"jsii-rosetta": "^0.0.0",
"prettier": "^2.4.1"
"prettier": "^2.5.1"
},
"jsii": {
"outdir": "dist",
Expand Down
5 changes: 3 additions & 2 deletions packages/@scope/jsii-calc-lib/test/assembly.jsii
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
"rosetta": {
"strict": true
}
}
},
"tscRootDir": "lib"
},
"name": "@scope/jsii-calc-lib",
"repository": {
Expand Down Expand Up @@ -952,5 +953,5 @@
}
},
"version": "0.0.0",
"fingerprint": "BJ528BPiptJdqvxyoh4Ax2l2Knaz2KcuNYBYhVpyTw8="
"fingerprint": "wtswDMhtuMcC4+ami5KddQIznqdpVjt8qc7Ba2QnnHk="
}
6 changes: 3 additions & 3 deletions packages/codemaker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"@types/fs-extra": "^9.0.13",
"@types/jest": "^27.0.3",
"@types/node": "^12.20.37",
"eslint": "^8.3.0",
"jest": "^27.3.1",
"prettier": "^2.4.1",
"eslint": "^8.4.1",
"jest": "^27.4.4",
"prettier": "^2.5.1",
"typescript": "~3.9.10"
}
}
4 changes: 2 additions & 2 deletions packages/jsii-calc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@
},
"devDependencies": {
"@types/node": "^12.20.37",
"eslint": "^8.3.0",
"eslint": "^8.4.1",
"jsii": "^0.0.0",
"jsii-build-tools": "^0.0.0",
"jsii-rosetta": "^0.0.0",
"prettier": "^2.4.1"
"prettier": "^2.5.1"
},
"jsii": {
"outdir": "dist",
Expand Down
10 changes: 5 additions & 5 deletions packages/jsii-calc/test/assembly.jsii
Original file line number Diff line number Diff line change
Expand Up @@ -11760,7 +11760,7 @@
}
],
"name": "SingletonIntEnum",
"symbolId": "lib/compliance:SingletonIntEnum.SINGLETON_INT"
"symbolId": "lib/compliance:SingletonIntEnum"
},
"jsii-calc.SingletonString": {
"assembly": "jsii-calc",
Expand Down Expand Up @@ -11825,7 +11825,7 @@
}
],
"name": "SingletonStringEnum",
"symbolId": "lib/compliance:SingletonStringEnum.SINGLETON_STRING"
"symbolId": "lib/compliance:SingletonStringEnum"
},
"jsii-calc.SmellyStruct": {
"assembly": "jsii-calc",
Expand Down Expand Up @@ -16363,7 +16363,7 @@
],
"name": "Awesomeness",
"namespace": "submodule.child",
"symbolId": "lib/submodule/child/index:Awesomeness.AWESOME"
"symbolId": "lib/submodule/child/index:Awesomeness"
},
"jsii-calc.submodule.child.Goodness": {
"assembly": "jsii-calc",
Expand Down Expand Up @@ -16541,7 +16541,7 @@
],
"name": "SomeEnum",
"namespace": "submodule.child",
"symbolId": "lib/submodule/child/index:SomeEnum.SOME"
"symbolId": "lib/submodule/child/index:SomeEnum"
},
"jsii-calc.submodule.child.SomeStruct": {
"assembly": "jsii-calc",
Expand Down Expand Up @@ -16807,5 +16807,5 @@
}
},
"version": "3.20.120",
"fingerprint": "wBGhJE4ZhvVb8R2qk5FWg49mt+ZKqW60TjlMMtT1Klo="
"fingerprint": "w6AJ35Nh9lBusQyMGP28WJp5MNbg527uO9TsHaP+DiE="
}
Loading

0 comments on commit 05dd13a

Please sign in to comment.