rollipop 1.0.0-beta.2 → 1.0.0-beta.4

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.4";
 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/plugins/dev-server-plugin.js

@@ -1,11 +1,13 @@
 import { ROLLIPOP_VIRTUAL_BOOTSTRAP_ID } from "../../constants.js";
 import { resolveFrom } from "../../utils/node-resolve.js";
+import { createVirtualModuleId } from "../../utils/id.js";
 import { replaceSourceMappingUrl } from "../../utils/source-map.js";
 import { isNotNil } from "es-toolkit";
 import dedent from "dedent";
 import { rollipopReactRefreshWrapperPlugin } from "@rollipop/rolldown/experimental";
 import { exactRegex, id, include } from "@rollipop/rolldown/filter";
 //#region src/core/plugins/dev-server-plugin.ts
+const DEV_GRAPH_META_MODULE_ID = createVirtualModuleId("dev-graph-meta");
 const DEFAULT_REACT_REFRESH_INCLUDE_PATTERNS = [/\.[tj]sx?(?:$|\?)/];
 const DEFAULT_REACT_REFRESH_EXCLUDE_PATTERNS = [/node_modules/];
 function sourceMapUrlPlugin(sourceMapUrl) {
@@ -49,20 +51,43 @@ async function devServerPlugin(options) {
 	if (origin != null && bundleEntry != null) {
 		const registerHMRGraphPlugin = {
 			name: "rollipop:register-hmr-graph",
+			resolveId: {
+				filter: [include(id(exactRegex(DEV_GRAPH_META_MODULE_ID)))],
+				handler() {
+					return DEV_GRAPH_META_MODULE_ID;
+				}
+			},
+			load: {
+				filter: [include(id(exactRegex(DEV_GRAPH_META_MODULE_ID)))],
+				handler() {
+					return {
+						code: `export default ${JSON.stringify({
+							origin,
+							bundleEntry,
+							platform
+						})};`,
+						moduleType: "js"
+					};
+				}
+			},
 			transform: {
 				filter: [include(id(exactRegex(ROLLIPOP_VIRTUAL_BOOTSTRAP_ID)))],
 				handler(code) {
-					return [code, dedent`
+					return [
+						`import __graph_meta__ from ${JSON.stringify(DEV_GRAPH_META_MODULE_ID)};`,
+						code,
+						dedent`
             if (import.meta.hot && globalThis.__rollipop_runtime__) {
               globalThis.__rollipop_runtime__.registerGraph({
                 id: ${JSON.stringify(id$1)},
-                origin: ${JSON.stringify(origin)},
-                bundleEntry: ${JSON.stringify(bundleEntry)},
-                platform: ${JSON.stringify(platform)},
+                origin: __graph_meta__.origin,
+                bundleEntry: __graph_meta__.bundleEntry,
+                platform: __graph_meta__.platform,
                 runtime: import.meta.hot.runtime,
               });
             }
-            `].join("\n");
+            `
+					].join("\n");
 				}
 			}
 		};

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";
@@ -144,6 +145,7 @@ async function resolveRolldownOptions(context, config, buildOptions, devEngineOp
 				await resolveOutputAddon(rolldownIntro, chunk)
 			].filter(isNotNil).join("\n");
 		},
+		postFooter: rolldownOutput.postFooter ?? "\n",
 		minify: buildOptions.minify ?? rolldownOutput.minify,
 		sourcemap: buildOptions.sourcemap ?? rolldownOutput.sourcemap,
 		sourcemapPathTransform: rolldownOutput.sourcemapPathTransform ?? createProjectRootSourcemapPathTransform(config.root),
@@ -218,17 +220,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") {