react-native-update-cli 1.10.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

@@ -55,7 +55,6 @@ 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) {
@@ -83,7 +82,7 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
         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')) {
-          await compileHermesByteCode(bundleName, outputFolder);
+          await compileHermesByteCode(bundleName, outputFolder, sourcemapOutput);
         }
         resolve(null);
       }
@@ -117,7 +116,7 @@ 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`;
@@ -130,9 +129,13 @@ async function compileHermesByteCode(bundleName, outputFolder) {
     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' });
+  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) {
@@ -462,11 +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.10.0",
+  "version": "1.11.0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {

package/src/bundle.js

@@ -48,7 +48,6 @@ async function runReactNativeBundleCommand(
 
   fs.emptyDirSync(outputFolder);
 
-  // TODO sourcemap
   Array.prototype.push.apply(reactNativeBundleArgs, [
     path.join('node_modules', 'react-native', 'local-cli', 'cli.js'),
     'bundle',
@@ -99,7 +98,11 @@ async function runReactNativeBundleCommand(
           (platform === 'android' && gradleConfig.enableHermes) ||
           (platform === 'ios' && fs.existsSync('ios/Pods/hermes-engine'))
         ) {
-          await compileHermesByteCode(bundleName, outputFolder);
+          await compileHermesByteCode(
+            bundleName,
+            outputFolder,
+            sourcemapOutput,
+          );
         }
         resolve(null);
       }
@@ -136,7 +139,11 @@ 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`;
@@ -151,19 +158,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 +531,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 +556,7 @@ export const commands = {
       entryFile,
       intermediaDir,
       platform,
+      sourcemap ? sourcemapOutput : '',
     );
 
     await pack(path.resolve(intermediaDir), realOutput);