@hot-updater/expo 1.0.0-rc.5 → 1.0.0

package/dist/index.cjs

@@ -37,7 +37,8 @@ node_process = __toESM(node_process, 1);
 let node_tty = require("node:tty");
 node_tty = __toESM(node_tty, 1);
 let node_path = require("node:path");
-node_path = __toESM(node_path, 1);
+let node_path$1 = __toESM(node_path, 1);
+node_path = __toESM(node_path);
 let node_timers_promises = require("node:timers/promises");
 let node_os = require("node:os");
 let node_events = require("node:events");
@@ -47,6 +48,7 @@ let node_stream_promises = require("node:stream/promises");
 let node_stream = require("node:stream");
 let node_buffer = require("node:buffer");
 let uuidv7 = require("uuidv7");
+let node_module = require("node:module");
 //#region ../../node_modules/.pnpm/is-plain-obj@4.1.0/node_modules/is-plain-obj/index.js
 function isPlainObject(value) {
 	if (typeof value !== "object" || value === null) return false;
@@ -924,7 +926,7 @@ var require_isexe = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#region ../../node_modules/.pnpm/which@2.0.2/node_modules/which/which.js
 var require_which = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-	const path$9 = require("path");
+	const path$10 = require("path");
 	const COLON = isWindows ? ";" : ":";
 	const isexe = require_isexe();
 	const getNotFoundError = (cmd) => Object.assign(/* @__PURE__ */ new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -955,7 +957,7 @@ var require_which = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if (i === pathEnv.length) return opt.all && found.length ? resolve(found) : reject(getNotFoundError(cmd));
 			const ppRaw = pathEnv[i];
 			const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-			const pCmd = path$9.join(pathPart, cmd);
+			const pCmd = path$10.join(pathPart, cmd);
 			const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
 			resolve(subStep(p, i, 0));
 		});
