v1.15.0

cli.json

@@ -140,7 +140,9 @@
           "default": ".pushy/output/${platform}.${time}.ppk",
           "hasValue": true
         },
-        "verbose": {}
+        "sourcemap": {
+          "default": false
+        }
       }
     },
     "release": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.10.0",
+  "version": "1.15.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",

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';

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 {
@@ -48,9 +49,10 @@ async function runReactNativeBundleCommand(
 
   fs.emptyDirSync(outputFolder);
 
-  // TODO sourcemap
   Array.prototype.push.apply(reactNativeBundleArgs, [
-    path.join('node_modules', 'react-native', 'local-cli', 'cli.js'),
+    require.resolve('react-native/local-cli/cli.js', {
+      paths: [process.cwd()],
+    }), // 'react-native' package may be symlinked
     'bundle',
     '--assets-dest',
     outputFolder,
@@ -95,11 +97,39 @@ 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')
         ) {
-          await compileHermesByteCode(bundleName, outputFolder);
+          hermesEnabled = true;
+        }
+        if (hermesEnabled) {
+          await compileHermesByteCode(
+            bundleName,
+            outputFolder,
+            sourcemapOutput,
+          );
         }
         resolve(null);
       }
@@ -136,10 +166,19 @@ async function checkGradleConfig() {
   };
 }
 
-async function compileHermesByteCode(bundleName, outputFolder) {
+async function compileHermesByteCode(
+  bundleName,
+  outputFolder,
+  sourcemapOutput,
+) {
   console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
   // >= rn 0.69
-  let hermesCommand = `node_modules/react-native/sdks/hermesc/${getHermesOSBin()}/hermesc`;
+  let hermesCommand = require.resolve(
+    `react-native/sdks/hermesc/${getHermesOSBin()}/hermesc`,
+    {
+      paths: [process.cwd()],
+    },
+  );
   // < rn 0.69
   if (!fs.existsSync(hermesCommand)) {
     const hermesPackage = fs.existsSync('node_modules/hermes-engine')
@@ -151,19 +190,19 @@ async function compileHermesByteCode(bundleName, outputFolder) {
       ? `${hermesPath}/hermesc` // 0.5+
       : `${hermesPath}/hermes`; // < 0.5
   }
-
-  // TODO sourcemap
-  spawnSync(
-    path.join.apply(null, hermesCommand.split('/')),
-    [
-      '-emit-binary',
-      '-out',
-      path.join(outputFolder, bundleName),
-      path.join(outputFolder, bundleName),
-      '-O',
-    ],
-    { stdio: 'ignore' },
-  );
+  const args = [
+    '-emit-binary',
+    '-out',
+    path.join(outputFolder, bundleName),
+    path.join(outputFolder, bundleName),
+    '-O',
+  ];
+  if (sourcemapOutput) {
+    args.push('-output-source-map');
+  }
+  spawnSync(path.join.apply(null, hermesCommand.split('/')), args, {
+    stdio: 'ignore',
+  });
 }
 
 async function pack(dir, output) {
@@ -524,13 +563,13 @@ export const commands = {
       options.platform || (await question('平台(ios/android):')),
     );
 
-    let { bundleName, entryFile, intermediaDir, output, dev, verbose } =
+    let { bundleName, entryFile, intermediaDir, output, dev, sourcemap } =
       translateOptions({
         ...options,
         platform,
       });
 
-    // const sourcemapOutput = path.join(intermediaDir, bundleName + ".map");
+    const sourcemapOutput = path.join(intermediaDir, bundleName + '.map');
 
     const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
 
@@ -549,6 +588,7 @@ export const commands = {
       entryFile,
       intermediaDir,
       platform,
+      sourcemap ? sourcemapOutput : '',
     );
 
     await pack(path.resolve(intermediaDir), realOutput);

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}`,
       );

src/utils/index.js

@@ -43,7 +43,11 @@ export function translateOptions(options) {
 
 export function getRNVersion() {
   const version = JSON.parse(
-    fs.readFileSync(path.resolve('node_modules/react-native/package.json')),
+    fs.readFileSync(
+      require.resolve('react-native/package.json', {
+        paths: [process.cwd()],
+      }),
+    ),
   ).version;
 
   // We only care about major and minor version.
@@ -106,9 +110,8 @@ export async function getIpaInfo(fn) {
   if (updateJsonFile) {
     appCredential = JSON.parse(updateJsonFile.toString()).ios;
   }
-  const {
-    CFBundleShortVersionString: versionName,
-  } = await appInfoParser.parse();
+  const { CFBundleShortVersionString: versionName } =
+    await appInfoParser.parse();
   let buildTimeTxtBuffer = await appInfoParser.parser.getEntry(
     /payload\/.+?\.app\/pushy_build_time.txt/,
   );
@@ -139,11 +142,11 @@ export function saveToLocal(originPath, destName) {
 export function printVersionCommand() {
   console.log('react-native-update-cli: ' + pkg.version);
   try {
-    const PACKAGE_JSON_PATH = path.resolve(
-      process.cwd(),
-      'node_modules',
-      'react-native-update',
-      'package.json',
+    const PACKAGE_JSON_PATH = require.resolve(
+      'react-native-update/package.json',
+      {
+        paths: [process.cwd()],
+      },
     );
     console.log('react-native-update: ' + require(PACKAGE_JSON_PATH).version);
   } catch (e) {