react-native-update-cli 1.45.0 → 1.45.2

package/cli.json

@@ -87,6 +87,9 @@
         "maxPackageVersion": {
           "hasValue": true
         },
+        "semverRange": {
+          "hasValue": true
+        },
         "rollout": {
           "hasValue": true
         }

package/lib/bundle.js

@@ -26,7 +26,7 @@ const _yazl = require("yazl");
 const _yauzl = require("yauzl");
 const _app = require("./app");
 const _child_process = require("child_process");
-const _satisfies = /*#__PURE__*/ _interop_require_default(require("semver/functions/satisfies"));
+const _compareversions = require("compare-versions");
 const _os = /*#__PURE__*/ _interop_require_default(require("os"));
 const _depversions = require("./utils/dep-versions");
 const _i18n = require("./utils/i18n");
@@ -120,7 +120,7 @@ async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputF
                 ]
             })).toString()).version;
             // expo cli 0.10.17 (expo 49) 开始支持 bundle:embed
-            if ((0, _satisfies.default)(expoCliVersion, '>= 0.10.17')) {
+            if ((0, _compareversions.satisfies)(expoCliVersion, '>= 0.10.17')) {
                 usingExpo = true;
             } else {
                 cliPath = undefined;

package/lib/utils/index.js

@@ -39,7 +39,7 @@ const _os = /*#__PURE__*/ _interop_require_default(require("os"));
 const _path = /*#__PURE__*/ _interop_require_default(require("path"));
 const _packagejson = /*#__PURE__*/ _interop_require_default(require("../../package.json"));
 const _appinfoparser = /*#__PURE__*/ _interop_require_default(require("./app-info-parser"));
-const _satisfies = /*#__PURE__*/ _interop_require_default(require("semver/functions/satisfies"));
+const _compareversions = require("compare-versions");
 const _chalk = /*#__PURE__*/ _interop_require_default(require("chalk"));
 const _latestversion = /*#__PURE__*/ _interop_require_default(require("../utils/latest-version"));
 const _checkplugin = require("./check-plugin");
@@ -201,18 +201,18 @@ async function printVersionCommand() {
         })}` : '';
         console.log(`react-native-update: ${rnuVersion}${latestRnuVersion}`);
         if (_constants.IS_CRESC) {
-            if ((0, _satisfies.default)(rnuVersion, '<10.27.0')) {
+            if ((0, _compareversions.satisfies)(rnuVersion, '<10.27.0')) {
                 console.error('Unsupported version, please update to the latest version: npm i react-native-update@latest');
                 process.exit(1);
             }
         } else {
-            if ((0, _satisfies.default)(rnuVersion, '<8.5.2')) {
+            if ((0, _compareversions.satisfies)(rnuVersion, '<8.5.2')) {
                 console.warn(`当前版本已不再支持，请至少升级到 v8 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@8 .
           如有使用安装 apk 的功能，请注意添加所需权限 https://pushy.reactnative.cn/docs/api#async-function-downloadandinstallapkurl`);
-            } else if ((0, _satisfies.default)(rnuVersion, '9.0.0 - 9.2.1')) {
+            } else if ((0, _compareversions.satisfies)(rnuVersion, '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)(rnuVersion, '10.0.0 - 10.17.0')) {
+            } else if ((0, _compareversions.satisfies)(rnuVersion, '10.0.0 - 10.17.0')) {
                 console.warn('当前版本已不再支持，请升级到 v10 的最新小版本（代码无需改动，可直接热更）: npm i react-native-update@10');
             }
         }

package/lib/versions.js

@@ -23,12 +23,7 @@ const _app = require("./app");
 const _package = require("./package");
 const _depversions = require("./utils/dep-versions");
 const _git = require("./utils/git");
