feat(refactor): Use @polkadot utils from @w3ux/utils to prevent multiple versions (#124)

Author: rossbulat

builder/src/builders/util.ts

@@ -95,7 +95,14 @@ export const getTemplate = async (name) => {
 export const generatePackageJson = async (
   inputDir: string,
   outputDir: string,
-  bundler: "gulp" | "tsup" | "module" | null
+  bundler: "gulp" | "tsup" | "module" | null,
+  additionalExports: Record<
+    string,
+    {
+      import: string;
+      require: string;
+    }
+  > = {}
 ): Promise<boolean> => {
   try {
     // Read the original package.json.
@@ -134,6 +141,7 @@ export const generatePackageJson = async (
             import: "./mjs/index.js",
             require: "./cjs/index.js",
           },
+          ...additionalExports,
         },
       };
     }
@@ -148,6 +156,7 @@ export const generatePackageJson = async (
             import: "./index.js",
             require: "./index.cjs",
           },
+          ...additionalExports,
         },
       };
     }

builder/src/builders/utils/index.ts

@@ -35,7 +35,19 @@ export const build = async () => {
       !(await generatePackageJson(
         libDirectory,
         `${libDirectory}/${PACKAGE_OUTPUT}`,
-        "tsup"
+        "tsup",
+        // Defining the additional entry points as `polkadot/util` and `polkadot/util-crypto`
+        // packages are re-exported.
+        {
+          "./util": {
+            import: "./util/index.js",
+            require: "./util/index.cjs",
+          },
+          "./util-crypto": {
+            import: "./util-crypto/index.js",
+            require: "./util-crypto/index.cjs",
+          },
+        }
       ))
     ) {
       throw `Failed to generate package.json file.`;

library/react-connect-kit/package.json

@@ -1,19 +1,18 @@
 {
   "name": "@w3ux/react-connect-kit-source",
   "license": "GPL-3.0-only",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "type": "module",
   "scripts": {
     "clear": "rm -rf node_modules dist tsconfig.tsbuildinfo",
     "build": "gulp --silent"
   },
   "dependencies": {
     "@chainsafe/metamask-polkadot-adapter": "^0.6.0",
-    "@polkadot/util": "^13.1.1",
     "@polkagate/extension-dapp": "^0.46.13",
     "@w3ux/extension-assets": "^0.3.1",
     "@w3ux/hooks": "^1.1.0",
-    "@w3ux/utils": "^0.7.0"
+    "@w3ux/utils": "^0.9.0"
   },
   "devDependencies": {
     "@chainsafe/metamask-polkadot-types": "^0.7.0",

library/react-connect-kit/src/ExtensionAccountsProvider/snap.ts

@@ -15,9 +15,9 @@ import type {
   SignerPayloadRaw,
   SignerResult,
 } from "@polkadot/types/types";
-import type { HexString } from "@polkadot/util/types";
 import { SnapConfig } from "@chainsafe/metamask-polkadot-types";
 import { ExtensionAccount } from "../ExtensionsProvider/types";
+import { HexString } from "types";
 
 interface Web3Window extends InjectedWindow {
   ethereum: unknown;

library/react-connect-kit/src/ExtensionAccountsProvider/types.ts

@@ -28,3 +28,5 @@ export interface HandleImportExtension {
     removedActiveAccount: MaybeAddress;
   };
 }
+
+export type HexString = `0x${string}`;

library/react-polkicon/package.json

@@ -1,15 +1,14 @@
 {
   "name": "@w3ux/react-polkicon-source",
   "license": "GPL-3.0-only",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "type": "module",
   "scripts": {
     "clear": "rm -rf node_modules dist tsconfig.tsbuildinfo",
     "build": "gulp --silent"
   },
   "dependencies": {
-    "@polkadot/util": "^12.6.2",
-    "@w3ux/utils": "^0.4.0",
+    "@w3ux/utils": "^0.9.0",
     "framer-motion": "^11.2.10"
   },
   "devDependencies": {

library/react-polkicon/src/utils.tsx

@@ -1,7 +1,7 @@
 /* @license Copyright 2024 w3ux authors & contributors
 SPDX-License-Identifier: GPL-3.0-only */
 
-import { decodeAddress, blake2AsU8a } from "@polkadot/util-crypto";
+import { decodeAddress, blake2AsU8a } from "@w3ux/utils/util-crypto";
 
 /*
   A generic identity icon, taken from

library/utils/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@w3ux/utils-source",
   "license": "GPL-3.0-only",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "type": "module",
   "scripts": {
     "clear": "rm -rf node_modules dist tsconfig.tsbuildinfo",

library/utils/src/util-crypto/index.ts

@@ -0,0 +1 @@
+export * from "@polkadot/util-crypto";

library/utils/src/util/index.ts

@@ -0,0 +1 @@
+export * from "@polkadot/util";