rollipop 1.0.0-alpha.27 → 1.0.0-alpha.29

package/client.d.ts

@@ -4,6 +4,10 @@ interface ImportMetaEnv {
 }
 
 interface ImportMeta {
-  hot?: import('./dist').HMRContext;
+  glob: import('./import-glob').ImportGlobFunction;
   env: ImportMetaEnv;
+  /**
+   * Only available in development mode.
+   */
+  hot?: import('./dist').HMRContext;
 }

package/dist/_virtual/_rolldown/runtime.js

@@ -10,6 +10,6 @@ var __exportAll = (all, no_symbols) => {
 	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
 	return target;
 };
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
+var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 //#endregion
 export { __exportAll, __require };

package/dist/commands.js

@@ -1,14 +1,14 @@
 import { createReactNativeCliCommand } from "./node/cli-utils.js";
 import { command } from "./node/commands/agent/command.js";
 import "./node/commands/agent/index.js";
-import { command as command$1 } from "./node/commands/start/command.js";
-import "./node/commands/start/index.js";
-import { command as command$2 } from "./node/commands/bundle/command.js";
+import { command as command$1 } from "./node/commands/bundle/command.js";
 import "./node/commands/bundle/index.js";
+import { command as command$2 } from "./node/commands/start/command.js";
+import "./node/commands/start/index.js";
 //#region src/commands.ts
 const commands = [
-	createReactNativeCliCommand(command$1),
 	createReactNativeCliCommand(command$2),
+	createReactNativeCliCommand(command$1),
 	createReactNativeCliCommand(command)
 ];
 //#endregion

package/dist/common/code.js

