@pisell/common 0.0.21-bata → 0.0.22

package/es/script/constants/index.js

@@ -8,6 +8,23 @@ var outPathMap = {
     prod: '../data/release/project/pisell_v2',
     release: '../data/release/project/pisell_v2',
     pre: '../data/release/project/pisell_v2'
+  },
+  my_pisel_pc_v2: {
+    prod: '../data/release/project/my_pisel_pc_v2',
+    release: '../data/release/project/my_pisel_pc_v2',
+    pre: '../data/release/project/my_pisel_pc_v2'
+  },
+  my_pisel_h5_v2: {
+    prod: '../data/release/project/my_pisel_h5_v2',
+    release: '../data/release/project/my_pisel_h5_v2',
+    pre: '../data/release/project/my_pisel_h5_v2'
   }
 };
-export { outPathMap };
+var isSsrMap = {
+  my_pisel_shop: false,
+  admin: false,
+  my_pisel_pc_v2: true,
+  my_pisel_h5_v2: true
+};
+var checkPackages = ['@pisell/date-picker', '@pisell/lowcode-renderer', '@pisell/common'];
+export { outPathMap, isSsrMap, checkPackages };

package/es/script/release/index.js

@@ -71,7 +71,7 @@ var getVersionList = /*#__PURE__*/function () {
         case 0:
           env = _ref.env, project = _ref.project;
           _context.next = 3;
-          return getServerConfig(project.fileName);
+          return getServerConfig();
         case 3:
           config = _context.sent;
           host = config[env].host;

package/es/script/release/release.js

@@ -43,7 +43,7 @@ var Release = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return getServerConfig(this.projectName);
+              return getServerConfig();
             case 2:
               serverConfigMap = _context.sent;
               serverConfig = serverConfigMap[this.env]; // 选择release默认用国内cn服务器

package/es/script/uploadCode/uploadCode.js

@@ -11,8 +11,8 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import archiver from 'archiver';
 import path from 'path';
-import { outPathMap } from "../constants/index.js";
-import { connectServer as _connectServer, getGitCurrentBranch, getServerConfig, isWorkingTreeClean, serverUnpack as _serverUnpack, serverUpload as _serverUpload } from "../utils/index.js";
+import { checkPackages, isSsrMap, outPathMap } from "../constants/index.js";
+import { checkPkgVersion, connectServer as _connectServer, getGitCurrentBranch, getServerConfig, isWorkingTreeClean, serverUnpack as _serverUnpack, serverUpload as _serverUpload } from "../utils/index.js";
 
 /**
  * @Title: 上传代码至服务器类
@@ -37,6 +37,8 @@ var UploadCode = /*#__PURE__*/function () {
     this.projectAbsolutePath = '';
     this.conn = null;
     this.serverConfig = null;
+    // 是否是ssr项目
+    this.isSSR = isSsrMap[this.projectName];
     this.outPath = outPathMap[this.projectName][this.env];
   }
 
@@ -61,12 +63,12 @@ var UploadCode = /*#__PURE__*/function () {
     key: "check",
     value: function () {
       var _check = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var serverConfigMap, serverConfig;
+        var serverConfigMap, _yield$checkPkgVersio, success, message, serverConfig;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return getServerConfig(this.projectName);
+              return getServerConfig();
             case 2:
               serverConfigMap = _context.sent;
               if (serverConfigMap) {
@@ -94,6 +96,19 @@ var UploadCode = /*#__PURE__*/function () {
               console.log('工作区不干净, 请先提交代码');
               return _context.abrupt("return", false);
             case 13:
+              _context.next = 15;
+              return checkPkgVersion(checkPackages);
+            case 15:
+              _yield$checkPkgVersio = _context.sent;
+              success = _yield$checkPkgVersio.success;
+              message = _yield$checkPkgVersio.message;
+              if (success) {
+                _context.next = 21;
+                break;
+              }
+              console.log(message);
+              return _context.abrupt("return", false);
+            case 21:
               serverConfig = this.setConfig(serverConfigMap[this.env]);
               if (this.env === 'prod') {
                 serverConfig.privateKey = fs.readFileSync(path.join(process.env.HOME, '.ssh', 'id_rsa'));
@@ -104,20 +119,20 @@ var UploadCode = /*#__PURE__*/function () {
                 serverConfig = this.setConfig(serverConfigMap.cn[this.env]);
               }
               if (serverConfig) {
-                _context.next = 19;
+                _context.next = 27;
                 break;
               }
               console.log('您当前没有权限!');
               return _context.abrupt("return", false);
-            case 19:
+            case 27:
               _context.t0 = console;
-              _context.next = 22;
+              _context.next = 30;
               return getGitCurrentBranch();
-            case 22:
+            case 30:
               _context.t1 = _context.sent;
               _context.t0.log.call(_context.t0, '当前主项目分支', _context.t1);
               return _context.abrupt("return", true);
-            case 25:
+            case 33:
             case "end":
               return _context.stop();
           }
@@ -342,7 +357,8 @@ var UploadCode = /*#__PURE__*/function () {
                 path: this.outPath,
                 fileName: "".concat(this.currentVersion),
                 fullFileName: "".concat(this.currentVersion, ".zip"),
-                changelog: this.changelog
+                changelog: this.changelog,
+                isSSR: this.isSSR
               });
             case 2:
               return _context7.abrupt("return", _context7.sent);

package/es/script/utils/index.js

@@ -5,6 +5,7 @@ function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import * as dotenv from 'dotenv';
+import npmCheck from 'npm-check';
 import path from 'path';
 import ssh2 from 'ssh2';
 
@@ -62,42 +63,27 @@ var getGitCurrentBranch = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * monorepo项目名称
- * @type {string[]}
- */
-var monorepoProjectNameArr = ['admin'];
-
 /**
  * @Title: 获取本地lm_config.json配置信息
- * @Describe:·
+ * @Describe:
  * @Author: Zsj
  */
 var getServerConfig = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(project) {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          if (!monorepoProjectNameArr.includes(project)) {
-            _context3.next = 4;
-            break;
-          }
-          _context3.next = 3;
-          return fs.readJson('../../lm_config.json');
-        case 3:
-          return _context3.abrupt("return", _context3.sent);
-        case 4:
-          _context3.next = 6;
+          _context3.next = 2;
           return fs.readJson('../lm_config.json');
-        case 6:
+        case 2:
           return _context3.abrupt("return", _context3.sent);
-        case 7:
+        case 3:
         case "end":
           return _context3.stop();
       }
     }, _callee3);
   }));
