From ab07bf97eedf58ab68517d4fa208fca00873e753 Mon Sep 17 00:00:00 2001 From: Dan Connolly Date: Wed, 14 Aug 2024 10:52:30 -0500 Subject: [PATCH 01/12] chore(deps): devDependencies versions for lint etc. --- contract/package.json | 12 +- package.json | 3 +- ui/package.json | 2 +- yarn.lock | 248 ++++++++++++++++++++++++++++++++++++------ 4 files changed, 226 insertions(+), 39 deletions(-) diff --git a/contract/package.json b/contract/package.json index a88c45f..b5702cc 100644 --- a/contract/package.json +++ b/contract/package.json @@ -44,20 +44,20 @@ "@typescript-eslint/parser": "^6.7.0", "agoric": "^0.21.2-u12.0", "ava": "^5.3.1", - "eslint": "^8.47.0", + "eslint": "^8.57.0", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-jessie": "^0.0.6", - "eslint-config-prettier": "^9.0.0", + "eslint-config-prettier": "^9.1.0", "eslint-plugin-ava": "^14.0.0", "eslint-plugin-github": "^4.10.0", - "eslint-plugin-import": "^2.25.3", - "eslint-plugin-jsdoc": "^46.4.3", - "eslint-plugin-prettier": "^5.0.0", + "eslint-plugin-import": "^2.29.1", + "eslint-plugin-jsdoc": "^48.5.2", + "eslint-plugin-prettier": "^5.1.3", "import-meta-resolve": "^2.2.1", "prettier-plugin-jsdoc": "^1.0.0", "rollup": "^4.18.0", "type-coverage": "^2.26.3", - "typescript": "~5.2.2" + "typescript": "^5.5.3" }, "dependencies": { "@agoric/ertp": "dev", diff --git a/package.json b/package.json index f9af3f3..7e9c8d6 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,8 @@ }, "devDependencies": { "prettier": "^3.3.3", - "prettier-plugin-tailwindcss": "^0.5.11" + "prettier-plugin-tailwindcss": "^0.5.11", + "typescript": "^5.5.2" }, "prettier": { "trailingComma": "all", diff --git a/ui/package.json b/ui/package.json index f221ec4..a50a51f 100644 --- a/ui/package.json +++ b/ui/package.json @@ -29,7 +29,7 @@ "@types/react": "^18.2.56", "@types/react-dom": "^18.2.19", "@typescript-eslint/eslint-plugin": "^7.0.2", - "@typescript-eslint/parser": "^7.0.2", + "@typescript-eslint/parser": "^7.15.0", "@vitejs/plugin-react": "^4.2.1", "autoprefixer": "^10.4.17", "eslint": "^8.56.0", diff --git a/yarn.lock b/yarn.lock index 6c0b5e0..7cde6ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3497,14 +3497,14 @@ __metadata: languageName: node linkType: hard -"@es-joy/jsdoccomment@npm:~0.41.0": - version: 0.41.0 - resolution: "@es-joy/jsdoccomment@npm:0.41.0" +"@es-joy/jsdoccomment@npm:~0.46.0": + version: 0.46.0 + resolution: "@es-joy/jsdoccomment@npm:0.46.0" dependencies: comment-parser: "npm:1.4.1" - esquery: "npm:^1.5.0" + esquery: "npm:^1.6.0" jsdoc-type-pratt-parser: "npm:~4.0.0" - checksum: 10c0/1fa27531eba32e4699664da53a0865aeeda1f7e83ac156fe53b7a6b09d2f3816baa94a34845ff019c10289b09572bda5519ec917e3e241088975477fa880f72d + checksum: 10c0/a7a67936ebf6d9aaf74af018c3ac744769af3552b05ad9b88fca96b2ffdca16e724b0ff497f53634ec4cca81e98d8c471b6b6bde0fa5b725af4222ad9a0707f0 languageName: node linkType: hard @@ -7478,7 +7478,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^7.0.1, @typescript-eslint/parser@npm:^7.0.2": +"@typescript-eslint/parser@npm:^7.0.1": version: 7.5.0 resolution: "@typescript-eslint/parser@npm:7.5.0" dependencies: @@ -7496,6 +7496,24 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/parser@npm:^7.15.0": + version: 7.18.0 + resolution: "@typescript-eslint/parser@npm:7.18.0" + dependencies: + "@typescript-eslint/scope-manager": "npm:7.18.0" + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/typescript-estree": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" + debug: "npm:^4.3.4" + peerDependencies: + eslint: ^8.56.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 10c0/370e73fca4278091bc1b657f85e7d74cd52b24257ea20c927a8e17546107ce04fbf313fec99aed0cc2a145ddbae1d3b12e9cc2c1320117636dc1281bcfd08059 + languageName: node + linkType: hard + "@typescript-eslint/scope-manager@npm:6.21.0": version: 6.21.0 resolution: "@typescript-eslint/scope-manager@npm:6.21.0" @@ -7506,6 +7524,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/scope-manager@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/scope-manager@npm:7.18.0" + dependencies: + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" + checksum: 10c0/038cd58c2271de146b3a594afe2c99290034033326d57ff1f902976022c8b0138ffd3cb893ae439ae41003b5e4bcc00cabf6b244ce40e8668f9412cc96d97b8e + languageName: node + linkType: hard + "@typescript-eslint/scope-manager@npm:7.5.0": version: 7.5.0 resolution: "@typescript-eslint/scope-manager@npm:7.5.0" @@ -7557,6 +7585,13 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/types@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/types@npm:7.18.0" + checksum: 10c0/eb7371ac55ca77db8e59ba0310b41a74523f17e06f485a0ef819491bc3dd8909bb930120ff7d30aaf54e888167e0005aa1337011f3663dc90fb19203ce478054 + languageName: node + linkType: hard + "@typescript-eslint/types@npm:7.5.0": version: 7.5.0 resolution: "@typescript-eslint/types@npm:7.5.0" @@ -7583,6 +7618,25 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/typescript-estree@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/typescript-estree@npm:7.18.0" + dependencies: + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" + debug: "npm:^4.3.4" + globby: "npm:^11.1.0" + is-glob: "npm:^4.0.3" + minimatch: "npm:^9.0.4" + semver: "npm:^7.6.0" + ts-api-utils: "npm:^1.3.0" + peerDependenciesMeta: + typescript: + optional: true + checksum: 10c0/0c7f109a2e460ec8a1524339479cf78ff17814d23c83aa5112c77fb345e87b3642616291908dcddea1e671da63686403dfb712e4a4435104f92abdfddf9aba81 + languageName: node + linkType: hard + "@typescript-eslint/typescript-estree@npm:7.5.0": version: 7.5.0 resolution: "@typescript-eslint/typescript-estree@npm:7.5.0" @@ -7646,6 +7700,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/visitor-keys@npm:7.18.0" + dependencies: + "@typescript-eslint/types": "npm:7.18.0" + eslint-visitor-keys: "npm:^3.4.3" + checksum: 10c0/538b645f8ff1d9debf264865c69a317074eaff0255e63d7407046176b0f6a6beba34a6c51d511f12444bae12a98c69891eb6f403c9f54c6c2e2849d1c1cb73c0 + languageName: node + linkType: hard + "@typescript-eslint/visitor-keys@npm:7.5.0": version: 7.5.0 resolution: "@typescript-eslint/visitor-keys@npm:7.5.0" @@ -8023,6 +8087,15 @@ __metadata: languageName: node linkType: hard +"acorn@npm:^8.12.0": + version: 8.12.1 + resolution: "acorn@npm:8.12.1" + bin: + acorn: bin/acorn + checksum: 10c0/51fb26cd678f914e13287e886da2d7021f8c2bc0ccc95e03d3e0447ee278dd3b40b9c57dc222acd5881adcf26f3edc40901a4953403232129e3876793cd17386 + languageName: node + linkType: hard + "aes-js@npm:3.0.0": version: 3.0.0 resolution: "aes-js@npm:3.0.0" @@ -9769,20 +9842,20 @@ __metadata: "@typescript-eslint/parser": "npm:^6.7.0" agoric: "npm:^0.21.2-u12.0" ava: "npm:^5.3.1" - eslint: "npm:^8.47.0" + eslint: "npm:^8.57.0" eslint-config-airbnb-base: "npm:^15.0.0" eslint-config-jessie: "npm:^0.0.6" - eslint-config-prettier: "npm:^9.0.0" + eslint-config-prettier: "npm:^9.1.0" eslint-plugin-ava: "npm:^14.0.0" eslint-plugin-github: "npm:^4.10.0" - eslint-plugin-import: "npm:^2.25.3" - eslint-plugin-jsdoc: "npm:^46.4.3" - eslint-plugin-prettier: "npm:^5.0.0" + eslint-plugin-import: "npm:^2.29.1" + eslint-plugin-jsdoc: "npm:^48.5.2" + eslint-plugin-prettier: "npm:^5.1.3" import-meta-resolve: "npm:^2.2.1" prettier-plugin-jsdoc: "npm:^1.0.0" rollup: "npm:^4.18.0" type-coverage: "npm:^2.26.3" - typescript: "npm:~5.2.2" + typescript: "npm:^5.5.3" languageName: unknown linkType: soft @@ -9796,7 +9869,7 @@ __metadata: "@types/react": "npm:^18.2.56" "@types/react-dom": "npm:^18.2.19" "@typescript-eslint/eslint-plugin": "npm:^7.0.2" - "@typescript-eslint/parser": "npm:^7.0.2" + "@typescript-eslint/parser": "npm:^7.15.0" "@vitejs/plugin-react": "npm:^4.2.1" autoprefixer: "npm:^10.4.17" buffer: "npm:^6.0.3" @@ -9824,6 +9897,7 @@ __metadata: patch-package: "npm:^8.0.0" prettier: "npm:^3.3.3" prettier-plugin-tailwindcss: "npm:^0.5.11" + typescript: "npm:^5.5.2" languageName: unknown linkType: soft @@ -9916,7 +9990,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4": +"debug@npm:4, debug@npm:^4.3.5": version: 4.3.6 resolution: "debug@npm:4.3.6" dependencies: @@ -10409,6 +10483,13 @@ __metadata: languageName: node linkType: hard +"es-module-lexer@npm:^1.5.3": + version: 1.5.4 + resolution: "es-module-lexer@npm:1.5.4" + checksum: 10c0/300a469488c2f22081df1e4c8398c78db92358496e639b0df7f89ac6455462aaf5d8893939087c1a1cbcbf20eed4610c70e0bcb8f3e4b0d80a5d2611c539408c + languageName: node + linkType: hard + "es-object-atoms@npm:^1.0.0": version: 1.0.0 resolution: "es-object-atoms@npm:1.0.0" @@ -10665,7 +10746,7 @@ __metadata: languageName: node linkType: hard -"eslint-config-prettier@npm:>=8.0.0, eslint-config-prettier@npm:^9.0.0": +"eslint-config-prettier@npm:>=8.0.0, eslint-config-prettier@npm:^9.1.0": version: 9.1.0 resolution: "eslint-config-prettier@npm:9.1.0" peerDependencies: @@ -10792,7 +10873,7 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import@npm:^2.25.2, eslint-plugin-import@npm:^2.25.3": +"eslint-plugin-import@npm:^2.25.2, eslint-plugin-import@npm:^2.29.1": version: 2.29.1 resolution: "eslint-plugin-import@npm:2.29.1" dependencies: @@ -10819,22 +10900,24 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jsdoc@npm:^46.4.3": - version: 46.10.1 - resolution: "eslint-plugin-jsdoc@npm:46.10.1" +"eslint-plugin-jsdoc@npm:^48.5.2": + version: 48.11.0 + resolution: "eslint-plugin-jsdoc@npm:48.11.0" dependencies: - "@es-joy/jsdoccomment": "npm:~0.41.0" + "@es-joy/jsdoccomment": "npm:~0.46.0" are-docs-informative: "npm:^0.0.2" comment-parser: "npm:1.4.1" - debug: "npm:^4.3.4" + debug: "npm:^4.3.5" escape-string-regexp: "npm:^4.0.0" - esquery: "npm:^1.5.0" - is-builtin-module: "npm:^3.2.1" - semver: "npm:^7.5.4" + espree: "npm:^10.1.0" + esquery: "npm:^1.6.0" + parse-imports: "npm:^2.1.1" + semver: "npm:^7.6.3" spdx-expression-parse: "npm:^4.0.0" + synckit: "npm:^0.9.1" peerDependencies: eslint: ^7.0.0 || ^8.0.0 || ^9.0.0 - checksum: 10c0/2c9db7e621e6393c4e22c312e8d729a1c5698a31a62b0985421bb64741eb737d95b65ea0523ea87df3456ff4b3452ed015e463cc5a3b98646f2e7a3f68dd6e1a + checksum: 10c0/f78bac109e62f838c14f90ebd572a06a865f2896a16201c9324cb92be25b5ba8deb54ee1d8ea36232ee53a41c177d5d5ac80662c0fe2479d1e1e1e7633385659 languageName: node linkType: hard @@ -10891,6 +10974,26 @@ __metadata: languageName: node linkType: hard +"eslint-plugin-prettier@npm:^5.1.3": + version: 5.2.1 + resolution: "eslint-plugin-prettier@npm:5.2.1" + dependencies: + prettier-linter-helpers: "npm:^1.0.0" + synckit: "npm:^0.9.1" + peerDependencies: + "@types/eslint": ">=8.0.0" + eslint: ">=8.0.0" + eslint-config-prettier: "*" + prettier: ">=3.0.0" + peerDependenciesMeta: + "@types/eslint": + optional: true + eslint-config-prettier: + optional: true + checksum: 10c0/4bc8bbaf5bb556c9c501dcdff369137763c49ccaf544f9fa91400360ed5e3a3f1234ab59690e06beca5b1b7e6f6356978cdd3b02af6aba3edea2ffe69ca6e8b2 + languageName: node + linkType: hard + "eslint-plugin-react-hooks@npm:^4.6.0": version: 4.6.0 resolution: "eslint-plugin-react-hooks@npm:4.6.0" @@ -10951,7 +11054,14 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.47.0, eslint@npm:^8.56.0": +"eslint-visitor-keys@npm:^4.0.0": + version: 4.0.0 + resolution: "eslint-visitor-keys@npm:4.0.0" + checksum: 10c0/76619f42cf162705a1515a6868e6fc7567e185c7063a05621a8ac4c3b850d022661262c21d9f1fc1d144ecf0d5d64d70a3f43c15c3fc969a61ace0fb25698cf5 + languageName: node + linkType: hard + +"eslint@npm:^8.56.0, eslint@npm:^8.57.0": version: 8.57.0 resolution: "eslint@npm:8.57.0" dependencies: @@ -11006,6 +11116,17 @@ __metadata: languageName: node linkType: hard +"espree@npm:^10.1.0": + version: 10.1.0 + resolution: "espree@npm:10.1.0" + dependencies: + acorn: "npm:^8.12.0" + acorn-jsx: "npm:^5.3.2" + eslint-visitor-keys: "npm:^4.0.0" + checksum: 10c0/52e6feaa77a31a6038f0c0e3fce93010a4625701925b0715cd54a2ae190b3275053a0717db698697b32653788ac04845e489d6773b508d6c2e8752f3c57470a0 + languageName: node + linkType: hard + "espree@npm:^9.0.0, espree@npm:^9.6.0, espree@npm:^9.6.1": version: 9.6.1 resolution: "espree@npm:9.6.1" @@ -11034,7 +11155,7 @@ __metadata: languageName: node linkType: hard -"esquery@npm:^1.4.2, esquery@npm:^1.5.0": +"esquery@npm:^1.4.2": version: 1.5.0 resolution: "esquery@npm:1.5.0" dependencies: @@ -11043,6 +11164,15 @@ __metadata: languageName: node linkType: hard +"esquery@npm:^1.6.0": + version: 1.6.0 + resolution: "esquery@npm:1.6.0" + dependencies: + estraverse: "npm:^5.1.0" + checksum: 10c0/cb9065ec605f9da7a76ca6dadb0619dfb611e37a81e318732977d90fab50a256b95fee2d925fba7c2f3f0523aa16f91587246693bc09bc34d5a59575fe6e93d2 + languageName: node + linkType: hard + "esrecurse@npm:^4.3.0": version: 4.3.0 resolution: "esrecurse@npm:4.3.0" @@ -14570,6 +14700,16 @@ __metadata: languageName: node linkType: hard +"parse-imports@npm:^2.1.1": + version: 2.1.1 + resolution: "parse-imports@npm:2.1.1" + dependencies: + es-module-lexer: "npm:^1.5.3" + slashes: "npm:^3.0.12" + checksum: 10c0/c9bb0b4e1823f84f034d2d7bd2b37415b1715a5c963fda14968c706186b48b02c10e97d04bce042b9dcd679b42f29c391ea120799ddf581c7f54786edd99e3a9 + languageName: node + linkType: hard + "parse-ms@npm:^3.0.0": version: 3.0.0 resolution: "parse-ms@npm:3.0.0" @@ -14950,8 +15090,8 @@ __metadata: linkType: hard "prettier-plugin-tailwindcss@npm:^0.5.11": - version: 0.5.13 - resolution: "prettier-plugin-tailwindcss@npm:0.5.13" + version: 0.5.14 + resolution: "prettier-plugin-tailwindcss@npm:0.5.14" peerDependencies: "@ianvs/prettier-plugin-sort-imports": "*" "@prettier/plugin-pug": "*" @@ -15000,7 +15140,7 @@ __metadata: optional: true prettier-plugin-svelte: optional: true - checksum: 10c0/017e85276952c0110a11c5bf114781c006f1335be29944daa7c5210d81168467efc9d1d212d6ac13ff7a30b2ec30de90619dbe0bf96f61d9b0dd510bf5841a02 + checksum: 10c0/9857873cb8cb0d9b7b895806e7f6265617a08805691125d282767dffb1cb3d2c4c662f2b9168ef391edc40dff1b81beb99eee488f96544e01b8924db694f2299 languageName: node linkType: hard @@ -15873,6 +16013,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.6.0, semver@npm:^7.6.3": + version: 7.6.3 + resolution: "semver@npm:7.6.3" + bin: + semver: bin/semver.js + checksum: 10c0/88f33e148b210c153873cb08cfe1e281d518aaa9a666d4d148add6560db5cd3c582f3a08ccb91f38d5f379ead256da9931234ed122057f40bb5766e65e58adaf + languageName: node + linkType: hard + "serialize-error@npm:^7.0.1": version: 7.0.1 resolution: "serialize-error@npm:7.0.1" @@ -16026,6 +16175,13 @@ __metadata: languageName: node linkType: hard +"slashes@npm:^3.0.12": + version: 3.0.12 + resolution: "slashes@npm:3.0.12" + checksum: 10c0/71ca2a1fcd1ab6814b0fdb8cf9c33a3d54321deec2aa8d173510f0086880201446021a9b9e6a18561f7c472b69a2145977c6a8fb9c53a8ff7be31778f203d175 + languageName: node + linkType: hard + "slice-ansi@npm:^4.0.0": version: 4.0.0 resolution: "slice-ansi@npm:4.0.0" @@ -16409,6 +16565,16 @@ __metadata: languageName: node linkType: hard +"synckit@npm:^0.9.1": + version: 0.9.1 + resolution: "synckit@npm:0.9.1" + dependencies: + "@pkgr/core": "npm:^0.1.0" + tslib: "npm:^2.6.2" + checksum: 10c0/d8b89e1bf30ba3ffb469d8418c836ad9c0c062bf47028406b4d06548bc66af97155ea2303b96c93bf5c7c0f0d66153a6fbd6924c76521b434e6a9898982abc2e + languageName: node + linkType: hard + "system-architecture@npm:^0.1.0": version: 0.1.0 resolution: "system-architecture@npm:0.1.0" @@ -16660,7 +16826,7 @@ __metadata: languageName: node linkType: hard -"ts-api-utils@npm:^1.0.1": +"ts-api-utils@npm:^1.0.1, ts-api-utils@npm:^1.3.0": version: 1.3.0 resolution: "ts-api-utils@npm:1.3.0" peerDependencies: @@ -16862,6 +17028,16 @@ __metadata: languageName: node linkType: hard +"typescript@npm:^5.5.2, typescript@npm:^5.5.3": + version: 5.5.4 + resolution: "typescript@npm:5.5.4" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10c0/422be60f89e661eab29ac488c974b6cc0a660fb2228003b297c3d10c32c90f3bcffc1009b43876a082515a3c376b1eefcce823d6e78982e6878408b9a923199c + languageName: node + linkType: hard + "typescript@npm:~5.2.2": version: 5.2.2 resolution: "typescript@npm:5.2.2" @@ -16882,6 +17058,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@npm%3A^5.5.2#optional!builtin, typescript@patch:typescript@npm%3A^5.5.3#optional!builtin": + version: 5.5.4 + resolution: "typescript@patch:typescript@npm%3A5.5.4#optional!builtin::version=5.5.4&hash=379a07" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10c0/73409d7b9196a5a1217b3aaad929bf76294d3ce7d6e9766dd880ece296ee91cf7d7db6b16c6c6c630ee5096eccde726c0ef17c7dfa52b01a243e57ae1f09ef07 + languageName: node + linkType: hard + "typescript@patch:typescript@npm%3A~5.2.2#optional!builtin": version: 5.2.2 resolution: "typescript@patch:typescript@npm%3A5.2.2#optional!builtin::version=5.2.2&hash=f3b441" From e7a8598d0d1e2a0c44e848c6c88870f692d32fbd Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Wed, 14 Aug 2024 14:32:31 -0400 Subject: [PATCH 02/12] lint: prettierignore build output --- .prettierignore | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .prettierignore diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..cfa3415 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,11 @@ +## Uses .gitignore syntax and should mostly match that file +## so that we don't format what never ends up in SCM. + +# artifacts +build +bundles +bundle-*.js +compiled +dist +lcov-report +public From e8b9c6fef87739e1d1df87f771d3cec6ce54a81d Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Wed, 14 Aug 2024 15:20:57 -0400 Subject: [PATCH 03/12] lint: ignore dist --- contract/.eslintignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 contract/.eslintignore diff --git a/contract/.eslintignore b/contract/.eslintignore new file mode 100644 index 0000000..1521c8b --- /dev/null +++ b/contract/.eslintignore @@ -0,0 +1 @@ +dist From 634490f27352449fb8f62b894ce957a76f8c33c1 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Wed, 14 Aug 2024 14:37:20 -0400 Subject: [PATCH 04/12] lint: document params --- contract/src/platform-goals/start-contract.js | 1 + 1 file changed, 1 insertion(+) diff --git a/contract/src/platform-goals/start-contract.js b/contract/src/platform-goals/start-contract.js index f50f2f7..af901e2 100644 --- a/contract/src/platform-goals/start-contract.js +++ b/contract/src/platform-goals/start-contract.js @@ -35,6 +35,7 @@ export const installContract = async ( * startArgs?: StartArgs; * issuerNames?: string[]; * }} opts + * @param {object} [privateArgs] * * @typedef {Partial>[0]>} StartArgs */ From 930ee54c7bec77799b39955e087d14156b681535 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Wed, 14 Aug 2024 15:03:35 -0400 Subject: [PATCH 05/12] chore(deps): bump endo deps --- contract/package.json | 2 +- package.json | 7 +++--- yarn.lock | 58 +++++++++++++++++++++++++++---------------- 3 files changed, 40 insertions(+), 27 deletions(-) diff --git a/contract/package.json b/contract/package.json index b5702cc..1cb66d2 100644 --- a/contract/package.json +++ b/contract/package.json @@ -33,7 +33,7 @@ "@endo/eslint-plugin": "^0.5.2", "@endo/nat": "^4.1.27", "@endo/promise-kit": "^0.2.56", - "@endo/ses-ava": "^1.4.0", + "@endo/ses-ava": "^1.2.4", "@jessie.js/eslint-plugin": "^0.4.0", "@rollup/plugin-commonjs": "^25.0.8", "@rollup/plugin-json": "^6.1.0", diff --git a/package.json b/package.json index 7e9c8d6..4931e45 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,9 @@ "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/captp": "^3.1.1", "@endo/compartment-mapper": "^0.8.4", - "@endo/far": "^0.2.18", - "@endo/init": "^0.5.60", - "@endo/marshal": "^1.5.0", + "@endo/far": "^1.1.4", + "@endo/init": "^1.1.3", + "@endo/marshal": "^1.5.2", "@endo/nat": "4.1.27", "@endo/promise-kit": "^0.2.56", "@endo/lockdown": "^0.1.28", @@ -30,7 +30,6 @@ "@endo/stream": "^0.3.25", "@endo/exo": "^0.2.2", "@endo/check-bundle": "^0.2.18", - "@endo/ses-ava": "^0.2.40", "@endo/netstring": "^0.3.26", "@endo/stream-node": "^0.2.26", "@noble/hashes": "github:paulmillr/noble-hashes#ae060daa6252f3ff2aa2f84e887de0aab491281d" diff --git a/yarn.lock b/yarn.lock index 7cde6ea..6f02097 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3297,7 +3297,7 @@ __metadata: languageName: node linkType: hard -"@endo/eventual-send@npm:^1.2.2, @endo/eventual-send@npm:^1.2.4": +"@endo/eventual-send@npm:^1.2.2, @endo/eventual-send@npm:^1.2.3, @endo/eventual-send@npm:^1.2.4": version: 1.2.4 resolution: "@endo/eventual-send@npm:1.2.4" dependencies: @@ -3318,13 +3318,14 @@ __metadata: languageName: node linkType: hard -"@endo/far@npm:^0.2.18": - version: 0.2.22 - resolution: "@endo/far@npm:0.2.22" +"@endo/far@npm:^1.1.4": + version: 1.1.4 + resolution: "@endo/far@npm:1.1.4" dependencies: - "@endo/eventual-send": "npm:^0.17.6" - "@endo/pass-style": "npm:^0.1.7" - checksum: 10c0/bd30a168b47a26014cab296336a64aa2721975c386f7f87b6776dd33cf77f3e85ddb822e8422fbc2befb6920d72301e3b9b206fe71d970dce1870b708b09805d + "@endo/errors": "npm:^1.2.4" + "@endo/eventual-send": "npm:^1.2.4" + "@endo/pass-style": "npm:^1.4.2" + checksum: 10c0/d79a388a0a11cb8f437a5aaffa9d0e7ddd1737c2fbb9a40498d8a294ad3872b3c08098906f55479cb78b99be43e8b5948a0fbaf699d0b39050a8fd5de42b5240 languageName: node linkType: hard @@ -3338,15 +3339,15 @@ __metadata: languageName: node linkType: hard -"@endo/init@npm:^0.5.60": - version: 0.5.60 - resolution: "@endo/init@npm:0.5.60" +"@endo/init@npm:^1.1.3": + version: 1.1.3 + resolution: "@endo/init@npm:1.1.3" dependencies: - "@endo/base64": "npm:^0.2.35" - "@endo/eventual-send": "npm:^0.17.6" - "@endo/lockdown": "npm:^0.1.32" - "@endo/promise-kit": "npm:^0.2.60" - checksum: 10c0/247f189139e3ba244ddcf9c3252e865783020c1524cfab94210b504afaecc11f0e9d61ab7beef9fbe221c572577113a7a4d3a12057f9e9072a4e1e7eda493c62 + "@endo/base64": "npm:^1.0.6" + "@endo/eventual-send": "npm:^1.2.3" + "@endo/lockdown": "npm:^1.0.8" + "@endo/promise-kit": "npm:^1.1.3" + checksum: 10c0/70d20c108d8e1e8773287677a9a097fad75ce2c22a9588470cb19e3829226f0a6fda9c9773a5cd679cc530bc454008ec851b023bd2c6917a77065b253afec76b languageName: node linkType: hard @@ -3359,7 +3360,7 @@ __metadata: languageName: node linkType: hard -"@endo/marshal@npm:^1.5.0": +"@endo/marshal@npm:^1.5.2": version: 1.5.2 resolution: "@endo/marshal@npm:1.5.2" dependencies: @@ -3446,12 +3447,25 @@ __metadata: languageName: node linkType: hard -"@endo/ses-ava@npm:^0.2.40": - version: 0.2.44 - resolution: "@endo/ses-ava@npm:0.2.44" +"@endo/ses-ava@npm:0.2.40": + version: 0.2.40 + resolution: "@endo/ses-ava@npm:0.2.40" dependencies: - ses: "npm:^0.18.8" - checksum: 10c0/2afc1c808ba4a5bab666ba8e66990e6b80c8d506d4421ea92421ee704cd5aeb46ffdb6cfbe7025352c40252d570500324ed900d7cbc68c06855168ca2a768e04 + ses: "npm:^0.18.4" + checksum: 10c0/5b11104107a1a43724a686cceb425bed4235aad9a8e2d5bf13e4848a08b1711b29ea40bd31aec4991c328578f3f4532975f26f99377392b026c39b851f8f0979 + languageName: node + linkType: hard + +"@endo/ses-ava@npm:^1.2.4": + version: 1.2.4 + resolution: "@endo/ses-ava@npm:1.2.4" + dependencies: + "@endo/env-options": "npm:^1.1.5" + "@endo/init": "npm:^1.1.3" + ses: "npm:^1.7.0" + peerDependencies: + ava: ^5.3.0 || ^6.1.2 + checksum: 10c0/8c9e9a42850cf23646d2570b312c49086a4b6943588c99b233a1e11ddda72af79afec28c7c0ab59bb8b88c7ec1ad9e50c55cb46c813555d069b67490d35a8b6c languageName: node linkType: hard @@ -9831,7 +9845,7 @@ __metadata: "@endo/nat": "npm:^4.1.27" "@endo/patterns": "npm:^1.4.0" "@endo/promise-kit": "npm:^0.2.56" - "@endo/ses-ava": "npm:^1.4.0" + "@endo/ses-ava": "npm:^1.2.4" "@jessie.js/eslint-plugin": "npm:^0.4.0" "@rollup/plugin-commonjs": "npm:^25.0.8" "@rollup/plugin-json": "npm:^6.1.0" From 3dbe0512491031cd1e3839dd3ebb6320d7808fce Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Wed, 14 Aug 2024 15:23:21 -0400 Subject: [PATCH 06/12] chore(deps): bump lint plugins --- contract/package.json | 6 +- yarn.lock | 231 ++++++++++++++++++------------------------ 2 files changed, 104 insertions(+), 133 deletions(-) diff --git a/contract/package.json b/contract/package.json index 1cb66d2..f635fda 100644 --- a/contract/package.json +++ b/contract/package.json @@ -30,7 +30,7 @@ "@agoric/zone": "^0.2.2", "@cosmjs/amino": "^0.32.3", "@cosmjs/proto-signing": "^0.32.3", - "@endo/eslint-plugin": "^0.5.2", + "@endo/eslint-plugin": "^2.2.0", "@endo/nat": "^4.1.27", "@endo/promise-kit": "^0.2.56", "@endo/ses-ava": "^1.2.4", @@ -40,8 +40,8 @@ "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-replace": "^5.0.5", "@rollup/plugin-typescript": "^11.1.6", - "@typescript-eslint/eslint-plugin": "^6.7.0", - "@typescript-eslint/parser": "^6.7.0", + "@typescript-eslint/eslint-plugin": "^7.0.2", + "@typescript-eslint/parser": "^7.15.0", "agoric": "^0.21.2-u12.0", "ava": "^5.3.1", "eslint": "^8.57.0", diff --git a/yarn.lock b/yarn.lock index 6f02097..55f2950 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3269,15 +3269,16 @@ __metadata: languageName: node linkType: hard -"@endo/eslint-plugin@npm:^0.5.2": - version: 0.5.2 - resolution: "@endo/eslint-plugin@npm:0.5.2" +"@endo/eslint-plugin@npm:^2.2.0": + version: 2.2.0 + resolution: "@endo/eslint-plugin@npm:2.2.0" dependencies: - "@typescript-eslint/utils": "npm:^6.6.0" requireindex: "npm:~1.1.0" + ts-api-utils: "npm:~1.0.1" tsutils: "npm:~3.21.0" - typescript: "npm:~5.2.2" - checksum: 10c0/8d12042fd6570362a64d46934c4716cc43dd5e727851f1cf7c905dcb37cd664759b5fa582a700c97a3fa669c49c001f0df427dfdec1da24fd8a0cf74bd7928bb + typescript: "npm:5.5.2" + typescript-eslint: "npm:^7.3.1" + checksum: 10c0/221d3d698efee2d92fcc5aa587a341953cb762d46c26ea724a68784719b48bf20a5d505d737cb9b6fe543e45dab0d400c49d675b74d5e8ea97087d0589b0a219 languageName: node linkType: hard @@ -3848,6 +3849,13 @@ __metadata: languageName: node linkType: hard +"@eslint-community/regexpp@npm:^4.10.0": + version: 4.11.0 + resolution: "@eslint-community/regexpp@npm:4.11.0" + checksum: 10c0/0f6328869b2741e2794da4ad80beac55cba7de2d3b44f796a60955b0586212ec75e6b0253291fd4aad2100ad471d1480d8895f2b54f1605439ba4c875e05e523 + languageName: node + linkType: hard + "@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1": version: 4.10.0 resolution: "@eslint-community/regexpp@npm:4.10.0" @@ -7424,28 +7432,26 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^6.7.0": - version: 6.21.0 - resolution: "@typescript-eslint/eslint-plugin@npm:6.21.0" +"@typescript-eslint/eslint-plugin@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/eslint-plugin@npm:7.18.0" dependencies: - "@eslint-community/regexpp": "npm:^4.5.1" - "@typescript-eslint/scope-manager": "npm:6.21.0" - "@typescript-eslint/type-utils": "npm:6.21.0" - "@typescript-eslint/utils": "npm:6.21.0" - "@typescript-eslint/visitor-keys": "npm:6.21.0" - debug: "npm:^4.3.4" + "@eslint-community/regexpp": "npm:^4.10.0" + "@typescript-eslint/scope-manager": "npm:7.18.0" + "@typescript-eslint/type-utils": "npm:7.18.0" + "@typescript-eslint/utils": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" graphemer: "npm:^1.4.0" - ignore: "npm:^5.2.4" + ignore: "npm:^5.3.1" natural-compare: "npm:^1.4.0" - semver: "npm:^7.5.4" - ts-api-utils: "npm:^1.0.1" + ts-api-utils: "npm:^1.3.0" peerDependencies: - "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha - eslint: ^7.0.0 || ^8.0.0 + "@typescript-eslint/parser": ^7.0.0 + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: 10c0/f911a79ee64d642f814a3b6cdb0d324b5f45d9ef955c5033e78903f626b7239b4aa773e464a38c3e667519066169d983538f2bf8e5d00228af587c9d438fb344 + checksum: 10c0/2b37948fa1b0dab77138909dabef242a4d49ab93e4019d4ef930626f0a7d96b03e696cd027fa0087881c20e73be7be77c942606b4a76fa599e6b37f6985304c3 languageName: node linkType: hard @@ -7474,21 +7480,21 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^6.7.0": - version: 6.21.0 - resolution: "@typescript-eslint/parser@npm:6.21.0" +"@typescript-eslint/parser@npm:7.18.0, @typescript-eslint/parser@npm:^7.15.0": + version: 7.18.0 + resolution: "@typescript-eslint/parser@npm:7.18.0" dependencies: - "@typescript-eslint/scope-manager": "npm:6.21.0" - "@typescript-eslint/types": "npm:6.21.0" - "@typescript-eslint/typescript-estree": "npm:6.21.0" - "@typescript-eslint/visitor-keys": "npm:6.21.0" + "@typescript-eslint/scope-manager": "npm:7.18.0" + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/typescript-estree": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" debug: "npm:^4.3.4" peerDependencies: - eslint: ^7.0.0 || ^8.0.0 + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: 10c0/a8f99820679decd0d115c0af61903fb1de3b1b5bec412dc72b67670bf636de77ab07f2a68ee65d6da7976039bbf636907f9d5ca546db3f0b98a31ffbc225bc7d + checksum: 10c0/370e73fca4278091bc1b657f85e7d74cd52b24257ea20c927a8e17546107ce04fbf313fec99aed0cc2a145ddbae1d3b12e9cc2c1320117636dc1281bcfd08059 languageName: node linkType: hard @@ -7510,34 +7516,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^7.15.0": - version: 7.18.0 - resolution: "@typescript-eslint/parser@npm:7.18.0" - dependencies: - "@typescript-eslint/scope-manager": "npm:7.18.0" - "@typescript-eslint/types": "npm:7.18.0" - "@typescript-eslint/typescript-estree": "npm:7.18.0" - "@typescript-eslint/visitor-keys": "npm:7.18.0" - debug: "npm:^4.3.4" - peerDependencies: - eslint: ^8.56.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 10c0/370e73fca4278091bc1b657f85e7d74cd52b24257ea20c927a8e17546107ce04fbf313fec99aed0cc2a145ddbae1d3b12e9cc2c1320117636dc1281bcfd08059 - languageName: node - linkType: hard - -"@typescript-eslint/scope-manager@npm:6.21.0": - version: 6.21.0 - resolution: "@typescript-eslint/scope-manager@npm:6.21.0" - dependencies: - "@typescript-eslint/types": "npm:6.21.0" - "@typescript-eslint/visitor-keys": "npm:6.21.0" - checksum: 10c0/eaf868938d811cbbea33e97e44ba7050d2b6892202cea6a9622c486b85ab1cf801979edf78036179a8ba4ac26f1dfdf7fcc83a68c1ff66be0b3a8e9a9989b526 - languageName: node - linkType: hard - "@typescript-eslint/scope-manager@npm:7.18.0": version: 7.18.0 resolution: "@typescript-eslint/scope-manager@npm:7.18.0" @@ -7558,20 +7536,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.21.0": - version: 6.21.0 - resolution: "@typescript-eslint/type-utils@npm:6.21.0" +"@typescript-eslint/type-utils@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/type-utils@npm:7.18.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:6.21.0" - "@typescript-eslint/utils": "npm:6.21.0" + "@typescript-eslint/typescript-estree": "npm:7.18.0" + "@typescript-eslint/utils": "npm:7.18.0" debug: "npm:^4.3.4" - ts-api-utils: "npm:^1.0.1" + ts-api-utils: "npm:^1.3.0" peerDependencies: - eslint: ^7.0.0 || ^8.0.0 + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: 10c0/7409c97d1c4a4386b488962739c4f1b5b04dc60cf51f8cd88e6b12541f84d84c6b8b67e491a147a2c95f9ec486539bf4519fb9d418411aef6537b9c156468117 + checksum: 10c0/ad92a38007be620f3f7036f10e234abdc2fdc518787b5a7227e55fd12896dacf56e8b34578723fbf9bea8128df2510ba8eb6739439a3879eda9519476d5783fd languageName: node linkType: hard @@ -7592,13 +7570,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:6.21.0": - version: 6.21.0 - resolution: "@typescript-eslint/types@npm:6.21.0" - checksum: 10c0/020631d3223bbcff8a0da3efbdf058220a8f48a3de221563996ad1dcc30d6c08dadc3f7608cc08830d21c0d565efd2db19b557b9528921c78aabb605eef2d74d - languageName: node - linkType: hard - "@typescript-eslint/types@npm:7.18.0": version: 7.18.0 resolution: "@typescript-eslint/types@npm:7.18.0" @@ -7613,25 +7584,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.21.0": - version: 6.21.0 - resolution: "@typescript-eslint/typescript-estree@npm:6.21.0" - dependencies: - "@typescript-eslint/types": "npm:6.21.0" - "@typescript-eslint/visitor-keys": "npm:6.21.0" - debug: "npm:^4.3.4" - globby: "npm:^11.1.0" - is-glob: "npm:^4.0.3" - minimatch: "npm:9.0.3" - semver: "npm:^7.5.4" - ts-api-utils: "npm:^1.0.1" - peerDependenciesMeta: - typescript: - optional: true - checksum: 10c0/af1438c60f080045ebb330155a8c9bb90db345d5069cdd5d01b67de502abb7449d6c75500519df829f913a6b3f490ade3e8215279b6bdc63d0fb0ae61034df5f - languageName: node - linkType: hard - "@typescript-eslint/typescript-estree@npm:7.18.0": version: 7.18.0 resolution: "@typescript-eslint/typescript-estree@npm:7.18.0" @@ -7670,20 +7622,17 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.21.0, @typescript-eslint/utils@npm:^6.6.0": - version: 6.21.0 - resolution: "@typescript-eslint/utils@npm:6.21.0" +"@typescript-eslint/utils@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/utils@npm:7.18.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" - "@types/json-schema": "npm:^7.0.12" - "@types/semver": "npm:^7.5.0" - "@typescript-eslint/scope-manager": "npm:6.21.0" - "@typescript-eslint/types": "npm:6.21.0" - "@typescript-eslint/typescript-estree": "npm:6.21.0" - semver: "npm:^7.5.4" + "@typescript-eslint/scope-manager": "npm:7.18.0" + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/typescript-estree": "npm:7.18.0" peerDependencies: - eslint: ^7.0.0 || ^8.0.0 - checksum: 10c0/ab2df3833b2582d4e5467a484d08942b4f2f7208f8e09d67de510008eb8001a9b7460f2f9ba11c12086fd3cdcac0c626761c7995c2c6b5657d5fa6b82030a32d + eslint: ^8.56.0 + checksum: 10c0/a25a6d50eb45c514469a01ff01f215115a4725fb18401055a847ddf20d1b681409c4027f349033a95c4ff7138d28c3b0a70253dfe8262eb732df4b87c547bd1e languageName: node linkType: hard @@ -7704,16 +7653,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.21.0": - version: 6.21.0 - resolution: "@typescript-eslint/visitor-keys@npm:6.21.0" - dependencies: - "@typescript-eslint/types": "npm:6.21.0" - eslint-visitor-keys: "npm:^3.4.1" - checksum: 10c0/7395f69739cfa1cb83c1fb2fad30afa2a814756367302fb4facd5893eff66abc807e8d8f63eba94ed3b0fe0c1c996ac9a1680bcbf0f83717acedc3f2bb724fbf - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:7.18.0": version: 7.18.0 resolution: "@typescript-eslint/visitor-keys@npm:7.18.0" @@ -9838,7 +9777,7 @@ __metadata: "@cosmjs/amino": "npm:^0.32.3" "@cosmjs/proto-signing": "npm:^0.32.3" "@endo/bundle-source": "npm:^3.2.3" - "@endo/eslint-plugin": "npm:^0.5.2" + "@endo/eslint-plugin": "npm:^2.2.0" "@endo/far": "npm:^1.1.2" "@endo/init": "npm:^0.5.60" "@endo/marshal": "npm:^1.5.0" @@ -9852,8 +9791,8 @@ __metadata: "@rollup/plugin-node-resolve": "npm:^15.2.3" "@rollup/plugin-replace": "npm:^5.0.5" "@rollup/plugin-typescript": "npm:^11.1.6" - "@typescript-eslint/eslint-plugin": "npm:^6.7.0" - "@typescript-eslint/parser": "npm:^6.7.0" + "@typescript-eslint/eslint-plugin": "npm:^7.0.2" + "@typescript-eslint/parser": "npm:^7.15.0" agoric: "npm:^0.21.2-u12.0" ava: "npm:^5.3.1" eslint: "npm:^8.57.0" @@ -12115,6 +12054,13 @@ __metadata: languageName: node linkType: hard +"ignore@npm:^5.3.1": + version: 5.3.2 + resolution: "ignore@npm:5.3.2" + checksum: 10c0/f9f652c957983634ded1e7f02da3b559a0d4cc210fca3792cb67f1b153623c9c42efdc1c4121af171e295444459fc4a9201101fb041b1104a3c000bccb188337 + languageName: node + linkType: hard + "immer@npm:^9.0.19": version: 9.0.21 resolution: "immer@npm:9.0.21" @@ -16849,6 +16795,15 @@ __metadata: languageName: node linkType: hard +"ts-api-utils@npm:~1.0.1": + version: 1.0.3 + resolution: "ts-api-utils@npm:1.0.3" + peerDependencies: + typescript: ">=4.2.0" + checksum: 10c0/9408338819c3aca2a709f0bc54e3f874227901506cacb1163612a6c8a43df224174feb965a5eafdae16f66fc68fd7bfee8d3275d0fa73fbb8699e03ed26520c9 + languageName: node + linkType: hard + "ts-interface-checker@npm:^0.1.9": version: 0.1.13 resolution: "ts-interface-checker@npm:0.1.13" @@ -17032,6 +16987,32 @@ __metadata: languageName: node linkType: hard +"typescript-eslint@npm:^7.3.1": + version: 7.18.0 + resolution: "typescript-eslint@npm:7.18.0" + dependencies: + "@typescript-eslint/eslint-plugin": "npm:7.18.0" + "@typescript-eslint/parser": "npm:7.18.0" + "@typescript-eslint/utils": "npm:7.18.0" + peerDependencies: + eslint: ^8.56.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 10c0/610c0faa70b9be89255086378c7ef69e979115c89be69851fb4d69e76907b3520450b162a8adee56b32dbf368f8c14c1fac88065539012140c1319851f2676da + languageName: node + linkType: hard + +"typescript@npm:5.5.2": + version: 5.5.2 + resolution: "typescript@npm:5.5.2" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10c0/8ca39b27b5f9bd7f32db795045933ab5247897660627251e8254180b792a395bf061ea7231947d5d7ffa5cb4cc771970fd4ef543275f9b559f08c9325cccfce3 + languageName: node + linkType: hard + "typescript@npm:^5.2.2": version: 5.4.3 resolution: "typescript@npm:5.4.3" @@ -17052,13 +17033,13 @@ __metadata: languageName: node linkType: hard -"typescript@npm:~5.2.2": - version: 5.2.2 - resolution: "typescript@npm:5.2.2" +"typescript@patch:typescript@npm%3A5.5.2#optional!builtin": + version: 5.5.2 + resolution: "typescript@patch:typescript@npm%3A5.5.2#optional!builtin::version=5.5.2&hash=379a07" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/91ae3e6193d0ddb8656d4c418a033f0f75dec5e077ebbc2bd6d76439b93f35683936ee1bdc0e9cf94ec76863aa49f27159b5788219b50e1cd0cd6d110aa34b07 + checksum: 10c0/a7b7ede75dc7fc32a76d0d0af6b91f5fbd8620890d84c906f663d8783bf3de6d7bd50f0430b8bb55eac88a38934af847ff709e7156e5138b95ae94cbd5f73e5b languageName: node linkType: hard @@ -17082,16 +17063,6 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A~5.2.2#optional!builtin": - version: 5.2.2 - resolution: "typescript@patch:typescript@npm%3A5.2.2#optional!builtin::version=5.2.2&hash=f3b441" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10c0/062c1cee1990e6b9419ce8a55162b8dc917eb87f807e4de0327dbc1c2fa4e5f61bc0dd4e034d38ff541d1ed0479b53bcee8e4de3a4075c51a1724eb6216cb6f5 - languageName: node - linkType: hard - "ufo@npm:^1.3.2, ufo@npm:^1.4.0, ufo@npm:^1.5.3": version: 1.5.3 resolution: "ufo@npm:1.5.3" From 5a19ccc954627d78af964a8778f5118483307670 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Wed, 14 Aug 2024 14:35:18 -0400 Subject: [PATCH 07/12] lint: typecheck --- contract/package.json | 3 +- contract/src/collectFees.js | 4 ++ contract/src/facade.js | 51 ------------------- contract/src/fixHub.js | 4 ++ contract/src/orc.js | 36 ------------- contract/src/orca.contract.js | 4 +- contract/src/orca.proposal.js | 24 +++------ contract/src/platform-goals/board-aux.core.js | 11 ++-- contract/src/platform-goals/endo1.core.js | 6 ++- contract/src/platform-goals/start-contract.js | 5 +- .../platform-goals/start-governed-contract.js | 11 +++- contract/src/types.js | 9 ---- contract/test/boot-tools.js | 4 +- contract/test/lib-gov-test/puppet-gov.js | 6 +++ contract/test/market-actors.js | 5 ++ contract/test/mintStable.js | 5 ++ contract/test/test-build-proposal.js | 1 + contract/test/wallet-tools.js | 11 ++-- contract/tools/ui-kit-goals/batchQuery.js | 9 ++-- contract/tools/ui-kit-goals/marshalTables.js | 5 +- .../tools/ui-kit-goals/name-service-client.js | 5 ++ contract/tools/ui-kit-goals/queryKit.js | 7 ++- contract/tsconfig.json | 11 ++-- ui/package.json | 2 +- ui/tsconfig.json | 10 ++-- 25 files changed, 107 insertions(+), 142 deletions(-) delete mode 100644 contract/src/facade.js delete mode 100644 contract/src/orc.js diff --git a/contract/package.json b/contract/package.json index f635fda..2752832 100644 --- a/contract/package.json +++ b/contract/package.json @@ -14,8 +14,7 @@ "build": "yarn build:deployer", "build:deployer": "rollup -c rollup.config.mjs", "test": "ava", - "lint": "eslint '**/*.js'", - "lint:types": "tsc -p jsconfig.json", + "lint": "tsc && eslint '**/*.js'", "lint:fix": "eslint --fix '**/*.js'" }, "devDependencies": { diff --git a/contract/src/collectFees.js b/contract/src/collectFees.js index 11fa6be..ff8581c 100644 --- a/contract/src/collectFees.js +++ b/contract/src/collectFees.js @@ -2,6 +2,10 @@ import { atomicTransfer } from '@agoric/zoe/src/contractSupport/index.js'; +/** + * @import {Brand, Issuer, Purse} from '@agoric/ertp/src/types.js'; + */ + /** * Provide shared support for providing access to fees from a service contract. * diff --git a/contract/src/facade.js b/contract/src/facade.js deleted file mode 100644 index b2284f5..0000000 --- a/contract/src/facade.js +++ /dev/null @@ -1,51 +0,0 @@ -/** @file Orchestration service */ - -/** - * @import {Zone} from '@agoric/zone'; - * @import {TimerService} from '@agoric/time'; - * @import {OrchestrationService} from './service.js'; - * @import {Orchestrator} from './types.js'; - */ - -/** - * - * @param {{ - * zone: Zone; - * timerService: ERef; - * zcf: ERef; - * storageNode: ERef; - * orchestrationService: ERef; - * }} powers - */ -export const makeOrchestrationFacade = ({ - zone, - timerService, - zcf, - storageNode, - orchestrationService, -}) => { - console.log('makeOrchestrationFacade got', { - zone, - timerService, - zcf, - storageNode, - orchestrationService, - }); - - return { - /** - * @template Context - * @template {any[]} Args - * @param {string} durableName - * @param {Context} ctx - * @param {(orc: Orchestrator, ctx2: Context, ...args: Args) => object} fn - * @returns {(...args: Args) => Promise} - */ - orchestrate(durableName, ctx, fn) { - console.log('orchestrate got', durableName, ctx, fn); - throw new Error('Not yet implemented'); - }, - }; -}; -harden(makeOrchestrationFacade); -/** @typedef {ReturnType} OrchestrationFacade */ diff --git a/contract/src/fixHub.js b/contract/src/fixHub.js index 1583c83..0d47623 100644 --- a/contract/src/fixHub.js +++ b/contract/src/fixHub.js @@ -1,6 +1,10 @@ // @ts-check import { E, Far } from '@endo/far'; +/** + * @import {ERef} from '@endo/far'; + */ + const { Fail } = assert; /** diff --git a/contract/src/orc.js b/contract/src/orc.js deleted file mode 100644 index 29a4d1f..0000000 --- a/contract/src/orc.js +++ /dev/null @@ -1,36 +0,0 @@ -/** @import {AfterAction, SwapMaxSlippage, TransferMsg} from '../types.js' */ - -export const orcUtils = { - /** - * unwinds denom with PFM, if necessary - * - * @param {Omit} _args - * @returns {TransferMsg} - */ - makeTransferMsg: _args => { - // XXX mocked, so typescript is happy - return { - toAccount: { - chainId: 'osmosis-test', - address: 'osmo1234', - addressEncoding: 'bech32', - }, - }; - }, - /** - * SwapExact or SwapMaxSlippage, with optional AfterAction - * @param { (SwapExact | SwapMaxSlippage) & - (AfterAction | Record)} _args - * @returns {TransferMsg} - */ - makeOsmosisSwap(_args) { - // XXX mocked, so typescript is happy - return { - toAccount: { - chainId: 'osmosis-test', - address: 'osmo1234', - addressEncoding: 'bech32', - }, - }; - }, -}; diff --git a/contract/src/orca.contract.js b/contract/src/orca.contract.js index 83eaf83..d652256 100644 --- a/contract/src/orca.contract.js +++ b/contract/src/orca.contract.js @@ -1,4 +1,3 @@ -/* eslint-disable -- FIXME */ import { M } from '@endo/patterns'; import { makeTracer, StorageNodeShape } from '@agoric/internal'; @@ -22,10 +21,13 @@ export const meta = harden({ timer: M.remotable('TimerService'), }, }); +harden(meta); export const privateArgsShape = meta.privateArgsShape; +harden(privateArgsShape); export const terms = harden({}); +harden(terms); /** * diff --git a/contract/src/orca.proposal.js b/contract/src/orca.proposal.js index ecdf49b..3b79967 100644 --- a/contract/src/orca.proposal.js +++ b/contract/src/orca.proposal.js @@ -1,29 +1,21 @@ /* eslint-disable -- FIXME */ -// @ts-check -import { allValues } from './objectTools.js'; +// @ts-nocheck -- FIXME import { - AmountMath, installContract, startContract, } from './platform-goals/start-contract.js'; -import { E } from '@endo/far'; import { makeTracer } from '@agoric/internal'; +import { E } from '@endo/far'; -const { Fail } = assert; - -const pathSegmentPattern = /^[a-zA-Z0-9_-]{1,100}$/; +/// +/// -// /** @type {(name: string) => void} */ -// const assertPathSegment = name => { -// pathSegmentPattern.test(name) || -// Fail`Path segment names must consist of 1 to 100 characters limited to ASCII alphanumerics, underscores, and/or dashes: ${name}`; -// }; -// harden(assertPathSegment); +const { Fail } = assert; const contractName = 'ORCA'; -// const trace = makeTracer('StartOrca', true); +const trace = makeTracer('StartOrca', true); /** * Core eval script to start contract @@ -38,7 +30,7 @@ const contractName = 'ORCA'; * }} DaoSpace */ export const startDaoContract = async (powers, config) => { - console.log('core eval for', contractName); + trace('core eval for', contractName); const { // must be supplied by caller or template-replaced @@ -102,7 +94,7 @@ export const startDaoContract = async (powers, config) => { }, ); - console.log(contractName, '(re)started'); + trace(contractName, '(re)started'); produceInstance.resolve(started.instance); }; diff --git a/contract/src/platform-goals/board-aux.core.js b/contract/src/platform-goals/board-aux.core.js index bcb1d95..0a885a6 100644 --- a/contract/src/platform-goals/board-aux.core.js +++ b/contract/src/platform-goals/board-aux.core.js @@ -1,8 +1,14 @@ -// @ts-check +// @ts-nocheck -- FIXME import { E, Far } from '@endo/far'; +/// + const { Fail } = assert; +/** + * @import {ERef} from '@endo/far'; + */ + // vstorage paths under published.* // and zone store key export const BOARD_AUX = 'boardAux'; @@ -90,12 +96,9 @@ export const marshalData = harden({ export const produceBoardAuxManager = async powers => { const { zone } = powers; const { board } = powers.consume; - /** @type {import('../types').NonNullChainStorage['consume']} */ - // @ts-expect-error cast const { chainStorage } = powers.consume; /** @type {BoardAuxPowers['produce']} */ - // @ts-expect-error cast const produce = powers.produce; const mgr = makeBoardAuxManager(zone, marshalData, { board, chainStorage }); diff --git a/contract/src/platform-goals/endo1.core.js b/contract/src/platform-goals/endo1.core.js index e72a454..88ac5ef 100644 --- a/contract/src/platform-goals/endo1.core.js +++ b/contract/src/platform-goals/endo1.core.js @@ -2,6 +2,10 @@ import * as marshal from '@endo/marshal'; import * as patterns from '@endo/patterns'; +/** + * @import {BootstrapManifestPermit} from '@agoric/vats/src/core/lib-boot.js'; + */ + /** * @typedef {{ * endo1: { @@ -23,7 +27,7 @@ export const produceEndoModules = permittedPowers => { produce.endo1.resolve(endo); }; -/** @type {import('@agoric/vats/src/core/lib-boot').BootstrapManifestPermit} */ +/** @type {BootstrapManifestPermit} */ export const permit = { /** @type {Record} */ produce: { endo1: true }, diff --git a/contract/src/platform-goals/start-contract.js b/contract/src/platform-goals/start-contract.js index af901e2..0d55a7b 100644 --- a/contract/src/platform-goals/start-contract.js +++ b/contract/src/platform-goals/start-contract.js @@ -1,8 +1,11 @@ /** @file utilities to start typical contracts in core eval scripts. */ -// @ts-check +// @ts-nocheck -- FIXME import { E } from '@endo/far'; +/// +/// + const { Fail } = assert; /** diff --git a/contract/src/platform-goals/start-governed-contract.js b/contract/src/platform-goals/start-governed-contract.js index 299b966..205c889 100644 --- a/contract/src/platform-goals/start-governed-contract.js +++ b/contract/src/platform-goals/start-governed-contract.js @@ -1,9 +1,16 @@ -// @ts-check +// @ts-nocheck -- FIXME import { E } from '@endo/far'; import { allValues, zip } from '../objectTools.js'; import { sanitizePathSegment } from './start-contract.js'; +/// + +/** + * @import {ERef} from '@endo/far'; + * @import {GovernableStartFn, GovernanceFacetKit} from '@agoric/governance/src/types.js'; + */ + const { values } = Object; /** @@ -18,7 +25,7 @@ const { values } = Object; /** * @typedef {StartResult< - * typeof import('@agoric/governance/src/committee.js').prepare + * typeof import('@agoric/governance/src/committee.js').start * >} CommitteeStart */ diff --git a/contract/src/types.js b/contract/src/types.js index 86064bf..75b76ca 100644 --- a/contract/src/types.js +++ b/contract/src/types.js @@ -1,10 +1 @@ import '@agoric/vats/src/core/types'; - -/** - * In agoric-sdk, the BootstrapPowers.consume['chainStorage'] type includes undefined because - * of some historical testing practices. It's tedious and unnecessary - * to check for undefined, so here we override the type to say that it's - * never undefined. - * - * @typedef {PromiseSpaceOf<{ chainStorage: StorageNode }>} NonNullChainStorage - */ diff --git a/contract/test/boot-tools.js b/contract/test/boot-tools.js index ed8973b..0c49032 100644 --- a/contract/test/boot-tools.js +++ b/contract/test/boot-tools.js @@ -16,6 +16,8 @@ import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-util import { mockWalletFactory } from './wallet-tools.js'; import { getBundleId } from '../tools/bundle-tools.js'; +import '@agoric/vats/src/core/types-ambient.js'; + const { entries } = Object; /** @@ -98,7 +100,7 @@ export const mockBootstrapPowers = async ( produce.priceAuthority.resolve(Far('NullPriceAuthority', {})); /** - * @type {BootstrapPowers & import('../src/types').NonNullChainStorage} + * @type {BootstrapPowers} */ // @ts-expect-error mock const powers = { produce, consume, ...spaces, zone }; diff --git a/contract/test/lib-gov-test/puppet-gov.js b/contract/test/lib-gov-test/puppet-gov.js index 5cd6b09..29ba5e9 100644 --- a/contract/test/lib-gov-test/puppet-gov.js +++ b/contract/test/lib-gov-test/puppet-gov.js @@ -3,6 +3,12 @@ import { E, Far } from '@endo/far'; import { createRequire } from 'node:module'; +import '@agoric/vats/src/core/types-ambient.js'; + +/** + * @import {ERef} from '@endo/far'; + */ + const nodeRequire = createRequire(import.meta.url); export const assets = { binaryVoteCounter: nodeRequire.resolve( diff --git a/contract/test/market-actors.js b/contract/test/market-actors.js index 53102e7..0f8e6a9 100644 --- a/contract/test/market-actors.js +++ b/contract/test/market-actors.js @@ -10,6 +10,10 @@ import { const { entries, fromEntries, keys } = Object; +/** + * @import {Brand, Issuer} from '@agoric/ertp/src/types.js'; + */ + /** * @typedef {{ * brand: Record> & { timer: unknown } @@ -43,6 +47,7 @@ export const payerPete = async ( ) => { const hub = await makeAgoricNames(queryTool); /** @type {WellKnown} */ + // @ts-expect-error XXX const agoricNames = makeNameProxy(hub); const instance = await agoricNames.instance.postalService; diff --git a/contract/test/mintStable.js b/contract/test/mintStable.js index 78156fc..b84075e 100644 --- a/contract/test/mintStable.js +++ b/contract/test/mintStable.js @@ -7,6 +7,11 @@ import { E } from '@endo/far'; import { createRequire } from 'module'; +/** + * @import {ERef} from '@endo/far'; + * @import {Brand, Issuer, Payment} from '@agoric/ertp/src/types.js'; + */ + const myRequire = createRequire(import.meta.url); const centralSupplyPath = myRequire.resolve( '@agoric/vats/src/centralSupply.js', diff --git a/contract/test/test-build-proposal.js b/contract/test/test-build-proposal.js index 3ac271a..f7e5296 100644 --- a/contract/test/test-build-proposal.js +++ b/contract/test/test-build-proposal.js @@ -51,6 +51,7 @@ test.before(async t => { }); test('bundles from build:deployer meet 1MB request limit', async t => { + // @ts-expect-error ses-ava types const { runPackageScript, listBundles, compressBundle } = t.context; await runPackageScript('build:deployer'); diff --git a/contract/test/wallet-tools.js b/contract/test/wallet-tools.js index 6412d7f..84904fb 100644 --- a/contract/test/wallet-tools.js +++ b/contract/test/wallet-tools.js @@ -10,12 +10,17 @@ import { makePromiseKit } from '@endo/promise-kit'; // eslint-disable-next-line import/no-extraneous-dependencies import { makeNotifier } from '@agoric/notifier'; +import '@agoric/zoe/src/zoeService/types-ambient.js'; + import { allValues, mapValues } from '../src/objectTools.js'; /** - * @typedef {import('@agoric/smart-wallet/src/offers.js').OfferSpec} OfferSpec - * @typedef {import('@agoric/smart-wallet/src/smartWallet.js').UpdateRecord} UpdateRecord - * @typedef {import('@agoric/smart-wallet/src/invitations.js').InvitationSpec} InvitationSpec + * @import {Amount, Brand, Issuer, Payment, Purse} from '@agoric/ertp/src/types.js'; + * @import {ERef} from '@endo/far'; + * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js'; + * @import {UpdateRecord} from '@agoric/smart-wallet/src/smartWallet.js'; + * @import {InvitationSpec} from '@agoric/smart-wallet/src/invitations.js'; + * @import {PromiseKit} from '@endo/promise-kit'; */ const { values } = Object; diff --git a/contract/tools/ui-kit-goals/batchQuery.js b/contract/tools/ui-kit-goals/batchQuery.js index d53468e..7af8ab1 100644 --- a/contract/tools/ui-kit-goals/batchQuery.js +++ b/contract/tools/ui-kit-goals/batchQuery.js @@ -1,9 +1,12 @@ // @ts-check import { E } from '@endo/far'; +/** + * @import {ERef} from '@endo/far'; + * @import {FromCapData} from '@endo/marshal'; + */ + /** @typedef {'children' | 'data'} AgoricChainStoragePathKind */ -/** @template T @typedef {import('@endo/marshal').FromCapData} FromCapData */ -/** @template T @typedef {import('@endo/eventual-send').ERef} ERef */ /** * @param {[kind: AgoricChainStoragePathKind, item: string]} path @@ -34,7 +37,7 @@ async function* mapHistory(f, chunks) { } /** - * @param {ERef} lcd + * @param {ERef} lcd */ export const makeVStorage = lcd => { const getJSON = (href, options) => E(lcd).getJSON(href, options); diff --git a/contract/tools/ui-kit-goals/marshalTables.js b/contract/tools/ui-kit-goals/marshalTables.js index 7913e66..a5a0334 100644 --- a/contract/tools/ui-kit-goals/marshalTables.js +++ b/contract/tools/ui-kit-goals/marshalTables.js @@ -1,3 +1,4 @@ +// @ts-nocheck -- FIXME /** * @file marshal tools for vstorage clients * @@ -34,7 +35,7 @@ const makeTranslationTable = (makeSlot, makeVal) => { /** @type {(val: Val) => string} */ const convertValToSlot = val => { if (valToSlot.has(val)) { - // @ts-expect-error https://github.com/microsoft/TypeScript/issues/13086 + // @ts-ignore https://github.com/microsoft/TypeScript/issues/13086 return valToSlot.get(val); } const slot = makeSlot(val, valToSlot.size); @@ -47,7 +48,7 @@ const makeTranslationTable = (makeSlot, makeVal) => { const convertSlotToVal = (slot, iface) => { if (slot === null) return makeVal(slot, iface); if (slotToVal.has(slot)) { - // @ts-expect-error https://github.com/microsoft/TypeScript/issues/13086 + // @ts-ignore https://github.com/microsoft/TypeScript/issues/13086 return slotToVal.get(slot); } const val = makeVal(slot, iface); diff --git a/contract/tools/ui-kit-goals/name-service-client.js b/contract/tools/ui-kit-goals/name-service-client.js index 2ccb664..e7e7503 100644 --- a/contract/tools/ui-kit-goals/name-service-client.js +++ b/contract/tools/ui-kit-goals/name-service-client.js @@ -1,6 +1,11 @@ // @ts-check import { E, Far } from '@endo/far'; +/** + * @import {ERef} from '@endo/far'; + * @import {NameHub} from '@agoric/vats'; + */ + /** @param {{ queryData: (path: string) => any }} qt */ export const makeAgoricNames = async qt => { assert(qt); diff --git a/contract/tools/ui-kit-goals/queryKit.js b/contract/tools/ui-kit-goals/queryKit.js index 7559c96..4fc578d 100644 --- a/contract/tools/ui-kit-goals/queryKit.js +++ b/contract/tools/ui-kit-goals/queryKit.js @@ -4,6 +4,11 @@ import { E, Far } from '@endo/far'; import { batchVstorageQuery } from './batchQuery.js'; import { makeClientMarshaller } from './marshalTables.js'; +/** + * @import {ERef} from '@endo/far'; + * @import {UpdateRecord} from '@agoric/smart-wallet/src/smartWallet.js'; + */ + /** * Iter tools... * @@ -83,7 +88,7 @@ export const makeWalletView = (addr, { query, vstorage }) => { current: () => query.queryData(`published.wallet.${addr}.current`), /** * TODO: visit in chunks by block - * @param {ERef<{visit: (r: import('@agoric/smart-wallet/src/smartWallet.js').UpdateRecord) => void}>} visitor + * @param {ERef<{visit: (r: UpdateRecord) => void}>} visitor * @param {number} [minHeight] */ history: async (visitor, minHeight) => { diff --git a/contract/tsconfig.json b/contract/tsconfig.json index 66f4f6e..00591ef 100644 --- a/contract/tsconfig.json +++ b/contract/tsconfig.json @@ -1,16 +1,19 @@ { "compilerOptions": { "target": "ESNext", - "module": "ESNext", - "moduleResolution": "node", + "module": "NodeNext", + "moduleResolution": "NodeNext", "lib": ["ESNext", "DOM"], - "strict": true, + "checkJs": true, + "strict": false, + "noImplicitAny": false, + "useUnknownInCatchVariables": false, "esModuleInterop": true, "skipLibCheck": true, "forceConsistentCasingInFileNames": true, "resolveJsonModule": true, "outDir": "./dist" }, - "include": ["src/**/*.ts", "test/**/*.ts"], + "include": ["src", "test"], "exclude": ["node_modules"] } diff --git a/ui/package.json b/ui/package.json index a50a51f..10b76c4 100644 --- a/ui/package.json +++ b/ui/package.json @@ -6,7 +6,7 @@ "scripts": { "dev": "vite", "build": "tsc && vite build", - "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", + "lint": "tsc && eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", "lint:fix": "yarn lint --fix", "preview": "vite preview", "test": "exit 0", diff --git a/ui/tsconfig.json b/ui/tsconfig.json index 7891d62..390c3a2 100644 --- a/ui/tsconfig.json +++ b/ui/tsconfig.json @@ -5,7 +5,6 @@ "lib": ["ES2020", "DOM", "DOM.Iterable"], "module": "ESNext", "skipLibCheck": true, - /* Bundler mode */ "moduleResolution": "bundler", "allowImportingTsExtensions": true, @@ -13,7 +12,6 @@ "isolatedModules": true, "noEmit": true, "jsx": "react-jsx", - /* Linting */ "strict": true, "noImplicitAny": false, @@ -21,6 +19,10 @@ "noUnusedParameters": true, "noFallthroughCasesInSwitch": true }, - "include": ["src"], - "references": [{ "path": "./tsconfig.node.json" }] + "include": ["src", "test"], + "references": [ + { + "path": "./tsconfig.node.json" + } + ] } From 13c9a4952bdef2b5f85d508b8206d73a6d5dcddc Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Wed, 14 Aug 2024 15:45:41 -0400 Subject: [PATCH 08/12] fixup! lint: typecheck --- contract/src/orca.proposal.js | 46 ++++++++----------- contract/src/platform-goals/board-aux.core.js | 7 ++- contract/src/platform-goals/start-contract.js | 10 ++-- .../platform-goals/start-governed-contract.js | 22 ++++----- contract/test/test-build-proposal.js | 3 +- contract/test/test-orca-contract.js | 6 ++- contract/tools/ui-kit-goals/marshalTables.js | 2 +- contract/tools/ui-kit-goals/queryKit.js | 6 ++- contract/tsconfig.json | 2 +- 9 files changed, 50 insertions(+), 54 deletions(-) diff --git a/contract/src/orca.proposal.js b/contract/src/orca.proposal.js index 3b79967..ea9aeb0 100644 --- a/contract/src/orca.proposal.js +++ b/contract/src/orca.proposal.js @@ -1,5 +1,4 @@ /* eslint-disable -- FIXME */ -// @ts-nocheck -- FIXME import { installContract, startContract, @@ -10,6 +9,9 @@ import { E } from '@endo/far'; /// /// +/** + * @import {AssetKind, Brand, Issuer, Purse} from '@agoric/ertp/src/types.js'; + */ const { Fail } = assert; @@ -47,9 +49,11 @@ export const startDaoContract = async (powers, config) => { chainTimerService, }, installation: { + // @ts-expect-error ORCA not known consume: { [contractName]: committee }, }, instance: { + // @ts-expect-error ORCA not known produce: { [contractName]: produceInstance }, }, } = powers; @@ -68,38 +72,28 @@ export const startDaoContract = async (powers, config) => { const storageNode = await E(mainNode).makeChildNode('state'); const marshaller = await E(board).getPublishingMarshaller(); - // const privateArgs = { - // storageNode, - // marshaller, - // }; - - const started = await startContract( - powers, - { - name: contractName, - startArgs: { - installation, - terms, - }, - issuerNames: [], - }, - // privateArgs - { - privateArgs: { - orchestration: await orchestration, - storageNode, - marshaller, - timer: await chainTimerService, - }, + const privateArgs = { + storageNode, + marshaller, + timer: await chainTimerService, + }; + + const started = await startContract(powers, { + name: contractName, + startArgs: { + installation, + terms, + privateArgs, }, - ); + issuerNames: [], + }); trace(contractName, '(re)started'); produceInstance.resolve(started.instance); }; // need more details on permit -/** @type { import("@agoric/vats/src/core/lib-boot").BootstrapManifestPermit } */ +/** @type { import("@agoric/vats/src/core/lib-boot.js").BootstrapManifestPermit } */ export const permit = harden({ consume: { agoricNames: true, diff --git a/contract/src/platform-goals/board-aux.core.js b/contract/src/platform-goals/board-aux.core.js index 0a885a6..ec896af 100644 --- a/contract/src/platform-goals/board-aux.core.js +++ b/contract/src/platform-goals/board-aux.core.js @@ -1,8 +1,12 @@ -// @ts-nocheck -- FIXME import { E, Far } from '@endo/far'; /// +/** + * @import {Marshaller, StorageNode} from '@agoric/internal/src/lib-chainStorage.js'; + * @import {Brand, Issuer, Purse} from '@agoric/ertp/src/types.js'; + */ + const { Fail } = assert; /** @@ -99,6 +103,7 @@ export const produceBoardAuxManager = async powers => { const { chainStorage } = powers.consume; /** @type {BoardAuxPowers['produce']} */ + // @ts-expect-error cast const produce = powers.produce; const mgr = makeBoardAuxManager(zone, marshalData, { board, chainStorage }); diff --git a/contract/src/platform-goals/start-contract.js b/contract/src/platform-goals/start-contract.js index 0d55a7b..e2f2774 100644 --- a/contract/src/platform-goals/start-contract.js +++ b/contract/src/platform-goals/start-contract.js @@ -1,10 +1,12 @@ /** @file utilities to start typical contracts in core eval scripts. */ -// @ts-nocheck -- FIXME import { E } from '@endo/far'; /// /// +/** + * @import {AssetKind, Brand, Issuer, Purse} from '@agoric/ertp/src/types.js'; + */ const { Fail } = assert; @@ -38,18 +40,15 @@ export const installContract = async ( * startArgs?: StartArgs; * issuerNames?: string[]; * }} opts - * @param {object} [privateArgs] * * @typedef {Partial>[0]>} StartArgs */ export const startContract = async ( powers, { name, startArgs, issuerNames }, - privateArgs, ) => { console.log('POWERS'); console.log(powers); - console.log(privateArgs); const { consume: { startUpgradable }, installation: { consume: consumeInstallation }, @@ -64,7 +63,6 @@ export const startContract = async ( ...startArgs, installation, label: name, - privateArgs, }); const { instance } = started; @@ -74,7 +72,7 @@ export const startContract = async ( console.log(name, 'started'); if (issuerNames) { - /** @type {BootstrapPowers & import('./board-aux.core').BoardAuxPowers} */ + /** @type {BootstrapPowers & import('./board-aux.core.js').BoardAuxPowers} */ // @ts-expect-error cast const auxPowers = powers; diff --git a/contract/src/platform-goals/start-governed-contract.js b/contract/src/platform-goals/start-governed-contract.js index 205c889..a822c77 100644 --- a/contract/src/platform-goals/start-governed-contract.js +++ b/contract/src/platform-goals/start-governed-contract.js @@ -1,4 +1,3 @@ -// @ts-nocheck -- FIXME import { E } from '@endo/far'; import { allValues, zip } from '../objectTools.js'; @@ -9,20 +8,11 @@ import { sanitizePathSegment } from './start-contract.js'; /** * @import {ERef} from '@endo/far'; * @import {GovernableStartFn, GovernanceFacetKit} from '@agoric/governance/src/types.js'; + * @import {StartParams, StartResult} from '@agoric/zoe/src/zoeService/utils.js'; */ const { values } = Object; -/** - * @template SF - * @typedef {import('@agoric/zoe/src/zoeService/utils').StartResult} StartResult - */ - -/** - * @template SF - * @typedef {import('@agoric/zoe/src/zoeService/utils').StartParams} StartParams - */ - /** * @typedef {StartResult< * typeof import('@agoric/governance/src/committee.js').start @@ -62,12 +52,12 @@ export const ParamTypes = /** @type {const} */ ({ * governedContractInstallation: ERef>; * issuerKeywordRecord?: IssuerKeywordRecord; * terms: Record; - * privateArgs: StartParams['privateArgs']; + * privateArgs: Parameters[1]; * label: string; * }} zoeArgs * @param {{ * governedParams: Record; - * timer: ERef; + * timer: ERef; * contractGovernor: ERef; * governorTerms: Record; * committeeCreatorFacet: CommitteeStart['creatorFacet']; @@ -152,7 +142,7 @@ export const startMyGovernedInstance = async ( /** * @param {*} creatorFacet - * @param {ERef} namesByAddress + * @param {ERef} namesByAddress * @param {Record} voterAddresses */ export const inviteToMyCharter = async ( @@ -183,11 +173,13 @@ export const startMyCharter = async (contractName, powers, config) => { const { consume: { namesByAddress, zoe }, + // @ts-expect-error space produce: { [`${charterName}Kit`]: produceKit }, installation: { consume: { binaryVoteCounter: counterP, econCommitteeCharter: installP }, }, instance: { + // @ts-expect-error space produce: { [charterName]: instanceP }, }, } = powers; @@ -232,11 +224,13 @@ export const startMyCommittee = async (contractName, powers, config) => { const committeeName = `${contractName}Committee`; const { consume: { board, chainStorage, namesByAddress, startUpgradable }, + // @ts-expect-error space produce: { [`${committeeName}Kit`]: produceKit }, installation: { consume: { committee }, }, instance: { + // @ts-expect-error space produce: { [committeeName]: produceInstance }, }, } = powers; diff --git a/contract/test/test-build-proposal.js b/contract/test/test-build-proposal.js index f7e5296..131ff3c 100644 --- a/contract/test/test-build-proposal.js +++ b/contract/test/test-build-proposal.js @@ -16,8 +16,7 @@ test.before(async t => { * @param {string} name of an _already cached_ bundle */ const compressBundle = async name => { - const rootPath = undefined; // not needed since bundle is already cached - const bundle = await bundleCache.load(rootPath, name); + const bundle = await bundleCache.load('', name); const fileContents = JSON.stringify(bundle); const buffer = Buffer.from(fileContents, 'utf-8'); const compressed = await promisify(gzip)(buffer); diff --git a/contract/test/test-orca-contract.js b/contract/test/test-orca-contract.js index 6d84984..723c81d 100644 --- a/contract/test/test-orca-contract.js +++ b/contract/test/test-orca-contract.js @@ -23,8 +23,10 @@ import { createRequire } from 'module'; const myRequire = createRequire(import.meta.url); const contractPath = myRequire.resolve(`../src/orca.contract.js`); -/** @type {import('ava').TestFn>>} */ -const test = anyTest; +const test = + /** @type {import('ava').TestFn>>} */ ( + anyTest + ); /** * Tests assume access to the zoe service and that contracts are bundled. diff --git a/contract/tools/ui-kit-goals/marshalTables.js b/contract/tools/ui-kit-goals/marshalTables.js index a5a0334..c365ee0 100644 --- a/contract/tools/ui-kit-goals/marshalTables.js +++ b/contract/tools/ui-kit-goals/marshalTables.js @@ -1,4 +1,3 @@ -// @ts-nocheck -- FIXME /** * @file marshal tools for vstorage clients * @@ -77,6 +76,7 @@ export const makeClientMarshaller = valToSlot => { }; const { convertValToSlot, convertSlotToVal } = makeTranslationTable( valToSlot || noNewSlots, + // @ts-expect-error null slots synthesizeRemotable, ); diff --git a/contract/tools/ui-kit-goals/queryKit.js b/contract/tools/ui-kit-goals/queryKit.js index 4fc578d..d97aa22 100644 --- a/contract/tools/ui-kit-goals/queryKit.js +++ b/contract/tools/ui-kit-goals/queryKit.js @@ -109,7 +109,11 @@ export const makeWalletView = (addr, { query, vstorage }) => { * @param {import('./batchQuery.js').VStorage} vstorage * @param {import('@endo/marshal').Marshal} [m] */ -export const makeQueryKit = (vstorage, m = makeClientMarshaller()) => { +export const makeQueryKit = ( + vstorage, + // @ts-expect-error null slots + m = makeClientMarshaller(), +) => { /** @param {['children' | 'data', string][]} paths */ const batchQuery = async paths => batchVstorageQuery(vstorage, m.fromCapData, paths); diff --git a/contract/tsconfig.json b/contract/tsconfig.json index 00591ef..25f9a15 100644 --- a/contract/tsconfig.json +++ b/contract/tsconfig.json @@ -5,7 +5,7 @@ "moduleResolution": "NodeNext", "lib": ["ESNext", "DOM"], "checkJs": true, - "strict": false, + "strict": true, "noImplicitAny": false, "useUnknownInCatchVariables": false, "esModuleInterop": true, From ba16d5383cb10f73978b6f606dd12d3aad79db7c Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Wed, 14 Aug 2024 15:58:38 -0400 Subject: [PATCH 09/12] style: tsconfig default format --- .prettierignore | 3 +++ contract/tsconfig.json | 14 +++++++++++--- ui/tsconfig.json | 11 +++++++++-- ui/tsconfig.node.json | 4 +++- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.prettierignore b/.prettierignore index cfa3415..c8a0748 100644 --- a/.prettierignore +++ b/.prettierignore @@ -9,3 +9,6 @@ compiled dist lcov-report public + +# VS Code has its own special formatting +tsconfig.json diff --git a/contract/tsconfig.json b/contract/tsconfig.json index 25f9a15..5ce20b8 100644 --- a/contract/tsconfig.json +++ b/contract/tsconfig.json @@ -3,7 +3,10 @@ "target": "ESNext", "module": "NodeNext", "moduleResolution": "NodeNext", - "lib": ["ESNext", "DOM"], + "lib": [ + "ESNext", + "DOM" + ], "checkJs": true, "strict": true, "noImplicitAny": false, @@ -14,6 +17,11 @@ "resolveJsonModule": true, "outDir": "./dist" }, - "include": ["src", "test"], - "exclude": ["node_modules"] + "include": [ + "src", + "test" + ], + "exclude": [ + "node_modules" + ] } diff --git a/ui/tsconfig.json b/ui/tsconfig.json index 390c3a2..c9c4a4e 100644 --- a/ui/tsconfig.json +++ b/ui/tsconfig.json @@ -2,7 +2,11 @@ "compilerOptions": { "target": "ES2020", "useDefineForClassFields": true, - "lib": ["ES2020", "DOM", "DOM.Iterable"], + "lib": [ + "ES2020", + "DOM", + "DOM.Iterable" + ], "module": "ESNext", "skipLibCheck": true, /* Bundler mode */ @@ -19,7 +23,10 @@ "noUnusedParameters": true, "noFallthroughCasesInSwitch": true }, - "include": ["src", "test"], + "include": [ + "src", + "test" + ], "references": [ { "path": "./tsconfig.node.json" diff --git a/ui/tsconfig.node.json b/ui/tsconfig.node.json index 97ede7e..c7a071e 100644 --- a/ui/tsconfig.node.json +++ b/ui/tsconfig.node.json @@ -7,5 +7,7 @@ "allowSyntheticDefaultImports": true, "strict": true }, - "include": ["vite.config.ts"] + "include": [ + "vite.config.ts" + ] } From 583773258a2228c2686c7b3e313a2eec1ec4101b Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Wed, 14 Aug 2024 16:02:24 -0400 Subject: [PATCH 10/12] build: remove obsolete patch-package yarn 4 has the ability built in. removing instead of porting the patches because their base versions aren't being used anymore --- package.json | 4 --- patches/@agoric+governance+0.10.4-u14.0.patch | 35 ------------------- patches/@agoric+vats+0.15.2-u12.0.patch | 16 --------- 3 files changed, 55 deletions(-) delete mode 100644 patches/@agoric+governance+0.10.4-u14.0.patch delete mode 100644 patches/@agoric+vats+0.15.2-u12.0.patch diff --git a/package.json b/package.json index 4931e45..672ffb2 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "@noble/hashes": "github:paulmillr/noble-hashes#ae060daa6252f3ff2aa2f84e887de0aab491281d" }, "scripts": { - "postinstall": "patch-package", "start:docker": "cd contract && docker compose up -d", "stop:docker": "cd contract && docker compose down", "docker:logs": "cd contract; docker compose logs --tail 200 -f", @@ -51,9 +50,6 @@ "test": "yarn workspaces foreach --all run test", "build": "yarn workspaces foreach --all run build" }, - "dependencies": { - "patch-package": "^8.0.0" - }, "devDependencies": { "prettier": "^3.3.3", "prettier-plugin-tailwindcss": "^0.5.11", diff --git a/patches/@agoric+governance+0.10.4-u14.0.patch b/patches/@agoric+governance+0.10.4-u14.0.patch deleted file mode 100644 index 250ef5a..0000000 --- a/patches/@agoric+governance+0.10.4-u14.0.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/node_modules/@agoric/governance/src/contractGovernance/governParam.js b/node_modules/@agoric/governance/src/contractGovernance/governParam.js -index c27c6d8..95af1b5 100644 ---- a/node_modules/@agoric/governance/src/contractGovernance/governParam.js -+++ b/node_modules/@agoric/governance/src/contractGovernance/governParam.js -@@ -133,11 +133,11 @@ const setupParamGovernance = ( - return negative; - }); - -- return { -+ return harden({ - outcomeOfUpdate, - instance: voteCounter, - details: E(counterPublicFacet).getDetails(), -- }; -+ }); - }; - - return Far('paramGovernor', { -diff --git a/node_modules/@agoric/governance/tools/puppetContractGovernor.js b/node_modules/@agoric/governance/tools/puppetContractGovernor.js -index 65fdda0..650f702 100644 ---- a/node_modules/@agoric/governance/tools/puppetContractGovernor.js -+++ b/node_modules/@agoric/governance/tools/puppetContractGovernor.js -@@ -38,8 +38,10 @@ export const start = async (zcf, privateArgs) => { - }, - } = zcf.getTerms(); - -- // in the fake there's no electionManager to augment the terms -- const augmentedTerms = contractTerms; -+ const augmentedTerms = { -+ ...contractTerms, -+ electionManager: zcf.getInstance(), -+ }; - - const { - creatorFacet: governedCF, diff --git a/patches/@agoric+vats+0.15.2-u12.0.patch b/patches/@agoric+vats+0.15.2-u12.0.patch deleted file mode 100644 index c023f55..0000000 --- a/patches/@agoric+vats+0.15.2-u12.0.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/node_modules/@agoric/vats/index.js b/node_modules/@agoric/vats/index.js -new file mode 100644 -index 0000000..05aabbc ---- /dev/null -+++ b/node_modules/@agoric/vats/index.js -@@ -0,0 +1,10 @@ -+// @ts-check -+// Ambient types -+import './src/core/types.js'; -+ -+// eslint-disable-next-line import/export -- no named exports -+export * from './src/types.js'; -+export * from './src/nameHub.js'; -+export * from './src/bridge.js'; -+export { makePromiseSpace } from './src/core/promise-space.js'; -+export { makeAgoricNamesAccess } from './src/core/utils.js'; From e3222517de4315388aad23a5cd1a13df61f5ff71 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Wed, 14 Aug 2024 16:03:23 -0400 Subject: [PATCH 11/12] fixup! style: tsconfig default format --- .prettierignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.prettierignore b/.prettierignore index c8a0748..9b0e861 100644 --- a/.prettierignore +++ b/.prettierignore @@ -11,4 +11,4 @@ lcov-report public # VS Code has its own special formatting -tsconfig.json +tsconfig.* From 509a23d0c1be869785dd306ab09d041abd718742 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Wed, 14 Aug 2024 16:05:17 -0400 Subject: [PATCH 12/12] fixup! build: remove obsolete patch-package --- yarn.lock | 150 +++--------------------------------------------------- 1 file changed, 7 insertions(+), 143 deletions(-) diff --git a/yarn.lock b/yarn.lock index 55f2950..e2abf90 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7992,13 +7992,6 @@ __metadata: languageName: node linkType: hard -"@yarnpkg/lockfile@npm:^1.1.0": - version: 1.1.0 - resolution: "@yarnpkg/lockfile@npm:1.1.0" - checksum: 10c0/0bfa50a3d756623d1f3409bc23f225a1d069424dbc77c6fd2f14fb377390cd57ec703dc70286e081c564be9051ead9ba85d81d66a3e68eeb6eb506d4e0c0fbda - languageName: node - linkType: hard - "abbrev@npm:^2.0.0": version: 2.0.0 resolution: "abbrev@npm:2.0.0" @@ -8497,13 +8490,6 @@ __metadata: languageName: node linkType: hard -"at-least-node@npm:^1.0.0": - version: 1.0.0 - resolution: "at-least-node@npm:1.0.0" - checksum: 10c0/4c058baf6df1bc5a1697cf182e2029c58cd99975288a13f9e70068ef5d6f4e1f1fd7c4d2c3c4912eae44797d1725be9700995736deca441b39f3e66d8dee97ef - languageName: node - linkType: hard - "atomic-sleep@npm:^1.0.0": version: 1.0.0 resolution: "atomic-sleep@npm:1.0.0" @@ -9126,7 +9112,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2": +"chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.1": version: 4.1.2 resolution: "chalk@npm:4.1.2" dependencies: @@ -9197,7 +9183,7 @@ __metadata: languageName: node linkType: hard -"ci-info@npm:^3.7.0, ci-info@npm:^3.8.0": +"ci-info@npm:^3.8.0": version: 3.9.0 resolution: "ci-info@npm:3.9.0" checksum: 10c0/6f0109e36e111684291d46123d491bc4e7b7a1934c3a20dea28cba89f1d4a03acd892f5f6a81ed3855c38647e285a150e3c9ba062e38943bef57fee6c1554c3a @@ -9847,7 +9833,6 @@ __metadata: version: 0.0.0-use.local resolution: "dapp-agoric-orca@workspace:." dependencies: - patch-package: "npm:^8.0.0" prettier: "npm:^3.3.3" prettier-plugin-tailwindcss: "npm:^0.5.11" typescript: "npm:^5.5.2" @@ -11451,15 +11436,6 @@ __metadata: languageName: node linkType: hard -"find-yarn-workspace-root@npm:^2.0.0": - version: 2.0.0 - resolution: "find-yarn-workspace-root@npm:2.0.0" - dependencies: - micromatch: "npm:^4.0.2" - checksum: 10c0/b0d3843013fbdaf4e57140e0165889d09fa61745c9e85da2af86e54974f4cc9f1967e40f0d8fc36a79d53091f0829c651d06607d552582e53976f3cd8f4e5689 - languageName: node - linkType: hard - "flat-cache@npm:^3.0.4": version: 3.2.0 resolution: "flat-cache@npm:3.2.0" @@ -11539,18 +11515,6 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^9.0.0": - version: 9.1.0 - resolution: "fs-extra@npm:9.1.0" - dependencies: - at-least-node: "npm:^1.0.0" - graceful-fs: "npm:^4.2.0" - jsonfile: "npm:^6.0.1" - universalify: "npm:^2.0.0" - checksum: 10c0/9b808bd884beff5cb940773018179a6b94a966381d005479f00adda6b44e5e3d4abf765135773d849cc27efe68c349e4a7b86acd7d3306d5932c14f3a4b17a92 - languageName: node - linkType: hard - "fs-minipass@npm:^2.0.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" @@ -11831,7 +11795,7 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.6": +"graceful-fs@npm:^4.2.6": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: 10c0/386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2 @@ -12340,15 +12304,6 @@ __metadata: languageName: node linkType: hard -"is-docker@npm:^2.0.0": - version: 2.2.1 - resolution: "is-docker@npm:2.2.1" - bin: - is-docker: cli.js - checksum: 10c0/e828365958d155f90c409cdbe958f64051d99e8aedc2c8c4cd7c89dcf35329daed42f7b99346f7828df013e27deb8f721cf9408ba878c76eb9e8290235fbcdcc - languageName: node - linkType: hard - "is-docker@npm:^3.0.0": version: 3.0.0 resolution: "is-docker@npm:3.0.0" @@ -12629,15 +12584,6 @@ __metadata: languageName: node linkType: hard -"is-wsl@npm:^2.1.1": - version: 2.2.0 - resolution: "is-wsl@npm:2.2.0" - dependencies: - is-docker: "npm:^2.0.0" - checksum: 10c0/a6fa2d370d21be487c0165c7a440d567274fbba1a817f2f0bfa41cc5e3af25041d84267baa22df66696956038a43973e72fca117918c91431920bdef490fa25e - languageName: node - linkType: hard - "is-wsl@npm:^3.1.0": version: 3.1.0 resolution: "is-wsl@npm:3.1.0" @@ -12912,7 +12858,7 @@ __metadata: languageName: node linkType: hard -"json-stable-stringify@npm:^1.0.1, json-stable-stringify@npm:^1.0.2": +"json-stable-stringify@npm:^1.0.1": version: 1.1.1 resolution: "json-stable-stringify@npm:1.1.1" dependencies: @@ -12958,19 +12904,6 @@ __metadata: languageName: node linkType: hard -"jsonfile@npm:^6.0.1": - version: 6.1.0 - resolution: "jsonfile@npm:6.1.0" - dependencies: - graceful-fs: "npm:^4.1.6" - universalify: "npm:^2.0.0" - dependenciesMeta: - graceful-fs: - optional: true - checksum: 10c0/4f95b5e8a5622b1e9e8f33c96b7ef3158122f595998114d1e7f03985649ea99cb3cd99ce1ed1831ae94c8c8543ab45ebd044207612f31a56fd08462140e46865 - languageName: node - linkType: hard - "jsonify@npm:^0.0.1": version: 0.0.1 resolution: "jsonify@npm:0.0.1" @@ -13029,15 +12962,6 @@ __metadata: languageName: node linkType: hard -"klaw-sync@npm:^6.0.0": - version: 6.0.0 - resolution: "klaw-sync@npm:6.0.0" - dependencies: - graceful-fs: "npm:^4.1.11" - checksum: 10c0/00d8e4c48d0d699b743b3b028e807295ea0b225caf6179f51029e19783a93ad8bb9bccde617d169659fbe99559d73fb35f796214de031d0023c26b906cecd70a - languageName: node - linkType: hard - "koalas@npm:^1.0.2": version: 1.0.2 resolution: "koalas@npm:1.0.2" @@ -13740,7 +13664,7 @@ __metadata: languageName: node linkType: hard -"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5": +"micromatch@npm:^4.0.4, micromatch@npm:^4.0.5": version: 4.0.5 resolution: "micromatch@npm:4.0.5" dependencies: @@ -14475,16 +14399,6 @@ __metadata: languageName: node linkType: hard -"open@npm:^7.4.2": - version: 7.4.2 - resolution: "open@npm:7.4.2" - dependencies: - is-docker: "npm:^2.0.0" - is-wsl: "npm:^2.1.1" - checksum: 10c0/77573a6a68f7364f3a19a4c80492712720746b63680ee304555112605ead196afe91052bd3c3d165efdf4e9d04d255e87de0d0a77acec11ef47fd5261251813f - languageName: node - linkType: hard - "opener@npm:^1.5.2": version: 1.5.2 resolution: "opener@npm:1.5.2" @@ -14677,31 +14591,6 @@ __metadata: languageName: node linkType: hard -"patch-package@npm:^8.0.0": - version: 8.0.0 - resolution: "patch-package@npm:8.0.0" - dependencies: - "@yarnpkg/lockfile": "npm:^1.1.0" - chalk: "npm:^4.1.2" - ci-info: "npm:^3.7.0" - cross-spawn: "npm:^7.0.3" - find-yarn-workspace-root: "npm:^2.0.0" - fs-extra: "npm:^9.0.0" - json-stable-stringify: "npm:^1.0.2" - klaw-sync: "npm:^6.0.0" - minimist: "npm:^1.2.6" - open: "npm:^7.4.2" - rimraf: "npm:^2.6.3" - semver: "npm:^7.5.3" - slash: "npm:^2.0.0" - tmp: "npm:^0.0.33" - yaml: "npm:^2.2.2" - bin: - patch-package: index.js - checksum: 10c0/690eab0537e953a3fd7d32bb23f0e82f97cd448f8244c3227ed55933611a126f9476397325c06ad2c11d881a19b427a02bd1881bee78d89f1731373fc4fe0fee - languageName: node - linkType: hard - "path-exists@npm:^4.0.0": version: 4.0.0 resolution: "path-exists@npm:4.0.0" @@ -15666,17 +15555,6 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:^2.6.3": - version: 2.7.1 - resolution: "rimraf@npm:2.7.1" - dependencies: - glob: "npm:^7.1.3" - bin: - rimraf: ./bin.js - checksum: 10c0/4eef73d406c6940927479a3a9dee551e14a54faf54b31ef861250ac815172bade86cc6f7d64a4dc5e98b65e4b18a2e1c9ff3b68d296be0c748413f092bb0dd40 - languageName: node - linkType: hard - "rimraf@npm:^3.0.2": version: 3.0.2 resolution: "rimraf@npm:3.0.2" @@ -15962,7 +15840,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.5.0, semver@npm:^7.5.3, semver@npm:^7.5.4": +"semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.5.0, semver@npm:^7.5.4": version: 7.6.0 resolution: "semver@npm:7.6.0" dependencies: @@ -16114,13 +15992,6 @@ __metadata: languageName: node linkType: hard -"slash@npm:^2.0.0": - version: 2.0.0 - resolution: "slash@npm:2.0.0" - checksum: 10c0/f83dbd3cb62c41bb8fcbbc6bf5473f3234b97fa1d008f571710a9d3757a28c7169e1811cad1554ccb1cc531460b3d221c9a7b37f549398d9a30707f0a5af9193 - languageName: node - linkType: hard - "slash@npm:^3.0.0": version: 3.0.0 resolution: "slash@npm:3.0.0" @@ -17152,13 +17023,6 @@ __metadata: languageName: node linkType: hard -"universalify@npm:^2.0.0": - version: 2.0.1 - resolution: "universalify@npm:2.0.1" - checksum: 10c0/73e8ee3809041ca8b818efb141801a1004e3fc0002727f1531f4de613ea281b494a40909596dae4a042a4fb6cd385af5d4db2e137b1362e0e91384b828effd3a - languageName: node - linkType: hard - "unstorage@npm:^1.9.0": version: 1.10.2 resolution: "unstorage@npm:1.10.2" @@ -17680,7 +17544,7 @@ __metadata: languageName: node linkType: hard -"yaml@npm:^2.2.2, yaml@npm:^2.3.4": +"yaml@npm:^2.3.4": version: 2.4.1 resolution: "yaml@npm:2.4.1" bin: