react-native-update-cli 1.9.0 → 1.10.0

package/lib/bundle.js

@@ -55,6 +55,7 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
 
   fs.emptyDirSync(outputFolder);
 
+  // TODO sourcemap
   Array.prototype.push.apply(reactNativeBundleArgs, [path.join('node_modules', 'react-native', 'local-cli', 'cli.js'), 'bundle', '--assets-dest', outputFolder, '--bundle-output', path.join(outputFolder, bundleName), '--dev', development, '--entry-file', entryFile, '--platform', platform, '--reset-cache']);
 
   if (sourcemapOutput) {
@@ -81,7 +82,7 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
       if (exitCode) {
         reject(new Error(`"react-native bundle" command exited with code ${exitCode}.`));
       } else {
-        if (gradleConfig.enableHermes) {
+        if (platform === 'android' && gradleConfig.enableHermes || platform === 'ios' && fs.existsSync('ios/Pods/hermes-engine')) {
           await compileHermesByteCode(bundleName, outputFolder);
         }
         resolve(null);
@@ -118,13 +119,19 @@ async function checkGradleConfig() {
 
 async function compileHermesByteCode(bundleName, outputFolder) {
   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
+  // >= 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
+  }
 
+  // TODO sourcemap
   spawnSync(path.join.apply(null, hermesCommand.split('/')), ['-emit-binary', '-out', path.join(outputFolder, bundleName), path.join(outputFolder, bundleName), '-O'], { stdio: 'ignore' });
 }
 
@@ -455,14 +462,7 @@ 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, verbose } = (0, _utils.translateOptions)(_extends({}, options, {
       platform
     }));
 

package/package.json

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

@@ -48,6 +48,7 @@ async function runReactNativeBundleCommand(
 
   fs.emptyDirSync(outputFolder);
 
+  // TODO sourcemap
   Array.prototype.push.apply(reactNativeBundleArgs, [
     path.join('node_modules', 'react-native', 'local-cli', 'cli.js'),
     'bundle',
@@ -94,7 +95,10 @@ async function runReactNativeBundleCommand(
           ),
         );
       } else {
-        if (gradleConfig.enableHermes) {
+        if (
+          (platform === 'android' && gradleConfig.enableHermes) ||
+          (platform === 'ios' && fs.existsSync('ios/Pods/hermes-engine'))
+        ) {
           await compileHermesByteCode(bundleName, outputFolder);
         }
         resolve(null);
@@ -134,15 +138,21 @@ async function checkGradleConfig() {
 
 async function compileHermesByteCode(bundleName, outputFolder) {
   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
+  // >= 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
+  }
 
+  // TODO sourcemap
   spawnSync(
     path.join.apply(null, hermesCommand.split('/')),
     [
@@ -514,17 +524,11 @@ 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, verbose } =
+      translateOptions({
+        ...options,
+        platform,
+      });
 
     // const sourcemapOutput = path.join(intermediaDir, bundleName + ".map");