create-crossbind 2.0.0-beta.63 → 2.0.0-beta.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-crossbind",
-  "version": "2.0.0-beta.63",
+  "version": "2.0.0-beta.65",
   "description": "Create crossbind Applications",
   "homepage": "https://github.com/crossbind/crossbind/tree/main/tooling/create-app#readme",
   "repository": {

package/src/index.js

@@ -6,6 +6,7 @@ import { fileURLToPath } from 'node:url';
 import { styleText } from 'node:util';
 import * as p from '@clack/prompts';
 import { unpackDotfiles } from './dotfiles.js';
+import { renameInReadme } from './readme.js';
 import { pkgManager } from './utils.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -157,9 +158,15 @@ async function main() {
     let scripts = {};
     if (fs.existsSync(pjPath)) {
         const pkg = JSON.parse(await fsp.readFile(pjPath, 'utf8'));
+        const templateName = pkg.name;
         pkg.name = entry.kind === 'lib' ? `crossbind-lib-${name}` : name;
         await fsp.writeFile(pjPath, `${JSON.stringify(pkg, null, 2)}\n`);
         scripts = pkg.scripts || {};
+
+        const readmePath = path.join(cwd, 'README.md');
+        if (fs.existsSync(readmePath)) {
+            await fsp.writeFile(readmePath, renameInReadme(await fsp.readFile(readmePath, 'utf8'), templateName, pkg.name));
+        }
     }
 
     const gradlew = path.join(cwd, 'android', 'gradlew');

package/src/manifest.json

@@ -59,6 +59,14 @@
         "nativeFolders": false,
         "keepLockfile": true
     },
+    {
+        "key": "desktop-app",
+        "group": "Desktop",
+        "framework": null,
+        "label": "App",
+        "kind": "app",
+        "source": "examples/desktop-app"
+    },
     {
         "key": "desktop-electron",
         "group": "Desktop",

package/src/readme.js

@@ -0,0 +1,12 @@
+// A template's README introduces the published sample on crossbind's beta channel. A scaffolded
+// project is a package of its own, installed from its default tag, so the README names it instead.
+const escapeRegExp = (text) => text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
+export function renameInReadme(readme, from, to) {
+    const name = escapeRegExp(from);
+    const end = '(?![\\w.-])';
+    return readme
+        .replace(new RegExp(`${name}@beta${end}`, 'g'), to)
+        .replace(new RegExp(`npm/v/${name}/beta${end}`, 'g'), `npm/v/${to}`)
+        .replace(new RegExp(`${name}${end}`, 'g'), to);
+}

package/templates/backend-nodejs-native/package.json

@@ -12,11 +12,11 @@
     "e2e:prod": "node e2e/run.mjs"
   },
   "dependencies": {
-    "@crossbind/example-lib-prebuilt-matrix": "^2.0.0-beta.63"
+    "@crossbind/example-lib-prebuilt-matrix": "^2.0.0-beta.65"
   },
   "devDependencies": {
-    "@crossbind/core-embind-napi": "^2.0.0-beta.63",
-    "crossbind": "^2.0.0-beta.63"
+    "@crossbind/core-embind-napi": "^2.0.0-beta.65",
+    "crossbind": "^2.0.0-beta.65"
   },
   "keywords": [
     "crossbind-sample",

package/templates/backend-nodejs-standalone/package.json

@@ -11,7 +11,7 @@
     "e2e:prod": "node e2e/run.mjs"
   },
   "dependencies": {
-    "@crossbind/example-lib-prebuilt-matrix": "^2.0.0-beta.63"
+    "@crossbind/example-lib-prebuilt-matrix": "^2.0.0-beta.65"
   },
   "keywords": [
     "crossbind-sample",

package/templates/backend-nodejs-wasm/package.json

@@ -10,10 +10,10 @@
     "build": "crossbind build -p wasm -a wasm32 -r st -e node -b release"
   },
   "dependencies": {
-    "@crossbind/example-lib-prebuilt-matrix": "^2.0.0-beta.63"
+    "@crossbind/example-lib-prebuilt-matrix": "^2.0.0-beta.65"
   },
   "devDependencies": {
-    "crossbind": "^2.0.0-beta.63"
+    "crossbind": "^2.0.0-beta.65"
   },
   "keywords": [
     "crossbind-sample",

package/templates/cloud-cloudflare-worker/package.json

@@ -9,7 +9,7 @@
   "scripts": {
     "build": "crossbind build -p wasm -a wasm32 -r st -e edge -b release",
     "dev": "wrangler dev",
-    "deploy": "wrangler dev",
+    "deploy": "wrangler deploy",
     "e2e:dev": "playwright test --config playwright.dev.config.cjs",
     "e2e:prod": "playwright test --config playwright.dev.config.cjs"
   },
@@ -23,7 +23,7 @@
   ],
   "dependencies": {},
   "devDependencies": {
-    "crossbind": "^2.0.0-beta.63",
+    "crossbind": "^2.0.0-beta.65",
     "wrangler": "^4.136.3",
     "@playwright/test": "^1.63.0"
   },

