@varlet/cli 2.0.4 → 2.0.6
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/lib/commands/release.js +57 -22
- package/package.json +7 -6
package/lib/commands/release.js
CHANGED
|
@@ -172,6 +172,36 @@ function confirmVersion(currentVersion, expectVersion) {
|
|
|
172
172
|
});
|
|
173
173
|
});
|
|
174
174
|
}
|
|
175
|
+
function confirmRefs(remote) {
|
|
176
|
+
var _a;
|
|
177
|
+
if (remote === void 0) { remote = 'origin'; }
|
|
178
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
179
|
+
var stdout, reg, repo, branch, name, ret;
|
|
180
|
+
return __generator(this, function (_b) {
|
|
181
|
+
switch (_b.label) {
|
|
182
|
+
case 0: return [4 /*yield*/, (0, execa_1.default)('git', ['remote', '-v'])];
|
|
183
|
+
case 1:
|
|
184
|
+
stdout = (_b.sent()).stdout;
|
|
185
|
+
reg = new RegExp("".concat(remote, "\t(.*) \\(push"));
|
|
186
|
+
repo = (_a = stdout.match(reg)) === null || _a === void 0 ? void 0 : _a[1];
|
|
187
|
+
return [4 /*yield*/, (0, execa_1.default)('git', ['branch', '--show-current'])];
|
|
188
|
+
case 2:
|
|
189
|
+
branch = (_b.sent()).stdout;
|
|
190
|
+
name = 'Refs confirm';
|
|
191
|
+
return [4 /*yield*/, (0, inquirer_1.prompt)([
|
|
192
|
+
{
|
|
193
|
+
name: name,
|
|
194
|
+
type: 'confirm',
|
|
195
|
+
message: "Current refs ".concat(repo, ":refs/for/").concat(branch),
|
|
196
|
+
},
|
|
197
|
+
])];
|
|
198
|
+
case 3:
|
|
199
|
+
ret = _b.sent();
|
|
200
|
+
return [2 /*return*/, ret[name]];
|
|
201
|
+
}
|
|
202
|
+
});
|
|
203
|
+
});
|
|
204
|
+
}
|
|
175
205
|
function getReleaseType() {
|
|
176
206
|
return __awaiter(this, void 0, void 0, function () {
|
|
177
207
|
var name, ret;
|
|
@@ -199,7 +229,7 @@ function release(options) {
|
|
|
199
229
|
return __generator(this, function (_b) {
|
|
200
230
|
switch (_b.label) {
|
|
201
231
|
case 0:
|
|
202
|
-
_b.trys.push([0,
|
|
232
|
+
_b.trys.push([0, 15, , 16]);
|
|
203
233
|
currentVersion = require((0, path_1.resolve)(constant_1.CWD, 'package.json')).version;
|
|
204
234
|
if (!currentVersion) {
|
|
205
235
|
logger_1.default.error('Your package is missing the version field');
|
|
@@ -211,58 +241,63 @@ function release(options) {
|
|
|
211
241
|
logger_1.default.error('Git worktree is not empty, please commit changed');
|
|
212
242
|
return [2 /*return*/];
|
|
213
243
|
}
|
|
214
|
-
return [4 /*yield*/,
|
|
244
|
+
return [4 /*yield*/, confirmRefs(options.remote)];
|
|
215
245
|
case 2:
|
|
216
246
|
if (!(_b.sent())) {
|
|
217
247
|
return [2 /*return*/];
|
|
218
248
|
}
|
|
219
|
-
return [4 /*yield*/,
|
|
249
|
+
return [4 /*yield*/, confirmRegistry()];
|
|
220
250
|
case 3:
|
|
251
|
+
if (!(_b.sent())) {
|
|
252
|
+
return [2 /*return*/];
|
|
253
|
+
}
|
|
254
|
+
return [4 /*yield*/, getReleaseType()];
|
|
255
|
+
case 4:
|
|
221
256
|
type = _b.sent();
|
|
222
257
|
isPreRelease = type.startsWith('pre');
|
|
223
258
|
expectVersion = semver_1.default.inc(currentVersion, type, "alpha.".concat(Date.now()));
|
|
224
259
|
expectVersion = isPreRelease ? expectVersion.slice(0, -2) : expectVersion;
|
|
225
260
|
return [4 /*yield*/, confirmVersion(currentVersion, expectVersion)];
|
|
226
|
-
case
|
|
261
|
+
case 5:
|
|
227
262
|
if (!(_b.sent())) {
|
|
228
263
|
return [2 /*return*/];
|
|
229
264
|
}
|
|
230
265
|
updateVersion(expectVersion);
|
|
231
266
|
return [4 /*yield*/, publish(isPreRelease)];
|
|
232
|
-
case 5:
|
|
233
|
-
_b.sent();
|
|
234
|
-
if (!!isPreRelease) return [3 /*break*/, 8];
|
|
235
|
-
return [4 /*yield*/, (0, changelog_1.changelog)()];
|
|
236
267
|
case 6:
|
|
237
268
|
_b.sent();
|
|
238
|
-
return [
|
|
269
|
+
if (!!isPreRelease) return [3 /*break*/, 9];
|
|
270
|
+
return [4 /*yield*/, (0, changelog_1.changelog)()];
|
|
239
271
|
case 7:
|
|
240
272
|
_b.sent();
|
|
241
|
-
|
|
273
|
+
return [4 /*yield*/, pushGit(expectVersion, options.remote)];
|
|
242
274
|
case 8:
|
|
243
|
-
|
|
244
|
-
if (!isPreRelease) return [3 /*break*/, 13];
|
|
275
|
+
_b.sent();
|
|
245
276
|
_b.label = 9;
|
|
246
277
|
case 9:
|
|
247
|
-
|
|
248
|
-
return [
|
|
278
|
+
logger_1.default.success("Release version ".concat(expectVersion, " successfully!"));
|
|
279
|
+
if (!isPreRelease) return [3 /*break*/, 14];
|
|
280
|
+
_b.label = 10;
|
|
249
281
|
case 10:
|
|
250
|
-
_b.
|
|
251
|
-
return [4 /*yield*/, (0, execa_1.default)('git', ['restore', 'package.json'])];
|
|
282
|
+
_b.trys.push([10, 13, , 14]);
|
|
283
|
+
return [4 /*yield*/, (0, execa_1.default)('git', ['restore', '**/package.json'])];
|
|
252
284
|
case 11:
|
|
253
285
|
_b.sent();
|
|
254
|
-
return [
|
|
286
|
+
return [4 /*yield*/, (0, execa_1.default)('git', ['restore', 'package.json'])];
|
|
255
287
|
case 12:
|
|
288
|
+
_b.sent();
|
|
289
|
+
return [3 /*break*/, 14];
|
|
290
|
+
case 13:
|
|
256
291
|
_a = _b.sent();
|
|
257
292
|
logger_1.default.error('Restore package.json has failed, please restore manually');
|
|
258
|
-
return [3 /*break*/,
|
|
259
|
-
case
|
|
260
|
-
case
|
|
293
|
+
return [3 /*break*/, 14];
|
|
294
|
+
case 14: return [3 /*break*/, 16];
|
|
295
|
+
case 15:
|
|
261
296
|
error_1 = _b.sent();
|
|
262
297
|
logger_1.default.error(error_1.toString());
|
|
263
298
|
process.exit(1);
|
|
264
|
-
return [3 /*break*/,
|
|
265
|
-
case
|
|
299
|
+
return [3 /*break*/, 16];
|
|
300
|
+
case 16: return [2 /*return*/];
|
|
266
301
|
}
|
|
267
302
|
});
|
|
268
303
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@varlet/cli",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.6",
|
|
4
4
|
"description": "cli of varlet",
|
|
5
5
|
"bin": {
|
|
6
6
|
"varlet-cli": "./lib/bin.js"
|
|
@@ -34,10 +34,8 @@
|
|
|
34
34
|
"@babel/helper-plugin-utils": "^7.14.5",
|
|
35
35
|
"@babel/preset-env": "^7.14.8",
|
|
36
36
|
"@babel/preset-typescript": "^7.14.5",
|
|
37
|
-
"@varlet/
|
|
38
|
-
"@varlet/
|
|
39
|
-
"@varlet/shared": "2.0.4",
|
|
40
|
-
"@varlet/touch-emulator": "2.0.4",
|
|
37
|
+
"@varlet/markdown-vite-plugin": "2.0.6",
|
|
38
|
+
"@varlet/shared": "2.0.6",
|
|
41
39
|
"@vitejs/plugin-vue": "3.0.1",
|
|
42
40
|
"@vitejs/plugin-vue-jsx": "2.0.0",
|
|
43
41
|
"@vue/babel-plugin-jsx": "1.1.1",
|
|
@@ -69,6 +67,8 @@
|
|
|
69
67
|
"vue-jest": "^5.0.0-alpha.8"
|
|
70
68
|
},
|
|
71
69
|
"devDependencies": {
|
|
70
|
+
"@varlet/icons": "2.0.6",
|
|
71
|
+
"@varlet/touch-emulator": "2.0.6",
|
|
72
72
|
"@types/node": "^18.7.20",
|
|
73
73
|
"@types/babel__core": "^7.1.12",
|
|
74
74
|
"@types/ejs": "^3.1.1",
|
|
@@ -82,7 +82,8 @@
|
|
|
82
82
|
"@types/semver": "^7.3.9"
|
|
83
83
|
},
|
|
84
84
|
"peerDependencies": {
|
|
85
|
-
"@varlet/
|
|
85
|
+
"@varlet/icons": "2.0.6",
|
|
86
|
+
"@varlet/touch-emulator": "2.0.6",
|
|
86
87
|
"@vue/runtime-core": "3.2.16",
|
|
87
88
|
"@vue/test-utils": "^2.0.2",
|
|
88
89
|
"clipboard": "^2.0.6",
|