react-native-update-cli 1.18.0 → 1.20.0

package/lib/api.js

@@ -1,5 +1,19 @@
 'use strict';
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.doDelete = exports.put = exports.post = exports.get = exports.closeSession = exports.saveSession = exports.loadSession = exports.replaceSession = exports.getSession = undefined;
+exports.uploadFile = uploadFile;
+
+var _nodeFetch = require('node-fetch');
+
+var _nodeFetch2 = _interopRequireDefault(_nodeFetch);
+
+var _fs = require('fs');
+
+var _fs2 = _interopRequireDefault(_fs);
+
 var _request = require('request');
 
 var _request2 = _interopRequireDefault(_request);
@@ -8,6 +22,22 @@ var _progress = require('progress');
 
 var _progress2 = _interopRequireDefault(_progress);
 
+var _package = require('../package.json');
+
+var _package2 = _interopRequireDefault(_package);
+
+var _tcpPing = require('tcp-ping');
+
+var _tcpPing2 = _interopRequireDefault(_tcpPing);
+
+var _util = require('util');
+
+var _util2 = _interopRequireDefault(_util);
+
+var _path = require('path');
+
+var _path2 = _interopRequireDefault(_path);
+
 var _filesizeParser = require('filesize-parser');
 
 var _filesizeParser2 = _interopRequireDefault(_filesizeParser);
@@ -16,28 +46,29 @@ var _utils = require('./utils');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const fetch = require('node-fetch');
 const defaultEndpoint = 'https://update.reactnative.cn/api';
 let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
-const fs = require('fs');
-
-const packageJson = require('../package.json');
-const tcpp = require('tcp-ping');
-const util = require('util');
-const path = require('path');
 
 
-const tcpPing = util.promisify(tcpp.ping);
+const tcpPing = _util2.default.promisify(_tcpPing2.default.ping);
 
 let session = undefined;
 let savedSession = undefined;
 
-const userAgent = `react-native-update-cli/${packageJson.version}`;
+const userAgent = `react-native-update-cli/${_package2.default.version}`;
 
