react-native-update-cli 1.26.0 → 1.27.0

package/cli.json

@@ -34,20 +34,8 @@
       }
     },
 
-    "uploadIpa": {
-      "options": {
-        "note": {
-          "hasValue": true
-        }
-      }
-    },
-    "uploadApk": {
-      "options": {
-        "note": {
-          "hasValue": true
-        }
-      }
-    },
+    "uploadIpa": {},
+    "uploadApk": {},
     "parseIpa": {},
     "parseApk": {},
     "packages": {
@@ -96,6 +84,12 @@
 
         "packageVersion": {
           "hasValue": true
+        },
+        "minPackageVersion": {
+          "hasValue": true
+        },
+        "maxPackageVersion": {
+          "hasValue": true
         }
       }
     },

package/lib/api.js

@@ -46,7 +46,7 @@ var _utils = require('./utils');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const defaultEndpoint = 'https://update.react-native.cn/api';
+const defaultEndpoint = 'https://update.reactnative.cn/api';
 let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 
 

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,16 +68,18 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
   let cliPath = require.resolve('react-native/local-cli/cli.js', {
     paths: [process.cwd()]
   });
-  let isExpo = false;
   try {
-    // use expo-cli if exists
+    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()]
     });
-    isExpo = true;
-    console.log(`expo detected, will use @expo/cli to bundle.\n`);
   } catch (e) {}
-  const bundleCommand = isExpo ? 'export:embed' : 'bundle';
+  const bundleCommand = cliPath.includes('@expo/cli') ? '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']);
 
@@ -175,9 +177,9 @@ async function compileHermesByteCode(bundleName, outputFolder, sourcemapOutput)
   const hermesCommand = `${hermesPath}/hermesc`;
 
   const args = ['-emit-binary', '-out', _path2.default.join(outputFolder, bundleName), _path2.default.join(outputFolder, bundleName), '-O'];
