react-native-update-cli 1.34.1 → 1.35.0

package/lib/bundle.js

@@ -86,37 +86,31 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
     }
     _fsextra.emptyDirSync(outputFolder);
     let cliPath;
-    try {
-        // rn >= 0.75
-        cliPath = require.resolve('@react-native-community/cli/build/bin.js', {
-            paths: [
-                process.cwd()
-            ]
-        });
-    } catch (e) {
-        // rn < 0.75
-        cliPath = require.resolve('react-native/local-cli/cli.js', {
-            paths: [
-                process.cwd()
-            ]
-        });
-    }
     let usingExpo = 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
         cliPath = require.resolve('@expo/cli', {
             paths: [
                 process.cwd()
             ]
         });
         usingExpo = true;
-    } catch (e) {}
+    } catch (e) {
+        try {
+            // rn >= 0.75
+            cliPath = require.resolve('@react-native-community/cli/build/bin.js', {
+                paths: [
+                    process.cwd()
+                ]
+            });
+        } catch (e) {
+            // rn < 0.75
+            cliPath = require.resolve('react-native/local-cli/cli.js', {
+                paths: [
+                    process.cwd()
+                ]
+            });
+        }
+    }
     const bundleCommand = usingExpo ? 'export:embed' : 'bundle';
     Array.prototype.push.apply(reactNativeBundleArgs, [
         cliPath,

package/lib/utils/index.js

@@ -181,7 +181,7 @@ async function printVersionCommand() {
         } else if ((0, _satisfies.default)(pushyVersion, '9.0.0 - 9.2.1')) {
             console.warn(`当前版本已不再支持，请至少升级到 v9 的最新小版本后重新打包（代码无需改动，可直接热更）: npm i react-native-update@9 .
         如有使用安装 apk 的功能，请注意添加所需权限 https://pushy.reactnative.cn/docs/api#async-function-downloadandinstallapkurl`);
-        } else if ((0, _satisfies.default)(pushyVersion, '10.0.0 - 10.15.2')) {
+        } else if ((0, _satisfies.default)(pushyVersion, '10.0.0 - 10.17.0')) {
             console.warn(`当前版本已不再支持，请升级到 v10 的最新小版本（代码无需改动，可直接热更）: npm i react-native-update@10`);
         }
     }

package/package.json

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

package/src/bundle.js

@@ -53,31 +53,25 @@ async function runReactNativeBundleCommand(
 
   let cliPath;
 
-  try {
-    // rn >= 0.75
-    cliPath = require.resolve('@react-native-community/cli/build/bin.js', {
-      paths: [process.cwd()],
-    });
-  } catch (e) {
-    // rn < 0.75
-    cliPath = require.resolve('react-native/local-cli/cli.js', {
-      paths: [process.cwd()],
-    });
-  }
-
   let usingExpo = 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
     cliPath = require.resolve('@expo/cli', {
       paths: [process.cwd()],
     });
     usingExpo = true;
-  } catch (e) {}
+  } catch (e) {
+    try {
+      // rn >= 0.75
+      cliPath = require.resolve('@react-native-community/cli/build/bin.js', {
+        paths: [process.cwd()],
+      });
+    } catch (e) {
+      // rn < 0.75
+      cliPath = require.resolve('react-native/local-cli/cli.js', {
+        paths: [process.cwd()],
+      });
+    }
+  }
   const bundleCommand = usingExpo ? 'export:embed' : 'bundle';
 
   Array.prototype.push.apply(reactNativeBundleArgs, [

package/src/utils/index.js

@@ -178,7 +178,7 @@ export async function printVersionCommand() {
         `当前版本已不再支持，请至少升级到 v9 的最新小版本后重新打包（代码无需改动，可直接热更）: npm i react-native-update@9 .
         如有使用安装 apk 的功能，请注意添加所需权限 https://pushy.reactnative.cn/docs/api#async-function-downloadandinstallapkurl`,
       );
-    } else if (semverSatisfies(pushyVersion, '10.0.0 - 10.15.2')) {
+    } else if (semverSatisfies(pushyVersion, '10.0.0 - 10.17.0')) {
       console.warn(
         `当前版本已不再支持，请升级到 v10 的最新小版本（代码无需改动，可直接热更）: npm i react-native-update@10`,
       );