@datadog/mobile-react-native-webview 2.13.2 → 2.14.0

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["WebView","RNWebView","React","forwardRef","useCallback","NativeDdLogs","NativeDdSdk","NativeDdWebView","isNewArchitecture","getWebViewEventBridgingJS","wrapJsCodeInTryAndCatch","jsx","_jsx","WebViewComponent","props","ref","userDefinedOnMessage","onMessage","event","handleDatadogMessage","ddMessage","type","message","logUserCodeErrors","error","consumeWebviewEvent","nativeEvent","data","jsonMsg","JSON","parse","source","err","getInjectedJavascriptBeforeContentLoaded","allowedHosts","injectedJavaScriptBeforeContentLoaded","nativeConfig","component","injectedJavaScript"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SAASA,OAAO,IAAIC,SAAS,QAAQ,sBAAsB;AAC3D,OAAOC,KAAK,IAAIC,UAAU,EAAEC,WAAW,QAAQ,OAAO;AAEtD,OAAOC,YAAY,MAAM,0BAA0B;AACnD,SAASC,WAAW,QAAQ,yBAAyB;AACrD,SAASC,eAAe,QAAQ,yBAAyB;AACzD,SAASC,iBAAiB,QAAQ,mBAAmB;AACrD,SACIC,yBAAyB,EACzBC,uBAAuB,QACpB,0BAA0B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAkBlC,MAAMC,gBAAgB,GAAGA,CAACC,KAAY,EAAEC,GAAgC,KAAK;EACzE,MAAMC,oBAAoB,GAAGF,KAAK,CAACG,SAAS;EAE5C,MAAMA,SAAS,GAAGb,WAAW,CACxBc,KAA0B,IAAK;IAC5B,MAAMC,oBAAoB,GAAIC,SAA+B,IAAK;MAC9D,IACIA,SAAS,CAACC,IAAI,KAAK,OAAO,IAC1BD,SAAS,CAACE,OAAO,IAAI,IAAI,KACxBR,KAAK,CAACS,iBAAiB,IAAI,KAAK,CAAC,EACpC;QACElB,YAAY,EAAEmB,KAAK,CAACJ,SAAS,CAACE,OAAO,EAAE,CAAC,CAAC,CAAC;MAC9C,CAAC,MAAM,IACHF,SAAS,CAACC,IAAI,KAAK,cAAc,IACjCD,SAAS,CAACE,OAAO,IAAI,IAAI,EAC3B;QACEhB,WAAW,EAAEmB,mBAAmB,CAACL,SAAS,CAACE,OAAO,CAAC;MACvD;IACJ,CAAC;IAED,MAAMA,OAAO,GAAGJ,KAAK,CAACQ,WAAW,CAACC,IAAI;IACtC,IAAIL,OAAO,IAAI,IAAI,EAAE;MACjB;IACJ;IAEA,IAAI;MACA,MAAMM,OAAO,GAAGC,IAAI,CAACC,KAAK,CAACR,OAAO,CAAC;MACnC,IAAIM,OAAO,IAAIA,OAAO,CAACG,MAAM,KAAK,SAAS,EAAE;QACzCZ,oBAAoB,CAACS,OAAO,CAAC;MACjC,CAAC,MAAM;QACHZ,oBAAoB,GAAGE,KAAK,CAAC;MACjC;IACJ,CAAC,CAAC,OAAOc,GAAG,EAAE;MACVhB,oBAAoB,GAAGE,KAAK,CAAC;IACjC;EACJ,CAAC,EACD,CAACF,oBAAoB,EAAEF,KAAK,CAACS,iBAAiB,CAClD,CAAC;EAED,MAAMU,wCAAwC,GAAGA,CAAA,KAA0B;IACvE,IAAIzB,iBAAiB,CAAC,CAAC,EAAE;MACrB,OAAOC,yBAAyB,CAC5BK,KAAK,CAACoB,YAAY,EAClBpB,KAAK,CAACqB,qCACV,CAAC;IACL,CAAC,MAAM;MACH,OAAOzB,uBAAuB,CAC1BI,KAAK,CAACqB,qCACV,CAAC;IACL;EACJ,CAAC;EAED,oBACIvB,IAAA,CAACX,SAAS;IAAA,GACFa,KAAK;IACTG,SAAS,EAAEA,SAAU;IACrBmB,YAAY,EAAE;MACVC,SAAS,EAAE9B,eAAe;MAC1BO,KAAK,EAAE;QACHoB,YAAY,EAAEpB,KAAK,CAACoB;MACxB;IACJ,CAAE;IACFI,kBAAkB,EAAE5B,uBAAuB,CACvCI,KAAK,CAACwB,kBACV,CAAE;IACFH,qCAAqC,EAAEF,wCAAwC,CAAC,CAAE;IAClFlB,GAAG,EAAEA;EAAI,CACZ,CAAC;AAEV,CAAC;AAED,OAAO,MAAMf,OAAO,gBAAGG,UAAU,CAACU,gBAAgB,CAAC;;AAEnD;AACA,eAAeb,OAAO","ignoreList":[]}
+{"version":3,"names":["WebView","RNWebView","React","forwardRef","useCallback","useMemo","NativeDdLogs","NativeDdSdk","NativeDdWebView","wrapJsCodeInTryAndCatch","wrapJsCodeWithAllowedHosts","jsx","_jsx","WebViewComponent","props","ref","userDefinedOnMessage","onMessage","event","handleDatadogMessage","ddMessage","type","message","logUserCodeErrors","error","consumeWebviewEvent","nativeEvent","data","jsonMsg","JSON","parse","source","err","injectedJavascript","injectedJavaScript","injectedJavascriptBeforeContentLoaded","injectedJavaScriptBeforeContentLoaded","allowedHosts","nativeConfig","component"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SAASA,OAAO,IAAIC,SAAS,QAAQ,sBAAsB;AAC3D,OAAOC,KAAK,IAAIC,UAAU,EAAEC,WAAW,EAAEC,OAAO,QAAQ,OAAO;AAE/D,OAAOC,YAAY,MAAM,0BAA0B;AACnD,SAASC,WAAW,QAAQ,yBAAyB;AACrD,SAASC,eAAe,QAAQ,yBAAyB;AACzD,SACIC,uBAAuB,EACvBC,0BAA0B,QACvB,0BAA0B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAkBlC,MAAMC,gBAAgB,GAAGA,CAACC,KAAY,EAAEC,GAAgC,KAAK;EACzE,MAAMC,oBAAoB,GAAGF,KAAK,CAACG,SAAS;EAE5C,MAAMA,SAAS,GAAGb,WAAW,CACxBc,KAA0B,IAAK;IAC5B,MAAMC,oBAAoB,GAAIC,SAA+B,IAAK;MAC9D,IACIA,SAAS,CAACC,IAAI,KAAK,OAAO,IAC1BD,SAAS,CAACE,OAAO,IAAI,IAAI,KACxBR,KAAK,CAACS,iBAAiB,IAAI,KAAK,CAAC,EACpC;QACEjB,YAAY,EAAEkB,KAAK,CAACJ,SAAS,CAACE,OAAO,EAAE,CAAC,CAAC,CAAC;MAC9C,CAAC,MAAM,IACHF,SAAS,CAACC,IAAI,KAAK,cAAc,IACjCD,SAAS,CAACE,OAAO,IAAI,IAAI,EAC3B;QACEf,WAAW,EAAEkB,mBAAmB,CAACL,SAAS,CAACE,OAAO,CAAC;MACvD;IACJ,CAAC;IAED,MAAMA,OAAO,GAAGJ,KAAK,CAACQ,WAAW,CAACC,IAAI;IACtC,IAAIL,OAAO,IAAI,IAAI,EAAE;MACjB;IACJ;IAEA,IAAI;MACA,MAAMM,OAAO,GAAGC,IAAI,CAACC,KAAK,CAACR,OAAO,CAAC;MACnC,IAAIM,OAAO,IAAIA,OAAO,CAACG,MAAM,KAAK,SAAS,EAAE;QACzCZ,oBAAoB,CAACS,OAAO,CAAC;MACjC,CAAC,MAAM;QACHZ,oBAAoB,GAAGE,KAAK,CAAC;MACjC;IACJ,CAAC,CAAC,OAAOc,GAAG,EAAE;MACVhB,oBAAoB,GAAGE,KAAK,CAAC;IACjC;EACJ,CAAC,EACD,CAACF,oBAAoB,EAAEF,KAAK,CAACS,iBAAiB,CAClD,CAAC;EAED,MAAMU,kBAAkB,GAAG5B,OAAO,CAAC,MAAM;IACrC,OAAOI,uBAAuB,CAACK,KAAK,CAACoB,kBAAkB,CAAC;EAC5D,CAAC,EAAE,CAACpB,KAAK,CAACoB,kBAAkB,CAAC,CAAC;EAE9B,MAAMC,qCAAqC,GAAG9B,OAAO,CAAC,MAAM;IACxD,OAAOK,0BAA0B,CAC7BI,KAAK,CAACsB,qCAAqC,EAC3CtB,KAAK,CAACuB,YACV,CAAC;EACL,CAAC,EAAE,CAACvB,KAAK,CAACsB,qCAAqC,EAAEtB,KAAK,CAACuB,YAAY,CAAC,CAAC;EAErE,oBACIzB,IAAA,CAACX,SAAS;IAAA,GACFa,KAAK;IACTG,SAAS,EAAEA,SAAU;IACrBqB,YAAY,EAAE;MACVC,SAAS,EAAE/B,eAAe;MAC1BM,KAAK,EAAE;QACHuB,YAAY,EAAEvB,KAAK,CAACuB;MACxB;IACJ,CAAE;IACFH,kBAAkB,EAAED,kBAAmB;IACvCG,qCAAqC,EACjCD,qCACH;IACDpB,GAAG,EAAEA;EAAI,CACZ,CAAC;AAEV,CAAC;AAED,OAAO,MAAMf,OAAO,gBAAGG,UAAU,CAACU,gBAAgB,CAAC;;AAEnD;AACA,eAAeb,OAAO","ignoreList":[]}

package/lib/module/specs/NativeDdWebView.js

@@ -5,7 +5,6 @@
  */
 
 import { requireNativeComponent } from 'react-native';
-import { isNewArchitecture } from '../utils/env-utils';
-const NativeDdWebView = !isNewArchitecture() ? requireNativeComponent('DdReactNativeWebView') : undefined;
+const NativeDdWebView = requireNativeComponent('DdReactNativeWebView');
 export { NativeDdWebView };
 //# sourceMappingURL=NativeDdWebView.js.map

package/lib/module/specs/NativeDdWebView.js.map

@@ -1 +1 @@
-{"version":3,"names":["requireNativeComponent","isNewArchitecture","NativeDdWebView","undefined"],"sourceRoot":"../../../src","sources":["specs/NativeDdWebView.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAGA,SAASA,sBAAsB,QAAQ,cAAc;AAErD,SAASC,iBAAiB,QAAQ,oBAAoB;AAEtD,MAAMC,eAAe,GAAG,CAACD,iBAAiB,CAAC,CAAC,GACtCD,sBAAsB,CAA2B,sBAAsB,CAAC,GACxEG,SAAS;AAEf,SAASD,eAAe","ignoreList":[]}
+{"version":3,"names":["requireNativeComponent","NativeDdWebView"],"sourceRoot":"../../../src","sources":["specs/NativeDdWebView.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAGA,SAASA,sBAAsB,QAAQ,cAAc;AAErD,MAAMC,eAAe,GAAGD,sBAAsB,CAC1C,sBACJ,CAAC;AAED,SAASC,eAAe","ignoreList":[]}

package/lib/module/utils/webview-js-utils.js

@@ -15,65 +15,49 @@ export const DATADOG_MESSAGE_PREFIX = '[DATADOG]';
  */
 
 /**
- * Wraps the given JS Code in a try and catch block.
+ * Wraps the given JS Code in a try and catch block, including a
+ * comment with the given allowedHosts in JSON format
  * @param javascriptCode The JS Code to wrap in a try and catch block.
  * @returns the wrapped JS code.
  */
-export const wrapJsCodeInTryAndCatch = javascriptCode => javascriptCode ? `
-    try{
-      ${javascriptCode}
-    }
-    catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-      window.ReactNativeWebView.postMessage(JSON.stringify({
-        source: 'DATADOG',
-        type: 'ERROR',
-        message: errorMsg
-      }));
-      true;
-    }` : undefined;
-
-/**
- * Legacy JS code for bridging the WebView events to DataDog native SDKs for consumption.
- * @param allowedHosts The list of allowed hosts.
- * @param customJavaScriptCode Custom user JS code to inject along with the Datadog bridging logic.
- * @returns The JS code block as a string.
- */
-export const getWebViewEventBridgingJS = (allowedHosts, customJavaScriptCode) => `
-    window.DatadogEventBridge = {
-      send(msg) {
-        window.ReactNativeWebView.postMessage(JSON.stringify({
-          source: 'DATADOG',
-          type: 'NATIVE_EVENT',
-          message: msg
-        }));
-        true;
-      },
-      getAllowedWebViewHosts() {
-        return ${formatAllowedHosts(allowedHosts)}
-      }
-    };
-    try{      
-      ${customJavaScriptCode}
-    }
-    catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-      window.ReactNativeWebView.postMessage(JSON.stringify({
-        source: 'DATADOG',
-        type: 'ERROR',
-        message: errorMsg
-      }));
-      true;
-    }
-  `;
+export function wrapJsCodeWithAllowedHosts(javascriptCode, allowedHosts) {
+  let jsCode = '';
+  const hosts = formatAllowedHosts(allowedHosts);
+  if (hosts) {
+    jsCode = `// #allowedHosts=${JSON.stringify(allowedHosts)}\n`;
+  }
+  return javascriptCode ? `${jsCode}\n${wrapJsCodeInTryAndCatch(javascriptCode)}` : jsCode.trim().length > 0 ? jsCode : undefined;
+}
+export function wrapJsCodeInTryAndCatch(javascriptCode) {
+  return javascriptCode ? `try{
+  ${javascriptCode}
+}
+catch (error) {
+  const errorMsg = error instanceof Error ? error.message : String(error);
+  window.ReactNativeWebView.postMessage(JSON.stringify({
+    source: 'DATADOG',
+    type: 'ERROR',
+    message: errorMsg
+  }));
+  true;
+}` : undefined;
+}
 function formatAllowedHosts(allowedHosts) {
   try {
-    return `'${JSON.stringify(allowedHosts)}'`;
+    if (!allowedHosts) {
+      throw new Error('allowedHosts is undefined');
+    }
+    const jsonHosts = JSON.stringify(allowedHosts);
+    if (!jsonHosts) {
+      throw new Error("JSON.stringify returned 'undefined' for the given hosts");
+    }
+    return jsonHosts;
   } catch (e) {
     if (NativeDdSdk) {
       NativeDdSdk.telemetryError(getErrorMessage(e), getErrorStackTrace(e), 'AllowedHostsError');
     }
-    return "'[]'";
+    console.warn(`[@datadog/mobile-react-native-webview] Invalid 'allowedHosts' format: ${e}`);
+    return undefined;
   }
 }
 const getErrorMessage = error => {

package/lib/module/utils/webview-js-utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeDdSdk","DATADOG_MESSAGE_PREFIX","wrapJsCodeInTryAndCatch","javascriptCode","undefined","getWebViewEventBridgingJS","allowedHosts","customJavaScriptCode","formatAllowedHosts","JSON","stringify","e","telemetryError","getErrorMessage","getErrorStackTrace","error","EMPTY_MESSAGE","message","String","EMPTY_STACK_TRACE","stack","stacktrace","componentStack","sourceURL","line","column"],"sourceRoot":"../../../src","sources":["utils/webview-js-utils.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["NativeDdSdk","DATADOG_MESSAGE_PREFIX","wrapJsCodeWithAllowedHosts","javascriptCode","allowedHosts","jsCode","hosts","formatAllowedHosts","JSON","stringify","wrapJsCodeInTryAndCatch","trim","length","undefined","Error","jsonHosts","e","telemetryError","getErrorMessage","getErrorStackTrace","console","warn","error","EMPTY_MESSAGE","message","String","EMPTY_STACK_TRACE","stack","stacktrace","componentStack","sourceURL","line","column"],"sourceRoot":"../../../src","sources":["utils/webview-js-utils.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAuB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAkC,MAAM,OAAO,CAAC;AAYvD,KAAK,KAAK,GAAG,YAAY,GAAG;IACxB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,qCAAqC,CAAC,EAAE,MAAM,CAAC;CAClD,CAAC;AAyEF,eAAO,MAAM,OAAO;IArFhB;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;0CA2E4C,CAAC;AAGpD,eAAe,OAAO,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAuB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAA2C,MAAM,OAAO,CAAC;AAWhE,KAAK,KAAK,GAAG,YAAY,GAAG;IACxB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,qCAAqC,CAAC,EAAE,MAAM,CAAC;CAClD,CAAC;AAuEF,eAAO,MAAM,OAAO;IAnFhB;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;0CAyE4C,CAAC;AAGpD,eAAe,OAAO,CAAC"}

package/lib/typescript/specs/NativeDdWebView.d.ts

@@ -1,4 +1,4 @@
 import type { CommonNativeWebViewProps } from 'react-native-webview/lib/WebViewTypes';
-declare const NativeDdWebView: import("react-native").HostComponent<CommonNativeWebViewProps> | undefined;
+declare const NativeDdWebView: import("react-native").HostComponent<CommonNativeWebViewProps>;
 export { NativeDdWebView };
 //# sourceMappingURL=NativeDdWebView.d.ts.map

package/lib/typescript/specs/NativeDdWebView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeDdWebView.d.ts","sourceRoot":"","sources":["../../../src/specs/NativeDdWebView.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AAKtF,QAAA,MAAM,eAAe,4EAEN,CAAC;AAEhB,OAAO,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"NativeDdWebView.d.ts","sourceRoot":"","sources":["../../../src/specs/NativeDdWebView.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AAGtF,QAAA,MAAM,eAAe,gEAEpB,CAAC;AAEF,OAAO,EAAE,eAAe,EAAE,CAAC"}

package/lib/typescript/utils/webview-js-utils.d.ts

@@ -19,16 +19,11 @@ export type DatadogMessageFormat = {
     message: string;
 };
 /**
- * Wraps the given JS Code in a try and catch block.
+ * Wraps the given JS Code in a try and catch block, including a
+ * comment with the given allowedHosts in JSON format
  * @param javascriptCode The JS Code to wrap in a try and catch block.
  * @returns the wrapped JS code.
  */
-export declare const wrapJsCodeInTryAndCatch: (javascriptCode?: string) => string | undefined;
-/**
- * Legacy JS code for bridging the WebView events to DataDog native SDKs for consumption.
- * @param allowedHosts The list of allowed hosts.
- * @param customJavaScriptCode Custom user JS code to inject along with the Datadog bridging logic.
- * @returns The JS code block as a string.
- */
-export declare const getWebViewEventBridgingJS: (allowedHosts?: string[], customJavaScriptCode?: string) => string;
+export declare function wrapJsCodeWithAllowedHosts(javascriptCode?: string, allowedHosts?: string[]): string | undefined;
+export declare function wrapJsCodeInTryAndCatch(javascriptCode: string | undefined): string | undefined;
 //# sourceMappingURL=webview-js-utils.d.ts.map

package/lib/typescript/utils/webview-js-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webview-js-utils.d.ts","sourceRoot":"","sources":["../../../src/utils/webview-js-utils.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,sBAAsB,cAAc,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,kBAAkB;AAC1B;;GAEG;AACD,OAAO;AACT;;GAEG;GACD,cAAc,CAAC;AAErB;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IAC/B,IAAI,EAAE,kBAAkB,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,oBACf,MAAM,KACxB,MAAM,GAAG,SAeO,CAAC;AAEpB;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,kBACnB,MAAM,EAAE,yBACA,MAAM,KAC9B,MA2BA,CAAC"}
+{"version":3,"file":"webview-js-utils.d.ts","sourceRoot":"","sources":["../../../src/utils/webview-js-utils.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,sBAAsB,cAAc,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,kBAAkB;AAC1B;;GAEG;AACD,OAAO;AACT;;GAEG;GACD,cAAc,CAAC;AAErB;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IAC/B,IAAI,EAAE,kBAAkB,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACtC,cAAc,CAAC,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,MAAM,EAAE,GACxB,MAAM,GAAG,SAAS,CAYpB;AAED,wBAAgB,uBAAuB,CACnC,cAAc,EAAE,MAAM,GAAG,SAAS,GACnC,MAAM,GAAG,SAAS,CAepB"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@datadog/mobile-react-native-webview",
-    "version": "2.13.2",
+    "version": "2.14.0",
     "description": "A client-side React Native module to interact with react-native-webview and Datadog",
     "keywords": [
         "datadog",
@@ -94,5 +94,5 @@
             "javaPackageName": "com.datadog.reactnative.webview"
         }
     },
-    "gitHead": "c87943251791af901cc49d1444d4a224e3846ac0"
+    "gitHead": "5a2b777da2d65922cc423992feee052f5c2b104f"
 }

package/src/__tests__/WebviewDatadogInjectedJS.test.tsx

@@ -3,13 +3,11 @@
  * This product includes software developed at Datadog (https://www.datadoghq.com/).
  * Copyright 2016-Present Datadog, Inc.
  */
-
 import { render } from '@testing-library/react-native';
 import { WebView as RNWebView } from 'react-native-webview';
 import React from 'react';
 
 import { WebView } from '../index';
-import { isNewArchitecture } from '../utils/env-utils';
 
 import { dedent } from './__utils__/string-utils';
 
@@ -28,7 +26,7 @@ jest.mock('react-native-webview', () => {
 const callfunction = jest.fn();
 const postMessageMock = jest.fn();
 
-window['ReactNativeWebView'] = {
+(window as any)['ReactNativeWebView'] = {
     postMessage: postMessageMock
 };
 
@@ -129,19 +127,18 @@ describe('Webview', () => {
         const realInjectedJs = dedent(
             mockedWebView.mock.calls[0][0].injectedJavaScript ?? ''
         );
-        const expected = dedent(`
-            try{
-              testInjectedJavaScript()
-            }
-            catch (error) {
-              const errorMsg = error instanceof Error ? error.message : String(error);
-              window.ReactNativeWebView.postMessage(JSON.stringify({
-                source: 'DATADOG',
-                type: 'ERROR',
-                message: errorMsg
-              }));
-              true;
-            }`);
+        const expected = dedent(`try{
+  testInjectedJavaScript()
+}
+catch (error) {
+  const errorMsg = error instanceof Error ? error.message : String(error);
+  window.ReactNativeWebView.postMessage(JSON.stringify({
+    source: 'DATADOG',
+    type: 'ERROR',
+    message: errorMsg
+  }));
+  true;
+}`);
 
         expect(realInjectedJs).toBe(expected);
     });
@@ -167,51 +164,20 @@ describe('Webview', () => {
             mockedWebView.mock.calls[0][0]
                 .injectedJavaScriptBeforeContentLoaded ?? ''
         );
-        let expected;
-
-        if (isNewArchitecture()) {
-            expected = dedent(`
-                window.DatadogEventBridge = {
-                  send(msg) {
-                    window.ReactNativeWebView.postMessage(JSON.stringify({
-                      source: 'DATADOG',
-                      type: 'NATIVE_EVENT',
-                      message: msg
-                    }));
-                    true;
-                  },
-                  getAllowedWebViewHosts() {
-                    return '["localhost","example.com"]'
-                  }
-                };
-                try{      
-                  testInjectedJavaScript()
-                }
-                catch (error) {
-                  const errorMsg = error instanceof Error ? error.message : String(error);
-                  window.ReactNativeWebView.postMessage(JSON.stringify({
-                    source: 'DATADOG',
-                    type: 'ERROR',
-                    message: errorMsg
-                  }));
-                  true;
-                }
-  `);
-        } else {
-            expected = dedent(`
-                try{
-                  testInjectedJavaScript()
-                }
-                catch (error) {
-                  const errorMsg = error instanceof Error ? error.message : String(error);
-                  window.ReactNativeWebView.postMessage(JSON.stringify({
-                    source: 'DATADOG',
-                    type: 'ERROR',
-                    message: errorMsg
-                  }));
-                  true;
-                }`);
-        }
+        const expected = dedent(`// #allowedHosts=["localhost","example.com"]
+
+try{
+  testInjectedJavaScript()
+}
+catch (error) {
+  const errorMsg = error instanceof Error ? error.message : String(error);
+  window.ReactNativeWebView.postMessage(JSON.stringify({
+    source: 'DATADOG',
+    type: 'ERROR',
+    message: errorMsg
+  }));
+  true;
+}`);
 
         expect(realInjectedJs).toBe(expected);
     });

package/src/__tests__/webview-js-utils.test.ts

@@ -4,7 +4,10 @@
  * Copyright 2016-Present Datadog, Inc.
  */
 
-import { wrapJsCodeInTryAndCatch } from '../utils/webview-js-utils';
+import {
+    wrapJsCodeInTryAndCatch,
+    wrapJsCodeWithAllowedHosts
+} from '../utils/webview-js-utils';
 
 import { dedent } from './__utils__/string-utils';
 
@@ -13,13 +16,73 @@ describe('WebView JS Utils', () => {
         jest.clearAllMocks();
     });
 
-    describe('M wrapJsCodeInTryCatch wraps JS code in try & catch with DD messaging W jsCode is not null', () => {
-        it('M returns the JS code wrapped in try and catch', () => {
+    describe('M wrapJsCodeWithAllowedHosts wraps JS code in try & catch with DD messaging W jsCode is not null', () => {
+        it('M returns the allowedHosts JS comment W { jsCode = undefined & valid allowedHosts }', () => {
             // Given
+            const warnSpy = jest
+                .spyOn(console, 'warn')
+                .mockImplementation(() => {});
+            const jsCode = undefined;
+
+            // When
+            const wrappedCode = wrapJsCodeWithAllowedHosts(jsCode, [
+                'example.com',
+                'test.com'
+            ]);
+
+            // Then
+            const expected = '// #allowedHosts=["example.com","test.com"]\n';
+            expect(wrappedCode).toBeDefined();
+            expect(dedent(wrappedCode as string)).toBe(expected);
+            expect(warnSpy).not.toHaveBeenCalled();
+
+            warnSpy.mockRestore();
+        });
+
+        it('M returns the JS code wrapped in try and catch with allowedHosts comment W { custom JS code & valid allowedHosts }', () => {
+            // Given
+            const warnSpy = jest
+                .spyOn(console, 'warn')
+                .mockImplementation(() => {});
             const jsCode = "console.log('test')";
 
             // When
-            const wrappedCode = wrapJsCodeInTryAndCatch(jsCode);
+            const wrappedCode = wrapJsCodeWithAllowedHosts(jsCode, [
+                'example.com',
+                'test.com'
+            ]);
+
+            // Then
+            const expected = dedent(`// #allowedHosts=["example.com","test.com"]
+
+try{
+  console.log('test')
+}
+catch (error) {
+  const errorMsg = error instanceof Error ? error.message : String(error);
+  window.ReactNativeWebView.postMessage(JSON.stringify({
+    source: 'DATADOG',
+    type: 'ERROR',
+    message: errorMsg
+  }));
+  true;
+}`);
+            expect(wrappedCode).toBeDefined();
+            expect(dedent(wrappedCode as string)).toBe(expected);
+            expect(warnSpy).not.toHaveBeenCalled();
+
+            warnSpy.mockRestore();
+        });
+
+        it('M returns the JS code wrapped in try and catch W { custom JS code & allowedHosts = undefined }', () => {
+            // Given
+            const warnSpy = jest
+                .spyOn(console, 'warn')
+                .mockImplementation(() => {});
+            const jsCode = "console.log('test')";
+
+            // When
+            const wrappedCode = wrapJsCodeWithAllowedHosts(jsCode, undefined);
 
             // Then
             const expected = dedent(`
@@ -37,15 +100,97 @@ describe('WebView JS Utils', () => {
             }`);
             expect(wrappedCode).toBeDefined();
             expect(dedent(wrappedCode as string)).toBe(expected);
+            expect(warnSpy).toHaveBeenCalledWith(
+                "[@datadog/mobile-react-native-webview] Invalid 'allowedHosts' format: Error: allowedHosts is undefined"
+            );
+
+            warnSpy.mockRestore();
         });
 
-        it('M returns undefined W { jsCode = undefined }', () => {
+        it('M returns the JS code wrapped in try and catch W { custom JS code & invalid JSON allowedHosts }', () => {
+            // Given
+            const warnSpy = jest
+                .spyOn(console, 'warn')
+                .mockImplementation(() => {});
+            const jsCode = "console.log('test')";
+
+            // When
+            const wrappedCode = wrapJsCodeWithAllowedHosts(
+                jsCode,
+                (() => 'incompatible') as any
+            );
+
+            // Then
+            const expected = dedent(`
+            try{
+              console.log('test')
+            }
+            catch (error) {
+              const errorMsg = error instanceof Error ? error.message : String(error);
+              window.ReactNativeWebView.postMessage(JSON.stringify({
+                source: 'DATADOG',
+                type: 'ERROR',
+                message: errorMsg
+              }));
+              true;
+            }`);
+            expect(wrappedCode).toBeDefined();
+            expect(dedent(wrappedCode as string)).toBe(expected);
+            expect(warnSpy).toHaveBeenCalledWith(
+                "[@datadog/mobile-react-native-webview] Invalid 'allowedHosts' format: Error: JSON.stringify returned 'undefined' for the given hosts"
+            );
+
+            warnSpy.mockRestore();
+        });
+
+        it('M returns undefined W { jsCode = undefined & allowedHosts = undefined }', () => {
             // Given
             const jsCode = undefined;
+            const allowedHosts = undefined;
             // When
-            const wrappedCode = wrapJsCodeInTryAndCatch(jsCode);
+            const wrappedCode = wrapJsCodeWithAllowedHosts(
+                jsCode,
+                allowedHosts
+            );
             // Then
             expect(wrappedCode).toBe(undefined);
         });
     });
+
+    describe('M wrapJsCodeInTryAndCatch wraps the given JS code in a try & catch block with DD messaging', () => {
+        it('M returns the JS code wrapped in try and catch W { custom JS code is defined }', () => {
+            // Given
+            const jsCode = "console.log('test')";
+
+            // When
+            const wrappedCode = wrapJsCodeInTryAndCatch(jsCode);
+
+            // Then
+            const expected = dedent(`try{
+  console.log('test')
+}
+catch (error) {
+  const errorMsg = error instanceof Error ? error.message : String(error);
+  window.ReactNativeWebView.postMessage(JSON.stringify({
+    source: 'DATADOG',
+    type: 'ERROR',
+    message: errorMsg
+  }));
+  true;
+}`);
+            expect(wrappedCode).toBeDefined();
+            expect(dedent(wrappedCode as string)).toBe(expected);
+        });
+
+        it('M returns undefined W { custom JS code is undefined }', () => {
+            // Given
+            const jsCode = undefined;
+
+            // When
+            const wrappedCode = wrapJsCodeInTryAndCatch(jsCode);
+
+            // Then
+            expect(wrappedCode).toBeUndefined();
+        });
+    });
 });

package/src/index.tsx

@@ -5,15 +5,14 @@
  */
 import type { WebViewMessageEvent, WebViewProps } from 'react-native-webview';
 import { WebView as RNWebView } from 'react-native-webview';
-import React, { forwardRef, useCallback } from 'react';
+import React, { forwardRef, useCallback, useMemo } from 'react';
 
 import NativeDdLogs from './ext-specs/NativeDdLogs';
 import { NativeDdSdk } from './ext-specs/NativeDdSdk';
 import { NativeDdWebView } from './specs/NativeDdWebView';
-import { isNewArchitecture } from './utils/env-utils';
 import {
-    getWebViewEventBridgingJS,
-    wrapJsCodeInTryAndCatch
+    wrapJsCodeInTryAndCatch,
+    wrapJsCodeWithAllowedHosts
 } from './utils/webview-js-utils';
 import type { DatadogMessageFormat } from './utils/webview-js-utils';
 
@@ -71,18 +70,16 @@ const WebViewComponent = (props: Props, ref: React.Ref<RNWebView<Props>>) => {
         [userDefinedOnMessage, props.logUserCodeErrors]
     );
 
-    const getInjectedJavascriptBeforeContentLoaded = (): string | undefined => {
-        if (isNewArchitecture()) {
-            return getWebViewEventBridgingJS(
-                props.allowedHosts,
-                props.injectedJavaScriptBeforeContentLoaded
-            );
-        } else {
-            return wrapJsCodeInTryAndCatch(
-                props.injectedJavaScriptBeforeContentLoaded
-            );
-        }
-    };
+    const injectedJavascript = useMemo(() => {
+        return wrapJsCodeInTryAndCatch(props.injectedJavaScript);
+    }, [props.injectedJavaScript]);
+
+    const injectedJavascriptBeforeContentLoaded = useMemo(() => {
+        return wrapJsCodeWithAllowedHosts(
+            props.injectedJavaScriptBeforeContentLoaded,
+            props.allowedHosts
+        );
+    }, [props.injectedJavaScriptBeforeContentLoaded, props.allowedHosts]);
 
     return (
         <RNWebView
@@ -94,10 +91,10 @@ const WebViewComponent = (props: Props, ref: React.Ref<RNWebView<Props>>) => {
                     allowedHosts: props.allowedHosts
                 }
             }}
-            injectedJavaScript={wrapJsCodeInTryAndCatch(
-                props.injectedJavaScript
-            )}
-            injectedJavaScriptBeforeContentLoaded={getInjectedJavascriptBeforeContentLoaded()}
+            injectedJavaScript={injectedJavascript}
+            injectedJavaScriptBeforeContentLoaded={
+                injectedJavascriptBeforeContentLoaded
+            }
             ref={ref}
         />
     );

package/src/specs/NativeDdWebView.ts

@@ -7,10 +7,8 @@
 import type { CommonNativeWebViewProps } from 'react-native-webview/lib/WebViewTypes';
 import { requireNativeComponent } from 'react-native';
 
-import { isNewArchitecture } from '../utils/env-utils';
-
-const NativeDdWebView = !isNewArchitecture()
-    ? requireNativeComponent<CommonNativeWebViewProps>('DdReactNativeWebView')
-    : undefined;
+const NativeDdWebView = requireNativeComponent<CommonNativeWebViewProps>(
+    'DdReactNativeWebView'
+);
 
 export { NativeDdWebView };