react-native-update-cli 1.38.2 → 1.39.1

package/lib/bundle.js

@@ -134,6 +134,8 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
             });
         }
     }
+    const bundleParams = await (0, _utils.checkPlugins)();
+    const isSentry = bundleParams.sentry;
     const bundleCommand = usingExpo ? 'export:embed' : platform === 'harmony' ? 'bundle-harmony' : 'bundle';
     if (platform === 'harmony') {
         Array.prototype.push.apply(reactNativeBundleArgs, [
@@ -207,7 +209,7 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
                     await copyHarmonyBundle(outputFolder);
                 }
                 if (hermesEnabled) {
-                    await compileHermesByteCode(bundleName, outputFolder, sourcemapOutput);
+                    await compileHermesByteCode(bundleName, outputFolder, sourcemapOutput, !isSentry);
                 }
                 resolve(null);
             }
@@ -258,7 +260,7 @@ async function checkGradleConfig() {
         crunchPngs
     };
 }
-async function compileHermesByteCode(bundleName, outputFolder, sourcemapOutput) {
+async function compileHermesByteCode(bundleName, outputFolder, sourcemapOutput, shouldCleanSourcemap) {
     console.log('Hermes enabled, now compiling to hermes bytecode:\n');
     // >= rn 0.69
     const rnDir = _nodepath.default.dirname(require.resolve('react-native', {
@@ -303,8 +305,79 @@ async function compileHermesByteCode(bundleName, outputFolder, sourcemapOutput)
             stdio: 'ignore'
         });
     }
+    if (shouldCleanSourcemap) {
+        _fsextra.removeSync(_nodepath.default.join(outputFolder, `${bundleName}.txt.map`));
+    }
+}
+async function copyDebugidForSentry(bundleName, outputFolder, sourcemapOutput) {
+    if (sourcemapOutput) {
+        let copyDebugidPath;
+        try {
+            copyDebugidPath = require.resolve('@sentry/react-native/scripts/copy-debugid.js', {
+                paths: [
+                    process.cwd()
+                ]
+            });
+        } catch (error) {
+            console.error('无法找到 Sentry copy-debugid.js 脚本文件，请确保已正确安装 @sentry/react-native');
+            return;
+        }
+        if (!_fsextra.existsSync(copyDebugidPath)) {
+            return;
+        }
+        console.log('Copying debugid');
+        (0, _nodechild_process.spawnSync)('node', [
+            copyDebugidPath,
+            _nodepath.default.join(outputFolder, `${bundleName}.txt.map`),
+            _nodepath.default.join(outputFolder, `${bundleName}.map`)
+        ], {
+            stdio: 'ignore'
+        });
+    }
     _fsextra.removeSync(_nodepath.default.join(outputFolder, `${bundleName}.txt.map`));
 }
+async function uploadSourcemapForSentry(bundleName, outputFolder, sourcemapOutput, version) {
+    if (sourcemapOutput) {
+        let sentryCliPath;
+        try {
+            sentryCliPath = require.resolve('@sentry/cli/bin/sentry-cli', {
+                paths: [
+                    process.cwd()
+                ]
+            });
+        } catch (error) {
+            console.error('无法找到 Sentry CLI 工具，请确保已正确安装 @sentry/cli');
+            return;
+        }
+        if (!_fsextra.existsSync(sentryCliPath)) {
+            return;
+        }
+        (0, _nodechild_process.spawnSync)('node', [
+            sentryCliPath,
+            'releases',
+            'set-commits',
+            version,
+            '--auto'
+        ], {
+            stdio: 'inherit'
+        });
+        console.log(`Sentry release created for version: ${version}`);
+        console.log('Uploading sourcemap');
+        (0, _nodechild_process.spawnSync)('node', [
+            sentryCliPath,
+            'releases',
+            'files',
+            version,
+            'upload-sourcemaps',
+            '--strip-prefix',
+            _nodepath.default.join(process.cwd(), outputFolder),
+            _nodepath.default.join(outputFolder, bundleName),
+            _nodepath.default.join(outputFolder, `${bundleName}.map`)
+        ], {
+            stdio: 'inherit'
+        });
+    }
+}
 async function pack(dir, output) {
     console.log('Packing');
     _fsextra.ensureDirSync(_nodepath.default.dirname(output));
@@ -316,7 +389,7 @@ async function pack(dir, output) {
             }
             const childs = _fsextra.readdirSync(root);
             for (const name of childs){
-                if (name === '.' || name === '..' || name === 'index.bundlejs.map') {
+                if (name === '.' || name === '..' || name === 'index.bundlejs.map' || name === 'index.bundlejs.txt.map') {
                     continue;
                 }
                 const fullPath = _nodepath.default.join(root, name);
@@ -632,6 +705,9 @@ const commands = {
             ...options,
             platform
         });
+        const bundleParams = await (0, _utils.checkPlugins)();
+        const sourcemapPlugin = bundleParams.sourcemap;
+        const isSentry = bundleParams.sentry;
         const sourcemapOutput = _nodepath.default.join(intermediaDir, `${bundleName}.map`);
         const realOutput = output.replace(/\$\{time\}/g, `${Date.now()}`);
         if (!platform) {
@@ -639,11 +715,11 @@ const commands = {
         }
         const { version, major, minor } = (0, _utils.getRNVersion)();
         console.log(`Bundling with react-native: ${version}`);
-        await runReactNativeBundleCommand(bundleName, dev, entryFile, intermediaDir, platform, sourcemap ? sourcemapOutput : '');
+        await runReactNativeBundleCommand(bundleName, dev, entryFile, intermediaDir, platform, sourcemap || sourcemapPlugin ? sourcemapOutput : '');
         await pack(_nodepath.default.resolve(intermediaDir), realOutput);
         const v = await (0, _utils.question)('是否现在上传此热更包?(Y/N)');
         if (v.toLowerCase() === 'y') {
-            await this.publish({
+            const versionName = await this.publish({
                 args: [
                     realOutput
                 ],
@@ -651,6 +727,10 @@ const commands = {
                     platform
                 }
             });
+            if (isSentry) {
+                await copyDebugidForSentry(bundleName, intermediaDir, sourcemapOutput);
+                await uploadSourcemapForSentry(bundleName, intermediaDir, sourcemapOutput, versionName);
+            }
         }
     },
     async diff ({ args, options }) {

package/lib/utils/check-plugin.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "checkPlugins", {
+    enumerable: true,
+    get: function() {
+        return checkPlugins;
+    }
+});
+const _pluginconfig = require("./plugin-config");
+async function checkPlugins() {
+    const params = {
+        sentry: false,
+        sourcemap: false
+    };
+    for (const plugin of _pluginconfig.plugins){
+        try {
+            const isEnabled = await plugin.detect();
+            if (isEnabled && plugin.bundleParams) {
+                Object.assign(params, plugin.bundleParams);
+                console.log(`检测到 ${plugin.name} 插件,应用相应打包配置`);
+            }
+        } catch (err) {
+            console.warn(`检测 ${plugin.name} 插件时出错:`, err);
+        }
+    }
+    return params;
+}

package/lib/utils/index.js

@@ -9,6 +9,9 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+    checkPlugins: function() {
+        return _checkplugin.checkPlugins;
+    },
     getApkInfo: function() {
         return getApkInfo;
     },
@@ -45,6 +48,7 @@ const _appinfoparser = /*#__PURE__*/ _interop_require_default(require("./app-inf
 const _satisfies = /*#__PURE__*/ _interop_require_default(require("semver/functions/satisfies"));
 const _chalk = /*#__PURE__*/ _interop_require_default(require("chalk"));
 const _latestversion = /*#__PURE__*/ _interop_require_default(require("@badisi/latest-version"));
+const _checkplugin = require("./check-plugin");
 const _read = require("read");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {

package/lib/utils/plugin-config.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "plugins", {
+    enumerable: true,
+    get: function() {
+        return plugins;
+    }
+});
+const _fsextra = /*#__PURE__*/ _interop_require_default(require("fs-extra"));
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const plugins = [
+    {
+        name: 'sentry',
+        bundleParams: {
+            sentry: true,
+            sourcemap: true
+        },
+        detect: async ()=>{
+            try {
+                await _fsextra.default.access('ios/sentry.properties');
+                return true;
+            } catch (e) {
+                try {
+                    await _fsextra.default.access('android/sentry.properties');
+                    return true;
+                } catch (e) {
+                    return false;
+                }
+            }
+        }
+    }
+];

package/lib/versions.js

@@ -86,8 +86,9 @@ const commands = {
         const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
         const { appId } = await (0, _app.getSelectedApp)(platform);
         const { hash } = await (0, _api.uploadFile)(fn);
+        const versionName = name || await (0, _utils.question)('输入版本名称: ') || '(未命名)';
         const { id } = await (0, _api.post)(`/app/${appId}/version/create`, {
-            name: name || await (0, _utils.question)('输入版本名称: ') || '(未命名)',
+            name: versionName,
             hash,
             description: description || await (0, _utils.question)('输入版本描述:'),
             metaInfo: metaInfo || await (0, _utils.question)('输入自定义的 meta info:')
@@ -105,6 +106,7 @@ const commands = {
                 }
             });
         }
+        return versionName;
     },
     versions: async ({ options })=>{
         const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));

package/package.json

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

package/src/bundle.js

@@ -3,7 +3,7 @@ import { getRNVersion, translateOptions } from './utils';
 import * as fs from 'fs-extra';
 import { ZipFile } from 'yazl';
 import { open as openZipFile } from 'yauzl';
-import { question, printVersionCommand } from './utils';
+import { question, checkPlugins } from './utils';
 import { checkPlatform } from './app';
 import { spawn, spawnSync } from 'node:child_process';
 import semverSatisfies from 'semver/functions/satisfies';
@@ -86,6 +86,8 @@ async function runReactNativeBundleCommand(
       });
     }
   }
+  const bundleParams = await checkPlugins();
+  const isSentry = bundleParams.sentry;
   const bundleCommand = usingExpo
     ? 'export:embed'
     : platform === 'harmony'
@@ -190,6 +192,7 @@ async function runReactNativeBundleCommand(
             bundleName,
             outputFolder,
             sourcemapOutput,
+            !isSentry,
           );
         }
         resolve(null);
@@ -253,6 +256,7 @@ async function compileHermesByteCode(
   bundleName,
   outputFolder,
   sourcemapOutput,
+  shouldCleanSourcemap,
 ) {
   console.log('Hermes enabled, now compiling to hermes bytecode:\n');
   // >= rn 0.69
@@ -309,9 +313,98 @@ async function compileHermesByteCode(
       },
     );
   }
