refactor: handle extension dapp path

PolkaGate · Jan 29, 2025 · 003f8cc · 003f8cc
1 parent 20a8eb8
commit 003f8cc
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 42 deletions.
diff --git a/packages/dapp/package.json b/packages/dapp/package.json
@@ -15,7 +15,7 @@
     "@polkadot/api-derive": "^12.1.1",
     "@polkadot/apps-config": "^0.141.1",
     "@polkadot/extension-inject": "^0.48.2",
-    "@polkagate/extension-dapp": "../../../polkadot-js-extension/packages/extension-dapp/build",
+    "@polkagate/extension-dapp": "^0.48.2",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
@@ -57,4 +57,4 @@
       "last 1 safari version"
     ]
   }
-}
+}
diff --git a/yarn.lock b/yarn.lock
@@ -4280,7 +4280,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/api@npm:12.4.2, @polkadot/api@npm:^12.0.2, @polkadot/api@npm:^12.1.1, @polkadot/api@npm:^12.2.1":
+"@polkadot/api@npm:12.4.2, @polkadot/api@npm:^12.0.2, @polkadot/api@npm:^12.1.1":
   version: 12.4.2
   resolution: "@polkadot/api@npm:12.4.2"
   dependencies:
@@ -4509,21 +4509,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/extension-inject@npm:0.50.1":
-  version: 0.50.1
-  resolution: "@polkadot/extension-inject@npm:0.50.1"
+"@polkadot/extension-inject@npm:0.48.2, @polkadot/extension-inject@npm:^0.48.2":
+  version: 0.48.2
+  resolution: "@polkadot/extension-inject@npm:0.48.2"
   dependencies:
-    "@polkadot/api": ^12.2.1
-    "@polkadot/rpc-provider": ^12.2.1
-    "@polkadot/types": ^12.2.1
-    "@polkadot/util": ^13.0.2
-    "@polkadot/util-crypto": ^13.0.2
-    "@polkadot/x-global": ^13.0.2
+    "@polkadot/api": ^12.0.2
+    "@polkadot/rpc-provider": ^12.0.2
+    "@polkadot/types": ^12.0.2
+    "@polkadot/util": ^12.6.2
+    "@polkadot/util-crypto": ^12.6.2
+    "@polkadot/x-global": ^12.6.2
     tslib: ^2.6.2
   peerDependencies:
     "@polkadot/api": "*"
     "@polkadot/util": "*"
-  checksum: 2cff1aca27e94778a38b0c51dc81c2437f64dfe07126061d1965c4d33cd620b62955e2266eb023798cd3472231083cbabb5f16de1c990dd9a413561545383efe
+  checksum: 53f53249b18e7384c92c3ae72663729e1306cbb24591d5cc9f35afddfb4cb2f4367e6ae7038a8f0b6edf40eae60497d67a2ef27c1ceeebd9a506a4bad885fb2e
   languageName: node
   linkType: hard
 
@@ -4545,24 +4545,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/extension-inject@npm:^0.48.2":
-  version: 0.48.2
-  resolution: "@polkadot/extension-inject@npm:0.48.2"
-  dependencies:
-    "@polkadot/api": ^12.0.2
-    "@polkadot/rpc-provider": ^12.0.2
-    "@polkadot/types": ^12.0.2
-    "@polkadot/util": ^12.6.2
-    "@polkadot/util-crypto": ^12.6.2
-    "@polkadot/x-global": ^12.6.2
-    tslib: ^2.6.2
-  peerDependencies:
-    "@polkadot/api": "*"
-    "@polkadot/util": "*"
-  checksum: 53f53249b18e7384c92c3ae72663729e1306cbb24591d5cc9f35afddfb4cb2f4367e6ae7038a8f0b6edf40eae60497d67a2ef27c1ceeebd9a506a4bad885fb2e
-  languageName: node
-  linkType: hard
-
 "@polkadot/keyring@npm:^10.4.2":
   version: 10.4.2
   resolution: "@polkadot/keyring@npm:10.4.2"
@@ -4984,7 +4966,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/rpc-provider@npm:12.4.2, @polkadot/rpc-provider@npm:^12.0.2, @polkadot/rpc-provider@npm:^12.2.1":
+"@polkadot/rpc-provider@npm:12.4.2, @polkadot/rpc-provider@npm:^12.0.2":
   version: 12.4.2
   resolution: "@polkadot/rpc-provider@npm:12.4.2"
   dependencies:
@@ -5125,6 +5107,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@polkadot/types-augment@npm:12.1.1":
+  version: 12.1.1
+  resolution: "@polkadot/types-augment@npm:12.1.1"
+  dependencies:
+    "@polkadot/types": 12.1.1
+    "@polkadot/types-codec": 12.1.1
+    "@polkadot/util": ^12.6.2
+    tslib: ^2.6.2
+  checksum: 7d31056cf6d33c8e876638be1705dcdaa3f1e817117d47b166ecc627f185a8eae985b3c6a69a47bdd6f2f80db6356ff09e8d3b00fda24b426debd919b75ef9cb
+  languageName: node
+  linkType: hard
+
 "@polkadot/types-augment@npm:12.4.2":
   version: 12.4.2
   resolution: "@polkadot/types-augment@npm:12.4.2"
