Skip to content

Commit b1b977a

Browse files
authored
2 parents c071d26 + b090d89 commit b1b977a

File tree

23 files changed

+628
-578
lines changed

23 files changed

+628
-578
lines changed

.all-contributorsrc

+9
Original file line numberDiff line numberDiff line change
@@ -1312,6 +1312,15 @@
13121312
"bug",
13131313
"code"
13141314
]
1315+
},
1316+
{
1317+
"login": "zxkane",
1318+
"name": "Meng Xin Zhu",
1319+
"avatar_url": "https://avatars.githubusercontent.com/u/843303?v=4",
1320+
"profile": "https://kane.mx",
1321+
"contributions": [
1322+
"bug"
1323+
]
13151324
}
13161325
],
13171326
"repoType": "github",

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
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.
44

5+
## [1.54.0](https://github.com/aws/jsii/compare/v1.53.0...v1.54.0) (2022-02-15)
6+
7+
8+
### Bug Fixes
9+
10+
* **jsii:** dependencies' README files are unnecessarily re-rendered ([#3380](https://github.com/aws/jsii/issues/3380)) ([ec4edc5](https://github.com/aws/jsii/commit/ec4edc5458d9b146ebd4a2d0c9c6cca1ed03dfaf))
11+
512
## [1.53.0](https://github.com/aws/jsii/compare/v1.52.1...v1.53.0) (2022-02-09)
613

714

README.md

+9-8
Large diffs are not rendered by default.

lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
"rejectCycles": true
1111
}
1212
},
13-
"version": "1.53.0"
13+
"version": "1.54.0"
1414
}

package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@
1515
"compliance": "(cd tools/jsii-compliance && yarn report)"
1616
},
1717
"devDependencies": {
18-
"@jest/types": "^27.4.2",
19-
"@typescript-eslint/eslint-plugin": "^5.10.2",
20-
"@typescript-eslint/parser": "^5.10.2",
18+
"@jest/types": "^27.5.1",
19+
"@typescript-eslint/eslint-plugin": "^5.11.0",
20+
"@typescript-eslint/parser": "^5.11.0",
2121
"all-contributors-cli": "^6.20.0",
2222
"eslint": "^8.8.0",
2323
"eslint-config-prettier": "^8.3.0",
2424
"eslint-import-resolver-node": "^0.3.6",
2525
"eslint-import-resolver-typescript": "^2.5.0",
2626
"eslint-plugin-import": "^2.25.4",
2727
"eslint-plugin-prettier": "^4.0.0",
28-
"jest-circus": "^27.4.6",
29-
"jest-config": "^27.4.7",
28+
"jest-circus": "^27.5.1",
29+
"jest-config": "^27.5.1",
3030
"lerna": "^4.0.0",
3131
"prettier": "^2.5.1",
3232
"standard-version": "^9.3.2",
3333
"ts-jest": "^27.1.3",
34-
"ts-node": "^10.4.0",
34+
"ts-node": "^10.5.0",
3535
"typescript": "~3.9.10"
3636
},
3737
"repository": {

packages/@jsii/check-node/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"@types/chalk": "^2.2.0",
4444
"@types/jest": "^27.4.0",
4545
"@types/node": "^12.20.43",
46-
"jest": "^27.4.7"
46+
"jest": "^27.5.1"
4747
}
4848
}

packages/@jsii/go-runtime/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"jsii-build-tools": "^0.0.0",
3232
"jsii-calc": "^3.20.120",
3333
"prettier": "^2.5.1",
34-
"ts-node": "^10.4.0",
34+
"ts-node": "^10.5.0",
3535
"typescript": "~3.9.10"
3636
}
3737
}

packages/@jsii/integ-test/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@octokit/rest": "^18.12.0",
2121
"dotenv": "^8.6.0",
2222
"fs-extra": "^9.1.0",
23-
"jest": "^27.4.7",
23+
"jest": "^27.5.1",
2424
"jsii": "^0.0.0",
2525
"jsii-pacmak": "^0.0.0",
2626
"jsii-rosetta": "^0.0.0",

packages/@jsii/kernel/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"@types/node": "^12.20.43",
4444
"@types/tar": "^6.1.1",
4545
"eslint": "^8.8.0",
46-
"jest": "^27.4.7",
46+
"jest": "^27.5.1",
4747
"jest-expect-message": "^1.0.2",
4848
"jsii-build-tools": "^0.0.0",
4949
"jsii-calc": "^3.20.120",

packages/@jsii/python-runtime/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"jsii-build-tools": "^0.0.0",
4242
"jsii-calc": "^3.20.120",
4343
"jsii-pacmak": "^0.0.0",
44-
"ts-node": "^10.4.0",
44+
"ts-node": "^10.5.0",
4545
"typescript": "~3.9.10"
4646
}
4747
}

packages/@jsii/runtime/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@types/jest": "^27.4.0",
4545
"@types/node": "^12.20.43",
4646
"eslint": "^8.8.0",
47-
"jest": "^27.4.7",
47+
"jest": "^27.5.1",
4848
"jsii-build-tools": "^0.0.0",
4949
"jsii-calc": "^3.20.120",
5050
"prettier": "^2.5.1",

