Skip to content

Commit

Permalink
chore: update jsii to latest version (#5494)
Browse files Browse the repository at this point in the history
Just in time to avoid deprecation!

*By submitting this pull request, I confirm that my contribution is made under the terms of the [Wing Cloud Contribution License](https://github.com/winglang/wing/blob/main/CONTRIBUTION_LICENSE.md)*.
  • Loading branch information
MarkMcCulloh authored Jan 22, 2024
1 parent 132f90b commit fcef888
Show file tree
Hide file tree
Showing 17 changed files with 1,209 additions and 377 deletions.
2 changes: 1 addition & 1 deletion apps/jsii-docgen/.projen/deps.json

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

5 changes: 4 additions & 1 deletion apps/jsii-docgen/.projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const project = new typescript.TypeScriptProject({
"jsii-docgen": "bin/jsii-docgen",
},
devDeps: [
"jsii@~5.0.0",
"jsii@~5.3.11",
"@types/fs-extra",
"@types/semver",
"@types/yargs@^16",
Expand All @@ -37,6 +37,9 @@ const project = new typescript.TypeScriptProject({
prettier: true,
release: false,
package: false,
jestOptions: {
coverageText: false,
},
});

const libraryFixtures = ["construct-library"];
Expand Down
9 changes: 4 additions & 5 deletions apps/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 @@ -24,28 +24,26 @@
"email": "[email protected]",
"organization": false
},
"dependencies": {
"@aws-cdk/aws-events": "^1.204.0",
"@aws-cdk/aws-iam": "^1.204.0",
"@aws-cdk/aws-kms": "^1.204.0",
"@aws-cdk/aws-s3": "^1.204.0",
"@aws-cdk/cloud-assembly-schema": "^1.204.0",
"@aws-cdk/core": "^1.204.0",
"constructs": "^3.4.344"
},
"peerDependencies": {
"@aws-cdk/aws-events": "^1.204.0",
"@aws-cdk/aws-iam": "^1.204.0",
"@aws-cdk/aws-kms": "^1.204.0",
"@aws-cdk/aws-s3": "^1.204.0",
"@aws-cdk/cloud-assembly-schema": "^1.204.0",
"@aws-cdk/core": "^1.204.0",
"constructs": "^3.3.69"
"constructs": "^3.4.344"
},
"devDependencies": {
"@aws-cdk/aws-events": "1.204.0",
"@aws-cdk/aws-iam": "1.204.0",
"@aws-cdk/aws-kms": "1.204.0",
"@aws-cdk/aws-s3": "1.204.0",
"@aws-cdk/cloud-assembly-schema": "1.204.0",
"@aws-cdk/core": "1.204.0",
"constructs": "3.4.344",
"@types/node": "^18.17.13",
"@types/prettier": "2.6.0",
"jsii": "~5.0.21",
"jsii": "~5.3.11",
"typescript": "^4.9.5"
},
"license": "Apache-2.0",
Expand Down
4 changes: 4 additions & 0 deletions apps/jsii-docgen/turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"pipeline": {
"compile": {
"outputs": ["lib/**"]
},
"test": {
"inputs": ["src/**", "test/**"],
"outputs": ["test/**"]
}
}
}
2 changes: 1 addition & 1 deletion apps/wing-api-checker/package.json

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

8 changes: 6 additions & 2 deletions docs/docs/04-standard-library/util/api-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,9 @@ util.nanoid(options?: NanoidOptions);

Generates a unique ID using the nanoid library.

# @link https://github.com/ai/nanoid
#

> [https://github.com/ai/nanoid](https://github.com/ai/nanoid)
###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.util.Util.nanoid.parameter.options"></a>

Expand Down Expand Up @@ -256,7 +258,9 @@ util.ulid(options?: UlidOptions);

Generates universally unique lexicographically sortable identifier.

# @link https://github.com/ulid/javascript
#

> [https://github.com/ulid/javascript](https://github.com/ulid/javascript)
###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.util.Util.ulid.parameter.options"></a>

Expand Down
6 changes: 3 additions & 3 deletions examples/jsii-fixture/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"private": true,
"homepage": "https://github.com/winglang/wing",
"devDependencies": {
"jsii": "^1.70.0",
"jsii-pacmak": "^1.70.0",
"jsii-release": "^0.2.519"
"jsii": "~5.3.11",
"jsii-pacmak": "^1.94.0",
"jsii-release": "^0.2.778"
},
"volta": {
"extends": "../../package.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ source: libs/wingc/src/lsp/completions.rs
detail: "(options: NanoidOptions?): str"
documentation:
kind: markdown
value: "```wing\nstatic nanoid: (options: NanoidOptions?): str\n```\n---\nGenerates a unique ID using the nanoid library.\n### Parameters\n- `...options` — `NanoidOptions?` — - Optional options object for generating the ID.\n \n - `alphabet?` — `str?` — Characters that make up the alphabet to generate the ID, limited to 256 characters or fewer.\n - `size?` — `num?` — Size of ID.\n\n### Remarks\n# @link https://github.com/ai/nanoid"
value: "```wing\nstatic nanoid: (options: NanoidOptions?): str\n```\n---\nGenerates a unique ID using the nanoid library.\n### Parameters\n- `...options` — `NanoidOptions?` — - Optional options object for generating the ID.\n \n - `alphabet?` — `str?` — Characters that make up the alphabet to generate the ID, limited to 256 characters or fewer.\n - `size?` — `num?` — Size of ID.\n\n### Remarks\n#\n\n*@link* *https://github.com/ai/nanoid*"
sortText: ff|nanoid
insertText: nanoid($1)
insertTextFormat: 2
Expand Down Expand Up @@ -102,7 +102,7 @@ source: libs/wingc/src/lsp/completions.rs
detail: "(options: UlidOptions?): str"
documentation:
kind: markdown
value: "```wing\nstatic ulid: (options: UlidOptions?): str\n```\n---\nGenerates universally unique lexicographically sortable identifier.\n### Parameters\n- `...options` — `UlidOptions?` — - Optional options object for generating the ID.\n \n - `seed?` — `num?` — You can also input a seed time which will consistently give you the same string for the time component.\n\n### Remarks\n# @link https://github.com/ulid/javascript"
value: "```wing\nstatic ulid: (options: UlidOptions?): str\n```\n---\nGenerates universally unique lexicographically sortable identifier.\n### Parameters\n- `...options` — `UlidOptions?` — - Optional options object for generating the ID.\n \n - `seed?` — `num?` — You can also input a seed time which will consistently give you the same string for the time component.\n\n### Remarks\n#\n\n*@link* *https://github.com/ulid/javascript*"
sortText: ff|ulid
insertText: ulid($1)
insertTextFormat: 2
Expand Down
8 changes: 4 additions & 4 deletions libs/wingii/src/fixtures/constructs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"eslint-plugin-import": "^2.26.0",
"jest": "^27",
"jest-junit": "^13",
"jsii": "^1.67.0",
"jsii-diff": "^1.67.0",
"jsii-docgen": "^1.8.110",
"jsii-pacmak": "^1.67.0",
"jsii": "~5.3.11",
"jsii-diff": "^1.94.0",
"jsii-docgen": "^10.3.19",
"jsii-pacmak": "^1.94.0",
"json-schema": "^0.4.0",
"npm-check-updates": "^15",
"projen": "^0.62.3",
Expand Down
2 changes: 1 addition & 1 deletion libs/wingsdk/.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 libs/wingsdk/.projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ const project = new cdk.JsiiProject({
codeCovTokenSecret: "CODECOV_TOKEN",
github: false,
projenrcTs: true,
jsiiVersion: "5.0.11",
jsiiVersion: "~5.3.11",
});

project.eslint?.addPlugins("sort-exports");
Expand Down
6 changes: 3 additions & 3 deletions libs/wingsdk/package.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
},
"patchedDependencies": {
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]"
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]"
}
}
}
6 changes: 3 additions & 3 deletions patches/[email protected] → patches/[email protected]
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/lib/assembler.js b/lib/assembler.js
index c1fa48219b514c312d5894c9cbf557ac3d8eeed7..9cf0ce22901558d6219fed5a303ae76954561744 100644
index 75fbc9583eb98336f94f3245cc656ba786021472..aee348079ebcffa71d12a412fe32766af97ed9c1 100644
--- a/lib/assembler.js
+++ b/lib/assembler.js
@@ -1572,7 +1572,12 @@ class Assembler {
Expand Down Expand Up @@ -30,10 +30,10 @@ index c1fa48219b514c312d5894c9cbf557ac3d8eeed7..9cf0ce22901558d6219fed5a303ae769
const fqn = this._getFQN(type, declaration, purpose, isThisType);
if (fqn == null) {
diff --git a/lib/compiler.js b/lib/compiler.js
index cb5587e1aa778be23eaba65ceeab8b2d99ce90b1..867d4c5b330a34bdcbe491e816f7b63c941eeb69 100644
index 242bb9f2049ee58814e641109afa3e0942ae5fe2..447237ff4ca734a95b62e260ec8cfdfc8b10a37a 100644
--- a/lib/compiler.js
+++ b/lib/compiler.js
@@ -17,7 +17,8 @@ const BASE_COMPILER_OPTIONS = {
@@ -18,7 +18,8 @@ const BASE_COMPILER_OPTIONS = {
declaration: true,
experimentalDecorators: true,
incremental: true,
Expand Down
Loading

0 comments on commit fcef888

Please sign in to comment.