@hot-updater/expo 1.1.3 → 1.2.0-rc.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$11 = 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" });
@@ -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$11.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));
 		});
@@ -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$11.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];
@@ -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$10 = require("path");
+	const path$9 = 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$10.delimiter : void 0
+				pathExt: withoutPathExt ? path$9.delimiter : void 0
 			});
 		} catch (e) {} finally {
 			if (shouldSwitchCwd) process.chdir(cwd);
 		}
-		if (resolved) resolved = path$10.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+		if (resolved) resolved = path$9.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$9 = require("path");
+	const path$8 = 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$9.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 = [
@@ -6263,13 +6263,14 @@ createExeca(mapScriptAsync, {}, deepScriptOptions, setScriptSync);
 const { sendMessage, getOneMessage, getEachMessage, getCancelSignal } = getIpcExport();
 //#endregion
 //#region src/expoConfig.ts
-const require$2 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
+const require$1 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
 const getConfig = async (...args) => {
-	return require$2(require$2.resolve("expo/config", { paths: [node_path.default.resolve(args[0])] })).getConfig(...args);
+	return require$1(require$1.resolve("expo/config", { paths: [node_path.default.resolve(args[0])] })).getConfig(...args);
 };
+/** The project's own `expo/config-plugins`, which prebuild writes with. */
+const getConfigPlugins = (cwd) => require$1(require$1.resolve("expo/config-plugins", { paths: [node_path.default.resolve(cwd)] }));
 //#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
@@ -6284,24 +6285,6 @@ const readExpoSettings = (exp, platform) => {
 	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/
@@ -6314,7 +6297,7 @@ const expoFingerprint = async (cwd, options) => {
 	const nativeInterface = await (0, _hot_updater_cli_tools.readReactNativeInterface)({
 		cwd,
 		command: process.execPath,
-		args: reactNativeConfigCommand(cwd, options.platform),
+		args: (0, _hot_updater_cli_tools.reactNativeConfigCommand)(cwd, options.platform),
 		platform: options.platform,
 		settings
 	});
@@ -6381,12 +6364,29 @@ const runExpoPrebuild = async ({ platform }) => {
 };
 //#endregion
 //#region src/expo.ts
+const isHotUpdaterExpoPlugin = (name) => name === "@hot-updater/expo" || name === "@hot-updater/expo/app.plugin.js";
 const getHotUpdaterExpoPluginProps = (plugins) => {
-	const entry = plugins?.find((plugin) => Array.isArray(plugin) && (plugin[0] === "@hot-updater/expo" || plugin[0] === "@hot-updater/expo/app.plugin.js"));
+	const entry = plugins?.find((plugin) => Array.isArray(plugin) && isHotUpdaterExpoPlugin(plugin[0]));
 	if (!entry || !Array.isArray(entry)) return void 0;
 	const props = entry[1];
 	return typeof props === "object" && props !== null ? props : void 0;
 };
+/**
+* What `expo prebuild` would write into a platform's native project, from
+* the Expo config and with the project's own config plugins, without
+* writing it: the version Expo's version plugin writes, and the channel the
+* `@hot-updater/expo` config plugin writes when the config lists it.
+*/
+const getExpoNativeProjectValues = async (cwd, platform) => {
+	const { exp } = await getConfig(cwd, { skipSDKVersionRequirement: true });
+	const { AndroidConfig, IOSConfig } = getConfigPlugins(cwd);
+	const appVersion = platform === "ios" ? IOSConfig.Version.getVersion(exp) : AndroidConfig.Version.getVersionName(exp);
+	const listsPlugin = (exp.plugins ?? []).some((plugin) => isHotUpdaterExpoPlugin(Array.isArray(plugin) ? plugin[0] : plugin));
+	return {
+		...appVersion ? { appVersion } : {},
+		...listsPlugin ? { channel: getHotUpdaterExpoPluginProps(exp.plugins)?.channel || "production" } : {}
+	};
+};
 const getExpoFingerprintExtraSources = async (cwd) => {
 	const { exp } = await getConfig(cwd, { skipSDKVersionRequirement: true });
 	const publicKeyPath = getHotUpdaterExpoPluginProps(exp.plugins)?.publicKeyPath;
@@ -6465,6 +6465,7 @@ const expo = (config = {
 			fingerprint: (options) => expoFingerprint(cwd, options),
 			getBundleSigningPublicKey: () => getExpoBundleSigningPublicKey(cwd),
 			getFingerprintExtraSources: async () => getExpoFingerprintExtraSources(cwd),
+			getNativeProjectValues: ({ platform }) => getExpoNativeProjectValues(cwd, platform),
 			prebuild: async ({ platform }) => {
 				await runExpoPrebuild({ platform });
 			}
@@ -6497,3 +6498,4 @@ exports.expo = expo;
 exports.expoFingerprint = expoFingerprint;
 exports.getExpoBundleSigningPublicKey = getExpoBundleSigningPublicKey;
 exports.getExpoFingerprintExtraSources = getExpoFingerprintExtraSources;
+exports.getExpoNativeProjectValues = getExpoNativeProjectValues;

package/dist/index.d.cts

@@ -1,5 +1,15 @@
-import { BuildAdapter, BuildAdapterArgs, BuildAdapterConfig, NativeFingerprintOptions } from "@hot-updater/plugin-core";
+import { BuildAdapter, BuildAdapterArgs, BuildAdapterConfig, NativeFingerprintOptions, Platform } from "@hot-updater/plugin-core";
 //#region src/expo.d.ts
+/**
+ * What `expo prebuild` would write into a platform's native project, from
+ * the Expo config and with the project's own config plugins, without
+ * writing it: the version Expo's version plugin writes, and the channel the
+ * `@hot-updater/expo` config plugin writes when the config lists it.
+ */
+declare const getExpoNativeProjectValues: (cwd: string, platform: Platform) => Promise<{
+  appVersion?: string;
+  channel?: string;
+}>;
 declare const getExpoFingerprintExtraSources: (cwd: string) => Promise<string[]>;
 declare const getExpoBundleSigningPublicKey: (cwd: string) => Promise<{
   readonly publicKey: string;
@@ -28,4 +38,4 @@ declare const expo: (config?: ExpoAdapterConfig) => ({ cwd }: BuildAdapterArgs)
  */
 declare const expoFingerprint: (cwd: string, options: NativeFingerprintOptions) => Promise<import("@hot-updater/plugin-core").NativeFingerprint>;
 //#endregion
-export { ExpoAdapterConfig, expo, expoFingerprint, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };
+export { ExpoAdapterConfig, expo, expoFingerprint, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources, getExpoNativeProjectValues };

package/dist/index.d.mts

@@ -1,5 +1,15 @@
-import { BuildAdapter, BuildAdapterArgs, BuildAdapterConfig, NativeFingerprintOptions } from "@hot-updater/plugin-core";
+import { BuildAdapter, BuildAdapterArgs, BuildAdapterConfig, NativeFingerprintOptions, Platform } from "@hot-updater/plugin-core";
 //#region src/expo.d.ts
+/**
+ * What `expo prebuild` would write into a platform's native project, from
+ * the Expo config and with the project's own config plugins, without
+ * writing it: the version Expo's version plugin writes, and the channel the
+ * `@hot-updater/expo` config plugin writes when the config lists it.
+ */
+declare const getExpoNativeProjectValues: (cwd: string, platform: Platform) => Promise<{
+  appVersion?: string;
+  channel?: string;
+}>;
 declare const getExpoFingerprintExtraSources: (cwd: string) => Promise<string[]>;
 declare const getExpoBundleSigningPublicKey: (cwd: string) => Promise<{
   readonly publicKey: string;
@@ -28,4 +38,4 @@ declare const expo: (config?: ExpoAdapterConfig) => ({ cwd }: BuildAdapterArgs)
  */
 declare const expoFingerprint: (cwd: string, options: NativeFingerprintOptions) => Promise<import("@hot-updater/plugin-core").NativeFingerprint>;
 //#endregion
-export { ExpoAdapterConfig, expo, expoFingerprint, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };
+export { ExpoAdapterConfig, expo, expoFingerprint, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources, getExpoNativeProjectValues };

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 { createInterfaceFingerprint, log, p, readBundleSigningPublicKeyFile, readReactNativeInterface, resolveExpoAutolinking } from "@hot-updater/cli-tools";
+import { createInterfaceFingerprint, log, p, reactNativeConfigCommand, readBundleSigningPublicKeyFile, readReactNativeInterface } 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,13 +6259,14 @@ createExeca(mapScriptAsync, {}, deepScriptOptions, setScriptSync);
 const { sendMessage, getOneMessage, getEachMessage, getCancelSignal } = getIpcExport();
 //#endregion
 //#region src/expoConfig.ts
-const require$2 = createRequire(import.meta.url);
+const require$1 = createRequire(import.meta.url);
 const getConfig = async (...args) => {
-	return require$2(require$2.resolve("expo/config", { paths: [path$1.resolve(args[0])] })).getConfig(...args);
+	return require$1(require$1.resolve("expo/config", { paths: [path$1.resolve(args[0])] })).getConfig(...args);
 };
+/** The project's own `expo/config-plugins`, which prebuild writes with. */
+const getConfigPlugins = (cwd) => require$1(require$1.resolve("expo/config-plugins", { paths: [path$1.resolve(cwd)] }));
 //#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
@@ -6280,24 +6281,6 @@ const readExpoSettings = (exp, platform) => {
 	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/
@@ -6377,12 +6360,29 @@ const runExpoPrebuild = async ({ platform }) => {
 };
 //#endregion
 //#region src/expo.ts
+const isHotUpdaterExpoPlugin = (name) => name === "@hot-updater/expo" || name === "@hot-updater/expo/app.plugin.js";
 const getHotUpdaterExpoPluginProps = (plugins) => {
-	const entry = plugins?.find((plugin) => Array.isArray(plugin) && (plugin[0] === "@hot-updater/expo" || plugin[0] === "@hot-updater/expo/app.plugin.js"));
+	const entry = plugins?.find((plugin) => Array.isArray(plugin) && isHotUpdaterExpoPlugin(plugin[0]));
 	if (!entry || !Array.isArray(entry)) return void 0;
 	const props = entry[1];
 	return typeof props === "object" && props !== null ? props : void 0;
 };
+/**
+* What `expo prebuild` would write into a platform's native project, from
+* the Expo config and with the project's own config plugins, without
+* writing it: the version Expo's version plugin writes, and the channel the
+* `@hot-updater/expo` config plugin writes when the config lists it.
+*/
+const getExpoNativeProjectValues = async (cwd, platform) => {
+	const { exp } = await getConfig(cwd, { skipSDKVersionRequirement: true });
+	const { AndroidConfig, IOSConfig } = getConfigPlugins(cwd);
+	const appVersion = platform === "ios" ? IOSConfig.Version.getVersion(exp) : AndroidConfig.Version.getVersionName(exp);
+	const listsPlugin = (exp.plugins ?? []).some((plugin) => isHotUpdaterExpoPlugin(Array.isArray(plugin) ? plugin[0] : plugin));
+	return {
+		...appVersion ? { appVersion } : {},
+		...listsPlugin ? { channel: getHotUpdaterExpoPluginProps(exp.plugins)?.channel || "production" } : {}
+	};
+};
 const getExpoFingerprintExtraSources = async (cwd) => {
 	const { exp } = await getConfig(cwd, { skipSDKVersionRequirement: true });
 	const publicKeyPath = getHotUpdaterExpoPluginProps(exp.plugins)?.publicKeyPath;
@@ -6461,6 +6461,7 @@ const expo = (config = {
 			fingerprint: (options) => expoFingerprint(cwd, options),
 			getBundleSigningPublicKey: () => getExpoBundleSigningPublicKey(cwd),
 			getFingerprintExtraSources: async () => getExpoFingerprintExtraSources(cwd),
+			getNativeProjectValues: ({ platform }) => getExpoNativeProjectValues(cwd, platform),
 			prebuild: async ({ platform }) => {
 				await runExpoPrebuild({ platform });
 			}
@@ -6489,4 +6490,4 @@ const expo = (config = {
 	};
 };
 //#endregion
-export { expo, expoFingerprint, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };
+export { expo, expoFingerprint, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources, getExpoNativeProjectValues };

package/package.json

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