react-native-update-cli 1.42.2 → 1.43.0

package/cli.json

@@ -136,11 +136,11 @@
           "hasValue": true
         },
         "intermediaDir": {
-          "default": ".pushy/intermedia/${platform}",
+          "default": "${tempDir}/intermedia/${platform}",
           "hasValue": true
         },
         "output": {
-          "default": ".pushy/output/${platform}.${time}.ppk",
+          "default": "${tempDir}/output/${platform}.${time}.ppk",
           "hasValue": true
         },
         "sourcemap": {
@@ -167,7 +167,7 @@
       "description": "Create diff patch",
       "options": {
         "output": {
-          "default": ".pushy/output/diff",
+          "default": "${tempDir}/output/diff",
           "hasValue": true
         }
       }
@@ -176,7 +176,7 @@
       "description": "Create diff patch from a Android package(.apk)",
       "options": {
         "output": {
-          "default": ".pushy/output/diff-${time}.apk-patch",
+          "default": "${tempDir}/output/diff-${time}.apk-patch",
           "hasValue": true
         }
       }
@@ -185,7 +185,7 @@
       "description": "Create diff patch from a iOS package(.ipa)",
       "options": {
         "output": {
-          "default": ".pushy/output/diff-${time}.ipa-patch",
+          "default": "${tempDir}/output/diff-${time}.ipa-patch",
           "hasValue": true
         }
       }
@@ -194,7 +194,7 @@
       "description": "Create hdiff patch",
       "options": {
         "output": {
-          "default": ".pushy/output/hdiff",
+          "default": "${tempDir}/output/hdiff",
           "hasValue": true
         }
       }
@@ -203,7 +203,7 @@
       "description": "Create hdiff patch from a Android package(.apk)",
       "options": {
         "output": {
-          "default": ".pushy/output/hdiff-${time}.apk-patch",
+          "default": "${tempDir}/output/hdiff-${time}.apk-patch",
           "hasValue": true
         }
       }
@@ -212,7 +212,7 @@
       "description": "Create hdiff patch from a Prepare package(.ppk)",
       "options": {
         "output": {
-          "default": ".pushy/output/hdiff-${time}.ppk-patch",
+          "default": "${tempDir}/output/hdiff-${time}.ppk-patch",
           "hasValue": true
         }
       }
@@ -221,7 +221,7 @@
       "description": "Create hdiff patch from a Harmony package(.app)",
       "options": {
         "output": {
-          "default": ".pushy/output/hdiff-${time}.app-patch",
+          "default": "${tempDir}/output/hdiff-${time}.app-patch",
           "hasValue": true
         }
       }
@@ -230,7 +230,7 @@
       "description": "Create hdiff patch from a iOS package(.ipa)",
       "options": {
         "output": {
-          "default": ".pushy/output/hdiff-${time}.ipa-patch",
+          "default": "${tempDir}/output/hdiff-${time}.ipa-patch",
           "hasValue": true
         }
       }
@@ -241,4 +241,4 @@
       "default": false
     }
   }
-}
+}

package/lib/bundle.js

@@ -29,6 +29,10 @@ const _nodechild_process = require("node:child_process");
 const _satisfies = /*#__PURE__*/ _interop_require_default(require("semver/functions/satisfies"));
 const _nodeos = /*#__PURE__*/ _interop_require_default(require("node:os"));
 const _depversions = require("./utils/dep-versions");
+const _i18n = require("./utils/i18n");
+const _constants = require("./utils/constants");
+const _checklockfile = require("./utils/check-lockfile");
+const _addgitignore = require("./utils/add-gitignore");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -464,7 +468,9 @@ async function pack(dir, output) {
         });
         zipfile.end();
     });
