react-native-update-cli 1.29.0 → 1.30.1

package/lib/bundle.js

@@ -65,9 +65,20 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
 
   fs.emptyDirSync(outputFolder);
 
-  let cliPath = require.resolve('react-native/local-cli/cli.js', {
-    paths: [process.cwd()]
-  });
+  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', {

package/lib/utils/index.js

@@ -35,9 +35,9 @@ var _appInfoParser = require('./app-info-parser');
 
 var _appInfoParser2 = _interopRequireDefault(_appInfoParser);
 
-var _lt = require('semver/functions/lt');
+var _satisfies = require('semver/functions/satisfies');
 
-var _lt2 = _interopRequireDefault(_lt);
+var _satisfies2 = _interopRequireDefault(_satisfies);
 
 var _read = require('read');
 
@@ -157,10 +157,9 @@ function printVersionCommand() {
     console.log('react-native-update: 无法获取版本号，请在项目目录中运行命令');
   }
   if (pushyVersion) {
-    if ((0, _lt2.default)(pushyVersion, '8.5.1')) {
+    if ((0, _satisfies2.default)(pushyVersion, '<8.5.1')) {
       console.warn('当前版本已不再支持，请至少升级到 v8 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@8');
-    }
-    if ((0, _lt2.default)(pushyVersion, '9.2.1')) {
+    } else if ((0, _satisfies2.default)(pushyVersion, '9.0.0 - 9.2.0')) {
       console.warn('当前版本已不再支持，请至少升级到 v9 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@9');
     }
   }

package/package.json

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

package/src/bundle.js

@@ -51,9 +51,20 @@ async function runReactNativeBundleCommand(
 
   fs.emptyDirSync(outputFolder);
 
-  let cliPath = require.resolve('react-native/local-cli/cli.js', {
-    paths: [process.cwd()],
-  });
+  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', {

package/src/utils/index.js

@@ -3,7 +3,7 @@ import os from 'os';
 import path from 'path';
 import pkg from '../../package.json';
 import AppInfoParser from './app-info-parser';
-import semverLt from 'semver/functions/lt';
+import semverSatisfies from 'semver/functions/satisfies';
 
 import read from 'read';
 
@@ -152,12 +152,11 @@ export function printVersionCommand() {
     console.log('react-native-update: 无法获取版本号，请在项目目录中运行命令');
   }
   if (pushyVersion) {
-    if (semverLt(pushyVersion, '8.5.1')) {
+    if (semverSatisfies(pushyVersion, '<8.5.1')) {
       console.warn(
         '当前版本已不再支持，请至少升级到 v8 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@8',
       );
-    }
-    if (semverLt(pushyVersion, '9.2.1')) {
+    } else if (semverSatisfies(pushyVersion, '9.0.0 - 9.2.0')) {
       console.warn(
         '当前版本已不再支持，请至少升级到 v9 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@9',
       );