Skip to content

Commit 30a8db6

Browse files
chore: npm-check-updates && yarn upgrade (#4800)
Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
1 parent 4db9cff commit 30a8db6

File tree

19 files changed

+1192
-1111
lines changed

19 files changed

+1192
-1111
lines changed

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@
1919
"@jest/types": "^29.6.3",
2020
"@types/jest": "^29.5.14",
2121
"@types/node": "^18",
22-
"@typescript-eslint/eslint-plugin": "^8.25.0",
23-
"@typescript-eslint/parser": "^8.25.0",
22+
"@typescript-eslint/eslint-plugin": "^8.29.0",
23+
"@typescript-eslint/parser": "^8.29.0",
2424
"all-contributors-cli": "^6.26.1",
25-
"eslint": "^9.21.0",
26-
"eslint-config-prettier": "^10.0.1",
25+
"eslint": "^9.23.0",
26+
"eslint-config-prettier": "^10.1.1",
2727
"eslint-import-resolver-node": "^0.3.9",
28-
"eslint-import-resolver-typescript": "^3.8.3",
28+
"eslint-import-resolver-typescript": "^4.3.1",
2929
"eslint-plugin-import": "2.31.0",
30-
"eslint-plugin-prettier": "^5.2.3",
30+
"eslint-plugin-prettier": "^5.2.5",
3131
"jest": "^29.7.0",
3232
"jest-circus": "^28.1.3",
3333
"jest-config": "^28.1.3",
3434
"jest-expect-message": "^1.1.3",
35-
"lerna": "^8.2.0",
36-
"npm-check-updates": "^17.1.15",
37-
"prettier": "^3.5.2",
35+
"lerna": "^8.2.1",
36+
"npm-check-updates": "^17.1.16",
37+
"prettier": "^3.5.3",
3838
"standard-version": "^9.5.0",
3939
"ts-node": "^10.9.2",
4040
"typescript": "~4.7.4"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"devDependencies": {
4141
"@jsii/runtime": "^0.0.0",
42-
"@types/semver": "^7.5.8",
42+
"@types/semver": "^7.7.0",
4343
"jsii-build-tools": "^0.0.0",
4444
"semver": "^7.7.1"
4545
}

packages/@jsii/kernel/src/kernel.ts

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -740,18 +740,16 @@ export class Kernel {
740740
return;
741741
}
742742

743-
if (!propInfo) {
744-
// We've overriding a property on an object we have NO type information on (probably
745-
// because it's an anonymous object).
746-
// Pretend it's 'prop: any';
747-
//
748-
// FIXME: We could do better type checking during the conversion if JSII clients
749-
// would tell us the intended interface type.
750-
propInfo = {
751-
name: override.property,
752-
type: spec.CANONICAL_ANY,
753-
};
754-
}
743+
// We've overriding a property on an object we have NO type information on (probably
744+
// because it's an anonymous object).
745+
// Pretend it's 'prop: any';
746+
//
747+
// FIXME: We could do better type checking during the conversion if JSII clients
748+
// would tell us the intended interface type.
749+
propInfo ??= {
750+
name: override.property,
751+
type: spec.CANONICAL_ANY,
752+
};
755753

756754
this.#defineOverridenProperty(obj, objref, override, propInfo);
757755
}
@@ -865,23 +863,21 @@ export class Kernel {
865863
return;
866864
}
867865

868-
if (!methodInfo) {
869-
// We've overriding a method on an object we have NO type information on (probably
870-
// because it's an anonymous object).
871-
// Pretend it's an (...args: any[]) => any
872-
methodInfo = {
873-
name: override.method,
874-
returns: { type: spec.CANONICAL_ANY },
875-
parameters: [
876-
{
877-
name: 'args',
878-
type: spec.CANONICAL_ANY,
879-
variadic: true,
880-
},
881-
],
882-
variadic: true,
883-
};
884-
}
866+
// We've overriding a method on an object we have NO type information on (probably
867+
// because it's an anonymous object).
868+
// Pretend it's an (...args: any[]) => any
869+
methodInfo ??= {
870+
name: override.method,
871+
returns: { type: spec.CANONICAL_ANY },
872+
parameters: [
873+
{
874+
name: 'args',
875+
type: spec.CANONICAL_ANY,
876+
variadic: true,
877+
},
878+
],
879+
variadic: true,
880+
};
885881

