@pisell/common 1.0.42 → 1.0.44

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @pisell/common
 
+## 1.0.44
+
+### Patch Changes
+
+- f4db8d9a3: build:增加上传代码前的包版本检查
+
+## 1.0.43
+
+### Patch Changes
+
+- 740ab6b52: s
+
 ## 1.0.42
 
 ### Patch Changes

package/es/script/constants/index.js

@@ -18,13 +18,31 @@ var outPathMap = {
     prod: '../data/release/project/my_pisel_h5_v2',
     release: '../data/release/project/my_pisel_h5_v2',
     pre: '../data/release/project/my_pisel_h5_v2'
+  },
+  xzero: {
+    prod: '../data/release/project/xzero',
+    release: '../data/release/project/xzero',
+    pre: '../data/release/project/xzero'
+  },
+  saas_admin: {
+    prod: '../data/release/project/saas_admin',
+    release: '../data/release/project/saas_admin',
+    pre: '../data/release/project/saas_admin'
+  },
+  saas_shop: {
+    prod: '../data/release/project/saas_shop',
+    release: '../data/release/project/saas_shop',
+    pre: '../data/release/project/saas_shop'
   }
 };
 var isSsrMap = {
   my_pisel_shop: false,
   admin: false,
   my_pisel_pc_v2: true,
-  my_pisel_h5_v2: true
+  my_pisel_h5_v2: true,
+  xzero: false,
+  saas_admin: false,
+  saas_shop: false
 };
-var checkPackages = ['@pisell/date-picker', '@pisell/lowcode-renderer', '@pisell/common', '@pisell/utils'];
+var checkPackages = ['@pisell/date-picker', '@pisell/lowcode-renderer', '@pisell/common', '@pisell/utils', '@pisell/materials'];
 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]); // 选择release默认用国内cn服务器
               if (this.env === "release") {
                 serverConfig = this.setConfig(serverConfigMap.cn[this.env]);
@@ -115,20 +128,20 @@ var UploadCode = /*#__PURE__*/function () {
               console.log(serverConfig, 'serverConfig');
               this.setConfig(serverConfig);
               if (serverConfig) {
-                _context.next = 22;
+                _context.next = 30;
                 break;
               }
               console.log("您当前没有权限!");
               return _context.abrupt("return", false);
-            case 22:
+            case 30:
               _context.t0 = console;
-              _context.next = 25;
+              _context.next = 33;
               return getGitCurrentBranch();
-            case 25:
+            case 33:
               _context.t1 = _context.sent;
               _context.t0.log.call(_context.t0, "当前主项目分支", _context.t1);
               return _context.abrupt("return", true);
-            case 28:
+            case 36:
             case "end":
               return _context.stop();
           }

package/lib/script/constants/index.js

@@ -44,19 +44,38 @@ var outPathMap = {
     prod: "../data/release/project/my_pisel_h5_v2",
     release: "../data/release/project/my_pisel_h5_v2",
     pre: "../data/release/project/my_pisel_h5_v2"
+  },
+  xzero: {
+    prod: "../data/release/project/xzero",
+    release: "../data/release/project/xzero",
+    pre: "../data/release/project/xzero"
+  },
+  saas_admin: {
+    prod: "../data/release/project/saas_admin",
+    release: "../data/release/project/saas_admin",
+    pre: "../data/release/project/saas_admin"
+  },
+  saas_shop: {
+    prod: "../data/release/project/saas_shop",
+    release: "../data/release/project/saas_shop",
+    pre: "../data/release/project/saas_shop"
   }
 };
 var isSsrMap = {
   my_pisel_shop: false,
   admin: false,
   my_pisel_pc_v2: true,
-  my_pisel_h5_v2: true
+  my_pisel_h5_v2: true,
+  xzero: false,
+  saas_admin: false,
+  saas_shop: false
 };
 var checkPackages = [
   "@pisell/date-picker",
   "@pisell/lowcode-renderer",
   "@pisell/common",
-  "@pisell/utils"
+  "@pisell/utils",
+  "@pisell/materials"
 ];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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 === "release") {
       serverConfig = this.setConfig(serverConfigMap.cn[this.env]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "1.0.42",
+  "version": "1.0.44",
   "sideEffects": [
     "*.less"
   ],

package/src/script/constants/index.js

@@ -19,6 +19,21 @@ const outPathMap = {
     release: '../data/release/project/my_pisel_h5_v2',
     pre: '../data/release/project/my_pisel_h5_v2',
   },
+  xzero: {
+    prod: '../data/release/project/xzero',
+    release: '../data/release/project/xzero',
+    pre: '../data/release/project/xzero',
+  },
+  saas_admin: {
+    prod: '../data/release/project/saas_admin',
+    release: '../data/release/project/saas_admin',
+    pre: '../data/release/project/saas_admin',
+  },
+  saas_shop: {
+    prod: '../data/release/project/saas_shop',
+    release: '../data/release/project/saas_shop',
+    pre: '../data/release/project/saas_shop',
+  },
 };
 
 const isSsrMap = {
@@ -26,6 +41,9 @@ const isSsrMap = {
   admin: false,
   my_pisel_pc_v2: true,
   my_pisel_h5_v2: true,
+  xzero: false,
+  saas_admin: false,
+  saas_shop: false,
 };
 
 const checkPackages = [
@@ -33,6 +51,7 @@ const checkPackages = [
   '@pisell/lowcode-renderer',
   '@pisell/common',
   '@pisell/utils',
+  '@pisell/materials',
 ];
 
-export { outPathMap,  isSsrMap, checkPackages };
+export { outPathMap, isSsrMap, checkPackages };

package/src/script/uploadCode/uploadCode.js

@@ -1,7 +1,8 @@
 import archiver from "archiver";
 import path from "path";
-import { isSsrMap, outPathMap } from "../constants/index.js";
+import { checkPackages, isSsrMap, outPathMap } from "../constants/index.js";
 import {
+  checkPkgVersion,
   connectServer,
   getGitCurrentBranch,
   getServerConfig,
@@ -72,6 +73,13 @@ class UploadCode {
       return false;
     }
 
+    const { success, message } = await checkPkgVersion(checkPackages);
+
+    if (!success) {
+      console.log(message);
+      return false;
+    }
+
     let serverConfig = this.setConfig(serverConfigMap[this.env]);
 
     // 选择release默认用国内cn服务器