@@ -5207,6 +5201,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@polkadot/types-codec@npm:12.1.1":
+  version: 12.1.1
+  resolution: "@polkadot/types-codec@npm:12.1.1"
+  dependencies:
+    "@polkadot/util": ^12.6.2
+    "@polkadot/x-bigint": ^12.6.2
+    tslib: ^2.6.2
+  checksum: 25095bb7a38718c531b1799dcf8d2cc9b566d231f43370f5c40e70e8ab07efbc1cc4d2f2285ea3d2bfc47e1924c285d03a3239a71836825b3846d84f8895836f
+  languageName: node
+  linkType: hard
+
 "@polkadot/types-codec@npm:12.4.2, @polkadot/types-codec@npm:^12.0.2":
   version: 12.4.2
   resolution: "@polkadot/types-codec@npm:12.4.2"
@@ -5283,6 +5288,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@polkadot/types-create@npm:12.1.1":
+  version: 12.1.1
+  resolution: "@polkadot/types-create@npm:12.1.1"
+  dependencies:
+    "@polkadot/types-codec": 12.1.1
+    "@polkadot/util": ^12.6.2
+    tslib: ^2.6.2
+  checksum: 91ea6607567ca632b1dfa3c36cf1b7fb659e5b74bdb0f323c89d8563b3e0257af6f4b1b94be48bd09acf9c43906718952c0f1e76572f6e51ca50f72fd4a00fab
+  languageName: node
+  linkType: hard
+
 "@polkadot/types-create@npm:12.4.2":
   version: 12.4.2
   resolution: "@polkadot/types-create@npm:12.4.2"
@@ -5562,7 +5578,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/types@npm:12.4.2, @polkadot/types@npm:^12.0.2, @polkadot/types@npm:^12.2.1":
+"@polkadot/types@npm:12.1.1":
+  version: 12.1.1
+  resolution: "@polkadot/types@npm:12.1.1"
+  dependencies:
+    "@polkadot/keyring": ^12.6.2
+    "@polkadot/types-augment": 12.1.1
+    "@polkadot/types-codec": 12.1.1
+    "@polkadot/types-create": 12.1.1
+    "@polkadot/util": ^12.6.2
+    "@polkadot/util-crypto": ^12.6.2
+    rxjs: ^7.8.1
+    tslib: ^2.6.2
+  checksum: a84bb90cd7005350df14378d64ea936b23f4d4a6b4c7943436183a23b18bfe133ce18b738fb333a8e4736b7cf86c1ddcce0ea21cfc26014a22c3aadf031a401e
+  languageName: node
+  linkType: hard
+
+"@polkadot/types@npm:12.4.2, @polkadot/types@npm:^12.0.2":
   version: 12.4.2
   resolution: "@polkadot/types@npm:12.4.2"
   dependencies:
@@ -6607,21 +6639,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkagate/extension-dapp@file:../../../polkadot-js-extension/packages/extension-dapp/build::locator=polkamask_dapp%40workspace%3Apackages%2Fdapp":
-  version: 0.50.2-1-x
-  resolution: "@polkagate/extension-dapp@file:../../../polkadot-js-extension/packages/extension-dapp/build#../../../polkadot-js-extension/packages/extension-dapp/build::hash=6f58d1&locator=polkamask_dapp%40workspace%3Apackages%2Fdapp"
+"@polkagate/extension-dapp@npm:^0.48.2":
+  version: 0.48.2
+  resolution: "@polkagate/extension-dapp@npm:0.48.2"
   dependencies:
     "@metamask/utils": ^9.0.0
-    "@polkadot/extension-inject": 0.50.1
-    "@polkadot/types": ^12.2.1
-    "@polkadot/util": ^13.0.2
-    "@polkadot/util-crypto": ^13.0.2
+    "@polkadot/extension-inject": 0.48.2
+    "@polkadot/types": 12.1.1
+    "@polkadot/util": ^12.6.2
+    "@polkadot/util-crypto": ^12.6.2
     tslib: ^2.6.2
   peerDependencies:
     "@polkadot/api": "*"
     "@polkadot/util": "*"
     "@polkadot/util-crypto": "*"
-  checksum: adb24513107d016c1006549001da5289bf560dba0fa639f99f4bdddf2a8bb410e379c907e8b8d711b17fe0b185789fd5b73a272b917e5b0a48dd3f993ef3ec59
+  checksum: 94be1e09fcd665df1286f7f65c7cf71b6cf01a677e877ad3523e34cca0514915f12c18d0aac7ccecef621852863393182f256c1e183384d1097d1ce078d426b7
   languageName: node
   linkType: hard
 
@@ -16261,7 +16293,7 @@ __metadata:
     "@polkadot/api-derive": ^12.1.1
     "@polkadot/apps-config": ^0.141.1
     "@polkadot/extension-inject": ^0.48.2
-    "@polkagate/extension-dapp": ../../../polkadot-js-extension/packages/extension-dapp/build
+    "@polkagate/extension-dapp": ^0.48.2
     "@testing-library/jest-dom": ^5.17.0
     "@testing-library/react": ^13.4.0
     "@testing-library/user-event": ^13.5.0