v1.19.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.16.0",
+  "version": "1.19.0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {

src/bundle.js

@@ -31,9 +31,11 @@ async function runReactNativeBundleCommand(
   let gradleConfig = {};
   if (platform === 'android') {
     gradleConfig = await checkGradleConfig();
-    // if (gradleConfig.crunchPngs !== false) {
-    //   throw new Error('请先禁用android的crunchPngs优化，具体请参考 https://pushy.reactnative.cn/docs/getting-started.html#%E7%A6%81%E7%94%A8android%E7%9A%84crunch%E4%BC%98%E5%8C%96')
-    // }
+    if (gradleConfig.crunchPngs !== false) {
+      console.warn(
+        'android的crunchPngs选项似乎尚未禁用（如已禁用则请忽略此提示），这可能导致热更包体积异常增大，具体请参考 https://pushy.reactnative.cn/docs/getting-started.html#%E7%A6%81%E7%94%A8-android-%E7%9A%84-crunch-%E4%BC%98%E5%8C%96 \n',
+      );
+    }
   }
 
   let reactNativeBundleArgs = [];
@@ -49,11 +51,27 @@ async function runReactNativeBundleCommand(
 
   fs.emptyDirSync(outputFolder);
 
-  Array.prototype.push.apply(reactNativeBundleArgs, [
-    require.resolve('react-native/local-cli/cli.js', {
+  let cliPath = require.resolve('react-native/local-cli/cli.js', {
+    paths: [process.cwd()],
+  });
+  try {
+    require.resolve('expo-router', {
       paths: [process.cwd()],
-    }), // 'react-native' package may be symlinked
-    'bundle',
+    });
+
+    console.log(`expo-router detected, will use @expo/cli to bundle.\n`);
+    // if using expo-router, use expo-cli
+    cliPath = require.resolve('@expo/cli', {
+      paths: [process.cwd()],
+    });
+  } catch (e) {}
+  const bundleCommand = cliPath.includes('@expo/cli')
+    ? 'export:embed'
+    : 'bundle';
+
+  Array.prototype.push.apply(reactNativeBundleArgs, [
+    cliPath,
+    bundleCommand,
     '--assets-dest',
     outputFolder,
     '--bundle-output',
@@ -173,7 +191,11 @@ async function compileHermesByteCode(
 ) {
   console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
   // >= rn 0.69
-  const rnDir = path.dirname(require.resolve('react-native'));
+  const rnDir = path.dirname(
+    require.resolve('react-native', {
+      paths: [process.cwd()],
+    }),
+  );
   const hermesCommand = path.join(
     rnDir,
     `/sdks/hermesc/${getHermesOSBin()}/hermesc`,
@@ -200,7 +222,10 @@ async function compileHermesByteCode(
   if (sourcemapOutput) {
     args.push('-output-source-map');
   }
-  spawnSync(path.join.apply(null, hermesCommand.split('/')), args, {
+  console.log(
+    'Running hermesc: ' + hermesCommand + ' ' + args.join(' ') + '\n',
+  );
+  spawnSync(hermesCommand, args, {
     stdio: 'ignore',
   });
 }