fix: 修复版本号获取问题

beezen · Oct 30, 2023 · b253aa3 · b253aa3
1 parent 8689f02
commit b253aa3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/actions/helper.js b/src/actions/helper.js
@@ -1,24 +1,23 @@
 import "colors";
 import shell from "shelljs";
 import inquirer from "inquirer";
-import pkg from "../../package.json";
 import { getLangMessage, setConfig } from "../common";
 import { baseInitConfig } from "../common/env";
 import { compareVersion } from "../utils/index";
 import { addUser, removeUser } from "./base";
 /**
  * 更新版本
- * @param 是否自动校验
+ * @param option 配置
+ * @param curVersion 当前版本号
  */
-export function updateVersion(option) {
+export function updateVersion(option, curVersion) {
   const { fileConfig } = baseInitConfig;
   const nucmrcConfig = fileConfig.nucm;
   let baseConfig = nucmrcConfig?.baseConfig;
   !baseConfig && (baseConfig = nucmrcConfig.baseConfig = {});
   baseConfig.checkUpdateDate = Date.now();
   setConfig("nucm", nucmrcConfig); // 更新校验时间记录
 
-  const curVersion = pkg.version;
   console.log(getLangMessage("MSG_update01").green);
   const latestVersion = shell.exec("npm view nucm version", { silent: true }).stdout.trim();
   if (!curVersion || !latestVersion) {

diff --git a/src/index.js b/src/index.js
@@ -2,9 +2,9 @@ import { Command } from "commander";
 import { getLangMessage, prepareEnv } from "./common/index";
 import { getUserList, changeUser, addUser, removeUser } from "./actions/base";
 import { updateVersion, changeLang, searchToSave } from "./actions/helper";
-import pkg from "../package.json";
 
 prepareEnv(() => {
+  const pkg = require("../package.json");
   const program = new Command();
   program.version(pkg.version, "-v,--version", getLangMessage("MSG_showVersion"));
   program.helpOption("-h, --help", getLangMessage("MSG_help"));
@@ -35,7 +35,7 @@ prepareEnv(() => {
     .command("update")
     .option("--silent", getLangMessage("MSG_updateSilent"))
     .description(getLangMessage("MSG_update"))
-    .action(updateVersion);
+    .action(options => updateVersion(options, pkg.version));
   program
     .command("save")
     .description(getLangMessage("MSG_save"))