@pisell/common 3.0.13 → 3.0.14
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 +9 -34
- package/es/bin/pisell.js +0 -0
- package/es/script/constants/index.js +6 -0
- package/es/script/uploadCode/index.js +1 -1
- package/es/script/utils/index.js +1 -1
- package/lib/script/constants/index.js +6 -0
- package/lib/script/uploadCode/index.js +9 -3
- package/lib/script/utils/index.js +1 -1
- package/package.json +15 -15
- package/src/script/constants/index.js +6 -0
- package/src/script/uploadCode/index.js +9 -3
- package/src/script/utils/index.js +13 -10
package/CHANGELOG.md
CHANGED
|
@@ -1,39 +1,35 @@
|
|
|
1
1
|
# @pisell/common
|
|
2
2
|
|
|
3
|
-
## 3.0.
|
|
3
|
+
## 3.0.14
|
|
4
4
|
|
|
5
5
|
### Patch Changes
|
|
6
6
|
|
|
7
|
-
-
|
|
8
|
-
- @pisell/utils@2.0.2
|
|
7
|
+
- 7c0653551: s
|
|
9
8
|
|
|
10
|
-
## 3.0.
|
|
9
|
+
## 3.0.13
|
|
11
10
|
|
|
12
11
|
### Patch Changes
|
|
13
12
|
|
|
14
|
-
-
|
|
15
|
-
- @pisell/utils@3.0.1
|
|
13
|
+
- 07222d938: s
|
|
16
14
|
|
|
17
|
-
## 3.0.
|
|
15
|
+
## 3.0.12
|
|
18
16
|
|
|
19
17
|
### Patch Changes
|
|
20
18
|
|
|
21
|
-
- Updated dependencies [
|
|
19
|
+
- Updated dependencies [995527380]
|
|
22
20
|
- @pisell/utils@3.0.1
|
|
23
21
|
|
|
24
|
-
## 3.0.
|
|
22
|
+
## 3.0.11
|
|
25
23
|
|
|
26
24
|
### Patch Changes
|
|
27
25
|
|
|
28
|
-
-
|
|
29
|
-
- @pisell/utils@1.0.44
|
|
26
|
+
- cf72095e7: update
|
|
30
27
|
|
|
31
28
|
## 3.0.9
|
|
32
29
|
|
|
33
30
|
### Patch Changes
|
|
34
31
|
|
|
35
|
-
-
|
|
36
|
-
- @pisell/utils@1.0.43
|
|
32
|
+
- ab5a8d1df: 新增 saas_home 项目路径并更新相关逻辑
|
|
37
33
|
|
|
38
34
|
## 3.0.8
|
|
39
35
|
|
|
@@ -89,27 +85,6 @@
|
|
|
89
85
|
|
|
90
86
|
- 7b7637320: s
|
|
91
87
|
|
|
92
|
-
## 1.0.28
|
|
93
|
-
|
|
94
|
-
### Patch Changes
|
|
95
|
-
|
|
96
|
-
- Updated dependencies [afc404e7]
|
|
97
|
-
- @pisell/utils@2.0.1
|
|
98
|
-
|
|
99
|
-
## 1.0.27
|
|
100
|
-
|
|
101
|
-
### Patch Changes
|
|
102
|
-
|
|
103
|
-
- Updated dependencies [0077f1f4]
|
|
104
|
-
- @pisell/utils@1.0.30
|
|
105
|
-
|
|
106
|
-
## 1.0.26
|
|
107
|
-
|
|
108
|
-
### Patch Changes
|
|
109
|
-
|
|
110
|
-
- Updated dependencies [56cd1bb5]
|
|
111
|
-
- @pisell/utils@1.0.29
|
|
112
|
-
|
|
113
88
|
## 1.0.26
|
|
114
89
|
|
|
115
90
|
### Patch Changes
|
package/es/bin/pisell.js
CHANGED
|
File without 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
|
}
|
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', '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 (![
|
|
157
|
-
|
|
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
|
}
|
|
@@ -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.
|
|
3
|
+
"version": "3.0.14",
|
|
4
4
|
"sideEffects": [
|
|
5
5
|
"*.less"
|
|
6
6
|
],
|
|
@@ -11,28 +11,16 @@
|
|
|
11
11
|
"bin": {
|
|
12
12
|
"pisell": "es/bin/pisell.js"
|
|
13
13
|
},
|
|
14
|
-
"scripts": {
|
|
15
|
-
"build": "father build",
|
|
16
|
-
"dev": "father dev",
|
|
17
|
-
"docs:build": "dumi build",
|
|
18
|
-
"doctor": "father doctor",
|
|
19
|
-
"lint": "npm run lint:es && npm run lint:css",
|
|
20
|
-
"lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
|
|
21
|
-
"lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
|
|
22
|
-
"lowcode:build": "build-scripts build --config ./build.lowcode.js",
|
|
23
|
-
"lowcode:dev": "build-scripts start --config ./build.lowcode.js",
|
|
24
|
-
"start": "npm run dev"
|
|
25
|
-
},
|
|
26
14
|
"dependencies": {
|
|
27
15
|
"@aws-sdk/client-s3": "^3.456.0",
|
|
28
|
-
"@pisell/utils": "workspace:*",
|
|
29
16
|
"zx": "^7.2.2",
|
|
30
17
|
"inquirer": "^6.2.6",
|
|
31
18
|
"mime-types": "^2.1.35",
|
|
32
19
|
"npm-check": "^6.0.1",
|
|
33
20
|
"archiver": "^5.3.1",
|
|
34
21
|
"dotenv": "^16.0.3",
|
|
35
|
-
"ssh2": "^1.13.0"
|
|
22
|
+
"ssh2": "^1.13.0",
|
|
23
|
+
"@pisell/utils": "3.0.1"
|
|
36
24
|
},
|
|
37
25
|
"devDependencies": {
|
|
38
26
|
"father": "^4.1.6"
|
|
@@ -56,5 +44,17 @@
|
|
|
56
44
|
},
|
|
57
45
|
"publishConfig": {
|
|
58
46
|
"access": "public"
|
|
47
|
+
},
|
|
48
|
+
"scripts": {
|
|
49
|
+
"build": "father build",
|
|
50
|
+
"dev": "father dev",
|
|
51
|
+
"docs:build": "dumi build",
|
|
52
|
+
"doctor": "father doctor",
|
|
53
|
+
"lint": "npm run lint:es && npm run lint:css",
|
|
54
|
+
"lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
|
|
55
|
+
"lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
|
|
56
|
+
"lowcode:build": "build-scripts build --config ./build.lowcode.js",
|
|
57
|
+
"lowcode:dev": "build-scripts start --config ./build.lowcode.js",
|
|
58
|
+
"start": "npm run dev"
|
|
59
59
|
}
|
|
60
60
|
}
|
|
@@ -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
|
-
![
|
|
151
|
-
|
|
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);
|
|
@@ -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 = (
|
|
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
|
};
|