Skip to content

Commit 985dd3e

Browse files
authored
Merge pull request #1146 from LimeChain/fix-allow-using-npm-or-yarn
chore: [fix] - allow using npm or yarn
2 parents 49e2ce1 + 03243d4 commit 985dd3e

File tree

5 files changed

+52
-54
lines changed

5 files changed

+52
-54
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ testem.log
4444
Thumbs.db
4545

4646
.angular
47-
.npmrc
47+
package-lock.json
4848

4949
# Next.js
5050
.next

.npmrc

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
save-exact=true
2+
legacy-peer-deps=true

package.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "near-wallet-selector",
33
"version": "8.9.11",
4-
"private": true,
54
"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",
65
"keywords": [
76
"near",
@@ -42,10 +41,6 @@
4241
"main": "./lib/cjs/index.js",
4342
"module": "./lib/esm/index.js",
4443
"types": "./lib/esm/index.d.ts",
45-
"workspaces": [
46-
"packages/*",
47-
"examples/*"
48-
],
4944
"scripts": {
5045
"build:account-export": "nx run-many --target=build --projects=account-export --configuration=production",
5146
"build:all": "nx run-many --target=build --all --exclude=react,angular --configuration=production && node ./scripts/update-package-json.js",
@@ -101,8 +96,8 @@
10196
"@ledgerhq/hw-transport-webhid": "6.28.6",
10297
"@metamask/detect-provider": "2.0.0",
10398
"@meteorwallet/sdk": "1.0.9",
99+
"@mintbase-js/wallet": "0.6.0-beta.10",
104100
"@near-snap/sdk": "0.6.0",
105-
"@near-wallet-selector/wallet-utils": "workspace:latest",
106101
"@noble/ciphers": "0.5.3",
107102
"@noble/hashes": "1.4.0",
108103
"@peersyst/near-mobile-signer": "1.0.12",
@@ -152,6 +147,7 @@
152147
"@angular/compiler-cli": "16.1.8",
153148
"@angular/language-service": "15.2.9",
154149
"@babel/preset-react": "7.16.7",
150+
"@babel/runtime": "7.24.8",
155151
"@nrwl/js": "16.0.0",
156152
"@nrwl/rollup": "16.0.0",
157153
"@nrwl/tao": "16.0.0",

packages/mintbase-wallet/package.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,5 @@
2020
"bugs": {
2121
"url": "https://github.com/near/wallet-selector/issues"
2222
},
23-
"homepage": "https://github.com/near/wallet-selector/tree/main/packages/mintbase-wallet",
24-
"dependencies": {
25-
"@mintbase-js/wallet": "0.6.0-beta.7",
26-
"@near-wallet-selector/wallet-utils": "workspace:latest"
27-
}
23+
"homepage": "https://github.com/near/wallet-selector/tree/main/packages/mintbase-wallet"
2824
}

yarn.lock

+46-42
Original file line numberDiff line numberDiff line change
@@ -2430,6 +2430,13 @@
24302430
dependencies:
24312431
regenerator-runtime "^0.13.11"
24322432

2433+
"@babel/runtime@7.24.8", "@babel/runtime@^7.23.2":
2434+
version "7.24.8"
2435+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.8.tgz#5d958c3827b13cc6d05e038c07fb2e5e3420d82e"
2436+
integrity sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==
2437+
dependencies:
2438+
regenerator-runtime "^0.14.0"
2439+
24332440
"@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":
24342441
version "7.24.7"
24352442
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12"
@@ -2451,13 +2458,6 @@
24512458
dependencies:
24522459
regenerator-runtime "^0.14.0"
24532460

2454-
"@babel/runtime@^7.23.2":
2455-
version "7.24.8"
2456-
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.8.tgz#5d958c3827b13cc6d05e038c07fb2e5e3420d82e"
2457-
integrity sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==
2458-
dependencies:
2459-
regenerator-runtime "^0.14.0"
2460-
24612461
"@babel/template@7.22.5":
24622462
version "7.22.5"
24632463
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
@@ -4031,15 +4031,14 @@
40314031
nanoid "3.3.6"
40324032
query-string "^7.1.3"
40334033

4034-
"@mintbase-js/wallet@0.6.0-beta.7":
4035-
version "0.6.0-beta.7"
4036-
resolved "https://registry.yarnpkg.com/@mintbase-js/wallet/-/wallet-0.6.0-beta.7.tgz#5d2ab3a03889624873f15a276652e6d5a3d77fb1"
4037-
integrity sha512-Trp7WJucfG0j3QLZFw1rcT3H1zp3doOM3ap1i+LiH1l9mK3F52c/K0sgbemSAAv7oglqvJqDD8N660TUQlsFgQ==
4034+
"@mintbase-js/wallet@0.6.0-beta.10":
4035+
version "0.6.0-beta.10"
4036+
resolved "https://registry.yarnpkg.com/@mintbase-js/wallet/-/wallet-0.6.0-beta.10.tgz#26a6ef1d9a46c117dc4389441b2f780c292afd43"
4037+
integrity sha512-i0U5cGLu7WySdfzOPlPO+eN/iQlVaPWo0E12UPWFNjAUrn76WJFvHM0RDHZYg9p+Ex5VTp2lU0vkJu6KtJO9Tw==
40384038
dependencies:
4039-
"@near-wallet-selector/core" "8.9.5"
40404039
"@near-wallet-selector/wallet-utils" "^8.9.5"
40414040
bn.js "^5.2.1"
4042-
near-api-js "^2.1.3"
4041+
near-api-js "^3.0.0"
40434042

40444043
"@mischnic/json-sourcemap@^0.1.0":
40454044
version "0.1.1"
@@ -4554,7 +4553,7 @@
45544553
dependencies:
45554554
"@near-wallet-selector/core" "^8.2.0"
45564555

4557-
"@near-wallet-selector/core@8.9.10":
4556+
"@near-wallet-selector/core@8.9.10", "@near-wallet-selector/core@^8.2.0":
45584557
version "8.9.10"
45594558
resolved "https://registry.yarnpkg.com/@near-wallet-selector/core/-/core-8.9.10.tgz#0e19b22bbe69208c9e82b149682be37f6f9b76c5"
45604559
integrity sha512-do+DDahRHPzr5VKiFS7NWKyNbspXu64/w7CuSBi8IUDsDsclmV7Os6Hp5HcVAq+X3Whi//NxKGX6mPMb+SRPqw==
@@ -4564,17 +4563,7 @@
45644563
js-sha256 "0.9.0"
45654564
rxjs "7.8.1"
45664565

4567-
"@near-wallet-selector/core@8.9.5":
4568-
version "8.9.5"
4569-
resolved "https://registry.yarnpkg.com/@near-wallet-selector/core/-/core-8.9.5.tgz#15e49f17252ee4e54a1c9719b8c2b98fd71aae74"
4570-
integrity sha512-wJiCL8M7z6tkNMY5H4n63/SZCmlW0Z15H6R1biWgpRuMDlVjhQOzxrmQggb1jbK4nYkzXyARNKyPh2gcRUuS+w==
4571-
dependencies:
4572-
borsh "0.7.0"
4573-
events "3.3.0"
4574-
js-sha256 "0.9.0"
4575-
rxjs "7.8.1"
4576-
4577-
"@near-wallet-selector/wallet-utils@workspace:latest":
4566+
"@near-wallet-selector/wallet-utils@^8.9.5":
45784567
version "8.9.10"
45794568
resolved "https://registry.yarnpkg.com/@near-wallet-selector/wallet-utils/-/wallet-utils-8.9.10.tgz#1e6d97464d995cccb4ec34314a1dd90e63901c39"
45804569
integrity sha512-Jq00IUAMvltaH8lvkaI8SRP6JWhqE4c0427ODSv+X10NwlkM8WKul9ZNZMxeCTC2ncZH23kDyaA+3MiYTX+DUg==
@@ -10363,21 +10352,11 @@ caniuse-api@^3.0.0:
1036310352
lodash.memoize "^4.1.2"
1036410353
lodash.uniq "^4.5.0"
1036510354

10366-
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001599, caniuse-lite@^1.0.30001640:
10367-
version "1.0.30001641"
10368-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001641.tgz#3572862cd18befae3f637f2a1101cc033c6782ac"
10369-
integrity sha512-Phv5thgl67bHYo1TtMY/MurjkHhV4EDaCosezRXgZ8jzA/Ub+wjxAvbGvjoFENStinwi5kCyOYV3mi5tOGykwA==
10370-
10371-
caniuse-lite@^1.0.30001464:
10355+
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:
1037210356
version "1.0.30001643"
10373-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz#9c004caef315de9452ab970c3da71085f8241dbd"
10357+
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz"
1037410358
integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==
1037510359

10376-
caniuse-lite@^1.0.30001503:
10377-
version "1.0.30001507"
10378-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001507.tgz#fae53f6286e7564783eadea9b447819410a59534"
10379-
integrity sha512-SFpUDoSLCaE5XYL2jfqe9ova/pbQHEmbheDf5r4diNwbAgR3qxM9NQtfsiSscjqoya5K7kFcHPUQ+VsUkIJR4A==
10380-
1038110360
capability@^0.2.5:
1038210361
version "0.2.5"
1038310362
resolved "https://registry.yarnpkg.com/capability/-/capability-0.2.5.tgz#51ad87353f1936ffd77f2f21c74633a4dea88801"
@@ -17928,7 +17907,7 @@ near-api-js@4.0.3:
1792817907
near-abi "0.1.1"
1792917908
node-fetch "2.6.7"
1793017909

17931-
near-api-js@^2.1.1, near-api-js@^2.1.3:
17910+
near-api-js@^2.1.1:
1793217911
version "2.1.4"
1793317912
resolved "https://registry.yarnpkg.com/near-api-js/-/near-api-js-2.1.4.tgz#562bb7047bf3699fbdf78f9a6620366069ad7cd9"
1793417913
integrity sha512-e1XicyvJvQMtu7qrG8oWyAdjHJJCoy+cvbW6h2Dky4yj7vC85omQz/x7IgKl71VhzDj2/TGUwjTVESp6NSe75A==
@@ -17955,7 +17934,7 @@ near-api-js@^2.1.1, near-api-js@^2.1.3:
1795517934
node-fetch "^2.6.1"
1795617935
tweetnacl "^1.0.1"
1795717936

17958-
near-api-js@^3.0.1:
17937+
near-api-js@^3.0.0, near-api-js@^3.0.1:
1795917938
version "3.0.4"
1796017939
resolved "https://registry.yarnpkg.com/near-api-js/-/near-api-js-3.0.4.tgz#5ee094ce53e30239cc817ca942ec3e9739296dbb"
1796117940
integrity sha512-qKWjnugoB7kSFhzZ5GXyH/eABspCQYWBmWnM4hpV5ctnQBt89LqgEu9yD1z4sa89MvUu8BuCxwb1m00BE8iofg==
@@ -21961,7 +21940,16 @@ string-range@~1.2, string-range@~1.2.1:
2196121940
resolved "https://registry.yarnpkg.com/string-range/-/string-range-1.2.2.tgz#a893ed347e72299bc83befbbf2a692a8d239d5dd"
2196221941
integrity sha512-tYft6IFi8SjplJpxCUxyqisD3b+R2CSkomrtJYCkvuf1KuCAWgz7YXt4O0jip7efpfCemwHEzTEAO8EuOYgh3w==
2196321942

21964-
"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:
21943+
"string-width-cjs@npm:string-width@^4.2.0":
21944+
version "4.2.3"
21945+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
21946+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
21947+
dependencies:
21948+
emoji-regex "^8.0.0"
21949+
is-fullwidth-code-point "^3.0.0"
21950+
strip-ansi "^6.0.1"
21951+
21952+
"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
2196521953
version "4.2.3"
2196621954
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
2196721955
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -22060,7 +22048,14 @@ string_decoder@~1.1.1:
2206022048
dependencies:
2206122049
safe-buffer "~5.1.0"
2206222050

22063-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
22051+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
22052+
version "6.0.1"
22053+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
22054+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
22055+
dependencies:
22056+
ansi-regex "^5.0.1"
22057+
22058+
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
2206422059
version "6.0.1"
2206522060
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
2206622061
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -23868,7 +23863,7 @@ wordwrap@^1.0.0:
2386823863
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
2386923864
integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
2387023865

23871-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
23866+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
2387223867
version "7.0.0"
2387323868
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
2387423869
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -23886,6 +23881,15 @@ wrap-ansi@^6.2.0:
2388623881
string-width "^4.1.0"
2388723882
strip-ansi "^6.0.0"
2388823883

23884+
wrap-ansi@^7.0.0:
23885+
version "7.0.0"
23886+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
23887+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
23888+
dependencies:
23889+
ansi-styles "^4.0.0"
23890+
string-width "^4.1.0"
23891+
strip-ansi "^6.0.0"
23892+
2388923893
wrap-ansi@^8.1.0:
2389023894
version "8.1.0"
2389123895
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

0 commit comments

Comments
 (0)