886882
this.#defineOverridenMethod(obj, objref, override, methodInfo);
887883
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@
4444
"jsii-build-tools": "^0.0.0",
4545
"jsii-calc": "^3.20.120",
4646
"jsii-pacmak": "^0.0.0",
47-
"pyright": "^1.1.395"
47+
"pyright": "^1.1.398"
4848
}
4949
}

packages/@jsii/runtime/bin/jsii-runtime.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ function makeHandler(
6767
tag: 'stdout' | 'stderr',
6868
): (chunk: string | Buffer) => void {
6969
return (chunk) => {
70-
const buffer = Buffer.from(chunk);
70+
// Use the chunk directly if it's already a Buffer, otherwise create a Buffer from it
71+
const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
7172
error(JSON.stringify({ [tag]: buffer.toString('base64') }));
7273
};
7374
}

packages/@scope/jsii-calc-base-of-base/test/assembly.jsii

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"description": "An example transitive dependency for jsii-calc.",
1111
"homepage": "https://github.com/aws/jsii",
12-
"jsiiVersion": "5.8.0",
12+
"jsiiVersion": "5.8.3",
1313
"license": "Apache-2.0",
1414
"metadata": {
1515
"jsii": {
@@ -166,5 +166,5 @@
166166
}
167167
},
168168
"version": "2.1.1",
169-
"fingerprint": "VfnjAv/kKNF0c7yssI920uEZbTr4OrRoFW0hcT57qns="
169+
"fingerprint": "w+cNLYmFtxMjycfA16cMn3aILHsTB/m2/zwdiOYVEKs="
170170
}

packages/@scope/jsii-calc-base/test/assembly.jsii

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"description": "An example direct dependency for jsii-calc.",
4141
"homepage": "https://github.com/aws/jsii",
42-
"jsiiVersion": "5.8.0",
42+
"jsiiVersion": "5.8.3",
4343
"license": "Apache-2.0",
4444
"metadata": {
4545
"jsii": {
@@ -207,5 +207,5 @@
207207
}
208208
},
209209
"version": "0.0.0",
210-
"fingerprint": "IZHOxoRL/MXFfl41fiT4CKd440KPwMz5DAPJe7um6JU="
210+
"fingerprint": "47jC+22N6f2FvPswhsTJN9lWp+jSTWtGzMhIlzPDpLs="
211211
}

packages/@scope/jsii-calc-lib/test/assembly.jsii

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"stability": "deprecated"
7272
},
7373
"homepage": "https://github.com/aws/jsii",
74-
"jsiiVersion": "5.8.0",
74+
"jsiiVersion": "5.8.3",
7575
"license": "Apache-2.0",
7676
"metadata": {
7777
"jsii": {
@@ -1107,5 +1107,5 @@
11071107
}
11081108
},
11091109
"version": "0.0.0",
1110-
"fingerprint": "Cj0SprOiSFuu5uOdVNJtUfPpVZxEi7sfDe0BiGEM54M="
1110+
"fingerprint": "TZeR3zoaGtTfSiNZo9Oy26ed5dWgzuJfwCbVUDL4E+A="
11111111
}

packages/jsii-calc/lib/compliance.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -721,9 +721,7 @@ export class Statics {
721721
* Jsdocs for static getter.
722722
*/
723723
public static get instance(): Statics {
724-
if (!this._instance) {
725-
this._instance = new Statics('default');
726-
}
724+
this._instance ??= new Statics('default');
727725
return this._instance;
728726
}
729727

0 commit comments

Comments
 (0)