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

Jump to bottom

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

Merged
merged 7 commits into from
May 7, 2024
Merged

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

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
130f8c4
chore: npm-check-updates && yarn upgrade
aws-cdk-automation May 1, 2024
a5a6c76
eslint fixes
mrgrain May 7, 2024
0931a5b
update lockfile
mrgrain May 7, 2024
767930e
fix eslint-plugin-import
mrgrain May 7, 2024
2cdfab4
revert pyright
mrgrain May 7, 2024
3b78789
keep pyright at previous version
mrgrain May 7, 2024
22572e7
Merge branch 'main' into automation/yarn-upgrade
mergify[bot] May 7, 2024
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
18 changes: 9 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@
},
"devDependencies": {
"@jest/types": "^28.1.3",
"@types/jest": "^29.5.8",
"@types/jest": "^29.5.12",
"@types/node": "^14.18.63",
"@typescript-eslint/eslint-plugin": "^6.11.0",
"@typescript-eslint/parser": "^6.11.0",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"all-contributors-cli": "^6.26.1",
"eslint": "^8.53.0",
"eslint-config-prettier": "^9.0.0",
"eslint": "^9.1.1",
"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.0.1",
"eslint-plugin-prettier": "^5.1.3",
"jest": "^29.7.0",
"jest-circus": "^28.1.3",
"jest-config": "^28.1.3",
"jest-expect-message": "^1.1.3",
"lerna": "^7.4.2",
"prettier": "^3.1.0",
"lerna": "^8.1.2",
"prettier": "^3.2.5",
"standard-version": "^9.5.0",
"ts-node": "^10.9.1",
"ts-node": "^10.9.2",
"typescript": "~4.7.4"
},
"repository": {
Expand Down
6 changes: 3 additions & 3 deletions packages/@jsii/benchmarks/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
"fs-extra": "^10.1.0",
"jsii": "^0.0.0",
"npm": "^8.19.4",
"tar": "^6.2.0",
"tar": "^6.2.1",
"typescript": "~3.9.10",
"yargs": "^16.2.0"
},
"devDependencies": {
"@types/glob": "^8.1.0",
"glob": "^10.3.10"
"glob": "^10.3.12"
},
"scripts": {
"build": "yarn --silent tsc --build && npm run lint",
"watch": "yarn --silent tsc -w",
"bench": "node bin/benchmark.js",
"snapshot": "node scripts/snapshot-package.js",
"lint": "eslint . --ext .ts --ignore-path=.gitignore",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .ts --ignore-path=.gitignore",
"lint:fix": "yarn lint --fix"
},
"bin": {
Expand Down
4 changes: 2 additions & 2 deletions packages/@jsii/check-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
"scripts": {
"build": "tsc --build && npm run lint",
"watch": "tsc --build -w",
"lint": "eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint:fix": "yarn lint --fix",
"test": "jest",
"test:update": "jest -u",
"package": "package-js"
},
"dependencies": {
"chalk": "^4.1.2",
"semver": "^7.5.4"
"semver": "^7.6.0"
}
}
4 changes: 2 additions & 2 deletions packages/@jsii/dotnet-runtime/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
},
"devDependencies": {
"@jsii/runtime": "^0.0.0",
"@types/semver": "^7.5.5",
"@types/semver": "^7.5.8",
"jsii-build-tools": "^0.0.0",
"semver": "^7.5.4"
"semver": "^7.6.0"
}
}
6 changes: 3 additions & 3 deletions packages/@jsii/integ-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"scripts": {
"build": "tsc --build && npm run lint",
"lint": "eslint . --ext .ts --ignore-pattern '*.d.ts' --ignore-path=.gitignore",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .ts --ignore-pattern '*.d.ts' --ignore-path=.gitignore",
"lint:fix": "yarn lint --fix",
"test:integ": "jest",
"package": "package-private"
Expand All @@ -23,10 +23,10 @@
"jsii": "^0.0.0",
"jsii-pacmak": "^0.0.0",
"jsii-rosetta": "^0.0.0",
"tar": "^6.2.0"
"tar": "^6.2.1"
},
"devDependencies": {
"@types/fs-extra": "^9.0.13",
"@types/tar": "^6.1.9"
"@types/tar": "^6.1.13"
}
}
6 changes: 3 additions & 3 deletions packages/@jsii/kernel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"scripts": {
"build": "tsc --build && npm run lint",
"watch": "tsc --build -w",
"lint": "eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint:fix": "yarn lint --fix",
"test": "jest",
"test:update": "jest -u",
Expand All @@ -34,14 +34,14 @@
"@jsii/spec": "^0.0.0",
"fs-extra": "^10.1.0",
"lockfile": "^1.0.4",
"tar": "^6.2.0"
"tar": "^6.2.1"
},
"devDependencies": {
"@scope/jsii-calc-base": "^0.0.0",
"@scope/jsii-calc-lib": "^0.0.0",
"@types/fs-extra": "^9.0.13",
"@types/lockfile": "^1.0.4",
"@types/tar": "^6.1.9",
"@types/tar": "^6.1.13",
"jest-expect-message": "^1.1.3",
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^3.20.120"
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/python-runtime/package.json
View file
Open in desktop
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.361"
}
}
6 changes: 3 additions & 3 deletions packages/@jsii/runtime/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"scripts": {
"build": "tsc --build && chmod +x bin/jsii-runtime && npx webpack-cli && npm run lint",
"watch": "tsc --build -w",
"lint": "eslint . --ext .js,.ts --ignore-path=.gitignore --ignore-pattern=webpack.config.js",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore --ignore-pattern=webpack.config.js",
"lint:fix": "yarn lint --fix",
"test": "jest",
"test:update": "jest -u",
Expand All @@ -43,8 +43,8 @@
"@scope/jsii-calc-lib": "^0.0.0",
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^3.20.120",
"source-map-loader": "^4.0.1",
"webpack": "^5.89.0",
"source-map-loader": "^5.0.0",
"webpack": "^5.91.0",
"webpack-cli": "^5.1.4"
}
}
6 changes: 3 additions & 3 deletions packages/@jsii/spec/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@
"scripts": {
"build": "tsc --build && bash build-tools/generate-json-schema.sh && npm run lint",
"watch": "tsc --build -w",
"lint": "eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint:fix": "yarn lint --fix",
"test": "jest",
"test:update": "jest -u",
"package": "package-js"
},
"dependencies": {
"ajv": "^8.12.0"
"ajv": "^8.13.0"
},
"devDependencies": {
"fs-extra": "^10.1.0",
"jsii-build-tools": "^0.0.0",
"typescript-json-schema": "^0.62.0"
"typescript-json-schema": "^0.63.0"
}
}
2 changes: 1 addition & 1 deletion packages/@jsii/spec/src/name-tree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export class NameTree {
if (!this._children[head]) {
this._children[head] = new NameTree();
}
this._children[head]!.register(fqn, rest);
this._children[head].register(fqn, rest);
}
return this;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/codemaker/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"scripts": {
"build": "tsc --build && npm run lint",
"watch": "tsc --build -w",
"lint": "eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint:fix": "yarn lint --fix",
"test": "jest",
"test:update": "jest -u",
Expand Down
2 changes: 1 addition & 1 deletion packages/jsii-calc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"scripts": {
"build": "jsii --project-references --silence-warnings reserved-word && npm run lint && jsii-rosetta --compile --verbose",
"watch": "jsii --project-references -w",
"lint": "eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint:fix": "yarn lint --fix",
"test": "(ls test/test.*.js | xargs -n1 node) && diff-test test/assembly.jsii .jsii",
"test:update": "npm run build && UPDATE_DIFF=1 npm run test",
Expand Down
2 changes: 1 addition & 1 deletion packages/jsii-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"scripts": {
"build": "tsc --build && npm run lint",
"watch": "tsc --build -w",
"lint": "eslint . --ext .js,.ts --ignore-path=.gitignore --ignore-pattern=test/negatives/*",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore --ignore-pattern=test/negatives/*",
"lint:fix": "yarn lint --fix",
"test": "jest",
"package": "package-js",
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 @@ -26,7 +26,7 @@
"scripts": {
"build": "bash ./generate.sh && tsc --build && npm run lint",
"watch": "bash ./generate.sh && tsc --build -w",
"lint": "eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint:fix": "yarn lint --fix",
"test": "jest",
"test:update": "jest -u",
Expand Down
16 changes: 8 additions & 8 deletions packages/jsii-pacmak/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"gen": "bash generate.sh",
"build": "npm run gen && tsc --build && chmod +x bin/jsii-pacmak && npm run lint",
"watch": "tsc --build -w",
"lint": "eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint:fix": "yarn lint --fix",
"test": "npm run test:unit && npm run test:build",
"test:unit": "jest",
Expand All @@ -41,12 +41,12 @@
"@jsii/spec": "^0.0.0",
"clone": "^2.1.2",
"codemaker": "^0.0.0",
"commonmark": "^0.30.0",
"commonmark": "^0.31.0",
"escape-string-regexp": "^4.0.0",
"fs-extra": "^10.1.0",
"jsii-reflect": "^0.0.0",
"semver": "^7.5.4",
"spdx-license-list": "^6.8.0",
"semver": "^7.6.0",
"spdx-license-list": "^6.9.0",
"xmlbuilder": "^15.1.1",
"yargs": "^16.2.0"
},
Expand All @@ -56,16 +56,16 @@
"@jsii/go-runtime": "^0.0.0",
"@scope/jsii-calc-lib": "^0.0.0",
"@types/clone": "^2.1.4",
"@types/diff": "^5.0.8",
"@types/diff": "^5.2.0",
"@types/commonmark": "^0.27.9",
"@types/fs-extra": "^9.0.13",
"@types/semver": "^7.5.5",
"diff": "^5.1.0",
"@types/semver": "^7.5.8",
"diff": "^5.2.0",
"jsii": "^0.0.0",
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^3.20.120",
"jsii-rosetta": "^0.0.0",
"pyright": "^1.1.332"
"pyright": "^1.1.361"
},
"peerDependencies": {
"jsii-rosetta": "^0.0.0 || ~5.2.0 || ~5.3.0 || ~5.4.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/jsii-reflect/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"scripts": {
"build": "tsc --build && chmod +x bin/jsii-tree && npm run lint",
"watch": "tsc --build -w",
"lint": "eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint:fix": "yarn lint --fix",
"test": "jest",
"test:update": "jest -u",
Expand Down
14 changes: 7 additions & 7 deletions packages/jsii-rosetta/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"scripts": {
"build": "yarn tsc --build && npm run lint",
"watch": "yarn tsc --build -w",
"lint": "eslint . --ext .js,.ts --ignore-path=.gitignore --ignore-pattern=examples/* --ignore-pattern=test/translations/*",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore --ignore-pattern=examples/* --ignore-pattern=test/translations/*",
"lint:fix": "yarn lint --fix",
"test": "jest",
"test:update": "jest -u",
Expand All @@ -18,24 +18,24 @@
"devDependencies": {
"@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",
"@types/stream-json": "^1.7.7",
"@types/workerpool": "^6.4.7",
"@types/semver": "^7.5.8",
"jsii-build-tools": "0.0.0",
"memory-streams": "^0.1.3",
"mock-fs": "^5.2.0"
},
"dependencies": {
"@jsii/check-node": "0.0.0",
"@jsii/spec": "0.0.0",
"commonmark": "^0.30.0",
"commonmark": "^0.31.0",
"typescript": "~3.9.10",
"@xmldom/xmldom": "^0.8.10",
"workerpool": "^6.5.1",
"yargs": "^16.2.0",
"stream-json": "^1.8.0",
"semver": "^7.5.4",
"semver-intersect": "^1.4.0",
"semver": "^7.6.0",
"semver-intersect": "^1.5.0",
"fast-glob": "^3.3.2",
"jsii": "0.0.0"
},
Expand Down
5 changes: 3 additions & 2 deletions packages/jsii/lib/assembler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,8 +753,9 @@ export class Assembler implements Emitter {
: fqn,
};
}
const symbolLocation = sym.getDeclarations()?.[0]?.getSourceFile()
?.fileName;
const symbolLocation = sym
.getDeclarations()?.[0]
?.getSourceFile()?.fileName;
const pkgInfo = symbolLocation
? this.findPackageInfo(symbolLocation)
: undefined;
Expand Down
10 changes: 5 additions & 5 deletions packages/jsii/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"gen": "cp ../../README.md . && bash ./generate.sh",
"build": "yarn gen && yarn tsc --build && npm run lint",
"watch": "bash ./generate.sh && tsc --build -w",
"lint": "eslint . --ext .js,.ts --ignore-path=.gitignore --ignore-pattern=test/negatives/*",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore --ignore-pattern=test/negatives/*",
"lint:fix": "yarn lint --fix",
"test": "jest",
"test:update": "jest -u",
Expand All @@ -42,18 +42,18 @@
"fast-deep-equal": "^3.1.3",
"fs-extra": "^10.1.0",
"log4js": "^6.9.1",
"semver": "^7.5.4",
"semver-intersect": "^1.4.0",
"semver": "^7.6.0",
"semver-intersect": "^1.5.0",
"sort-json": "^2.0.1",
"spdx-license-list": "^6.8.0",
"spdx-license-list": "^6.9.0",
"typescript": "~3.9.10",
"yargs": "^16.2.0"
},
"devDependencies": {
"@types/clone": "^2.1.4",
"@types/deep-equal": "^1.0.4",
"@types/fs-extra": "^9.0.13",
"@types/semver": "^7.5.5",
"@types/semver": "^7.5.8",
"clone": "^2.1.2",
"jsii-build-tools": "^0.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/oo-ascii-tree/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"scripts": {
"build": "tsc --build && npm run lint",
"watch": "tsc --build -w",
"lint": "eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
"lint:fix": "yarn lint --fix",
"test": "jest",
"test:update": "jest -u",
Expand Down
2 changes: 1 addition & 1 deletion tools/jsii-build-tools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
},
"dependencies": {
"chalk": "^4.1.2",
"diff": "^5.1.0"
"diff": "^5.2.0"
}
}
2 changes: 1 addition & 1 deletion tools/jsii-compliance/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"build": "echo 'build not needed for the jsii-compliance package'",
"report": "ts-node report.ts",
"lint": "eslint . --ext .js,.ts",
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts",
"lint:fix": "yarn lint --fix"
},
"keywords": [],
Expand Down
Loading
Loading