package/templates/desktop-app/README.md

@@ -0,0 +1,102 @@
+# @crossbind/example-desktop-app
+**crossbind desktop app sample**
+
+A macOS, Linux, Windows, iOS and Android app whose page runs in the system webview and whose C++ runs natively in the
+app: crossbind builds `src/native` and the matrix library into the app's own host, and the page calls it with the same
+`initNative()` and awaited calls as a web build that runs its module in a worker. There is no Node.js and no browser
+engine in the app; the page uses the system's own, WKWebView on macOS and iOS, WebKitGTK on Linux, WebView2 on
+Windows and Android System WebView on Android.
+
+# Getting Started
+
+>**Note**: Make sure you have completed the [crossbind - Prerequisites](https://crossbind.dev/docs/guide/getting-started/prerequisites) instructions.
+Apps build on macOS with Xcode's command line tools, iOS apps with Xcode and its iOS platform, and Linux, Windows and
+Android apps in crossbind's linux, windows and android-app images, which carry everything they build with; the
+bindings are generated in Docker. A macOS or iOS build fetches React Native's Hermes once into `~/.crossbind/hermes`.
+
+## Setup
+
+Install the dependencies:
+
+```bash
+pnpm install
+```
+
+Inside the crossbind repository, build the library's archives first:
+`pnpm --filter @crossbind/example-lib-prebuilt-matrix run build:desktop`, `run build:ios` for the iOS app and
+`run build:android` for the Android app.
+
+## Get Started
+
+```bash
+pnpm dev
+```
+
+opens the app on Vite's dev server: edits to the page reload it, edits to the C++ rebuild the app and open it again,
+and the page's console shows in the terminal. Closing the window ends the session.
+
+## Build
+
+```bash
+pnpm build
+```
+
+writes the app to `dist/crossbind-example-desktop-app.app`, signed ad hoc, so it opens on the Mac that built it. On
+Linux it writes `dist/crossbind-example-desktop-app-linux-<arch>/` and the same as a `.tar.gz`, which runs where
+WebKitGTK 4.1 is installed (`libwebkit2gtk-4.1-0` on Debian and Ubuntu).
+
+```bash
+pnpm build:linux
+```
+
+writes the Linux app for x64 and arm64, on a Mac as well.
+
+```bash
+pnpm build:windows
+```
+
+writes the Windows app for x64 and arm64, on a Mac or Linux as well: `dist/crossbind-example-desktop-app-win32-<arch>/`
+and the same as a `.zip`, which runs where the WebView2 Runtime is installed, as on Windows 11.
+
+## iOS
+
+```bash
+pnpm dev:ios
+```
+
+opens the app in the iOS Simulator on Vite's dev server, as `pnpm dev` does on the desktop; ending the app in the
+Simulator ends the session.
+
+```bash
+pnpm build:ios
+```
+
+writes the app's Xcode project to `dist/crossbind-example-desktop-app-ios/`. Open it in Xcode to run the app on an
+iPhone, once `crossbind.config.js` names the app's bundle id and Apple team (`app: { id, team }`).
+
+## Android
+
+```bash
+pnpm dev:android
+```
+
+opens the app on the attached Android device or the running emulator on Vite's dev server, as `pnpm dev` does on the
+desktop; ending the app ends the session. Start an emulator first, in Android Studio's Device Manager, or connect a
+phone with USB debugging on. crossbind reaches it with the machine's `adb` (`brew install --cask
+android-platform-tools` on macOS, `sudo apt install adb` on Debian and Ubuntu, or Android Studio's).
+
+```bash
+pnpm build:android
+```
+
+writes `dist/crossbind-example-desktop-app-android.apk`, signed with this machine's debug key, which `adb install`
+puts on a device. With `CROSSBIND_ANDROID_KEYSTORE`, `CROSSBIND_ANDROID_KEY_ALIAS` and
+`CROSSBIND_ANDROID_KEYSTORE_PASSWORD` set to Google Play's upload key, the APK is signed with it and
+`dist/crossbind-example-desktop-app-android.aab` is the bundle Google Play takes. Gradle runs in Docker, so no JDK or
+Android SDK is needed; the Gradle project it builds stays in `dist/crossbind-example-desktop-app-android/`.
+
+## Test
+
+`pnpm run e2e:prod` opens the built app and waits for the page to log the result; with `CROSSBIND_APP_PLATFORM=ios` it
+builds the Xcode project for the Simulator and opens the app there, and with `android` it builds the Gradle project as
+a debug APK and opens the app on the attached device.

package/templates/desktop-app/_gitignore

@@ -0,0 +1,3 @@
+node_modules
+.crossbind
+dist

package/templates/desktop-app/crossbind.config.js

@@ -0,0 +1,17 @@
+import Matrix from '@crossbind/example-lib-prebuilt-matrix/crossbind.config.js';
+
+export default {
+    general: {
+        name: 'crossbind-example-desktop-app',
+    },
+    dependencies: [
+        Matrix,
+    ],
+    // The page runs in the system webview and the C++ in the app's own process.
+    target: {
+        runtimeEnv: 'app',
+    },
+    paths: {
+        config: import.meta.url,
+    },
+};

package/templates/desktop-app/e2e/run.mjs

@@ -0,0 +1,60 @@
+import { spawn } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { resolve } from 'node:path';
+import config from '../crossbind.config.js';
+
+// Opens the app `pnpm build` made and waits for its page to log what the C++ returned. With CROSSBIND_APP_PLATFORM=ios
+// the app is the Xcode project `pnpm build:ios` made, built and opened in the Simulator, and with android the Gradle
+// project `pnpm build:android` made, built and opened on the attached device.
+// A cold Simulator on a CI runner can take over a minute to show the page.
+const RUN_TIMEOUT_MS = 300000;
+const EXPECTED = 'Matrix multiplier with c++ => J₃ * (2*J₃) = 6*J₃';
+
+const root = resolve(import.meta.dirname, '..');
+const { name } = config.general;
+const env = { CROSSBIND_APP_CONSOLE: '1' };
+
+function missing(file) {
+    console.error(`FAIL: ${file} is missing - run \`pnpm build\` first.`);
+    process.exit(1);
+}
+
+async function open() {
+    const platform = process.env.CROSSBIND_APP_PLATFORM;
+    if (platform) {
+        const project = `${root}/dist/${name}-${platform}`;
+        if (!existsSync(project)) missing(project);
+        const { buildForSimulator, openInSimulator, buildApk, openOnDevice } = await import('crossbind');
+        return platform === 'ios' ? openInSimulator(buildForSimulator(project), { env }) : openOnDevice(buildApk(project), { env });
+    }
+    // A macOS app is a bundle; a Linux or Windows app a directory named after its platform and arch.
+    const executable = process.platform === 'darwin'
+        ? `${root}/dist/${name}.app/Contents/MacOS/${name}`
+        : `${root}/dist/${name}-${process.platform}-${process.arch}/${name}${process.platform === 'win32' ? '.exe' : ''}`;
+    if (!existsSync(executable)) missing(executable);
+    return { child: spawn(executable, [], { env: { ...process.env, ...env } }), close: () => {} };
+}
+
+let out = '';
+const { child: app, close } = await open();
+
+function finish(problem) {
+    clearTimeout(timer);
+    close();
+    app.kill();
+    if (problem) {
+        console.error(`FAIL: ${problem}:\n${out}`);
+        process.exit(1);
+    }
+    console.log(`ok: ${EXPECTED}`);
+    process.exit(0);
+}
+
+const timer = setTimeout(() => finish('the page did not log the result in time'), RUN_TIMEOUT_MS);
+const read = (chunk) => {
+    out += chunk;
+    if (out.includes(EXPECTED)) finish();
+};
+app.stdout.on('data', read);
+app.stderr.on('data', read);
+app.on('exit', (code) => finish(`the app exited with ${code} before the page logged the result`));

