@lakutata/cli 1.0.20 → 1.0.23
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/build/CLI.js +5 -24
- package/build/CLI.js.map +1 -1
- package/build/Deploy.js +45 -39
- package/build/Deploy.js.map +1 -1
- package/build/lib/LatestVersion.d.ts +1 -0
- package/build/lib/LatestVersion.js +13 -0
- package/build/lib/LatestVersion.js.map +1 -0
- package/build/lib/generators/project/ProjectGenerator.js +3 -3
- package/build/lib/generators/project/ProjectGenerator.js.map +1 -1
- package/build/lib/menus/MainMenu.js +2 -2
- package/build/lib/menus/MainMenu.js.map +1 -1
- package/package.json +9 -6
- package/src/CLI.ts +3 -3
- package/src/Deploy.ts +33 -19
- package/src/lib/LatestVersion.ts +6 -0
- package/src/lib/generators/project/ProjectGenerator.ts +3 -3
- package/src/lib/menus/MainMenu.ts +2 -2
- package/tsconfig.json +1 -0
package/build/CLI.js
CHANGED
|
@@ -1,32 +1,13 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
"use strict";
|
|
3
|
-
var
|
|
4
|
-
|
|
5
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
6
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
7
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
8
|
-
}
|
|
9
|
-
Object.defineProperty(o, k2, desc);
|
|
10
|
-
}) : (function(o, m, k, k2) {
|
|
11
|
-
if (k2 === undefined) k2 = k;
|
|
12
|
-
o[k2] = m[k];
|
|
13
|
-
}));
|
|
14
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
15
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
16
|
-
}) : function(o, v) {
|
|
17
|
-
o["default"] = v;
|
|
18
|
-
});
|
|
19
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
20
|
-
if (mod && mod.__esModule) return mod;
|
|
21
|
-
var result = {};
|
|
22
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
23
|
-
__setModuleDefault(result, mod);
|
|
24
|
-
return result;
|
|
3
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
4
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
25
5
|
};
|
|
26
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
-
const
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
28
9
|
const MainMenu_1 = require("./lib/menus/MainMenu");
|
|
29
10
|
(async () => {
|
|
30
|
-
await (0, MainMenu_1.MainMenu)(
|
|
11
|
+
await (0, MainMenu_1.MainMenu)(JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(__dirname, '../package.json')).toString()));
|
|
31
12
|
})();
|
|
32
13
|
//# sourceMappingURL=CLI.js.map
|
package/build/CLI.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CLI.js","sourceRoot":"","sources":["../src/CLI.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CLI.js","sourceRoot":"","sources":["../src/CLI.ts"],"names":[],"mappings":";;;;;;AACA,4CAAmB;AACnB,gDAAuB;AACvB,mDAA6C;AAC7C,CAAC,KAAK,IAAI,EAAE;IACR,MAAM,IAAA,mBAAQ,EAAC,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;AACtG,CAAC,CAAC,EAAE,CAAA"}
|
package/build/Deploy.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
"use strict";
|
|
3
3
|
(async () => {
|
|
4
4
|
const path = require('path');
|
|
5
|
+
const args = require('args');
|
|
5
6
|
const inquirer = require('inquirer');
|
|
6
7
|
const shelljs = require('shelljs');
|
|
7
8
|
const moment = require('moment-timezone');
|
|
@@ -12,6 +13,12 @@
|
|
|
12
13
|
const REPOSITORY_ADDR = new URL(`repo://${REGISTRY_ADDR}`).hostname;
|
|
13
14
|
if (!REGISTRY_ADDR)
|
|
14
15
|
throw new Error('未配置仓库地址');
|
|
16
|
+
args
|
|
17
|
+
.option('username')
|
|
18
|
+
.option('password')
|
|
19
|
+
.option('platform')
|
|
20
|
+
.option('tagLatest');
|
|
21
|
+
const flags = args.parse(process.argv);
|
|
15
22
|
const TIMESTAMP = Date.now();
|
|
16
23
|
const IMAGE_BASE_NAME = `lakutata_tmp_image_${TIMESTAMP}`;
|
|
17
24
|
const IMAGE_VERSION = `${packageJson.version}-build.${moment().format('YYYYMMDDHHmmss')}`;
|
|
@@ -22,46 +29,45 @@
|
|
|
22
29
|
});
|
|
23
30
|
});
|
|
24
31
|
};
|
|
25
|
-
const
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
const tagLatest = settings.tagLatest;
|
|
32
|
+
const platforms = [
|
|
33
|
+
'linux/amd64',
|
|
34
|
+
'linux/arm64',
|
|
35
|
+
'linux/riscv64',
|
|
36
|
+
'linux/ppc64le',
|
|
37
|
+
'linux/s390x',
|
|
38
|
+
'linux/386',
|
|
39
|
+
'linux/arm/v7',
|
|
40
|
+
'linux/arm/v6'
|
|
41
|
+
];
|
|
42
|
+
const username = flags.username ? flags.username : (await inquirer.prompt({
|
|
43
|
+
type: 'input',
|
|
44
|
+
name: 'username',
|
|
45
|
+
message: 'Docker仓库账号'
|
|
46
|
+
})).username;
|
|
47
|
+
const password = flags.password ? flags.password : (await inquirer.prompt({
|
|
48
|
+
type: 'password',
|
|
49
|
+
name: 'password',
|
|
50
|
+
message: 'Docker仓库密码',
|
|
51
|
+
mask: '*'
|
|
52
|
+
})).password;
|
|
53
|
+
const platform = flags.platform ? flags.platform : (await inquirer.prompt({
|
|
54
|
+
type: 'list',
|
|
55
|
+
name: 'platform',
|
|
56
|
+
message: '目标构建平台架构',
|
|
57
|
+
choices: platforms
|
|
58
|
+
})).platform;
|
|
59
|
+
let tagLatest = flags.tagLatest ? flags.tagLatest : (await inquirer.prompt({
|
|
60
|
+
type: 'confirm',
|
|
61
|
+
name: 'tagLatest',
|
|
62
|
+
message: '是否为镜像打上latest标签',
|
|
63
|
+
default: false
|
|
64
|
+
})).tagLatest;
|
|
65
|
+
if (typeof tagLatest === 'string') {
|
|
66
|
+
tagLatest = tagLatest !== 'false';
|
|
67
|
+
}
|
|
62
68
|
try {
|
|
63
|
-
await execPromise(`docker login --username=${
|
|
64
|
-
shelljs.exec(`docker buildx build -f ${DOCKERFILE_PATH} -t ${IMAGE_BASE_NAME}:${IMAGE_VERSION} --platform=${
|
|
69
|
+
await execPromise(`docker login --username=${username} ${REPOSITORY_ADDR} -p${password}`);
|
|
70
|
+
shelljs.exec(`docker buildx build -f ${DOCKERFILE_PATH} -t ${IMAGE_BASE_NAME}:${IMAGE_VERSION} --platform=${platform} .`);
|
|
65
71
|
shelljs.exec(`docker tag ${IMAGE_BASE_NAME}:${IMAGE_VERSION} ${REGISTRY_ADDR}:${IMAGE_VERSION}`);
|
|
66
72
|
if (tagLatest) {
|
|
67
73
|
shelljs.exec(`docker tag ${IMAGE_BASE_NAME}:${IMAGE_VERSION} ${REGISTRY_ADDR}:latest`);
|
package/build/Deploy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Deploy.js","sourceRoot":"","sources":["../src/Deploy.ts"],"names":[],"mappings":";;AACA,CAAC,KAAK,IAAI,EAAE;IACR,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IACpC,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;IAClC,MAAM,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;IACzC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAA;IAC1E,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAA;IACnC,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;IAC/C,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;IACjD,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,UAAU,aAAa,EAAE,CAAC,CAAC,QAAQ,CAAA;IACnE,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;IAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAC5B,MAAM,eAAe,GAAG,sBAAsB,SAAS,EAAE,CAAA;IACzD,MAAM,aAAa,GAAG,GAAG,WAAW,CAAC,OAAO,UAAU,MAAM,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAA;IACzF,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,OAAQ,EAAE,EAAE;QACtC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBACpD,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YACrD,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC,CAAA;IACD,MAAM,
|
|
1
|
+
{"version":3,"file":"Deploy.js","sourceRoot":"","sources":["../src/Deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function LatestVersion(packageName: any, options?: any): Promise<string>;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.LatestVersion = void 0;
|
|
7
|
+
const package_json_1 = __importDefault(require("package-json"));
|
|
8
|
+
async function LatestVersion(packageName, options) {
|
|
9
|
+
const { version } = await (0, package_json_1.default)(packageName.toLowerCase(), options);
|
|
10
|
+
return version;
|
|
11
|
+
}
|
|
12
|
+
exports.LatestVersion = LatestVersion;
|
|
13
|
+
//# sourceMappingURL=LatestVersion.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LatestVersion.js","sourceRoot":"","sources":["../../src/lib/LatestVersion.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAsC;AAE/B,KAAK,UAAU,aAAa,CAAC,WAAW,EAAE,OAAQ;IACrD,MAAM,EAAC,OAAO,EAAC,GAAG,MAAM,IAAA,sBAAW,EAAC,WAAW,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,CAAA;IACvE,OAAO,OAAiB,CAAA;AAC5B,CAAC;AAHD,sCAGC"}
|
|
@@ -11,7 +11,7 @@ const ProjectPackageConfig_1 = require("./configs/ProjectPackageConfig");
|
|
|
11
11
|
const ProjectEslintrcConfig_1 = require("./configs/ProjectEslintrcConfig");
|
|
12
12
|
const simple_git_1 = __importDefault(require("simple-git"));
|
|
13
13
|
const GitIgnore_1 = require("../../../constants/GitIgnore");
|
|
14
|
-
const
|
|
14
|
+
const LatestVersion_1 = require("../../LatestVersion");
|
|
15
15
|
class ProjectGenerator {
|
|
16
16
|
constructor(options) {
|
|
17
17
|
this.lakutataPackageName = '@lakutata/core';
|
|
@@ -38,7 +38,7 @@ class ProjectGenerator {
|
|
|
38
38
|
this.importLakutataCoreInDev = !!options.importLakutataCoreInDev;
|
|
39
39
|
}
|
|
40
40
|
async checkLatestFrameworkVersion() {
|
|
41
|
-
this.lakutataCoreVersion = await (0,
|
|
41
|
+
this.lakutataCoreVersion = await (0, LatestVersion_1.LatestVersion)(this.lakutataPackageName);
|
|
42
42
|
}
|
|
43
43
|
async getGitRepository() {
|
|
44
44
|
try {
|
|
@@ -94,7 +94,7 @@ class ProjectGenerator {
|
|
|
94
94
|
packageConfig.scripts = options.scripts ? Object.assign(packageConfig.scripts, options.scripts) : packageConfig.scripts;
|
|
95
95
|
packageConfig.dependencies = options.dependencies ? Object.assign(packageConfig.dependencies, options.dependencies) : packageConfig.dependencies;
|
|
96
96
|
packageConfig.devDependencies = Object.assign(options.devDependencies ? Object.assign(packageConfig.devDependencies, options.devDependencies) : packageConfig.devDependencies, {
|
|
97
|
-
'@lakutata/cli': await (0,
|
|
97
|
+
'@lakutata/cli': await (0, LatestVersion_1.LatestVersion)('@lakutata/cli')
|
|
98
98
|
});
|
|
99
99
|
const gitRepository = await this.getGitRepository();
|
|
100
100
|
if (gitRepository) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectGenerator.js","sourceRoot":"","sources":["../../../../src/lib/generators/project/ProjectGenerator.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAoC;AACpC,gDAAuB;AACvB,+EAAyE;AACzE,yEAAmE;AAEnE,2EAAqE;AACrE,4DAAgG;AAGhG,4DAAsD;AAEtD,
|
|
1
|
+
{"version":3,"file":"ProjectGenerator.js","sourceRoot":"","sources":["../../../../src/lib/generators/project/ProjectGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.MainMenu = void 0;
|
|
7
7
|
const inquirer_1 = __importDefault(require("inquirer"));
|
|
8
|
-
const latest_version_1 = __importDefault(require("latest-version"));
|
|
9
8
|
const InitializeApplicationProject_1 = require("./initializeMenus/InitializeApplicationProject");
|
|
10
9
|
const InitializeModuleProject_1 = require("./initializeMenus/InitializeModuleProject");
|
|
11
10
|
const InitializeComponentProject_1 = require("./initializeMenus/InitializeComponentProject");
|
|
@@ -17,6 +16,7 @@ const ManipulateApplicationProject_1 = require("./manipulateMenus/ManipulateAppl
|
|
|
17
16
|
const ManipulateModuleProject_1 = require("./manipulateMenus/ManipulateModuleProject");
|
|
18
17
|
const ManipulateComponentProject_1 = require("./manipulateMenus/ManipulateComponentProject");
|
|
19
18
|
const ManipulatePluginProject_1 = require("./manipulateMenus/ManipulatePluginProject");
|
|
19
|
+
const LatestVersion_1 = require("../LatestVersion");
|
|
20
20
|
async function MainMenu(packageJson) {
|
|
21
21
|
const mainMenuOpt = await inquirer_1.default.prompt([{
|
|
22
22
|
name: 'opr',
|
|
@@ -141,7 +141,7 @@ async function MainMenu(packageJson) {
|
|
|
141
141
|
case 'check-update': {
|
|
142
142
|
try {
|
|
143
143
|
const localVersion = packageJson.version;
|
|
144
|
-
const npmVersion = await (0,
|
|
144
|
+
const npmVersion = await (0, LatestVersion_1.LatestVersion)(packageJson.name.toString());
|
|
145
145
|
if ((0, semver_1.gt)(npmVersion, localVersion)) {
|
|
146
146
|
console.info('有可用更新:', localVersion, '➡', npmVersion);
|
|
147
147
|
console.info('执行', `npm install -g ${packageJson.name}`, '进行更新');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MainMenu.js","sourceRoot":"","sources":["../../../src/lib/menus/MainMenu.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"MainMenu.js","sourceRoot":"","sources":["../../../src/lib/menus/MainMenu.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA+B;AAC/B,iGAA2F;AAC3F,uFAAiF;AACjF,6FAAuF;AACvF,uFAAiF;AACjF,mCAAyB;AACzB,gDAAuB;AACvB,4CAAmB;AACnB,iGAA2F;AAC3F,uFAAiF;AACjF,6FAAuF;AACvF,uFAAiF;AACjF,oDAAgD;AAEzC,KAAK,UAAU,QAAQ,CAAC,WAAgB;IAC3C,MAAM,WAAW,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC,CAAC;YACvC,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,4BAA4B,WAAW,CAAC,OAAO,GAAG;YAC3D,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE;gBACL;oBACI,IAAI,EAAE,cAAc;oBACpB,KAAK,EAAE,YAAY;iBACtB;gBACD;oBACI,IAAI,EAAE,cAAc;oBACpB,KAAK,EAAE,YAAY;iBACtB;gBACD;oBACI,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE,OAAO;iBACjB;gBACD;oBACI,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE,cAAc;iBACxB;aACJ;SACJ,CAAC,CAAC,CAAA;IACH,QAAQ,WAAW,CAAC,GAAG,EAAE;QACrB,KAAK,YAAY;YAAE;gBACf,MAAM,uBAAuB,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;oBAClD;wBACI,IAAI,EAAE,MAAM;wBACZ,OAAO,EAAE,YAAY;wBACrB,IAAI,EAAE,MAAM;wBACZ,OAAO,EAAE;4BACL;gCACI,IAAI,EAAE,MAAM;gCACZ,KAAK,EAAE,aAAa;6BACvB;4BACD;gCACI,IAAI,EAAE,IAAI;gCACV,KAAK,EAAE,QAAQ;6BAClB;4BACD;gCACI,IAAI,EAAE,IAAI;gCACV,KAAK,EAAE,WAAW;6BACrB;4BACD;gCACI,IAAI,EAAE,IAAI;gCACV,KAAK,EAAE,QAAQ;6BAClB;yBACJ;qBACJ,EAAE;wBACC,IAAI,EAAE,MAAM;wBACZ,OAAO,EAAE,QAAQ;wBACjB,IAAI,EAAE,OAAO;wBACb,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE;qBACzB;iBACJ,CAAC,CAAA;gBACF,MAAM,WAAW,GAAW,uBAAuB,CAAC,IAAI,CAAA;gBACxD,QAAQ,uBAAuB,CAAC,IAAI,EAAE;oBAClC,KAAK,aAAa,CAAC,CAAC;wBAChB,OAAO,MAAM,IAAA,2DAA4B,EAAC,WAAW,CAAC,CAAA;qBACzD;oBACD,KAAK,QAAQ,CAAC,CAAC;wBACX,OAAO,MAAM,IAAA,iDAAuB,EAAC,WAAW,CAAC,CAAA;qBACpD;oBACD,KAAK,WAAW,CAAC,CAAC;wBACd,OAAO,MAAM,IAAA,uDAA0B,EAAC,WAAW,CAAC,CAAA;qBACvD;oBACD,KAAK,QAAQ,CAAC,CAAC;wBACX,OAAO,MAAM,IAAA,iDAAuB,EAAC,WAAW,CAAC,CAAA;qBACpD;oBACD,OAAO,CAAC,CAAC;wBACL,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAA;qBAC1D;iBACJ;aACJ;YACG,MAAK;QACT,KAAK,YAAY,CAAC,CAAC;YACf,MAAM,WAAW,GAAW,OAAO,CAAC,GAAG,EAAE,CAAA;YACzC,MAAM,eAAe,GAAW,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAA;YAC3E,MAAM,gBAAgB,GAAW,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAA;YAC7E,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;gBACjC,OAAO,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;aACjD;YACD,IAAI;gBACA,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,CAAC,CAAA;gBAC5F,IAAI,kBAAkB,CAAC,QAAQ,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,EAAE;oBACjE,MAAM,WAAW,GAAsD,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAA;oBACvG,QAAQ,WAAW,EAAE;wBACjB,KAAK,aAAa,CAAC,CAAC;4BAChB,OAAO,MAAM,IAAA,2DAA4B,EAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAA;yBACxG;wBACD,KAAK,QAAQ,CAAC,CAAC;4BACX,OAAO,MAAM,IAAA,iDAAuB,EAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAA;yBACnG;wBACD,KAAK,WAAW,CAAC,CAAC;4BACd,OAAO,MAAM,IAAA,uDAA0B,EAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAA;yBACtG;wBACD,KAAK,QAAQ,CAAC,CAAC;4BACX,OAAO,IAAA,iDAAuB,EAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAA;yBAC7F;wBACD,OAAO,CAAC,CAAC;4BACL,OAAO,OAAO,CAAC,KAAK,CAAC,qBAAqB,WAAW,GAAG,CAAC,CAAA;yBAC5D;qBACJ;iBACJ;qBAAM;oBACH,OAAO,OAAO,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;iBACvD;aACJ;YAAC,OAAO,CAAC,EAAE;gBACR,OAAO,OAAO,CAAC,KAAK,CAAC,aAAc,CAAW,CAAC,OAAO,EAAE,CAAC,CAAA;aAC5D;YACD,OAAM;SACT;QACD,KAAK,OAAO,CAAC,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;YAC5C,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;YAC5C,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAA;YAClC,OAAM;SACT;QACD,KAAK,cAAc,CAAC,CAAC;YACjB,IAAI;gBACA,MAAM,YAAY,GAAW,WAAW,CAAC,OAAO,CAAA;gBAChD,MAAM,UAAU,GAAW,MAAM,IAAA,6BAAa,EAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;gBAC3E,IAAI,IAAA,WAAE,EAAC,UAAU,EAAE,YAAY,CAAC,EAAE;oBAC9B,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;oBACrD,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,kBAAkB,WAAW,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAA;iBACnE;qBAAM;oBACH,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBACxB;aACJ;YAAC,OAAO,CAAC,EAAE;gBACR,OAAO,CAAC,KAAK,CAAC,WAAY,CAAW,CAAC,OAAO,EAAE,CAAC,CAAA;aACnD;SACJ;KACJ;AACL,CAAC;AArID,4BAqIC"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lakutata/cli",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.23",
|
|
4
4
|
"description": "Lakutata CLI Tool",
|
|
5
5
|
"main": "./build/CLI.js",
|
|
6
6
|
"types": "./build/CLI.d.ts",
|
|
7
|
+
"type": "commonjs",
|
|
7
8
|
"bin": {
|
|
8
9
|
"lakutata": "./build/CLI.js",
|
|
9
10
|
"lakutata-deploy": "./build/Deploy.js"
|
|
@@ -34,16 +35,18 @@
|
|
|
34
35
|
"author": "alex.ma",
|
|
35
36
|
"license": "MIT",
|
|
36
37
|
"dependencies": {
|
|
37
|
-
"
|
|
38
|
-
"
|
|
38
|
+
"@types/args": "^5.0.0",
|
|
39
|
+
"args": "^5.0.3",
|
|
40
|
+
"inquirer": "^8.2.4",
|
|
39
41
|
"moment-timezone": "^0.5.34",
|
|
40
|
-
"
|
|
42
|
+
"package-json": "^7.0.0",
|
|
43
|
+
"semver": "^7.3.7",
|
|
41
44
|
"shelljs": "^0.8.5",
|
|
42
|
-
"simple-git": "^3.
|
|
45
|
+
"simple-git": "^3.9.0",
|
|
43
46
|
"ts-morph": "^13.0.2"
|
|
44
47
|
},
|
|
45
48
|
"devDependencies": {
|
|
46
|
-
"@lakutata/core": "^1.0.
|
|
49
|
+
"@lakutata/core": "^1.0.47",
|
|
47
50
|
"@types/inquirer": "^8.1.3",
|
|
48
51
|
"@types/node": "^16.11.7",
|
|
49
52
|
"@types/semver": "^7.3.9",
|
package/src/CLI.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
import
|
|
2
|
+
import fs from 'fs'
|
|
3
|
+
import path from 'path'
|
|
3
4
|
import {MainMenu} from './lib/menus/MainMenu'
|
|
4
|
-
|
|
5
5
|
(async () => {
|
|
6
|
-
await MainMenu(
|
|
6
|
+
await MainMenu(JSON.parse(fs.readFileSync(path.resolve(__dirname, '../package.json')).toString()))
|
|
7
7
|
})()
|
package/src/Deploy.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
(async () => {
|
|
3
3
|
const path = require('path')
|
|
4
|
+
const args = require('args')
|
|
4
5
|
const inquirer = require('inquirer')
|
|
5
6
|
const shelljs = require('shelljs')
|
|
6
7
|
const moment = require('moment-timezone')
|
|
@@ -10,6 +11,12 @@
|
|
|
10
11
|
const DOCKERFILE_PATH = process.argv[argvLen - 2]
|
|
11
12
|
const REPOSITORY_ADDR = new URL(`repo://${REGISTRY_ADDR}`).hostname
|
|
12
13
|
if (!REGISTRY_ADDR) throw new Error('未配置仓库地址')
|
|
14
|
+
args
|
|
15
|
+
.option('username')
|
|
16
|
+
.option('password')
|
|
17
|
+
.option('platform')
|
|
18
|
+
.option('tagLatest')
|
|
19
|
+
const flags = args.parse(process.argv)
|
|
13
20
|
const TIMESTAMP = Date.now()
|
|
14
21
|
const IMAGE_BASE_NAME = `lakutata_tmp_image_${TIMESTAMP}`
|
|
15
22
|
const IMAGE_VERSION = `${packageJson.version}-build.${moment().format('YYYYMMDDHHmmss')}`
|
|
@@ -20,46 +27,53 @@
|
|
|
20
27
|
})
|
|
21
28
|
})
|
|
22
29
|
}
|
|
23
|
-
const
|
|
30
|
+
const platforms = [
|
|
31
|
+
'linux/amd64',
|
|
32
|
+
'linux/arm64',
|
|
33
|
+
'linux/riscv64',
|
|
34
|
+
'linux/ppc64le',
|
|
35
|
+
'linux/s390x',
|
|
36
|
+
'linux/386',
|
|
37
|
+
'linux/arm/v7',
|
|
38
|
+
'linux/arm/v6'
|
|
39
|
+
]
|
|
40
|
+
const username = flags.username ? flags.username : (await inquirer.prompt(
|
|
24
41
|
{
|
|
25
42
|
type: 'input',
|
|
26
43
|
name: 'username',
|
|
27
44
|
message: 'Docker仓库账号'
|
|
28
|
-
}
|
|
45
|
+
}
|
|
46
|
+
)).username
|
|
47
|
+
const password = flags.password ? flags.password : (await inquirer.prompt(
|
|
29
48
|
{
|
|
30
49
|
type: 'password',
|
|
31
50
|
name: 'password',
|
|
32
51
|
message: 'Docker仓库密码',
|
|
33
52
|
mask: '*'
|
|
34
53
|
}
|
|
35
|
-
|
|
36
|
-
const
|
|
54
|
+
)).password
|
|
55
|
+
const platform = flags.platform ? flags.platform : (await inquirer.prompt(
|
|
37
56
|
{
|
|
38
57
|
type: 'list',
|
|
39
58
|
name: 'platform',
|
|
40
59
|
message: '目标构建平台架构',
|
|
41
|
-
choices:
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
'linux/ppc64le',
|
|
46
|
-
'linux/s390x',
|
|
47
|
-
'linux/386',
|
|
48
|
-
'linux/arm/v7',
|
|
49
|
-
'linux/arm/v6'
|
|
50
|
-
]
|
|
51
|
-
},
|
|
60
|
+
choices: platforms
|
|
61
|
+
}
|
|
62
|
+
)).platform
|
|
63
|
+
let tagLatest = flags.tagLatest ? flags.tagLatest : (await inquirer.prompt(
|
|
52
64
|
{
|
|
53
65
|
type: 'confirm',
|
|
54
66
|
name: 'tagLatest',
|
|
55
67
|
message: '是否为镜像打上latest标签',
|
|
56
68
|
default: false
|
|
57
69
|
}
|
|
58
|
-
|
|
59
|
-
|
|
70
|
+
)).tagLatest
|
|
71
|
+
if (typeof tagLatest === 'string') {
|
|
72
|
+
tagLatest = tagLatest !== 'false'
|
|
73
|
+
}
|
|
60
74
|
try {
|
|
61
|
-
await execPromise(`docker login --username=${
|
|
62
|
-
shelljs.exec(`docker buildx build -f ${DOCKERFILE_PATH} -t ${IMAGE_BASE_NAME}:${IMAGE_VERSION} --platform=${
|
|
75
|
+
await execPromise(`docker login --username=${username} ${REPOSITORY_ADDR} -p${password}`)
|
|
76
|
+
shelljs.exec(`docker buildx build -f ${DOCKERFILE_PATH} -t ${IMAGE_BASE_NAME}:${IMAGE_VERSION} --platform=${platform} .`)
|
|
63
77
|
shelljs.exec(`docker tag ${IMAGE_BASE_NAME}:${IMAGE_VERSION} ${REGISTRY_ADDR}:${IMAGE_VERSION}`)
|
|
64
78
|
if (tagLatest) {
|
|
65
79
|
shelljs.exec(`docker tag ${IMAGE_BASE_NAME}:${IMAGE_VERSION} ${REGISTRY_ADDR}:latest`)
|
|
@@ -9,7 +9,7 @@ import {IProjectGeneratorOptions} from '../../../interfaces/IProjectGeneratorOpt
|
|
|
9
9
|
import {IGenerator} from '../../../interfaces/IGenerator'
|
|
10
10
|
import {GitIgnore} from '../../../constants/GitIgnore'
|
|
11
11
|
import {ProjectSourceFile} from './ProjectSourceFile'
|
|
12
|
-
import
|
|
12
|
+
import { LatestVersion } from '../../LatestVersion'
|
|
13
13
|
|
|
14
14
|
export class ProjectGenerator implements IGenerator {
|
|
15
15
|
private readonly project: Project
|
|
@@ -54,7 +54,7 @@ export class ProjectGenerator implements IGenerator {
|
|
|
54
54
|
* @private
|
|
55
55
|
*/
|
|
56
56
|
private async checkLatestFrameworkVersion(): Promise<void> {
|
|
57
|
-
this.lakutataCoreVersion = await
|
|
57
|
+
this.lakutataCoreVersion = await LatestVersion(this.lakutataPackageName)
|
|
58
58
|
}
|
|
59
59
|
|
|
60
60
|
/**
|
|
@@ -123,7 +123,7 @@ export class ProjectGenerator implements IGenerator {
|
|
|
123
123
|
packageConfig.scripts = options.scripts ? Object.assign(packageConfig.scripts, options.scripts) : packageConfig.scripts
|
|
124
124
|
packageConfig.dependencies = options.dependencies ? Object.assign(packageConfig.dependencies, options.dependencies) : packageConfig.dependencies
|
|
125
125
|
packageConfig.devDependencies = Object.assign(options.devDependencies ? Object.assign(packageConfig.devDependencies, options.devDependencies) : packageConfig.devDependencies, {
|
|
126
|
-
'@lakutata/cli': await
|
|
126
|
+
'@lakutata/cli': await LatestVersion('@lakutata/cli')
|
|
127
127
|
})
|
|
128
128
|
const gitRepository: string | null = await this.getGitRepository()
|
|
129
129
|
if (gitRepository) {
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import inquirer from 'inquirer'
|
|
2
|
-
import latestVersion from 'latest-version'
|
|
3
2
|
import {InitializeApplicationProject} from './initializeMenus/InitializeApplicationProject'
|
|
4
3
|
import {InitializeModuleProject} from './initializeMenus/InitializeModuleProject'
|
|
5
4
|
import {InitializeComponentProject} from './initializeMenus/InitializeComponentProject'
|
|
@@ -11,6 +10,7 @@ import {ManipulateApplicationProject} from './manipulateMenus/ManipulateApplicat
|
|
|
11
10
|
import {ManipulateModuleProject} from './manipulateMenus/ManipulateModuleProject'
|
|
12
11
|
import {ManipulateComponentProject} from './manipulateMenus/ManipulateComponentProject'
|
|
13
12
|
import {ManipulatePluginProject} from './manipulateMenus/ManipulatePluginProject'
|
|
13
|
+
import { LatestVersion } from '../LatestVersion'
|
|
14
14
|
|
|
15
15
|
export async function MainMenu(packageJson: any) {
|
|
16
16
|
const mainMenuOpt = await inquirer.prompt([{
|
|
@@ -133,7 +133,7 @@ export async function MainMenu(packageJson: any) {
|
|
|
133
133
|
case 'check-update': {
|
|
134
134
|
try {
|
|
135
135
|
const localVersion: string = packageJson.version
|
|
136
|
-
const npmVersion: string = await
|
|
136
|
+
const npmVersion: string = await LatestVersion(packageJson.name.toString())
|
|
137
137
|
if (gt(npmVersion, localVersion)) {
|
|
138
138
|
console.info('有可用更新:', localVersion, '➡', npmVersion)
|
|
139
139
|
console.info('执行', `npm install -g ${packageJson.name}`, '进行更新')
|