react-native-ariel 0.1.0-dev.38 → 0.1.0-dev.39

package/android/build.gradle

@@ -28,9 +28,7 @@ def isNewArchitectureEnabled() {
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
+apply plugin: "com.facebook.react"
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["Ariel_" + name]
@@ -135,10 +133,8 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
-if (isNewArchitectureEnabled()) {
-  react {
-    jsRootDir = file("../src/")
-    libraryName = "Ariel"
-    codegenJavaPackageName = "com.ariel"
-  }
+react {
+  jsRootDir = file("../src/")
+  libraryName = "Ariel"
+  codegenJavaPackageName = "com.ariel"
 }

package/android/generated/{android/app/build/generated/source/codegen/java/com/facebook/fbreact/specs → java/com/ariel}/NativeArielSpec.java

@@ -10,7 +10,7 @@
  * @nolint
  */
 
-package com.facebook.fbreact.specs;
+package com.ariel;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactApplicationContext;

package/lib/module/index.web.js

@@ -3,10 +3,6 @@
 // Generated by uniffi-bindgen-react-native
 // Export the generated bindings to the app.
 export * from "./generated/web/mermaid_wrapper.js";
-
-// Now import the bindings so we can:
-// - intialize them
-// - export them as namespaced objects as the default export.
 import * as mermaid_wrapper from "./generated/web/mermaid_wrapper.js";
 import initAsync from './generated/web/wasm-bindgen/react_native_ariel.js';
 import wasmPath from './generated/web/wasm-bindgen/react_native_ariel_bg.wasm';
@@ -14,14 +10,8 @@ export async function uniffiInitAsync() {
   await initAsync({
     module_or_path: wasmPath
   });
-
-  // Initialize the generated bindings: mostly checksums, but also callbacks.
-  // - the boolean flag ensures this loads exactly once, even if the JS code
-  //   is reloaded (e.g. during development with metro).
   mermaid_wrapper.default.initialize();
 }
-
-// Export the crates as individually namespaced objects.
 export default {
   mermaid_wrapper
 };

package/lib/module/index.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["mermaid_wrapper","initAsync","wasmPath","uniffiInitAsync","module_or_path","default","initialize"],"sourceRoot":"../../src","sources":["index.web.ts"],"mappings":";;AAAA;AACA;AACA,cAAc,oCAAiC;;AAE/C;AACA;AACA;AACA,OAAO,KAAKA,eAAe,MAAM,oCAAiC;AAElE,OAAOC,SAAS,MAAM,oDAAoD;AAC1E,OAAOC,QAAQ,MAAM,yDAAyD;AAE9E,OAAO,eAAeC,eAAeA,CAAA,EAAG;EACtC,MAAMF,SAAS,CAAC;IAAEG,cAAc,EAAEF;EAAS,CAAC,CAAC;;EAE7C;EACA;EACA;EACAF,eAAe,CAACK,OAAO,CAACC,UAAU,CAAC,CAAC;AACtC;;AAEA;AACA,eAAe;EACbN;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["mermaid_wrapper","initAsync","wasmPath","uniffiInitAsync","module_or_path","default","initialize"],"sourceRoot":"../../src","sources":["index.web.tsx"],"mappings":";;AAAA;AACA;AACA,cAAc,oCAAiC;AAE/C,OAAO,KAAKA,eAAe,MAAM,oCAAiC;AAElE,OAAOC,SAAS,MAAM,oDAAoD;AAC1E,OAAOC,QAAQ,MAAM,yDAAyD;AAE9E,OAAO,eAAeC,eAAeA,CAAA,EAAG;EACtC,MAAMF,SAAS,CAAC;IAAEG,cAAc,EAAEF;EAAS,CAAC,CAAC;EAC7CF,eAAe,CAACK,OAAO,CAACC,UAAU,CAAC,CAAC;AACtC;AAEA,eAAe;EACbN;AACF,CAAC","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ariel",
-  "version": "0.1.0-dev.38",
+  "version": "0.1.0-dev.39",
   "description": "Mermaid diagrams for React Native and React Native Web. No DOM. No WebView. Pure Rust.",
   "main": "./lib/module/index.js",
   "source": "./src/index.tsx",
@@ -135,7 +135,7 @@
     "android": {
       "javaPackageName": "com.ariel"
     },
-    "includesGeneratedCode": false
+    "includesGeneratedCode": true
   },
   "jest": {
     "preset": "@react-native/jest-preset",

package/react-native.config.js

@@ -7,7 +7,7 @@ module.exports = {
       android: {
         cmakeListsPath: 'generated/jni/CMakeLists.txt',
         cxxModuleCMakeListsModuleName: 'react-native-ariel',
-        cxxModuleCMakeListsPath: 'CMakeLists.txt',
+        cxxModuleCMakeListsPath: 'android/generated/jni/CMakeLists.txt',
         cxxModuleHeaderName: 'ArielImpl',
       },
     },