package/templates/desktop-app/index.html

@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>crossbind desktop app sample</title>
+</head>
+<body>
+    <p>Matrix multiplier with c++ =&gt; <span id="cppMessage">loading ...</span></p>
+    <script type="module" src="/src/main.js"></script>
+</body>
+</html>

package/templates/desktop-app/package.json

@@ -0,0 +1,38 @@
+{
+  "name": "@crossbind/example-desktop-app",
+  "private": true,
+  "version": "0.0.0",
+  "description": "crossbind - desktop app sample",
+  "homepage": "https://github.com/crossbind/crossbind/tree/main/examples/desktop-app#readme",
+  "repository": "https://github.com/crossbind/crossbind.git",
+  "license": "MIT",
+  "type": "module",
+  "scripts": {
+    "dev": "crossbind app dev",
+    "dev:ios": "crossbind app dev -p ios",
+    "dev:android": "crossbind app dev -p android",
+    "build": "crossbind app build",
+    "build:linux": "crossbind app build -p linux",
+    "build:windows": "crossbind app build -p windows",
+    "build:ios": "crossbind app build -p ios",
+    "build:android": "crossbind app build -p android",
+    "e2e:prod": "node e2e/run.mjs"
+  },
+  "dependencies": {
+    "@crossbind/example-lib-prebuilt-matrix": "^2.0.0-beta.65"
+  },
+  "devDependencies": {
+    "@crossbind/core-app-host": "^2.0.0-beta.65",
+    "@crossbind/plugin-vite": "^2.0.0-beta.65",
+    "crossbind": "^2.0.0-beta.65",
+    "vite": "^8.2.1"
+  },
+  "keywords": [
+    "crossbind-sample",
+    "desktop",
+    "app",
+    "webview",
+    "c++",
+    "vite"
+  ]
+}