-  // if (sourcemapOutput) {
-  //   args.push('-output-source-map');
-  // }
+  if (sourcemapOutput) {
+    args.push('-output-source-map');
+  }
   console.log('Running hermesc: ' + hermesCommand + ' ' + args.join(' ') + '\n');
   (0, _child_process.spawnSync)(hermesCommand, args, {
     stdio: 'ignore'

package/lib/package.js

@@ -61,12 +61,11 @@ async function choosePackage(appId) {
 }
 
 const commands = exports.commands = {
-  uploadIpa: async function ({ args, options }) {
+  uploadIpa: async function ({ args }) {
     const fn = args[0];
     if (!fn || !fn.endsWith('.ipa')) {
       throw new Error('使用方法: pushy uploadIpa ipa后缀文件');
     }
-    const { note = '' } = options;
     const {
       versionName,
       buildTime,
@@ -88,18 +87,16 @@ const commands = exports.commands = {
     const { id } = await (0, _api.post)(`/app/${appId}/package/create`, {
       name: versionName,
       hash,
-      buildTime,
-      note
+      buildTime
     });
     (0, _utils.saveToLocal)(fn, `${appId}/package/${id}.ipa`);
     console.log(`已成功上传ipa原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`);
   },
-  uploadApk: async function ({ args, options }) {
+  uploadApk: async function ({ args }) {
     const fn = args[0];
     if (!fn || !fn.endsWith('.apk')) {
       throw new Error('使用方法: pushy uploadApk apk后缀文件');
     }
-    const { note = '' } = options;
     const {
       versionName,
       buildTime,
@@ -121,8 +118,7 @@ const commands = exports.commands = {
     const { id } = await (0, _api.post)(`/app/${appId}/package/create`, {
       name: versionName,
       hash,
-      buildTime,
-      note
+      buildTime
     });
     (0, _utils.saveToLocal)(fn, `${appId}/package/${id}.apk`);
     console.log(`已成功上传apk原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`);

package/lib/versions.js

@@ -13,6 +13,8 @@ var _app = require('./app');
 
 var _package = require('./package');
 
+var _compareVersions = require('compare-versions');
+
 async function showVersion(appId, offset) {
   const { data, count } = await (0, _api.get)(`/app/${appId}/version/list`);
   console.log(`Offset ${offset}`);
@@ -120,6 +122,8 @@ const commands = exports.commands = {
 
     let pkgId;
     let pkgVersion = options.packageVersion;
+    let minPkgVersion = options.minPackageVersion;
+    let maxPkgVersion = options.maxPackageVersion;
     if (pkgVersion) {
       pkgVersion = pkgVersion.trim();
       const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
@@ -130,6 +134,38 @@ const commands = exports.commands = {
         throw new Error(`未查询到匹配原生版本：${pkgVersion}`);
       }
     }
+    if (minPkgVersion) {
+      minPkgVersion = String(minPkgVersion).trim();
+      const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
+      const pkgs = data.filter(d => (0, _compareVersions.compare)(d.name, minPkgVersion, '>='));
+      if (pkgs.length === 0) {
+        throw new Error(`未查询到 >= ${minPkgVersion} 的原生版本`);
+      }
+      for (const pkg of pkgs) {
+        await (0, _api.put)(`/app/${appId}/package/${pkg.id}`, {
+          versionId
+        });
+        console.log(`已将版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
+      }
+      console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
+      return;
+    }
+    if (maxPkgVersion) {
+      maxPkgVersion = String(maxPkgVersion).trim();
+      const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
+      const pkgs = data.filter(d => (0, _compareVersions.compare)(d.name, maxPkgVersion, '<='));
+      if (pkgs.length === 0) {
+        throw new Error(`未查询到 <= ${maxPkgVersion} 的原生版本`);
+      }
+      for (const pkg of pkgs) {
+        await (0, _api.put)(`/app/${appId}/package/${pkg.id}`, {
+          versionId
+        });
+        console.log(`已将版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
+      }
+      console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
+      return;
+    }
     if (!pkgId) {
       pkgId = options.packageId || (await (0, _package.choosePackage)(appId)).id;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.26.0",
+  "version": "1.27.0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
@@ -12,7 +12,7 @@
     "cli.json"
   ],
   "scripts": {
-    "prepublish": "babel src --out-dir lib"
+    "prepublish": "babel src --out-dir lib && chmod +x lib/index.js"
   },
   "repository": {
     "type": "git",
@@ -36,6 +36,7 @@
     "cgbi-to-png": "^1.0.7",
     "cli-arguments": "^0.2.1",
     "commander": "^7.2.0",
+    "compare-versions": "^6.1.1",
     "filesize-parser": "^1.5.0",
     "fs-extra": "8",
     "gradle-to-js": "^2.0.1",

package/src/api.js

@@ -1,5 +1,5 @@
 import fetch from 'node-fetch';
-const defaultEndpoint = 'https://update.react-native.cn/api';
+const defaultEndpoint = 'https://update.reactnative.cn/api';
 let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 import fs from 'fs';
 import request from 'request';

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,16 +54,20 @@ async function runReactNativeBundleCommand(
   let cliPath = require.resolve('react-native/local-cli/cli.js', {
     paths: [process.cwd()],
   });
-  let isExpo = false;
   try {
-    // use expo-cli if exists
+    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()],
     });
-    isExpo = true;
-    console.log(`expo detected, will use @expo/cli to bundle.\n`);
   } catch (e) {}
-  const bundleCommand = isExpo ? 'export:embed' : 'bundle';
+  const bundleCommand = cliPath.includes('@expo/cli')
+    ? 'export:embed'
+    : 'bundle';
 
   Array.prototype.push.apply(reactNativeBundleArgs, [
     cliPath,
@@ -200,7 +204,7 @@ async function compileHermesByteCode(
   }
 
   const hermesCommand = `${hermesPath}/hermesc`;
-
+  
   const args = [
     '-emit-binary',
     '-out',
@@ -208,9 +212,9 @@ async function compileHermesByteCode(
     path.join(outputFolder, bundleName),
     '-O',
   ];
-  // if (sourcemapOutput) {
-  //   args.push('-output-source-map');
-  // }
+  if (sourcemapOutput) {
+    args.push('-output-source-map');
+  }
   console.log(
     'Running hermesc: ' + hermesCommand + ' ' + args.join(' ') + '\n',
   );

package/src/package.js

@@ -48,12 +48,11 @@ export async function choosePackage(appId) {
 }
 
 export const commands = {
-  uploadIpa: async function ({ args, options }) {
+  uploadIpa: async function ({ args }) {
     const fn = args[0];
     if (!fn || !fn.endsWith('.ipa')) {
       throw new Error('使用方法: pushy uploadIpa ipa后缀文件');
     }
-    const { note = '' } = options;
     const {
       versionName,
       buildTime,
@@ -80,19 +79,17 @@ export const commands = {
       name: versionName,
       hash,
       buildTime,
-      note,
     });
     saveToLocal(fn, `${appId}/package/${id}.ipa`);
     console.log(
       `已成功上传ipa原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`,
     );
   },
-  uploadApk: async function ({ args, options }) {
+  uploadApk: async function ({ args }) {
     const fn = args[0];
     if (!fn || !fn.endsWith('.apk')) {
       throw new Error('使用方法: pushy uploadApk apk后缀文件');
     }
-    const { note = '' } = options;
     const {
       versionName,
       buildTime,
@@ -119,7 +116,6 @@ export const commands = {
       name: versionName,
       hash,
       buildTime,
-      note,
     });
     saveToLocal(fn, `${appId}/package/${id}.apk`);
     console.log(

package/src/versions.js

@@ -3,6 +3,7 @@ import { question, saveToLocal } from './utils';
 
 import { checkPlatform, getSelectedApp } from './app';
 import { choosePackage } from './package';
+import { compare } from 'compare-versions';
 
 async function showVersion(appId, offset) {
   const { data, count } = await get(`/app/${appId}/version/list`);
@@ -127,6 +128,8 @@ export const commands = {
 
     let pkgId;
     let pkgVersion = options.packageVersion;
+    let minPkgVersion = options.minPackageVersion;
+    let maxPkgVersion = options.maxPackageVersion;
     if (pkgVersion) {
       pkgVersion = pkgVersion.trim();
       const { data } = await get(`/app/${appId}/package/list?limit=1000`);
@@ -137,6 +140,42 @@ export const commands = {
         throw new Error(`未查询到匹配原生版本：${pkgVersion}`);
       }
     }
+    if (minPkgVersion) {
+      minPkgVersion = String(minPkgVersion).trim();
+      const { data } = await get(`/app/${appId}/package/list?limit=1000`);
+      const pkgs = data.filter((d) => compare(d.name, minPkgVersion, '>='));
+      if (pkgs.length === 0) {
+        throw new Error(
+          `未查询到 >= ${minPkgVersion} 的原生版本`,
+        );
+      }
+      for (const pkg of pkgs) {
+        await put(`/app/${appId}/package/${pkg.id}`, {
+          versionId,
+        });
+        console.log(`已将版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
+      }
+      console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
+      return;
+    }
+    if (maxPkgVersion) {
+      maxPkgVersion = String(maxPkgVersion).trim();
+      const { data } = await get(`/app/${appId}/package/list?limit=1000`);
+      const pkgs = data.filter((d) => compare(d.name, maxPkgVersion, '<='));
+      if (pkgs.length === 0) {
+        throw new Error(
+          `未查询到 <= ${maxPkgVersion} 的原生版本`,
+        );
+      }
+      for (const pkg of pkgs) {
+        await put(`/app/${appId}/package/${pkg.id}`, {
+          versionId,
+        });
+        console.log(`已将版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
+      }
+      console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
+      return;
+    }
     if (!pkgId) {
       pkgId = options.packageId || (await choosePackage(appId)).id;
     }