react-native-update-cli 2.7.1 → 2.7.3

package/lib/bundle.js

@@ -28,6 +28,7 @@ const _yazl = require("yazl");
 const _app = require("./app");
 const _utils = require("./utils");
 const _os = /*#__PURE__*/ _interop_require_default(require("os"));
+const _globaldirs = require("global-dirs");
 const _addgitignore = require("./utils/add-gitignore");
 const _checklockfile = require("./utils/check-lockfile");
 const _constants = require("./utils/constants");
@@ -82,15 +83,28 @@ function _interop_require_wildcard(obj, nodeInterop) {
 }
 const g2js = require('gradle-to-js/lib/parser');
 const properties = require('properties');
+const loadDiffModule = (pkgName)=>{
+    const resolvePaths = [
+        process.cwd(),
+        _globaldirs.npm.packages,
+        _globaldirs.yarn.packages
+    ];
+    try {
+        const resolved = require.resolve(pkgName, {
+            paths: resolvePaths
+        });
+        const mod = require(resolved);
+        if (mod == null ? void 0 : mod.diff) {
+            return mod.diff;
+        }
+    } catch (e) {}
+    return undefined;
+};
 let bsdiff;
 let hdiff;
 let diff;
-try {
-    bsdiff = require('node-bsdiff').diff;
-} catch (e) {}
-try {
-    hdiff = require('node-hdiffpatch').diff;
-} catch (e) {}
+bsdiff = loadDiffModule('node-bsdiff');
+hdiff = loadDiffModule('node-hdiffpatch');
 async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputFolder, platform, sourcemapOutput, config, forceHermes, cli }) {
     let gradleConfig = {};
     if (platform === 'android') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "2.7.1",
+  "version": "2.7.3",
   "description": "command line tool for react-native-update (remote updates for react native)",
   "main": "index.js",
   "bin": {

package/src/bundle.ts

@@ -13,6 +13,7 @@ import { translateOptions } from './utils';
 import { checkPlugins, question } from './utils';
 const g2js = require('gradle-to-js/lib/parser');
 import os from 'os';
+import { npm, yarn } from 'global-dirs';
 const properties = require('properties');
 import { addGitIgnore } from './utils/add-gitignore';
 import { checkLockFiles } from './utils/check-lockfile';
@@ -23,16 +24,25 @@ import { versionCommands } from './versions';
 
 type Diff = (oldSource?: Buffer, newSource?: Buffer) => Buffer;
 
-let bsdiff: Diff;
-let hdiff: Diff;
-let diff: Diff;
-try {
-  bsdiff = require('node-bsdiff').diff;
-} catch (e) {}
+const loadDiffModule = (pkgName: string): Diff | undefined => {
+  const resolvePaths = [process.cwd(), npm.packages, yarn.packages];
+
+  try {
+    const resolved = require.resolve(pkgName, { paths: resolvePaths });
+    const mod = require(resolved);
+    if (mod?.diff) {
+      return mod.diff as Diff;
+    }
+  } catch {}
 
-try {
-  hdiff = require('node-hdiffpatch').diff;
-} catch (e) {}
+  return undefined;
+};
+
+let bsdiff: Diff | undefined;
+let hdiff: Diff | undefined;
+let diff: Diff;
+bsdiff = loadDiffModule('node-bsdiff');
+hdiff = loadDiffModule('node-hdiffpatch');
 
 async function runReactNativeBundleCommand({
   bundleName,