packages/@jsii/spec/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"@types/jest": "^27.4.0",
3838
"@types/node": "^12.20.43",
3939
"eslint": "^8.8.0",
40-
"jest": "^27.4.7",
40+
"jest": "^27.5.1",
4141
"jsii-build-tools": "^0.0.0",
4242
"prettier": "^2.5.1",
4343
"typescript": "~3.9.10",

packages/codemaker/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@types/jest": "^27.4.0",
4141
"@types/node": "^12.20.43",
4242
"eslint": "^8.8.0",
43-
"jest": "^27.4.7",
43+
"jest": "^27.5.1",
4444
"prettier": "^2.5.1",
4545
"typescript": "~3.9.10"
4646
}

packages/jsii-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@types/node": "^12.20.43",
2525
"@types/yargs": "^17.0.8",
2626
"eslint": "^8.8.0",
27-
"jest": "^27.4.7",
27+
"jest": "^27.5.1",
2828
"jest-expect-message": "^1.0.2",
2929
"prettier": "^2.5.1",
3030
"typescript": "~3.9.10"

packages/jsii-diff/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@types/node": "^12.20.43",
4848
"@types/tar-fs": "^2.0.1",
4949
"eslint": "^8.8.0",
50-
"jest": "^27.4.7",
50+
"jest": "^27.5.1",
5151
"jest-expect-message": "^1.0.2",
5252
"jsii": "^0.0.0",
5353
"jsii-build-tools": "^0.0.0",

packages/jsii-pacmak/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"@types/node": "^12.20.43",
6464
"@types/semver": "^7.3.9",
6565
"eslint": "^8.8.0",
66-
"jest": "^27.4.7",
66+
"jest": "^27.5.1",
6767
"jsii": "^0.0.0",
6868
"jsii-build-tools": "^0.0.0",
6969
"jsii-calc": "^3.20.120",

packages/jsii-reflect/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@types/jest": "^27.4.0",
4848
"@types/node": "^12.20.43",
4949
"eslint": "^8.8.0",
50-
"jest": "^27.4.7",
50+
"jest": "^27.5.1",
5151
"jsii": "^0.0.0",
5252
"jsii-build-tools": "^0.0.0",
5353
"jsii-calc": "^3.20.120",

packages/jsii-rosetta/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@types/workerpool": "^6.1.0",
2525
"@types/semver": "^7.3.9",
2626
"eslint": "^8.8.0",
27-
"jest": "^27.4.7",
27+
"jest": "^27.5.1",
2828
"jsii-build-tools": "0.0.0",
2929
"memory-streams": "^0.1.3",
3030
"mock-fs": "^5.1.2",
@@ -42,7 +42,7 @@
4242
"yargs": "^16.2.0",
4343
"semver": "^7.3.5",
4444
"semver-intersect": "^1.4.0",
45-
"fast-glob": "^3.2.7",
45+
"fast-glob": "^3.2.11",
4646
"jsii": "0.0.0"
4747
},
4848
"license": "Apache-2.0",

packages/jsii/lib/assembler.ts

+11-4
Original file line numberDiff line numberDiff line change
@@ -721,10 +721,17 @@ export class Assembler implements Emitter {
721721
symbol,
722722
);
723723
const targets = await loadSubmoduleTargetConfig(sourceFile.fileName);
724-
const readme = await loadSubmoduleReadMe(
725-
sourceFile.fileName,
726-
this.projectInfo.projectRoot,
727-
);
724+
// There is no need to process the README file for submodules that are
725+
// external (i.e: from a dependency), as these will not be emitted in the
726+
// assembly. That'd be wasted effort, and could fail if the README file
727+
// refers to literate examples that are not packaged in the dependency.
728+
const readme =
729+
packageRoot === this.projectInfo.projectRoot
730+
? await loadSubmoduleReadMe(
731+
sourceFile.fileName,
732+
this.projectInfo.projectRoot,
733+
)
734+
: undefined;
728735

729736
this._submodules.set(symbol, {
730737
fqn,

packages/jsii/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@types/semver": "^7.3.9",
5959
"clone": "^2.1.2",
6060
"eslint": "^8.8.0",
61-
"jest": "^27.4.7",
61+
"jest": "^27.5.1",
6262
"jest-expect-message": "^1.0.2",
6363
"jsii-build-tools": "^0.0.0",
6464
"prettier": "^2.5.1",

packages/oo-ascii-tree/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@types/jest": "^27.4.0",
3535
"@types/node": "^12.20.43",
3636
"eslint": "^8.8.0",
37-
"jest": "^27.4.7",
37+
"jest": "^27.5.1",
3838
"jsii-build-tools": "^0.0.0",
3939
"prettier": "^2.5.1",
4040
"typescript": "~3.9.10"

tools/jsii-compliance/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@types/node": "^12.20.43",
2020
"eslint": "^8.8.0",
2121
"prettier": "^2.5.1",
22-
"ts-node": "^10.4.0",
22+
"ts-node": "^10.5.0",
2323
"typescript": "~3.9.10"
2424
}
2525
}

0 commit comments

Comments
 (0)