-  return function getServerConfig(_x) {
+  return function getServerConfig() {
     return _ref3.apply(this, arguments);
   };
 }();
@@ -170,7 +156,8 @@ var serverUnpack = function serverUnpack(conn, _ref5) {
   var path = _ref5.path,
     fileName = _ref5.fileName,
     fullFileName = _ref5.fullFileName,
-    changelog = _ref5.changelog;
+    changelog = _ref5.changelog,
+    isSSR = _ref5.isSSR;
   if (!conn) return Promise.reject('未连接服务器');
   // 文件全名
   return new Promise(function (resolve, reject) {
@@ -180,7 +167,7 @@ var serverUnpack = function serverUnpack(conn, _ref5) {
         reject(err);
         return;
       }
-      stream.end("\n             cd ".concat(path, "\n             unzip ").concat(fullFileName, " -d ").concat(fileName, " && mv ").concat(fileName, "/dist/* ").concat(fileName, "/ && rmdir ").concat(fileName, "/dist\n             rm -rf ").concat(fullFileName, "\n             echo \"").concat(changelog, "\" > ./").concat(fileName, "/changelog.md\n             sh deleteOldVersion.sh\n             exit\n            ") // 打开到path
+      stream.end("\n             cd ".concat(path, "\n             unzip ").concat(fullFileName, " -d ").concat(fileName, " && mv ").concat(fileName, "/dist/* ").concat(fileName, "/ && rmdir ").concat(fileName, "/dist\n             rm -rf ").concat(fullFileName, "\n             echo \"").concat(changelog, "\" > ./").concat(fileName, "/changelog.md\n             sh deleteOldVersion.sh\n             ").concat(isSSR ? 'pm2 restart server.js' : '', "\n             exit\n            ") // 打开到path
       // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
       // 删除1.0.0.zip
       // 写入changelog到changelog.md
@@ -329,8 +316,40 @@ var sendWebhook = /*#__PURE__*/function () {
       }
     }, _callee5);
   }));
