react-native-worklets 0.11.1 → 0.11.2

package/Common/cpp/worklets/WorkletRuntime/WorkletHermesRuntime.cpp

@@ -38,11 +38,14 @@ WorkletHermesRuntime::WorkletHermesRuntime(std::unique_ptr<facebook::hermes::Her
         auto code = std::make_shared<const jsi::StringBuffer>(args[0].asString(rt).utf8(rt));
         std::string sourceURL;
         if (count > 1 && args[1].isString()) {
-          sourceURL = args[1].asString(rt).utf8(rt);
+          sourceURL = args[1].getString(rt).utf8(rt);
         }
         std::shared_ptr<const jsi::Buffer> sourceMap;
         if (count > 2 && args[2].isString()) {
-          sourceMap = std::make_shared<const jsi::StringBuffer>(args[2].asString(rt).utf8(rt));
+          auto sourceMapString = args[2].getString(rt).utf8(rt);
+          if (!sourceMapString.empty()) {
+            sourceMap = std::make_shared<const jsi::StringBuffer>(std::move(sourceMapString));
+          }
         }
         return wrappedRuntime->evaluateJavaScriptWithSourceMap(code, sourceMap, sourceURL);
       });

package/RNWorklets.podspec

@@ -57,7 +57,6 @@ Pod::Spec.new do |s|
 
   s.dependency 'React-jsi'
   s.dependency 'React-hermes'
-  
   s.pod_target_xcconfig = {
     "USE_HEADERMAP" => "YES",
     "DEFINES_MODULE" => "YES",
@@ -70,6 +69,7 @@ Pod::Spec.new do |s|
       '"$(PODS_ROOT)/DoubleConversion"',
       '"$(PODS_ROOT)/Headers/Private/React-Core"',
       '"$(PODS_ROOT)/Headers/Private/Yoga"',
+      '"$(PODS_CONFIGURATION_BUILD_DIR)/React-utils/React_utils.framework/Headers/react/utils/platform/ios"',
     ].join(' '),
     "FRAMEWORK_SEARCH_PATHS" => '"${PODS_CONFIGURATION_BUILD_DIR}/React-hermes"',
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",

package/apple/worklets/apple/Networking/WorkletsNetworking.mm

@@ -5,9 +5,6 @@
 
 #import <mutex>
 
-#import <FBReactNativeSpec/FBReactNativeSpec.h>
-#import <React-Core/React/RCTFollyConvert.h>
-#import <React-jsi/jsi/JSIDynamic.h>
 #import <React/RCTAssert.h>
 #import <React/RCTConvert.h>
 #import <React/RCTHTTPRequestHandler.h>
@@ -17,7 +14,10 @@
 #import <React/RCTNetworkTask.h>
 #import <React/RCTNetworking.h>
 #import <React/RCTUtils.h>
+#import <ReactCommon/RCTTurboModule.h>
+#import <jsi/JSIDynamic.h>
 #import <react/featureflags/ReactNativeFeatureFlags.h>
+#import <react/utils/FollyConvert.h>
 
 #import <worklets/WorkletRuntime/WorkletRuntime.h>
 #import <worklets/apple/Networking/WorkletsNetworking.h>

package/apple/worklets/apple/WorkletsModule.mm

@@ -13,7 +13,6 @@
 #import <React/RCTCallInvoker.h>
 
 #ifdef WORKLETS_FETCH_PREVIEW_ENABLED
-#import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTNetworking.h>
 #import <ReactCommon/RCTTurboModule.h>
 #import <worklets/apple/Networking/WorkletsNetworking.h>

package/bundleMode/shims/turboModuleRegistryShim.js