+  if (shouldCleanSourcemap) {
+    fs.removeSync(path.join(outputFolder, `${bundleName}.txt.map`));
+  }
+}
+
+async function copyDebugidForSentry(bundleName, outputFolder, sourcemapOutput) {
+  if (sourcemapOutput) {
+    let copyDebugidPath;
+    try {
+      copyDebugidPath = require.resolve(
+        '@sentry/react-native/scripts/copy-debugid.js',
+        {
+          paths: [process.cwd()],
+        },
+      );
+    } catch (error) {
+      console.error(
+        '无法找到 Sentry copy-debugid.js 脚本文件，请确保已正确安装 @sentry/react-native',
+      );
+      return;
+    }
+
+    if (!fs.existsSync(copyDebugidPath)) {
+      return;
+    }
+    console.log('Copying debugid');
+    spawnSync(
+      'node',
+      [
+        copyDebugidPath,
+        path.join(outputFolder, `${bundleName}.txt.map`),
+        path.join(outputFolder, `${bundleName}.map`),
+      ],
+      {
+        stdio: 'ignore',
+      },
+    );
+  }
   fs.removeSync(path.join(outputFolder, `${bundleName}.txt.map`));
 }
 
+async function uploadSourcemapForSentry(
+  bundleName,
+  outputFolder,
+  sourcemapOutput,
+  version,
+) {
+  if (sourcemapOutput) {
+    let sentryCliPath;
+    try {
+      sentryCliPath = require.resolve('@sentry/cli/bin/sentry-cli', {
+        paths: [process.cwd()],
+      });
+    } catch (error) {
+      console.error('无法找到 Sentry CLI 工具，请确保已正确安装 @sentry/cli');
+      return;
+    }
+
+    if (!fs.existsSync(sentryCliPath)) {
+      return;
+    }
+
+    spawnSync(
+      'node',
+      [sentryCliPath, 'releases', 'set-commits', version, '--auto'],
+      {
+        stdio: 'inherit',
+      },
+    );
+    console.log(`Sentry release created for version: ${version}`);
+
+    console.log('Uploading sourcemap');
+    spawnSync(
+      'node',
+      [
+        sentryCliPath,
+        'releases',
+        'files',
+        version,
+        'upload-sourcemaps',
+        '--strip-prefix',
+        path.join(process.cwd(), outputFolder),
+        path.join(outputFolder, bundleName),
+        path.join(outputFolder, `${bundleName}.map`),
+      ],
+      {
+        stdio: 'inherit',
+      },
+    );
+  }
+}
+
 async function pack(dir, output) {
   console.log('Packing');
   fs.ensureDirSync(path.dirname(output));
@@ -324,7 +417,7 @@ async function pack(dir, output) {
       }
       const childs = fs.readdirSync(root);
       for (const name of childs) {
-        if (name === '.' || name === '..' || name === 'index.bundlejs.map') {
+        if (name === '.' || name === '..' || name === 'index.bundlejs.map' || name === 'index.bundlejs.txt.map') {
           continue;
         }
         const fullPath = path.join(root, name);
@@ -724,6 +817,10 @@ export const commands = {
         platform,
       });
 
+    const bundleParams = await checkPlugins();
+    const sourcemapPlugin = bundleParams.sourcemap;
+    const isSentry = bundleParams.sentry;
+
     const sourcemapOutput = path.join(intermediaDir, `${bundleName}.map`);
 
     const realOutput = output.replace(/\$\{time\}/g, `${Date.now()}`);
@@ -742,19 +839,28 @@ export const commands = {
       entryFile,
       intermediaDir,
       platform,
-      sourcemap ? sourcemapOutput : '',
+      sourcemap || sourcemapPlugin ? sourcemapOutput : '',
     );
 
     await pack(path.resolve(intermediaDir), realOutput);
 
     const v = await question('是否现在上传此热更包?(Y/N)');
     if (v.toLowerCase() === 'y') {
-      await this.publish({
+    const versionName = await this.publish({
         args: [realOutput],
         options: {
           platform,
         },
       });
+      if (isSentry) {
+        await copyDebugidForSentry(bundleName, intermediaDir, sourcemapOutput);
+        await uploadSourcemapForSentry(
+          bundleName,
+          intermediaDir,
+          sourcemapOutput,
+          versionName,
+        );
+      }
     }
   },
 

package/src/utils/check-plugin.ts

@@ -0,0 +1,28 @@
+import { plugins } from './plugin-config';
+
+interface BundleParams {
+  sentry: boolean;
+  sourcemap: boolean;
+  [key: string]: any;
+}
+
+export async function checkPlugins(): Promise<BundleParams> {
+  const params: BundleParams = {
+    sentry: false,
+    sourcemap: false,
+  };
+
+  for (const plugin of plugins) {
+    try {
+      const isEnabled = await plugin.detect();
+      if (isEnabled && plugin.bundleParams) {
+        Object.assign(params, plugin.bundleParams);
+        console.log(`检测到 ${plugin.name} 插件,应用相应打包配置`);
+      }
+    } catch (err) {
+      console.warn(`检测 ${plugin.name} 插件时出错:`, err);
+    }
+  }
+
+  return params;
+}

package/src/utils/index.ts

@@ -6,6 +6,7 @@ import AppInfoParser from './app-info-parser';
 import semverSatisfies from 'semver/functions/satisfies';
 import chalk from 'chalk';
 import latestVersion from '@badisi/latest-version';
+import { checkPlugins } from './check-plugin';
 
 import { read } from 'read';
 
@@ -225,3 +226,5 @@ export async function printVersionCommand() {
 }
 
 export const pricingPageUrl = 'https://pushy.reactnative.cn/pricing.html';
+
+export { checkPlugins };

package/src/utils/plugin-config.ts

@@ -0,0 +1,32 @@
+import fs from 'fs-extra';
+
+interface PluginConfig {
+  name: string;
+  bundleParams?: {
+    [key: string]: any;
+  };
+  detect: () => Promise<boolean>;
+}
+
+export const plugins: PluginConfig[] = [
+  {
+    name: 'sentry',
+    bundleParams: {
+      sentry: true,
+      sourcemap: true,
+    },
+    detect: async () => {
+      try {
+        await fs.access('ios/sentry.properties');
+        return true;
+      } catch {
+        try {
+          await fs.access('android/sentry.properties');
+          return true;
+        } catch {
+          return false;
+        }
+      }
+    }
+  }
+];

package/src/versions.js

@@ -97,8 +97,9 @@ export const commands = {
 
     const { hash } = await uploadFile(fn);
 
+    const versionName = name || (await question('输入版本名称: ')) || '(未命名)';
     const { id } = await post(`/app/${appId}/version/create`, {
-      name: name || (await question('输入版本名称: ')) || '(未命名)',
+      name: versionName,
       hash,
       description: description || (await question('输入版本描述:')),
       metaInfo: metaInfo || (await question('输入自定义的 meta info:')),
@@ -111,6 +112,7 @@ export const commands = {
     if (v.toLowerCase() === 'y') {
       await this.update({ args: [], options: { versionId: id, platform } });
     }
+    return versionName;
   },
   versions: async ({ options }) => {
     const platform = checkPlatform(