react-native-update-cli 1.40.0-beta.1 → 1.40.1

package/cli.json

@@ -154,6 +154,9 @@
         },
         "rncli": {
           "default": false
+        },
+        "disableHermes": {
+          "default": false
         }
       }
     },

package/lib/api.js

@@ -148,7 +148,7 @@ async function uploadFile(fn, key) {
                 timeout: 1000
             });
             // console.log({pingResult});
-            if (isNaN(pingResult.avg) || pingResult.avg > 150) {
+            if (Number.isNaN(pingResult.avg) || pingResult.avg > 150) {
                 realUrl = backupUrl;
             }
         }

package/lib/bundle.js

@@ -85,7 +85,7 @@ try {
 try {
     hdiff = require('node-hdiffpatch').diff;
 } catch (e) {}
-async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputFolder, platform, sourcemapOutput, config, cli }) {
+async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputFolder, platform, sourcemapOutput, config, disableHermes, cli }) {
     let gradleConfig = {};
     if (platform === 'android') {
         gradleConfig = await checkGradleConfig();
@@ -112,7 +112,7 @@ async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputF
                 paths: [
                     process.cwd()
                 ]
-            }))).version;
+            })).toString()).version;
             // expo cli 0.10.17 (expo 49) 开始支持 bundle:embed
             if ((0, _satisfies.default)(expoCliVersion, '>= 0.10.17')) {
                 usingExpo = true;
@@ -231,7 +231,10 @@ async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputF
                 reject(new Error(`"react-native bundle" command exited with code ${exitCode}.`));
             } else {
                 let hermesEnabled = false;
-                if (platform === 'android') {
+                if (disableHermes) {
+                    hermesEnabled = false;
+                    console.log('Hermes disabled');
+                } else if (platform === 'android') {
                     const gradlePropeties = await new Promise((resolve)=>{
                         properties.parse('./android/gradle.properties', {
                             path: true
@@ -751,7 +754,7 @@ function diffArgsCheck(args, options, diffFn) {
 const commands = {
     bundle: async function({ options }) {
         const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
-        const { bundleName, entryFile, intermediaDir, output, dev, sourcemap, taro, expo, rncli } = (0, _utils.translateOptions)({
+        const { bundleName, entryFile, intermediaDir, output, dev, sourcemap, taro, expo, rncli, disableHermes } = (0, _utils.translateOptions)({
             ...options,
             platform
         });
@@ -772,6 +775,7 @@ const commands = {
             outputFolder: intermediaDir,
             platform,
             sourcemapOutput: sourcemap || sourcemapPlugin ? sourcemapOutput : '',
+            disableHermes,
             cli: {
                 taro,
                 expo,

package/lib/index.js

@@ -5,13 +5,27 @@ Object.defineProperty(exports, "__esModule", {
 });
 const _api = require("./api");
 const _updatenotifier = /*#__PURE__*/ _interop_require_default(require("update-notifier"));
-const _index = require("./utils/index.js");
+const _utils = require("./utils");
 const _packagejson = /*#__PURE__*/ _interop_require_default(require("../package.json"));
+const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
+const _i18next = /*#__PURE__*/ _interop_require_default(require("i18next"));
+const _en = /*#__PURE__*/ _interop_require_default(require("./locales/en"));
+const _zh = /*#__PURE__*/ _interop_require_default(require("./locales/zh"));
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
+const scriptName = _nodepath.default.basename(process.argv[1]);
+global.IS_CRESC = scriptName === 'cresc';
+_i18next.default.init({
+    lng: global.IS_CRESC ? 'en' : 'zh',
+    // debug: process.env.NODE_ENV !== 'production',
+    resources: {
+        en: _en.default,
+        zh: _zh.default
+    }
+});
 (0, _updatenotifier.default)({
     pkg: _packagejson.default
 }).notify({
@@ -34,7 +48,7 @@ const commands = {
     help: printUsage
 };
 async function run() {
-    await (0, _index.printVersionCommand)();
+    await (0, _utils.printVersionCommand)();
     if (process.argv.indexOf('-v') >= 0 || process.argv[2] === 'version') {
         process.exit();
     }

package/lib/locales/en.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+const _default = {};

package/lib/locales/zh.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+const _default = {};

package/lib/utils/app-info-parser/zip.js

@@ -32,7 +32,7 @@ class Zip {
             ], {
                 type
             }, (err, buffers)=>{
-                console.log(buffers);
+                // console.log(buffers);
                 err ? reject(err) : resolve(buffers[regex]);
             });
         });

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.40.0-beta.1",
+  "version": "1.40.1",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
-    "pushy": "lib/index.js"
+    "pushy": "lib/index.js",
+    "cresc": "lib/index.js"
   },
   "files": [
     "lib",
@@ -46,6 +47,7 @@
     "form-data": "^4.0.1",
     "fs-extra": "8",
     "gradle-to-js": "^2.0.1",
+    "i18next": "^24.2.2",
     "isomorphic-unzip": "^1.1.5",
     "node-fetch": "^2.6.1",
     "plist": "^3.1.0",

package/src/api.ts

@@ -121,7 +121,7 @@ export async function uploadFile(fn: string, key?: string) {
         timeout: 1000,
       });
       // console.log({pingResult});
-      if (isNaN(pingResult.avg) || pingResult.avg > 150) {
+      if (Number.isNaN(pingResult.avg) || pingResult.avg > 150) {
         realUrl = backupUrl;
       }
     }

package/src/bundle.ts

@@ -30,6 +30,7 @@ async function runReactNativeBundleCommand({
   platform,
   sourcemapOutput,
   config,
+  disableHermes,
   cli,
 }: {
   bundleName: string;
@@ -39,6 +40,7 @@ async function runReactNativeBundleCommand({
   platform: string;
   sourcemapOutput: string;
   config?: string;
+  disableHermes?: boolean;
   cli: {
     taro?: boolean;
     expo?: boolean;
@@ -84,7 +86,7 @@ async function runReactNativeBundleCommand({
           require.resolve('@expo/cli/package.json', {
             paths: [process.cwd()],
           }),
-        ),
+        ).toString(),
       ).version;
       // expo cli 0.10.17 (expo 49) 开始支持 bundle:embed
       if (semverSatisfies(expoCliVersion, '>= 0.10.17')) {
@@ -221,7 +223,10 @@ async function runReactNativeBundleCommand({
       } else {
         let hermesEnabled: boolean | undefined = false;
 
-        if (platform === 'android') {
+        if (disableHermes) {
+          hermesEnabled = false;
+          console.log('Hermes disabled');
+        } else if (platform === 'android') {
           const gradlePropeties = await new Promise<{
             hermesEnabled?: boolean;
           }>((resolve) => {
@@ -904,6 +909,7 @@ export const commands = {
       taro,
       expo,
       rncli,
+      disableHermes,
     } = translateOptions({
       ...options,
       platform,
@@ -932,6 +938,7 @@ export const commands = {
       outputFolder: intermediaDir,
       platform,
       sourcemapOutput: sourcemap || sourcemapPlugin ? sourcemapOutput : '',
+      disableHermes,
       cli: {
         taro,
         expo,

package/src/index.ts

@@ -2,8 +2,26 @@
 
 import { loadSession } from './api';
 import updateNotifier from 'update-notifier';
-import { printVersionCommand } from './utils/index.js';
+import { printVersionCommand } from './utils';
 import pkg from '../package.json';
+import path from 'node:path';
+import i18next from 'i18next';
+import en from './locales/en';
+import zh from './locales/zh';
+
+const scriptName: 'cresc' | 'pushy' = path.basename(process.argv[1]) as
+  | 'cresc'
+  | 'pushy';
+global.IS_CRESC = scriptName === 'cresc';
+
+i18next.init({
+  lng: global.IS_CRESC ? 'en' : 'zh',
+  // debug: process.env.NODE_ENV !== 'production',
+  resources: {
+    en,
+    zh,
+  },
+});
 
 updateNotifier({ pkg }).notify({
   isGlobal: true,

package/src/locales/en.ts

@@ -0,0 +1 @@
+export default {};

package/src/locales/zh.ts

@@ -0,0 +1 @@
+export default {};

package/src/types.ts

@@ -1,6 +1,7 @@
 declare global {
   var NO_INTERACTIVE: boolean;
   var USE_ACC_OSS: boolean;
+  var IS_CRESC: boolean;
 }
 
 export interface Session {

package/src/utils/app-info-parser/zip.js

@@ -42,7 +42,7 @@ class Zip {
     regex = decodeNullUnicode(regex);
     return new Promise((resolve, reject) => {
       this.unzip.getBuffer([regex], { type }, (err, buffers) => {
-        console.log(buffers);
+        // console.log(buffers);
         err ? reject(err) : resolve(buffers[regex]);
       });
     });

package/src/utils/index.ts

@@ -55,7 +55,7 @@ export function getRNVersion() {
   };
 }
 
-export async function getApkInfo(fn) {
+export async function getApkInfo(fn: string) {
   const appInfoParser = new AppInfoParser(fn);
   const bundleFile = await appInfoParser.parser.getEntry(
     /assets\/index.android.bundle/,