package/templates/desktop-app/src/main.js

@@ -0,0 +1,15 @@
+import { initNative, Native } from './native/native.h';
+
+const message = document.querySelector('#cppMessage');
+
+initNative()
+    .then(() => Native.sample())
+    .then((result) => {
+        message.textContent = result;
+        // During development the page's console shows in the terminal that runs `pnpm dev`.
+        console.log(`Matrix multiplier with c++ => ${result}`);
+    })
+    .catch((error) => {
+        message.textContent = error.message;
+        console.error(error);
+    });

package/templates/desktop-app/src/native/native.cpp

@@ -0,0 +1,9 @@
+#include "native.h"
+#include <Matrix.h>
+
+std::string Native::sample() {
+  auto firstMatrix = std::make_shared<Matrix>(9, 1);
+  auto secondMatrix = std::make_shared<Matrix>(9, 2);
+  auto resultStr = std::to_string(firstMatrix->multiple(secondMatrix)->get(0));
+  return "J₃ * (2*J₃) = " + resultStr + "*J₃";
+}

package/templates/desktop-app/src/native/native.h

@@ -0,0 +1,12 @@
+#ifndef _NATIVE_H
+#define _NATIVE_H
+
+#include <string>
+#include <memory>
+
+class Native {
+public:
+    static std::string sample();
+};
+
+#endif

