@pisell/common 3.0.15 → 3.0.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  # @pisell/common
2
2
 
3
+ ## 3.0.16
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies [5c6ce2633]
8
+ - @pisell/utils@3.0.5
9
+
3
10
  ## 3.0.15
4
11
 
5
12
  ### Patch Changes
@@ -48,6 +48,11 @@ var outPathMap = {
48
48
  prod: '../data/release/project/saas_home',
49
49
  release: '../data/release/project/saas_home',
50
50
  pre: '../data/release/project/saas_home'
51
+ },
52
+ docs: {
53
+ prod: '../data/release/project/docs',
54
+ release: '../data/release/project/docs',
55
+ pre: '../data/release/project/docs'
51
56
  }
52
57
  };
53
58
  var isSsrMap = {
@@ -56,6 +61,7 @@ var isSsrMap = {
56
61
  my_pisel_pc_v2: true,
57
62
  my_pisel_h5_v2: true,
58
63
  xzero: false,
64
+ docs: false,
59
65
  saas_admin: false,
60
66
  saas_shop: false,
61
67
  saas_kds: false,
@@ -173,7 +173,7 @@ function _init() {
173
173
  if (_fileName === 'admin') {
174
174
  _fileName = 'my_pisell_v2';
175
175
  }
176
- if (['xzero', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(_fileName)) {
176
+ if (['xzero', 'docs', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(_fileName)) {
177
177
  _context.next = 42;
178
178
  break;
179
179
  }
@@ -125,7 +125,7 @@ var UploadCode = /*#__PURE__*/function () {
125
125
  }
126
126
 
127
127
  // pisell2.0正式环境使用亚马逊服务器
128
- if (this.env === 'prod' && this.projectName === 'admin') {
128
+ if (this.env === 'prod' && ['admin', 'docs'].includes(this.projectName)) {
129
129
  serverConfig = serverConfigMap.aws.service[this.env];
130
130
  serverConfig.privateKey = fs.readFileSync('../../../pem/pisell-pro.pem');
131
131
  }
@@ -73,7 +73,7 @@ var getGitCurrentBranch = /*#__PURE__*/function () {
73
73
  * monorepo项目名称
74
74
  * @type {string[]}
75
75
  */
76
- var monorepoProjectNameArr = ['admin', 'my_pisell_v2'];
76
+ var monorepoProjectNameArr = ['admin', 'my_pisell_v2', 'docs'];
77
77
 
78
78
  /**
79
79
  * @Title: 获取本地lm_config.json配置信息
@@ -74,6 +74,11 @@ var outPathMap = {
74
74
  prod: "../data/release/project/saas_home",
75
75
  release: "../data/release/project/saas_home",
76
76
  pre: "../data/release/project/saas_home"
77
+ },
78
+ docs: {
79
+ prod: "../data/release/project/docs",
80
+ release: "../data/release/project/docs",
81
+ pre: "../data/release/project/docs"
77
82
  }
78
83
  };
79
84
  var isSsrMap = {
@@ -82,6 +87,7 @@ var isSsrMap = {
82
87
  my_pisel_pc_v2: true,
83
88
  my_pisel_h5_v2: true,
84
89
  xzero: false,
90
+ docs: false,
85
91
  saas_admin: false,
86
92
  saas_shop: false,
87
93
  saas_kds: false,
@@ -153,9 +153,15 @@ async function init() {
153
153
  if (_fileName === "admin") {
154
154
  _fileName = "my_pisell_v2";
155
155
  }
156
- if (!["xzero", "saas_admin", "saas_shop", "saas_kds", "saas_ads", "saas_home"].includes(
157
- _fileName
158
- )) {
156
+ if (![
157
+ "xzero",
158
+ "docs",
159
+ "saas_admin",
160
+ "saas_shop",
161
+ "saas_kds",
162
+ "saas_ads",
163
+ "saas_home"
164
+ ].includes(_fileName)) {
159
165
  await (0, import_aws.uploadStaticToOSS)(_fileName);
160
166
  }
161
167
  }
@@ -90,13 +90,18 @@ var UploadCode = class {
90
90
  if (this.env === "prod") {
91
91
  serverConfig = this.setConfig(serverConfigMap["prod3"]);
92
92
  }
93
- if (this.env === "prod" && ["xzero", "saas_admin", "saas_shop", "saas_kds", "saas_ads", "saas_home"].includes(
94
- this.projectName
95
- )) {
93
+ if (this.env === "prod" && [
94
+ "xzero",
95
+ "saas_admin",
96
+ "saas_shop",
97
+ "saas_kds",
98
+ "saas_ads",
99
+ "saas_home"
100
+ ].includes(this.projectName)) {
96
101
  serverConfig = serverConfigMap.aws.service[this.env];
97
102
  serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
98
103
  }
99
- if (this.env === "prod" && this.projectName === "admin") {
104
+ if (this.env === "prod" && ["admin", "docs"].includes(this.projectName)) {
100
105
  serverConfig = serverConfigMap.aws.service[this.env];
101
106
  serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
102
107
  }
@@ -57,7 +57,7 @@ var getGitCurrentBranch = async () => {
57
57
  const v = await $`git symbolic-ref --short HEAD`;
58
58
  return v.stdout;
59
59
  };
60
- var monorepoProjectNameArr = ["admin", "my_pisell_v2"];
60
+ var monorepoProjectNameArr = ["admin", "my_pisell_v2", "docs"];
61
61
  var getServerConfig = async (project) => {
62
62
  console.log(project, "project");
63
63
  if (monorepoProjectNameArr.includes(project)) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pisell/common",
3
- "version": "3.0.15",
3
+ "version": "3.0.16",
4
4
  "sideEffects": [
5
5
  "*.less"
6
6
  ],
@@ -20,7 +20,7 @@
20
20
  "archiver": "^5.3.1",
21
21
  "dotenv": "^16.0.3",
22
22
  "ssh2": "^1.13.0",
23
- "@pisell/utils": "3.0.4"
23
+ "@pisell/utils": "3.0.5"
24
24
  },
25
25
  "devDependencies": {
26
26
  "father": "^4.1.6"
@@ -49,6 +49,11 @@ const outPathMap = {
49
49
  release: '../data/release/project/saas_home',
50
50
  pre: '../data/release/project/saas_home',
51
51
  },
52
+ docs: {
53
+ prod: '../data/release/project/docs',
54
+ release: '../data/release/project/docs',
55
+ pre: '../data/release/project/docs',
56
+ },
52
57
  };
53
58
 
54
59
  const isSsrMap = {
@@ -57,6 +62,7 @@ const isSsrMap = {
57
62
  my_pisel_pc_v2: true,
58
63
  my_pisel_h5_v2: true,
59
64
  xzero: false,
65
+ docs: false,
60
66
  saas_admin: false,
61
67
  saas_shop: false,
62
68
  saas_kds: false,
@@ -147,9 +147,15 @@ async function init() {
147
147
  _fileName = 'my_pisell_v2';
148
148
  }
149
149
  if (
150
- !['xzero', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(
151
- _fileName
152
- )
150
+ ![
151
+ 'xzero',
152
+ 'docs',
153
+ 'saas_admin',
154
+ 'saas_shop',
155
+ 'saas_kds',
156
+ 'saas_ads',
157
+ 'saas_home',
158
+ ].includes(_fileName)
153
159
  ) {
154
160
  // 上传oss
155
161
  await uploadStaticToOSS(_fileName);
@@ -96,16 +96,21 @@ class UploadCode {
96
96
 
97
97
  if (
98
98
  this.env === 'prod' &&
99
- ['xzero', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(
100
- this.projectName
101
- )
99
+ [
100
+ 'xzero',
101
+ 'saas_admin',
102
+ 'saas_shop',
103
+ 'saas_kds',
104
+ 'saas_ads',
105
+ 'saas_home',
106
+ ].includes(this.projectName)
102
107
  ) {
103
108
  serverConfig = serverConfigMap.aws.service[this.env];
104
109
  serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
105
110
  }
106
111
 
107
112
  // pisell2.0正式环境使用亚马逊服务器
108
- if (this.env === 'prod' && this.projectName === 'admin') {
113
+ if (this.env === 'prod' && ['admin', 'docs'].includes(this.projectName)) {
109
114
  serverConfig = serverConfigMap.aws.service[this.env];
110
115
  serverConfig.privateKey = fs.readFileSync('../../../pem/pisell-pro.pem');
111
116
  }
@@ -28,7 +28,7 @@ const getGitCurrentBranch = async () => {
28
28
  * monorepo项目名称
29
29
  * @type {string[]}
30
30
  */
31
- const monorepoProjectNameArr = ['admin', 'my_pisell_v2'];
31
+ const monorepoProjectNameArr = ['admin', 'my_pisell_v2', 'docs'];
32
32
 
33
33
  /**
34
34
  * @Title: 获取本地lm_config.json配置信息
@@ -36,11 +36,11 @@ const monorepoProjectNameArr = ['admin', 'my_pisell_v2'];
36
36
  * @Author: Zsj
37
37
  */
38
38
  const getServerConfig = async (project) => {
39
- console.log(project,'project')
39
+ console.log(project, 'project');
40
40
  if (monorepoProjectNameArr.includes(project)) {
41
- return await JSON.parse(fs.readFileSync('../../../lm_config.json', 'utf8'))
41
+ return await JSON.parse(fs.readFileSync('../../../lm_config.json', 'utf8'));
42
42
  }
43
- return await JSON.parse(fs.readFileSync('../lm_config.json', 'utf8'))
43
+ return await JSON.parse(fs.readFileSync('../lm_config.json', 'utf8'));
44
44
  };
45
45
 
46
46
  /**
@@ -106,7 +106,7 @@ const serverUpload = (conn, { localPath, remotePath }) => {
106
106
  }
107
107
  console.log('上传成功');
108
108
  resolve(conn);
109
- },
109
+ }
110
110
  );
111
111
  });
112
112
  });
@@ -117,7 +117,10 @@ const serverUpload = (conn, { localPath, remotePath }) => {
117
117
  * @Describe:
118
118
  * @Author: Zsj
119
119
  */
120
- const serverUnpack = (conn, { path, fileName, fullFileName, changelog, env }) => {
120
+ const serverUnpack = (
121
+ conn,
122
+ { path, fileName, fullFileName, changelog, env }
123
+ ) => {
121
124
  if (!conn) return Promise.reject('未连接服务器');
122
125
  // 文件全名
123
126
  return new Promise((resolve, reject) => {
@@ -139,7 +142,7 @@ const serverUnpack = (conn, { path, fileName, fullFileName, changelog, env }) =>
139
142
  sh deleteOldVersion.sh
140
143
  exit
141
144
  ${env === 'prod' ? 'exit' : ''}
142
- `,
145
+ `
143
146
  // 打开到path
144
147
  // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
145
148
  // 删除1.0.0.zip
@@ -184,7 +187,7 @@ const releaseProject = (conn, { path, fileName, isSSR, env }) => {
184
187
  ${isSSR ? 'pm2 restart server.js' : ''}
185
188
  exit
186
189
  ${env === 'prod' ? 'exit' : ''}
187
- `,
190
+ `
188
191
  // 打开到path
189
192
  // 复制pre-master到next-master
190
193
  // 删除pre-master
@@ -251,7 +254,7 @@ const createFeishuMessageContent = (contentArr) => {
251
254
  { tag: 'text', text: `${item.key}: ` },
252
255
  { tag: 'text', text: `${item.value}` },
253
256
  ];
254
- }),
257
+ })
255
258
  );
256
259
  };
257
260
 
@@ -265,7 +268,7 @@ const getNonExcludedPackages = (excludedPackages) => {
265
268
  };
266
269
 
267
270
  const nonExcludedPackages = Object.keys(dependencies).filter(
268
- (packageName) => !excludedPackages.includes(packageName),
271
+ (packageName) => !excludedPackages.includes(packageName)
269
272
  );
270
273
  return nonExcludedPackages;
271
274
  };