cpp.js 1.0.0 → 1.0.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # cpp.js
 
+## 1.0.2
+
+### Patch Changes
+
+- fix: workaround for race condition with turbomodule in android. In the future, it will be completely resolved by removing support for the old architecture.
+
+## 1.0.1
+
+### Patch Changes
+
+- fix: include prebuilt/_/{config.general.name}/_.h in dependency header search paths
+
 ## 1.0.0
 
 ### Major Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cpp.js",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "license": "MIT",
   "homepage": "https://cpp.js.org",
   "repository": "https://github.com/bugra9/cpp.js.git",

package/src/integration/getCppJsScript.js

@@ -36,7 +36,7 @@ export default function getCppJsScript(platform, bridgePath = null) {
 
 function getReactNativeScript(env, modulePrefix) {
     return `
-        import { NativeModules } from 'react-native';
+        import { NativeModules, Platform } from 'react-native';
         import Module from '@cpp.js/core-embind-jsi';
 
         const { RNJsiLib } = NativeModules;
@@ -54,10 +54,12 @@ function getReactNativeScript(env, modulePrefix) {
             return new Promise((resolve, reject) => {
                 if (RNJsiLib && RNJsiLib.start) {
                     RNJsiLib.start();
-                    setEnv();
-                    const m = Module;
-                    ${modulePrefix}
-                    resolve(Module);
+                    setTimeout(() => {
+                        setEnv();
+                        const m = Module;
+                        ${modulePrefix}
+                        resolve(Module);
+                    }, Platform.OS === 'android' ? 2000 : 0);
                 } else {
                     reject('Module failed to initialise.');
                 }

package/src/integration/getDependFilePath.js

@@ -8,6 +8,7 @@ export default function getDependFilePath(source, platform) {
     const dependPackage = state.config.allDependencies.find((d) => source.startsWith(d.package.name));
     if (dependPackage) {
         const depName = dependPackage.package.name;
+        const configName = dependPackage.general.name;
         const filePath = source.substring(depName.length + 1);
 
         let path;
@@ -19,7 +20,9 @@ export default function getDependFilePath(source, platform) {
             path = `${dependPackage.paths.output}/prebuilt/${platform}`;
         }
 
-        if (fs.existsSync(`${path}/${depName}/${filePath}`)) {
+        if (fs.existsSync(`${path}/${configName}/${filePath}`)) {
+            path = `${path}/${configName}/${filePath}`;
+        } else if (fs.existsSync(`${path}/${depName}/${filePath}`)) {
             path = `${path}/${depName}/${filePath}`;
         } else if (fs.existsSync(`${path}/${filePath}`)) {
             path = `${path}/${filePath}`;