Adjust bundles (no @polkadot/networks) (#3754)

CHANGELOG.md

@@ -15,7 +15,7 @@ Changes:
 - Add `BlockNumberFor` type mapping
 - Add Westend 9080 upgrade block
 - Add `derive.crowdloan.contributions(paraId)`
-- Allow building as a completely stand-alone browser bundle
+- Allow building as a completely stand-alone browser bundle (experimental)
 - Update to latest `@polkadot/x-rxjs` with RxJs 7.2
 
 

packages/api-contract/package.json

@@ -22,7 +22,7 @@
     "@babel/runtime": "^7.14.6",
     "@polkadot/api": "4.17.2-17",
     "@polkadot/types": "4.17.2-17",
-    "@polkadot/util": "^6.11.2-13",
+    "@polkadot/util": "^6.11.2-14",
     "rxjs": "^7.2.0"
   }
 }

packages/api-derive/package.json

@@ -23,12 +23,12 @@
     "@polkadot/api": "4.17.2-17",
     "@polkadot/rpc-core": "4.17.2-17",
     "@polkadot/types": "4.17.2-17",
-    "@polkadot/util": "^6.11.2-13",
-    "@polkadot/util-crypto": "^6.11.2-13",
+    "@polkadot/util": "^6.11.2-14",
+    "@polkadot/util-crypto": "^6.11.2-14",
     "rxjs": "^7.2.0"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^6.11.2-13",
+    "@polkadot/keyring": "^6.11.2-14",
     "@polkadot/rpc-provider": "4.17.2-17"
   }
 }

packages/api/package.json

@@ -21,13 +21,13 @@
   "dependencies": {
     "@babel/runtime": "^7.14.6",
     "@polkadot/api-derive": "4.17.2-17",
-    "@polkadot/keyring": "^6.11.2-13",
+    "@polkadot/keyring": "^6.11.2-14",
     "@polkadot/rpc-core": "4.17.2-17",
     "@polkadot/rpc-provider": "4.17.2-17",
     "@polkadot/types": "4.17.2-17",
     "@polkadot/types-known": "4.17.2-17",
-    "@polkadot/util": "^6.11.2-13",
-    "@polkadot/util-crypto": "^6.11.2-13",
+    "@polkadot/util": "^6.11.2-14",
+    "@polkadot/util-crypto": "^6.11.2-14",
     "eventemitter3": "^4.0.7",
     "rxjs": "^7.2.0"
   }

packages/rpc-core/package.json

@@ -22,10 +22,10 @@
     "@babel/runtime": "^7.14.6",
     "@polkadot/rpc-provider": "4.17.2-17",
     "@polkadot/types": "4.17.2-17",
-    "@polkadot/util": "^6.11.2-13",
+    "@polkadot/util": "^6.11.2-14",
     "rxjs": "^7.2.0"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^6.11.2-13"
+    "@polkadot/keyring": "^6.11.2-14"
   }
 }

packages/rpc-provider/package.json

@@ -21,15 +21,15 @@
   "dependencies": {
     "@babel/runtime": "^7.14.6",
     "@polkadot/types": "4.17.2-17",
-    "@polkadot/util": "^6.11.2-13",
-    "@polkadot/util-crypto": "^6.11.2-13",
-    "@polkadot/x-fetch": "^6.11.2-13",
-    "@polkadot/x-global": "^6.11.2-13",
-    "@polkadot/x-ws": "^6.11.2-13",
+    "@polkadot/util": "^6.11.2-14",
+    "@polkadot/util-crypto": "^6.11.2-14",
+    "@polkadot/x-fetch": "^6.11.2-14",
+    "@polkadot/x-global": "^6.11.2-14",
+    "@polkadot/x-ws": "^6.11.2-14",
     "eventemitter3": "^4.0.7"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^6.11.2-13",
+    "@polkadot/keyring": "^6.11.2-14",
     "@polkadot/types": "4.17.2-17",
     "mock-socket": "^9.0.3",
     "nock": "^13.1.1"

packages/typegen/package.json

@@ -32,7 +32,7 @@
     "@polkadot/api": "4.17.2-17",
     "@polkadot/rpc-provider": "4.17.2-17",
     "@polkadot/types": "4.17.2-17",
-    "@polkadot/util": "^6.11.2-13",
+    "@polkadot/util": "^6.11.2-14",
     "handlebars": "^4.7.7",
     "websocket": "^1.0.34",
     "yargs": "^17.0.1"

packages/types-known/package.json

@@ -20,8 +20,8 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types-known#readme",
   "dependencies": {
     "@babel/runtime": "^7.14.6",
-    "@polkadot/networks": "^6.11.2-13",
+    "@polkadot/networks": "^6.11.2-14",
     "@polkadot/types": "4.17.2-17",
-    "@polkadot/util": "^6.11.2-13"
+    "@polkadot/util": "^6.11.2-14"
   }
 }

packages/types-known/src/upgrades/index.ts

