@pisell/common 3.0.15 → 3.0.17

package/CHANGELOG.md

@@ -1,291 +1,13 @@
 # @pisell/common
 
-## 3.0.15
+## 3.0.17
 
 ### Patch Changes
 
-- Updated dependencies [841161d824]
-  - @pisell/utils@3.0.4
+- 333165e3b: s
 
-## 3.0.14
+## 3.0.16
 
 ### Patch Changes
 
-- Updated dependencies [66adcd5db]
-  - @pisell/utils@3.0.3
-
-## 3.0.13
-
-### Patch Changes
-
-- Updated dependencies [e00e79597]
-  - @pisell/utils@3.0.2
-
-## 3.0.12
-
-### Patch Changes
-
-- Updated dependencies [995527380]
-  - @pisell/utils@3.0.1
-
-## 3.0.11
-
-### Patch Changes
-
-- cf72095e7: update
-
-## 3.0.9
-
-### Patch Changes
-
-- ab5a8d1df: 新增 saas_home 项目路径并更新相关逻辑
-
-## 3.0.10
-
-### Patch Changes
-
-- Updated dependencies [f15c3be02]
-  - @pisell/utils@1.0.44
-
-## 3.0.9
-
-### Patch Changes
-
-- Updated dependencies [2f57417ac]
-  - @pisell/utils@1.0.43
-
-## 3.0.8
-
-### Patch Changes
-
-- 75d3934ab: build:增加上传代码前的包版本检查
-
-## 3.0.7
-
-### Patch Changes
-
-- 6c5bc9634: update
-
-## 3.0.6
-
-### Patch Changes
-
-- f5ad04b73: saas_admin saas_shop 不上传 cdn
-
-## 3.0.5
-
-### Patch Changes
-
-- acc312ef1: s
-
-## 3.0.4
-
-### Patch Changes
-
-- bee46472d: feat: xzero 正式上传 privateKey 调整
-
-## 3.0.3
-
-### Patch Changes
-
-- 8c34062b6: xzero 正式上传调整
-
-## 3.0.2
-
-### Patch Changes
-
-- add57fee8: xzero 不上传 oss
-
-## 3.0.1
-
-### Patch Changes
-
-- f8847ef9a: s
-
-## 1.0.27
-
-### Patch Changes
-
-- 7b7637320: s
-
-## 1.0.26
-
-### Patch Changes
-
-- Updated dependencies [8dc07315]
-- Updated dependencies [678cac4f]
-  - @pisell/utils@1.0.29
-
-## 1.0.25
-
-### Patch Changes
-
-- Updated dependencies [532f075e]
-  - @pisell/utils@1.0.28
-
-## 1.0.24
-
-### Patch Changes
-
-- Updated dependencies [77f985d0]
-  - @pisell/utils@1.0.25
-
-## 1.0.23
-
-### Patch Changes
-
-- Updated dependencies [315258e3]
-  - @pisell/utils@1.0.24
-
-## 1.0.22
-
-### Patch Changes
-
-- Updated dependencies [fdc8fae]
-  - @pisell/utils@1.0.23
-
-## 1.0.21
-
-### Patch Changes
-
-- Updated dependencies [bbd6503]
-  - @pisell/utils@1.0.22
-
-## 1.0.20
-
-### Patch Changes
-
-- Updated dependencies [d000328]
-  - @pisell/utils@1.0.21
-
-## 1.0.19
-
-### Patch Changes
-
-- Updated dependencies [b879dad]
-  - @pisell/utils@1.0.20
-
-## 1.0.18
-
-### Patch Changes
-
-- Updated dependencies [67d2110]
-  - @pisell/utils@1.0.19
-
-## 1.0.17
-
-### Patch Changes
-
-- Updated dependencies [770c6cb]
-  - @pisell/utils@1.0.18
-
-## 1.0.16
-
-### Patch Changes
-
-- Updated dependencies [443a959]
-  - @pisell/utils@1.0.17
-
-## 1.0.15
-
-### Patch Changes
-
-- Updated dependencies [32fd732]
-  - @pisell/utils@1.0.16
-
-## 1.0.14
-
-### Patch Changes
-
-- Updated dependencies [0f0601e]
-  - @pisell/utils@1.0.15
-
-## 1.0.13
-
-### Patch Changes
-
-- Updated dependencies [bf50fb5]
-  - @pisell/utils@1.0.14
-
-## 1.0.12
-
-### Patch Changes
-
-- Updated dependencies [b41ebaf]
-  - @pisell/utils@1.0.13
-
-## 1.0.11
-
-### Patch Changes
-
-- Updated dependencies [e1a659c]
-  - @pisell/utils@1.0.12
-
-## 1.0.10
-
-### Patch Changes
-
-- Updated dependencies [64ce1de]
-  - @pisell/utils@1.0.11
-
-## 1.0.9
-
-### Patch Changes
-
-- Updated dependencies [eef8cdb]
-  - @pisell/utils@1.0.10
-
-## 1.0.8
-
-### Patch Changes
-
-- Updated dependencies [ab61ee2]
-  - @pisell/utils@1.0.9
-
-## 1.0.7
-
-### Patch Changes
-
-- Updated dependencies [88d5ebc]
-  - @pisell/utils@1.0.8
-
-## 1.0.6
-
-### Patch Changes
-
-- Updated dependencies [abf14c2]
-  - @pisell/utils@1.0.7
-
-## 1.0.5
-
-### Patch Changes
-
-- Updated dependencies [179b7e0]
-  - @pisell/utils@1.0.6
-
-## 1.0.4
-
-### Patch Changes
-
-- Updated dependencies [1bd9790]
-  - @pisell/utils@1.0.5
-
-## 1.0.3
-
-### Patch Changes
-
-- Updated dependencies
-  - @pisell/utils@1.0.3
-
-## 1.0.2
-
-### Patch Changes
-
-- Updated dependencies
-  - @pisell/utils@1.0.2
-
-## 1.0.1
-
-### Patch Changes
-
-- 测试更新包
+- 688d67089: s

