Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: npm-check-updates && yarn upgrade #4310

Merged
merged 7 commits into from
Nov 15, 2023
Merged

chore: npm-check-updates && yarn upgrade #4310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9238e10
chore: npm-check-updates && yarn upgrade
aws-cdk-automation Nov 14, 2023
04233f8
fixup
mrgrain Nov 14, 2023
3f42c0b
fixup linting
mrgrain Nov 14, 2023
3c49215
final fixes
mrgrain Nov 14, 2023
1d67df1
Fixed pyright version since it caused a test to fail. However I belie…
mrgrain Nov 14, 2023
cf2abeb
Apply suggestions from code review
mrgrain Nov 14, 2023
6a483a2
Merge branch 'main' into automation/yarn-upgrade
mergify[bot] Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
},
"devDependencies": {
"@jest/types": "^28.1.3",
"@types/jest": "^29.5.6",
"@types/jest": "^29.5.8",
"@types/node": "^14.18.63",
"@typescript-eslint/eslint-plugin": "^6.8.0",
"@typescript-eslint/parser": "^6.8.0",
"@typescript-eslint/eslint-plugin": "^6.11.0",
"@typescript-eslint/parser": "^6.11.0",
"all-contributors-cli": "^6.26.1",
"eslint": "^8.51.0",
"eslint": "^8.53.0",
"eslint-config-prettier": "^9.0.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-typescript": "^3.6.1",
Expand All @@ -31,8 +31,8 @@
"jest-circus": "^28.1.3",
"jest-config": "^28.1.3",
"jest-expect-message": "^1.1.3",
"lerna": "^7.4.1",
"prettier": "^3.0.3",
"lerna": "^7.4.2",
"prettier": "^3.1.0",
"standard-version": "^9.5.0",
"ts-node": "^10.9.1",
"typescript": "~4.7.4"
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/dotnet-runtime/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"devDependencies": {
"@jsii/runtime": "^0.0.0",
"@types/semver": "^7.5.3",
"@types/semver": "^7.5.5",
"jsii-build-tools": "^0.0.0",
"semver": "^7.5.4"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/integ-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
},
"devDependencies": {
"@types/fs-extra": "^9.0.13",
"@types/tar": "^6.1.6"
"@types/tar": "^6.1.9"
}
}
4 changes: 2 additions & 2 deletions packages/@jsii/kernel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"@scope/jsii-calc-base": "^0.0.0",
"@scope/jsii-calc-lib": "^0.0.0",
"@types/fs-extra": "^9.0.13",
"@types/lockfile": "^1.0.3",
"@types/tar": "^6.1.6",
"@types/lockfile": "^1.0.4",
"@types/tar": "^6.1.9",
"jest-expect-message": "^1.1.3",
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^3.20.120"
Expand Down
4 changes: 1 addition & 3 deletions packages/@jsii/kernel/src/kernel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,9 +417,7 @@ export class Kernel {

if (this.#syncInProgress) {
throw new JsiiFault(
`Cannot invoke async method '${req.objref[TOKEN_REF]}.${
req.method
}' while sync ${this.#syncInProgress} is being processed`,
`Cannot invoke async method '${req.objref[TOKEN_REF]}.${req.method}' while sync ${this.#syncInProgress} is being processed`,
);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/jsii-diff/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"devDependencies": {
"@types/fs-extra": "^9.0.13",
"@types/tar-fs": "^2.0.2",
"@types/tar-fs": "^2.0.4",
"jest-expect-message": "^1.1.3",
"jsii": "^0.0.0",
"jsii-build-tools": "^0.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/jsii-pacmak/lib/targets/dotnet/runtime-type-checking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ abstract class Validation {
t.startsWith('"')
? t.slice(1, t.length - 1)
: t.startsWith('$"')
? t.slice(2, t.length - 1)
: `{${t}}`,
? t.slice(2, t.length - 1)
: `{${t}}`,
)
.join(', ');
if (allowNull) {
Expand Down
10 changes: 5 additions & 5 deletions packages/jsii-pacmak/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"jsii-reflect": "^0.0.0",
"jsii-rosetta": "^0.0.0",
"semver": "^7.5.4",
"spdx-license-list": "^6.7.0",
"spdx-license-list": "^6.8.0",
"xmlbuilder": "^15.1.1",
"yargs": "^16.2.0"
},
Expand All @@ -56,11 +56,11 @@
"@jsii/java-runtime": "^0.0.0",
"@jsii/go-runtime": "^0.0.0",
"@scope/jsii-calc-lib": "^0.0.0",
"@types/clone": "^2.1.3",
"@types/diff": "^5.0.7",
"@types/commonmark": "^0.27.8",
"@types/clone": "^2.1.4",
"@types/diff": "^5.0.8",
"@types/commonmark": "^0.27.9",
"@types/fs-extra": "^9.0.13",
"@types/semver": "^7.5.3",
"@types/semver": "^7.5.5",
"diff": "^5.1.0",
"jsii": "^0.0.0",
"jsii-build-tools": "^0.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/jsii-rosetta/lib/languages/default.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ export abstract class DefaultVisitor<C> implements AstHandler<C> {
ts.isPropertyAssignment(p)
? isExpressionOfFunctionType(context.typeChecker, p.initializer)
: ts.isShorthandPropertyAssignment(p)
? isExpressionOfFunctionType(context.typeChecker, p.name)
: false,
? isExpressionOfFunctionType(context.typeChecker, p.name)
: false,
);

const inferredType = inferredTypeOfExpression(context.typeChecker, node);
Expand Down
18 changes: 9 additions & 9 deletions packages/jsii-rosetta/lib/languages/go.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,10 +524,10 @@ export class GoVisitor extends DefaultVisitor<GoLanguageContext> {
...(isClassStaticPropertyAccess
? ['()']
: // If the parent's not a call-like expression, and it's an inferred static property access, we need to put call
// parentheses at the end, as static properties are accessed via synthetic readers.
expressionLooksLikeTypeReference && findUp(node, ts.isCallLikeExpression) == null
? ['()']
: []),
// parentheses at the end, as static properties are accessed via synthetic readers.
expressionLooksLikeTypeReference && findUp(node, ts.isCallLikeExpression) == null
? ['()']
: []),
]);
}

