react-native-update-cli 1.9.0 → 1.11.0

package/cli.json

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

package/lib/bundle.js

@@ -81,8 +81,8 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
       if (exitCode) {
         reject(new Error(`"react-native bundle" command exited with code ${exitCode}.`));
       } else {
-        if (gradleConfig.enableHermes) {
-          await compileHermesByteCode(bundleName, outputFolder);
+        if (platform === 'android' && gradleConfig.enableHermes || platform === 'ios' && fs.existsSync('ios/Pods/hermes-engine')) {
+          await compileHermesByteCode(bundleName, outputFolder, sourcemapOutput);
         }
         resolve(null);
       }
@@ -116,16 +116,26 @@ async function checkGradleConfig() {
   };
 }
 
-async function compileHermesByteCode(bundleName, outputFolder) {
+async function compileHermesByteCode(bundleName, outputFolder, sourcemapOutput) {
   console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
-  const hermesPackage = fs.existsSync('node_modules/hermes-engine') ? 'node_modules/hermes-engine' // 0.2+
-  : 'node_modules/hermesvm'; // < 0.2
-  const hermesPath = `${hermesPackage}/${getHermesOSBin()}`;
-
-  const hermesCommand = fs.existsSync(`${hermesPath}/hermesc`) ? `${hermesPath}/hermesc` // 0.5+
-  : `${hermesPath}/hermes`; // < 0.5
-
-  spawnSync(path.join.apply(null, hermesCommand.split('/')), ['-emit-binary', '-out', path.join(outputFolder, bundleName), path.join(outputFolder, bundleName), '-O'], { stdio: 'ignore' });
+  // >= rn 0.69
+  let hermesCommand = `node_modules/react-native/sdks/hermesc/${getHermesOSBin()}/hermesc`;
+  // < 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
+  }
+  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) {
@@ -455,18 +465,11 @@ const commands = exports.commands = {
   bundle: async function ({ options }) {
     const platform = (0, _app.checkPlatform)(options.platform || (await (0, _utils.question)('平台(ios/android):')));
 
-    let {
-      bundleName,
-      entryFile,
-      intermediaDir,
-      output,
-      dev,
-      verbose
-    } = (0, _utils.translateOptions)(_extends({}, options, {
+    let { bundleName, entryFile, intermediaDir, output, dev, sourcemap } = (0, _utils.translateOptions)(_extends({}, options, {
       platform
     }));
 
-    // const sourcemapOutput = path.join(intermediaDir, bundleName + ".map");
+    const sourcemapOutput = path.join(intermediaDir, bundleName + '.map');
 
     const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
 
@@ -479,7 +482,7 @@ const commands = exports.commands = {
     console.log('Bundling with react-native: ', version);
     (0, _utils.printVersionCommand)();
 
-    await runReactNativeBundleCommand(bundleName, dev, entryFile, intermediaDir, platform);
+    await runReactNativeBundleCommand(bundleName, dev, entryFile, intermediaDir, platform, sourcemap ? sourcemapOutput : '');
 
     await pack(path.resolve(intermediaDir), realOutput);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
@@ -36,7 +36,7 @@
     "cli-arguments": "^0.2.1",
     "filesize-parser": "^1.5.0",
     "fs-extra": "8",
-    "gradle-to-js": "^2.0.0",
+    "gradle-to-js": "^2.0.1",
     "node-fetch": "^2.6.1",
     "progress": "^2.0.3",
     "read": "^1.0.7",

package/src/bundle.js

@@ -94,8 +94,15 @@ async function runReactNativeBundleCommand(
           ),
         );
       } else {
-        if (gradleConfig.enableHermes) {
-          await compileHermesByteCode(bundleName, outputFolder);
+        if (
+          (platform === 'android' && gradleConfig.enableHermes) ||
+          (platform === 'ios' && fs.existsSync('ios/Pods/hermes-engine'))
+        ) {
+          await compileHermesByteCode(
+            bundleName,
+            outputFolder,
+            sourcemapOutput,
+          );
         }
         resolve(null);
       }
@@ -132,28 +139,38 @@ async function checkGradleConfig() {
   };
 }
 
-async function compileHermesByteCode(bundleName, outputFolder) {
+async function compileHermesByteCode(
+  bundleName,
+  outputFolder,
+  sourcemapOutput,
+) {
   console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
-  const hermesPackage = fs.existsSync('node_modules/hermes-engine')
-    ? 'node_modules/hermes-engine' // 0.2+
-    : 'node_modules/hermesvm'; // < 0.2
-  const hermesPath = `${hermesPackage}/${getHermesOSBin()}`;
-
-  const hermesCommand = fs.existsSync(`${hermesPath}/hermesc`)
-    ? `${hermesPath}/hermesc` // 0.5+
-    : `${hermesPath}/hermes`; // < 0.5
-
-  spawnSync(
-    path.join.apply(null, hermesCommand.split('/')),
-    [
-      '-emit-binary',
-      '-out',
-      path.join(outputFolder, bundleName),
-      path.join(outputFolder, bundleName),
-      '-O',
-    ],
-    { stdio: 'ignore' },
-  );
+  // >= rn 0.69
+  let hermesCommand = `node_modules/react-native/sdks/hermesc/${getHermesOSBin()}/hermesc`;
+  // < 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
+  }
+  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) {
@@ -514,19 +531,13 @@ export const commands = {
       options.platform || (await question('平台(ios/android):')),
     );
 
-    let {
-      bundleName,
-      entryFile,
-      intermediaDir,
-      output,
-      dev,
-      verbose,
-    } = translateOptions({
-      ...options,
-      platform,
-    });
+    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());
 
@@ -545,6 +556,7 @@ export const commands = {
       entryFile,
       intermediaDir,
       platform,
+      sourcemap ? sourcemapOutput : '',
     );
 
     await pack(path.resolve(intermediaDir), realOutput);