@webview-bridge/web 1.7.1 → 1.7.3

package/dist/index.cjs

@@ -541,9 +541,9 @@ var mockStore = function() {
 };
 // src/internal/bridgeInstance.ts
 var BridgeInstance = /*#__PURE__*/ function() {
-    function BridgeInstance(_options, _emitter) {
-        var _bridgeMethods = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : [], _nativeInitialState = arguments.length > 3 ? arguments[3] : void 0;
+    function BridgeInstance(_bridgeId, _options, _emitter, _bridgeMethods, _nativeInitialState) {
         _class_call_check(this, BridgeInstance);
+        this._bridgeId = _bridgeId;
         this._options = _options;
         this._emitter = _emitter;
         this._bridgeMethods = _bridgeMethods;
@@ -585,9 +585,11 @@ var BridgeInstance = /*#__PURE__*/ function() {
                 var _window_ReactNativeWebView;
                 (_window_ReactNativeWebView = window.ReactNativeWebView) === null || _window_ReactNativeWebView === void 0 ? void 0 : _window_ReactNativeWebView.postMessage(JSON.stringify(body ? {
                     type: type,
-                    body: body
+                    body: body,
+                    bridgeId: this._bridgeId
                 } : {
-                    type: type
+                    type: type,
+                    bridgeId: this._bridgeId
                 }));
             }
         },
@@ -682,7 +684,7 @@ var BridgeInstance = /*#__PURE__*/ function() {
                         value: nativeMethod,
                         writable: false
                     });
-                    return _object_spread_props(_object_spread({}, acc), _define_property({}, methodName, nativeMethod));
+                    return Object.assign(acc, _define_property({}, methodName, nativeMethod));
                 }, initialBridge);
                 this.loose = this._createLoose(nativeMethods);
                 this.store = linkBridgeStore(this._emitter, _object_spread({}, nativeMethods, nativeInitialState));