-const _satisfies = /*#__PURE__*/ _interop_require_default(require("semver/functions/satisfies"));
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
+const _compareversions = require("compare-versions");
 async function showVersion(appId, offset) {
     const { data, count } = await (0, _api.get)(`/app/${appId}/version/list`);
     console.log((0, _i18n.t)('offset', {
@@ -202,7 +197,7 @@ const commands = {
         let pkgsToBind = [];
         if (minPkgVersion) {
             minPkgVersion = String(minPkgVersion).trim();
-            pkgsToBind = allPkgs.filter((pkg)=>(0, _satisfies.default)(pkg.name, `>=${minPkgVersion}`));
+            pkgsToBind = allPkgs.filter((pkg)=>(0, _compareversions.satisfies)(pkg.name, `>=${minPkgVersion}`));
             if (pkgsToBind.length === 0) {
                 throw new Error((0, _i18n.t)('nativeVersionNotFoundGte', {
                     version: minPkgVersion
@@ -210,7 +205,7 @@ const commands = {
             }
         } else if (maxPkgVersion) {
             maxPkgVersion = String(maxPkgVersion).trim();
-            pkgsToBind = allPkgs.filter((pkg)=>(0, _satisfies.default)(pkg.name, `<=${maxPkgVersion}`));
+            pkgsToBind = allPkgs.filter((pkg)=>(0, _compareversions.satisfies)(pkg.name, `<=${maxPkgVersion}`));
             if (pkgsToBind.length === 0) {
                 throw new Error((0, _i18n.t)('nativeVersionNotFoundLte', {
                     version: maxPkgVersion
@@ -230,7 +225,7 @@ const commands = {
             }
         } else if (semverRange) {
             semverRange = semverRange.trim();
-            pkgsToBind = allPkgs.filter((pkg)=>(0, _satisfies.default)(pkg.name, semverRange));
+            pkgsToBind = allPkgs.filter((pkg)=>(0, _compareversions.satisfies)(pkg.name, semverRange));
             if (pkgsToBind.length === 0) {
                 throw new Error((0, _i18n.t)('nativeVersionNotFoundMatch', {
                     version: semverRange

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.45.0",
+  "version": "1.45.2",
   "description": "command line tool for react-native-update (remote updates for react native)",
   "main": "index.js",
   "bin": {
@@ -42,6 +42,7 @@
     "chalk": "4",
     "cli-arguments": "^0.2.1",
     "commander": "^13",
+    "compare-versions": "^6.1.1",
     "filesize-parser": "^1.5.1",
     "form-data": "^4.0.2",
     "fs-extra": "8",

package/src/bundle.ts

@@ -8,9 +8,9 @@ import {
   type ZipFile as YauzlZipFile,
 } from 'yauzl';
 import { question, checkPlugins } from './utils';
-import { checkPlatform, getPlatform } from './app';
+import { getPlatform } from './app';
 import { spawn, spawnSync } from 'child_process';
-import semverSatisfies from 'semver/functions/satisfies';
+import { satisfies } from 'compare-versions';
 const g2js = require('gradle-to-js/lib/parser');
 import os from 'os';
 const properties = require('properties');
@@ -101,7 +101,7 @@ async function runReactNativeBundleCommand({
           .toString(),
       ).version;
       // expo cli 0.10.17 (expo 49) 开始支持 bundle:embed
-      if (semverSatisfies(expoCliVersion, '>= 0.10.17')) {
+      if (satisfies(expoCliVersion, '>= 0.10.17')) {
         usingExpo = true;
       } else {
         cliPath = undefined;

package/src/utils/index.ts

@@ -3,7 +3,7 @@ import os from 'os';
 import path from 'path';
 import pkg from '../../package.json';
 import AppInfoParser from './app-info-parser';
-import semverSatisfies from 'semver/functions/satisfies';
+import { satisfies } from 'compare-versions';
 import chalk from 'chalk';
 import latestVersion from '../utils/latest-version';
 import { checkPlugins } from './check-plugin';
@@ -189,24 +189,24 @@ export async function printVersionCommand() {
       : '';
     console.log(`react-native-update: ${rnuVersion}${latestRnuVersion}`);
     if (IS_CRESC) {
-      if (semverSatisfies(rnuVersion, '<10.27.0')) {
+      if (satisfies(rnuVersion, '<10.27.0')) {
         console.error(
           'Unsupported version, please update to the latest version: npm i react-native-update@latest',
         );
         process.exit(1);
       }
     } else {
-      if (semverSatisfies(rnuVersion, '<8.5.2')) {
+      if (satisfies(rnuVersion, '<8.5.2')) {
         console.warn(
           `当前版本已不再支持，请至少升级到 v8 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@8 .
           如有使用安装 apk 的功能，请注意添加所需权限 https://pushy.reactnative.cn/docs/api#async-function-downloadandinstallapkurl`,
         );
-      } else if (semverSatisfies(rnuVersion, '9.0.0 - 9.2.1')) {
+      } else if (satisfies(rnuVersion, '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 (semverSatisfies(rnuVersion, '10.0.0 - 10.17.0')) {
+      } else if (satisfies(rnuVersion, '10.0.0 - 10.17.0')) {
         console.warn(
           '当前版本已不再支持，请升级到 v10 的最新小版本（代码无需改动，可直接热更）: npm i react-native-update@10',
         );

package/src/versions.ts

@@ -7,7 +7,7 @@ import { choosePackage } from './package';
 import { depVersions } from './utils/dep-versions';
 import { getCommitInfo } from './utils/git';
 import type { Package, Platform, Version } from 'types';
-import semverSatisfies from 'semver/functions/satisfies';
+import { satisfies } from 'compare-versions';
 
 interface CommandOptions {
   name?: string;
@@ -170,7 +170,8 @@ export const commands = {
     const { id } = await post(`/app/${appId}/version/create`, {
       name: versionName,
       hash,
-      description: description || (await question(t('versionDescriptionQuestion'))),
+      description:
+        description || (await question(t('versionDescriptionQuestion'))),
       metaInfo: metaInfo || (await question(t('versionMetaInfoQuestion'))),
       deps: depVersions,
       commit: await getCommitInfo(),
@@ -233,7 +234,7 @@ export const commands = {
     if (minPkgVersion) {
       minPkgVersion = String(minPkgVersion).trim();
       pkgsToBind = allPkgs.filter((pkg: Package) =>
-        semverSatisfies(pkg.name, `>=${minPkgVersion}`),
+        satisfies(pkg.name, `>=${minPkgVersion}`),
       );
       if (pkgsToBind.length === 0) {
         throw new Error(
@@ -243,7 +244,7 @@ export const commands = {
     } else if (maxPkgVersion) {
       maxPkgVersion = String(maxPkgVersion).trim();
       pkgsToBind = allPkgs.filter((pkg: Package) =>
-        semverSatisfies(pkg.name, `<=${maxPkgVersion}`),
+        satisfies(pkg.name, `<=${maxPkgVersion}`),
       );
       if (pkgsToBind.length === 0) {
         throw new Error(
@@ -263,7 +264,7 @@ export const commands = {
     } else if (semverRange) {
       semverRange = semverRange.trim();
       pkgsToBind = allPkgs.filter((pkg: Package) =>
-        semverSatisfies(pkg.name, semverRange!),
+        satisfies(pkg.name, semverRange!),
       );
       if (pkgsToBind.length === 0) {
         throw new Error(