rollipop 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/config/types.d.ts

@@ -6,11 +6,12 @@ import { InteractiveCommand } from "../node/commands/start/setup-interactive-mod
 import "../node/cli-utils.js";
 import { Plugin } from "../core/plugins/types.js";
 import * as swc from "@swc/core";
-import { DevWatchOptions, RollipopReactNativeFlowConfig as FlowConfig, RollipopReactNativeReactConfig, RollipopReactNativeSwcConfig as SwcConfig, RollipopReactNativeWorkletsConfig as WorkletsConfig } from "@rollipop/rolldown/experimental";
+import { DevWatchOptions, RollipopReactNativeFlowConfig as FlowConfig, RollipopReactNativeReactConfig, RollipopReactNativeSwcConfig as SwcConfig, RollipopReactNativeWorkletsConfig } from "@rollipop/rolldown/experimental";
 import * as rolldown from "@rollipop/rolldown";
 import { TopLevelFilterExpression } from "@rollipop/rolldown/filter";
 import * as babel from "@babel/core";
 //#region src/config/types.d.ts
+type WorkletsConfig = Partial<RollipopReactNativeWorkletsConfig>;
 type RolldownExperimentalOptions = NonNullable<rolldown.InputOptions['experimental']>;
 type RolldownTransformOptions = NonNullable<rolldown.InputOptions['transform']>;
 type RolldownJsxOptions = ExtractObject<NonNullable<RolldownTransformOptions['jsx']>>;
@@ -227,7 +228,7 @@ export interface TransformRule<T = unknown> {
 }
 export interface ExperimentalConfig extends RolldownExperimentalOptions {
   /**
-   * `react-native-worklets` transformation configuration.
+   * Worklets or Reanimated 3 transformation configuration. Installed versions are detected by default.
    */
   worklets?: WorkletsConfig;
 }

package/dist/constants.js

@@ -20,7 +20,7 @@ var constants_exports = /* @__PURE__ */ __exportAll({
 	ROLLIPOP_VIRTUAL_ENTRY_ID: () => ROLLIPOP_VIRTUAL_ENTRY_ID,
 	ROLLIPOP_VIRTUAL_PREFIX: () => ROLLIPOP_VIRTUAL_PREFIX
 });
-const ROLLIPOP_VERSION = "1.0.0-beta.2";
+const ROLLIPOP_VERSION = "1.0.0-beta.3";
 const ROLLIPOP_VIRTUAL_PREFIX = "\0rollipop/";
 const ROLLIPOP_VIRTUAL_BOOTSTRAP_ID = `${ROLLIPOP_VIRTUAL_PREFIX}bootstrap`;
 const ROLLIPOP_VIRTUAL_ENTRY_ID = `${ROLLIPOP_VIRTUAL_PREFIX}entry`;

package/dist/core/plugins/babel-plugin.js

@@ -62,7 +62,7 @@ function transform(code, id, options) {
 		sourceMaps: true,
 		...options
 	});
-	invariant(result?.code, `Failed to transform with babel: ${id}`);
+	invariant(result?.code != null, `Failed to transform with babel: ${id}`);
 	const map = result.map && {
 		...result.map,
 		names: [...result.map.names],

package/dist/core/rolldown.js

@@ -2,7 +2,7 @@ import { ROLLIPOP_VIRTUAL_ENTRY_ID } from "../constants.js";
 import { isDebugEnabled } from "../common/env.js";
 import { CompatStatusReporter, ProgressBarStatusReporter } from "../events/builtin-reporters.js";
 import { asLiteral, iife, nodeEnvironment } from "../common/code.js";
-import { resolveFrom, resolvePackageJson } from "../utils/node-resolve.js";
+import { resolveFrom } from "../utils/node-resolve.js";
 import { getGlobalVariables } from "../internal/react-native.js";
 import { printPluginLog } from "./plugins/context.js";
 import { applyRolldownOptionsConfig } from "../config/compose-override.js";
@@ -12,6 +12,7 @@ import { resolveHmrConfig } from "../utils/config.js";
 import { defineEnvFromObject } from "../utils/env.js";
 import { getBaseUrl } from "../utils/server.js";
 import { getBuildTotalModules, setBuildTotalModules } from "../utils/storage.js";
+import { resolveWorkletsConfig } from "../utils/worklets.js";
 import { transformWithRollipop } from "../utils/transform.js";
 import { loadEnv } from "./env.js";
 import { withTransformBoundary } from "./plugins/utils/transform-utils.js";
@@ -218,17 +219,9 @@ function resolveReactNativeBuiltinPluginConfig(config) {
 		runtimeTarget: config.runtimeTarget,
 		flow: config.transform.flow,
 		swc: resolveNativeSwcConfig(config.transform),
-		worklets: resolveWorkletsConfig(config)
+		worklets: resolveWorkletsConfig(config.experimental.worklets, config)
 	};
 }
