@crossbind/plugin-rollup 2.0.0-beta.64 → 2.0.0-beta.65

package/AGENTS.md

@@ -15,6 +15,8 @@
 | `buildStart` | Iterate `state.config.paths.native` array; `addWatchFile` every entry. Watch mode now sees `.cpp`/`.h` edits |
 | `generateBundle` | Run `createLib + createXCFramework + buildWasm` with `force = isSourceNewer(...)`; emit `crossbind.js`, `crossbind.wasm`, `crossbind.data.txt` as bundle assets |
 
+In app mode (`target.runtimeEnv: 'app'`, macOS, Linux, Windows, iOS and Android for now) `generateBundle` builds the app host for this machine with `buildProjectApp` instead, or with `CROSSBIND_APP_PLATFORM`, which `crossbind app -p` sets, one for each iOS SDK, Android ABI or Linux or Windows arch (`appTargetParams`), and emits its page runtime as `crossbind.js`; `writeBundle` then puts the written page into each app beside it with `publishApp`: `<name>.app`, `<name>-linux-<arch>/`, `<name>-win32-<arch>/`, the Xcode project `<name>-ios/` or the Gradle project `<name>-android/` and its APK. See `docs/api/app.md`.
+
 ## Invariants
 
 - **`paths.native` is an array.** The outer Vite plugin assumed this years ago; this plugin must too. `existsSync(array)` returns false silently — always iterate entries before testing each one.

package/index.js

@@ -2,16 +2,29 @@
 
 import {
     state, createLib, createBridgeFile, buildWasm, getCrossbindScript, getRustJsScript, buildDependencies,
-    getDependFilePath, getTargetParams, getFilteredBuildTargets, isSourceNewer, appSourceFiles,
+    getDependFilePath, getTargetParams, getFilteredBuildTargets, isSourceNewer, appSourceFiles, buildProjectApp, publishApp,
+    appOutputName, appTargetParams,
 } from 'crossbind';
 
 import fs from 'node:fs';
 import p from 'node:path';
 
-const targetParams = getTargetParams({ platform: ['wasm'], arch: ['wasm32'], runtime: ['st'], runtimeEnv: ['browser'] }, true);
-let buildTargetRelease = getFilteredBuildTargets(targetParams, { buildType: 'release' })?.[0];
-let buildTargetDebug = getFilteredBuildTargets(targetParams, { buildType: 'debug' })?.[0];
-
+// An app's page reaches the module in the host the app runs, so its build makes the host, not wasm: this machine's, or
+// with CROSSBIND_APP_PLATFORM one per iOS SDK, Android ABI or Linux or Windows arch.
+const isApp = state.config.target.runtimeEnv === 'app';
+const targetParams = isApp
+    ? appTargetParams()
+    : getTargetParams({ platform: ['wasm'], arch: ['wasm32'], runtime: ['st'], runtimeEnv: ['browser'] }, true);
+// iOS and Android keep targets without a runtime environment for React Native, which every filter of runtimeEnv lets
+// through.
+const appOnly = isApp ? { runtimeEnv: 'app' } : {};
+let buildTargetRelease = getFilteredBuildTargets(targetParams, { buildType: 'release', ...appOnly })?.[0];
+let buildTargetDebug = getFilteredBuildTargets(targetParams, { buildType: 'debug', ...appOnly })?.[0];
+const appTargets = isApp ? getFilteredBuildTargets(targetParams, { buildType: 'release', ...appOnly }) : [];
+
+if (isApp && !buildTargetRelease) {
+    throw new Error(`crossbind: desktop apps build on macOS, Linux and Windows so far, and this machine runs ${process.platform}-${process.arch}.`);
+}
 if (!buildTargetRelease && !buildTargetDebug) {
     throw new Error('No build targets found');
 }
@@ -25,11 +38,13 @@ const rollupCrossbindPlugin = (options, bridges = []) => {
     const moduleRegex = new RegExp(`\\.(${state.config.ext.module.join('|')})$`);
     // Vite gives the base it serves the app from; plain Rollup has none.
     let base = '/';
+    let isServe = false;
 
     return {
         name: 'rollup-plugin-crossbind',
         configResolved(config) {
             base = config.base;
+            isServe = config.command === 'serve';
         },
         resolveId(source) {
             if (source === '/crossbind.js') {
@@ -57,7 +72,9 @@ const rollupCrossbindPlugin = (options, bridges = []) => {
             // A header transforms again after each source edit; a repeated entry would change the bridge lib's fingerprint.
             if (!bridges.includes(bridgeFile)) bridges.push(bridgeFile);
             // The names the app imports decide what a header binds, so watch mode transforms it again after any source edit.
-            appSourceFiles(state.config.paths.project).forEach((file) => this.addWatchFile(file));
+            // Vite's dev server rebinds them itself: there, Vite would take the sources for imports of the header and, the
+            // page importing the header, update nothing after an edit to the page.
+            if (!isServe) appSourceFiles(state.config.paths.project).forEach((file) => this.addWatchFile(file));
 
             return getCrossbindScript(buildTargetRelease, bridgeFile, { base });
         },
@@ -89,6 +106,15 @@ const rollupCrossbindPlugin = (options, bridges = []) => {
             });
         },
         async generateBundle() {
+            if (isApp) {
+                for (const target of appTargets) await buildProjectApp(target);
+                this.emitFile({
+                    type: 'asset',
+                    source: fs.readFileSync(`${state.config.paths.build}/${buildTargetRelease.appJsName}`),
+                    fileName: 'crossbind.js',
+                });
+                return;
+            }
             const force = isSourceNewer(buildTargetRelease);
             const sourceBuilt = createLib(buildTargetRelease, 'Source', { force, buildSource: true });
             // Bridge cache is keyed on the nativeGlob fingerprint: adding or
@@ -125,6 +151,14 @@ const rollupCrossbindPlugin = (options, bridges = []) => {
                 });
             } */
         },
+        // The page, once written, goes into the app beside it: one project of every SDK or ABI for iOS and Android, one
+        // app per arch for a desktop.
+        writeBundle(outputOptions) {
+            if (!isApp) return;
+            const dir = outputOptions.dir ?? p.dirname(outputOptions.file);
+            const apps = ['ios', 'android'].includes(buildTargetRelease.platform) ? [buildTargetRelease] : appTargets;
+            apps.forEach((target) => publishApp(target, { to: `${dir}/${appOutputName(target)}`, page: dir }));
+        },
     };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crossbind/plugin-rollup",
-  "version": "2.0.0-beta.64",
+  "version": "2.0.0-beta.65",
   "description": "crossbind Rollup plugin: A tool for seamless C++ integration with the Rollup bundler.",
   "homepage": "https://github.com/crossbind/crossbind/tree/main/plugins/rollup#readme",
   "repository": {
@@ -11,8 +11,8 @@
   "type": "module",
   "main": "index.js",
   "dependencies": {
-    "crossbind": "^2.0.0-beta.64",
-    "@crossbind/core-embind-rust": "^2.0.0-beta.64"
+    "crossbind": "^2.0.0-beta.65",
+    "@crossbind/core-embind-rust": "^2.0.0-beta.65"
   },
   "peerDependencies": {
     "rollup": ">=2.0.0"