react-native-update-cli 1.11.0 → 1.13.0

package/lib/api.js

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

package/lib/bundle.js

@@ -26,6 +26,7 @@ const path = require('path');
 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;
 try {
@@ -81,7 +82,26 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
       if (exitCode) {
         reject(new Error(`"react-native bundle" command exited with code ${exitCode}.`));
       } else {
-        if (platform === 'android' && gradleConfig.enableHermes || platform === 'ios' && fs.existsSync('ios/Pods/hermes-engine')) {
+        let hermesEnabled = false;
+
+        if (platform === 'android') {
+          const gradlePropeties = await new Promise(resolve => {
+            properties.parse('./android/gradle.properties', { path: true }, function (error, props) {
+              if (error) {
+                console.error(error);
+                resolve(null);
+              }
+
+              resolve(props);
+            });
+          });
+          hermesEnabled = gradlePropeties.hermesEnabled;
+
+          if (typeof hermesEnabled !== 'boolean') hermesEnabled = gradleConfig.enableHermes;
+        } else if (platform === 'ios' && fs.existsSync('ios/Pods/hermes-engine')) {
+          hermesEnabled = true;
+        }
+        if (hermesEnabled) {
           await compileHermesByteCode(bundleName, outputFolder, sourcemapOutput);
         }
         resolve(null);

package/lib/package.js

@@ -74,7 +74,7 @@ const commands = exports.commands = {
     } = await (0, _utils.getIpaInfo)(fn);
     const { appId, appKey } = await (0, _app.getSelectedApp)('ios');
 
-    if (appIdInPkg && appIdInPkg !== appId) {
+    if (appIdInPkg && appIdInPkg != appId) {
       throw new Error(`appId不匹配！当前ipa: ${appIdInPkg}, 当前update.json: ${appId}`);
     }
 
@@ -105,7 +105,7 @@ const commands = exports.commands = {
     } = await (0, _utils.getApkInfo)(fn);
     const { appId, appKey } = await (0, _app.getSelectedApp)('android');
 
-    if (appIdInPkg && appIdInPkg !== appId) {
+    if (appIdInPkg && appIdInPkg != appId) {
       throw new Error(`appId不匹配！当前apk: ${appIdInPkg}, 当前update.json: ${appId}`);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.11.0",
+  "version": "1.13.0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
@@ -39,6 +39,7 @@
     "gradle-to-js": "^2.0.1",
     "node-fetch": "^2.6.1",
     "progress": "^2.0.3",
+    "properties": "^1.2.1",
     "read": "^1.0.7",
     "request": "^2.88.2",
     "tcp-ping": "^0.1.1",

package/src/api.js

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

package/src/bundle.js

@@ -8,6 +8,7 @@ import { checkPlatform } from './app';
 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;
 try {
@@ -94,10 +95,34 @@ async function runReactNativeBundleCommand(
           ),
         );
       } else {
-        if (
-          (platform === 'android' && gradleConfig.enableHermes) ||
-          (platform === 'ios' && fs.existsSync('ios/Pods/hermes-engine'))
+        let hermesEnabled = false;
+
+        if (platform === 'android') {
+          const gradlePropeties = await new Promise((resolve) => {
+            properties.parse(
+              './android/gradle.properties',
+              { path: true },
+              function (error, props) {
+                if (error) {
+                  console.error(error);
+                  resolve(null);
+                }
+
+                resolve(props);
+              },
+            );
+          });
+          hermesEnabled = gradlePropeties.hermesEnabled;
+
+          if (typeof hermesEnabled !== 'boolean')
+            hermesEnabled = gradleConfig.enableHermes;
+        } else if (
+          platform === 'ios' &&
+          fs.existsSync('ios/Pods/hermes-engine')
         ) {
+          hermesEnabled = true;
+        }
+        if (hermesEnabled) {
           await compileHermesByteCode(
             bundleName,
             outputFolder,

package/src/package.js

@@ -65,7 +65,7 @@ export const commands = {
     } = await getIpaInfo(fn);
     const { appId, appKey } = await getSelectedApp('ios');
 
-    if (appIdInPkg && appIdInPkg !== appId) {
+    if (appIdInPkg && appIdInPkg != appId) {
       throw new Error(
         `appId不匹配！当前ipa: ${appIdInPkg}, 当前update.json: ${appId}`,
       );
@@ -100,7 +100,7 @@ export const commands = {
     } = await getApkInfo(fn);
     const { appId, appKey } = await getSelectedApp('android');
 
-    if (appIdInPkg && appIdInPkg !== appId) {
+    if (appIdInPkg && appIdInPkg != appId) {
       throw new Error(
         `appId不匹配！当前apk: ${appIdInPkg}, 当前update.json: ${appId}`,
       );