react-native-update-cli 1.27.0 → 1.29.0

package/lib/bundle.js

@@ -68,6 +68,7 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
   let cliPath = require.resolve('react-native/local-cli/cli.js', {
     paths: [process.cwd()]
   });
+  let usingExpo = false;
   try {
     require.resolve('expo-router', {
       paths: [process.cwd()]
@@ -78,8 +79,9 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
     cliPath = require.resolve('@expo/cli', {
       paths: [process.cwd()]
     });
+    usingExpo = true;
   } catch (e) {}
-  const bundleCommand = cliPath.includes('@expo/cli') ? 'export:embed' : 'bundle';
+  const bundleCommand = usingExpo ? '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/lib/index.js

@@ -33,8 +33,8 @@ const commands = _extends({}, require('./user').commands, require('./bundle').co
 });
 
 function run() {
+  (0, _index.printVersionCommand)();
   if (process.argv.indexOf('-v') >= 0 || process.argv[2] === 'version') {
-    (0, _index.printVersionCommand)();
     process.exit();
   }
 

package/lib/utils/index.js

@@ -35,6 +35,10 @@ var _appInfoParser = require('./app-info-parser');
 
 var _appInfoParser2 = _interopRequireDefault(_appInfoParser);
 
+var _lt = require('semver/functions/lt');
+
+var _lt2 = _interopRequireDefault(_lt);
+
 var _read = require('read');
 
 var _read2 = _interopRequireDefault(_read);
@@ -102,7 +106,7 @@ async function getApkInfo(fn) {
     }
   }
   if (buildTime == 0) {
-    throw new Error('无法获取此包的编译时间戳。请更新react-native-update到最新版本后重新打包上传。');
+    throw new Error('无法获取此包的编译时间戳。请更新 react-native-update 到最新版本后重新打包上传。');
   }
   return _extends({ versionName, buildTime }, appCredential);
 }
@@ -125,7 +129,7 @@ async function getIpaInfo(fn) {
     buildTimeTxtBuffer = await appInfoParser.parser.getEntry(/payload\/.+?\.app\/frameworks\/react_native_update.framework\/pushy_build_time.txt/);
   }
   if (!buildTimeTxtBuffer) {
-    throw new Error('无法获取此包的编译时间戳。请更新react-native-update到最新版本后重新打包上传。');
+    throw new Error('无法获取此包的编译时间戳。请更新 react-native-update 到最新版本后重新打包上传。');
   }
   const buildTime = buildTimeTxtBuffer.toString().replace('\n', '');
   return _extends({ versionName, buildTime }, appCredential);
@@ -142,14 +146,24 @@ function saveToLocal(originPath, destName) {
 
 function printVersionCommand() {
   console.log('react-native-update-cli: ' + _package2.default.version);
+  let pushyVersion = '';
   try {
     const PACKAGE_JSON_PATH = require.resolve('react-native-update/package.json', {
       paths: [process.cwd()]
     });
-    console.log('react-native-update: ' + require(PACKAGE_JSON_PATH).version);
+    pushyVersion = require(PACKAGE_JSON_PATH).version;
+    console.log('react-native-update: ' + pushyVersion);
   } catch (e) {
     console.log('react-native-update: 无法获取版本号，请在项目目录中运行命令');
   }
+  if (pushyVersion) {
+    if ((0, _lt2.default)(pushyVersion, '8.5.1')) {
+      console.warn('当前版本已不再支持，请至少升级到 v8 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@8');
+    }
+    if ((0, _lt2.default)(pushyVersion, '9.2.1')) {
+      console.warn('当前版本已不再支持，请至少升级到 v9 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@9');
+    }
+  }
 }
 
 const pricingPageUrl = exports.pricingPageUrl = 'https://pushy.reactnative.cn/pricing.html';

package/package.json

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

package/src/bundle.js

@@ -54,6 +54,7 @@ async function runReactNativeBundleCommand(
   let cliPath = require.resolve('react-native/local-cli/cli.js', {
     paths: [process.cwd()],
   });
+  let usingExpo = false;
   try {
     require.resolve('expo-router', {
       paths: [process.cwd()],
@@ -64,10 +65,9 @@ async function runReactNativeBundleCommand(
     cliPath = require.resolve('@expo/cli', {
       paths: [process.cwd()],
     });
+    usingExpo = true;
   } catch (e) {}
-  const bundleCommand = cliPath.includes('@expo/cli')
-    ? 'export:embed'
-    : 'bundle';
+  const bundleCommand = usingExpo ? 'export:embed' : 'bundle';
 
   Array.prototype.push.apply(reactNativeBundleArgs, [
     cliPath,
@@ -204,7 +204,7 @@ async function compileHermesByteCode(
   }
 
   const hermesCommand = `${hermesPath}/hermesc`;
-  
+
   const args = [
     '-emit-binary',
     '-out',

package/src/index.js

@@ -28,8 +28,8 @@ const commands = {
 };
 
 function run() {
+  printVersionCommand();
   if (process.argv.indexOf('-v') >= 0 || process.argv[2] === 'version') {
-    printVersionCommand();
     process.exit();
   }
 

package/src/utils/index.js

@@ -3,6 +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 read from 'read';
 
@@ -83,7 +84,7 @@ export async function getApkInfo(fn) {
   }
   if (buildTime == 0) {
     throw new Error(
-      '无法获取此包的编译时间戳。请更新react-native-update到最新版本后重新打包上传。',
+      '无法获取此包的编译时间戳。请更新 react-native-update 到最新版本后重新打包上传。',
     );
   }
   return { versionName, buildTime, ...appCredential };
@@ -119,7 +120,7 @@ export async function getIpaInfo(fn) {
   }
   if (!buildTimeTxtBuffer) {
     throw new Error(
-      '无法获取此包的编译时间戳。请更新react-native-update到最新版本后重新打包上传。',
+      '无法获取此包的编译时间戳。请更新 react-native-update 到最新版本后重新打包上传。',
     );
   }
   const buildTime = buildTimeTxtBuffer.toString().replace('\n', '');
@@ -137,6 +138,7 @@ export function saveToLocal(originPath, destName) {
 
 export function printVersionCommand() {
   console.log('react-native-update-cli: ' + pkg.version);
+  let pushyVersion = '';
   try {
     const PACKAGE_JSON_PATH = require.resolve(
       'react-native-update/package.json',
@@ -144,10 +146,23 @@ export function printVersionCommand() {
         paths: [process.cwd()],
       },
     );
-    console.log('react-native-update: ' + require(PACKAGE_JSON_PATH).version);
+    pushyVersion = require(PACKAGE_JSON_PATH).version;
+    console.log('react-native-update: ' + pushyVersion);
   } catch (e) {
     console.log('react-native-update: 无法获取版本号，请在项目目录中运行命令');
   }
+  if (pushyVersion) {
+    if (semverLt(pushyVersion, '8.5.1')) {
+      console.warn(
+        '当前版本已不再支持，请至少升级到 v8 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@8',
+      );
+    }
+    if (semverLt(pushyVersion, '9.2.1')) {
+      console.warn(
+        '当前版本已不再支持，请至少升级到 v9 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@9',
+      );
+    }
+  }
 }
 
 export const pricingPageUrl = 'https://pushy.reactnative.cn/pricing.html';