@pisell/common 0.0.21 → 0.0.22

package/es/script/constants/index.js

@@ -26,4 +26,5 @@ var isSsrMap = {
   my_pisel_pc_v2: true,
   my_pisel_h5_v2: true
 };
-export { outPathMap, isSsrMap };
+var checkPackages = ['@pisell/date-picker', '@pisell/lowcode-renderer', '@pisell/common'];
+export { outPathMap, isSsrMap, checkPackages };

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 { isSsrMap, 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: 上传代码至服务器类
@@ -63,7 +63,7 @@ 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:
@@ -96,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'));
@@ -106,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();
           }

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';
 
@@ -319,4 +320,36 @@ var sendWebhook = /*#__PURE__*/function () {
     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,7 @@ 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
 });
@@ -51,8 +52,14 @@ var isSsrMap = {
   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/uploadCode/uploadCode.js

@@ -78,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(

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 () => {
@@ -232,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",
+  "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",