package/templates/desktop-app/vite.config.js

@@ -0,0 +1,6 @@
+import { defineConfig } from 'vite';
+import viteCrossbindPlugin from '@crossbind/plugin-vite';
+
+export default defineConfig({
+    plugins: [viteCrossbindPlugin()],
+});

package/templates/desktop-electron/package.json

@@ -16,10 +16,10 @@
     "e2e:prod": "electron-builder --dir && playwright test --project=packaged"
   },
   "devDependencies": {
-    "@crossbind/core-embind-napi": "^2.0.0-beta.63",
-    "@crossbind/example-lib-prebuilt-matrix": "^2.0.0-beta.63",
+    "@crossbind/core-embind-napi": "^2.0.0-beta.65",
+    "@crossbind/example-lib-prebuilt-matrix": "^2.0.0-beta.65",
     "@playwright/test": "^1.63.0",
-    "crossbind": "^2.0.0-beta.63",
+    "crossbind": "^2.0.0-beta.65",
     "electron": "^44.5.1",
     "electron-builder": "^26.15.3"
   },

package/templates/lib-cmake/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crossbind/example-lib-cmake",
-  "version": "2.0.0-beta.63",
+  "version": "2.0.0-beta.65",
   "description": "crossbind sample library: simple cmake library",
   "homepage": "https://github.com/crossbind/crossbind/tree/main/examples/lib-cmake#readme",
   "repository": "https://github.com/crossbind/crossbind.git",

package/templates/lib-prebuilt/README.md

