diff --git a/multichain-testing/.gitignore b/multichain-testing/.gitignore index 0271cf6ebd50..2cd9af368781 100644 --- a/multichain-testing/.gitignore +++ b/multichain-testing/.gitignore @@ -1,2 +1,3 @@ .tsimp -.yarn +.yarn/* +!.yarn/patches/* diff --git a/multichain-testing/patches/js-yaml+4.1.0.patch b/multichain-testing/.yarn/patches/js-yaml-npm-4.1.0-3606f32312.patch similarity index 70% rename from multichain-testing/patches/js-yaml+4.1.0.patch rename to multichain-testing/.yarn/patches/js-yaml-npm-4.1.0-3606f32312.patch index 8f5df5772e9e..a575f1f27ede 100644 --- a/multichain-testing/patches/js-yaml+4.1.0.patch +++ b/multichain-testing/.yarn/patches/js-yaml-npm-4.1.0-3606f32312.patch @@ -1,7 +1,7 @@ -diff --git a/node_modules/js-yaml/lib/exception.js b/node_modules/js-yaml/lib/exception.js -index 7f62daa..8d60657 100644 ---- a/node_modules/js-yaml/lib/exception.js -+++ b/node_modules/js-yaml/lib/exception.js +diff --git a/lib/exception.js b/lib/exception.js +index 7f62daaef8bcdb8248da0fd65e7b2880a5c1cf92..b057a914926cf84601aee2fa6e8fe8b98c441935 100644 +--- a/lib/exception.js ++++ b/lib/exception.js @@ -26,7 +26,6 @@ function YAMLException(reason, mark) { // Super constructor Error.call(this); @@ -10,16 +10,10 @@ index 7f62daa..8d60657 100644 this.reason = reason; this.mark = mark; this.message = formatError(this, false); -@@ -37,19 +36,34 @@ function YAMLException(reason, mark) { - Error.captureStackTrace(this, this.constructor); - } else { - // FF, IE 10+ and Safari 6+. Fallback for others -- this.stack = (new Error()).stack || ''; -+ this.stack = new Error().stack || ""; - } +@@ -42,14 +41,31 @@ function YAMLException(reason, mark) { } -- + -// Inherit from Error -YAMLException.prototype = Object.create(Error.prototype); -YAMLException.prototype.constructor = YAMLException; @@ -28,7 +22,6 @@ index 7f62daa..8d60657 100644 -YAMLException.prototype.toString = function toString(compact) { - return this.name + ': ' + formatError(this, compact); -}; -- +function makeErrorish(errorConstructor, name) { + errorConstructor.prototype = Object.create(Error.prototype, { + constructor: { @@ -55,4 +48,5 @@ index 7f62daa..8d60657 100644 +} +makeErrorish(YAMLException, "YAMLException"); + module.exports = YAMLException; diff --git a/multichain-testing/patches/node-fetch+2.6.12.patch b/multichain-testing/.yarn/patches/node-fetch-npm-2.6.12-48619ce9d6.patch similarity index 65% rename from multichain-testing/patches/node-fetch+2.6.12.patch rename to multichain-testing/.yarn/patches/node-fetch-npm-2.6.12-48619ce9d6.patch index 605f5d181d4b..6534bf28bac9 100644 --- a/multichain-testing/patches/node-fetch+2.6.12.patch +++ b/multichain-testing/.yarn/patches/node-fetch-npm-2.6.12-48619ce9d6.patch @@ -1,13 +1,8 @@ -diff --git a/node_modules/node-fetch/lib/index.js b/node_modules/node-fetch/lib/index.js -index 087f2a0..6778549 100644 ---- a/node_modules/node-fetch/lib/index.js -+++ b/node_modules/node-fetch/lib/index.js -@@ -1,3 +1,4 @@ -+// @ts-nocheck - 'use strict'; - - Object.defineProperty(exports, '__esModule', { value: true }); -@@ -154,9 +155,23 @@ function FetchError(message, type, systemError) { +diff --git a/lib/index.js b/lib/index.js +index 087f2a09f85e03beaee767b2d2a8a98745e4ae5f..445d1eae0b57e61f03f730fc90055102cd6f4563 100644 +--- a/lib/index.js ++++ b/lib/index.js +@@ -154,9 +154,23 @@ function FetchError(message, type, systemError) { Error.captureStackTrace(this, this.constructor); } @@ -34,11 +29,10 @@ index 087f2a0..6778549 100644 let convert; try { -@@ -1400,10 +1415,7 @@ function AbortError(message) { - // hide custom error implementation details from end-users +@@ -1401,9 +1415,7 @@ function AbortError(message) { Error.captureStackTrace(this, this.constructor); } -- + -AbortError.prototype = Object.create(Error.prototype); -AbortError.prototype.constructor = AbortError; -AbortError.prototype.name = 'AbortError'; diff --git a/multichain-testing/patches/starshipjs+2.0.0.patch b/multichain-testing/.yarn/patches/starshipjs-npm-2.0.0-d34bc8a5f1.patch similarity index 91% rename from multichain-testing/patches/starshipjs+2.0.0.patch rename to multichain-testing/.yarn/patches/starshipjs-npm-2.0.0-d34bc8a5f1.patch index d8c2ab9a825e..07471bee3899 100644 --- a/multichain-testing/patches/starshipjs+2.0.0.patch +++ b/multichain-testing/.yarn/patches/starshipjs-npm-2.0.0-d34bc8a5f1.patch @@ -1,7 +1,7 @@ -diff --git a/node_modules/starshipjs/hooks.js b/node_modules/starshipjs/hooks.js -index fb3e3cf..6b6567b 100644 ---- a/node_modules/starshipjs/hooks.js -+++ b/node_modules/starshipjs/hooks.js +diff --git a/hooks.js b/hooks.js +index fb3e3cfde62a5c562564a5ab0250ecd12551fd94..6b6567bb081208b9e977edc0d97c39648b234911 100644 +--- a/hooks.js ++++ b/hooks.js @@ -14,7 +14,7 @@ const useRegistry = async (configFile) => { const registryUrl = `http://localhost:${config.registry.ports.rest}`; const urls = []; diff --git a/multichain-testing/package.json b/multichain-testing/package.json index dcabbd27a220..d086639e3f83 100644 --- a/multichain-testing/package.json +++ b/multichain-testing/package.json @@ -33,12 +33,15 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.1.3", "prettier": "^3.2.4", - "starshipjs": "2.0.0", + "starshipjs": "patch:starshipjs@npm%3A2.0.0#~/.yarn/patches/starshipjs-npm-2.0.0-d34bc8a5f1.patch", "tsimp": "^2.0.10", "typescript": "^5.5.0-beta" }, "resolutions": { - "node-fetch": "2.6.12" + "node-fetch": "2.6.12", + "node-fetch@npm:^2.6.12": "patch:node-fetch@npm%3A2.6.12#~/.yarn/patches/node-fetch-npm-2.6.12-48619ce9d6.patch", + "js-yaml@npm:^4.1.0": "patch:js-yaml@npm%3A4.1.0#~/.yarn/patches/js-yaml-npm-4.1.0-3606f32312.patch", + "js-yaml@npm:^3.14.1": "patch:js-yaml@npm%3A4.1.0#~/.yarn/patches/js-yaml-npm-4.1.0-3606f32312.patch" }, "ava": { "extensions": { diff --git a/multichain-testing/yarn.lock b/multichain-testing/yarn.lock index 20c99cf99100..dfae3facb796 100644 --- a/multichain-testing/yarn.lock +++ b/multichain-testing/yarn.lock @@ -868,15 +868,6 @@ __metadata: languageName: node linkType: hard -"argparse@npm:^1.0.7": - version: 1.0.10 - resolution: "argparse@npm:1.0.10" - dependencies: - sprintf-js: "npm:~1.0.2" - checksum: 10c0/b2972c5c23c63df66bca144dbc65d180efa74f25f8fd9b7d9a0a6c88ae839db32df3d54770dcb6460cf840d232b60695d1a6b1053f599d84e73f7437087712de - languageName: node - linkType: hard - "argparse@npm:^2.0.1": version: 2.0.1 resolution: "argparse@npm:2.0.1" @@ -1636,16 +1627,6 @@ __metadata: languageName: node linkType: hard -"esprima@npm:^4.0.0": - version: 4.0.1 - resolution: "esprima@npm:4.0.1" - bin: - esparse: ./bin/esparse.js - esvalidate: ./bin/esvalidate.js - checksum: 10c0/ad4bab9ead0808cf56501750fd9d3fb276f6b105f987707d059005d57e182d18a7c9ec7f3a01794ebddcca676773e42ca48a32d67a250c9d35e009ca613caba3 - languageName: node - linkType: hard - "esquery@npm:^1.4.2": version: 1.5.0 resolution: "esquery@npm:1.5.0" @@ -2334,26 +2315,25 @@ __metadata: languageName: node linkType: hard -"js-yaml@npm:^3.14.1": - version: 3.14.1 - resolution: "js-yaml@npm:3.14.1" +"js-yaml@npm:4.1.0": + version: 4.1.0 + resolution: "js-yaml@npm:4.1.0" dependencies: - argparse: "npm:^1.0.7" - esprima: "npm:^4.0.0" + argparse: "npm:^2.0.1" bin: js-yaml: bin/js-yaml.js - checksum: 10c0/6746baaaeac312c4db8e75fa22331d9a04cccb7792d126ed8ce6a0bbcfef0cedaddd0c5098fade53db067c09fe00aa1c957674b4765610a8b06a5a189e46433b + checksum: 10c0/184a24b4eaacfce40ad9074c64fd42ac83cf74d8c8cd137718d456ced75051229e5061b8633c3366b8aada17945a7a356b337828c19da92b51ae62126575018f languageName: node linkType: hard -"js-yaml@npm:^4.1.0": +"js-yaml@patch:js-yaml@npm%3A4.1.0#~/.yarn/patches/js-yaml-npm-4.1.0-3606f32312.patch": version: 4.1.0 - resolution: "js-yaml@npm:4.1.0" + resolution: "js-yaml@patch:js-yaml@npm%3A4.1.0#~/.yarn/patches/js-yaml-npm-4.1.0-3606f32312.patch::version=4.1.0&hash=e4dd10" dependencies: argparse: "npm:^2.0.1" bin: js-yaml: bin/js-yaml.js - checksum: 10c0/184a24b4eaacfce40ad9074c64fd42ac83cf74d8c8cd137718d456ced75051229e5061b8633c3366b8aada17945a7a356b337828c19da92b51ae62126575018f + checksum: 10c0/449bbf40905871151850e2519b4884326fd2df77b8f3798125ec4ad6efc33835500e6f4da07f2b1bc690e4150e35265e4161055890a3656d96c86a39651a0e4a languageName: node linkType: hard @@ -3221,7 +3201,7 @@ __metadata: eslint-config-prettier: "npm:^9.1.0" eslint-plugin-prettier: "npm:^5.1.3" prettier: "npm:^3.2.4" - starshipjs: "npm:2.0.0" + starshipjs: "patch:starshipjs@npm%3A2.0.0#~/.yarn/patches/starshipjs-npm-2.0.0-d34bc8a5f1.patch" tsimp: "npm:^2.0.10" typescript: "npm:^5.5.0-beta" languageName: unknown @@ -3389,13 +3369,6 @@ __metadata: languageName: node linkType: hard -"sprintf-js@npm:~1.0.2": - version: 1.0.3 - resolution: "sprintf-js@npm:1.0.3" - checksum: 10c0/ecadcfe4c771890140da5023d43e190b7566d9cf8b2d238600f31bec0fc653f328da4450eb04bd59a431771a8e9cc0e118f0aa3974b683a4981b4e07abc2a5bb - languageName: node - linkType: hard - "ssri@npm:^10.0.0": version: 10.0.6 resolution: "ssri@npm:10.0.6" @@ -3425,6 +3398,17 @@ __metadata: languageName: node linkType: hard +"starshipjs@patch:starshipjs@npm%3A2.0.0#~/.yarn/patches/starshipjs-npm-2.0.0-d34bc8a5f1.patch": + version: 2.0.0 + resolution: "starshipjs@patch:starshipjs@npm%3A2.0.0#~/.yarn/patches/starshipjs-npm-2.0.0-d34bc8a5f1.patch::version=2.0.0&hash=54f324" + dependencies: + "@chain-registry/client": "npm:1.18.1" + js-yaml: "npm:^4.1.0" + node-fetch: "npm:^2.6.9" + checksum: 10c0/af5f3a11212e4be338c512ebf75d0f9f0032e39496ecb921669f87de7fbf7a3d3ec155fdd787e8e4796c0b97ddae6e921463be9f952f081a180ef6752d6a68b7 + languageName: node + linkType: hard + "string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3"