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.

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 #4507

Merged
merged 6 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/workflows/yarn-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,10 @@ jobs:
--filter=typescript

# Upgrade all other dependencies (devDependencies) to the latest
# Exclude:
# - glob, because newer version don't support Node 18
lerna exec --parallel ncu -- --upgrade --target=latest \
--reject='@types/inquirer,@types/node,typescript,@types/fs-extra,@types/yargs,${{ steps.production-dependencies.outputs.list }},${{ steps.monorepo-packages.outputs.list }}'
--reject='@types/inquirer,@types/node,typescript,@types/fs-extra,@types/yargs,glob,${{ steps.production-dependencies.outputs.list }},${{ steps.monorepo-packages.outputs.list }}'

# This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run)
- name: Run "yarn install"
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@
"@jest/types": "^28.1.3",
"@types/jest": "^29.5.12",
"@types/node": "^14.18.63",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"@typescript-eslint/eslint-plugin": "^7.17.0",
"@typescript-eslint/parser": "^7.17.0",
"all-contributors-cli": "^6.26.1",
"eslint": "^9.1.1",
"eslint": "^9.7.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-prettier": "^5.2.1",
"jest": "^29.7.0",
"jest-circus": "^28.1.3",
"jest-config": "^28.1.3",
"jest-expect-message": "^1.1.3",
"lerna": "^8.1.5",
"prettier": "^3.2.5",
"lerna": "^8.1.7",
"prettier": "^3.3.3",
"standard-version": "^9.5.0",
"ts-node": "^10.9.2",
"typescript": "~4.7.4"
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/check-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
},
"dependencies": {
"chalk": "^4.1.2",
"semver": "^7.6.0"
"semver": "^7.6.3"
}
}
2 changes: 1 addition & 1 deletion packages/@jsii/dotnet-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@
"@jsii/runtime": "^0.0.0",
"@types/semver": "^7.5.8",
"jsii-build-tools": "^0.0.0",
"semver": "^7.6.0"
"semver": "^7.6.3"
}
}
2 changes: 1 addition & 1 deletion packages/@jsii/python-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^3.20.120",
"jsii-pacmak": "^0.0.0",
"pyright": "^1.1.332"
"pyright": "^1.1.373"
}
}
8 changes: 4 additions & 4 deletions packages/@jsii/python-runtime/tests/test_compliance.py
Original file line number Diff line number Diff line change
Expand Up @@ -937,10 +937,10 @@ def test_eraseUnsetDataValues():

def test_objectIdDoesNotGetReallocatedWhenTheConstructorPassesThisOut():
class PartiallyInitializedThisConsumerImpl(PartiallyInitializedThisConsumer):
def consume_partially_initialized_this(self, obj, dt, en):
def consume_partially_initialized_this(self, obj, dt, ev):
assert obj is not None
assert isinstance(dt, datetime)
assert en == AllTypesEnum.THIS_IS_GREAT
assert ev == AllTypesEnum.THIS_IS_GREAT
return "OK"

reflector = PartiallyInitializedThisConsumerImpl()
Expand Down Expand Up @@ -1337,8 +1337,8 @@ def test_class_can_be_used_when_not_expressedly_loaded():
"""

class Subject(Cdk16625):
def _unwrap(self, rng: IRandomNumberGenerator):
return rng.next()
def _unwrap(self, gen: IRandomNumberGenerator):
return gen.next()

# This should NOT throw
Subject().test()
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^3.20.120",
"source-map-loader": "^5.0.0",
"webpack": "^5.91.0",
"webpack": "^5.93.0",
"webpack-cli": "^5.1.4"
}
}
4 changes: 2 additions & 2 deletions packages/@jsii/spec/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
"package": "package-js"
},
"dependencies": {
"ajv": "^8.13.0"
"ajv": "^8.17.1"
},
"devDependencies": {
"fs-extra": "^10.1.0",
"jsii-build-tools": "^0.0.0",
"typescript-json-schema": "^0.63.0"
"typescript-json-schema": "^0.64.0"
}
}
7 changes: 5 additions & 2 deletions packages/jsii-pacmak/lib/targets/python.ts
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ abstract class BaseProperty implements PythonBase {
// PyRight and MyPY both special-case @property, but not custom implementations such as our @classproperty...
// MyPY reports on the re-declaration, but PyRight reports on the initial declaration (duh!)
this.isStatic && !this.immutable
? 'pyright: ignore [reportGeneralTypeIssues]'
? 'pyright: ignore [reportGeneralTypeIssues,reportRedeclaration]'
: undefined,
);
this.generator.emitDocString(code, this.apiLocation, this.docs, {
Expand Down Expand Up @@ -1011,8 +1011,11 @@ abstract class BaseProperty implements PythonBase {
this.pythonName
}`,
);
// In case of a static setter, the 'cls' type is the class type but because we use a custom
// decorator to make the setter operate on classes instead of objects, pyright doesn't know about
// that and thinks the first argument is an instance instead of a class. Shut it up.
code.line(
`jsii.${this.jsiiSetMethod}(${this.implicitParameter}, "${this.jsName}", value)`,
`jsii.${this.jsiiSetMethod}(${this.implicitParameter}, "${this.jsName}", value) # pyright: ignore[reportArgumentType]`,
);
} else {
code.line('...');
Expand Down
6 changes: 3 additions & 3 deletions packages/jsii-pacmak/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"escape-string-regexp": "^4.0.0",
"fs-extra": "^10.1.0",
"jsii-reflect": "^0.0.0",
"semver": "^7.6.0",
"semver": "^7.6.3",
"spdx-license-list": "^6.9.0",
"xmlbuilder": "^15.1.1",
"yargs": "^16.2.0"
Expand All @@ -56,7 +56,7 @@
"@jsii/go-runtime": "^0.0.0",
"@scope/jsii-calc-lib": "^0.0.0",
"@types/clone": "^2.1.4",
"@types/diff": "^5.2.0",
"@types/diff": "^5.2.1",
"@types/commonmark": "^0.27.9",
"@types/fs-extra": "^9.0.13",
"@types/semver": "^7.5.8",
Expand All @@ -65,7 +65,7 @@
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^3.20.120",
"jsii-rosetta": "^0.0.0",
"pyright": "^1.1.332"
"pyright": "^1.1.373"
},
"peerDependencies": {
"jsii-rosetta": "^0.0.0 || ~5.2.0 || ~5.3.0 || ~5.4.0"
Expand Down
Loading
Loading