@crossbind/plugin-rollup 2.0.0-beta.62 → 2.0.0-beta.63

package/README.md

@@ -3,20 +3,20 @@
 A tool for seamless C++ integration with the Rollup bundler.
 
 <a href="https://www.npmjs.com/package/@crossbind/plugin-rollup">
-    <img alt="NPM version" src="https://img.shields.io/npm/v/@crossbind/plugin-rollup?style=for-the-badge" />
+    <img alt="NPM version" src="https://img.shields.io/npm/v/@crossbind/plugin-rollup/beta?style=for-the-badge" />
 </a>
 <a href="https://github.com/crossbind/crossbind/blob/main/LICENSE">
     <img alt="License" src="https://img.shields.io/github/license/crossbind/crossbind?style=for-the-badge" />
 </a>
 <a href="https://crossbind.dev/docs/guide/integrate-into-existing-project/rollup">
-    <img alt="Docs - React Native" src="https://img.shields.io/badge/Docs_-_Rollup-20B2AA?style=for-the-badge" />
+    <img alt="Docs - Rollup" src="https://img.shields.io/badge/Docs_-_Rollup-20B2AA?style=for-the-badge" />
 </a>
 
 ## Integration
 To integrate crossbind into your project using Rollup as a bundler, you can utilize the @crossbind/plugin-rollup plugin. Start by installing these package with the following command:
 
 ```sh
-npm install @crossbind/plugin-rollup --save-dev
+npm install @crossbind/plugin-rollup@beta --save-dev
 ```
 
 To enable the plugin, modify the `vite.config.js` file as shown below.

package/index.js

@@ -2,7 +2,7 @@
 
 import {
     state, createLib, createBridgeFile, buildWasm, getCrossbindScript, getRustJsScript, buildDependencies,
-    getDependFilePath, getTargetParams, getFilteredBuildTargets, isSourceNewer,
+    getDependFilePath, getTargetParams, getFilteredBuildTargets, isSourceNewer, appSourceFiles,
 } from 'crossbind';
 
 import fs from 'node:fs';
@@ -23,9 +23,14 @@ if (!buildTargetRelease) {
 const rollupCrossbindPlugin = (options, bridges = []) => {
     const headerRegex = new RegExp(`\\.(${state.config.ext.header.join('|')})$`);
     const moduleRegex = new RegExp(`\\.(${state.config.ext.module.join('|')})$`);
+    // Vite gives the base it serves the app from; plain Rollup has none.
+    let base = '/';
 
     return {
         name: 'rollup-plugin-crossbind',
+        configResolved(config) {
+            base = config.base;
+        },
         resolveId(source) {
             if (source === '/crossbind.js') {
                 return { id: source, external: true };
@@ -42,18 +47,24 @@ const rollupCrossbindPlugin = (options, bridges = []) => {
             // generated companion crate (or the app-local synthesized crate); this only emits
             // the JS proxy module - the same shape as the .h flow.
             if (path.endsWith('.rs')) {
-                return getRustJsScript(buildTargetRelease, path);
+                return getRustJsScript(buildTargetRelease, path, { base });
             }
             if (!headerRegex.test(path) && !moduleRegex.test(path)) {
                 return null;
             }
 
             const bridgeFile = createBridgeFile(path);
-            bridges.push(bridgeFile);
+            // 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));
 
-            return getCrossbindScript(buildTargetRelease, bridgeFile);
+            return getCrossbindScript(buildTargetRelease, bridgeFile, { base });
         },
-        buildStart() {
+        async buildStart() {
+            // Before any transform: a header's bridge reads the include roots of every dependency, and a cargo
+            // dependency built for another target only is there but lacks this one until the build makes it.
+            await buildDependencies({ targetParams: { ...targetParams, buildType: [buildTargetRelease.buildType] } });
             const watch = (dirs) => {
                 dirs.forEach((dir) => {
                     const filesToWatch = fs.readdirSync(dir);
@@ -78,7 +89,6 @@ const rollupCrossbindPlugin = (options, bridges = []) => {
             });
         },
         async generateBundle() {
-            await buildDependencies({ targetParams: { ...targetParams, buildType: [buildTargetRelease.buildType] } });
             const force = isSourceNewer(buildTargetRelease);
             const sourceBuilt = createLib(buildTargetRelease, 'Source', { force, buildSource: true });
             // Bridge cache is keyed on the nativeGlob fingerprint: adding or

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crossbind/plugin-rollup",
-  "version": "2.0.0-beta.62",
+  "version": "2.0.0-beta.63",
   "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.62",
-    "@crossbind/core-embind-rust": "^2.0.0-beta.62"
+    "crossbind": "^2.0.0-beta.63",
+    "@crossbind/core-embind-rust": "^2.0.0-beta.63"
   },
   "peerDependencies": {
     "rollup": ">=2.0.0"