@@ -58,7 +58,7 @@ console.log(result.get(0));
 
 ### Usage in JavaScript Code (web, without plugin)
 ```js
-import 'node_modules/@crossbind/example-lib-prebuilt-matrix/dist/crossbind-example-lib-prebuilt-matrix.browser.js';
+import 'node_modules/@crossbind/example-lib-prebuilt-matrix/dist/crossbind-example-lib-prebuilt-matrix-wasm-wasm32-st-release.browser.js';
 
 initNative({ path: 'node_modules/@crossbind/example-lib-prebuilt-matrix/dist' }).then(({ Matrix }) => {
     const a = new Matrix(1210000, 1);

package/templates/lib-prebuilt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crossbind/example-lib-prebuilt-matrix",
-  "version": "2.0.0-beta.63",
+  "version": "2.0.0-beta.65",
   "description": "crossbind sample prebuilt library: matrix multiplier",
   "homepage": "https://github.com/crossbind/crossbind/tree/main/examples/lib-prebuilt-matrix#readme",
   "repository": "https://github.com/crossbind/crossbind.git",
@@ -18,7 +18,7 @@
     "prepublishOnly": "crossbind build"
   },
   "devDependencies": {
-    "crossbind": "^2.0.0-beta.63"
+    "crossbind": "^2.0.0-beta.65"
   },
   "keywords": [
     "crossbind-sample",

package/templates/lib-source/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crossbind/example-lib-source",
-  "version": "2.0.0-beta.63",
+  "version": "2.0.0-beta.65",
   "description": "crossbind sample library: simple source library",
   "homepage": "https://github.com/crossbind/crossbind/tree/main/examples/lib-source#readme",
   "repository": "https://github.com/crossbind/crossbind.git",

package/templates/mobile-reactnative-cli/ci/crossbind-snapshot/cache.json

@@ -1,7 +1,7 @@
 {
     "hashes": {
-        "/Users/runner/work/crossbind/crossbind/examples/mobile-reactnative-cli/src/native/native.h": "swig-macros-3\nd105082c6e8c8652ea461e161c501e824b6b625f7b819490102c5c0699744249\nconstants:Native\nnamed:Native",
-        "/Users/runner/work/crossbind/crossbind/examples/mobile-reactnative-cli/.crossbind/build/interface/native.i": "swig-extras-1\nd2951a720fdd54191e27157df067c64d7d7839b41c14494d63aef4f3a4eae3a2\nd105082c6e8c8652ea461e161c501e824b6b625f7b819490102c5c0699744249\nnamed:Native"
+        "/Users/runner/work/crossbind/crossbind/examples/mobile-reactnative-cli/src/native/native.h": "swig-macros-4\nd105082c6e8c8652ea461e161c501e824b6b625f7b819490102c5c0699744249\nconstants:Native\nnamed:Native",
+        "/Users/runner/work/crossbind/crossbind/examples/mobile-reactnative-cli/.crossbind/build/interface/native.i": "swig-extras-2\nd2951a720fdd54191e27157df067c64d7d7839b41c14494d63aef4f3a4eae3a2\nd105082c6e8c8652ea461e161c501e824b6b625f7b819490102c5c0699744249\nnamed:Native"
     },
     "interfaces": {
         "/Users/runner/work/crossbind/crossbind/examples/mobile-reactnative-cli/src/native/native.h": "/Users/runner/work/crossbind/crossbind/examples/mobile-reactnative-cli/.crossbind/build/interface/native.i"

package/templates/mobile-reactnative-cli/package.json

@@ -20,12 +20,12 @@
     "e2e:android": "pnpm run run:android && pnpm run maestro:android"
   },
   "dependencies": {
-    "@crossbind/core-embind-jsi": "^2.0.0-beta.63",
-    "@crossbind/plugin-react-native": "^2.0.0-beta.63",
-    "@crossbind/plugin-react-native-ios-helper": "^2.0.0-beta.63",
-    "@crossbind/example-lib-prebuilt-matrix": "^2.0.0-beta.63",
-    "react": "19.3.0",
-    "react-native": "0.87.1",
+    "@crossbind/core-embind-jsi": "^2.0.0-beta.65",
+    "@crossbind/plugin-react-native": "^2.0.0-beta.65",
+    "@crossbind/plugin-react-native-ios-helper": "^2.0.0-beta.65",
+    "@crossbind/example-lib-prebuilt-matrix": "^2.0.0-beta.65",
+    "react": "19.3.1",
+    "react-native": "0.88.0",
     "react-native-safe-area-context": "^5.8.0",
     "hermes-compiler": "250829098.0.17"
   },
@@ -36,22 +36,22 @@
     "@react-native-community/cli": "20.2.0",
     "@react-native-community/cli-platform-android": "20.2.0",
     "@react-native-community/cli-platform-ios": "20.2.0",
-    "@react-native/babel-preset": "0.87.1",
-    "@react-native/codegen": "0.87.1",
-    "@react-native/eslint-config": "0.87.1",
-    "@react-native/jest-preset": "0.87.1",
-    "@react-native/gradle-plugin": "0.87.1",
-    "@react-native/metro-config": "0.87.1",
-    "@react-native/typescript-config": "0.87.1",
+    "@react-native/babel-preset": "0.88.0",
+    "@react-native/codegen": "0.88.0",
+    "@react-native/eslint-config": "0.88.0",
+    "@react-native/jest-preset": "0.88.0",
+    "@react-native/gradle-plugin": "0.88.0",
+    "@react-native/metro-config": "0.88.0",
+    "@react-native/typescript-config": "0.88.0",
     "@types/jest": "^29.5.13",
     "@types/react": "^19.3.0",
     "@types/react-test-renderer": "^19.3.0",
     "eslint": "^8.19.0",
     "jest": "^29.6.3",
-    "prettier": "3.9.9",
-    "react-test-renderer": "19.3.0",
+    "prettier": "3.9.10",
+    "react-test-renderer": "19.3.1",
     "typescript": "^6.0.3",
-    "@crossbind/plugin-metro": "^2.0.0-beta.63"
+    "@crossbind/plugin-metro": "^2.0.0-beta.65"
   },
   "engines": {
     "node": ">=24"