@hot-updater/expo 1.0.8 → 1.1.0

package/dist/index.cjs

@@ -926,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$10 = require("path");
+	const path$11 = require("path");
 	const COLON = isWindows ? ";" : ":";
 	const isexe = require_isexe();
 	const getNotFoundError = (cmd) => Object.assign(/* @__PURE__ */ new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -957,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$10.join(pathPart, cmd);
+			const pCmd = path$11.join(pathPart, cmd);
 			const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
 			resolve(subStep(p, i, 0));
 		});
@@ -981,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$10.join(pathPart, cmd);
+			const pCmd = path$11.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];
@@ -1014,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$9 = require("path");
+	const path$10 = require("path");
 	const which = require_which();
 	const getPathKey = require_path_key();
 	function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -1029,12 +1029,12 @@ var require_resolveCommand = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 		try {
 			resolved = which.sync(parsed.command, {
 				path: env[getPathKey({ env })],
-				pathExt: withoutPathExt ? path$9.delimiter : void 0
+				pathExt: withoutPathExt ? path$10.delimiter : void 0
 			});
 		} catch (e) {} finally {
 			if (shouldSwitchCwd) process.chdir(cwd);
 		}
-		if (resolved) resolved = path$9.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+		if (resolved) resolved = path$10.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
 		return resolved;
 	}
 	function resolveCommand(parsed) {
@@ -1101,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$8 = require("path");
+	const path$9 = require("path");
 	const resolveCommand = require_resolveCommand();
 	const escape = require_escape();
 	const readShebang = require_readShebang();
@@ -1124,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$8.normalize(parsed.command);
+			parsed.command = path$9.normalize(parsed.command);
 			parsed.command = escape.command(parsed.command);
 			parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars));
 			parsed.args = [
@@ -6263,9 +6263,62 @@ createExeca(mapScriptAsync, {}, deepScriptOptions, setScriptSync);
 const { sendMessage, getOneMessage, getEachMessage, getCancelSignal } = getIpcExport();
 //#endregion
 //#region src/expoConfig.ts
-const require$1 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
+const require$2 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
 const getConfig = async (...args) => {
-	return require$1(require$1.resolve("expo/config", { paths: [node_path.default.resolve(args[0])] })).getConfig(...args);
+	return require$2(require$2.resolve("expo/config", { paths: [node_path.default.resolve(args[0])] })).getConfig(...args);
+};
+//#endregion
+//#region src/expoFingerprint.ts
+const require$1 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
+/**
+* The engine settings an Expo app declares, for one platform: the JavaScript
+* engine and the architecture. A bare app records them in
+* `android/gradle.properties`; an Expo app declares them in the app config,
+* which prebuild writes into the native projects.
+*/
+const readExpoSettings = (exp, platform) => {
+	const own = exp[platform];
+	const settings = { "expo.jsEngine": String(own?.jsEngine ?? exp.jsEngine ?? "hermes") };
+	const newArchEnabled = own?.newArchEnabled ?? exp.newArchEnabled;
+	if (newArchEnabled !== void 0) settings["expo.newArchEnabled"] = String(newArchEnabled);
+	return settings;
+};
+/**
+* The command that lists the React Native packages a build links, chosen as
+* Expo and @expo/fingerprint choose it: Expo's autolinking from
+* expo-modules-autolinking 1.12 (SDK 52), else React Native CLI. The native
+* templates also fall back to React Native CLI when
+* `EXPO_USE_COMMUNITY_AUTOLINKING=1`, as Expo documents.
+*/
+const reactNativeConfigCommand = (cwd, platform, env = process.env) => {
+	const autolinking = (0, _hot_updater_cli_tools.resolveExpoAutolinking)(cwd);
+	if (autolinking.linksReactNative && env["EXPO_USE_COMMUNITY_AUTOLINKING"] !== "1") return [
+		autolinking.bin,
+		"react-native-config",
+		"--platform",
+		platform,
+		"--json"
+	];
+	return [node_path.default.join(node_path.default.dirname(require$1.resolve("react-native/package.json", { paths: [cwd] })), "cli.js"), "config"];
+};
+/**
+* The Expo adapter's native fingerprint: the bare and Rock adapters' engine,
+* fed the native packages Expo's autolinking links and the engine settings
+* the app config declares. Neither needs the generated ios/ and android/
+* folders, so `fingerprint create` before prebuild and the native build
+* after it compute the same one.
+*/
+const expoFingerprint = async (cwd, options) => {
+	const { exp } = await getConfig(cwd, { skipSDKVersionRequirement: true });
+	const settings = readExpoSettings(exp, options.platform);
+	const nativeInterface = await (0, _hot_updater_cli_tools.readReactNativeInterface)({
+		cwd,
+		command: process.execPath,
+		args: reactNativeConfigCommand(cwd, options.platform),
+		platform: options.platform,
+		settings
+	});
+	return (0, _hot_updater_cli_tools.createInterfaceFingerprint)(cwd, options, nativeInterface);
 };
 //#endregion
 //#region src/resolveMain.ts
@@ -6409,6 +6462,7 @@ const expo = (config = {
 	const { outDir = "dist", sourcemap = false, resetCache = true } = config;
 	return {
 		nativeBuild: {
+			fingerprint: (options) => expoFingerprint(cwd, options),
 			getBundleSigningPublicKey: () => getExpoBundleSigningPublicKey(cwd),
 			getFingerprintExtraSources: async () => getExpoFingerprintExtraSources(cwd),
 			prebuild: async ({ platform }) => {
@@ -6440,5 +6494,6 @@ const expo = (config = {
 };
 //#endregion
 exports.expo = expo;
+exports.expoFingerprint = expoFingerprint;
 exports.getExpoBundleSigningPublicKey = getExpoBundleSigningPublicKey;
 exports.getExpoFingerprintExtraSources = getExpoFingerprintExtraSources;

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { BuildAdapter, BuildAdapterArgs, BuildAdapterConfig } from "@hot-updater/plugin-core";
+import { BuildAdapter, BuildAdapterArgs, BuildAdapterConfig, NativeFingerprintOptions } from "@hot-updater/plugin-core";
 //#region src/expo.d.ts
 declare const getExpoFingerprintExtraSources: (cwd: string) => Promise<string[]>;
 declare const getExpoBundleSigningPublicKey: (cwd: string) => Promise<{
@@ -18,4 +18,14 @@ interface ExpoAdapterConfig extends BuildAdapterConfig {
 }
 declare const expo: (config?: ExpoAdapterConfig) => ({ cwd }: BuildAdapterArgs) => BuildAdapter;
 //#endregion
-export { ExpoAdapterConfig, expo, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };
+//#region src/expoFingerprint.d.ts
+/**
+ * The Expo adapter's native fingerprint: the bare and Rock adapters' engine,
+ * fed the native packages Expo's autolinking links and the engine settings
+ * the app config declares. Neither needs the generated ios/ and android/
+ * folders, so `fingerprint create` before prebuild and the native build
+ * after it compute the same one.
+ */
+declare const expoFingerprint: (cwd: string, options: NativeFingerprintOptions) => Promise<import("@hot-updater/plugin-core").NativeFingerprint>;
+//#endregion
+export { ExpoAdapterConfig, expo, expoFingerprint, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { BuildAdapter, BuildAdapterArgs, BuildAdapterConfig } from "@hot-updater/plugin-core";
+import { BuildAdapter, BuildAdapterArgs, BuildAdapterConfig, NativeFingerprintOptions } from "@hot-updater/plugin-core";
 //#region src/expo.d.ts
 declare const getExpoFingerprintExtraSources: (cwd: string) => Promise<string[]>;
 declare const getExpoBundleSigningPublicKey: (cwd: string) => Promise<{
@@ -18,4 +18,14 @@ interface ExpoAdapterConfig extends BuildAdapterConfig {
 }
 declare const expo: (config?: ExpoAdapterConfig) => ({ cwd }: BuildAdapterArgs) => BuildAdapter;
 //#endregion
-export { ExpoAdapterConfig, expo, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };
+//#region src/expoFingerprint.d.ts
+/**
+ * The Expo adapter's native fingerprint: the bare and Rock adapters' engine,
+ * fed the native packages Expo's autolinking links and the engine settings
+ * the app config declares. Neither needs the generated ios/ and android/
+ * folders, so `fingerprint create` before prebuild and the native build
+ * after it compute the same one.
+ */
+declare const expoFingerprint: (cwd: string, options: NativeFingerprintOptions) => Promise<import("@hot-updater/plugin-core").NativeFingerprint>;
+//#endregion
+export { ExpoAdapterConfig, expo, expoFingerprint, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };

package/dist/index.mjs

@@ -4,7 +4,7 @@ import fs from "fs";
 import * as path$2 from "path";
 import path from "path";
 import { compileHermes } from "@hot-updater/bare";
-import { log, p, readBundleSigningPublicKeyFile } from "@hot-updater/cli-tools";
+import { createInterfaceFingerprint, log, p, readBundleSigningPublicKeyFile, readReactNativeInterface, resolveExpoAutolinking } from "@hot-updater/cli-tools";
 import { fileURLToPath } from "node:url";
 import { ChildProcess, execFile, spawn, spawnSync } from "node:child_process";
 import { StringDecoder } from "node:string_decoder";
@@ -6259,9 +6259,62 @@ createExeca(mapScriptAsync, {}, deepScriptOptions, setScriptSync);
 const { sendMessage, getOneMessage, getEachMessage, getCancelSignal } = getIpcExport();
 //#endregion
 //#region src/expoConfig.ts
-const require$1 = createRequire(import.meta.url);
+const require$2 = createRequire(import.meta.url);
 const getConfig = async (...args) => {
-	return require$1(require$1.resolve("expo/config", { paths: [path$1.resolve(args[0])] })).getConfig(...args);
+	return require$2(require$2.resolve("expo/config", { paths: [path$1.resolve(args[0])] })).getConfig(...args);
+};
+//#endregion
+//#region src/expoFingerprint.ts
+const require$1 = createRequire(import.meta.url);
+/**
+* The engine settings an Expo app declares, for one platform: the JavaScript
+* engine and the architecture. A bare app records them in
+* `android/gradle.properties`; an Expo app declares them in the app config,
+* which prebuild writes into the native projects.
+*/
+const readExpoSettings = (exp, platform) => {
+	const own = exp[platform];
+	const settings = { "expo.jsEngine": String(own?.jsEngine ?? exp.jsEngine ?? "hermes") };
+	const newArchEnabled = own?.newArchEnabled ?? exp.newArchEnabled;
+	if (newArchEnabled !== void 0) settings["expo.newArchEnabled"] = String(newArchEnabled);
+	return settings;
+};
+/**
+* The command that lists the React Native packages a build links, chosen as
+* Expo and @expo/fingerprint choose it: Expo's autolinking from
+* expo-modules-autolinking 1.12 (SDK 52), else React Native CLI. The native
+* templates also fall back to React Native CLI when
+* `EXPO_USE_COMMUNITY_AUTOLINKING=1`, as Expo documents.
+*/
+const reactNativeConfigCommand = (cwd, platform, env = process.env) => {
+	const autolinking = resolveExpoAutolinking(cwd);
+	if (autolinking.linksReactNative && env["EXPO_USE_COMMUNITY_AUTOLINKING"] !== "1") return [
+		autolinking.bin,
+		"react-native-config",
+		"--platform",
+		platform,
+		"--json"
+	];
+	return [path$1.join(path$1.dirname(require$1.resolve("react-native/package.json", { paths: [cwd] })), "cli.js"), "config"];
+};
+/**
+* The Expo adapter's native fingerprint: the bare and Rock adapters' engine,
+* fed the native packages Expo's autolinking links and the engine settings
+* the app config declares. Neither needs the generated ios/ and android/
+* folders, so `fingerprint create` before prebuild and the native build
+* after it compute the same one.
+*/
+const expoFingerprint = async (cwd, options) => {
+	const { exp } = await getConfig(cwd, { skipSDKVersionRequirement: true });
+	const settings = readExpoSettings(exp, options.platform);
+	const nativeInterface = await readReactNativeInterface({
+		cwd,
+		command: process.execPath,
+		args: reactNativeConfigCommand(cwd, options.platform),
+		platform: options.platform,
+		settings
+	});
+	return createInterfaceFingerprint(cwd, options, nativeInterface);
 };
 //#endregion
 //#region src/resolveMain.ts
@@ -6405,6 +6458,7 @@ const expo = (config = {
 	const { outDir = "dist", sourcemap = false, resetCache = true } = config;
 	return {
 		nativeBuild: {
+			fingerprint: (options) => expoFingerprint(cwd, options),
 			getBundleSigningPublicKey: () => getExpoBundleSigningPublicKey(cwd),
 			getFingerprintExtraSources: async () => getExpoFingerprintExtraSources(cwd),
 			prebuild: async ({ platform }) => {
@@ -6435,4 +6489,4 @@ const expo = (config = {
 	};
 };
 //#endregion
-export { expo, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };
+export { expo, expoFingerprint, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/expo",
-  "version": "1.0.8",
+  "version": "1.1.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.8",
-    "@hot-updater/cli-tools": "1.0.8",
-    "@hot-updater/plugin-core": "1.0.8"
+    "@hot-updater/cli-tools": "1.1.0",
+    "@hot-updater/plugin-core": "1.1.0",
+    "@hot-updater/bare": "1.1.0"
   },
   "devDependencies": {
     "@types/node": "^20",
     "expo": "^50.0.0",
     "execa": "9.5.2",
     "vitest": "4.1.4",
-    "hot-updater": "1.0.8"
+    "hot-updater": "1.1.0"
   },
   "exports": {
     ".": {

package/plugin/build/withHotUpdater.js

@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPublicKeyFromConfig = void 0;
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
 const config_plugins_1 = require("expo/config-plugins");
 const package_json_1 = __importDefault(require("../../package.json"));
 const transformers_1 = require("./transformers");
@@ -109,20 +111,27 @@ const withHotUpdaterConfigAsync = (props) => (config) => {
         return publicKeyPromise;
     };
     let modifiedConfig = config;
-    // === iOS: Add channel and fingerprint to Info.plist ===
-    modifiedConfig = (0, config_plugins_1.withInfoPlist)(modifiedConfig, async (cfg) => {
-        let fingerprintHash = null;
+    // fingerprint.json, which the native build reads to embed each
+    // platform's fingerprint. Under appVersion a fingerprint.json left from
+    // the fingerprint strategy would still be embedded, so it goes.
+    const writeFingerprintJson = async (projectRoot) => {
         const hotUpdaterConfig = await getHotUpdaterConfig();
         if (hotUpdaterConfig.updateStrategy !== "appVersion") {
-            const fingerprint = await getFingerprint(props.publicKeyPath);
-            fingerprintHash = fingerprint.ios.hash;
+            await getFingerprint(props.publicKeyPath);
+        }
+        else {
+            await promises_1.default.rm(node_path_1.default.join(projectRoot, "fingerprint.json"), {
+                force: true,
+            });
         }
+    };
+    // === iOS: Add channel to Info.plist ===
+    modifiedConfig = (0, config_plugins_1.withInfoPlist)(modifiedConfig, async (cfg) => {
+        await writeFingerprintJson(cfg.modRequest.projectRoot);
         // Load public key if signing is enabled
         const publicKey = await getPublicKey(cfg.modRequest.projectRoot);
         cfg.modResults.HOT_UPDATER_CHANNEL = channel;
-        if (fingerprintHash) {
-            cfg.modResults.HOT_UPDATER_FINGERPRINT_HASH = fingerprintHash;
-        }
+        delete cfg.modResults.HOT_UPDATER_FINGERPRINT_HASH;
         if (publicKey) {
             cfg.modResults.HOT_UPDATER_PUBLIC_KEY = publicKey;
         }
@@ -131,14 +140,9 @@ const withHotUpdaterConfigAsync = (props) => (config) => {
         }
         return cfg;
     });
-    // === Android: Add channel and fingerprint to AndroidManifest.xml ===
+    // === Android: Add channel to AndroidManifest.xml ===
     modifiedConfig = (0, config_plugins_1.withAndroidManifest)(modifiedConfig, async (cfg) => {
-        let fingerprintHash = null;
-        const hotUpdaterConfig = await getHotUpdaterConfig();
-        if (hotUpdaterConfig.updateStrategy !== "appVersion") {
-            const fingerprint = await getFingerprint(props.publicKeyPath);
-            fingerprintHash = fingerprint.android.hash;
-        }
+        await writeFingerprintJson(cfg.modRequest.projectRoot);
         // Load public key if signing is enabled
         const publicKey = await getPublicKey(cfg.modRequest.projectRoot);
         const application = cfg.modResults.manifest.application?.[0];
@@ -146,9 +150,7 @@ const withHotUpdaterConfigAsync = (props) => (config) => {
             return cfg;
         }
         upsertAndroidMetaData(application, ANDROID_META_DATA_KEYS.channel, channel);
-        if (fingerprintHash) {
-            upsertAndroidMetaData(application, ANDROID_META_DATA_KEYS.fingerprintHash, fingerprintHash);
-        }
+        removeAndroidMetaData(application, ANDROID_META_DATA_KEYS.fingerprintHash);
         if (publicKey) {
             upsertAndroidMetaData(application, ANDROID_META_DATA_KEYS.publicKey, config_plugins_1.XML.escapeAndroidString(publicKey));
         }