@pisell/common 3.0.14 → 3.0.15
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 +25 -2
- package/es/script/constants/index.js +0 -6
- package/es/script/uploadCode/index.js +1 -1
- package/es/script/utils/index.js +1 -1
- package/lib/script/constants/index.js +0 -6
- package/lib/script/uploadCode/index.js +3 -9
- package/lib/script/utils/index.js +1 -1
- package/package.json +2 -2
- package/src/script/constants/index.js +0 -6
- package/src/script/uploadCode/index.js +3 -9
- package/src/script/utils/index.js +10 -13
package/CHANGELOG.md
CHANGED
|
@@ -1,16 +1,25 @@
|
|
|
1
1
|
# @pisell/common
|
|
2
2
|
|
|
3
|
+
## 3.0.15
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [841161d824]
|
|
8
|
+
- @pisell/utils@3.0.4
|
|
9
|
+
|
|
3
10
|
## 3.0.14
|
|
4
11
|
|
|
5
12
|
### Patch Changes
|
|
6
13
|
|
|
7
|
-
-
|
|
14
|
+
- Updated dependencies [66adcd5db]
|
|
15
|
+
- @pisell/utils@3.0.3
|
|
8
16
|
|
|
9
17
|
## 3.0.13
|
|
10
18
|
|
|
11
19
|
### Patch Changes
|
|
12
20
|
|
|
13
|
-
-
|
|
21
|
+
- Updated dependencies [e00e79597]
|
|
22
|
+
- @pisell/utils@3.0.2
|
|
14
23
|
|
|
15
24
|
## 3.0.12
|
|
16
25
|
|
|
@@ -31,6 +40,20 @@
|
|
|
31
40
|
|
|
32
41
|
- ab5a8d1df: 新增 saas_home 项目路径并更新相关逻辑
|
|
33
42
|
|
|
43
|
+
## 3.0.10
|
|
44
|
+
|
|
45
|
+
### Patch Changes
|
|
46
|
+
|
|
47
|
+
- Updated dependencies [f15c3be02]
|
|
48
|
+
- @pisell/utils@1.0.44
|
|
49
|
+
|
|
50
|
+
## 3.0.9
|
|
51
|
+
|
|
52
|
+
### Patch Changes
|
|
53
|
+
|
|
54
|
+
- Updated dependencies [2f57417ac]
|
|
55
|
+
- @pisell/utils@1.0.43
|
|
56
|
+
|
|
34
57
|
## 3.0.8
|
|
35
58
|
|
|
36
59
|
### Patch Changes
|
|
@@ -48,11 +48,6 @@ 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'
|
|
56
51
|
}
|
|
57
52
|
};
|
|
58
53
|
var isSsrMap = {
|
|
@@ -61,7 +56,6 @@ var isSsrMap = {
|
|
|
61
56
|
my_pisel_pc_v2: true,
|
|
62
57
|
my_pisel_h5_v2: true,
|
|
63
58
|
xzero: false,
|
|
64
|
-
docs: false,
|
|
65
59
|
saas_admin: false,
|
|
66
60
|
saas_shop: false,
|
|
67
61
|
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', '
|
|
176
|
+
if (['xzero', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(_fileName)) {
|
|
177
177
|
_context.next = 42;
|
|
178
178
|
break;
|
|
179
179
|
}
|
package/es/script/utils/index.js
CHANGED
|
@@ -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'];
|
|
77
77
|
|
|
78
78
|
/**
|
|
79
79
|
* @Title: 获取本地lm_config.json配置信息
|
|
@@ -74,11 +74,6 @@ 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"
|
|
82
77
|
}
|
|
83
78
|
};
|
|
84
79
|
var isSsrMap = {
|
|
@@ -87,7 +82,6 @@ var isSsrMap = {
|
|
|
87
82
|
my_pisel_pc_v2: true,
|
|
88
83
|
my_pisel_h5_v2: true,
|
|
89
84
|
xzero: false,
|
|
90
|
-
docs: false,
|
|
91
85
|
saas_admin: false,
|
|
92
86
|
saas_shop: false,
|
|
93
87
|
saas_kds: false,
|
|
@@ -153,15 +153,9 @@ async function init() {
|
|
|
153
153
|
if (_fileName === "admin") {
|
|
154
154
|
_fileName = "my_pisell_v2";
|
|
155
155
|
}
|
|
156
|
-
if (![
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
"saas_admin",
|
|
160
|
-
"saas_shop",
|
|
161
|
-
"saas_kds",
|
|
162
|
-
"saas_ads",
|
|
163
|
-
"saas_home"
|
|
164
|
-
].includes(_fileName)) {
|
|
156
|
+
if (!["xzero", "saas_admin", "saas_shop", "saas_kds", "saas_ads", "saas_home"].includes(
|
|
157
|
+
_fileName
|
|
158
|
+
)) {
|
|
165
159
|
await (0, import_aws.uploadStaticToOSS)(_fileName);
|
|
166
160
|
}
|
|
167
161
|
}
|
|
@@ -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"];
|
|
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.
|
|
3
|
+
"version": "3.0.15",
|
|
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.
|
|
23
|
+
"@pisell/utils": "3.0.4"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"father": "^4.1.6"
|
|
@@ -49,11 +49,6 @@ 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
|
-
},
|
|
57
52
|
};
|
|
58
53
|
|
|
59
54
|
const isSsrMap = {
|
|
@@ -62,7 +57,6 @@ const isSsrMap = {
|
|
|
62
57
|
my_pisel_pc_v2: true,
|
|
63
58
|
my_pisel_h5_v2: true,
|
|
64
59
|
xzero: false,
|
|
65
|
-
docs: false,
|
|
66
60
|
saas_admin: false,
|
|
67
61
|
saas_shop: false,
|
|
68
62
|
saas_kds: false,
|
|
@@ -147,15 +147,9 @@ async function init() {
|
|
|
147
147
|
_fileName = 'my_pisell_v2';
|
|
148
148
|
}
|
|
149
149
|
if (
|
|
150
|
-
![
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
'saas_admin',
|
|
154
|
-
'saas_shop',
|
|
155
|
-
'saas_kds',
|
|
156
|
-
'saas_ads',
|
|
157
|
-
'saas_home',
|
|
158
|
-
].includes(_fileName)
|
|
150
|
+
!['xzero', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(
|
|
151
|
+
_fileName
|
|
152
|
+
)
|
|
159
153
|
) {
|
|
160
154
|
// 上传oss
|
|
161
155
|
await uploadStaticToOSS(_fileName);
|
|
@@ -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'];
|
|
32
32
|
|
|
33
33
|
/**
|
|
34
34
|
* @Title: 获取本地lm_config.json配置信息
|
|
@@ -36,11 +36,11 @@ const monorepoProjectNameArr = ['admin', 'my_pisell_v2', 'docs'];
|
|
|
36
36
|
* @Author: Zsj
|
|
37
37
|
*/
|
|
38
38
|
const getServerConfig = async (project) => {
|
|
39
|
-
console.log(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,10 +117,7 @@ const serverUpload = (conn, { localPath, remotePath }) => {
|
|
|
117
117
|
* @Describe:
|
|
118
118
|
* @Author: Zsj
|
|
119
119
|
*/
|
|
120
|
-
const serverUnpack = (
|
|
121
|
-
conn,
|
|
122
|
-
{ path, fileName, fullFileName, changelog, env }
|
|
123
|
-
) => {
|
|
120
|
+
const serverUnpack = (conn, { path, fileName, fullFileName, changelog, env }) => {
|
|
124
121
|
if (!conn) return Promise.reject('未连接服务器');
|
|
125
122
|
// 文件全名
|
|
126
123
|
return new Promise((resolve, reject) => {
|
|
@@ -142,7 +139,7 @@ const serverUnpack = (
|
|
|
142
139
|
sh deleteOldVersion.sh
|
|
143
140
|
exit
|
|
144
141
|
${env === 'prod' ? 'exit' : ''}
|
|
145
|
-
|
|
142
|
+
`,
|
|
146
143
|
// 打开到path
|
|
147
144
|
// 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
|
|
148
145
|
// 删除1.0.0.zip
|
|
@@ -187,7 +184,7 @@ const releaseProject = (conn, { path, fileName, isSSR, env }) => {
|
|
|
187
184
|
${isSSR ? 'pm2 restart server.js' : ''}
|
|
188
185
|
exit
|
|
189
186
|
${env === 'prod' ? 'exit' : ''}
|
|
190
|
-
|
|
187
|
+
`,
|
|
191
188
|
// 打开到path
|
|
192
189
|
// 复制pre-master到next-master
|
|
193
190
|
// 删除pre-master
|
|
@@ -254,7 +251,7 @@ const createFeishuMessageContent = (contentArr) => {
|
|
|
254
251
|
{ tag: 'text', text: `${item.key}: ` },
|
|
255
252
|
{ tag: 'text', text: `${item.value}` },
|
|
256
253
|
];
|
|
257
|
-
})
|
|
254
|
+
}),
|
|
258
255
|
);
|
|
259
256
|
};
|
|
260
257
|
|
|
@@ -268,7 +265,7 @@ const getNonExcludedPackages = (excludedPackages) => {
|
|
|
268
265
|
};
|
|
269
266
|
|
|
270
267
|
const nonExcludedPackages = Object.keys(dependencies).filter(
|
|
271
|
-
(packageName) => !excludedPackages.includes(packageName)
|
|
268
|
+
(packageName) => !excludedPackages.includes(packageName),
|
|
272
269
|
);
|
|
273
270
|
return nonExcludedPackages;
|
|
274
271
|
};
|