-exports.loadSession = async function () {
-  if (fs.existsSync('.update')) {
+const getSession = exports.getSession = function () {
+  return session;
+};
+
+const replaceSession = exports.replaceSession = function (newSession) {
+  session = newSession;
+};
+
+const loadSession = exports.loadSession = async function () {
+  if (_fs2.default.existsSync('.update')) {
     try {
-      exports.replaceSession(JSON.parse(fs.readFileSync('.update', 'utf8')));
+      replaceSession(JSON.parse(_fs2.default.readFileSync('.update', 'utf8')));
       savedSession = session;
     } catch (e) {
       console.error('Failed to parse file `.update`. Try to remove it manually.');
@@ -46,27 +77,19 @@ exports.loadSession = async function () {
   }
 };
 
-exports.getSession = function () {
-  return session;
-};
-
-exports.replaceSession = function (newSession) {
-  session = newSession;
-};
-
-exports.saveSession = function () {
+const saveSession = exports.saveSession = function () {
   // Only save on change.
   if (session !== savedSession) {
     const current = session;
     const data = JSON.stringify(current, null, 4);
-    fs.writeFileSync('.update', data, 'utf8');
+    _fs2.default.writeFileSync('.update', data, 'utf8');
     savedSession = current;
   }
 };
 
-exports.closeSession = function () {
-  if (fs.existsSync('.update')) {
-    fs.unlinkSync('.update');
+const closeSession = exports.closeSession = function () {
+  if (_fs2.default.existsSync('.update')) {
+    _fs2.default.unlinkSync('.update');
     savedSession = undefined;
   }
   session = undefined;
@@ -74,7 +97,7 @@ exports.closeSession = function () {
 };
 
 async function query(url, options) {
-  const resp = await fetch(url, options);
+  const resp = await (0, _nodeFetch2.default)(url, options);
   const text = await resp.text();
   let json;
   try {
@@ -117,14 +140,14 @@ function queryWithBody(method) {
   };
 }
 
-exports.get = queryWithoutBody('GET');
-exports.post = queryWithBody('POST');
-exports.put = queryWithBody('PUT');
-exports.doDelete = queryWithBody('DELETE');
+const get = exports.get = queryWithoutBody('GET');
+const post = exports.post = queryWithBody('POST');
+const put = exports.put = queryWithBody('PUT');
+const doDelete = exports.doDelete = queryWithBody('DELETE');
 
 async function uploadFile(fn, key) {
-  const { url, backupUrl, formData, maxSize } = await exports.post('/upload', {
-    ext: path.extname(fn)
+  const { url, backupUrl, formData, maxSize } = await post('/upload', {
+    ext: _path2.default.extname(fn)
   });
   let realUrl = url;
 
@@ -145,7 +168,7 @@ async function uploadFile(fn, key) {
     // console.log({realUrl});
   }
 
-  const fileSize = fs.statSync(fn).size;
+  const fileSize = _fs2.default.statSync(fn).size;
   if (maxSize && fileSize > (0, _filesizeParser2.default)(maxSize)) {
     throw new Error(`此文件大小${(fileSize / 1048576).toFixed(1)}m, 超出当前额度${maxSize}。您可以考虑升级付费业务以提升此额度。详情请访问: ${_utils.pricingPageUrl}`);
   }
@@ -160,7 +183,7 @@ async function uploadFile(fn, key) {
     if (key) {
       formData.key = key;
     }
-    formData.file = fs.createReadStream(fn);
+    formData.file = _fs2.default.createReadStream(fn);
 
     formData.file.on('data', function (data) {
       bar.tick(data.length);
@@ -178,6 +201,4 @@ async function uploadFile(fn, key) {
     });
   });
   return info;
-}
-
-exports.uploadFile = uploadFile;
+}

package/lib/app.js

@@ -15,11 +15,13 @@ var _fs = require('fs');
 
 var _fs2 = _interopRequireDefault(_fs);
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _ttyTable = require('tty-table');
+
+var _ttyTable2 = _interopRequireDefault(_ttyTable);
 
-const Table = require('tty-table');
+var _api = require('./api');
 
-const { post, get, doDelete } = require('./api');
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const validPlatforms = {
   ios: 1,
@@ -47,7 +49,7 @@ function getSelectedApp(platform) {
 }
 
 async function listApp(platform) {
-  const { data } = await get('/app/list');
+  const { data } = await (0, _api.get)('/app/list');
   const list = platform ? data.filter(v => v.platform === platform) : data;
 
   const header = [{ value: '应用 id' }, { value: '应用名称' }, { value: '平台' }];
@@ -56,7 +58,7 @@ async function listApp(platform) {
     rows.push([app.id, app.name, app.platform]);
   }
 
-  console.log(Table(header, rows).render());
+  console.log((0, _ttyTable2.default)(header, rows).render());
 
   if (platform) {
     console.log(`\共 ${list.length} ${platform} 个应用`);
@@ -83,7 +85,7 @@ const commands = exports.commands = {
     const name = options.name || (await (0, _utils.question)('应用名称:'));
     const { downloadUrl } = options;
     const platform = checkPlatform(options.platform || (await (0, _utils.question)('平台(ios/android):')));
-    const { id } = await post('/app/create', { name, platform });
+    const { id } = await (0, _api.post)('/app/create', { name, platform });
     console.log(`已成功创建应用（id: ${id}）`);
     await this.selectApp({
       args: [id],
@@ -96,7 +98,7 @@ const commands = exports.commands = {
     if (!id) {
       console.log('已取消');
     }
-    await doDelete(`/app/${id}`);
+    await (0, _api.doDelete)(`/app/${id}`);
     console.log('操作成功');
   },
   apps: async function ({ options }) {
@@ -116,7 +118,7 @@ const commands = exports.commands = {
         throw e;
       }
     }
-    const { appKey } = await get(`/app/${id}`);
+    const { appKey } = await (0, _api.get)(`/app/${id}`);
     updateInfo[platform] = {
       appId: id,
       appKey

package/lib/bundle.js

@@ -7,6 +7,10 @@ exports.commands = undefined;
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
+var _path = require('path');
+
+var _path2 = _interopRequireDefault(_path);
+
 var _utils = require('./utils');
 
 var _fsExtra = require('fs-extra');
@@ -19,16 +23,21 @@ var _yauzl = require('yauzl');
 
 var _app = require('./app');
 
+var _child_process = require('child_process');
+
+var _os = require('os');
+
+var _os2 = _interopRequireDefault(_os);
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
-const path = require('path');
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const { spawn, spawnSync } = require('child_process');
 const g2js = require('gradle-to-js/lib/parser');
-const os = require('os');
+
 const properties = require('properties');
 
-var bsdiff, hdiff, diff;
+let bsdiff, hdiff, diff;
 try {
   bsdiff = require('node-bsdiff').diff;
 } catch (e) {}
@@ -41,9 +50,9 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
   let gradleConfig = {};
   if (platform === 'android') {
     gradleConfig = await checkGradleConfig();
-    // if (gradleConfig.crunchPngs !== false) {
-    //   throw new Error('请先禁用android的crunchPngs优化，具体请参考 https://pushy.reactnative.cn/docs/getting-started.html#%E7%A6%81%E7%94%A8android%E7%9A%84crunch%E4%BC%98%E5%8C%96')
-    // }
+    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');
+    }
   }
 
   let reactNativeBundleArgs = [];
@@ -60,13 +69,19 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
     paths: [process.cwd()]
   });
   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()]
     });
   } catch (e) {}
   const bundleCommand = cliPath.includes('@expo/cli') ? 'export:embed' : 'bundle';
 
-  Array.prototype.push.apply(reactNativeBundleArgs, [cliPath, bundleCommand, '--assets-dest', outputFolder, '--bundle-output', path.join(outputFolder, bundleName), '--dev', development, '--entry-file', entryFile, '--platform', platform, '--reset-cache']);
+  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']);
 
   if (sourcemapOutput) {
     reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
@@ -76,7 +91,7 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
     reactNativeBundleArgs.push('--config', config);
   }
 
-  const reactNativeBundleProcess = spawn('node', reactNativeBundleArgs);
+  const reactNativeBundleProcess = (0, _child_process.spawn)('node', reactNativeBundleArgs);
   console.log(`Running bundle command: node ${reactNativeBundleArgs.join(' ')}`);
 
   return new Promise((resolve, reject) => {
@@ -121,9 +136,9 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
 }
 
 function getHermesOSBin() {
-  if (os.platform() === 'win32') return 'win64-bin';
-  if (os.platform() === 'darwin') return 'osx-bin';
-  if (os.platform() === 'linux') return 'linux64-bin';
+  if (_os2.default.platform() === 'win32') return 'win64-bin';
+  if (_os2.default.platform() === 'darwin') return 'osx-bin';
+  if (_os2.default.platform() === 'linux') return 'linux64-bin';
 }
 
 async function checkGradleConfig() {
@@ -149,35 +164,33 @@ async function checkGradleConfig() {
 async function compileHermesByteCode(bundleName, outputFolder, sourcemapOutput) {
   console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
   // >= rn 0.69
-  const rnDir = path.dirname(require.resolve('react-native', {
+  const rnDir = _path2.default.dirname(require.resolve('react-native', {
     paths: [process.cwd()]
   }));
-  const hermesCommand = path.join(rnDir, `/sdks/hermesc/${getHermesOSBin()}/hermesc`);
+  let hermesPath = _path2.default.join(rnDir, `/sdks/hermesc/${getHermesOSBin()}`);
 
   // < rn 0.69
-  if (!fs.existsSync(hermesCommand)) {
-    const hermesPackage = fs.existsSync('node_modules/hermes-engine') ? 'node_modules/hermes-engine' // 0.2+
-    : 'node_modules/hermesvm'; // < 0.2
-    const hermesPath = `${hermesPackage}/${getHermesOSBin()}`;
-
-    hermesCommand = fs.existsSync(`${hermesPath}/hermesc`) ? `${hermesPath}/hermesc` // 0.5+
-    : `${hermesPath}/hermes`; // < 0.5
+  if (!fs.existsSync(hermesPath)) {
+    hermesPath = `node_modules/hermes-engine/${getHermesOSBin()}`;
   }
-  const args = ['-emit-binary', '-out', path.join(outputFolder, bundleName), path.join(outputFolder, bundleName), '-O'];
+
+  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');
   }
   console.log('Running hermesc: ' + hermesCommand + ' ' + args.join(' ') + '\n');
-  spawnSync(hermesCommand, args, {
+  (0, _child_process.spawnSync)(hermesCommand, args, {
     stdio: 'ignore'
   });
 }
 
 async function pack(dir, output) {
   console.log('Packing');
-  fs.ensureDirSync(path.dirname(output));
+  fs.ensureDirSync(_path2.default.dirname(output));
   await new Promise((resolve, reject) => {
-    var zipfile = new _yazl.ZipFile();
+    const zipfile = new _yazl.ZipFile();
 
     function addDirectory(root, rel) {
       if (rel) {
@@ -188,7 +201,7 @@ async function pack(dir, output) {
         if (name === '.' || name === '..') {
           continue;
         }
-        const fullPath = path.join(root, name);
+        const fullPath = _path2.default.join(root, name);
         const stat = fs.statSync(fullPath);
         if (stat.isFile()) {
           //console.log('adding: ' + rel+name);
@@ -237,7 +250,7 @@ function basename(fn) {
 }
 
 async function diffFromPPK(origin, next, output) {
-  fs.ensureDirSync(path.dirname(output));
+  fs.ensureDirSync(_path2.default.dirname(output));
 
   const originEntries = {};
   const originMap = {};
@@ -263,7 +276,7 @@ async function diffFromPPK(origin, next, output) {
 
   const copies = {};
 
-  var zipfile = new _yazl.ZipFile();
+  const zipfile = new _yazl.ZipFile();
 
   const writePromise = new Promise((resolve, reject) => {
     zipfile.outputStream.on('error', err => {
@@ -343,7 +356,7 @@ async function diffFromPPK(origin, next, output) {
 
   const deletes = {};
 
-  for (var k in originEntries) {
+  for (let k in originEntries) {
     if (!newEntries[k]) {
       console.log('Delete ' + k);
       deletes[k] = 1;
@@ -357,7 +370,7 @@ async function diffFromPPK(origin, next, output) {
 }
 
 async function diffFromPackage(origin, next, output, originBundleName, transformPackagePath = v => v) {
-  fs.ensureDirSync(path.dirname(output));
+  fs.ensureDirSync(_path2.default.dirname(output));
 
   const originEntries = {};
   const originMap = {};
@@ -389,7 +402,7 @@ async function diffFromPackage(origin, next, output, originBundleName, transform
 
   const copies = {};
 
-  var zipfile = new _yazl.ZipFile();
+  const zipfile = new _yazl.ZipFile();
 
   const writePromise = new Promise((resolve, reject) => {
     zipfile.outputStream.on('error', err => {
@@ -504,7 +517,7 @@ const commands = exports.commands = {
       platform
     }));
 
-    const sourcemapOutput = path.join(intermediaDir, bundleName + '.map');
+    const sourcemapOutput = _path2.default.join(intermediaDir, bundleName + '.map');
 
     const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
 
@@ -519,7 +532,7 @@ const commands = exports.commands = {
 
     await runReactNativeBundleCommand(bundleName, dev, entryFile, intermediaDir, platform, sourcemap ? sourcemapOutput : '');
 
-    await pack(path.resolve(intermediaDir), realOutput);
+    await pack(_path2.default.resolve(intermediaDir), realOutput);
 
     const v = await (0, _utils.question)('是否现在上传此热更包?(Y/N)');
     if (v.toLowerCase() === 'y') {

package/lib/index.js

@@ -3,14 +3,21 @@
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
+var _api = require('./api');
+
+var _updateNotifier = require('update-notifier');
+
+var _updateNotifier2 = _interopRequireDefault(_updateNotifier);
+
 var _index = require('./utils/index.js');
 
-const { loadSession } = require('./api');
-const updateNotifier = require('update-notifier');
+var _package = require('../package.json');
+
+var _package2 = _interopRequireDefault(_package);
 
-const pkg = require('../package.json');
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-updateNotifier({ pkg }).notify({ isGlobal: true });
+(0, _updateNotifier2.default)({ pkg: _package2.default }).notify({ isGlobal: true });
 
 function printUsage({ args }) {
   // const commandName = args[0];
@@ -35,7 +42,7 @@ function run() {
   global.NO_INTERACTIVE = argv.options['no-interactive'];
   global.USE_ACC_OSS = argv.options['acc'];
 
-  loadSession().then(() => commands[argv.command](argv)).catch(err => {
+  (0, _api.loadSession)().then(() => commands[argv.command](argv)).catch(err => {
     if (err.status === 401) {
       console.log('尚未登录。\n请在项目目录中运行`pushy login`命令来登录');
       return;

package/lib/package.js

@@ -7,20 +7,20 @@ exports.commands = undefined;
 exports.listPackage = listPackage;
 exports.choosePackage = choosePackage;
 
+var _api = require('./api');
+
 var _utils = require('./utils');
 
 var _app = require('./app');
 
-/**
- * Created by tdzl2003 on 4/2/16.
- */
+var _ttyTable = require('tty-table');
 
-const { get, post, uploadFile } = require('./api');
+var _ttyTable2 = _interopRequireDefault(_ttyTable);
 
-const Table = require('tty-table');
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 async function listPackage(appId) {
-  const { data } = await get(`/app/${appId}/package/list?limit=1000`);
+  const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
 
   const header = [{ value: '原生包 Id' }, { value: '原生版本' }];
   const rows = [];
@@ -43,7 +43,7 @@ async function listPackage(appId) {
     rows.push([pkg.id, output]);
   }
 
-  console.log(Table(header, rows).render());
+  console.log((0, _ttyTable2.default)(header, rows).render());
   console.log(`\n共 ${data.length} 个包`);
   return data;
 }
@@ -82,15 +82,15 @@ const commands = exports.commands = {
       throw new Error(`appKey不匹配！当前ipa: ${appKeyInPkg}, 当前update.json: ${appKey}`);
     }
 
-    const { hash } = await uploadFile(fn);
+    const { hash } = await (0, _api.uploadFile)(fn);
 
-    const { id } = await post(`/app/${appId}/package/create`, {
+    const { id } = await (0, _api.post)(`/app/${appId}/package/create`, {
       name: versionName,
       hash,
       buildTime
     });
     (0, _utils.saveToLocal)(fn, `${appId}/package/${id}.ipa`);
-    console.log(`已成功上传ipa原生包（id: ${id}）`);
+    console.log(`已成功上传ipa原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`);
   },
   uploadApk: async function ({ args }) {
     const fn = args[0];
@@ -113,15 +113,15 @@ const commands = exports.commands = {
       throw new Error(`appKey不匹配！当前apk: ${appKeyInPkg}, 当前update.json: ${appKey}`);
     }
 
-    const { hash } = await uploadFile(fn);
+    const { hash } = await (0, _api.uploadFile)(fn);
 
-    const { id } = await post(`/app/${appId}/package/create`, {
+    const { id } = await (0, _api.post)(`/app/${appId}/package/create`, {
       name: versionName,
       hash,
       buildTime
     });
     (0, _utils.saveToLocal)(fn, `${appId}/package/${id}.apk`);
-    console.log(`已成功上传apk原生包（id: ${id}）`);
+    console.log(`已成功上传apk原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`);
   },
   parseIpa: async function ({ args }) {
     const fn = args[0];

package/lib/user.js

@@ -1,41 +1,42 @@
 'use strict';
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.commands = undefined;
+
 var _utils = require('./utils');
 
-const {
-  post,
-  get,
-  replaceSession,
-  saveSession,
-  closeSession
-} = require('./api'); /**
-                       * Created by tdzl2003 on 2/13/16.
-                       */
+var _api = require('./api');
+
+var _crypto = require('crypto');
+
+var _crypto2 = _interopRequireDefault(_crypto);
 
-const crypto = require('crypto');
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function md5(str) {
-  return crypto.createHash('md5').update(str).digest('hex');
+  return _crypto2.default.createHash('md5').update(str).digest('hex');
 }
 
-exports.commands = {
+const commands = exports.commands = {
   login: async function ({ args }) {
     const email = args[0] || (await (0, _utils.question)('email:'));
     const pwd = args[1] || (await (0, _utils.question)('password:', true));
-    const { token, info } = await post('/user/login', {
+    const { token, info } = await (0, _api.post)('/user/login', {
       email,
       pwd: md5(pwd)
     });
-    replaceSession({ token });
-    await saveSession();
+    (0, _api.replaceSession)({ token });
+    await (0, _api.saveSession)();
     console.log(`欢迎使用 pushy 热更新服务， ${info.name}.`);
   },
   logout: async function () {
-    await closeSession();
+    await (0, _api.closeSession)();
     console.log('已退出登录');
   },
   me: async function () {
-    const me = await get('/user/me');
+    const me = await (0, _api.get)('/user/me');
     for (const k in me) {
       if (k !== 'ok') {
         console.log(`${k}: ${me[k]}`);

package/lib/utils/index.js

@@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.pricingPageUrl = undefined;
 
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; /**
-                                                                                                                                                                                                                                                                   * Created by tdzl2003 on 2/13/16.
-                                                                                                                                                                                                                                                                   */
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 exports.question = question;
 exports.translateOptions = translateOptions;
@@ -29,18 +27,25 @@ var _path = require('path');
 
 var _path2 = _interopRequireDefault(_path);
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _package = require('../../package.json');
+
+var _package2 = _interopRequireDefault(_package);
+
+var _appInfoParser = require('app-info-parser');
 
-const pkg = require('../../package.json');
-const AppInfoParser = require('app-info-parser');
+var _appInfoParser2 = _interopRequireDefault(_appInfoParser);
 
-var read = require('read');
+var _read = require('read');
+
+var _read2 = _interopRequireDefault(_read);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function question(query, password) {
   if (NO_INTERACTIVE) {
     return Promise.resolve('');
   }
-  return new Promise((resolve, reject) => read({
+  return new Promise((resolve, reject) => (0, _read2.default)({
     prompt: query,
     silent: password,
     replace: password ? '*' : undefined
@@ -77,7 +82,7 @@ function getRNVersion() {
 }
 
 async function getApkInfo(fn) {
-  const appInfoParser = new AppInfoParser(fn);
+  const appInfoParser = new _appInfoParser2.default(fn);
   const bundleFile = await appInfoParser.parser.getEntry(/assets\/index.android.bundle/);
   if (!bundleFile) {
     throw new Error('找不到bundle文件。请确保此apk为release版本，且bundle文件名为默认的index.android.bundle');
@@ -103,7 +108,7 @@ async function getApkInfo(fn) {
 }
 
 async function getIpaInfo(fn) {
-  const appInfoParser = new AppInfoParser(fn);
+  const appInfoParser = new _appInfoParser2.default(fn);
   const bundleFile = await appInfoParser.parser.getEntry(/payload\/.+?\.app\/main.jsbundle/);
   if (!bundleFile) {
     throw new Error('找不到bundle文件。请确保此ipa为release版本，且bundle文件名为默认的main.jsbundle');
@@ -136,7 +141,7 @@ function saveToLocal(originPath, destName) {
 }
 
 function printVersionCommand() {
-  console.log('react-native-update-cli: ' + pkg.version);
+  console.log('react-native-update-cli: ' + _package2.default.version);
   try {
     const PACKAGE_JSON_PATH = require.resolve('react-native-update/package.json', {
       paths: [process.cwd()]

package/lib/versions.js

@@ -5,17 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.commands = undefined;
 
+var _api = require('./api');
+
 var _utils = require('./utils');
 
 var _app = require('./app');
 
 var _package = require('./package');
 
-const { get, post, put, uploadFile } = require('./api');
-
-
 async function showVersion(appId, offset) {
-  const { data, count } = await get(`/app/${appId}/version/list`);
+  const { data, count } = await (0, _api.get)(`/app/${appId}/version/list`);
   console.log(`Offset ${offset}`);
   for (const version of data) {
     let packageInfo = version.packages.slice(0, 3).map(v => v.name).join(', ');
@@ -92,9 +91,9 @@ const commands = exports.commands = {
     const platform = (0, _app.checkPlatform)(options.platform || (await (0, _utils.question)('平台(ios/android):')));
     const { appId } = await (0, _app.getSelectedApp)(platform);
 
-    const { hash } = await uploadFile(fn);
+    const { hash } = await (0, _api.uploadFile)(fn);
 
-    const { id } = await post(`/app/${appId}/version/create`, {
+    const { id } = await (0, _api.post)(`/app/${appId}/version/create`, {
       name: name || (await (0, _utils.question)('输入版本名称: ')) || '(未命名)',
       hash,
       description: description || (await (0, _utils.question)('输入版本描述:')),
@@ -123,7 +122,7 @@ const commands = exports.commands = {
     let pkgVersion = options.packageVersion;
     if (pkgVersion) {
       pkgVersion = pkgVersion.trim();
-      const { data } = await get(`/app/${appId}/package/list?limit=1000`);
+      const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
       const pkg = data.find(d => d.name === pkgVersion);
       if (pkg) {
         pkgId = pkg.id;
@@ -138,7 +137,7 @@ const commands = exports.commands = {
     if (!pkgId) {
       throw new Error('请提供 packageId 或 packageVersion 参数');
     }
-    await put(`/app/${appId}/package/${pkgId}`, {
+    await (0, _api.put)(`/app/${appId}/package/${pkgId}`, {
       versionId
     });
     console.log('操作成功');
@@ -152,7 +151,7 @@ const commands = exports.commands = {
     options.name && (updateParams.name = options.name);
     options.description && (updateParams.description = options.description);
     options.metaInfo && (updateParams.metaInfo = options.metaInfo);
-    await put(`/app/${appId}/version/${versionId}`, updateParams);
+    await (0, _api.put)(`/app/${appId}/version/${versionId}`, updateParams);
     console.log('操作成功');
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.18.0",
+  "version": "1.20.0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
@@ -12,7 +12,6 @@
     "cli.json"
   ],
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
     "prepublish": "babel src --out-dir lib"
   },
   "repository": {
@@ -32,7 +31,7 @@
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy/tree/master/react-native-pushy-cli",
   "dependencies": {
-    "app-info-parser": "^1.0.0",
+    "app-info-parser": "^1.1.6",
     "cli-arguments": "^0.2.1",
     "filesize-parser": "^1.5.0",
     "fs-extra": "8",
@@ -43,8 +42,8 @@
     "read": "^1.0.7",
     "request": "^2.88.2",
     "tcp-ping": "^0.1.1",
-    "tty-table": "4.1",
-    "update-notifier": "^4.1.1",
+    "tty-table": "4.2",
+    "update-notifier": "^5.1.0",
     "yauzl": "^2.10.0",
     "yazl": "2.5.1"
   },
@@ -56,6 +55,11 @@
     "babel-plugin-transform-object-rest-spread": "^6.26.0"
   },
   "engines": {
-    "node": ">= 8"
+    "node": ">= 10"
+  },
+  "pnpm": {
+    "patchedDependencies": {
+      "app-info-parser@1.1.6": "patches/app-info-parser@1.1.6.patch"
+    }
   }
 }

package/src/api.js

@@ -1,13 +1,13 @@
-const fetch = require('node-fetch');
+import fetch from 'node-fetch';
 const defaultEndpoint = 'https://update.reactnative.cn/api';
 let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
-const fs = require('fs');
+import fs from 'fs';
 import request from 'request';
 import ProgressBar from 'progress';
-const packageJson = require('../package.json');
-const tcpp = require('tcp-ping');
-const util = require('util');
-const path = require('path');
+import packageJson from '../package.json';
+import tcpp from 'tcp-ping';
+import util from 'util';
+import path from 'path';
 import filesizeParser from 'filesize-parser';
 import { pricingPageUrl } from './utils';
 
@@ -18,10 +18,18 @@ let savedSession = undefined;
 
 const userAgent = `react-native-update-cli/${packageJson.version}`;
 
-exports.loadSession = async function () {
+export const getSession = function () {
+  return session;
+};
+
+export const replaceSession = function (newSession) {
+  session = newSession;
+};
+
+export const loadSession = async function () {
   if (fs.existsSync('.update')) {
     try {
-      exports.replaceSession(JSON.parse(fs.readFileSync('.update', 'utf8')));
+      replaceSession(JSON.parse(fs.readFileSync('.update', 'utf8')));
       savedSession = session;
     } catch (e) {
       console.error(
@@ -32,15 +40,7 @@ exports.loadSession = async function () {
   }
 };
 
-exports.getSession = function () {
-  return session;
-};
-
-exports.replaceSession = function (newSession) {
-  session = newSession;
-};
-
-exports.saveSession = function () {
+export const saveSession = function () {
   // Only save on change.
   if (session !== savedSession) {
     const current = session;
@@ -50,7 +50,7 @@ exports.saveSession = function () {
   }
 };
 
-exports.closeSession = function () {
+export const closeSession = function () {
   if (fs.existsSync('.update')) {
     fs.unlinkSync('.update');
     savedSession = undefined;
@@ -103,13 +103,13 @@ function queryWithBody(method) {
   };
 }
 
-exports.get = queryWithoutBody('GET');
-exports.post = queryWithBody('POST');
-exports.put = queryWithBody('PUT');
-exports.doDelete = queryWithBody('DELETE');
+export const get = queryWithoutBody('GET');
+export const post = queryWithBody('POST');
+export const put = queryWithBody('PUT');
+export const doDelete = queryWithBody('DELETE');
 
-async function uploadFile(fn, key) {
-  const { url, backupUrl, formData, maxSize } = await exports.post('/upload', {
+export async function uploadFile(fn, key) {
+  const { url, backupUrl, formData, maxSize } = await post('/upload', {
     ext: path.extname(fn),
   });
   let realUrl = url;
@@ -175,5 +175,3 @@ async function uploadFile(fn, key) {
   });
   return info;
 }
-
-exports.uploadFile = uploadFile;

package/src/app.js

@@ -1,8 +1,8 @@
 import { question } from './utils';
 import fs from 'fs';
-const Table = require('tty-table');
+import Table from 'tty-table';
 
-const { post, get, doDelete } = require('./api');
+import { post, get, doDelete } from './api';
 
 const validPlatforms = {
   ios: 1,

package/src/bundle.js

@@ -1,16 +1,16 @@
-const path = require('path');
+import path from 'path';
 import { getRNVersion, translateOptions } from './utils';
 import * as fs from 'fs-extra';
 import { ZipFile } from 'yazl';
 import { open as openZipFile } from 'yauzl';
 import { question, printVersionCommand } from './utils';
 import { checkPlatform } from './app';
-const { spawn, spawnSync } = require('child_process');
+import { spawn, spawnSync } from 'child_process';
 const g2js = require('gradle-to-js/lib/parser');
-const os = require('os');
+import os from 'os';
 const properties = require('properties');
 
-var bsdiff, hdiff, diff;
+let bsdiff, hdiff, diff;
 try {
   bsdiff = require('node-bsdiff').diff;
 } catch (e) {}
@@ -31,9 +31,11 @@ async function runReactNativeBundleCommand(
   let gradleConfig = {};
   if (platform === 'android') {
     gradleConfig = await checkGradleConfig();
-    // if (gradleConfig.crunchPngs !== false) {
-    //   throw new Error('请先禁用android的crunchPngs优化，具体请参考 https://pushy.reactnative.cn/docs/getting-started.html#%E7%A6%81%E7%94%A8android%E7%9A%84crunch%E4%BC%98%E5%8C%96')
-    // }
+    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',
+      );
+    }
   }
 
   let reactNativeBundleArgs = [];
@@ -53,6 +55,12 @@ async function runReactNativeBundleCommand(
     paths: [process.cwd()],
   });
   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()],
     });
@@ -188,22 +196,15 @@ async function compileHermesByteCode(
       paths: [process.cwd()],
     }),
   );
-  const hermesCommand = path.join(
-    rnDir,
-    `/sdks/hermesc/${getHermesOSBin()}/hermesc`,
-  );
+  let hermesPath = path.join(rnDir, `/sdks/hermesc/${getHermesOSBin()}`);
 
   // < rn 0.69
-  if (!fs.existsSync(hermesCommand)) {
-    const hermesPackage = fs.existsSync('node_modules/hermes-engine')
-      ? 'node_modules/hermes-engine' // 0.2+
-      : 'node_modules/hermesvm'; // < 0.2
-    const hermesPath = `${hermesPackage}/${getHermesOSBin()}`;
-
-    hermesCommand = fs.existsSync(`${hermesPath}/hermesc`)
-      ? `${hermesPath}/hermesc` // 0.5+
-      : `${hermesPath}/hermes`; // < 0.5
+  if (!fs.existsSync(hermesPath)) {
+    hermesPath = `node_modules/hermes-engine/${getHermesOSBin()}`;
   }
+
+  const hermesCommand = `${hermesPath}/hermesc`;
+  
   const args = [
     '-emit-binary',
     '-out',
@@ -226,7 +227,7 @@ async function pack(dir, output) {
   console.log('Packing');
   fs.ensureDirSync(path.dirname(output));
   await new Promise((resolve, reject) => {
-    var zipfile = new ZipFile();
+    const zipfile = new ZipFile();
 
     function addDirectory(root, rel) {
       if (rel) {
@@ -316,7 +317,7 @@ async function diffFromPPK(origin, next, output) {
 
   const copies = {};
 
-  var zipfile = new ZipFile();
+  const zipfile = new ZipFile();
 
   const writePromise = new Promise((resolve, reject) => {
     zipfile.outputStream.on('error', (err) => {
@@ -401,7 +402,7 @@ async function diffFromPPK(origin, next, output) {
 
   const deletes = {};
 
-  for (var k in originEntries) {
+  for (let k in originEntries) {
     if (!newEntries[k]) {
       console.log('Delete ' + k);
       deletes[k] = 1;
@@ -458,7 +459,7 @@ async function diffFromPackage(
 
   const copies = {};
 
-  var zipfile = new ZipFile();
+  const zipfile = new ZipFile();
 
   const writePromise = new Promise((resolve, reject) => {
     zipfile.outputStream.on('error', (err) => {

package/src/index.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-const { loadSession } = require('./api');
-const updateNotifier = require('update-notifier');
+import { loadSession } from './api';
+import updateNotifier from 'update-notifier';
 import { printVersionCommand } from './utils/index.js';
-const pkg = require('../package.json');
+import pkg from '../package.json';
 
 updateNotifier({ pkg }).notify({ isGlobal: true });
 

package/src/package.js

@@ -1,14 +1,10 @@
-/**
- * Created by tdzl2003 on 4/2/16.
- */
-
-const { get, post, uploadFile } = require('./api');
+import { get, post, uploadFile } from './api';
 import { question, saveToLocal } from './utils';
 
 import { checkPlatform, getSelectedApp } from './app';
 
 import { getApkInfo, getIpaInfo } from './utils';
-const Table = require('tty-table');
+import Table from 'tty-table';
 
 export async function listPackage(appId) {
   const { data } = await get(`/app/${appId}/package/list?limit=1000`);
@@ -85,7 +81,9 @@ export const commands = {
       buildTime,
     });
     saveToLocal(fn, `${appId}/package/${id}.ipa`);
-    console.log(`已成功上传ipa原生包（id: ${id}）`);
+    console.log(
+      `已成功上传ipa原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`,
+    );
   },
   uploadApk: async function ({ args }) {
     const fn = args[0];
@@ -120,7 +118,9 @@ export const commands = {
       buildTime,
     });
     saveToLocal(fn, `${appId}/package/${id}.apk`);
-    console.log(`已成功上传apk原生包（id: ${id}）`);
+    console.log(
+      `已成功上传apk原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`,
+    );
   },
   parseIpa: async function ({ args }) {
     const fn = args[0];

package/src/user.js

@@ -1,38 +1,28 @@
-/**
- * Created by tdzl2003 on 2/13/16.
- */
-
-import {question} from './utils';
-const {
-  post,
-  get,
-  replaceSession,
-  saveSession,
-  closeSession,
-} = require('./api');
-const crypto = require('crypto');
+import { question } from './utils';
+import { post, get, replaceSession, saveSession, closeSession } from './api';
+import crypto from 'crypto';
 
 function md5(str) {
   return crypto.createHash('md5').update(str).digest('hex');
 }
 
-exports.commands = {
-  login: async function ({args}){
-    const email = args[0] || await question('email:');
-    const pwd = args[1] || await question('password:', true);
-    const {token, info} = await post('/user/login', {
+export const commands = {
+  login: async function ({ args }) {
+    const email = args[0] || (await question('email:'));
+    const pwd = args[1] || (await question('password:', true));
+    const { token, info } = await post('/user/login', {
       email,
       pwd: md5(pwd),
     });
-    replaceSession({token});
+    replaceSession({ token });
     await saveSession();
     console.log(`欢迎使用 pushy 热更新服务， ${info.name}.`);
   },
-  logout: async function (){
+  logout: async function () {
     await closeSession();
     console.log('已退出登录');
   },
-  me: async function (){
+  me: async function () {
     const me = await get('/user/me');
     for (const k in me) {
       if (k !== 'ok') {
@@ -40,4 +30,4 @@ exports.commands = {
       }
     }
   },
-}
+};

package/src/utils/index.js

@@ -1,14 +1,10 @@
-/**
- * Created by tdzl2003 on 2/13/16.
- */
-
 import fs from 'fs-extra';
 import os from 'os';
 import path from 'path';
-const pkg = require('../../package.json');
-const AppInfoParser = require('app-info-parser');
+import pkg from '../../package.json';
+import AppInfoParser from 'app-info-parser';
 
-var read = require('read');
+import read from 'read';
 
 export function question(query, password) {
   if (NO_INTERACTIVE) {

package/src/versions.js

@@ -1,4 +1,4 @@
-const { get, post, put, uploadFile } = require('./api');
+import { get, post, put, uploadFile } from './api';
 import { question, saveToLocal } from './utils';
 
 import { checkPlatform, getSelectedApp } from './app';