-    console.log(`ppk热更包已生成并保存到: ${output}`);
+    console.log((0, _i18n.t)('ppkPackageGenerated', {
+        output
+    }));
 }
 function readEntire(entry, zipFile) {
     const buffers = [];
@@ -757,8 +763,11 @@ const commands = {
         const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
         const { bundleName, entryFile, intermediaDir, output, dev, sourcemap, taro, expo, rncli, disableHermes } = (0, _utils.translateOptions)({
             ...options,
+            tempDir: _constants.tempDir,
             platform
         });
+        (0, _checklockfile.checkLockFiles)();
+        (0, _addgitignore.addGitIgnore)();
         const bundleParams = await (0, _utils.checkPlugins)();
         const sourcemapPlugin = bundleParams.sourcemap;
         const isSentry = bundleParams.sentry;

package/lib/locales/en.js

@@ -12,7 +12,7 @@ const _default = {
     updateNotifier: 'Run `{updateCommand}` to update the CLI to get continuous improvements in features, performance, and security.',
     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.
@@ -38,5 +38,6 @@ This can reduce the risk of inconsistent dependencies and supply chain attacks.
     createAppSuccess: 'App created successfully (id: {{id}})',
     cancelled: 'Cancelled',
     operationSuccess: 'Operation successful',
-    failedToParseUpdateJson: 'Failed to parse file `update.json`. Try to remove it manually.'
+    failedToParseUpdateJson: 'Failed to parse file `update.json`. Try to remove it manually.',
+    ppkPackageGenerated: 'ppk package generated and saved to: {{output}}'
 };

package/lib/locales/zh.js

@@ -19,7 +19,7 @@ const _default = {
 3. 代码审核时应关注 lock 文件的变化。
 这样可以最大限度避免因依赖关系不一致而导致的热更异常，也降低供应链攻击等安全隐患。
 `,
-    multipleLocksFound: '检测到多种不同格式的锁文件({lockFiles})，这可能导致依赖关系不一致而使热更异常。',
+    multipleLocksFound: '检测到多种不同格式的锁文件({{lockFiles}})，这可能导致依赖关系不一致而使热更异常。',
     loginExpired: '登录信息已过期，请使用 `pushy login` 命令重新登录',
     fileSizeExceeded: '此文件大小 {{fileSize}} , 超出当前额度 {{maxSize}} 。您可以考虑升级付费业务以提升此额度。详情请访问: {{pricingPageUrl}}',
     bundleNotFound: '找不到 bundle 文件。请确保此 {{packageType}} 为 release 版本，且 bundle 文件名为默认的 `{{entryFile}}`',
@@ -38,5 +38,6 @@ const _default = {
     createAppSuccess: '已成功创建应用（id: {{id}}）',
     cancelled: '已取消',
     operationSuccess: '操作成功',
-    failedToParseUpdateJson: '无法解析文件 `update.json`。请手动删除它。'
+    failedToParseUpdateJson: '无法解析文件 `update.json`。请手动删除它。',
+    ppkPackageGenerated: 'ppk 热更包已生成并保存到: {{output}}'
 };

package/lib/utils/add-gitignore.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "addGitIgnore", {
+    enumerable: true,
+    get: function() {
+        return addGitIgnore;
+    }
+});
+const _nodefs = /*#__PURE__*/ _interop_require_default(require("node:fs"));
+const _constants = require("./constants");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function addGitIgnore() {
+    const shouldIgnore = [
+        _constants.credentialFile,
+        _constants.tempDir
+    ];
+    const gitignorePath = '.gitignore';
+    if (!_nodefs.default.existsSync(gitignorePath)) {
+        return;
+    }
+    const gitignoreContent = _nodefs.default.readFileSync(gitignorePath, 'utf-8');
+    const gitignoreLines = gitignoreContent.split('\n');
+    for (const line of gitignoreLines){
+        const index = shouldIgnore.indexOf(line.trim());
+        if (index !== -1) {
+            shouldIgnore.splice(index, 1);
+        }
+    }
+    if (shouldIgnore.length > 0) {
+        gitignoreLines.push('# react-native-update');
+        for (const line of shouldIgnore){
+            gitignoreLines.push(line);
+            console.log(`Added ${line} to .gitignore`);
+        }
+        _nodefs.default.writeFileSync(gitignorePath, gitignoreLines.join('\n'));
+    }
+}

package/lib/utils/check-lockfile.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "checkLockFiles", {
+    enumerable: true,
+    get: function() {
+        return checkLockFiles;
+    }
+});
+const _nodefs = /*#__PURE__*/ _interop_require_default(require("node:fs"));
+const _i18n = require("./i18n");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const lockFiles = [
+    'package-lock.json',
+    'yarn.lock',
+    'pnpm-lock.yaml',
+    'bun.lockb',
+    'bun.lock'
+];
+const existingLockFiles = [];
+function checkLockFiles() {
+    for (const file of lockFiles){
+        if (_nodefs.default.existsSync(file)) {
+            existingLockFiles.push(file);
+        }
+    }
+    if (existingLockFiles.length === 1) {
+        return;
+    }
+    console.warn((0, _i18n.t)('lockBestPractice'));
+    if (existingLockFiles.length === 0) {
+        throw new Error((0, _i18n.t)('lockNotFound'));
+    }
+    throw new Error((0, _i18n.t)('multipleLocksFound', {
+        lockFiles: existingLockFiles.join(', ')
+    }));
+}

package/package.json

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

package/src/bundle.ts

@@ -11,6 +11,10 @@ const g2js = require('gradle-to-js/lib/parser');
 import os from 'node:os';
 const properties = require('properties');
 import { depVersions } from './utils/dep-versions';
+import { t } from './utils/i18n';
+import { tempDir } from './utils/constants';
+import { checkLockFiles } from './utils/check-lockfile';
+import { addGitIgnore } from './utils/add-gitignore';
 
 let bsdiff;
 let hdiff;
@@ -512,7 +516,7 @@ async function pack(dir: string, output: string) {
     });
     zipfile.end();
   });
-  console.log(`ppk热更包已生成并保存到: ${output}`);
+  console.log(t('ppkPackageGenerated', { output }));
 }
 
 export function readEntire(entry: string, zipFile: ZipFile) {
@@ -907,9 +911,13 @@ export const commands = {
       disableHermes,
     } = translateOptions({
       ...options,
+      tempDir,
       platform,
     });
 
+    checkLockFiles();
+    addGitIgnore();
+
     const bundleParams = await checkPlugins();
     const sourcemapPlugin = bundleParams.sourcemap;
     const isSentry = bundleParams.sentry;

package/src/locales/en.ts

@@ -6,7 +6,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.
@@ -39,4 +39,5 @@ This can reduce the risk of inconsistent dependencies and supply chain attacks.
   cancelled: 'Cancelled',
   operationSuccess: 'Operation successful',
   failedToParseUpdateJson: 'Failed to parse file `update.json`. Try to remove it manually.',
+  ppkPackageGenerated: 'ppk package generated and saved to: {{output}}',
 };

package/src/locales/zh.ts

@@ -12,7 +12,7 @@ export default {
 这样可以最大限度避免因依赖关系不一致而导致的热更异常，也降低供应链攻击等安全隐患。
 `,
   multipleLocksFound:
-    '检测到多种不同格式的锁文件({lockFiles})，这可能导致依赖关系不一致而使热更异常。',
+    '检测到多种不同格式的锁文件({{lockFiles}})，这可能导致依赖关系不一致而使热更异常。',
   loginExpired: '登录信息已过期，请使用 `pushy login` 命令重新登录',
   fileSizeExceeded:
     '此文件大小 {{fileSize}} , 超出当前额度 {{maxSize}} 。您可以考虑升级付费业务以提升此额度。详情请访问: {{pricingPageUrl}}',
@@ -37,4 +37,5 @@ export default {
   cancelled: '已取消',
   operationSuccess: '操作成功',
   failedToParseUpdateJson: '无法解析文件 `update.json`。请手动删除它。',
+  ppkPackageGenerated: 'ppk 热更包已生成并保存到: {{output}}',
 };

package/src/utils/add-gitignore.ts

@@ -0,0 +1,34 @@
+import fs from 'node:fs';
+// import path from 'node:path';
+import { credentialFile, tempDir } from './constants';
+
+export function addGitIgnore() {
+  const shouldIgnore = [credentialFile, tempDir];
+
+  const gitignorePath = '.gitignore';
+
+  if (!fs.existsSync(gitignorePath)) {
+    return;
+  }
+
+  const gitignoreContent = fs.readFileSync(gitignorePath, 'utf-8');
+
+  const gitignoreLines = gitignoreContent.split('\n');
+
+  for (const line of gitignoreLines) {
+    const index = shouldIgnore.indexOf(line.trim());
+    if (index !== -1) {
+      shouldIgnore.splice(index, 1);
+    }
+  }
+
+  if (shouldIgnore.length > 0) {
+    gitignoreLines.push('# react-native-update');
+    for (const line of shouldIgnore) {
+      gitignoreLines.push(line);
+      console.log(`Added ${line} to .gitignore`);
+    }
+
+    fs.writeFileSync(gitignorePath, gitignoreLines.join('\n'));
+  }
+}

package/src/utils/check-lockfile.ts

@@ -0,0 +1,29 @@
+import fs from 'node:fs';
+import { t } from './i18n';
+
+const lockFiles = [
+  'package-lock.json',
+  'yarn.lock',
+  'pnpm-lock.yaml',
+  'bun.lockb',
+  'bun.lock',
+];
+
+const existingLockFiles: string[] = [];
+export function checkLockFiles() {
+  for (const file of lockFiles) {
+    if (fs.existsSync(file)) {
+      existingLockFiles.push(file);
+    }
+  }
+  if (existingLockFiles.length === 1) {
+    return;
+  }
+  console.warn(t('lockBestPractice'));
+  if (existingLockFiles.length === 0) {
+    throw new Error(t('lockNotFound'));
+  }
+  throw new Error(
+    t('multipleLocksFound', { lockFiles: existingLockFiles.join(', ') }),
+  );
+}

package/lib/utils/lock-checker.js

@@ -1,8 +0,0 @@
-"use strict";
-const lockFiles = [
-    'package-lock.json',
-    'yarn.lock',
-    'pnpm-lock.yaml',
-    'bun.lockb',
-    'bun.lock'
-];

package/src/utils/lock-checker.ts

@@ -1,7 +0,0 @@
-const lockFiles = [
-  'package-lock.json',
-  'yarn.lock',
-  'pnpm-lock.yaml',
-  'bun.lockb',
-  'bun.lock',
-];