-function resolveWorkletsConfig(config) {
-	const { worklets } = config.experimental ?? {};
-	if (worklets == null) return;
-	return toMerged({
-		isRelease: config.mode === "production",
-		pluginVersion: resolvePackageJson(config.root, "react-native-worklets")?.version
-	}, worklets);
-}
 function resolveRolldownTransformConfig(config) {
 	const { flow: _flow, babel: _babel, swc: _swc, ...transform } = config;
 	if (transform.jsx != null && typeof transform.jsx === "object") {

package/dist/hmr-runtime.iife.js

@@ -232,29 +232,29 @@ var __rolldown_runtime__ = (function() {
 		if (e === void 0) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
 		return e;
 	}
-	function asyncGeneratorStep(e, t, r, n, o, a, i) {
+	function asyncGeneratorStep(e, t, r, n, o, i, u) {
 		try {
-			var u = e[a](i);
-			var l = u.value;
+			var l = e[i](u);
+			var a = l.value;
 		} catch (e) {
 			r(e);
 			return;
 		}
-		if (u.done) t(l);
-		else Promise.resolve(l).then(n, o);
+		if (l.done) t(a);
+		else Promise.resolve(a).then(n, o);
 	}
 	function _async_to_generator(e) {
 		return function() {
 			var t = this, r = arguments;
 			return new Promise(function(n, o) {
-				var a = e.apply(t, r);
-				function i(e) {
-					asyncGeneratorStep(a, n, o, i, u, "next", e);
-				}
+				var i = e.apply(t, r);
 				function u(e) {
-					asyncGeneratorStep(a, n, o, i, u, "throw", e);
+					asyncGeneratorStep(i, n, o, u, l, "next", e);
+				}
+				function l(e) {
+					asyncGeneratorStep(i, n, o, u, l, "throw", e);
 				}
-				i(void 0);
+				u(void 0);
 			});
 		};
 	}
@@ -279,6 +279,17 @@ var __rolldown_runtime__ = (function() {
 		if (r) _defineProperties(e, r);
 		return e;
 	}
+	function _get(e, t, r) {
+		if (typeof Reflect !== "undefined" && Reflect.get) _get = Reflect.get;
+		else _get = function e(e, t, r) {
+			var n = _super_prop_base(e, t);
+			if (!n) return;
+			var o = Object.getOwnPropertyDescriptor(n, t);
+			if (o.get) return o.get.call(r || e);
+			return o.value;
+		};
+		return _get(e, t, r || e);
+	}
 	function _get_prototype_of(e) {
 		_get_prototype_of = Object.setPrototypeOf ? Object.getPrototypeOf : function e(e) {
 			return e.__proto__ || Object.getPrototypeOf(e);
@@ -310,21 +321,21 @@ var __rolldown_runtime__ = (function() {
 		if (r == null) return;
 		var n = [];
 		var o = true;
-		var a = false;
-		var i, u;
+		var i = false;
+		var u, l;
 		try {
-			for (r = r.call(e); !(o = (i = r.next()).done); o = true) {
-				n.push(i.value);
+			for (r = r.call(e); !(o = (u = r.next()).done); o = true) {
+				n.push(u.value);
 				if (t && n.length === t) break;
 			}
 		} catch (e) {
-			a = true;
-			u = e;
+			i = true;
+			l = e;
 		} finally {
 			try {
 				if (!o && r["return"] != null) r["return"]();
 			} finally {
-				if (a) throw u;
+				if (i) throw l;
 			}
 		}
 		return n;
@@ -349,11 +360,18 @@ var __rolldown_runtime__ = (function() {
 	function _sliced_to_array(e, t) {
 		return _array_with_holes(e) || _iterable_to_array_limit(e, t) || _unsupported_iterable_to_array(e, t) || _non_iterable_rest();
 	}
+	function _super_prop_base(e, t) {
+		while (!Object.prototype.hasOwnProperty.call(e, t)) {
+			e = _get_prototype_of(e);
+			if (e === null) break;
+		}
+		return e;
+	}
 	function _to_consumable_array(e) {
 		return _array_without_holes(e) || _iterable_to_array(e) || _unsupported_iterable_to_array(e) || _non_iterable_spread();
 	}
 	function _ts_generator(e, t) {
-		var r, n, o, a = {
+		var r, n, o, i = {
 			label: 0,
 			sent: function() {
 				if (o[0] & 1) throw o[1];
@@ -361,73 +379,73 @@ var __rolldown_runtime__ = (function() {
 			},
 			trys: [],
 			ops: []
-		}, i = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), u = Object.defineProperty;
-		return u(i, "next", { value: l(0) }), u(i, "throw", { value: l(1) }), u(i, "return", { value: l(2) }), typeof Symbol === "function" && u(i, Symbol.iterator, { value: function() {
+		}, u = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), l = Object.defineProperty;
+		return l(u, "next", { value: a(0) }), l(u, "throw", { value: a(1) }), l(u, "return", { value: a(2) }), typeof Symbol === "function" && l(u, Symbol.iterator, { value: function() {
 			return this;
-		} }), i;
-		function l(e) {
+		} }), u;
+		function a(e) {
 			return function(t) {
 				return s([e, t]);
 			};
 		}
-		function s(u) {
+		function s(l) {
 			if (r) throw new TypeError("Generator is already executing.");
-			while (i && (i = 0, u[0] && (a = 0)), a) try {
-				if (r = 1, n && (o = u[0] & 2 ? n["return"] : u[0] ? n["throw"] || ((o = n["return"]) && o.call(n), 0) : n.next) && !(o = o.call(n, u[1])).done) return o;
-				if (n = 0, o) u = [u[0] & 2, o.value];
-				switch (u[0]) {
+			while (u && (u = 0, l[0] && (i = 0)), i) try {
+				if (r = 1, n && (o = l[0] & 2 ? n["return"] : l[0] ? n["throw"] || ((o = n["return"]) && o.call(n), 0) : n.next) && !(o = o.call(n, l[1])).done) return o;
+				if (n = 0, o) l = [l[0] & 2, o.value];
+				switch (l[0]) {
 					case 0:
 					case 1:
-						o = u;
+						o = l;
 						break;
 					case 4:
-						a.label++;
+						i.label++;
 						return {
-							value: u[1],
+							value: l[1],
 							done: false
 						};
 					case 5:
-						a.label++;
-						n = u[1];
-						u = [0];
+						i.label++;
+						n = l[1];
+						l = [0];
 						continue;
 					case 7:
-						u = a.ops.pop();
-						a.trys.pop();
+						l = i.ops.pop();
+						i.trys.pop();
 						continue;
 					default:
-						if (!(o = a.trys, o = o.length > 0 && o[o.length - 1]) && (u[0] === 6 || u[0] === 2)) {
-							a = 0;
+						if (!(o = i.trys, o = o.length > 0 && o[o.length - 1]) && (l[0] === 6 || l[0] === 2)) {
+							i = 0;
 							continue;
 						}
-						if (u[0] === 3 && (!o || u[1] > o[0] && u[1] < o[3])) {
-							a.label = u[1];
+						if (l[0] === 3 && (!o || l[1] > o[0] && l[1] < o[3])) {
+							i.label = l[1];
 							break;
 						}
-						if (u[0] === 6 && a.label < o[1]) {
-							a.label = o[1];
-							o = u;
+						if (l[0] === 6 && i.label < o[1]) {
+							i.label = o[1];
+							o = l;
 							break;
 						}
-						if (o && a.label < o[2]) {
-							a.label = o[2];
-							a.ops.push(u);
+						if (o && i.label < o[2]) {
+							i.label = o[2];
+							i.ops.push(l);
 							break;
 						}
-						if (o[2]) a.ops.pop();
-						a.trys.pop();
+						if (o[2]) i.ops.pop();
+						i.trys.pop();
 						continue;
 				}
-				u = t.call(e, a);
+				l = t.call(e, i);
 			} catch (e) {
-				u = [6, e];
+				l = [6, e];
 				n = 0;
 			} finally {
 				r = o = 0;
 			}
-			if (u[0] & 5) throw u[1];
+			if (l[0] & 5) throw l[1];
 			return {
-				value: u[0] ? u[1] : void 0,
+				value: l[0] ? l[1] : void 0,
 				done: true
 			};
 		}
@@ -449,13 +467,13 @@ var __rolldown_runtime__ = (function() {
 	var BaseDevRuntime = DevRuntime;
 	var ModuleHotContext = /*#__PURE__*/ function() {
 		"use strict";
-		function e(t, r, n, o, a) {
+		function e(t, r, n, o, i) {
 			_class_call_check(this, e);
 			this.moduleId = t;
 			this.socketHolder = r;
 			this.runtime = n;
 			this.data = o;
-			this.invalidateModule = a;
+			this.invalidateModule = i;
 			this.removeListeners = [];
 			this.acceptCallbacks = [];
 		}
@@ -527,8 +545,8 @@ var __rolldown_runtime__ = (function() {
 					var e = true, t = false, r = void 0;
 					try {
 						for (var n = this.removeListeners[Symbol.iterator](), o; !(e = (o = n.next()).done); e = true) {
-							var a = o.value;
-							a();
+							var i = o.value;
+							i();
 						}
 					} catch (e) {
 						t = true;
@@ -623,8 +641,8 @@ var __rolldown_runtime__ = (function() {
 					var e = true, t = false, r = void 0;
 					try {
 						for (var n = this.queuedMessages[Symbol.iterator](), o; !(e = (o = n.next()).done); e = true) {
-							var a = o.value;
-							this._socket.send(a);
+							var i = o.value;
+							this._socket.send(i);
 						}
 					} catch (e) {
 						t = true;
@@ -669,6 +687,62 @@ var __rolldown_runtime__ = (function() {
 			return e;
 		}
 		_create_class(ReactNativeDevRuntime, [
+			{
+				key: "hasFactory",
+				value: function e(e) {
+					return _get(_get_prototype_of(ReactNativeDevRuntime.prototype), "hasFactory", this).call(this, e) || typeof __rollipop_require__ !== "undefined" && __rollipop_require__.m[e] != null;
+				}
+			},
+			{
+				key: "isExecuted",
+				value: function e(e) {
+					return _get(_get_prototype_of(ReactNativeDevRuntime.prototype), "isExecuted", this).call(this, e) || typeof __rollipop_require__ !== "undefined" && __rollipop_require__.c[e] != null;
+				}
+			},
+			{
+				key: "loadExports",
+				value: function e(e) {
+					if (!_get(_get_prototype_of(ReactNativeDevRuntime.prototype), "isExecuted", this).call(this, e) && typeof __rollipop_require__ !== "undefined") {
+						var t = __rollipop_require__.c[e];
+						if (t != null) return t.exports;
+					}
+					return _get(_get_prototype_of(ReactNativeDevRuntime.prototype), "loadExports", this).call(this, e);
+				}
+			},
+			{
+				key: "initModule",
+				value: function e(e) {
+					if (this.isExecuted(e)) return this.loadExports(e);
+					if (_get(_get_prototype_of(ReactNativeDevRuntime.prototype), "hasFactory", this).call(this, e) || !this.hasFactory(e)) return _get(_get_prototype_of(ReactNativeDevRuntime.prototype), "initModule", this).call(this, e);
+					return __rollipop_require__(e);
+				}
+			},
+			{
+				key: "registerFactory",
+				value: function e(e, t, r) {
+					var n = this;
+					_get(_get_prototype_of(ReactNativeDevRuntime.prototype), "registerFactory", this).call(this, e, t, r);
+					if (typeof __rollipop_require__ !== "undefined") __rollipop_require__.m[e] = function(t, r) {
+						r.exports = _get(_get_prototype_of(ReactNativeDevRuntime.prototype), "initModule", n).call(n, e);
+					};
+				}
+			},
+			{
+				key: "registerModule",
+				value: function e(e, t) {
+					t !== null && t !== void 0 || (t = typeof __rollipop_require__ !== "undefined" ? __rollipop_require__.c[e] : void 0);
+					t !== null && t !== void 0 || (t = { exports: {} });
+					_get(_get_prototype_of(ReactNativeDevRuntime.prototype), "registerModule", this).call(this, e, t);
+					if (typeof __rollipop_require__ !== "undefined") __rollipop_require__.c[e] = t;
+				}
+			},
+			{
+				key: "removeModuleCache",
+				value: function e(e) {
+					if (typeof __rollipop_require__ !== "undefined") delete __rollipop_require__.c[e];
+					_get(_get_prototype_of(ReactNativeDevRuntime.prototype), "removeModuleCache", this).call(this, e);
+				}
+			},
 			{
 				key: "createHotContext",
 				value: function e(e) {
@@ -709,10 +783,10 @@ var __rolldown_runtime__ = (function() {
 					e.addEventListener("message", function(t) {
 						var n = JSON.parse(t.data);
 						if (isCustomHMRMessage(n)) {
-							var o, a;
+							var o, i;
 							debug("[HMR]: Custom HMR message received: ".concat(n.type));
 							r.socketHolder.emit(n.type, n.payload);
-							(a = globalThis.__rollipop_runtime__) === null || a === void 0 || (o = a.customHMRHandler) == null || o.call(a, e, n);
+							(i = globalThis.__rollipop_runtime__) === null || i === void 0 || (o = i.customHMRHandler) == null || o.call(i, e, n);
 							return;
 						}
 						switch (n.type) {
@@ -782,23 +856,23 @@ var __rolldown_runtime__ = (function() {
 			{
 				key: "applyPush",
 				value: function e(e) {
-					var t = e.changedIds, r = e.code, n = e.filename, o = e.seq, a = e.sourceURL;
+					var t = e.changedIds, r = e.code, n = e.filename, o = e.seq, i = e.sourceURL;
 					if (o !== this.lastSeq + 1) {
 						this.reload("HMR update sequence gap (expected ".concat(this.lastSeq + 1, ", got ").concat(o, ")"));
 						return;
 					}
 					this.lastSeq = o;
-					var i = this.computeHmrUpdate(t);
-					if (i.type === "full-reload") {
-						this.reload(i.reason);
+					var u = this.computeHmrUpdate(t);
+					if (u.type === "full-reload") {
+						this.reload(u.reason);
 						return;
 					}
-					this.evaluate(r, a);
+					this.evaluate(r, i);
 					this.socketHolder.send(JSON.stringify({
 						type: "hmr:payload-delivered",
 						filename: n
 					}));
-					if (i.type === "boundaries") this.applyUpdate(i);
+					if (u.type === "boundaries") this.applyUpdate(u);
 				}
 			},
 			{
@@ -827,22 +901,22 @@ var __rolldown_runtime__ = (function() {
 					var r = [];
 					var n = /* @__PURE__ */ new Set();
 					var o = /* @__PURE__ */ new Set();
-					var a = true, i = false, u = void 0;
+					var i = true, u = false, l = void 0;
 					try {
-						for (var l = e[Symbol.iterator](), s; !(a = (s = l.next()).done); a = true) {
+						for (var a = e[Symbol.iterator](), s; !(i = (s = a.next()).done); i = true) {
 							var c = s.value;
 							if (!this.isExecuted(c)) continue;
 							var f = this.bubble(c, [c], n, r, o, t);
 							if (f != null) return f;
 						}
 					} catch (e) {
-						i = true;
-						u = e;
+						u = true;
+						l = e;
 					} finally {
 						try {
-							if (!a && l.return != null) l.return();
+							if (!i && a.return != null) a.return();
 						} finally {
-							if (i) throw u;
+							if (u) throw l;
 						}
 					}
 					return r.length === 0 ? { type: "noop" } : {
@@ -854,47 +928,47 @@ var __rolldown_runtime__ = (function() {
 			},
 			{
 				key: "bubble",
-				value: function e(e, t, r, n, o, a) {
-					var i = this;
+				value: function e(e, t, r, n, o, i) {
+					var u = this;
 					if (o.has(e)) return;
 					o.add(e);
 					r.add(e);
-					if (a != null && e === a) return {
+					if (i != null && e === i) return {
 						type: "full-reload",
-						reason: "Update propagated back to ".concat(a)
+						reason: "Update propagated back to ".concat(i)
 					};
 					if (this.isSelfAccepted(e)) {
 						n.push([e, e]);
 						return;
 					}
-					var u = this.getImporters(e).filter(function(e) {
-						return i.isExecuted(e);
+					var l = this.getImporters(e).filter(function(e) {
+						return u.isExecuted(e);
 					});
-					if (u.length === 0) return {
+					if (l.length === 0) return {
 						type: "full-reload",
 						reason: "No HMR boundary found for ".concat(e)
 					};
-					var l = true, s = false, c = void 0;
+					var a = true, s = false, c = void 0;
 					try {
-						for (var f = u[Symbol.iterator](), d; !(l = (d = f.next()).done); l = true) {
-							var h = d.value;
-							if (this.acceptsDependency(h, e)) {
-								n.push([h, e]);
+						for (var f = l[Symbol.iterator](), d; !(a = (d = f.next()).done); a = true) {
+							var p = d.value;
+							if (this.acceptsDependency(p, e)) {
+								n.push([p, e]);
 								continue;
 							}
-							if (t.includes(h)) return {
+							if (t.includes(p)) return {
 								type: "full-reload",
-								reason: "Circular import chain between ".concat(e, " and ").concat(h)
+								reason: "Circular import chain between ".concat(e, " and ").concat(p)
 							};
-							var v = this.bubble(h, _to_consumable_array(t).concat([h]), r, n, o, a);
-							if (v != null) return v;
+							var h = this.bubble(p, _to_consumable_array(t).concat([p]), r, n, o, i);
+							if (h != null) return h;
 						}
 					} catch (e) {
 						s = true;
 						c = e;
 					} finally {
 						try {
-							if (!l && f.return != null) f.return();
+							if (!a && f.return != null) f.return();
 						} finally {
 							if (s) throw c;
 						}
@@ -925,110 +999,110 @@ var __rolldown_runtime__ = (function() {
 				key: "applyUpdate",
 				value: function e(e, t) {
 					var r = this;
-					var n = true, o = false, a = void 0;
+					var n = true, o = false, i = void 0;
 					try {
-						for (var i = e.updateSet[Symbol.iterator](), u; !(n = (u = i.next()).done); n = true) {
-							var l = u.value;
-							if (!this.hasFactory(l)) {
-								this.reload("No factory registered for ".concat(l));
+						for (var u = e.updateSet[Symbol.iterator](), l; !(n = (l = u.next()).done); n = true) {
+							var a = l.value;
+							if (!this.hasFactory(a)) {
+								this.reload("No factory registered for ".concat(a));
 								return;
 							}
 						}
 					} catch (e) {
 						o = true;
-						a = e;
+						i = e;
 					} finally {
 						try {
-							if (!n && i.return != null) i.return();
+							if (!n && u.return != null) u.return();
 						} finally {
-							if (o) throw a;
+							if (o) throw i;
 						}
 					}
 					var s = e.boundaries.map(function(e) {
 						var t = _sliced_to_array(e, 2), n = t[0], o = t[1];
-						var a;
 						var i;
+						var u;
 						return {
 							acceptedVia: o,
-							callbacks: (a = (i = r.moduleHotContexts.get(n)) === null || i === void 0 ? void 0 : i.acceptCallbacks.filter(function(e) {
+							callbacks: (i = (u = r.moduleHotContexts.get(n)) === null || u === void 0 ? void 0 : u.acceptCallbacks.filter(function(e) {
 								return e.deps.includes(o);
-							})) !== null && a !== void 0 ? a : []
+							})) !== null && i !== void 0 ? i : []
 						};
 					});
 					var c = true, f = false, d = void 0;
 					try {
-						for (var h = e.updateSet[Symbol.iterator](), v; !(c = (v = h.next()).done); c = true) {
-							var p = v.value;
-							this.removeModuleCache(p);
+						for (var p = e.updateSet[Symbol.iterator](), h; !(c = (h = p.next()).done); c = true) {
+							var v = h.value;
+							this.removeModuleCache(v);
 						}
 					} catch (e) {
 						f = true;
 						d = e;
 					} finally {
 						try {
-							if (!c && h.return != null) h.return();
+							if (!c && p.return != null) p.return();
 						} finally {
 							if (f) throw d;
 						}
 					}
-					var y = true, m = false, b = void 0;
+					var y = true, m = false, _ = void 0;
 					try {
-						var k, g = function() {
-							var e = _.value, r = e.acceptedVia, n = e.callbacks;
-							k.initModule(r);
-							var o = k.loadExports(r);
+						var b, k = function() {
+							var e = w.value, r = e.acceptedVia, n = e.callbacks;
+							b.initModule(r);
+							var o = b.loadExports(r);
 							try {
-								k.currentFirstInvalidatedBy = t;
-								var a = true, i = false, u = void 0;
+								b.currentFirstInvalidatedBy = t;
+								var i = true, u = false, l = void 0;
 								try {
-									for (var l = n[Symbol.iterator](), s; !(a = (s = l.next()).done); a = true) {
+									for (var a = n[Symbol.iterator](), s; !(i = (s = a.next()).done); i = true) {
 										var c = s.value, f = c.deps, d = c.fn;
 										d(f.map(function(e) {
 											return e === r ? o : void 0;
 										}));
 									}
 								} catch (e) {
-									i = true;
-									u = e;
+									u = true;
+									l = e;
 								} finally {
 									try {
-										if (!a && l.return != null) l.return();
+										if (!i && a.return != null) a.return();
 									} finally {
-										if (i) throw u;
+										if (u) throw l;
 									}
 								}
 							} finally {
-								k.currentFirstInvalidatedBy = void 0;
+								b.currentFirstInvalidatedBy = void 0;
 							}
 						};
-						for (var w = s[Symbol.iterator](), _; !(y = (_ = w.next()).done); y = true) k = this, g();
+						for (var g = s[Symbol.iterator](), w; !(y = (w = g.next()).done); y = true) b = this, k();
 					} catch (e) {
 						m = true;
-						b = e;
+						_ = e;
 					} finally {
 						try {
-							if (!y && w.return != null) w.return();
+							if (!y && g.return != null) g.return();
 						} finally {
-							if (m) throw b;
+							if (m) throw _;
 						}
 					}
-					var H = true, S = false, x = void 0;
+					var x = true, H = false, S = void 0;
 					try {
-						for (var M = this.moduleHotContextsToBeUpdated[Symbol.iterator](), C; !(H = (C = M.next()).done); H = true) {
-							var R = _sliced_to_array(C.value, 2), U = R[0], E = R[1];
-							var O;
-							(O = this.moduleHotContexts.get(U)) === null || O === void 0 || O.cleanup();
-							if (E == null) this.moduleHotContexts.delete(U);
-							else this.moduleHotContexts.set(U, E);
+						for (var M = this.moduleHotContextsToBeUpdated[Symbol.iterator](), C; !(x = (C = M.next()).done); x = true) {
+							var R = _sliced_to_array(C.value, 2), E = R[0], q = R[1];
+							var U;
+							(U = this.moduleHotContexts.get(E)) === null || U === void 0 || U.cleanup();
+							if (q == null) this.moduleHotContexts.delete(E);
+							else this.moduleHotContexts.set(E, q);
 						}
 					} catch (e) {
-						S = true;
-						x = e;
+						H = true;
+						S = e;
 					} finally {
 						try {
-							if (!H && M.return != null) M.return();
+							if (!x && M.return != null) M.return();
 						} finally {
-							if (S) throw x;
+							if (H) throw S;
 						}
 					}
 					this.moduleHotContextsToBeUpdated.clear();
@@ -1088,20 +1162,20 @@ var __rolldown_runtime__ = (function() {
 					return;
 				}
 				e.set(r.id, r);
-				var o = true, a = false, i = void 0;
+				var o = true, i = false, u = void 0;
 				try {
-					for (var u = t[Symbol.iterator](), l; !(o = (l = u.next()).done); o = true) {
-						var s = l.value;
+					for (var l = t[Symbol.iterator](), a; !(o = (a = l.next()).done); o = true) {
+						var s = a.value;
 						s(r);
 					}
 				} catch (e) {
-					a = true;
-					i = e;
+					i = true;
+					u = e;
 				} finally {
 					try {
-						if (!o && u.return != null) u.return();
+						if (!o && l.return != null) l.return();
 					} finally {
-						if (a) throw i;
+						if (i) throw u;
 					}
 				}
 			},

package/dist/index.d.ts

@@ -19,6 +19,7 @@ import { resetCache } from "./utils/reset-cache.js";
 import { Bundler } from "./core/bundler.js";
 import { assets_d_exports } from "./core/assets.js";
 import { LoadEnvOptions, loadEnv } from "./core/env.js";
+import { resolveWorkletsConfig } from "./utils/worklets.js";
 import { constants_d_exports } from "./constants.js";
 import { HMRClientLogLevel, HMRClientMessage, HMRContext, HMRCustomHandler, HMRCustomMessage, HMRServerError, HMRServerMessage } from "./types/hmr.js";
 import { cli_d_exports } from "./node/cli.js";
@@ -29,4 +30,4 @@ import { OutputChunk } from "@rollipop/rolldown";
 export declare function runBuild(config: ResolvedConfig, options: BuildOptions): Promise<OutputChunk>;
 export declare function runServer(config: ResolvedConfig, options: ServerOptions): Promise<DevServer>;
 //#endregion
-export { type AliasConfig, type AnalyzerConfig, assets_d_exports as AssetUtils, type AsyncResult, type BabelTransformConfig, type BuildDiagnosticLog, type BuildOptions, type BuildType, type BundleDetails, Bundler, type BundlerContext, type BundlerState, type ChangeEvent, type Config, constants_d_exports as Constants, DEFAULT_HOST, DEFAULT_PORT, DEV_SERVER_ASSET_PATH, type DeepRequired, DefaultConfig, DefineConfigContext, type DevConfig, type DevEngine, type DevEngineOptions, type DevServer, type DevServerContext, type DevServerEvents, type DevToolsPluginOptions, DynamicUserConfig, type ExperimentalConfig, type ExtractObject, type FastifyInstance, type FlowConfig, type FlowConfig as RollipopReactNativeFlowConfig, type FormattedError, type HMRClientLogLevel, type HMRClientMessage, type HMRContext, type HMRCustomHandler, type HMRCustomMessage, type HMRServerError, type HMRServerMessage, type HmrConfig, type HotUpdateOptions, InteractiveCommand, InteractiveCommandContext, InteractiveModeOptions, InternalConfig, type JsxOptions, LoadConfigOptions, LoadEnvOptions, type MaybePromise, type Middlewares, type NullValue, type OptimizationConfig, type OutputConfig, type PackageJson, type Plugin, type PluginConfig, PluginFlattenConfig, type PluginOption, type PluginWithHotUpdate, type Polyfill, type PolyfillOptions, type PolyfillType, type PolyfillWithCode, type PolyfillWithPath, type ReactNativeConfig, type ReportableEvent, type Reporter, type ResolveConfig, ResolvedConfig, type RolldownOptions, type RolldownOptionsConfig, type RolldownOptionsContext, type RolldownOptionsFunction, type RollipopDevToolsNodeContext, type SwcConfig as RollipopReactNativeSwcConfig, type SwcConfig, type WorkletsConfig as RollipopReactNativeWorkletsConfig, type WorkletsConfig, type ServerOptions, type SwcTransformConfig, type TransformConfig, type TransformRule, UserConfig, type WatcherConfig, cli_d_exports as cli, createCommand, createDevServer, createReactNativeCliCommand, defineConfig, flattenPluginOption, getDefaultConfig, invokeConfigResolved, loadConfig, loadEnv, mergeConfig, index_d_exports as plugins, resetCache, resolvePluginConfig, rolldown, rolldownExperimental, setupInteractiveMode };
+export { type AliasConfig, type AnalyzerConfig, assets_d_exports as AssetUtils, type AsyncResult, type BabelTransformConfig, type BuildDiagnosticLog, type BuildOptions, type BuildType, type BundleDetails, Bundler, type BundlerContext, type BundlerState, type ChangeEvent, type Config, constants_d_exports as Constants, DEFAULT_HOST, DEFAULT_PORT, DEV_SERVER_ASSET_PATH, type DeepRequired, DefaultConfig, DefineConfigContext, type DevConfig, type DevEngine, type DevEngineOptions, type DevServer, type DevServerContext, type DevServerEvents, type DevToolsPluginOptions, DynamicUserConfig, type ExperimentalConfig, type ExtractObject, type FastifyInstance, type FlowConfig, type FlowConfig as RollipopReactNativeFlowConfig, type FormattedError, type HMRClientLogLevel, type HMRClientMessage, type HMRContext, type HMRCustomHandler, type HMRCustomMessage, type HMRServerError, type HMRServerMessage, type HmrConfig, type HotUpdateOptions, InteractiveCommand, InteractiveCommandContext, InteractiveModeOptions, InternalConfig, type JsxOptions, LoadConfigOptions, LoadEnvOptions, type MaybePromise, type Middlewares, type NullValue, type OptimizationConfig, type OutputConfig, type PackageJson, type Plugin, type PluginConfig, PluginFlattenConfig, type PluginOption, type PluginWithHotUpdate, type Polyfill, type PolyfillOptions, type PolyfillType, type PolyfillWithCode, type PolyfillWithPath, type ReactNativeConfig, type ReportableEvent, type Reporter, type ResolveConfig, ResolvedConfig, type RolldownOptions, type RolldownOptionsConfig, type RolldownOptionsContext, type RolldownOptionsFunction, type RollipopDevToolsNodeContext, type SwcConfig as RollipopReactNativeSwcConfig, type SwcConfig, type WorkletsConfig as RollipopReactNativeWorkletsConfig, type WorkletsConfig, type ServerOptions, type SwcTransformConfig, type TransformConfig, type TransformRule, UserConfig, type WatcherConfig, cli_d_exports as cli, createCommand, createDevServer, createReactNativeCliCommand, defineConfig, flattenPluginOption, getDefaultConfig, invokeConfigResolved, loadConfig, loadEnv, mergeConfig, index_d_exports as plugins, resetCache, resolvePluginConfig, resolveWorkletsConfig, rolldown, rolldownExperimental, setupInteractiveMode };

package/dist/index.js

@@ -5,6 +5,7 @@ import { mergeConfig } from "./config/merge-config.js";
 import { flattenPluginOption, invokeConfigResolved, loadConfig, resolvePluginConfig } from "./config/load-config.js";
 import "./config/index.js";
 import { resetCache } from "./utils/reset-cache.js";
+import { resolveWorkletsConfig } from "./utils/worklets.js";
 import { loadEnv } from "./core/env.js";
 import { DEFAULT_HOST, DEFAULT_PORT, DEV_SERVER_ASSET_PATH } from "./server/constants.js";
 import { createDevServer } from "./server/index.js";
@@ -26,4 +27,4 @@ async function runServer(config, options) {
 	return runServer(config, options);
 }
 //#endregion
-export { assets_exports as AssetUtils, Bundler, constants_exports as Constants, DEFAULT_HOST, DEFAULT_PORT, DEV_SERVER_ASSET_PATH, cli_exports as cli, createCommand, createDevServer, createReactNativeCliCommand, defineConfig, flattenPluginOption, getDefaultConfig, invokeConfigResolved, loadConfig, loadEnv, mergeConfig, plugins_exports as plugins, resetCache, resolvePluginConfig, rolldown, rolldownExperimental, runBuild, runServer, setupInteractiveMode };
+export { assets_exports as AssetUtils, Bundler, constants_exports as Constants, DEFAULT_HOST, DEFAULT_PORT, DEV_SERVER_ASSET_PATH, cli_exports as cli, createCommand, createDevServer, createReactNativeCliCommand, defineConfig, flattenPluginOption, getDefaultConfig, invokeConfigResolved, loadConfig, loadEnv, mergeConfig, plugins_exports as plugins, resetCache, resolvePluginConfig, resolveWorkletsConfig, rolldown, rolldownExperimental, runBuild, runServer, setupInteractiveMode };

package/dist/node/commands/bundle/command.js

@@ -14,6 +14,14 @@ const command = {
 			description: "Path to the CLI configuration file",
 			parse: resolvePath
 		},
+		{
+			name: "--config-cmd <string>",
+			description: "Accepted for React Native Xcode compatibility; ignored."
+		},
+		{
+			name: "--load-config <string>",
+			description: "Accepted for React Native Xcode compatibility; ignored."
+		},
 		{
 			name: "--entry-file <path>",
 			description: "Path to the root JS file, either absolute or relative to JS root"

package/dist/package.js

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "1.0.0-beta.2";
+var version = "1.0.0-beta.3";
 //#endregion
 export { version };

package/dist/server/devframe/index.js

@@ -21,7 +21,7 @@ var RollipopDevframeController = class {
 		this.definition = defineDevframe({
 			id: "rollipop",
 			name: "Rollipop",
-			version: "1.0.0-beta.2",
+			version: "1.0.0-beta.3",
 			packageName: "rollipop",
 			homepage: "https://github.com/rollipop-dev/rollipop",
 			description: "React Native development dashboard powered by Rollipop.",

package/dist/server/devframe/setup.js

@@ -16,7 +16,7 @@ async function setupDevframe(context, server, inspectorDeviceServer) {
 	const controller = new RollipopDevframeController(context, createAgentToolContext(context));
 	const devtools = initHub({
 		name: DEVFRAME_NAME,
-		version: "1.0.0-beta.2",
+		version: "1.0.0-beta.3",
 		base: ROLLIPOP_DEVFRAME_BASE,
 		cwd: context.config.root,
 		ui: createUi({
@@ -39,6 +39,9 @@ async function setupDevframe(context, server, inspectorDeviceServer) {
 		mcp: mcpEnabled ? { path: ROLLIPOP_DEVFRAME_MCP_PATH } : false,
 		origin: context.serverBaseUrl,
 		configure: async (devtoolsContext) => {
+			(await devtoolsContext.rpc.sharedState.get("devframe:user-settings")).mutate((state) => {
+				state.autoCollapseEdgeToolbar ??= false;
+			});
 			await controller.definition.setup(devtoolsContext);
 			await invokeDevToolsSetup(devtoolsContext, server, context.config.plugins ?? []);
 		}

package/dist/storage/file-storage.js

@@ -28,7 +28,7 @@ var FileStorage = class FileStorage {
 		this.dataFilePath = path.join(FileStorage.getPath(basePath, { prepare: true }), DATA_FILENAME);
 		if (fs.existsSync(this.dataFilePath)) {
 			const loadedData = JSON.parse(fs.readFileSync(this.dataFilePath, "utf-8"));
-			if ("version" in loadedData && loadedData.version === "1.0.0-beta.2") this.data = loadedData;
+			if ("version" in loadedData && loadedData.version === "1.0.0-beta.3") this.data = loadedData;
 			else {
 				this.data = createDefaultData();
 				this.flush();

package/dist/utils/transform.js

@@ -1,3 +1,4 @@
+import { resolveWorkletsConfig } from "./worklets.js";
 import { RollipopReactNativeTransformer } from "@rollipop/rolldown/experimental";
 //#region src/utils/transform.ts
 const transformers = /* @__PURE__ */ new WeakMap();
@@ -8,7 +9,7 @@ function transformWithRollipop(id, code, config) {
 			envName: config.mode,
 			runtimeTarget: config.runtimeTarget,
 			flow: config.transform.flow,
-			worklets: config.experimental.worklets,
+			worklets: resolveWorkletsConfig(config.experimental.worklets, config),
 			swc: {
 				externalHelpers: true,
 				...config.transform.swc?.native

package/dist/utils/worklets.d.ts

@@ -0,0 +1,7 @@
+import { RollipopReactNativeWorkletsConfig as WorkletsConfig } from "../config/types.js";
+import "../config/index.js";
+import { ResolvedConfig } from "../config/defaults.js";
+import { RollipopReactNativeWorkletsConfig } from "@rollipop/rolldown/experimental";
+//#region src/utils/worklets.d.ts
+export declare function resolveWorkletsConfig(worklets: WorkletsConfig | undefined, { root, mode }: Pick<ResolvedConfig, 'root' | 'mode'>): RollipopReactNativeWorkletsConfig | undefined;
+//#endregion

package/dist/utils/worklets.js

@@ -0,0 +1,32 @@
+import { resolvePackageJson } from "./node-resolve.js";
+import { satisfies } from "semver";
+//#region src/utils/worklets.ts
+function resolveWorkletsConfig(worklets, { root, mode }) {
+	if (worklets == null) return;
+	const { pluginVersion, reanimatedVersion, ...options } = worklets;
+	const defaults = {
+		...options,
+		isRelease: options.isRelease ?? mode === "production"
+	};
+	if (pluginVersion != null) return {
+		...defaults,
+		pluginVersion
+	};
+	if (reanimatedVersion != null) return {
+		...defaults,
+		reanimatedVersion
+	};
+	const installedReanimatedVersion = resolvePackageJson(root, "react-native-reanimated")?.version;
+	if (installedReanimatedVersion != null && satisfies(installedReanimatedVersion, "3.x", { includePrerelease: true })) return {
+		...defaults,
+		reanimatedVersion: installedReanimatedVersion
+	};
+	const installedWorkletsVersion = resolvePackageJson(root, "react-native-worklets")?.version;
+	if (installedWorkletsVersion != null) return {
+		...defaults,
+		pluginVersion: installedWorkletsVersion
+	};
+	throw new Error("Could not resolve a worklet runtime. Install react-native-reanimated 3.x or react-native-worklets, or set reanimatedVersion or pluginVersion in the worklets configuration.");
+}
+//#endregion
+export { resolveWorkletsConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollipop",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "homepage": "https://github.com/rollipop-dev/rollipop#readme",
   "bugs": {
     "url": "https://github.com/rollipop-dev/rollipop/issues"
@@ -67,8 +67,8 @@
     "@react-native-community/cli-server-api": "20.2.0",
     "@react-native-community/cli-types": "20.2.0",
     "@react-native/dev-middleware": "0.88.0",
-    "@rollipop/dashboard": "1.0.0-beta.2",
-    "@rollipop/rolldown": "1.1.1",
+    "@rollipop/dashboard": "1.0.0-beta.3",
+    "@rollipop/rolldown": "1.2.0",
     "@swc/core": "1.16.13",
     "@swc/helpers": "0.5.23",
     "@types/ws": "8.18.2",

package/src/runtime/__tests__/hmr-runtime.spec.ts

@@ -2,12 +2,13 @@ import fs from 'node:fs';
 import { stripVTControlCharacters } from 'node:util';
 import vm from 'node:vm';
 
+import { DevRuntime } from '@rollipop/rolldown/experimental/runtime';
 import { transformSync } from '@swc/core';
 import * as prettyFormat from 'pretty-format';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vite-plus/test';
 
 import type { HMRContext } from '../../types/hmr';
-import type { HMRGraphRuntime, ModuleGraphDelta } from '../../types/runtime';
+import type { HMRGraphRuntime } from '../../types/runtime';
 
 const clientCode = transformSync(
   fs.readFileSync(new URL('../hmr-client.ts', import.meta.url), 'utf8'),
@@ -18,73 +19,6 @@ const clientCode = transformSync(
   },
 ).code;
 
-class FakeDevRuntime {
-  clientId: string;
-  hooks: {
-    createModuleHotContext(moduleId: string): unknown;
-    onModuleCacheRemoval(moduleId: string): void;
-  } | null = null;
-  private readonly factories = new Map<string, (id: string) => void>();
-  private readonly importers = new Map<string, Set<string>>();
-  private readonly modules = new Map<string, { exports: any }>();
-
-  constructor(clientId: string) {
-    this.clientId = clientId;
-  }
-
-  registerGraph(delta: ModuleGraphDelta) {
-    for (let index = 0; index < delta.localCount; index++) {
-      const importer = delta.ids[index];
-      for (const targetIndex of delta.edges[index]) {
-        const target = delta.ids[targetIndex];
-        const importers = this.importers.get(target) ?? new Set();
-        importers.add(importer);
-        this.importers.set(target, importers);
-      }
-    }
-  }
-
-  registerFactory(id: string, _kind: 'esm' | 'cjs', factory: (id: string) => void) {
-    this.factories.set(id, factory);
-  }
-
-  registerModule(id: string, exportsHolder: { exports: any }) {
-    this.modules.set(id, exportsHolder);
-  }
-
-  getImporters(id: string) {
-    return [...(this.importers.get(id) ?? [])];
-  }
-
-  isExecuted(id: string) {
-    return this.modules.has(id);
-  }
-
-  hasFactory(id: string) {
-    return this.factories.has(id);
-  }
-
-  removeModuleCache(id: string) {
-    this.modules.delete(id);
-    this.hooks?.onModuleCacheRemoval(id);
-  }
-
-  initModule(id: string) {
-    if (!this.modules.has(id)) {
-      this.factories.get(id)?.(id);
-    }
-    return this.loadExports(id);
-  }
-
-  loadExports(id: string) {
-    return this.modules.get(id)?.exports ?? {};
-  }
-
-  createModuleHotContext(moduleId: string) {
-    return this.hooks?.createModuleHotContext(moduleId);
-  }
-}
-
 class FakeWebSocket {
   static readonly CONNECTING = 0;
   static readonly OPEN = 1;
@@ -124,7 +58,7 @@ describe('HMR runtime', () => {
     reload.mockReset();
     FakeWebSocket.instances = [];
     Object.assign(globalThis, {
-      DevRuntime: FakeDevRuntime,
+      DevRuntime,
       WebSocket: FakeWebSocket,
       __rollipop_runtime__: undefined,
       __turboModuleProxy: undefined,
@@ -133,6 +67,7 @@ describe('HMR runtime', () => {
   });
 
   afterEach(() => {
+    delete (globalThis as any).__rollipop_require__;
     delete (globalThis as any).globalEvalWithSourceUrl;
     delete (globalThis as any).__rollipop_runtime__;
   });
@@ -143,6 +78,145 @@ describe('HMR runtime', () => {
     expect((runtime.createModuleHotContext('entry.js') as any).runtime).toBe(runtime);
   });
 
+  describe('initial bundle factories and cache', () => {
+    it.each(['esm', 'cjs'])(
+      'reuses an initial %s factory after eviction through either executor',
+      async (kind) => {
+        const { runtime } = await setupRuntime();
+        const bundleRequire = createBundleRequire();
+        let executions = 0;
+        bundleRequire.m['parent.js'] = (_global, module, exports) => {
+          const value = ++executions;
+          if (kind === 'esm') {
+            Object.defineProperty(exports, 'value', { get: () => value });
+            runtime.registerModule('parent.js', { exports });
+          } else {
+            runtime.registerModule('parent.js', module);
+            module.exports = () => value;
+          }
+        };
+        const readValue = (exports: any) => (kind === 'esm' ? exports.value : exports());
+
+        expect(runtime.hasFactory('parent.js')).toBe(true);
+        expect(runtime.isExecuted('parent.js')).toBe(false);
+        const first = bundleRequire('parent.js');
+        expect(runtime.initModule('parent.js')).toBe(first);
+        expect(runtime.loadExports('parent.js')).toBe(first);
+        expect(readValue(first)).toBe(1);
+
+        runtime.removeModuleCache('parent.js');
+        expect(bundleRequire.c['parent.js']).toBeUndefined();
+        expect(runtime.isExecuted('parent.js')).toBe(false);
+        const second = runtime.initModule('parent.js');
+        expect(bundleRequire('parent.js')).toBe(second);
+        expect(readValue(second)).toBe(2);
+
+        runtime.removeModuleCache('parent.js');
+        const third = bundleRequire('parent.js');
+        expect(runtime.loadExports('parent.js')).toBe(third);
+        expect(readValue(third)).toBe(3);
+      },
+    );
+
+    it.each(['esm', 'cjs'])(
+      'uses the latest %s patch from ordinary require after repeated eviction',
+      async (kind) => {
+        const { runtime } = await setupRuntime();
+        const bundleRequire = createBundleRequire();
+        const original = vi.fn((_global, module: BundleModule) => {
+          runtime.registerModule('dep.js', module);
+          module.exports = { value: 'initial' };
+        });
+        bundleRequire.m['dep.js'] = original;
+        expect(bundleRequire('dep.js')).toEqual({ value: 'initial' });
+
+        for (let version = 1; version <= 2; version++) {
+          const factory = vi.fn((id: string) => {
+            const holder = { exports: {} as any };
+            runtime.registerModule(id, holder);
+            if (kind === 'esm') {
+              Object.defineProperty(holder.exports, 'value', { get: () => version });
+            } else {
+              holder.exports = () => version;
+            }
+          });
+          runtime.registerFactory('dep.js', factory, version);
+          runtime.removeModuleCache('dep.js');
+          const updated = runtime.initModule('dep.js');
+          expect(bundleRequire('dep.js')).toBe(updated);
+          expect(kind === 'esm' ? (updated as any).value : (updated as any)()).toBe(version);
+
+          const stale = vi.fn();
+          runtime.registerFactory('dep.js', stale, version - 1);
+          runtime.removeModuleCache('dep.js');
+          const reexecuted = bundleRequire('dep.js');
+          expect(runtime.initModule('dep.js')).toBe(reexecuted);
+          expect(runtime.loadExports('dep.js')).toBe(reexecuted);
+          expect(kind === 'esm' ? reexecuted.value : reexecuted()).toBe(version);
+          expect(factory).toHaveBeenCalledTimes(2);
+          expect(stale).not.toHaveBeenCalled();
+        }
+        expect(original).toHaveBeenCalledOnce();
+      },
+    );
+
+    it.each([null, undefined, 0, false])(
+      'shares CommonJS module.exports reassignment to %s',
+      async (value) => {
+        const { runtime } = await setupRuntime();
+        const bundleRequire = createBundleRequire();
+        const module = { exports: {} as any };
+        runtime.registerModule('dep.cjs', module);
+        module.exports = value;
+        expect(bundleRequire('dep.cjs')).toBe(value);
+        expect(runtime.loadExports('dep.cjs')).toBe(value);
+        expect(runtime.initModule('dep.cjs')).toBe(value);
+      },
+    );
+
+    it('recognizes modules cached only by the bundle and removes both caches before disposal', async () => {
+      const { runtime } = await setupRuntime();
+      const bundleRequire = createBundleRequire();
+      const exports = { value: 'cached' };
+      bundleRequire.c['helper.js'] = { exports };
+      expect(runtime.isExecuted('helper.js')).toBe(true);
+      expect(runtime.loadExports('helper.js')).toBe(exports);
+      expect(runtime.initModule('helper.js')).toBe(exports);
+      const dispose = vi.fn(() => {
+        expect(bundleRequire.c['helper.js']).toBeUndefined();
+        expect(runtime.isExecuted('helper.js')).toBe(false);
+      });
+      runtime.createModuleHotContext('helper.js').dispose(dispose);
+      runtime.removeModuleCache('helper.js');
+      expect(dispose).toHaveBeenCalledOnce();
+    });
+
+    it('shares the bundle holder when a side-effect module registers without exports', async () => {
+      const { runtime } = await setupRuntime();
+      const bundleRequire = createBundleRequire();
+      bundleRequire.m['side-effect.js'] = () => runtime.registerModule('side-effect.js');
+      const exports = bundleRequire('side-effect.js');
+      expect(bundleRequire('side-effect.js')).toBe(exports);
+      expect(runtime.initModule('side-effect.js')).toBe(exports);
+      expect(runtime.loadExports('side-effect.js')).toBe(exports);
+    });
+
+    it('reloads when an invalidated non-component module has no accepting ancestor', async () => {
+      const { runtime } = await setupRuntime();
+      const bundleRequire = createBundleRequire();
+      runtime.registerGraph({ ids: ['route.js', 'entry.js'], localCount: 2, edges: [[], [0]] });
+      const entry = vi.fn((_global, module: BundleModule) => {
+        runtime.registerModule('entry.js', module);
+        runtime.registerModule('route.js', { exports: { Router: {} } });
+      });
+      bundleRequire.m['entry.js'] = entry;
+      bundleRequire('entry.js');
+      runtime.createModuleHotContext('route.js').invalidate();
+      await vi.waitFor(() => expect(reload).toHaveBeenCalledOnce());
+      expect(entry).toHaveBeenCalledOnce();
+    });
+  });
+
   describe('client logs', () => {
     const formatter = { format: prettyFormat.format, plugins: prettyFormat.plugins };
 
@@ -527,7 +601,7 @@ describe('HMR runtime', () => {
     const evaluate = vi.fn((source: string) => (0, eval)(source));
     globalThis.globalEvalWithSourceUrl = evaluate;
     const { runtime, socket } = await setupRuntime();
-    runtime.registerFactory('dep.js', 'esm', (id) => {
+    runtime.registerFactory('dep.js', (id) => {
       runtime.registerModule(id, { exports: { value: 'before' } });
     });
 
@@ -565,7 +639,7 @@ describe('HMR runtime', () => {
     });
     runtime.registerModule('dep.js', { exports: {} });
     runtime.registerModule('entry.js', { exports: { value: 'before' } });
-    runtime.registerFactory('entry.js', 'esm', (id) => {
+    runtime.registerFactory('entry.js', (id) => {
       runtime.registerModule(id, { exports: { value: 'after' } });
       runtime.createModuleHotContext(id).accept();
     });
@@ -711,9 +785,34 @@ function createPatch(value: string, createHotContext = true) {
       edges: [[], [0]],
       dynamicEdges: [[], []]
     });
-    __rolldown_runtime__.registerFactory("dep.js", "esm", function (id) {
+    __rolldown_runtime__.registerFactory("dep.js", function (id) {
       __rolldown_runtime__.registerModule(id, { exports: { value: "${value}" } });
       ${createHotContext ? '__rolldown_runtime__.createModuleHotContext(id);' : ''}
     });
   })(globalThis.__rollipop_runtime__.graphs.get("host").runtime);`;
 }
+
+type BundleModule = { exports: any };
+type BundleRequire = {
+  (id: string): any;
+  m: Record<
+    string,
+    (global: unknown, module: BundleModule, exports: any, require: BundleRequire) => void
+  >;
+  c: Record<string, BundleModule>;
+};
+
+function createBundleRequire() {
+  const require: BundleRequire = Object.assign(
+    (id: string) => {
+      if (require.c[id] !== undefined) return require.c[id].exports;
+      const module = { exports: {} };
+      require.c[id] = module;
+      require.m[id].call(module.exports, globalThis, module, module.exports, require);
+      return module.exports;
+    },
+    { m: {} as BundleRequire['m'], c: {} as BundleRequire['c'] },
+  );
+  (globalThis as any).__rollipop_require__ = require;
+  return require;
+}

package/src/runtime/hmr-client.ts

@@ -315,7 +315,7 @@ class HMRClient implements HMRClientNativeInterface {
       case 'hmr:update-start':
         connection.pendingUpdatesCount++;
         connection.compileErrorMessage = null;
-        DevLoadingView.showMessage(`Refreshing ${connection.graph.id}...`, 'refresh');
+        DevLoadingView.showMessage('Refreshing...', 'refresh');
         break;
       case 'hmr:update':
         this.dismissRedbox();

package/src/runtime/hmr-runtime.ts

@@ -25,6 +25,19 @@ declare global {
 // DO NOT EDIT THIS CLASS NAME (`DevRuntime`)
 declare const DevRuntime: typeof DefaultDevRuntime;
 
+type BundleModule = { exports: any };
+interface BundleRequire {
+  (id: string): any;
+  m: Record<
+    string,
+    (global: unknown, module: BundleModule, exports: any, require: BundleRequire) => void
+  >;
+  c: Record<string, BundleModule>;
+}
+
+// Defined in the enclosing Rollipop bundle, separately for each bundle runtime.
+declare const __rollipop_require__: BundleRequire;
+
 var BaseDevRuntime = DevRuntime;
 
 interface AcceptCallback {
@@ -194,6 +207,69 @@ class ReactNativeDevRuntime extends BaseDevRuntime {
     };
   }
 
+  hasFactory(moduleId: string) {
+    return (
+      super.hasFactory(moduleId) ||
+      (typeof __rollipop_require__ !== 'undefined' && __rollipop_require__.m[moduleId] != null)
+    );
+  }
+
+  isExecuted(moduleId: string) {
+    return (
+      super.isExecuted(moduleId) ||
+      (typeof __rollipop_require__ !== 'undefined' && __rollipop_require__.c[moduleId] != null)
+    );
+  }
+
+  loadExports(moduleId: string) {
+    if (!super.isExecuted(moduleId) && typeof __rollipop_require__ !== 'undefined') {
+      const module = __rollipop_require__.c[moduleId];
+      if (module != null) {
+        return module.exports;
+      }
+    }
+    return super.loadExports(moduleId);
+  }
+
+  initModule(moduleId: string) {
+    if (this.isExecuted(moduleId)) {
+      return this.loadExports(moduleId);
+    }
+    if (super.hasFactory(moduleId) || !this.hasFactory(moduleId)) {
+      return super.initModule(moduleId);
+    }
+    return __rollipop_require__(moduleId);
+  }
+
+  registerFactory(moduleId: string, factory: (id: string) => void, stamp?: number) {
+    super.registerFactory(moduleId, factory, stamp);
+    if (typeof __rollipop_require__ !== 'undefined') {
+      __rollipop_require__.m[moduleId] = (_global, module) => {
+        // require() has already inserted an empty cache entry.
+        // The base executor bypasses that entry and selects the latest factory accepted by its stamp.
+        module.exports = super.initModule(moduleId);
+      };
+    }
+  }
+
+  registerModule(moduleId: string, module?: BundleModule) {
+    module ??=
+      typeof __rollipop_require__ !== 'undefined' ? __rollipop_require__.c[moduleId] : undefined;
+    module ??= { exports: {} };
+    super.registerModule(moduleId, module);
+    if (typeof __rollipop_require__ !== 'undefined') {
+      // Share the holder itself so CommonJS module.exports reassignments stay live.
+      __rollipop_require__.c[moduleId] = module;
+    }
+  }
+
+  removeModuleCache(moduleId: string) {
+    if (typeof __rollipop_require__ !== 'undefined') {
+      delete __rollipop_require__.c[moduleId];
+    }
+    super.removeModuleCache(moduleId);
+  }
+
   private createHotContext(moduleId: string) {
     let data = this.moduleHotData.get(moduleId);
     if (data == null) {