react-native-update-cli 1.13.0 → 1.18.0

package/lib/bundle.js

@@ -56,7 +56,17 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
 
   fs.emptyDirSync(outputFolder);
 
-  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']);
+  let cliPath = require.resolve('react-native/local-cli/cli.js', {
+    paths: [process.cwd()]
+  });
+  try {
+    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', path.join(outputFolder, bundleName), '--dev', development, '--entry-file', entryFile, '--platform', platform, '--reset-cache']);
 
   if (sourcemapOutput) {
     reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
@@ -139,7 +149,11 @@ async function checkGradleConfig() {
 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`;
+  const rnDir = path.dirname(require.resolve('react-native', {
+    paths: [process.cwd()]
+  }));
+  const hermesCommand = path.join(rnDir, `/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+
@@ -153,7 +167,8 @@ async function compileHermesByteCode(bundleName, outputFolder, sourcemapOutput)
   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'
   });
 }

package/lib/utils/index.js

@@ -63,7 +63,9 @@ function translateOptions(options) {
 }
 
 function getRNVersion() {
-  const version = JSON.parse(_fsExtra2.default.readFileSync(_path2.default.resolve('node_modules/react-native/package.json'))).version;
+  const version = JSON.parse(_fsExtra2.default.readFileSync(require.resolve('react-native/package.json', {
+    paths: [process.cwd()]
+  }))).version;
 
   // We only care about major and minor version.
   const match = /^(\d+)\.(\d+)\./.exec(version);
@@ -111,9 +113,7 @@ 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/);
   if (!buildTimeTxtBuffer) {
     // Not in root bundle when use `use_frameworks`
@@ -138,7 +138,9 @@ function saveToLocal(originPath, destName) {
 function printVersionCommand() {
   console.log('react-native-update-cli: ' + pkg.version);
   try {
-    const PACKAGE_JSON_PATH = _path2.default.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) {
     console.log('react-native-update: 无法获取版本号，请在项目目录中运行命令');

package/package.json

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

package/src/bundle.js

@@ -49,9 +49,21 @@ async function runReactNativeBundleCommand(
 
   fs.emptyDirSync(outputFolder);
 
+  let cliPath = require.resolve('react-native/local-cli/cli.js', {
+    paths: [process.cwd()],
+  });
+  try {
+    cliPath = require.resolve('@expo/cli', {
+      paths: [process.cwd()],
+    });
+  } catch (e) {}
+  const bundleCommand = cliPath.includes('@expo/cli')
+    ? 'export:embed'
+    : 'bundle';
+
   Array.prototype.push.apply(reactNativeBundleArgs, [
-    path.join('node_modules', 'react-native', 'local-cli', 'cli.js'),
-    'bundle',
+    cliPath,
+    bundleCommand,
     '--assets-dest',
     outputFolder,
     '--bundle-output',
@@ -171,7 +183,16 @@ async function compileHermesByteCode(
 ) {
   console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
   // >= rn 0.69
-  let hermesCommand = `node_modules/react-native/sdks/hermesc/${getHermesOSBin()}/hermesc`;
+  const rnDir = path.dirname(
+    require.resolve('react-native', {
+      paths: [process.cwd()],
+    }),
+  );
+  const hermesCommand = path.join(
+    rnDir,
+    `/sdks/hermesc/${getHermesOSBin()}/hermesc`,
+  );
+
   // < rn 0.69
   if (!fs.existsSync(hermesCommand)) {
     const hermesPackage = fs.existsSync('node_modules/hermes-engine')
@@ -193,7 +214,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',
   });
 }

package/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) {