Merge pull request #49 from signalwire/fr/web-umd

Migrating from TSDX to microbundle
signalwire · Apr 27, 2021 · e7d17e4 · e7d17e4
2 parents 3204422 + 77a6053
commit e7d17e4
Show file tree

Hide file tree

Showing 26 changed files with 17,896 additions and 15,962 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -0,0 +1,6 @@
+module.exports = {
+  presets: [
+    ['@babel/preset-env', { targets: { node: 'current' } }],
+    '@babel/preset-typescript',
+  ],
+}
diff --git a/examples/with-next.js/package.json b/examples/with-next.js/package.json
@@ -5,7 +5,8 @@
     "dev": "next",
     "build": "next build",
     "start": "next start",
-    "type-check": "tsc"
+    "type-check": "tsc",
+    "test": ""
   },
   "dependencies": {
     "@signalwire/web": "0.0.0",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,18 +10,23 @@
     "postinstall": "manypkg check",
     "changeset": "changeset",
     "clean": "manypkg exec rm -rf node_modules && manypkg exec rm -rf dist && rm -rf node_modules",
-    "build": "manypkg run @signalwire/core build && manypkg run @signalwire/webrtc build && manypkg run @signalwire/web build && manypkg run @signalwire/node build",
+    "test": "manypkg exec npm run test",
+    "build": "manypkg exec rm -rf dist && manypkg run @signalwire/core build && manypkg run @signalwire/webrtc build && manypkg run @signalwire/web build && manypkg run @signalwire/node build",
     "prettier": "prettier --write .",
     "start:web": "concurrently \"manypkg run @signalwire/core start\" \"manypkg run @signalwire/web start\" \"manypkg run @signalwire/webrtc start\" \"manypkg run @signalwire/web example\"",
     "start:next": "concurrently \"manypkg run @signalwire/web start\" \"manypkg run with-next.js dev\""
   },
   "dependencies": {
+    "@babel/core": "^7.13.16",
+    "@babel/preset-env": "^7.13.15",
+    "@babel/preset-typescript": "^7.13.0",
     "@changesets/cli": "^2.14.1",
     "@manypkg/cli": "^0.17.0",
+    "babel-jest": "^25.5.1",
     "concurrently": "^6.0.0",
+    "jest": "^25.5.4",
+    "microbundle": "^0.13.0",
     "prettier": "^2.2.1",
-    "tsdx": "^0.14.1",
-    "tslib": "^2.1.0",
     "typescript": "^4.2.3"
   }
 }
