react-native-update-cli 1.22.0 → 1.23.1

package/lib/bundle.js

@@ -51,7 +51,7 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
   if (platform === 'android') {
     gradleConfig = await checkGradleConfig();
     if (gradleConfig.crunchPngs !== false) {
-      console.warn('android的crunchPngs选项似乎尚未禁用（如已禁用则请忽略此提示），这可能导致热更包体积异常增大，具体请参考 https://pushy.reactnative.cn/docs/getting-started.html#%E7%A6%81%E7%94%A8-android-%E7%9A%84-crunch-%E4%BC%98%E5%8C%96 \n');
+      console.warn('android 的 crunchPngs 选项似乎尚未禁用（如已禁用则请忽略此提示），这可能导致热更包体积异常增大，具体请参考 https://pushy.reactnative.cn/docs/getting-started.html#%E7%A6%81%E7%94%A8-android-%E7%9A%84-crunch-%E4%BC%98%E5%8C%96 \n');
     }
   }
 
@@ -68,18 +68,16 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
   let cliPath = require.resolve('react-native/local-cli/cli.js', {
     paths: [process.cwd()]
   });
+  let isExpo = false;
   try {
-    require.resolve('expo-router', {
-      paths: [process.cwd()]
-    });
-
-    console.log(`expo-router detected, will use @expo/cli to bundle.\n`);
-    // if using expo-router, use expo-cli
+    // use expo-cli if exists
     cliPath = require.resolve('@expo/cli', {
       paths: [process.cwd()]
     });
+    isExpo = true;
+    console.log(`expo detected, will use @expo/cli to bundle.\n`);
   } catch (e) {}
-  const bundleCommand = cliPath.includes('@expo/cli') ? 'export:embed' : 'bundle';
+  const bundleCommand = isExpo ? 'export:embed' : 'bundle';
 
   Array.prototype.push.apply(reactNativeBundleArgs, [cliPath, bundleCommand, '--assets-dest', outputFolder, '--bundle-output', _path2.default.join(outputFolder, bundleName), '--dev', development, '--entry-file', entryFile, '--platform', platform, '--reset-cache']);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.22.0",
+  "version": "1.23.1",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {

package/src/bundle.js

@@ -33,7 +33,7 @@ async function runReactNativeBundleCommand(
     gradleConfig = await checkGradleConfig();
     if (gradleConfig.crunchPngs !== false) {
       console.warn(
-        'android的crunchPngs选项似乎尚未禁用（如已禁用则请忽略此提示），这可能导致热更包体积异常增大，具体请参考 https://pushy.reactnative.cn/docs/getting-started.html#%E7%A6%81%E7%94%A8-android-%E7%9A%84-crunch-%E4%BC%98%E5%8C%96 \n',
+        'android 的 crunchPngs 选项似乎尚未禁用（如已禁用则请忽略此提示），这可能导致热更包体积异常增大，具体请参考 https://pushy.reactnative.cn/docs/getting-started.html#%E7%A6%81%E7%94%A8-android-%E7%9A%84-crunch-%E4%BC%98%E5%8C%96 \n',
       );
     }
   }
@@ -54,20 +54,16 @@ async function runReactNativeBundleCommand(
   let cliPath = require.resolve('react-native/local-cli/cli.js', {
     paths: [process.cwd()],
   });
+  let isExpo = false;
   try {
-    require.resolve('expo-router', {
-      paths: [process.cwd()],
-    });
-
-    console.log(`expo-router detected, will use @expo/cli to bundle.\n`);
-    // if using expo-router, use expo-cli
+    // use expo-cli if exists
     cliPath = require.resolve('@expo/cli', {
       paths: [process.cwd()],
     });
+    isExpo = true;
+    console.log(`expo detected, will use @expo/cli to bundle.\n`);
   } catch (e) {}
-  const bundleCommand = cliPath.includes('@expo/cli')
-    ? 'export:embed'
-    : 'bundle';
+  const bundleCommand = isExpo ? 'export:embed' : 'bundle';
 
   Array.prototype.push.apply(reactNativeBundleArgs, [
     cliPath,
@@ -204,7 +200,7 @@ async function compileHermesByteCode(
   }
 
   const hermesCommand = `${hermesPath}/hermesc`;
-  
+
   const args = [
     '-emit-binary',
     '-out',