cpp.js 1.0.0-beta.27 → 1.0.0-beta.29

package/package.json

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

package/src/actions/createInterface.js

@@ -1,17 +1,19 @@
 /* eslint-disable prefer-destructuring */
 import fs from 'node:fs';
+import upath from 'upath';
 import state, { saveCache } from '../state/index.js';
 import { getFileHash } from '../utils/hash.js';
 import run from './run.js';
 
 export default function createBridgeFile(headerOrModuleFilePath) {
+    const interfaceFilePath = upath.resolve(headerOrModuleFilePath);
     if (!fs.existsSync(`${state.config.paths.build}/interface`)) {
         fs.mkdirSync(`${state.config.paths.build}/interface`, { recursive: true });
     }
     if (!fs.existsSync(`${state.config.paths.build}/bridge`)) {
         fs.mkdirSync(`${state.config.paths.build}/bridge`, { recursive: true });
     }
-    const interfaceFile = createInterfaceFile(headerOrModuleFilePath);
+    const interfaceFile = createInterfaceFile(interfaceFilePath);
     return createBridgeFileFromInterfaceFile(interfaceFile);
 }
 

package/src/actions/getCmakeParameters.js

@@ -13,11 +13,11 @@ export default function getCmakeParameters(platform, options = {}) {
         ...(options.nativeGlob || []),
     ];
     const externalBridgeGlob = [
-        `${state.config.paths.cli}/assets/bridge.cpp`,
+        `${state.config.paths.cli}/assets/commonBridges.cpp`,
         ...(options.bridgeGlob || []),
     ];
     const nativeGlob = [
-        `${state.config.paths.cli}/assets/cppjsemptysource.cpp`,
+        `${state.config.paths.cli}/assets/cppjsEmptySource.cpp`,
         ...(dependParams.nativeGlob || []),
     ];
     const headerGlob = [

package/src/assets/{bridge.cpp → commonBridges.cpp}

@@ -1,7 +1,6 @@
 #include <emscripten/bind.h>
 
-EMSCRIPTEN_BINDINGS(stl_wrappers) {
-    emscripten::register_vector<bool>("VectorBool");
+EMSCRIPTEN_BINDINGS(CommonBridges) {
     emscripten::register_vector<char>("VectorChar");
     emscripten::register_vector<short>("VectorShort");
     emscripten::register_vector<int>("VectorInt");

package/src/assets/dist.cmake

@@ -9,7 +9,7 @@ if(ANDROID)
     set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
 elseif(APPLE)
     if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
-        set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}")
+        set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/../..")
     else()
         set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
         set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")

package/src/bin.js

@@ -303,7 +303,10 @@ async function createWasmJs() {
     const opt = {
         isProd: true,
         buildSource: false,
-        nativeGlob: bridges,
+        nativeGlob: [
+            `${state.config.paths.cli}/assets/commonBridges.cpp`,
+            ...bridges,
+        ],
     };
     createLib('Emscripten-x86_64', 'Bridge', opt);