@@ -759,15 +761,14 @@ var linkBridge = function() {
     if (!window.ReactNativeWebView) {
         console.warn("[WebViewBridge] Not in a WebView environment");
     }
+    var bridgeId = (0, import_utils3.createRandomId)();
     var emitter = (0, import_utils3.createEvents)();
-    if (!window.nativeEmitter) {
-        window.nativeEmitter = emitter;
-    }
+    window.nativeEmitter = _object_spread_props(_object_spread({}, window.nativeEmitter || {}), _define_property({}, bridgeId, emitter));
     var _window___bridgeMethods__;
     var bridgeMethods = (_window___bridgeMethods__ = window.__bridgeMethods__) !== null && _window___bridgeMethods__ !== void 0 ? _window___bridgeMethods__ : [];
     var _window___bridgeInitialState__;
     var nativeInitialState = (_window___bridgeInitialState__ = window.__bridgeInitialState__) !== null && _window___bridgeInitialState__ !== void 0 ? _window___bridgeInitialState__ : {};
-    var instance = new BridgeInstance(options, emitter, bridgeMethods, nativeInitialState);
+    var instance = new BridgeInstance(bridgeId, options, emitter, bridgeMethods, nativeInitialState);
     if (bridgeMethods.length === 0) {
         var unsubscribe = emitter.on("hydrate", function(param) {
             var bridgeMethods2 = param.bridgeMethods, nativeInitialState2 = param.nativeInitialState;
@@ -792,9 +793,8 @@ var linkBridge = function() {
                     onFallback === null || onFallback === void 0 ? void 0 : onFallback(methodName, args);
                     return Promise.reject(new MethodNotFoundError(methodName));
                 };
-            } else {
-                console.warn("[WebViewBridge] ".concat(methodName, " is not defined, using fallback."));
             }
+            console.warn("[WebViewBridge] ".concat(methodName, " is not defined, using fallback."));
             return function() {
                 return Promise.resolve();
             };

package/dist/index.js

@@ -396,7 +396,7 @@ var NativeMethodError = /*#__PURE__*/ function(Error1) {
     return NativeMethodError;
 }(_wrap_native_super(Error));
 // src/linkBridge.ts
-import { createEvents } from "@webview-bridge/utils";
+import { createEvents, createRandomId as createRandomId2 } from "@webview-bridge/utils";
 // src/internal/bridgeInstance.ts
 import { createRandomId, createResolver, timeout } from "@webview-bridge/utils";
 // src/internal/createPromiseProxy.ts
@@ -481,9 +481,9 @@ var mockStore = function() {
 // src/internal/bridgeInstance.ts
 var BridgeInstance = /*#__PURE__*/ function() {
     "use strict";
-    function BridgeInstance(_options, _emitter) {
-        var _bridgeMethods = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : [], _nativeInitialState = arguments.length > 3 ? arguments[3] : void 0;
+    function BridgeInstance(_bridgeId, _options, _emitter, _bridgeMethods, _nativeInitialState) {
         _class_call_check(this, BridgeInstance);
+        this._bridgeId = _bridgeId;
         this._options = _options;
         this._emitter = _emitter;
         this._bridgeMethods = _bridgeMethods;
@@ -525,9 +525,11 @@ var BridgeInstance = /*#__PURE__*/ function() {
                 var _window_ReactNativeWebView;
                 (_window_ReactNativeWebView = window.ReactNativeWebView) === null || _window_ReactNativeWebView === void 0 ? void 0 : _window_ReactNativeWebView.postMessage(JSON.stringify(body ? {
                     type: type,
-                    body: body
+                    body: body,
+                    bridgeId: this._bridgeId
                 } : {
-                    type: type
+                    type: type,
+                    bridgeId: this._bridgeId
                 }));
             }
         },
@@ -622,7 +624,7 @@ var BridgeInstance = /*#__PURE__*/ function() {
                         value: nativeMethod,
                         writable: false
                     });
-                    return _object_spread_props(_object_spread({}, acc), _define_property({}, methodName, nativeMethod));
+                    return Object.assign(acc, _define_property({}, methodName, nativeMethod));
                 }, initialBridge);
                 this.loose = this._createLoose(nativeMethods);
                 this.store = linkBridgeStore(this._emitter, _object_spread({}, nativeMethods, nativeInitialState));
@@ -699,15 +701,14 @@ var linkBridge = function() {
     if (!window.ReactNativeWebView) {
         console.warn("[WebViewBridge] Not in a WebView environment");
     }
+    var bridgeId = createRandomId2();
     var emitter = createEvents();
-    if (!window.nativeEmitter) {
-        window.nativeEmitter = emitter;
-    }
+    window.nativeEmitter = _object_spread_props(_object_spread({}, window.nativeEmitter || {}), _define_property({}, bridgeId, emitter));
     var _window___bridgeMethods__;
     var bridgeMethods = (_window___bridgeMethods__ = window.__bridgeMethods__) !== null && _window___bridgeMethods__ !== void 0 ? _window___bridgeMethods__ : [];
     var _window___bridgeInitialState__;
     var nativeInitialState = (_window___bridgeInitialState__ = window.__bridgeInitialState__) !== null && _window___bridgeInitialState__ !== void 0 ? _window___bridgeInitialState__ : {};
-    var instance = new BridgeInstance(options, emitter, bridgeMethods, nativeInitialState);
+    var instance = new BridgeInstance(bridgeId, options, emitter, bridgeMethods, nativeInitialState);
     if (bridgeMethods.length === 0) {
         var unsubscribe = emitter.on("hydrate", function(param) {
             var bridgeMethods2 = param.bridgeMethods, nativeInitialState2 = param.nativeInitialState;
@@ -732,9 +733,8 @@ var linkBridge = function() {
                     onFallback === null || onFallback === void 0 ? void 0 : onFallback(methodName, args);
                     return Promise.reject(new MethodNotFoundError(methodName));
                 };
-            } else {
-                console.warn("[WebViewBridge] ".concat(methodName, " is not defined, using fallback."));
             }
+            console.warn("[WebViewBridge] ".concat(methodName, " is not defined, using fallback."));
             return function() {
                 return Promise.resolve();
             };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@webview-bridge/web",
   "type": "module",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "description": "Fully Type-Safe Integration for React Native WebView and Web",
   "publishConfig": {
     "access": "public"
@@ -15,8 +15,8 @@
     "dist",
     "package.json"
   ],
-  "main": "dist/index.js",
-  "module": "dist/index.cjs",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
@@ -26,11 +26,12 @@
     }
   },
   "dependencies": {
-    "@webview-bridge/utils": "1.7.1",
-    "@webview-bridge/types": "1.7.1"
+    "@webview-bridge/utils": "1.7.3",
+    "@webview-bridge/types": "1.7.3"
   },
   "scripts": {
     "build": "tsup src/index.ts --format cjs,esm --dts --target es5",
-    "test:type": "tsc --noEmit"
+    "test:type": "tsc --noEmit",
+    "lint": "biome check"
   }
 }