cjs/bytes.js generation adjustment (#520)

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## master
+
+Changes:
+
+- Adjust `cs/bytes.js` generation to follow `export.<var> = ...` form
+- Add `module` to `package.json` export map (ESM-only)
+
+
 ## 7.1.2 Apr 28, 2023
 
 Changes:

package.json

@@ -44,7 +44,7 @@
     "test:wasm-crypto:rust": "cd packages/wasm-crypto && RUST_BACKTRACE=full cargo test --release -- --test-threads=1 --nocapture"
   },
   "devDependencies": {
-    "@polkadot/dev": "^0.73.11",
+    "@polkadot/dev": "^0.73.16",
     "@polkadot/util": "^12.1.2",
     "@polkadot/x-randomvalues": "^12.1.2",
     "@types/node": "^20.1.0",

packages/wasm-crypto-wasm/src/cjs/bytes.js

@@ -1,8 +1,8 @@
 // Copyright 2019-2023 @polkadot/wasm-crypto-wasm authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-module.exports.bytes = '';
+exports.lenIn = 0;
 
-module.exports.lenIn = 0;
+exports.lenOut = 0;
 
-module.exports.lenOut = 0;
+exports.bytes = '';

scripts/pack-wasm-base.mjs

@@ -19,11 +19,11 @@ console.log(`*** Compressed WASM: in=${formatNumber(data.length)}, out=${formatN
 fs.mkdirSync(DIR_DENO, { recursive: true });
 
 fs.writeFileSync(`${DIR_CJS}/bytes.js`, `${HDR}
-const lenIn = ${compressed.length};
-const lenOut = ${data.length};
-const bytes = '${base64}';
+exports.lenIn = ${compressed.length};
 
-module.exports = { bytes, lenIn, lenOut };
+exports.lenOut = ${data.length};
+
+exports.bytes = '${base64}';
 `);
 
 fs.writeFileSync(`${DIR_DENO}/bytes.js`, `${HDR}

yarn.lock

@@ -350,34 +350,34 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/dev-test@npm:^0.73.11":
-  version: 0.73.11
-  resolution: "@polkadot/dev-test@npm:0.73.11"
+"@polkadot/dev-test@npm:^0.73.16":
+  version: 0.73.16
+  resolution: "@polkadot/dev-test@npm:0.73.16"
   dependencies:
     jsdom: ^22.0.0
     tslib: ^2.5.0
-  checksum: c5d3dafc6002fcff52d0c3a94fc6f8c09ab4b2e47143000a6d0977be78460e9f91cba39b25a131418ae99e40740edab447761f533571f45c1484eba202991370
+  checksum: c5d8a3551ade481d2617b26803e3bc45d6fb81c74ad6c2f18e32cebef35bec9f69b7b6d9a1eb03882d9b8f0f09a1f6f9f98d0edf193a0e411177cb15bf369adf
   languageName: node
   linkType: hard
 
-"@polkadot/dev-ts@npm:^0.73.11":
-  version: 0.73.11
-  resolution: "@polkadot/dev-ts@npm:0.73.11"
+"@polkadot/dev-ts@npm:^0.73.16":
+  version: 0.73.16
+  resolution: "@polkadot/dev-ts@npm:0.73.16"
   dependencies:
     json5: ^2.2.3
     tslib: ^2.5.0
     typescript: ^5.0.4
-  checksum: a0ed8eec7f531d0501fda2084d7fe51cbcf8886d580fabe600e657f47a287f7b7191486617ec94768af050e68ec967fe0431507dc029c7d6e4ccfb52de7c6c86
+  checksum: ad1060bbafdfa565078bff4470e4f955b6c52bf926489b666979dbcf4a20ba56d9a382d458b592165b062242a19d276c372a7c4af10daebdaf12d63496e4104c
   languageName: node
   linkType: hard
 
-"@polkadot/dev@npm:^0.73.11":
-  version: 0.73.11
-  resolution: "@polkadot/dev@npm:0.73.11"
+"@polkadot/dev@npm:^0.73.16":
+  version: 0.73.16
+  resolution: "@polkadot/dev@npm:0.73.16"
   dependencies:
     "@eslint/js": ^8.40.0
-    "@polkadot/dev-test": ^0.73.11
-    "@polkadot/dev-ts": ^0.73.11
+    "@polkadot/dev-test": ^0.73.16
+    "@polkadot/dev-ts": ^0.73.16
     "@rollup/plugin-alias": ^5.0.0
     "@rollup/plugin-commonjs": ^24.1.0
     "@rollup/plugin-dynamic-import-vars": ^2.0.3
@@ -410,8 +410,8 @@ __metadata:
     tslib: ^2.5.0
     typescript: ^5.0.4
     webpack: ^5.82.0
-    webpack-cli: ^5.0.2
-    webpack-dev-server: ^4.13.3
+    webpack-cli: ^5.1.0
+    webpack-dev-server: ^4.15.0
     webpack-merge: ^5.8.0
     webpack-subresource-integrity: ^5.2.0-rc.1
     yargs: ^17.7.2
@@ -439,7 +439,7 @@ __metadata:
     polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs
     polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs
     polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs
-  checksum: d87e7fd433ee262ae486da95a56efa9ce3ffb4b9e3ecf19315bbdfa1fdb814ec5a6eef123d012121085be92520ce13f049312b825ef06720e62a32da02609094
+  checksum: 004af3808b8b990f998c9a8a08bf23b68cce49294414d0fb4546394f10b09ae745bf3c47ff25ce9e4983bf353524fcb79f1522f48c1d18cf1f1b3fba5d5aa25e
   languageName: node
   linkType: hard
 
@@ -1276,13 +1276,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webpack-cli/configtest@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@webpack-cli/configtest@npm:2.0.1"
+"@webpack-cli/configtest@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "@webpack-cli/configtest@npm:2.1.0"
   peerDependencies:
     webpack: 5.x.x
     webpack-cli: 5.x.x
-  checksum: 15d0ca835f2e16ec99e9f295f07b676435b9e706d7700df0ad088692fea065e34772fc44b96a4f6a86178b9ca8cf1ff941fbce15269587cf0925d70b18928cea
+  checksum: b875fccd8be9a936924e24986725823347703e3eb72ea884e74669ca20f007704e859855a6a05940d5d3805ce2fc08b183a0f1658d5395b5454b3f5f88293081
   languageName: node
   linkType: hard
 
@@ -1296,16 +1296,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webpack-cli/serve@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "@webpack-cli/serve@npm:2.0.2"
+"@webpack-cli/serve@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "@webpack-cli/serve@npm:2.0.3"
   peerDependencies:
     webpack: 5.x.x
     webpack-cli: 5.x.x
   peerDependenciesMeta:
     webpack-dev-server:
       optional: true
-  checksum: f74c8cc7d3e4de58e1261c6d09af0e8b8a23f53ada4ec336140f30fa16d57d9f56de954e87125947c090c06a30b10a243ca1e093c3e4bd60ba3f19c852cb20b7
+  checksum: 1a133d8222d9a3b286cbc670a920af1a2ee66f136b61cb1448767bc481cdc3db65f06eae132a7093b4059ad7aa9a1a5b4810099f8698402843e7c39796804dd0
   languageName: node
   linkType: hard
 
@@ -6879,7 +6879,7 @@ fsevents@~2.3.2:
   version: 0.0.0-use.local
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
-    "@polkadot/dev": ^0.73.11
+    "@polkadot/dev": ^0.73.16
     "@polkadot/util": ^12.1.2
     "@polkadot/x-randomvalues": ^12.1.2
     "@types/node": ^20.1.0
@@ -8138,14 +8138,14 @@ fsevents@~2.3.2:
   languageName: node
   linkType: hard
 
-"webpack-cli@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "webpack-cli@npm:5.0.2"
+"webpack-cli@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "webpack-cli@npm:5.1.0"
   dependencies:
     "@discoveryjs/json-ext": ^0.5.0
-    "@webpack-cli/configtest": ^2.0.1
+    "@webpack-cli/configtest": ^2.1.0
     "@webpack-cli/info": ^2.0.1
-    "@webpack-cli/serve": ^2.0.2
+    "@webpack-cli/serve": ^2.0.3
     colorette: ^2.0.14
     commander: ^10.0.1
     cross-spawn: ^7.0.3
@@ -8166,7 +8166,7 @@ fsevents@~2.3.2:
       optional: true
   bin:
     webpack-cli: bin/cli.js
-  checksum: 98816d84c51487b90e1008ddbcda8827dcb7ae9ab7892f4d742f0d7b93f90a4a18a6ec2671b380e5a7ee4b0917cf0c43921119419d8ba9e1b14ea060115684fd
+  checksum: 73749b9e27e16007011266dcd7b935168cc61cd4e346e4c09a697be066a310b822c1f386ba4a87417851eedd6df5812389918be68e275542c8a18e05ca1a719c
   languageName: node
   linkType: hard
 
@@ -8185,9 +8185,9 @@ fsevents@~2.3.2:
   languageName: node
   linkType: hard
 
-"webpack-dev-server@npm:^4.13.3":
-  version: 4.13.3
-  resolution: "webpack-dev-server@npm:4.13.3"
+"webpack-dev-server@npm:^4.15.0":
+  version: 4.15.0
+  resolution: "webpack-dev-server@npm:4.15.0"
   dependencies:
     "@types/bonjour": ^3.5.9
     "@types/connect-history-api-fallback": ^1.3.5
@@ -8228,7 +8228,7 @@ fsevents@~2.3.2:
       optional: true
   bin:
     webpack-dev-server: bin/webpack-dev-server.js
-  checksum: d019844d3bc384676921afadfbd0a95fd06e475f2d43604789a4a8f42f79a8fb37e745f15f47f352630046dd6c6c9694051a7552b34a056c59d3a601e74d6320
+  checksum: 6fe375089b061be2e4ed6d6a8b20743734d304cd0c34757271c6685f97642b028f253c627f899b629c97c067c294484f906e394fd1c104ee795237b8725f2701
   languageName: node
   linkType: hard