Skip to content

Commit

Permalink
chore: update to jsii v5.5 (#7133)
Browse files Browse the repository at this point in the history
  • Loading branch information
Chriscbr authored Sep 17, 2024
1 parent 586e9bf commit 9d96625
Show file tree
Hide file tree
Showing 13 changed files with 219 additions and 55 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"jsii@5.3.39": "patches/jsii@5.3.39.patch"
"jsii@5.5.4": "patches/jsii@5.5.4.patch"
}
}
}
2 changes: 1 addition & 1 deletion packages/@winglang/jsii-docgen/.projen/deps.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/@winglang/jsii-docgen/.projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const project = new typescript.TypeScriptProject({
devDeps: [
"vitest",
"tsx",
"jsii@~5.3.39",
"jsii@~5.5.4",
"@types/fs-extra",
"@types/semver",
"@types/yargs@^16",
Expand Down
2 changes: 1 addition & 1 deletion packages/@winglang/jsii-docgen/package.json

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

Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@types/node": "^20.11.0",
"@types/prettier": "2.6.0",
"constructs": "3.4.344",
"jsii": "~5.3.39",
"jsii": "~5.5.4",
"typescript": "^5.5.2"
},
"license": "Apache-2.0",
Expand Down
1 change: 1 addition & 0 deletions packages/@winglang/platform-awscdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"safe-stable-stringify": "^2.4.3"
},
"devDependencies": {
"@types/node": "^22.5.5",
"bump-pack": "workspace:^",
"tsup": "^8.1.0",
"typescript": "^5.5.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/@winglang/sdk/.projen/deps.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/@winglang/sdk/.projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ const project = new cdk.JsiiProject({
codeCovTokenSecret: "CODECOV_TOKEN",
github: false,
projenrcTs: true,
jsiiVersion: "~5.3.39",
jsiiVersion: "~5.5.4",
});
project.defaultTask!.reset("tsx --tsconfig tsconfig.dev.json .projenrc.ts");
project.deps.removeDependency("ts-node");
Expand Down
2 changes: 1 addition & 1 deletion packages/@winglang/sdk/package.json

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

12 changes: 6 additions & 6 deletions packages/@winglang/wingii/src/fixtures/constructs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
"eslint-import-resolver-node": "^0.3.6",
"eslint-import-resolver-typescript": "^2.7.1",
"eslint-plugin-import": "^2.26.0",
"jsii": "~5.3.11",
"jsii-diff": "^1.94.0",
"jsii-docgen": "^10.3.19",
"jsii-pacmak": "^1.94.0",
"jsii": "~5.5.4",
"jsii-diff": "^1.103.1",
"jsii-docgen": "^10.5.4",
"jsii-pacmak": "^1.103.1",
"json-schema": "^0.4.0",
"npm-check-updates": "^15",
"projen": "^0.62.3",
Expand Down Expand Up @@ -79,7 +79,7 @@
"ignore": true
},
"volta": {
"extends": "../../../../../package.json"
"extends": "../../../../../../package.json"
},
"//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"pnpm projen\"."
}
}
4 changes: 2 additions & 2 deletions packages/jsii-fixture/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
"private": true,
"homepage": "https://github.com/winglang/wing",
"devDependencies": {
"jsii": "~5.3.39"
"jsii": "~5.5.4"
},
"volta": {
"extends": "../../package.json"
}
}
}
12 changes: 6 additions & 6 deletions patches/[email protected] → patches/[email protected]
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/lib/assembler.js b/lib/assembler.js
index 75fbc9583eb98336f94f3245cc656ba786021472..aee348079ebcffa71d12a412fe32766af97ed9c1 100644
index a8ae750fa6ec83cd56b84848bcd3cfdd4c297de1..c620930d412b6c87c8f38dcf0cd5f6ce17189d70 100644
--- a/lib/assembler.js
+++ b/lib/assembler.js
@@ -1572,7 +1572,12 @@ class Assembler {
@@ -1575,7 +1575,12 @@ class Assembler {
return { type: spec.CANONICAL_ANY };
}
if (type.symbol.name === 'Array') {
Expand All @@ -16,7 +16,7 @@ index 75fbc9583eb98336f94f3245cc656ba786021472..aee348079ebcffa71d12a412fe32766a
}
if (type.symbol.name === '__type' && type.symbol.members) {
return { type: _mapType.call(this) };
@@ -1583,9 +1588,9 @@ class Assembler {
@@ -1586,9 +1591,9 @@ class Assembler {
this._diagnostics.push(jsii_diagnostic_1.JsiiDiagnostic.JSII_1002_UNSPECIFIED_PROMISE.create(declaration));
return { type: spec.CANONICAL_ANY };
}
Expand All @@ -30,15 +30,15 @@ index 75fbc9583eb98336f94f3245cc656ba786021472..aee348079ebcffa71d12a412fe32766a
const fqn = this._getFQN(type, declaration, purpose, isThisType);
if (fqn == null) {
diff --git a/lib/tsconfig/compiler-options.js b/lib/tsconfig/compiler-options.js
index e97343ab6ec9cfccda4b5a0c3780796755eb2b0a..2c1eaad9288c2951cba6410fd344647ebce884b5 100644
index e7ac0ec99906448c609beff54dc868bf41c2da82..fab0114ba5ae57f71ca987d08b19eb176d3e9b7d 100644
--- a/lib/tsconfig/compiler-options.js
+++ b/lib/tsconfig/compiler-options.js
@@ -8,8 +8,9 @@ exports.BASE_COMPILER_OPTIONS = {
@@ -15,8 +15,9 @@ exports.BASE_COMPILER_OPTIONS = {
declaration: true,
experimentalDecorators: true,
incremental: true,
- lib: ['lib.es2020.d.ts'],
+ lib: ['lib.es2020.d.ts','lib.dom.d.ts'],
+ lib: ['lib.es2020.d.ts', 'lib.dom.d.ts'],
module: ts.ModuleKind.CommonJS,
+ esModuleInterop: true,
noEmitOnError: true,
Expand Down
Loading

0 comments on commit 9d96625

Please sign in to comment.