diff --git a/packages/core/jest.config.js b/packages/core/jest.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  transform: {
+    '\\.[jt]sx?$': ['babel-jest', { configFile: './../../babel.config.js' }],
+  },
+}
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,9 +1,12 @@
 {
   "name": "@signalwire/core",
+  "private": true,
   "version": "0.0.0",
+  "source": "src/index.ts",
   "main": "dist/index.js",
-  "module": "dist/core.esm.js",
-  "typings": "dist/core/src/index.d.ts",
+  "exports": "./dist/index.modern.js",
+  "module": "dist/index.esm.js",
+  "types": "dist/core/src/index.d.ts",
   "files": [
     "dist",
     "src"
@@ -12,11 +15,10 @@
     "node": ">=10"
   },
   "scripts": {
-    "start": "tsdx watch --tsconfig tsconfig.build.json --verbose --noClean",
-    "build": "tsdx build --tsconfig tsconfig.build.json",
-    "test": "tsdx test",
-    "lint": "tsdx lint",
-    "prepare": "tsdx build"
+    "start": "microbundle watch -f modern --tsconfig tsconfig.build.json",
+    "build": "microbundle --external none -f modern,es,cjs --define process.env.NODE_ENV=production --tsconfig ./tsconfig.build.json --target node",
+    "test": "NODE_ENV=test jest",
+    "prepare": "npm run build"
   },
   "dependencies": {
     "@reduxjs/toolkit": "^1.5.1",

diff --git a/packages/core/src/BaseComponent.ts b/packages/core/src/BaseComponent.ts
@@ -31,6 +31,7 @@ export class BaseComponent implements Emitter {
 
   destroy() {
     this._destroyer?.()
+    this.removeAllListeners()
   }
 
   execute({ method, params }: { method: string; params: Record<string, any> }) {

diff --git a/packages/core/src/redux/features/session/sessionSaga.ts b/packages/core/src/redux/features/session/sessionSaga.ts
@@ -101,7 +101,7 @@ export function* sessionChannelWatcher({
             method: 'video.message',
             params: {
               message: VertoResult(id, method),
-              node_id: null,
+              node_id: nodeId,
             },
           })
         )
@@ -115,7 +115,7 @@ export function* sessionChannelWatcher({
             method: 'video.message',
             params: {
               message: VertoResult(id, method),
-              node_id: null,
+              node_id: nodeId,
             },
           })
         )

diff --git a/packages/node/jest.config.js b/packages/node/jest.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  transform: {
+    '\\.[jt]sx?$': ['babel-jest', { configFile: './../../babel.config.js' }],
+  },
+}
diff --git a/packages/node/package.json b/packages/node/package.json
@@ -1,9 +1,11 @@
 {
   "name": "@signalwire/node",
   "version": "0.0.0",
+  "source": "src/index.ts",
   "main": "dist/index.js",
-  "module": "dist/node.esm.js",
-  "typings": "dist/node/src/index.d.ts",
+  "exports": "./dist/index.modern.js",
+  "module": "dist/index.esm.js",
+  "types": "dist/node/src/index.d.ts",
   "files": [
     "dist",
     "src"
@@ -12,11 +14,10 @@
     "node": ">=10"
   },
   "scripts": {
-    "start": "tsdx watch --tsconfig tsconfig.build.json --verbose --noClean",
-    "build": "tsdx build --tsconfig tsconfig.build.json",
-    "test": "tsdx test",
-    "lint": "tsdx lint",
-    "prepare": "tsdx build"
+    "start": "microbundle watch -f modern --tsconfig tsconfig.build.json",
+    "build": "microbundle --external none -f modern,es,cjs --define process.env.NODE_ENV=production --tsconfig ./tsconfig.build.json --target node",
+    "test": "NODE_ENV=test jest",
+    "prepare": "npm run build"
   },
   "dependencies": {
     "@signalwire/core": "0.0.0"

diff --git a/packages/node/tsdx.config.js b/packages/node/tsdx.config.js
diff --git a/packages/react-native/jest.config.js b/packages/react-native/jest.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  transform: {
+    '\\.[jt]sx?$': ['babel-jest', { configFile: './../../babel.config.js' }],
+  },
+}
diff --git a/packages/react-native/package.json b/packages/react-native/package.json
@@ -1,9 +1,11 @@
 {
   "name": "@signalwire/react-native",
   "version": "0.0.0",
+  "source": "src/index.ts",
   "main": "dist/index.js",
-  "module": "dist/react-native.esm.js",
-  "typings": "dist/react-native/src/index.d.ts",
+  "exports": "./dist/index.modern.js",
+  "module": "dist/index.esm.js",
+  "types": "dist/react-native/src/index.d.ts",
   "files": [
     "dist",
     "src"
@@ -12,11 +14,10 @@
     "node": ">=10"
   },
   "scripts": {
-    "start": "tsdx watch --tsconfig tsconfig.build.json --verbose --noClean",
-    "build": "tsdx build --tsconfig tsconfig.build.json",
-    "test": "tsdx test",
-    "lint": "tsdx lint",
-    "prepare": "tsdx build"
+    "start": "microbundle watch -f modern --tsconfig tsconfig.build.json",
+    "build": "microbundle --external none -f modern,es,cjs --define process.env.NODE_ENV=production --tsconfig ./tsconfig.build.json --target node",
+    "test": "NODE_ENV=test jest",
+    "prepare": "npm run build"
   },
   "dependencies": {
     "@signalwire/core": "0.0.0",

diff --git a/packages/react-native/tsdx.config.js b/packages/react-native/tsdx.config.js