@@ -979,7 +981,7 @@ var require_which = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		for (let i = 0; i < pathEnv.length; i++) {
 			const ppRaw = pathEnv[i];
 			const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-			const pCmd = path$9.join(pathPart, cmd);
+			const pCmd = path$10.join(pathPart, cmd);
 			const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
 			for (let j = 0; j < pathExt.length; j++) {
 				const cur = p + pathExt[j];
@@ -1012,7 +1014,7 @@ var require_path_key = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/resolveCommand.js
 var require_resolveCommand = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const path$8 = require("path");
+	const path$9 = require("path");
 	const which = require_which();
 	const getPathKey = require_path_key();
 	function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -1027,12 +1029,12 @@ var require_resolveCommand = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 		try {
 			resolved = which.sync(parsed.command, {
 				path: env[getPathKey({ env })],
-				pathExt: withoutPathExt ? path$8.delimiter : void 0
+				pathExt: withoutPathExt ? path$9.delimiter : void 0
 			});
 		} catch (e) {} finally {
 			if (shouldSwitchCwd) process.chdir(cwd);
 		}
-		if (resolved) resolved = path$8.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+		if (resolved) resolved = path$9.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
 		return resolved;
 	}
 	function resolveCommand(parsed) {
@@ -1099,7 +1101,7 @@ var require_readShebang = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/parse.js
 var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const path$7 = require("path");
+	const path$8 = require("path");
 	const resolveCommand = require_resolveCommand();
 	const escape = require_escape();
 	const readShebang = require_readShebang();
@@ -1122,7 +1124,7 @@ var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		const needsShell = !isExecutableRegExp.test(commandFile);
 		if (parsed.options.forceShell || needsShell) {
 			const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-			parsed.command = path$7.normalize(parsed.command);
+			parsed.command = path$8.normalize(parsed.command);
 			parsed.command = escape.command(parsed.command);
 			parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars));
 			parsed.args = [
@@ -1231,33 +1233,33 @@ function toPath(urlOrPath) {
 }
 function traversePathUp(startPath) {
 	return { *[Symbol.iterator]() {
-		let currentPath = node_path.default.resolve(toPath(startPath));
+		let currentPath = node_path$1.default.resolve(toPath(startPath));
 		let previousPath;
 		while (previousPath !== currentPath) {
 			yield currentPath;
 			previousPath = currentPath;
-			currentPath = node_path.default.resolve(currentPath, "..");
+			currentPath = node_path$1.default.resolve(currentPath, "..");
 		}
 	} };
 }
 //#endregion
 //#region ../../node_modules/.pnpm/npm-run-path@6.0.0/node_modules/npm-run-path/index.js
 const npmRunPath = ({ cwd = node_process.default.cwd(), path: pathOption = node_process.default.env[pathKey()], preferLocal = true, execPath = node_process.default.execPath, addExecPath = true } = {}) => {
-	const cwdPath = node_path.default.resolve(toPath(cwd));
+	const cwdPath = node_path$1.default.resolve(toPath(cwd));
 	const result = [];
-	const pathParts = pathOption.split(node_path.default.delimiter);
+	const pathParts = pathOption.split(node_path$1.default.delimiter);
 	if (preferLocal) applyPreferLocal(result, pathParts, cwdPath);
 	if (addExecPath) applyExecPath(result, pathParts, execPath, cwdPath);
-	return pathOption === "" || pathOption === node_path.default.delimiter ? `${result.join(node_path.default.delimiter)}${pathOption}` : [...result, pathOption].join(node_path.default.delimiter);
+	return pathOption === "" || pathOption === node_path$1.default.delimiter ? `${result.join(node_path$1.default.delimiter)}${pathOption}` : [...result, pathOption].join(node_path$1.default.delimiter);
 };
 const applyPreferLocal = (result, pathParts, cwdPath) => {
 	for (const directory of traversePathUp(cwdPath)) {
-		const pathPart = node_path.default.join(directory, "node_modules/.bin");
+		const pathPart = node_path$1.default.join(directory, "node_modules/.bin");
 		if (!pathParts.includes(pathPart)) result.push(pathPart);
 	}
 };
 const applyExecPath = (result, pathParts, execPath, cwdPath) => {
-	const pathPart = node_path.default.resolve(cwdPath, toPath(execPath), "..");
+	const pathPart = node_path$1.default.resolve(cwdPath, toPath(execPath), "..");
 	if (!pathParts.includes(pathPart)) result.push(pathPart);
 };
 const npmRunPathEnv = ({ env = node_process.default.env, ...options } = {}) => {
@@ -2269,7 +2271,7 @@ const mapNode = ({ options }) => {
 const handleNodeOption = (file, commandArguments, { node: shouldHandleNode = false, nodePath = node_process.execPath, nodeOptions = node_process.execArgv.filter((nodeOption) => !nodeOption.startsWith("--inspect")), cwd, execPath: formerNodePath, ...options }) => {
 	if (formerNodePath !== void 0) throw new TypeError("The \"execPath\" option has been removed. Please use the \"nodePath\" option instead.");
 	const normalizedNodePath = safeNormalizeFileUrl(nodePath, "The \"nodePath\" option");
-	const resolvedNodePath = node_path.default.resolve(cwd, normalizedNodePath);
+	const resolvedNodePath = node_path$1.default.resolve(cwd, normalizedNodePath);
 	const newOptions = {
 		...options,
 		nodePath: resolvedNodePath,
@@ -2281,7 +2283,7 @@ const handleNodeOption = (file, commandArguments, { node: shouldHandleNode = fal
 		commandArguments,
 		newOptions
 	];
-	if (node_path.default.basename(file, ".exe") === "node") throw new TypeError("When the \"node\" option is true, the first argument does not need to be \"node\".");
+	if (node_path$1.default.basename(file, ".exe") === "node") throw new TypeError("When the \"node\" option is true, the first argument does not need to be \"node\".");
 	return [
 		resolvedNodePath,
 		[
@@ -2365,7 +2367,7 @@ const serializeEncoding = (encoding) => typeof encoding === "string" ? `"${encod
 //#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/arguments/cwd.js
 const normalizeCwd = (cwd = getDefaultCwd()) => {
 	const cwdString = safeNormalizeFileUrl(cwd, "The \"cwd\" option");
-	return node_path.default.resolve(cwdString);
+	return node_path$1.default.resolve(cwdString);
 };
 const getDefaultCwd = () => {
 	try {
@@ -2404,7 +2406,7 @@ const normalizeOptions = (filePath, rawArguments, rawOptions) => {
 	options.killSignal = normalizeKillSignal(options.killSignal);
 	options.forceKillAfterDelay = normalizeForceKillAfterDelay(options.forceKillAfterDelay);
 	options.lines = options.lines.map((lines, fdNumber) => lines && !BINARY_ENCODINGS.has(options.encoding) && options.buffer[fdNumber]);
-	if (node_process.default.platform === "win32" && node_path.default.basename(file, ".exe") === "cmd") commandArguments.unshift("/q");
+	if (node_process.default.platform === "win32" && node_path$1.default.basename(file, ".exe") === "cmd") commandArguments.unshift("/q");
 	return {
 		file,
 		commandArguments,
@@ -6261,20 +6263,9 @@ createExeca(mapScriptAsync, {}, deepScriptOptions, setScriptSync);
 const { sendMessage, getOneMessage, getEachMessage, getCancelSignal } = getIpcExport();
 //#endregion
 //#region src/expoConfig.ts
-const importExpoConfigModule = (specifier) => import(specifier);
-const isMissingModule = (error, specifier) => error instanceof Error && "code" in error && error.code === "ERR_MODULE_NOT_FOUND" && error.message.includes(specifier);
-const loadExpoConfig = async () => {
-	try {
-		const module = await importExpoConfigModule("expo/config.js");
-		return module.getConfig ? module : module.default;
-	} catch (error) {
-		if (!isMissingModule(error, "expo/config.js")) throw error;
-	}
-	const module = await importExpoConfigModule("expo/config/index.js");
-	return module.getConfig ? module : module.default;
-};
+const require$1 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
 const getConfig = async (...args) => {
-	return (await loadExpoConfig()).getConfig(...args);
+	return require$1(require$1.resolve("expo/config", { paths: [node_path.default.resolve(args[0])] })).getConfig(...args);
 };
 //#endregion
 //#region src/resolveMain.ts
@@ -6357,23 +6348,16 @@ const getExpoBundleSigningPublicKey = async (cwd) => {
 	if (typeof publicKeyPath !== "string" || !publicKeyPath.trim()) throw new Error("@hot-updater/expo publicKeyPath must be a non-empty path.");
 	return { publicKey: await (0, _hot_updater_cli_tools.readBundleSigningPublicKeyFile)(publicKeyPath, { cwd }) };
 };
-const isHermesEnabled = (cwd, platform) => {
-	try {
-		const appJsonPath = path.default.join(cwd, "app.json");
-		const { expo } = JSON.parse(fs.default.readFileSync(appJsonPath, "utf-8"));
-		const platformJsEngine = expo?.[platform]?.jsEngine;
-		const commonJsEngine = expo?.jsEngine;
-		if (platformJsEngine !== void 0) return platformJsEngine === "hermes";
-		if (commonJsEngine !== void 0) return commonJsEngine === "hermes";
-	} catch {}
-	return true;
+const isHermesEnabled = async (cwd, platform) => {
+	const { exp } = await getConfig(cwd, { skipSDKVersionRequirement: true });
+	return (exp[platform]?.jsEngine ?? exp.jsEngine ?? "hermes") === "hermes";
 };
 const runBundle = async ({ cwd, platform, buildPath, sourcemap, resetCache }) => {
 	const filename = `index.${platform}`;
 	const bundleOutput = path.default.join(buildPath, `${filename}.bundle`);
 	const entryFile = resolveMain(cwd);
 	const bundleId = (0, uuidv7.uuidv7)();
-	const enableHermes = isHermesEnabled(cwd, platform);
+	const enableHermes = await isHermesEnabled(cwd, platform);
 	const args = [
 		"expo",
 		"export:embed",

package/dist/index.d.cts

@@ -1,10 +1,10 @@
-import { BasePluginArgs, BuildPlugin, BuildPluginConfig } from "@hot-updater/plugin-core";
+import { BuildAdapter, BuildAdapterArgs, BuildAdapterConfig } from "@hot-updater/plugin-core";
 //#region src/expo.d.ts
 declare const getExpoFingerprintExtraSources: (cwd: string) => Promise<string[]>;
 declare const getExpoBundleSigningPublicKey: (cwd: string) => Promise<{
   readonly publicKey: string;
 } | null>;
-interface ExpoPluginConfig extends BuildPluginConfig {
+interface ExpoAdapterConfig extends BuildAdapterConfig {
   /**
    * @default false
    * Whether to generate sourcemap for the bundle.
@@ -16,6 +16,6 @@ interface ExpoPluginConfig extends BuildPluginConfig {
    */
   resetCache?: boolean;
 }
-declare const expo: (config?: ExpoPluginConfig) => ({ cwd }: BasePluginArgs) => BuildPlugin;
+declare const expo: (config?: ExpoAdapterConfig) => ({ cwd }: BuildAdapterArgs) => BuildAdapter;
 //#endregion
-export { ExpoPluginConfig, expo, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };
+export { ExpoAdapterConfig, expo, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };

package/dist/index.d.mts

@@ -1,10 +1,10 @@
-import { BasePluginArgs, BuildPlugin, BuildPluginConfig } from "@hot-updater/plugin-core";
+import { BuildAdapter, BuildAdapterArgs, BuildAdapterConfig } from "@hot-updater/plugin-core";
 //#region src/expo.d.ts
 declare const getExpoFingerprintExtraSources: (cwd: string) => Promise<string[]>;
 declare const getExpoBundleSigningPublicKey: (cwd: string) => Promise<{
   readonly publicKey: string;
 } | null>;
-interface ExpoPluginConfig extends BuildPluginConfig {
+interface ExpoAdapterConfig extends BuildAdapterConfig {
   /**
    * @default false
    * Whether to generate sourcemap for the bundle.
@@ -16,6 +16,6 @@ interface ExpoPluginConfig extends BuildPluginConfig {
    */
   resetCache?: boolean;
 }
-declare const expo: (config?: ExpoPluginConfig) => ({ cwd }: BasePluginArgs) => BuildPlugin;
+declare const expo: (config?: ExpoAdapterConfig) => ({ cwd }: BuildAdapterArgs) => BuildAdapter;
 //#endregion
-export { ExpoPluginConfig, expo, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };
+export { ExpoAdapterConfig, expo, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };

package/dist/index.mjs

@@ -6259,20 +6259,9 @@ createExeca(mapScriptAsync, {}, deepScriptOptions, setScriptSync);
 const { sendMessage, getOneMessage, getEachMessage, getCancelSignal } = getIpcExport();
 //#endregion
 //#region src/expoConfig.ts
-const importExpoConfigModule = (specifier) => import(specifier);
-const isMissingModule = (error, specifier) => error instanceof Error && "code" in error && error.code === "ERR_MODULE_NOT_FOUND" && error.message.includes(specifier);
-const loadExpoConfig = async () => {
-	try {
-		const module = await importExpoConfigModule("expo/config.js");
-		return module.getConfig ? module : module.default;
-	} catch (error) {
-		if (!isMissingModule(error, "expo/config.js")) throw error;
-	}
-	const module = await importExpoConfigModule("expo/config/index.js");
-	return module.getConfig ? module : module.default;
-};
+const require$1 = createRequire(import.meta.url);
 const getConfig = async (...args) => {
-	return (await loadExpoConfig()).getConfig(...args);
+	return require$1(require$1.resolve("expo/config", { paths: [path$1.resolve(args[0])] })).getConfig(...args);
 };
 //#endregion
 //#region src/resolveMain.ts
@@ -6355,23 +6344,16 @@ const getExpoBundleSigningPublicKey = async (cwd) => {
 	if (typeof publicKeyPath !== "string" || !publicKeyPath.trim()) throw new Error("@hot-updater/expo publicKeyPath must be a non-empty path.");
 	return { publicKey: await readBundleSigningPublicKeyFile(publicKeyPath, { cwd }) };
 };
-const isHermesEnabled = (cwd, platform) => {
-	try {
-		const appJsonPath = path.join(cwd, "app.json");
-		const { expo } = JSON.parse(fs.readFileSync(appJsonPath, "utf-8"));
-		const platformJsEngine = expo?.[platform]?.jsEngine;
-		const commonJsEngine = expo?.jsEngine;
-		if (platformJsEngine !== void 0) return platformJsEngine === "hermes";
-		if (commonJsEngine !== void 0) return commonJsEngine === "hermes";
-	} catch {}
-	return true;
+const isHermesEnabled = async (cwd, platform) => {
+	const { exp } = await getConfig(cwd, { skipSDKVersionRequirement: true });
+	return (exp[platform]?.jsEngine ?? exp.jsEngine ?? "hermes") === "hermes";
 };
 const runBundle = async ({ cwd, platform, buildPath, sourcemap, resetCache }) => {
 	const filename = `index.${platform}`;
 	const bundleOutput = path.join(buildPath, `${filename}.bundle`);
 	const entryFile = resolveMain(cwd);
 	const bundleId = uuidv7();
-	const enableHermes = isHermesEnabled(cwd, platform);
+	const enableHermes = await isHermesEnabled(cwd, platform);
 	const args = [
 		"expo",
 		"export:embed",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/expo",
-  "version": "1.0.0-rc.5",
+  "version": "1.0.0",
   "description": "Hot Updater build and config plugin for Expo",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -28,16 +28,16 @@
     "@babel/core": "7.26.0",
     "@babel/types": "7.26.0",
     "uuidv7": "^1.0.2",
-    "@hot-updater/bare": "1.0.0-rc.3",
-    "@hot-updater/plugin-core": "1.0.0-rc.3",
-    "@hot-updater/cli-tools": "1.0.0-rc.3"
+    "@hot-updater/bare": "1.0.0",
+    "@hot-updater/cli-tools": "1.0.0",
+    "@hot-updater/plugin-core": "1.0.0"
   },
   "devDependencies": {
     "@types/node": "^20",
     "expo": "^50.0.0",
     "execa": "9.5.2",
     "vitest": "4.1.4",
-    "hot-updater": "1.0.0-rc.8"
+    "hot-updater": "1.0.0"
   },
   "exports": {
     ".": {

package/plugin/build/transformers.js

@@ -65,20 +65,6 @@ function transformAndroidReactHost(contents) {
         return result;
     }
     const callContents = result.slice(callStartIndex, closeParenIndex + 1);
-    const kotlinLegacyBundlePathRegex = /^([ \t]*)jsBundleFilePath = HotUpdater\.getJSBundleFile\(applicationContext\),[ \t]*\r?$/m;
-    const legacyBundlePathMatch = callContents.match(kotlinLegacyBundlePathRegex);
-    if (legacyBundlePathMatch) {
-        const paramIndent = legacyBundlePathMatch[1];
-        const jsBundleLines = [
-            `${paramIndent}jsBundleFilePath = if (BuildConfig.DEBUG) {`,
-            `${paramIndent}  null`,
-            `${paramIndent}} else {`,
-            `${paramIndent}  HotUpdater.getJSBundleFile(applicationContext)`,
-            `${paramIndent}},`,
-        ];
-        const migratedCallContents = callContents.replace(kotlinLegacyBundlePathRegex, jsBundleLines.join("\n"));
-        return `${result.slice(0, callStartIndex)}${migratedCallContents}${result.slice(closeParenIndex + 1)}`;
-    }
     if (callContents.includes("jsBundleFilePath")) {
         return result;
     }
@@ -134,7 +120,6 @@ function transformAndroidDefaultHost(contents) {
     const kotlinImportAnchor = "import com.facebook.react.ReactApplication";
     const kotlinReactNativeHostAnchor = "object : DefaultReactNativeHost(this) {";
     const kotlinMethodCheck = "HotUpdater.getJSBundleFile(applicationContext)";
-    const kotlinLegacyMethodRegex = /^([ \t]*)override fun getJSBundleFile\(\): String\? \{[ \t]*\r?\n([ \t]*)return HotUpdater\.getJSBundleFile\(applicationContext\)[ \t]*\r?\n\1\}[ \t]*$/m;
     const kotlinExistingMethodRegex = /^\s*override fun getJSBundleFile\(\): String\?\s*\{[\s\S]*?^\s*\}/gm;
     const kotlinHermesAnchor = "override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED";
     const kotlinNewArchAnchor = "override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED";
@@ -144,21 +129,6 @@ function transformAndroidDefaultHost(contents) {
     }
     // 1. Add import if missing
     let result = addLinesOnce(contents, kotlinImportAnchor, [kotlinImport]);
-    const legacyMethodMatch = result.match(kotlinLegacyMethodRegex);
-    if (legacyMethodMatch) {
-        const methodIndent = legacyMethodMatch[1];
-        const bodyIndent = legacyMethodMatch[2];
-        const methodLines = [
-            `${methodIndent}override fun getJSBundleFile(): String? {`,
-            `${bodyIndent}return if (BuildConfig.DEBUG) {`,
-            `${bodyIndent}  null`,
-            `${bodyIndent}} else {`,
-            `${bodyIndent}  HotUpdater.getJSBundleFile(applicationContext)`,
-            `${bodyIndent}}`,
-            `${methodIndent}}`,
-        ];
-        result = result.replace(kotlinLegacyMethodRegex, methodLines.join("\n"));
-    }
     // 2. Add/Replace getJSBundleFile method if needed
     if (!result.includes(kotlinMethodCheck)) {
         // Remove potentially existing (different) override first

package/plugin/build/withHotUpdater.js

@@ -157,17 +157,6 @@ const withHotUpdaterConfigAsync = (props) => (config) => {
         }
         return cfg;
     });
-    // Remove legacy Hot Updater string resources when prebuild reuses a tree.
-    modifiedConfig = (0, config_plugins_1.withStringsXml)(modifiedConfig, (cfg) => {
-        const strings = cfg.modResults.resources?.string;
-        if (!strings) {
-            return cfg;
-        }
-        cfg.modResults.resources.string = (Array.isArray(strings) ? strings : [strings]).filter((item) => item.$?.name !== "hot_updater_channel" &&
-            item.$?.name !== "hot_updater_fingerprint_hash" &&
-            item.$?.name !== "hot_updater_public_key");
-        return cfg;
-    });
     return modifiedConfig;
 };
 /**