@expo-harmony/cli 55.0.26-harmony.2 → 55.0.26-harmony.4

package/README.md

@@ -50,7 +50,9 @@ npx expo-harmony start --port 8082
 npx expo-harmony start --clear
 ```
 
-`start` 调用项目本地的 Expo CLI，以 `--dev-client` 模式启动 Metro，并自动设置 `EXPO_METRO_TARGET=harmony`。它只启动 JS 开发服务，不执行原生工程生成、构建、安装、应用启动或设备端口映射，也不要求 HarmonyOS SDK 和设备就绪。新启动的 Metro 在当前终端输出日志，按 Ctrl+C 退出。
+所有命令都会在 CLI 入口、读取应用配置之前设置 `EXPO_HARMONY=1` 和 `EXPO_METRO_TARGET=harmony`。
+
+`start` 调用项目本地的 Expo CLI，以 `--dev-client` 模式启动 Metro。它只启动 JS 开发服务，不执行原生工程生成、构建、安装、应用启动或设备端口映射，也不要求 HarmonyOS SDK 和设备就绪。新启动的 Metro 在当前终端输出日志，按 Ctrl+C 退出。
 
 支持 `--port <number>`（默认 `8081`）和 `--reset-cache`（别名 `--clear`、`-c`）。端口上已有 Metro 时提示并退出，不停止已有服务；此时缓存选项不会生效，需要先停止已有 Metro 后重新执行命令。端口被其他进程占用时会报错。
 

package/build/buildHap/build.js

@@ -50,7 +50,6 @@ async function buildHarmonyUnlockedAsync(projectRoot, options = {}) {
     const buildEnv = {
         ...process.env,
         EXPO_HARMONY_NODE: process.env.EXPO_HARMONY_NODE || process.execPath,
-        EXPO_METRO_TARGET: 'harmony',
         HERMES_V1_ENABLED: 'true',
         ...(normalizedOptions.variant === 'release' ? { EXPO_HARMONY_BUNDLE_PREBUILT: '1' } : {}),
         ...(toolchain.sdkHome && !process.env.DEVECO_SDK_HOME

package/build/cli.js

@@ -78,6 +78,8 @@ function parseInvocation(argv) {
     return { command, parsed, projectRoot };
 }
 async function runAsync(argv = process.argv.slice(2), io = console) {
+    process.env.EXPO_HARMONY = '1';
+    process.env.EXPO_METRO_TARGET = 'harmony';
     const invocation = parseInvocation(argv);
     if (invocation.command === 'help') {
         io.log(Help);

package/build/doctor/doctor.js

@@ -59,19 +59,7 @@ async function validateMetroConfigAsync(projectRoot) {
         })();
         throw new Error(`metro-config ${version} does not expose resolveConfig().`);
     }
-    const hadMetroTarget = Object.hasOwn(process.env, 'EXPO_METRO_TARGET');
-    const previousMetroTarget = process.env.EXPO_METRO_TARGET;
-    let resolved;
-    try {
-        process.env.EXPO_METRO_TARGET = 'harmony';
-        resolved = await metroConfig.resolveConfig(undefined, projectRoot);
-    }
-    finally {
-        if (hadMetroTarget)
-            process.env.EXPO_METRO_TARGET = previousMetroTarget;
-        else
-            delete process.env.EXPO_METRO_TARGET;
-    }
+    const resolved = await metroConfig.resolveConfig(undefined, projectRoot);
     const config = resolved?.config;
     const platforms = config?.resolver?.platforms;
     const conditions = config?.resolver?.unstable_conditionsByPlatform?.harmony;

package/build/exportEmbed/export.js

@@ -65,7 +65,6 @@ async function exportEmbedUnlockedAsync(projectRoot, options = {}) {
             cwd: projectRoot,
             env: {
                 ...process.env,
-                EXPO_METRO_TARGET: 'harmony',
                 HERMES_V1_ENABLED: 'true',
                 NODE_ENV: 'production',
             },

package/build/run/metro.js

@@ -88,7 +88,6 @@ async function startExpoMetroAsync(projectRoot, options) {
         cwd: projectRoot,
         env: {
             ...process.env,
-            EXPO_METRO_TARGET: 'harmony',
         },
         operation: 'expo-metro',
         outputLimit: 1024 * 1024,

package/build/run/run.js

@@ -80,7 +80,6 @@ async function runHarmonyUnlockedAsync(projectRoot, options = {}) {
         const buildEnv = {
             ...process.env,
             EXPO_HARMONY_NODE: process.env.EXPO_HARMONY_NODE || process.execPath,
-            EXPO_METRO_TARGET: 'harmony',
             HERMES_V1_ENABLED: 'true',
             ...(normalizedOptions.variant === 'release' ? { EXPO_HARMONY_BUNDLE_PREBUILT: '1' } : {}),
             ...(toolchain.sdkHome && !process.env.DEVECO_SDK_HOME

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo-harmony/cli",
-  "version": "55.0.26-harmony.2",
+  "version": "55.0.26-harmony.4",
   "keywords": [
     "react-native",
     "expo",
@@ -36,9 +36,9 @@
     "expo-harmony": "build/bin/expo-harmony.js"
   },
   "dependencies": {
-    "@expo-harmony/config-plugins": "55.0.10-harmony.1",
-    "@expo-harmony/expo-modules-autolinking": "55.0.25-harmony.1",
-    "@expo-harmony/prebuild-config": "55.0.0-harmony.1",
+    "@expo-harmony/config-plugins": "55.0.10-harmony.2",
+    "@expo-harmony/expo-modules-autolinking": "55.0.25-harmony.2",
+    "@expo-harmony/prebuild-config": "55.0.0-harmony.3",
     "@expo/config": "55.0.17",
     "cross-spawn": "^7.0.6",
     "json5": "2.2.3"

package/src/cli.ts

@@ -90,6 +90,9 @@ async function runAsync(
   argv: string[] = process.argv.slice(2),
   io: Pick<Console, 'error' | 'log' | 'warn'> = console
 ): Promise<number> {
+  process.env.EXPO_HARMONY = '1';
+  process.env.EXPO_METRO_TARGET = 'harmony';
+
   const invocation = parseInvocation(argv);
   if (invocation.command === 'help') {
     io.log(Help);