@@ -33,7 +33,7 @@ if (
   function getPolyfill(/** @type {string} */ name) {
     if (__DEV__ && !TurboModulesPolyfill?.has(name)) {
       throw new Error(
-        '[Worklets] Accessing TurboModules is not allowed on Worklet Runtimes.'
+        `[Worklets] Accessing TurboModules is not allowed on Worklet Runtimes. Requested: "${String(name)}".`
       );
     } else {
       return TurboModulesPolyfill?.get(name);

package/lib/module/bundleMode/network.native.js

@@ -6,10 +6,15 @@
  * The NetworkingModule itself is injected via C++.
  */
 export function initializeNetworking() {
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
+  require('react-native/Libraries/TurboModule/TurboModuleRegistry');
   const TurboModules = globalThis.TurboModules;
   TurboModules.set('FileReaderModule', makeMockTurboModule('FileReaderModule'));
   TurboModules.set('PlatformConstants', makeMockTurboModule('PlatformConstants'));
   TurboModules.set('WebSocketModule', makeMockTurboModule('WebSocketModule'));
+  TurboModules.set('NativeReactNativeFeatureFlagsCxx', new Proxy({}, {
+    get: () => () => undefined
+  }));
   TurboModules.set('BlobModule', makeMockTurboModule('BlobModule', ['addNetworkingHandler']));
 
   /**

package/lib/module/bundleMode/network.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["initializeNetworking","TurboModules","globalThis","set","makeMockTurboModule","require","noopMethods","name","extraNoopMethods","proxy","Proxy","get","_target","prop","includes","Error","String"],"sourceRoot":"../../../src","sources":["bundleMode/network.native.ts"],"mappings":"AAAA,YAAY;;AAEZ;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,oBAAoBA,CAAA,EAAG;EACrC,MAAMC,YAAY,GAAGC,UAAU,CAACD,YAAY;EAE5CA,YAAY,CAACE,GAAG,CAAC,kBAAkB,EAAEC,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;EAC7EH,YAAY,CAACE,GAAG,CACd,mBAAmB,EACnBC,mBAAmB,CAAC,mBAAmB,CACzC,CAAC;EACDH,YAAY,CAACE,GAAG,CAAC,iBAAiB,EAAEC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;EAC3EH,YAAY,CAACE,GAAG,CACd,YAAY,EACZC,mBAAmB,CAAC,YAAY,EAAE,CAAC,sBAAsB,CAAC,CAC5D,CAAC;;EAED;AACF;AACA;AACA;AACA;AACA;AACA;EACE;EACAC,OAAO,CAAC,sCAAsC,CAAC;AACjD;AAEA,MAAMC,WAAW,GAAG,CAAC,cAAc,CAAC;AAEpC,SAASF,mBAAmBA,CAACG,IAAY,EAAEC,gBAA2B,EAAE;EACtE,MAAMC,KAAK,GAAG,IAAIC,KAAK,CACrB,CAAC,CAAC,EACF;IACEC,GAAG,EAAE,SAASA,GAAGA,CAACC,OAAO,EAAEC,IAAI,EAAE;MAC/B,IACE,CAAC,GAAGP,WAAW,EAAE,IAAIE,gBAAgB,IAAI,EAAE,CAAC,CAAC,CAACM,QAAQ,CAACD,IAAc,CAAC,EACtE;QACA,OAAO,MAAM;UACX,OAAO,MAAM,CAAC,CAAC;QACjB,CAAC;MACH;MACA,MAAM,IAAIE,KAAK,CACb,wCAAwCC,MAAM,CAC5CH,IACF,CAAC,WAAWN,IAAI,8CAA8CA,IAAI,oDACpE,CAAC;IACH;EACF,CACF,CAAC;EAED,OAAOE,KAAK;AACd","ignoreList":[]}
+{"version":3,"names":["initializeNetworking","require","TurboModules","globalThis","set","makeMockTurboModule","Proxy","get","undefined","noopMethods","name","extraNoopMethods","proxy","_target","prop","includes","Error","String"],"sourceRoot":"../../../src","sources":["bundleMode/network.native.ts"],"mappings":"AAAA,YAAY;;AAEZ;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,oBAAoBA,CAAA,EAAG;EACrC;EACAC,OAAO,CAAC,wDAAwD,CAAC;EACjE,MAAMC,YAAY,GAAGC,UAAU,CAACD,YAAY;EAE5CA,YAAY,CAACE,GAAG,CAAC,kBAAkB,EAAEC,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;EAC7EH,YAAY,CAACE,GAAG,CACd,mBAAmB,EACnBC,mBAAmB,CAAC,mBAAmB,CACzC,CAAC;EACDH,YAAY,CAACE,GAAG,CAAC,iBAAiB,EAAEC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;EAC3EH,YAAY,CAACE,GAAG,CACd,kCAAkC,EAClC,IAAIE,KAAK,CAAC,CAAC,CAAC,EAAE;IAAEC,GAAG,EAAEA,CAAA,KAAM,MAAMC;EAAU,CAAC,CAC9C,CAAC;EACDN,YAAY,CAACE,GAAG,CACd,YAAY,EACZC,mBAAmB,CAAC,YAAY,EAAE,CAAC,sBAAsB,CAAC,CAC5D,CAAC;;EAED;AACF;AACA;AACA;AACA;AACA;AACA;EACE;EACAJ,OAAO,CAAC,sCAAsC,CAAC;AACjD;AAEA,MAAMQ,WAAW,GAAG,CAAC,cAAc,CAAC;AAEpC,SAASJ,mBAAmBA,CAACK,IAAY,EAAEC,gBAA2B,EAAE;EACtE,MAAMC,KAAK,GAAG,IAAIN,KAAK,CACrB,CAAC,CAAC,EACF;IACEC,GAAG,EAAE,SAASA,GAAGA,CAACM,OAAO,EAAEC,IAAI,EAAE;MAC/B,IACE,CAAC,GAAGL,WAAW,EAAE,IAAIE,gBAAgB,IAAI,EAAE,CAAC,CAAC,CAACI,QAAQ,CAACD,IAAc,CAAC,EACtE;QACA,OAAO,MAAM;UACX,OAAO,MAAM,CAAC,CAAC;QACjB,CAAC;MACH;MACA,MAAM,IAAIE,KAAK,CACb,wCAAwCC,MAAM,CAC5CH,IACF,CAAC,WAAWJ,IAAI,8CAA8CA,IAAI,oDACpE,CAAC;IACH;EACF,CACF,CAAC;EAED,OAAOE,KAAK;AACd","ignoreList":[]}

package/lib/module/debug/jsVersion.js

@@ -5,5 +5,5 @@
  * version used to build the native part of the library in runtime. Remember to
  * keep this in sync with the version declared in `package.json`
  */
-export const jsVersion = '0.11.1';
+export const jsVersion = '0.11.2';
 //# sourceMappingURL=jsVersion.js.map

package/lib/module/memory/valueUnpacker.native.js

@@ -14,7 +14,7 @@ export function installValueUnpacker() {
         const initData = objectToUnpack.__initData;
         if (initData.bytecode !== undefined) {
           workletFun = globalThis.evalBytecode(initData.bytecode);
-        } else if (globalThis.evalWithSourceMap) {
+        } else if (globalThis.evalWithSourceMap && initData.sourceMap) {
           // if the runtime (hermes only for now) supports loading source maps
           // we want to use the proper filename for the location as it guarantees
           // that debugger understands and loads the source code of the file where

package/lib/module/memory/valueUnpacker.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["installValueUnpacker","workletsCache","Map","handleCache","WeakMap","valueUnpacker","objectToUnpack","workletHash","__workletHash","undefined","workletFun","get","initData","__initData","bytecode","globalThis","evalBytecode","evalWithSourceMap","code","location","sourceMap","evalWithSourceUrl","eval","set","functionInstance","bind","_recur","__init","value","Error","_toString","__valueUnpacker"],"sourceRoot":"../../../src","sources":["memory/valueUnpacker.native.ts"],"mappings":"AAAA,YAAY;;AAcZ,OAAO,SAASA,oBAAoBA,CAAA,EAAG;EACrC,SAAS;EACT,oBAAoB;;EACpB,MAAMC,aAAa,GAAG,IAAIC,GAAG,CAAwB,CAAC;EACtD,MAAMC,WAAW,GAAG,IAAIC,OAAO,CAAkB,CAAC;EAElD,SAASC,aAAaA,CAACC,cAA8B,EAAW;IAC9D,MAAMC,WAAW,GAAGD,cAAc,CAACE,aAAa;IAChD,IAAID,WAAW,KAAKE,SAAS,EAAE;MAC7B,IAAIC,UAAU,GAAGT,aAAa,CAACU,GAAG,CAACJ,WAAW,CAAC;MAC/C,IAAIG,UAAU,KAAKD,SAAS,EAAE;QAC5B,MAAMG,QAAQ,GAAGN,cAAc,CAACO,UAAU;QAC1C,IAAID,QAAQ,CAAEE,QAAQ,KAAKL,SAAS,EAAE;UACpCC,UAAU,GAAGK,UAAU,CAACC,YAAY,CAAEJ,QAAQ,CAAEE,QAAQ,CAAC;QAC3D,CAAC,MAAM,IAAIC,UAAU,CAACE,iBAAiB,EAAE;UACvC;UACA;UACA;UACA;UACAP,UAAU,GAAGK,UAAU,CAACE,iBAAiB,CACvCL,QAAQ,CAAEM,IAAI,EACdN,QAAQ,CAAEO,QAAQ,EAClBP,QAAQ,CAAEQ,SACZ,CAAC;QACH,CAAC,MAAM,IAAIL,UAAU,CAACM,iBAAiB,EAAE;UACvC;UACA;UACA;UACA;UACAX,UAAU,GAAGK,UAAU,CAACM,iBAAiB,CACvCT,QAAQ,CAAEM,IAAI,EACd,WAAWX,WAAW,EACxB,CAAC;QACH,CAAC,MAAM;UACL;UACA;UACAG,UAAU,GAAGY,IAAI,CAACV,QAAQ,CAAEM,IAAK,CAAC;QACpC;QACAjB,aAAa,CAACsB,GAAG,CAAChB,WAAW,EAAEG,UAAW,CAAC;MAC7C;MACA,MAAMc,gBAAgB,GAAGd,UAAU,CAAEe,IAAI,CAACnB,cAAc,CAAC;MACzDA,cAAc,CAACoB,MAAM,GAAGF,gBAAgB;MACxC,OAAOA,gBAAgB;IACzB,CAAC,MAAM,IAAIlB,cAAc,CAACqB,MAAM,KAAKlB,SAAS,EAAE;MAC9C,IAAImB,KAAK,GAAGzB,WAAW,CAACQ,GAAG,CAACL,cAAc,CAAC;MAC3C,IAAIsB,KAAK,KAAKnB,SAAS,EAAE;QACvBmB,KAAK,GAAGtB,cAAc,CAACqB,MAAM,CAAC,CAAC;QAC/BxB,WAAW,CAACoB,GAAG,CAACjB,cAAc,EAAEsB,KAAK,CAAC;MACxC;MACA,OAAOA,KAAK;IACd,CAAC,MAAM;MACL,MAAM,IAAIC,KAAK,CACb,2DAA2Dd,UAAU,CAACe,SAAS,CAC7ExB,cACF,CAAC,IACH,CAAC;IACH;EACF;EAEAS,UAAU,CAACgB,eAAe,GAAG1B,aAA8B;AAC7D","ignoreList":[]}
+{"version":3,"names":["installValueUnpacker","workletsCache","Map","handleCache","WeakMap","valueUnpacker","objectToUnpack","workletHash","__workletHash","undefined","workletFun","get","initData","__initData","bytecode","globalThis","evalBytecode","evalWithSourceMap","sourceMap","code","location","evalWithSourceUrl","eval","set","functionInstance","bind","_recur","__init","value","Error","_toString","__valueUnpacker"],"sourceRoot":"../../../src","sources":["memory/valueUnpacker.native.ts"],"mappings":"AAAA,YAAY;;AAcZ,OAAO,SAASA,oBAAoBA,CAAA,EAAG;EACrC,SAAS;EACT,oBAAoB;;EACpB,MAAMC,aAAa,GAAG,IAAIC,GAAG,CAAwB,CAAC;EACtD,MAAMC,WAAW,GAAG,IAAIC,OAAO,CAAkB,CAAC;EAElD,SAASC,aAAaA,CAACC,cAA8B,EAAW;IAC9D,MAAMC,WAAW,GAAGD,cAAc,CAACE,aAAa;IAChD,IAAID,WAAW,KAAKE,SAAS,EAAE;MAC7B,IAAIC,UAAU,GAAGT,aAAa,CAACU,GAAG,CAACJ,WAAW,CAAC;MAC/C,IAAIG,UAAU,KAAKD,SAAS,EAAE;QAC5B,MAAMG,QAAQ,GAAGN,cAAc,CAACO,UAAU;QAC1C,IAAID,QAAQ,CAAEE,QAAQ,KAAKL,SAAS,EAAE;UACpCC,UAAU,GAAGK,UAAU,CAACC,YAAY,CAAEJ,QAAQ,CAAEE,QAAQ,CAAC;QAC3D,CAAC,MAAM,IAAIC,UAAU,CAACE,iBAAiB,IAAIL,QAAQ,CAAEM,SAAS,EAAE;UAC9D;UACA;UACA;UACA;UACAR,UAAU,GAAGK,UAAU,CAACE,iBAAiB,CACvCL,QAAQ,CAAEO,IAAI,EACdP,QAAQ,CAAEQ,QAAQ,EAClBR,QAAQ,CAAEM,SACZ,CAAC;QACH,CAAC,MAAM,IAAIH,UAAU,CAACM,iBAAiB,EAAE;UACvC;UACA;UACA;UACA;UACAX,UAAU,GAAGK,UAAU,CAACM,iBAAiB,CACvCT,QAAQ,CAAEO,IAAI,EACd,WAAWZ,WAAW,EACxB,CAAC;QACH,CAAC,MAAM;UACL;UACA;UACAG,UAAU,GAAGY,IAAI,CAACV,QAAQ,CAAEO,IAAK,CAAC;QACpC;QACAlB,aAAa,CAACsB,GAAG,CAAChB,WAAW,EAAEG,UAAW,CAAC;MAC7C;MACA,MAAMc,gBAAgB,GAAGd,UAAU,CAAEe,IAAI,CAACnB,cAAc,CAAC;MACzDA,cAAc,CAACoB,MAAM,GAAGF,gBAAgB;MACxC,OAAOA,gBAAgB;IACzB,CAAC,MAAM,IAAIlB,cAAc,CAACqB,MAAM,KAAKlB,SAAS,EAAE;MAC9C,IAAImB,KAAK,GAAGzB,WAAW,CAACQ,GAAG,CAACL,cAAc,CAAC;MAC3C,IAAIsB,KAAK,KAAKnB,SAAS,EAAE;QACvBmB,KAAK,GAAGtB,cAAc,CAACqB,MAAM,CAAC,CAAC;QAC/BxB,WAAW,CAACoB,GAAG,CAACjB,cAAc,EAAEsB,KAAK,CAAC;MACxC;MACA,OAAOA,KAAK;IACd,CAAC,MAAM;MACL,MAAM,IAAIC,KAAK,CACb,2DAA2Dd,UAAU,CAACe,SAAS,CAC7ExB,cACF,CAAC,IACH,CAAC;IACH;EACF;EAEAS,UAAU,CAACgB,eAAe,GAAG1B,aAA8B;AAC7D","ignoreList":[]}

package/lib/typescript/bundleMode/network.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network.native.d.ts","sourceRoot":"","sources":["../../../src/bundleMode/network.native.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,oBAAoB,SAuBnC"}
+{"version":3,"file":"network.native.d.ts","sourceRoot":"","sources":["../../../src/bundleMode/network.native.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,oBAAoB,SA6BnC"}

package/lib/typescript/debug/jsVersion.d.ts

@@ -3,5 +3,5 @@
  * version used to build the native part of the library in runtime. Remember to
  * keep this in sync with the version declared in `package.json`
  */
-export declare const jsVersion = "0.11.1";
+export declare const jsVersion = "0.11.2";
 //# sourceMappingURL=jsVersion.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-worklets",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "The React Native multithreading library",
   "keywords": [
     "react-native",

package/plugin/index.js

@@ -381,9 +381,19 @@ var require_utils = __commonJS({
     exports2.replaceWithFactoryCall = replaceWithFactoryCall;
     var types_12 = require("@babel/types");
     function isRelease(state) {
-      var _a, _b, _c;
-      const pattern = /(prod|release|stag[ei])/i;
-      return !!(((_a = state.file.opts.envName) === null || _a === void 0 ? void 0 : _a.match(pattern)) || ((_b = process.env.BABEL_ENV) === null || _b === void 0 ? void 0 : _b.match(pattern)) || ((_c = process.env.NODE_ENV) === null || _c === void 0 ? void 0 : _c.match(pattern)));
+      var _a, _b;
+      const releasePattern = /(prod|release|stag[ei])/i;
+      const developmentPattern = /dev/i;
+      const envName = state.file.opts.envName;
+      if (envName) {
+        if (envName.match(releasePattern)) {
+          return true;
+        }
+        if (envName.match(developmentPattern)) {
+          return false;
+        }
+      }
+      return !!(((_a = process.env.BABEL_ENV) === null || _a === void 0 ? void 0 : _a.match(releasePattern)) || ((_b = process.env.NODE_ENV) === null || _b === void 0 ? void 0 : _b.match(releasePattern)));
     }
     function replaceWithFactoryCall(toReplace, name, factoryCall) {
       if (!name || !needsDeclaration(toReplace)) {

package/src/bundleMode/network.native.ts

@@ -6,6 +6,8 @@
  * The NetworkingModule itself is injected via C++.
  */
 export function initializeNetworking() {
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
+  require('react-native/Libraries/TurboModule/TurboModuleRegistry');
   const TurboModules = globalThis.TurboModules;
 
   TurboModules.set('FileReaderModule', makeMockTurboModule('FileReaderModule'));
@@ -14,6 +16,10 @@ export function initializeNetworking() {
     makeMockTurboModule('PlatformConstants')
   );
   TurboModules.set('WebSocketModule', makeMockTurboModule('WebSocketModule'));
+  TurboModules.set(
+    'NativeReactNativeFeatureFlagsCxx',
+    new Proxy({}, { get: () => () => undefined })
+  );
   TurboModules.set(
     'BlobModule',
     makeMockTurboModule('BlobModule', ['addNetworkingHandler'])

package/src/debug/jsVersion.ts

@@ -5,4 +5,4 @@
  * version used to build the native part of the library in runtime. Remember to
  * keep this in sync with the version declared in `package.json`
  */
-export const jsVersion = '0.11.1';
+export const jsVersion = '0.11.2';

package/src/memory/valueUnpacker.native.ts

@@ -26,7 +26,7 @@ export function installValueUnpacker() {
         const initData = objectToUnpack.__initData;
         if (initData!.bytecode !== undefined) {
           workletFun = globalThis.evalBytecode!(initData!.bytecode);
-        } else if (globalThis.evalWithSourceMap) {
+        } else if (globalThis.evalWithSourceMap && initData!.sourceMap) {
           // if the runtime (hermes only for now) supports loading source maps
           // we want to use the proper filename for the location as it guarantees
           // that debugger understands and loads the source code of the file where
@@ -34,7 +34,7 @@ export function installValueUnpacker() {
           workletFun = globalThis.evalWithSourceMap(
             initData!.code!,
             initData!.location!,
-            initData!.sourceMap!
+            initData!.sourceMap
           );
         } else if (globalThis.evalWithSourceUrl) {
           // if the runtime doesn't support loading source maps, in dev mode we