react-native-update-cli 1.43.6 → 1.44.1

package/lib/locales/en.js

@@ -11,7 +11,7 @@ Object.defineProperty(exports, "default", {
 const _default = {
     loginFirst: 'Not logged in.\nPlease run `cresc login` in the project directory to login.',
     lockNotFound: 'No lock file detected, which may cause inconsistent dependencies and hot-updating issues.',
-    multipleLocksFound: 'Multiple lock files detected ({{lockFiles}}), which may cause inconsistent dependencies and hot-updating issues.',
+    multipleLocksFound: 'Multiple lock files detected ({{- lockFiles}}), which may cause inconsistent dependencies and hot-updating issues.',
     lockBestPractice: `
 Best practices for lock files:
 1. All members of the development team should use the same package manager to maintain a single lock file.

package/lib/locales/zh.js

@@ -18,7 +18,7 @@ const _default = {
 3. 代码审核时应关注 lock 文件的变化。
 这样可以最大限度避免因依赖关系不一致而导致的热更异常，也降低供应链攻击等安全隐患。
 `,
-    multipleLocksFound: '检测到多种不同格式的锁文件({{lockFiles}})，这可能导致依赖关系不一致而使热更异常。',
+    multipleLocksFound: '检测到多种不同格式的锁文件({{- lockFiles}})，这可能导致依赖关系不一致而使热更异常。',
     loginExpired: '登录信息已过期，请使用 `pushy login` 命令重新登录',
     fileSizeExceeded: '此文件大小 {{fileSize}} , 超出当前额度 {{maxSize}} 。您可以考虑升级付费业务以提升此额度。详情请访问: {{pricingPageUrl}}',
     bundleNotFound: '找不到 bundle 文件。请确保此 {{packageType}} 为 release 版本，且 bundle 文件名为默认的 `{{entryFile}}`',
@@ -53,7 +53,7 @@ const _default = {
     packing: '正在打包',
     deletingFile: '删除 {{- file}}',
     bundlingWithRN: '正在使用 react-native {{version}} 打包',
-    fileGenerated: '已生成 {{- file}}。',
+    fileGenerated: '已生成 {{- file}}',
     processingError: '处理文件时出错：{{error}}',
     usageDiff: '用法：pushy {{command}} <origin> <next>',
     pluginDetected: '检测到 {{name}} 插件',

package/lib/utils/check-lockfile.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "checkLockFiles", {
     }
 });
 const _nodefs = /*#__PURE__*/ _interop_require_default(require("node:fs"));
+const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
 const _i18n = require("./i18n");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -22,21 +23,71 @@ const lockFiles = [
     'bun.lockb',
     'bun.lock'
 ];
-const existingLockFiles = [];
-function checkLockFiles() {
+// Function to check if a package.json has a workspaces field
+function hasWorkspaces(dir) {
+    const pkgPath = _nodepath.default.join(dir, 'package.json');
+    if (_nodefs.default.existsSync(pkgPath)) {
+        try {
+            const pkg = JSON.parse(_nodefs.default.readFileSync(pkgPath, 'utf-8'));
+            return !!pkg.workspaces;
+        } catch (e) {
+        // Ignore parsing errors
+        }
+    }
+    return false;
+}
+// Helper function to find lock files in a specific directory
+function findLockFilesInDir(directory) {
+    const found = [];
     for (const file of lockFiles){
-        if (_nodefs.default.existsSync(file)) {
-            existingLockFiles.push(file);
+        const filePath = _nodepath.default.join(directory, file);
+        if (_nodefs.default.existsSync(filePath)) {
+            found.push(filePath);
         }
     }
-    if (existingLockFiles.length === 1) {
+    return found;
+}
+function checkLockFiles() {
+    const cwd = process.cwd();
+    let searchDir = cwd;
+    let foundLockFiles = findLockFilesInDir(searchDir);
+    // If no lock file in cwd, try to find monorepo root and check there
+    if (foundLockFiles.length === 0) {
+        // Search upwards for package.json with workspaces
+        let currentDir = _nodepath.default.dirname(cwd); // Start searching from parent
+        let projectRootDir = null;
+        while(true){
+            if (hasWorkspaces(currentDir)) {
+                projectRootDir = currentDir;
+                break;
+            }
+            const parentDir = _nodepath.default.dirname(currentDir);
+            if (parentDir === currentDir) {
+                break;
+            }
+            currentDir = parentDir;
+        }
+        // If a potential root was found, switch search directory and re-check
+        if (projectRootDir) {
+            searchDir = projectRootDir;
+            foundLockFiles = findLockFilesInDir(searchDir);
+        }
+    // If no projectRootDir found, foundLockFiles remains empty and searchDir remains cwd
+    }
+    // Handle results based on findings in the final searchDir
+    if (foundLockFiles.length === 1) {
+        // Successfully found one lock file in the determined searchDir
         return;
     }
-    console.warn((0, _i18n.t)('lockBestPractice'));
-    if (existingLockFiles.length === 0) {
-        throw new Error((0, _i18n.t)('lockNotFound'));
+    if (foundLockFiles.length > 1) {
+        // Found multiple lock files in the determined searchDir
+        console.warn((0, _i18n.t)('lockBestPractice'));
+        throw new Error((0, _i18n.t)('multipleLocksFound', {
+            lockFiles: foundLockFiles.join(', ')
+        }));
     }
-    throw new Error((0, _i18n.t)('multipleLocksFound', {
-        lockFiles: existingLockFiles.join(', ')
-    }));
+    // If we reach here, foundLockFiles.length === 0
+    console.warn((0, _i18n.t)('lockBestPractice'));
+    // Warn instead of throwing an error if no lock file is found
+    console.warn((0, _i18n.t)('lockNotFound'));
 }

package/lib/utils/dep-versions.js

@@ -9,25 +9,27 @@ Object.defineProperty(exports, "depVersions", {
     }
 });
 const currentPackage = require(`${process.cwd()}/package.json`);
-const depKeys = Object.keys(currentPackage.dependencies);
-const devDepKeys = Object.keys(currentPackage.devDependencies);
-const dedupedDeps = [
-    ...new Set([
-        ...depKeys,
-        ...devDepKeys
-    ])
-];
 const _depVersions = {};
-for (const dep of dedupedDeps){
-    try {
-        const packageJsonPath = require.resolve(`${dep}/package.json`, {
-            paths: [
-                process.cwd()
-            ]
-        });
-        const version = require(packageJsonPath).version;
-        _depVersions[dep] = version;
-    } catch (e) {}
+if (currentPackage) {
+    const depKeys = currentPackage.dependencies ? Object.keys(currentPackage.dependencies) : [];
+    const devDepKeys = currentPackage.devDependencies ? Object.keys(currentPackage.devDependencies) : [];
+    const dedupedDeps = [
+        ...new Set([
+            ...depKeys,
+            ...devDepKeys
+        ])
+    ];
+    for (const dep of dedupedDeps){
+        try {
+            const packageJsonPath = require.resolve(`${dep}/package.json`, {
+                paths: [
+                    process.cwd()
+                ]
+            });
+            const version = require(packageJsonPath).version;
+            _depVersions[dep] = version;
+        } catch (e) {}
+    }
 }
 const depVersions = Object.keys(_depVersions).sort() // Sort the keys alphabetically
 .reduce((obj, key)=>{

package/package.json

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

package/src/locales/en.ts

@@ -4,7 +4,7 @@ export default {
   lockNotFound:
     'No lock file detected, which may cause inconsistent dependencies and hot-updating issues.',
   multipleLocksFound:
-    'Multiple lock files detected ({{lockFiles}}), which may cause inconsistent dependencies and hot-updating issues.',
+    'Multiple lock files detected ({{- lockFiles}}), which may cause inconsistent dependencies and hot-updating issues.',
   lockBestPractice: `
 Best practices for lock files:
 1. All members of the development team should use the same package manager to maintain a single lock file.

package/src/locales/zh.ts

@@ -10,7 +10,7 @@ export default {
 这样可以最大限度避免因依赖关系不一致而导致的热更异常，也降低供应链攻击等安全隐患。
 `,
   multipleLocksFound:
-    '检测到多种不同格式的锁文件({{lockFiles}})，这可能导致依赖关系不一致而使热更异常。',
+    '检测到多种不同格式的锁文件({{- lockFiles}})，这可能导致依赖关系不一致而使热更异常。',
   loginExpired: '登录信息已过期，请使用 `pushy login` 命令重新登录',
   fileSizeExceeded:
     '此文件大小 {{fileSize}} , 超出当前额度 {{maxSize}} 。您可以考虑升级付费业务以提升此额度。详情请访问: {{pricingPageUrl}}',
@@ -50,7 +50,7 @@ export default {
   packing: '正在打包',
   deletingFile: '删除 {{- file}}',
   bundlingWithRN: '正在使用 react-native {{version}} 打包',
-  fileGenerated: '已生成 {{- file}}。',
+  fileGenerated: '已生成 {{- file}}',
   processingError: '处理文件时出错：{{error}}',
   usageDiff: '用法：pushy {{command}} <origin> <next>',
   pluginDetected: '检测到 {{name}} 插件',

package/src/utils/check-lockfile.ts

@@ -1,4 +1,5 @@
 import fs from 'node:fs';
+import path from 'node:path';
 import { t } from './i18n';
 
 const lockFiles = [
@@ -9,21 +10,80 @@ const lockFiles = [
   'bun.lock',
 ];
 
-const existingLockFiles: string[] = [];
-export function checkLockFiles() {
+// Function to check if a package.json has a workspaces field
+function hasWorkspaces(dir: string): boolean {
+  const pkgPath = path.join(dir, 'package.json');
+  if (fs.existsSync(pkgPath)) {
+    try {
+      const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+      return !!pkg.workspaces;
+    } catch (e) {
+      // Ignore parsing errors
+    }
+  }
+  return false;
+}
+
+// Helper function to find lock files in a specific directory
+function findLockFilesInDir(directory: string): string[] {
+  const found: string[] = [];
   for (const file of lockFiles) {
-    if (fs.existsSync(file)) {
-      existingLockFiles.push(file);
+    const filePath = path.join(directory, file);
+    if (fs.existsSync(filePath)) {
+      found.push(filePath);
     }
   }
-  if (existingLockFiles.length === 1) {
+  return found;
+}
+
+export function checkLockFiles() {
+  const cwd = process.cwd();
+  let searchDir = cwd;
+  let foundLockFiles = findLockFilesInDir(searchDir);
+
+  // If no lock file in cwd, try to find monorepo root and check there
+  if (foundLockFiles.length === 0) {
+    // Search upwards for package.json with workspaces
+    let currentDir = path.dirname(cwd); // Start searching from parent
+    let projectRootDir: string | null = null;
+
+    while (true) {
+      if (hasWorkspaces(currentDir)) {
+        projectRootDir = currentDir;
+        break;
+      }
+      const parentDir = path.dirname(currentDir);
+      if (parentDir === currentDir) {
+        // Reached the filesystem root
+        break;
+      }
+      currentDir = parentDir;
+    }
+
+    // If a potential root was found, switch search directory and re-check
+    if (projectRootDir) {
+      searchDir = projectRootDir;
+      foundLockFiles = findLockFilesInDir(searchDir);
+    }
+    // If no projectRootDir found, foundLockFiles remains empty and searchDir remains cwd
+  }
+
+  // Handle results based on findings in the final searchDir
+  if (foundLockFiles.length === 1) {
+    // Successfully found one lock file in the determined searchDir
     return;
   }
-  console.warn(t('lockBestPractice'));
-  if (existingLockFiles.length === 0) {
-    throw new Error(t('lockNotFound'));
+
+  if (foundLockFiles.length > 1) {
+    // Found multiple lock files in the determined searchDir
+    console.warn(t('lockBestPractice'));
+    throw new Error(
+      t('multipleLocksFound', { lockFiles: foundLockFiles.join(', ') }),
+    );
   }
-  throw new Error(
-    t('multipleLocksFound', { lockFiles: existingLockFiles.join(', ') }),
-  );
+
+  // If we reach here, foundLockFiles.length === 0
+  console.warn(t('lockBestPractice'));
+  // Warn instead of throwing an error if no lock file is found
+  console.warn(t('lockNotFound'));
 }

package/src/utils/dep-versions.ts

@@ -1,19 +1,21 @@
 const currentPackage = require(`${process.cwd()}/package.json`);
 
-const depKeys = Object.keys(currentPackage.dependencies);
-const devDepKeys = Object.keys(currentPackage.devDependencies);
-const dedupedDeps = [...new Set([...depKeys, ...devDepKeys])];
-
 const _depVersions: Record<string, string> = {};
 
-for (const dep of dedupedDeps) {
-  try {
-    const packageJsonPath = require.resolve(`${dep}/package.json`, {
-      paths: [process.cwd()],
-    });
-    const version = require(packageJsonPath).version;
-    _depVersions[dep] = version;
-  } catch (e) {}
+if (currentPackage) {
+  const depKeys = currentPackage.dependencies ? Object.keys(currentPackage.dependencies) : [];
+  const devDepKeys = currentPackage.devDependencies ? Object.keys(currentPackage.devDependencies) : [];
+  const dedupedDeps = [...new Set([...depKeys, ...devDepKeys])];
+
+  for (const dep of dedupedDeps) {
+    try {
+      const packageJsonPath = require.resolve(`${dep}/package.json`, {
+        paths: [process.cwd()],
+      });
+      const version = require(packageJsonPath).version;
+      _depVersions[dep] = version;
+    } catch (e) {}
+  }
 }
 
 export const depVersions = Object.keys(_depVersions)