Expand Down Expand Up @@ -741,11 +741,11 @@ export class GoVisitor extends DefaultVisitor<GoLanguageContext> {
ucFirst(this.goName(base.name.text, renderer, renderer.typeChecker.getSymbolAtLocation(base.name))),
])
: ts.isIdentifier(base)
? `new${ucFirst(this.goName(base.text, renderer, renderer.typeChecker.getSymbolAtLocation(base)))}`
: (function () {
renderer.reportUnsupported(node, TargetLanguage.GO);
return renderer.convert(base);
})();
? `new${ucFirst(this.goName(base.text, renderer, renderer.typeChecker.getSymbolAtLocation(base)))}`
: (function () {
renderer.reportUnsupported(node, TargetLanguage.GO);
return renderer.convert(base);
})();

return new OTree(
[
Expand Down
2 changes: 1 addition & 1 deletion packages/jsii-rosetta/lib/translate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function translateTypeScript(
export class Translator {
private readonly compiler = new TypeScriptCompiler();
// eslint-disable-next-line @typescript-eslint/explicit-member-accessibility
#diagnostics: ts.Diagnostic[] = [];
readonly #diagnostics: ts.Diagnostic[] = [];

public constructor(private readonly includeCompilerDiagnostics: boolean) {}

Expand Down
12 changes: 6 additions & 6 deletions packages/jsii-rosetta/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
"package": "package-js"
},
"devDependencies": {
"@types/commonmark": "^0.27.8",
"@types/mock-fs": "^4.13.3",
"@types/stream-json": "^1.7.4",
"@types/workerpool": "^6.4.4",
"@types/semver": "^7.5.3",
"@types/commonmark": "^0.27.9",
"@types/mock-fs": "^4.13.4",
"@types/stream-json": "^1.7.6",
"@types/workerpool": "^6.4.6",
"@types/semver": "^7.5.5",
"jsii-build-tools": "0.0.0",
"memory-streams": "^0.1.3",
"mock-fs": "^5.2.0"
Expand All @@ -36,7 +36,7 @@
"stream-json": "^1.8.0",
"semver": "^7.5.4",
"semver-intersect": "^1.4.0",
"fast-glob": "^3.3.1",
"fast-glob": "^3.3.2",
"jsii": "0.0.0"
},
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/jsii/lib/jsii-diagnostic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export class Code<
#category?: ts.DiagnosticCategory;

// eslint-disable-next-line @typescript-eslint/explicit-member-accessibility
#formatter: T;
readonly #formatter: T;

/**
* Registers a new diagnostic code.
Expand Down
8 changes: 4 additions & 4 deletions packages/jsii/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@
"semver": "^7.5.4",
"semver-intersect": "^1.4.0",
"sort-json": "^2.0.1",
"spdx-license-list": "^6.7.0",
"spdx-license-list": "^6.8.0",
"typescript": "~3.9.10",
"yargs": "^16.2.0"
},
"devDependencies": {
"@types/clone": "^2.1.3",
"@types/deep-equal": "^1.0.3",
"@types/clone": "^2.1.4",
"@types/deep-equal": "^1.0.4",
"@types/fs-extra": "^9.0.13",
"@types/semver": "^7.5.3",
"@types/semver": "^7.5.5",
"clone": "^2.1.2",
"jsii-build-tools": "^0.0.0"
},
Expand Down
Loading
Loading