-  return function sendWebhook(_x2) {
+  return function sendWebhook(_x) {
     return _ref9.apply(this, arguments);
   };
 }();
-export { isWorkingTreeClean, getServerConfig, connectServer, serverUpload, serverUnpack, versionSort, releaseProject, getGitCurrentBranch, getCurrentProjectName, loadJSON, getCurrentUserName, sendWebhook };
+var checkPkgVersion = /*#__PURE__*/function () {
+  var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(checkPackages) {
+    var currentState, pkgs, wrongPkg, errorMessage, isWrongVersion;
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          _context6.next = 2;
+          return npmCheck();
+        case 2:
+          currentState = _context6.sent;
+          pkgs = currentState.get('packages');
+          wrongPkg = pkgs.filter(function (item) {
+            return checkPackages.includes(item.moduleName) && item.mismatch;
+          });
+          errorMessage = wrongPkg.reduce(function (p, c) {
+            return "".concat(p, "\n     ").concat(c.moduleName, "\u672C\u5730\u7248\u672C").concat(c.installed, "\u9700\u5347\u7EA7\u81F3").concat(c.packageJson, "\n     ");
+          }, '');
+          isWrongVersion = wrongPkg.length;
+          return _context6.abrupt("return", {
+            success: !isWrongVersion,
+            message: errorMessage
+          });
+        case 8:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6);
+  }));
+  return function checkPkgVersion(_x2) {
+    return _ref10.apply(this, arguments);
+  };
+}();
+export { isWorkingTreeClean, getServerConfig, connectServer, serverUpload, serverUnpack, versionSort, releaseProject, getGitCurrentBranch, getCurrentProjectName, loadJSON, getCurrentUserName, sendWebhook, checkPkgVersion };

package/lib/script/constants/index.js

@@ -19,6 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/script/constants/index.js
 var constants_exports = {};
 __export(constants_exports, {
+  checkPackages: () => checkPackages,
+  isSsrMap: () => isSsrMap,
   outPathMap: () => outPathMap
 });
 module.exports = __toCommonJS(constants_exports);
@@ -32,9 +34,32 @@ var outPathMap = {
     prod: "../data/release/project/pisell_v2",
     release: "../data/release/project/pisell_v2",
     pre: "../data/release/project/pisell_v2"
+  },
+  my_pisel_pc_v2: {
+    prod: "../data/release/project/my_pisel_pc_v2",
+    release: "../data/release/project/my_pisel_pc_v2",
+    pre: "../data/release/project/my_pisel_pc_v2"
+  },
+  my_pisel_h5_v2: {
+    prod: "../data/release/project/my_pisel_h5_v2",
+    release: "../data/release/project/my_pisel_h5_v2",
+    pre: "../data/release/project/my_pisel_h5_v2"
   }
 };
+var isSsrMap = {
+  my_pisel_shop: false,
+  admin: false,
+  my_pisel_pc_v2: true,
+  my_pisel_h5_v2: true
+};
+var checkPackages = [
+  "@pisell/date-picker",
+  "@pisell/lowcode-renderer",
+  "@pisell/common"
+];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  checkPackages,
+  isSsrMap,
   outPathMap
 });

package/lib/script/release/index.js

