From 03243d40cbca24108a2b44c67d059191eb70268f Mon Sep 17 00:00:00 2001 From: Pavel Ivanov Date: Fri, 26 Jul 2024 09:37:35 +0300 Subject: [PATCH] [fix] - allow using npm or yarn --- .gitignore | 2 +- .npmrc | 2 + package.json | 8 +-- packages/mintbase-wallet/package.json | 6 +- yarn.lock | 88 ++++++++++++++------------- 5 files changed, 52 insertions(+), 54 deletions(-) create mode 100644 .npmrc diff --git a/.gitignore b/.gitignore index 5a70acc62..78457613f 100644 --- a/.gitignore +++ b/.gitignore @@ -44,7 +44,7 @@ testem.log Thumbs.db .angular -.npmrc +package-lock.json # Next.js .next diff --git a/.npmrc b/.npmrc new file mode 100644 index 000000000..1b78f1c6f --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +save-exact=true +legacy-peer-deps=true diff --git a/package.json b/package.json index 2a80ec212..b63032a06 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,6 @@ { "name": "near-wallet-selector", "version": "8.9.11", - "private": true, "description": "NEAR Wallet Selector makes it easy for users to interact with your dApp by providing an abstraction over various wallets within the NEAR ecosystem", "keywords": [ "near", @@ -42,10 +41,6 @@ "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "types": "./lib/esm/index.d.ts", - "workspaces": [ - "packages/*", - "examples/*" - ], "scripts": { "build:account-export": "nx run-many --target=build --projects=account-export --configuration=production", "build:all": "nx run-many --target=build --all --exclude=react,angular --configuration=production && node ./scripts/update-package-json.js", @@ -101,8 +96,8 @@ "@ledgerhq/hw-transport-webhid": "6.28.6", "@metamask/detect-provider": "2.0.0", "@meteorwallet/sdk": "1.0.9", + "@mintbase-js/wallet": "0.6.0-beta.10", "@near-snap/sdk": "0.6.0", - "@near-wallet-selector/wallet-utils": "workspace:latest", "@noble/ciphers": "0.5.3", "@noble/hashes": "1.4.0", "@peersyst/near-mobile-signer": "1.0.12", @@ -152,6 +147,7 @@ "@angular/compiler-cli": "16.1.8", "@angular/language-service": "15.2.9", "@babel/preset-react": "7.16.7", + "@babel/runtime": "7.24.8", "@nrwl/js": "16.0.0", "@nrwl/rollup": "16.0.0", "@nrwl/tao": "16.0.0", diff --git a/packages/mintbase-wallet/package.json b/packages/mintbase-wallet/package.json index 6d99be9e3..2f1ec15f3 100644 --- a/packages/mintbase-wallet/package.json +++ b/packages/mintbase-wallet/package.json @@ -20,9 +20,5 @@ "bugs": { "url": "https://github.com/near/wallet-selector/issues" }, - "homepage": "https://github.com/near/wallet-selector/tree/main/packages/mintbase-wallet", - "dependencies": { - "@mintbase-js/wallet": "0.6.0-beta.7", - "@near-wallet-selector/wallet-utils": "workspace:latest" - } + "homepage": "https://github.com/near/wallet-selector/tree/main/packages/mintbase-wallet" } diff --git a/yarn.lock b/yarn.lock index 088a0f4ce..904263775 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2430,6 +2430,13 @@ dependencies: regenerator-runtime "^0.13.11" +"@babel/runtime@7.24.8", "@babel/runtime@^7.23.2": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.8.tgz#5d958c3827b13cc6d05e038c07fb2e5e3420d82e" + integrity sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA== + dependencies: + regenerator-runtime "^0.14.0" + "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.8", "@babel/runtime@^7.18.9", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12" @@ -2451,13 +2458,6 @@ dependencies: regenerator-runtime "^0.14.0" -"@babel/runtime@^7.23.2": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.8.tgz#5d958c3827b13cc6d05e038c07fb2e5e3420d82e" - integrity sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA== - dependencies: - regenerator-runtime "^0.14.0" - "@babel/template@7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec" @@ -4031,15 +4031,14 @@ nanoid "3.3.6" query-string "^7.1.3" -"@mintbase-js/wallet@0.6.0-beta.7": - version "0.6.0-beta.7" - resolved "https://registry.yarnpkg.com/@mintbase-js/wallet/-/wallet-0.6.0-beta.7.tgz#5d2ab3a03889624873f15a276652e6d5a3d77fb1" - integrity sha512-Trp7WJucfG0j3QLZFw1rcT3H1zp3doOM3ap1i+LiH1l9mK3F52c/K0sgbemSAAv7oglqvJqDD8N660TUQlsFgQ== +"@mintbase-js/wallet@0.6.0-beta.10": + version "0.6.0-beta.10" + resolved "https://registry.yarnpkg.com/@mintbase-js/wallet/-/wallet-0.6.0-beta.10.tgz#26a6ef1d9a46c117dc4389441b2f780c292afd43" + integrity sha512-i0U5cGLu7WySdfzOPlPO+eN/iQlVaPWo0E12UPWFNjAUrn76WJFvHM0RDHZYg9p+Ex5VTp2lU0vkJu6KtJO9Tw== dependencies: - "@near-wallet-selector/core" "8.9.5" "@near-wallet-selector/wallet-utils" "^8.9.5" bn.js "^5.2.1" - near-api-js "^2.1.3" + near-api-js "^3.0.0" "@mischnic/json-sourcemap@^0.1.0": version "0.1.1" @@ -4554,7 +4553,7 @@ dependencies: "@near-wallet-selector/core" "^8.2.0" -"@near-wallet-selector/core@8.9.10": +"@near-wallet-selector/core@8.9.10", "@near-wallet-selector/core@^8.2.0": version "8.9.10" resolved "https://registry.yarnpkg.com/@near-wallet-selector/core/-/core-8.9.10.tgz#0e19b22bbe69208c9e82b149682be37f6f9b76c5" integrity sha512-do+DDahRHPzr5VKiFS7NWKyNbspXu64/w7CuSBi8IUDsDsclmV7Os6Hp5HcVAq+X3Whi//NxKGX6mPMb+SRPqw== @@ -4564,17 +4563,7 @@ js-sha256 "0.9.0" rxjs "7.8.1" -"@near-wallet-selector/core@8.9.5": - version "8.9.5" - resolved "https://registry.yarnpkg.com/@near-wallet-selector/core/-/core-8.9.5.tgz#15e49f17252ee4e54a1c9719b8c2b98fd71aae74" - integrity sha512-wJiCL8M7z6tkNMY5H4n63/SZCmlW0Z15H6R1biWgpRuMDlVjhQOzxrmQggb1jbK4nYkzXyARNKyPh2gcRUuS+w== - dependencies: - borsh "0.7.0" - events "3.3.0" - js-sha256 "0.9.0" - rxjs "7.8.1" - -"@near-wallet-selector/wallet-utils@workspace:latest": +"@near-wallet-selector/wallet-utils@^8.9.5": version "8.9.10" resolved "https://registry.yarnpkg.com/@near-wallet-selector/wallet-utils/-/wallet-utils-8.9.10.tgz#1e6d97464d995cccb4ec34314a1dd90e63901c39" integrity sha512-Jq00IUAMvltaH8lvkaI8SRP6JWhqE4c0427ODSv+X10NwlkM8WKul9ZNZMxeCTC2ncZH23kDyaA+3MiYTX+DUg== @@ -10363,21 +10352,11 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001599, caniuse-lite@^1.0.30001640: - version "1.0.30001641" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001641.tgz#3572862cd18befae3f637f2a1101cc033c6782ac" - integrity sha512-Phv5thgl67bHYo1TtMY/MurjkHhV4EDaCosezRXgZ8jzA/Ub+wjxAvbGvjoFENStinwi5kCyOYV3mi5tOGykwA== - -caniuse-lite@^1.0.30001464: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001503, caniuse-lite@^1.0.30001599, caniuse-lite@^1.0.30001640: version "1.0.30001643" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz#9c004caef315de9452ab970c3da71085f8241dbd" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz" integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg== -caniuse-lite@^1.0.30001503: - version "1.0.30001507" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001507.tgz#fae53f6286e7564783eadea9b447819410a59534" - integrity sha512-SFpUDoSLCaE5XYL2jfqe9ova/pbQHEmbheDf5r4diNwbAgR3qxM9NQtfsiSscjqoya5K7kFcHPUQ+VsUkIJR4A== - capability@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/capability/-/capability-0.2.5.tgz#51ad87353f1936ffd77f2f21c74633a4dea88801" @@ -17928,7 +17907,7 @@ near-api-js@4.0.3: near-abi "0.1.1" node-fetch "2.6.7" -near-api-js@^2.1.1, near-api-js@^2.1.3: +near-api-js@^2.1.1: version "2.1.4" resolved "https://registry.yarnpkg.com/near-api-js/-/near-api-js-2.1.4.tgz#562bb7047bf3699fbdf78f9a6620366069ad7cd9" integrity sha512-e1XicyvJvQMtu7qrG8oWyAdjHJJCoy+cvbW6h2Dky4yj7vC85omQz/x7IgKl71VhzDj2/TGUwjTVESp6NSe75A== @@ -17955,7 +17934,7 @@ near-api-js@^2.1.1, near-api-js@^2.1.3: node-fetch "^2.6.1" tweetnacl "^1.0.1" -near-api-js@^3.0.1: +near-api-js@^3.0.0, near-api-js@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/near-api-js/-/near-api-js-3.0.4.tgz#5ee094ce53e30239cc817ca942ec3e9739296dbb" integrity sha512-qKWjnugoB7kSFhzZ5GXyH/eABspCQYWBmWnM4hpV5ctnQBt89LqgEu9yD1z4sa89MvUu8BuCxwb1m00BE8iofg== @@ -21961,7 +21940,16 @@ string-range@~1.2, string-range@~1.2.1: resolved "https://registry.yarnpkg.com/string-range/-/string-range-1.2.2.tgz#a893ed347e72299bc83befbbf2a692a8d239d5dd" integrity sha512-tYft6IFi8SjplJpxCUxyqisD3b+R2CSkomrtJYCkvuf1KuCAWgz7YXt4O0jip7efpfCemwHEzTEAO8EuOYgh3w== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -22060,7 +22048,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -23868,7 +23863,7 @@ wordwrap@^1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -23886,6 +23881,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"