@pisell/common 3.0.3 → 3.0.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @pisell/common
 
+## 3.0.5
+
+### Patch Changes
+
+- acc312ef1: s
+
+## 3.0.4
+
+### Patch Changes
+
+- bee46472d: feat: xzero 正式上传 privateKey 调整
+
 ## 3.0.3
 
 ### Patch Changes

package/es/script/constants/index.js

@@ -23,6 +23,16 @@ var outPathMap = {
     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 = {
@@ -30,7 +40,9 @@ var isSsrMap = {
   admin: false,
   my_pisel_pc_v2: true,
   my_pisel_h5_v2: true,
-  xzero: false
+  xzero: false,
+  saas_admin: false,
+  saas_shop: false
 };
 var checkPackages = ['@pisell/date-picker', '@pisell/lowcode-renderer', '@pisell/common', '@pisell/utils'];
 export { outPathMap, isSsrMap, checkPackages };

package/es/script/uploadCode/uploadCode.js

@@ -109,7 +109,7 @@ var UploadCode = /*#__PURE__*/function () {
 
               if (this.env === 'prod' && this.projectName === 'xzero') {
                 serverConfig = serverConfigMap.aws.service[this.env];
-                serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
+                serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
               }
 
               // pisell2.0正式环境使用亚马逊服务器

package/es/script/utils/index.js

@@ -72,7 +72,7 @@ var getGitCurrentBranch = /*#__PURE__*/function () {
  * monorepo项目名称
  * @type {string[]}
  */
-var monorepoProjectNameArr = ['admin'];
+var monorepoProjectNameArr = ['admin', 'my_pisell_v2'];
 
 /**
  * @Title: 获取本地lm_config.json配置信息
@@ -84,20 +84,21 @@ var getServerConfig = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
+          console.log(project, 'project');
           if (!monorepoProjectNameArr.includes(project)) {
-            _context3.next = 4;
+            _context3.next = 5;
             break;
           }
-          _context3.next = 3;
+          _context3.next = 4;
           return fs.readJson('../../../lm_config.json');
-        case 3:
-          return _context3.abrupt("return", _context3.sent);
         case 4:
-          _context3.next = 6;
-          return fs.readJson('../lm_config.json');
-        case 6:
           return _context3.abrupt("return", _context3.sent);
+        case 5:
+          _context3.next = 7;
+          return fs.readJson('../lm_config.json');
         case 7:
+          return _context3.abrupt("return", _context3.sent);
+        case 8:
         case "end":
           return _context3.stop();
       }

package/lib/script/constants/index.js

@@ -49,6 +49,16 @@ var outPathMap = {
     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 = {
@@ -56,7 +66,9 @@ var isSsrMap = {
   admin: false,
   my_pisel_pc_v2: true,
   my_pisel_h5_v2: true,
-  xzero: false
+  xzero: false,
+  saas_admin: false,
+  saas_shop: false
 };
 var checkPackages = [
   "@pisell/date-picker",

package/lib/script/uploadCode/uploadCode.js

@@ -87,7 +87,7 @@ var UploadCode = class {
     }
     if (this.env === "prod" && this.projectName === "xzero") {
       serverConfig = serverConfigMap.aws.service[this.env];
-      serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
+      serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
     }
     if (this.env === "prod" && this.projectName === "admin") {
       serverConfig = serverConfigMap.aws.service[this.env];

package/lib/script/utils/index.js

@@ -56,8 +56,9 @@ var getGitCurrentBranch = async () => {
   const v = await $`git symbolic-ref --short HEAD`;
   return v.stdout;
 };
-var monorepoProjectNameArr = ["admin"];
+var monorepoProjectNameArr = ["admin", "my_pisell_v2"];
 var getServerConfig = async (project) => {
+  console.log(project, "project");
   if (monorepoProjectNameArr.includes(project)) {
     return await fs.readJson("../../../lm_config.json");
   }

package/package.json

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

package/src/script/constants/index.js

@@ -24,6 +24,16 @@ const outPathMap = {
     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 = {
@@ -32,6 +42,8 @@ const isSsrMap = {
   my_pisel_pc_v2: true,
   my_pisel_h5_v2: true,
   xzero: false,
+  saas_admin: false,
+  saas_shop: false,
 };
 
 const checkPackages = [

package/src/script/uploadCode/uploadCode.js

@@ -88,7 +88,7 @@ class UploadCode {
 
     if (this.env === 'prod' && this.projectName === 'xzero') {
       serverConfig = serverConfigMap.aws.service[this.env];
-      serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
+      serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
     }
 
     // pisell2.0正式环境使用亚马逊服务器

package/src/script/utils/index.js

@@ -27,7 +27,7 @@ const getGitCurrentBranch = async () => {
  * monorepo项目名称
  * @type {string[]}
  */
-const monorepoProjectNameArr = ['admin'];
+const monorepoProjectNameArr = ['admin', 'my_pisell_v2'];
 
 /**
  * @Title: 获取本地lm_config.json配置信息
@@ -35,6 +35,7 @@ const monorepoProjectNameArr = ['admin'];
  * @Author: Zsj
  */
 const getServerConfig = async (project) => {
+  console.log(project,'project')
   if (monorepoProjectNameArr.includes(project)) {
     return await fs.readJson('../../../lm_config.json');
   }