@@ -79,7 +79,7 @@ var inquirerResult = (versionList) => {
 };
 var ignoreName = ["master", ".git", "pre-master"];
 var getVersionList = async ({ env, project }) => {
-  const config = await (0, import_utils.getServerConfig)(project.fileName);
+  const config = await (0, import_utils.getServerConfig)();
   let host = config[env].host;
   if (env === "release") {
     host = config.cn[env].host;

package/lib/script/release/release.js

@@ -39,7 +39,7 @@ var Release = class {
    * @Author: Zsj
    */
   async setConfig() {
-    const serverConfigMap = await (0, import_utils.getServerConfig)(this.projectName);
+    const serverConfigMap = await (0, import_utils.getServerConfig)();
     let serverConfig = serverConfigMap[this.env];
     if (this.env === "release") {
       serverConfig = serverConfigMap.cn[this.env];

package/lib/script/uploadCode/uploadCode.js

@@ -49,6 +49,7 @@ var UploadCode = class {
     this.projectAbsolutePath = "";
     this.conn = null;
     this.serverConfig = null;
+    this.isSSR = import_constants.isSsrMap[this.projectName];
     this.outPath = import_constants.outPathMap[this.projectName][this.env];
   }
   /**
@@ -66,7 +67,7 @@ var UploadCode = class {
    * @Author: Zsj
    */
   async check() {
-    const serverConfigMap = await (0, import_utils.getServerConfig)(this.projectName);
+    const serverConfigMap = await (0, import_utils.getServerConfig)();
     if (!serverConfigMap) {
       console.log("未找到发布脚本!");
       return false;
@@ -77,6 +78,11 @@ var UploadCode = class {
       console.log("工作区不干净, 请先提交代码");
       return false;
     }
+    const { success, message } = await (0, import_utils.checkPkgVersion)(import_constants.checkPackages);
+    if (!success) {
+      console.log(message);
+      return false;
+    }
     let serverConfig = this.setConfig(serverConfigMap[this.env]);
     if (this.env === "prod") {
       serverConfig.privateKey = fs.readFileSync(
@@ -183,7 +189,8 @@ var UploadCode = class {
       path: this.outPath,
       fileName: `${this.currentVersion}`,
       fullFileName: `${this.currentVersion}.zip`,
-      changelog: this.changelog
+      changelog: this.changelog,
+      isSSR: this.isSSR
     });
   }
   /**

package/lib/script/utils/index.js

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/script/utils/index.js
 var utils_exports = {};
 __export(utils_exports, {
+  checkPkgVersion: () => checkPkgVersion,
   connectServer: () => connectServer,
   getCurrentProjectName: () => getCurrentProjectName,
   getCurrentUserName: () => getCurrentUserName,
@@ -44,6 +45,7 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var dotenv = __toESM(require("dotenv"));
+var import_npm_check = __toESM(require("npm-check"));
 var import_path = __toESM(require("path"));
 var import_ssh2 = __toESM(require("ssh2"));
 var isWorkingTreeClean = async () => {
@@ -54,11 +56,7 @@ var getGitCurrentBranch = async () => {
   const v = await $`git symbolic-ref --short HEAD`;
   return v.stdout;
 };
-var monorepoProjectNameArr = ["admin"];
-var getServerConfig = async (project) => {
-  if (monorepoProjectNameArr.includes(project)) {
-    return await fs.readJson("../../lm_config.json");
-  }
+var getServerConfig = async () => {
   return await fs.readJson("../lm_config.json");
 };
 var connectServer = (config2) => {
@@ -116,7 +114,7 @@ var serverUpload = (conn, { localPath, remotePath }) => {
     });
   });
 };
-var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog }) => {
+var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog, isSSR }) => {
   if (!conn)
     return Promise.reject("未连接服务器");
   return new Promise((resolve, reject) => {
@@ -133,6 +131,7 @@ var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog }) =>
              rm -rf ${fullFileName}
              echo "${changelog}" > ./${fileName}/changelog.md
              sh deleteOldVersion.sh
+             ${isSSR ? "pm2 restart server.js" : ""}
              exit
             `
         // 打开到path
@@ -235,8 +234,26 @@ var sendWebhook = async ({ title, content }) => {
   });
   return await response.json();
 };
+var checkPkgVersion = async (checkPackages) => {
+  const currentState = await (0, import_npm_check.default)();
+  const pkgs = currentState.get("packages");
+  const wrongPkg = pkgs.filter((item) => {
+    return checkPackages.includes(item.moduleName) && item.mismatch;
+  });
+  const errorMessage = wrongPkg.reduce((p, c) => {
+    return `${p}
+     ${c.moduleName}本地版本${c.installed}需升级至${c.packageJson}
+     `;
+  }, "");
+  const isWrongVersion = wrongPkg.length;
+  return {
+    success: !isWrongVersion,
+    message: errorMessage
+  };
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  checkPkgVersion,
   connectServer,
   getCurrentProjectName,
   getCurrentUserName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "0.0.21-bata",
+  "version": "0.0.22",
   "description": "A collection of reusable UI components for web development",
   "license": "MIT",
   "sideEffects": [
@@ -63,6 +63,7 @@
     "array-move": "^3.0.1",
     "dotenv": "^16.0.3",
     "inquirer": "^9.2.6",
+    "npm-check": "^6.0.1",
     "react-beautiful-dnd": "^13.1.0",
     "react-color": "^2.19.3",
     "ssh2": "^1.13.0",