package/es/script/constants/index.js

@@ -48,6 +48,16 @@ var outPathMap = {
     prod: '../data/release/project/saas_home',
     release: '../data/release/project/saas_home',
     pre: '../data/release/project/saas_home'
+  },
+  docs: {
+    prod: '../data/release/project/docs',
+    release: '../data/release/project/docs',
+    pre: '../data/release/project/docs'
+  },
+  saas_shop_pos: {
+    prod: '../data/release/project/saas_shop_pos',
+    release: '../data/release/project/saas_shop_pos',
+    pre: '../data/release/project/saas_shop_pos'
   }
 };
 var isSsrMap = {
@@ -56,10 +66,12 @@ var isSsrMap = {
   my_pisel_pc_v2: true,
   my_pisel_h5_v2: true,
   xzero: false,
+  docs: false,
   saas_admin: false,
   saas_shop: false,
   saas_kds: false,
-  saas_ads: false
+  saas_ads: false,
+  saas_shop_pos: false
 };
 var checkPackages = ['@pisell/date-picker', '@pisell/lowcode-renderer', '@pisell/common', '@pisell/utils', '@pisell/materials'];
 export { outPathMap, isSsrMap, checkPackages };

package/es/script/uploadCode/index.js

@@ -173,7 +173,7 @@ function _init() {
           if (_fileName === 'admin') {
             _fileName = 'my_pisell_v2';
           }
-          if (['xzero', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(_fileName)) {
+          if (['xzero', 'docs', 'saas_admin', 'saas_shop', 'saas_shop_pos', 'saas_kds', 'saas_ads', 'saas_home'].includes(_fileName)) {
             _context.next = 42;
             break;
           }

package/es/script/uploadCode/uploadCode.js

@@ -119,13 +119,13 @@ var UploadCode = /*#__PURE__*/function () {
                 //   path.join(process.env.HOME, '.ssh', 'id_rsa'),
                 // );
               }
-              if (this.env === 'prod' && ['xzero', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(this.projectName)) {
+              if (this.env === 'prod' && ['xzero', 'saas_admin', 'saas_shop', 'saas_shop_pos', 'saas_kds', 'saas_ads', 'saas_home'].includes(this.projectName)) {
                 serverConfig = serverConfigMap.aws.service[this.env];
                 serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
               }
 
               // pisell2.0正式环境使用亚马逊服务器
-              if (this.env === 'prod' && this.projectName === 'admin') {
+              if (this.env === 'prod' && ['admin', 'docs'].includes(this.projectName)) {
                 serverConfig = serverConfigMap.aws.service[this.env];
                 serverConfig.privateKey = fs.readFileSync('../../../pem/pisell-pro.pem');
               }

package/es/script/utils/index.js

@@ -73,12 +73,14 @@ var getGitCurrentBranch = /*#__PURE__*/function () {
  * monorepo项目名称
  * @type {string[]}
  */
-var monorepoProjectNameArr = ['admin', 'my_pisell_v2'];
+var monorepoProjectNameArr = ['admin', 'my_pisell_v2', 'docs'];
 
 /**
  * @Title: 获取本地lm_config.json配置信息
- * @Describe:·
+ * @Describe: 从项目根目录读取配置文件，支持错误处理
  * @Author: Zsj
+ * @param {string} project - 项目名称
+ * @returns {Object} 配置对象
  */
 var getServerConfig = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(project) {

package/lib/script/constants/index.js

@@ -74,6 +74,16 @@ var outPathMap = {
     prod: "../data/release/project/saas_home",
     release: "../data/release/project/saas_home",
     pre: "../data/release/project/saas_home"
+  },
+  docs: {
+    prod: "../data/release/project/docs",
+    release: "../data/release/project/docs",
+    pre: "../data/release/project/docs"
+  },
+  saas_shop_pos: {
+    prod: "../data/release/project/saas_shop_pos",
+    release: "../data/release/project/saas_shop_pos",
+    pre: "../data/release/project/saas_shop_pos"
   }
 };
 var isSsrMap = {
@@ -82,10 +92,12 @@ var isSsrMap = {
   my_pisel_pc_v2: true,
   my_pisel_h5_v2: true,
   xzero: false,
+  docs: false,
   saas_admin: false,
   saas_shop: false,
   saas_kds: false,
-  saas_ads: false
+  saas_ads: false,
+  saas_shop_pos: false
 };
 var checkPackages = [
   "@pisell/date-picker",

package/lib/script/uploadCode/index.js

@@ -153,9 +153,16 @@ async function init() {
       if (_fileName === "admin") {
         _fileName = "my_pisell_v2";
       }
-      if (!["xzero", "saas_admin", "saas_shop", "saas_kds", "saas_ads", "saas_home"].includes(
-        _fileName
-      )) {
+      if (![
+        "xzero",
+        "docs",
+        "saas_admin",
+        "saas_shop",
+        "saas_shop_pos",
+        "saas_kds",
+        "saas_ads",
+        "saas_home"
+      ].includes(_fileName)) {
         await (0, import_aws.uploadStaticToOSS)(_fileName);
       }
     }

package/lib/script/uploadCode/uploadCode.js

@@ -90,13 +90,19 @@ var UploadCode = class {
     if (this.env === "prod") {
       serverConfig = this.setConfig(serverConfigMap["prod3"]);
     }
-    if (this.env === "prod" && ["xzero", "saas_admin", "saas_shop", "saas_kds", "saas_ads", "saas_home"].includes(
-      this.projectName
-    )) {
+    if (this.env === "prod" && [
+      "xzero",
+      "saas_admin",
+      "saas_shop",
+      "saas_shop_pos",
+      "saas_kds",
+      "saas_ads",
+      "saas_home"
+    ].includes(this.projectName)) {
       serverConfig = serverConfigMap.aws.service[this.env];
       serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
     }
-    if (this.env === "prod" && this.projectName === "admin") {
+    if (this.env === "prod" && ["admin", "docs"].includes(this.projectName)) {
       serverConfig = serverConfigMap.aws.service[this.env];
       serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
     }

package/lib/script/utils/index.js

@@ -57,7 +57,7 @@ var getGitCurrentBranch = async () => {
   const v = await $`git symbolic-ref --short HEAD`;
   return v.stdout;
 };
-var monorepoProjectNameArr = ["admin", "my_pisell_v2"];
+var monorepoProjectNameArr = ["admin", "my_pisell_v2", "docs"];
 var getServerConfig = async (project) => {
   console.log(project, "project");
   if (monorepoProjectNameArr.includes(project)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "3.0.15",
+  "version": "3.0.17",
   "sideEffects": [
     "*.less"
   ],
@@ -20,7 +20,7 @@
     "archiver": "^5.3.1",
     "dotenv": "^16.0.3",
     "ssh2": "^1.13.0",
-    "@pisell/utils": "3.0.4"
+    "@pisell/utils": "3.0.2"
   },
   "devDependencies": {
     "father": "^4.1.6"

package/src/script/constants/index.js

@@ -49,6 +49,16 @@ const outPathMap = {
     release: '../data/release/project/saas_home',
     pre: '../data/release/project/saas_home',
   },
+  docs: {
+    prod: '../data/release/project/docs',
+    release: '../data/release/project/docs',
+    pre: '../data/release/project/docs',
+  },
+  saas_shop_pos: {
+    prod: '../data/release/project/saas_shop_pos',
+    release: '../data/release/project/saas_shop_pos',
+    pre: '../data/release/project/saas_shop_pos',
+  },
 };
 
 const isSsrMap = {
@@ -57,10 +67,12 @@ const isSsrMap = {
   my_pisel_pc_v2: true,
   my_pisel_h5_v2: true,
   xzero: false,
+  docs: false,
   saas_admin: false,
   saas_shop: false,
   saas_kds: false,
   saas_ads: false,
+  saas_shop_pos: false,
 };
 
 const checkPackages = [

package/src/script/uploadCode/index.js

@@ -147,9 +147,16 @@ async function init() {
         _fileName = 'my_pisell_v2';
       }
       if (
-        !['xzero', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(
-          _fileName
-        )
+        ![
+          'xzero',
+          'docs',
+          'saas_admin',
+          'saas_shop',
+          'saas_shop_pos',
+          'saas_kds',
+          'saas_ads',
+          'saas_home',
+        ].includes(_fileName)
       ) {
         // 上传oss
         await uploadStaticToOSS(_fileName);

package/src/script/uploadCode/uploadCode.js

@@ -96,16 +96,22 @@ class UploadCode {
 
     if (
       this.env === 'prod' &&
-      ['xzero', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(
-        this.projectName
-      )
+      [
+        'xzero',
+        'saas_admin',
+        'saas_shop',
+        'saas_shop_pos',
+        'saas_kds',
+        'saas_ads',
+        'saas_home',
+      ].includes(this.projectName)
     ) {
       serverConfig = serverConfigMap.aws.service[this.env];
       serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
     }
 
     // pisell2.0正式环境使用亚马逊服务器
-    if (this.env === 'prod' && this.projectName === 'admin') {
+    if (this.env === 'prod' && ['admin', 'docs'].includes(this.projectName)) {
       serverConfig = serverConfigMap.aws.service[this.env];
       serverConfig.privateKey = fs.readFileSync('../../../pem/pisell-pro.pem');
     }

package/src/script/utils/index.js

@@ -28,19 +28,21 @@ const getGitCurrentBranch = async () => {
  * monorepo项目名称
  * @type {string[]}
  */
-const monorepoProjectNameArr = ['admin', 'my_pisell_v2'];
+const monorepoProjectNameArr = ['admin', 'my_pisell_v2', 'docs'];
 
 /**
  * @Title: 获取本地lm_config.json配置信息
- * @Describe:·
+ * @Describe: 从项目根目录读取配置文件，支持错误处理
  * @Author: Zsj
+ * @param {string} project - 项目名称
+ * @returns {Object} 配置对象
  */
 const getServerConfig = async (project) => {
-  console.log(project,'project')
+  console.log(project, 'project');
   if (monorepoProjectNameArr.includes(project)) {
-    return await JSON.parse(fs.readFileSync('../../../lm_config.json', 'utf8'))
+    return await JSON.parse(fs.readFileSync('../../../lm_config.json', 'utf8'));
   }
-  return await JSON.parse(fs.readFileSync('../lm_config.json', 'utf8'))
+  return await JSON.parse(fs.readFileSync('../lm_config.json', 'utf8'));
 };
 
 /**
@@ -106,7 +108,7 @@ const serverUpload = (conn, { localPath, remotePath }) => {
           }
           console.log('上传成功');
           resolve(conn);
-        },
+        }
       );
     });
   });
@@ -117,7 +119,10 @@ const serverUpload = (conn, { localPath, remotePath }) => {
  * @Describe:
  * @Author: Zsj
  */
-const serverUnpack = (conn, { path, fileName, fullFileName, changelog, env }) => {
+const serverUnpack = (
+  conn,
+  { path, fileName, fullFileName, changelog, env }
+) => {
   if (!conn) return Promise.reject('未连接服务器');
   // 文件全名
   return new Promise((resolve, reject) => {
@@ -139,7 +144,7 @@ const serverUnpack = (conn, { path, fileName, fullFileName, changelog, env }) =>
              sh deleteOldVersion.sh
              exit
              ${env === 'prod' ? 'exit' : ''}
-            `,
+            `
           // 打开到path
           // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
           // 删除1.0.0.zip
@@ -184,7 +189,7 @@ const releaseProject = (conn, { path, fileName, isSSR, env }) => {
              ${isSSR ? 'pm2 restart server.js' : ''}
              exit
             ${env === 'prod' ? 'exit' : ''}
-            `,
+            `
           // 打开到path
           // 复制pre-master到next-master
           // 删除pre-master
@@ -251,7 +256,7 @@ const createFeishuMessageContent = (contentArr) => {
         { tag: 'text', text: `${item.key}: ` },
         { tag: 'text', text: `${item.value}` },
       ];
-    }),
+    })
   );
 };
 
@@ -265,7 +270,7 @@ const getNonExcludedPackages = (excludedPackages) => {
   };
 
   const nonExcludedPackages = Object.keys(dependencies).filter(
-    (packageName) => !excludedPackages.includes(packageName),
+    (packageName) => !excludedPackages.includes(packageName)
   );
   return nonExcludedPackages;
 };