Add support for CJS projects

bin/wasm-node/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Added
+
+- Add support for CommonJS projects. ([#2487](https://github.com/paritytech/smoldot/pull/2487))
+
 ### Changed
 
 - No WebWorker/worker thread is spawned anymore by the JavaScript code. The WebAssembly virtual machine that runs smoldot is now directly instantiated by the `start` function. This should fix compatibility issues with various JavaScript bundlers. ([#2498](https://github.com/paritytech/smoldot/pull/2498))

bin/wasm-node/javascript/demo/demo.js → bin/wasm-node/javascript/demo/demo.mjs

@@ -17,7 +17,7 @@
 
 // This file launches a WebSocket server that exposes JSON-RPC functions.
 
-import * as smoldot from '../dist/index.js';
+import * as smoldot from '../dist/mjs/index.js';
 import { default as websocket } from 'websocket';
 import * as http from 'node:http';
 import * as process from 'node:process';

bin/wasm-node/javascript/fix-package-type.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+#   Adds package.json files to cjs/mjs subtrees with the respective type needed for
+#   the target environment.
+#
+
+cat >dist/cjs/package.json <<!EOF
+{
+    "type": "commonjs"
+}
+!EOF
+
+cat >dist/mjs/package.json <<!EOF
+{
+    "type": "module"
+}
+!EOF

bin/wasm-node/javascript/package.json

@@ -13,17 +13,25 @@
     "url": "https://github.com/paritytech/smoldot/issues"
   },
   "files": ["dist"],
-  "type": "module",
-  "types": "dist/index.d.ts",
-  "main": "dist/index.js",
+  "main": "dist/cjs/index.js",
+  "types": "dist/mjs/index.d.ts",
+  "module": "dist/mjs/index.js",
+  "exports": {
+    ".": {
+        "import": "./dist/mjs/index.js",
+        "require": "./dist/cjs/index.js"
+    }
+  },
   "scripts": {
-    "prepublishOnly": "node prepare.js --release && rimraf ./dist && tsc",
-    "build": "node prepare.js --release && rimraf ./dist && tsc",
-    "start": "node prepare.js --debug && rimraf ./dist && tsc && node demo/demo.js",
-    "test": "node prepare.js --debug && rimraf ./dist && tsc && ava --timeout=2m --concurrency 2 --no-worker-threads"
+    "buildModules": "tsc -p tsconfig-mjs.json && tsc -p tsconfig-cjs.json && bash fix-package-type.sh",
+    "prepublishOnly": "node prepare.mjs --release && rimraf ./dist && npm run buildModules",
+    "build": "node prepare.mjs --release && rimraf ./dist && npm run buildModules",
+    "start": "node prepare.mjs --debug && rimraf ./dist && npm run buildModules && node demo/demo.mjs",
+    "test": "node prepare.mjs --debug && rimraf ./dist && npm run buildModules && ava --timeout=2m --concurrency 2 --no-worker-threads"
   },
   "browser": {
-    "./dist/compat/index.js": "./dist/compat/index-browser-overwrite.js"
+    "./dist/mjs/compat/index.js": "./dist/mjs/compat/index-browser-overwrite.js",
+    "./dist/cjs/compat/index.js": "./dist/cjs/compat/index-browser-overwrite.js"
   },
   "dependencies": {
     "buffer": "^6.0.1",

bin/wasm-node/javascript/test/chainHead.js → bin/wasm-node/javascript/test/chainHead.mjs

@@ -17,7 +17,7 @@
 
 import test from 'ava';
 import * as fs from 'node:fs';
-import { start } from "../dist/index.js";
+import { start } from "../dist/mjs/index.js";
 
 const westendSpec = fs.readFileSync('./test/westend.json', 'utf8');
 

bin/wasm-node/javascript/test/chainSpec.js → bin/wasm-node/javascript/test/chainSpec.mjs

@@ -17,7 +17,7 @@
 
 import test from 'ava';
 import * as fs from 'node:fs';
-import { start } from "../dist/index.js";
+import { start } from "../dist/mjs/index.js";
 
 const westendSpec = fs.readFileSync('./test/westend.json', 'utf8');
 

bin/wasm-node/javascript/test/misc.js → bin/wasm-node/javascript/test/misc.mjs

@@ -17,7 +17,7 @@
 
 import test from 'ava';
 import * as fs from 'node:fs';
-import { start } from "../dist/index.js";
+import { start } from "../dist/mjs/index.js";
 
 const westendSpec = fs.readFileSync('./test/westend.json', 'utf8');
 

bin/wasm-node/javascript/test/sudo.js → bin/wasm-node/javascript/test/sudo.mjs

@@ -17,7 +17,7 @@
 
 import test from 'ava';
 import * as fs from 'node:fs';
-import { start } from "../dist/index.js";
+import { start } from "../dist/mjs/index.js";
 
 const westendSpec = fs.readFileSync('./test/westend.json', 'utf8');
 

bin/wasm-node/javascript/test/test.js → bin/wasm-node/javascript/test/test.mjs

@@ -17,7 +17,7 @@
 
 import test from 'ava';
 import * as fs from 'node:fs';
-import { start } from "../dist/index.js";
+import { start } from "../dist/mjs/index.js";
 
 const westendSpec = fs.readFileSync('./test/westend.json', 'utf8');
 

bin/wasm-node/javascript/tsconfig-cjs.json

@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "lib": [
+      "es2015"
+    ],
+    "target": "es2015",
+    "module": "commonjs",
+    "outDir": "./dist/cjs",
+  },
+}

bin/wasm-node/javascript/tsconfig-mjs.json

@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "lib": [
+      "es2020"
+    ],
+    "target": "es2020",
+    "module": "es2020",
+    "outDir": "./dist/mjs",
+  }
+}

bin/wasm-node/javascript/tsconfig.json

@@ -1,15 +1,9 @@
 {
     "compilerOptions": {
-        "lib": [
-            "es2020"
-        ],
-        "target": "es2020",
-        "module": "es2020",
-        "outDir": "./dist",
         "declaration": true,
         "allowJs": true,
         "allowSyntheticDefaultImports": true,
-
+        "esModuleInterop": true,
         "strict": true,
         "allowUnreachableCode": false,
         "allowUnusedLabels": false,