@@ -4,13 +4,15 @@
 import type { ChainUpgrades } from '@polkadot/types/types';
 import type { ChainUpgradesRaw } from './types';
 
-import networks from '@polkadot/networks';
+import { selectableNetworks } from '@polkadot/networks';
 import { assert, BN, hexToU8a, stringify } from '@polkadot/util';
 
 import kusama from './kusama';
 import polkadot from './polkadot';
 import westend from './westend';
 
+const allKnown = { kusama, polkadot, westend };
+
 // testnets are not available in the networks map
 const NET_EXTRA: Record<string, { genesisHash: string[] }> = {
   westend: {
@@ -35,7 +37,7 @@ function checkOrder (network: string, versions: ChainUpgradesRaw): [number, numb
 
 /** @internal */
 function mapRaw ([network, versions]: [string, ChainUpgradesRaw]): ChainUpgrades {
-  const chain = networks.find((n) => n.network === network) || NET_EXTRA[network];
+  const chain = selectableNetworks.find((n) => n.network === network) || NET_EXTRA[network];
 
   assert(chain, () => `Unable to find info for chain ${network}`);
 
@@ -50,6 +52,6 @@ function mapRaw ([network, versions]: [string, ChainUpgradesRaw]): ChainUpgrades
 }
 
 // Type overrides for specific spec types & versions as given in runtimeVersion
-const upgrades = Object.entries({ kusama, polkadot, westend }).map(mapRaw);
+const upgrades = Object.entries(allKnown).map(mapRaw);
 
 export default upgrades;

packages/types/package.json

@@ -20,12 +20,12 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types#readme",
   "dependencies": {
     "@babel/runtime": "^7.14.6",
-    "@polkadot/util": "^6.11.2-13",
-    "@polkadot/util-crypto": "^6.11.2-13",
+    "@polkadot/util": "^6.11.2-14",
+    "@polkadot/util-crypto": "^6.11.2-14",
     "rxjs": "^7.2.0"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^6.11.2-13",
+    "@polkadot/keyring": "^6.11.2-14",
     "@types/bn.js": "^4.11.6",
     "bn.js": "^4.11.9"
   }

rollup.config.mjs

@@ -14,15 +14,17 @@ const pkgs = [
 const external = [
   ...pkgs,
   '@polkadot/keyring',
-  '@polkadot/networks',
   '@polkadot/util',
   '@polkadot/util-crypto'
 ];
 
 const entries = ['api-derive', 'rpc-core', 'rpc-provider', 'types-known'].reduce((all, p) => ({
   ...all,
   [`@polkadot/${p}`]: path.resolve(process.cwd(), `packages/${p}/build/bundle.js`)
-}), {});
+}), {
+  // re-exported in @polkadot/util-crypto, map directly
+  '@polkadot/networks': '@polkadot/util-crypto'
+});
 
 const overrides = {};
 

test-bundle.html

@@ -2,34 +2,49 @@
 <html>
   <head>
     <meta charset="UTF-8">
-    <title></title>
-    <style></style>
+    <title>Bundler tests</title>
+    <style>
+      pre {
+        margin: 0.5rem 0;
+      }
+
+      pre.header {
+        background: #ddd;
+        margin-top: 1.5rem;
+        padding: 0.25rem 0.75rem;
+      }
+    </style>
   </head>
   <body>
-    Executing bundle tests, see the dev console for output ...
     <script>
       function log (label, result) {
-        label.startsWith('*')
-          ? console.log(label)
-          : console.log(label.padStart(24), '=', result);
+        const pre = document.createElement('pre');
+
+        if (typeof result !== 'undefined') {
+          pre.innerHTML = `${label.padStart(24)} = ${result}`;
+        } else {
+          pre.innerHTML = label;
+          pre.className = 'header';
+        }
+
+        document.body.appendChild(pre);
       }
     </script>
     <script src="node_modules/@polkadot/util/bundle-polkadot-util.js"></script>
-    <script src="node_modules/@polkadot/networks/bundle-polkadot-networks.js"></script>
     <script src="node_modules/@polkadot/util-crypto/bundle-polkadot-util-crypto.js"></script>
     <script src="node_modules/@polkadot/keyring/bundle-polkadot-keyring.js"></script>
     <script src="packages/types/build/bundle-polkadot-types.js"></script>
     <script>
-      log('*** polkadotTypes');
+      log('polkadotTypes');
 
       const { TypeRegistry } = polkadotTypes;
       const registry = new TypeRegistry();
 
-      console.log('createType', registry.createType('Balance', 1234567890).toHuman());
+      log('createType', registry.createType('Balance', 1234567890).toHuman());
     </script>
     <script src="packages/api/build/bundle-polkadot-api.js"></script>
     <script>
-      log('*** polkadotApi');
+      log('polkadotApi');
 
       const { ApiPromise, WsProvider } = polkadotApi;
       const provider = new WsProvider('wss://rpc.polkadot.io');