@@ -22,4 +22,4 @@ function iife(body) {
   `.replace(bodyPlaceholder, indent(body, 1, "	")).trim();
 }
 //#endregion
-export { asLiteral, iife, nodeEnvironment };
+export { GLOBAL_OBJECT_EXPRESSION, asLiteral, iife, nodeEnvironment };

package/dist/common/env.js

@@ -30,4 +30,4 @@ function isDebugEnabled() {
 	return debugKeys[DEBUG_KEY] ?? false;
 }
 //#endregion
-export { isDebugEnabled };
+export { isDebugEnabled, parseDebugKeys };

package/dist/common/logger.d.ts

@@ -1,5 +1,4 @@
 import { ChalkInstance } from "chalk";
-
 //#region src/common/logger.d.ts
 declare class Logger {
   private readonly scope?;

package/dist/common/logger.js

@@ -1,7 +1,7 @@
 import { isDebugEnabled } from "./env.js";
-import { invariant } from "es-toolkit";
 import chalk from "chalk";
 import dayjs from "dayjs";
+import { invariant } from "es-toolkit";
 //#region src/common/logger.ts
 var Logger = class Logger {
 	scope;

package/dist/common/progress-bar.js

@@ -1,6 +1,6 @@
 import { StreamManager, ellipsisLeft } from "../utils/terminal.js";
-import { range, throttle } from "es-toolkit";
 import chalk from "chalk";
+import { range, throttle } from "es-toolkit";
 //#region src/common/progress-bar.ts
 const BAR_LENGTH = 25;
 const BLOCK_CHAR = "█";
@@ -36,15 +36,20 @@ const completedRenderer = { render(state, context) {
 const hmrCompletedRenderer = { render(state, context) {
 	const icon = chalk.green("✔");
 	const count = chalk.yellow(`(x${state.count})`);
-	const moduleId = chalk.gray(ellipsisLeft(state.moduleId, context.columns - 4));
-	return `${icon} HMR Updated ${chalk.gray(context.label)} ${count}\n  ${moduleId}`;
+	const header = `${icon} HMR Updated ${chalk.gray(context.label)} ${count}`;
+	const modules = state.moduleIds.map((moduleId) => `  ${chalk.gray(ellipsisLeft(moduleId, context.columns - 4))}`).join("\n");
+	return modules === "" ? header : `${header}\n${modules}`;
+} };
+const hmrFailedRenderer = { render(_state, context) {
+	return `${chalk.red("✘")} HMR failed ${chalk.gray(context.label)}`;
 } };
 var ProgressBarRenderer = class {
 	renderers = {
 		idle: idleRenderer,
 		running: runningRenderer,
 		completed: completedRenderer,
-		"hmr-completed": hmrCompletedRenderer
+		"hmr-completed": hmrCompletedRenderer,
+		"hmr-failed": hmrFailedRenderer
 	};
 	render(state, context) {
 		return this.renderers[state.type].render(state, context);
@@ -64,7 +69,7 @@ var ProgressBar = class {
 		this.renderer = options.renderer ?? new ProgressBarRenderer();
 	}
 	get done() {
-		return this.state.type === "completed" || this.state.type === "hmr-completed";
+		return this.state.type === "completed" || this.state.type === "hmr-completed" || this.state.type === "hmr-failed";
 	}
 	setCurrent(current) {
 		this.current = current;
@@ -99,15 +104,20 @@ var ProgressBar = class {
 		this.stale = true;
 		return this;
 	}
-	completeHmr(moduleId, count) {
+	completeHmr(moduleIds, count) {
 		this.state = {
 			type: "hmr-completed",
 			count,
-			moduleId
+			moduleIds
 		};
 		this.stale = true;
 		return this;
 	}
+	failHmr() {
+		this.state = { type: "hmr-failed" };
+		this.stale = true;
+		return this;
+	}
 	render() {
 		this.stale = false;
 		const context = {
@@ -145,6 +155,7 @@ var ProgressBarRenderManager = class ProgressBarRenderManager {
 		return progressBar;
 	}
 	start() {
+		this.throttledRender.cancel();
 		console.log();
 		this.streamManager.listen();
 		this._render();
@@ -164,4 +175,4 @@ var ProgressBarRenderManager = class ProgressBarRenderManager {
 	}
 };
 //#endregion
-export { ProgressBarRenderManager };
+export { ProgressBar, ProgressBarRenderManager, ProgressBarRenderer };

package/dist/config/compose-override.js

@@ -1,18 +1,16 @@
 import { merge } from "es-toolkit";
 //#region src/config/compose-override.ts
-async function applyOverrideRolldownOptions(override, rolldownOptions) {
-	if (typeof override === "function") return await override(rolldownOptions);
-	return {
-		input: merge(rolldownOptions.input ?? {}, override.input ?? {}),
-		output: merge(rolldownOptions.output ?? {}, override.output ?? {})
-	};
+async function applyRolldownOptionsConfig(config, options, context) {
+	if (typeof config === "function") return await config(options, context);
+	return merge(options, config);
 }
-function composeOverrideRolldownOptions(target, source) {
+function composeRolldownOptions(target, source) {
 	if (source == null) return target;
 	if (target == null) return source;
-	return async (rolldownOptions) => {
-		return await applyOverrideRolldownOptions(source, await applyOverrideRolldownOptions(target, rolldownOptions));
+	if (typeof target !== "function" && typeof source !== "function") return merge(target, source);
+	return async (options, context) => {
+		return await applyRolldownOptionsConfig(source, await applyRolldownOptionsConfig(target, options, context), context);
 	};
 }
 //#endregion
-export { applyOverrideRolldownOptions, composeOverrideRolldownOptions };
+export { applyRolldownOptionsConfig, composeRolldownOptions };

package/dist/config/defaults.d.ts

@@ -1,13 +1,12 @@
 import { Reporter } from "../types.js";
-import { AnalyzerConfig, Config, DevModeConfig, OptimizationConfig, Polyfill, ReactNativeConfig } from "./types.js";
+import { AnalyzerConfig, Config, DevConfig, Polyfill, ReactNativeConfig } from "./types.js";
 import { PluginFlattenConfig } from "./merge-config.js";
-
 //#region src/config/defaults.d.ts
 declare function getDefaultConfig(projectRoot: string, mode?: Config['mode']): Promise<{
   root: string;
   mode: "development" | "production";
   entry: string;
-  resolver: {
+  resolve: {
     sourceExtensions: string[];
     assetExtensions: string[];
     mainFields: string[];
@@ -16,7 +15,7 @@ declare function getDefaultConfig(projectRoot: string, mode?: Config['mode']): P
     preferNativePlatform: true;
     symlinks: true;
   };
-  transformer: {
+  transform: {
     flow: {
       filter: {
         id: RegExp;
@@ -24,18 +23,10 @@ declare function getDefaultConfig(projectRoot: string, mode?: Config['mode']): P
       };
     };
   };
-  serializer: {
-    prelude: string[];
-    polyfills: Polyfill[];
-  };
-  watcher: {
-    skipWrite: true;
-    useDebounce: true;
-    debounceDuration: number;
-  };
-  optimization: {
-    treeshake: NonNullable<OptimizationConfig["treeshake"]>;
-  };
+  prelude: string[];
+  polyfills: Polyfill[];
+  output: {};
+  treeshake: NonNullable<Config["treeshake"]>;
   reactNative: {
     reactNativePath: string;
     codegen: {
@@ -49,8 +40,13 @@ declare function getDefaultConfig(projectRoot: string, mode?: Config['mode']): P
     assetRegistryPath: NonNullable<NonNullable<ReactNativeConfig>["assetRegistryPath"]>;
     hmrClientPath: NonNullable<NonNullable<ReactNativeConfig>["hmrClientPath"]>;
   };
-  devMode: {
-    hmr: NonNullable<DevModeConfig["hmr"]>;
+  dev: {
+    watch: {
+      skipWrite: true;
+      useDebounce: true;
+      debounceDuration: number;
+    };
+    hmr: NonNullable<DevConfig["hmr"]>;
   };
   reporter: Reporter;
   analyzer: Required<AnalyzerConfig>;

package/dist/config/defaults.js

@@ -1,9 +1,9 @@
 import { isDebugEnabled } from "../common/env.js";
 import { stripFlowTypes } from "../common/transformer.js";
 import { DEFAULT_ANALYZE_FILE, DEFAULT_ANALYZE_REPORT_FILE, DEFAULT_ASSET_EXTENSIONS, DEFAULT_ASSET_REGISTRY_PATH, DEFAULT_ENV_FILE, DEFAULT_ENV_PREFIX, DEFAULT_HMR_CLIENT_PATH, DEFAULT_RESOLVER_ALIAS_FIELDS, DEFAULT_RESOLVER_CONDITION_NAMES, DEFAULT_RESOLVER_MAIN_FIELDS, DEFAULT_RUNTIME_TARGET, DEFAULT_SOURCE_EXTENSIONS } from "../constants.js";
+import { ClientLogReporter } from "../events/builtin-reporters.js";
 import { getInitializeCorePath, getPolyfillScriptPaths } from "../internal/react-native.js";
 import { resolvePackagePath } from "../utils/node-resolve.js";
-import { ClientLogReporter } from "../utils/reporters.js";
 import fs from "node:fs";
 //#region src/config/defaults.ts
 async function getDefaultConfig(projectRoot, mode) {
@@ -17,7 +17,7 @@ async function getDefaultConfig(projectRoot, mode) {
 		root: projectRoot,
 		mode: mode ?? "development",
 		entry: "index.js",
-		resolver: {
+		resolve: {
 			sourceExtensions: DEFAULT_SOURCE_EXTENSIONS,
 			assetExtensions: DEFAULT_ASSET_EXTENSIONS,
 			mainFields: DEFAULT_RESOLVER_MAIN_FIELDS,
@@ -26,25 +26,19 @@ async function getDefaultConfig(projectRoot, mode) {
 			preferNativePlatform: true,
 			symlinks: true
 		},
-		transformer: { flow: { filter: {
+		transform: { flow: { filter: {
 			id: /\.jsx?$/,
 			code: /@flow/
 		} } },
-		serializer: {
-			prelude: [getInitializeCorePath(projectRoot)],
-			polyfills: await Promise.all(getPolyfillScriptPaths(reactNativePath).map(async (path) => {
-				return {
-					type: "iife",
-					code: (await stripFlowTypes(path, fs.readFileSync(path, "utf-8"))).code
-				};
-			}))
-		},
-		watcher: {
-			skipWrite: true,
-			useDebounce: true,
-			debounceDuration: 50
-		},
-		optimization: { treeshake: true },
+		prelude: [getInitializeCorePath(projectRoot)],
+		polyfills: await Promise.all(getPolyfillScriptPaths(reactNativePath).map(async (path) => {
+			return {
+				type: "iife",
+				code: (await stripFlowTypes(path, fs.readFileSync(path, "utf-8"))).code
+			};
+		})),
+		output: {},
+		treeshake: true,
 		reactNative: {
 			reactNativePath,
 			codegen: { 
@@ -55,7 +49,14 @@ filter: { code: /\bcodegenNativeComponent</ } },
 			assetRegistryPath: DEFAULT_ASSET_REGISTRY_PATH,
 			hmrClientPath: DEFAULT_HMR_CLIENT_PATH
 		},
-		devMode: { hmr: true },
+		dev: {
+			watch: {
+				skipWrite: true,
+				useDebounce: true,
+				debounceDuration: 50
+			},
+			hmr: true
+		},
 		reporter: new ClientLogReporter(),
 		analyzer: {
 			enabled: false,

package/dist/config/define-config.d.ts

@@ -1,6 +1,5 @@
 import { Config } from "./types.js";
 import { DefaultConfig } from "./defaults.js";
-
 //#region src/config/define-config.d.ts
 interface DefineConfigContext {
   command?: string;

package/dist/config/index.d.ts

@@ -1,5 +1,7 @@
-import { AnalyzerConfig, BabelTransformConfig, CodegenConfig, Config, DevModeConfig, ExperimentalConfig, FlowConfig, HmrConfig, OptimizationConfig, PluginOption, Polyfill, PolyfillOptions, PolyfillType, PolyfillWithCode, PolyfillWithPath, ReactNativeConfig, ResolverConfig, RolldownConfig, RollipopReactNativeFlowConfig, RollipopReactNativeWorkletsConfig, SerializerConfig, SwcTransformConfig, TerminalConfig, TransformRule, TransformerConfig, WatcherConfig } from "./types.js";
+import { RolldownOptions, RolldownOptionsConfig, RolldownOptionsContext, RolldownOptionsFunction } from "../core/rolldown.js";
+import { AliasConfig, AnalyzerConfig, BabelTransformConfig, CodegenConfig, Config, DevConfig, ExperimentalConfig, FlowConfig, HmrConfig, OptimizationConfig, OutputConfig, PluginOption, Polyfill, PolyfillOptions, PolyfillType, PolyfillWithCode, PolyfillWithPath, ReactNativeConfig, ResolveConfig, RollipopReactNativeFlowConfig, RollipopReactNativeWorkletsConfig, SwcTransformConfig, TerminalConfig, TransformConfig, TransformRule, WatcherConfig } from "./types.js";
+import { DefineConfigContext, DynamicUserConfig, UserConfig, defineConfig } from "./define-config.js";
+import { LoadConfigOptions, flattenPluginOption, invokeConfigResolved, loadConfig, resolvePluginConfig } from "./load-config.js";
 import { PluginFlattenConfig, mergeConfig } from "./merge-config.js";
 import { DefaultConfig, InternalConfig, ResolvedConfig, getDefaultConfig } from "./defaults.js";
-import { DefineConfigContext, DynamicUserConfig, UserConfig, defineConfig } from "./define-config.js";
-import { LoadConfigOptions, flattenPluginOption, invokeConfigResolved, loadConfig, resolvePluginConfig } from "./load-config.js";
+export { type AliasConfig, type AnalyzerConfig, type BabelTransformConfig, type CodegenConfig, type Config, DefaultConfig, DefineConfigContext, type DevConfig, DynamicUserConfig, type ExperimentalConfig, type FlowConfig, type HmrConfig, InternalConfig, LoadConfigOptions, type OptimizationConfig, type OutputConfig, PluginFlattenConfig, type PluginOption, type Polyfill, type PolyfillOptions, type PolyfillType, type PolyfillWithCode, type PolyfillWithPath, type ReactNativeConfig, type ResolveConfig, ResolvedConfig, type RolldownOptions, type RolldownOptionsConfig, type RolldownOptionsContext, type RolldownOptionsFunction, type RollipopReactNativeFlowConfig, type RollipopReactNativeWorkletsConfig, type SwcTransformConfig, type TerminalConfig, type TransformConfig, type TransformRule, UserConfig, type WatcherConfig, defineConfig, flattenPluginOption, getDefaultConfig, invokeConfigResolved, loadConfig, mergeConfig, resolvePluginConfig };

package/dist/config/index.js

@@ -1,5 +1,5 @@
-import "./defaults.js";
-import "./define-config.js";
-import "./merge-config.js";
-import "./load-config.js";
-export {};
+import { getDefaultConfig } from "./defaults.js";
+import { defineConfig } from "./define-config.js";
+import { mergeConfig } from "./merge-config.js";
+import { flattenPluginOption, invokeConfigResolved, loadConfig, resolvePluginConfig } from "./load-config.js";
+export { defineConfig, flattenPluginOption, getDefaultConfig, invokeConfigResolved, loadConfig, mergeConfig, resolvePluginConfig };

package/dist/config/load-config.d.ts

@@ -1,8 +1,7 @@
-import { Plugin, PluginConfig, ResolvedPluginConfig } from "../core/plugins/types.js";
 import { Config, PluginOption } from "./types.js";
-import { ResolvedConfig } from "./defaults.js";
 import { DefineConfigContext } from "./define-config.js";
-
+import { Plugin, PluginConfig, ResolvedPluginConfig } from "../core/plugins/types.js";
+import { ResolvedConfig } from "./defaults.js";
 //#region src/config/load-config.d.ts
 interface LoadConfigOptions {
   cwd?: string;

package/dist/config/load-config.js

@@ -57,13 +57,13 @@ async function resolvePluginConfig(baseConfig, plugins) {
 	let mergedConfig = omit(baseConfig, ["plugins"]);
 	for (const plugin of plugins) {
 		const context = createPluginContext(plugin.name);
-		const overrideBefore = mergedConfig.dangerously_overrideRolldownOptions;
+		const rolldownOptionsBefore = mergedConfig.rolldownOptions;
 		if (typeof plugin.config === "function") {
 			const config = await plugin.config.call(context, mergedConfig);
 			if (config != null) mergedConfig = mergeConfig(mergedConfig, config);
 		} else if (typeof plugin.config === "object") mergedConfig = mergeConfig(mergedConfig, plugin.config);
-		const overrideAfter = mergedConfig.dangerously_overrideRolldownOptions;
-		if (overrideAfter != null && overrideAfter !== overrideBefore) context.debug({ message: `set 'dangerously_overrideRolldownOptions'` });
+		const rolldownOptionsAfter = mergedConfig.rolldownOptions;
+		if (rolldownOptionsAfter != null && rolldownOptionsAfter !== rolldownOptionsBefore) context.debug({ message: `set 'rolldownOptions'` });
 	}
 	return mergedConfig;
 }

package/dist/config/merge-config.d.ts

@@ -1,7 +1,6 @@
-import { Plugin } from "../core/plugins/types.js";
 import { Config } from "./types.js";
+import { Plugin } from "../core/plugins/types.js";
 import { DefaultConfig, ResolvedConfig } from "./defaults.js";
-
 //#region src/config/merge-config.d.ts
 type PluginFlattenConfig = Omit<Config, 'plugins'> & {
   plugins?: Plugin[];

package/dist/config/merge-config.js

@@ -1,5 +1,6 @@
-import { composeOverrideRolldownOptions } from "./compose-override.js";
-import { mergeWith } from "es-toolkit";
+import { mergeReporters } from "../utils/reporters.js";
+import { composeRolldownOptions } from "./compose-override.js";
+import { isNotNil, mergeWith } from "es-toolkit";
 //#region src/config/merge-config.ts
 function mergeConfig(baseConfig, ...overrideConfigs) {
 	let mergedConfig = baseConfig;
@@ -7,12 +8,16 @@ function mergeConfig(baseConfig, ...overrideConfigs) {
 		if ([
 			"sourceExtensions",
 			"assetExtensions",
-			"polyfills",
 			"prelude",
+			"polyfills",
 			"plugins"
-		].includes(key)) return Array.from(new Set([...target ?? [], ...source ?? []]));
-		if (key === "reporter") return source ?? target;
-		if (key === "dangerously_overrideRolldownOptions") return composeOverrideRolldownOptions(target, source);
+		].includes(key)) return Array.from(/* @__PURE__ */ new Set([...target ?? [], ...source ?? []]));
+		if (key === "reporter") {
+			if (target === source) return target;
+			const reporters = [target, source].filter(isNotNil);
+			return reporters.length > 0 ? mergeReporters(reporters) : void 0;
+		}
+		if (key === "rolldownOptions") return composeRolldownOptions(target, source);
 	});
 	return mergedConfig;
 }

package/dist/config/notice.js

@@ -1,7 +1,7 @@
 import { logger } from "../logger.js";
 //#region src/config/notice.ts
 function printConfigNotice(config) {
-	if (config.transformer.reactCompiler != null) logger.info("✨ React Compiler is enabled");
+	if (typeof config.transform.jsx === "object" && config.transform.jsx.compiler != null) logger.info("✨ React Compiler is enabled");
 }
 //#endregion
 export { printConfigNotice };