@cloudbase/cli 1.12.2-beta → 1.12.4-alpha.0

package/bin/tcb.js

@@ -146,7 +146,7 @@ function errorHandler(err) {
         if (errMsg.includes('Environment') && errMsg.includes('not found')) {
             console.log(
                 chalk.yellow.bold(
-                    '\n此环境可能不属于当前账号，或为非上海地域环境，请检查环境归属，参考多地域使用方法：https://docs.cloudbase.net/cli-v1/region.html'
+                    '\n此环境可能不属于当前账号，或为非上海地域环境，如需切换地域请追加参数（例：-r gz），请检查环境归属，参考多地域使用方法：https://docs.cloudbase.net/cli-v1/region.html'
                 )
             )
         }

package/lib/commands/lowcode/comps.js

@@ -44,19 +44,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LowCodePublishVersionComps = exports.LowCodePublishComps = exports.LowCodeDebugComps = exports.LowCodeBuildComps = exports.LowCodeCreateComps = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const path_1 = __importDefault(require("path"));
 const common_1 = require("../common");
 const decorators_1 = require("../../decorators");
 const utils_1 = require("../../utils");
 const error_1 = require("../../error");
-const toolbox_1 = require("@cloudbase/toolbox");
-const chalk_1 = __importDefault(require("chalk"));
 const lowcode_cli_1 = require("@cloudbase/lowcode-cli");
-const child_process_1 = require("child_process");
 const enquirer_1 = require("enquirer");
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const util_1 = require("util");
 const semver = __importStar(require("semver"));
 const cloudService = utils_1.CloudApiService.getInstance('lowcode');
 const DEFAULE_TEMPLATE_PATH = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcc/template.zip';
@@ -98,19 +93,7 @@ let LowCodeCreateComps = class LowCodeCreateComps extends common_1.Command {
                     throw new error_1.CloudBaseError(`云端不存在组件库 ${compsName}，请到低码控制台新建该组件库！`);
                 }
             }
-            const compsPath = path_1.default.resolve(process.cwd(), compsName);
-            if (fs_extra_1.default.pathExistsSync(compsPath)) {
-                throw new error_1.CloudBaseError(`当前目录下已存在组件库 ${compsName} ！`);
-            }
-            yield _download(compsPath, compsName);
-            const installed = yield _install(compsPath);
-            log.success('组件库 - 创建成功\n');
-            log.info(`👉 执行命令 ${chalk_1.default.bold.cyan(`cd ${compsName}`)} 进入文件夹`);
-            if (!installed) {
-                log.info(`👉 执行命令 ${chalk_1.default.bold.cyan('npm install')} 手动安装依赖`);
-            }
-            log.info(`👉 执行命令 ${chalk_1.default.bold.cyan('tcb lowcode debug')} 调试组件库`);
-            log.info(`👉 执行命令 ${chalk_1.default.bold.cyan('tcb lowcode publish')} 发布组件库`);
+            yield (0, lowcode_cli_1.bootstrap)(compsName, log);
         });
     }
 };
@@ -361,65 +344,6 @@ LowCodePublishVersionComps = __decorate([
     (0, common_1.ICommand)()
 ], LowCodePublishVersionComps);
 exports.LowCodePublishVersionComps = LowCodePublishVersionComps;
-function _download(compsPath, compsName) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield (0, utils_1.execWithLoading)(() => __awaiter(this, void 0, void 0, function* () {
-            yield (0, utils_1.fetchStream)(DEFAULE_TEMPLATE_PATH).then((res) => __awaiter(this, void 0, void 0, function* () {
-                if (!res) {
-                    throw new error_1.CloudBaseError('请求异常');
-                }
-                if (res.status !== 200) {
-                    throw new error_1.CloudBaseError('未找到组件库模板');
-                }
-                yield (0, toolbox_1.unzipStream)(res.body, compsPath);
-                _renamePackage(path_1.default.resolve(compsPath, 'cloudbaserc.json'), compsName);
-            }));
-        }), {
-            startTip: '组件库 - 下载模板中',
-            successTip: '组件库 - 下载模板成功'
-        });
-    });
-}
-function _renamePackage(configPath, name) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!fs_extra_1.default.existsSync(configPath)) {
-            throw new error_1.CloudBaseError(`组件库缺少配置文件: ${configPath}`);
-        }
-        const rcJson = fs_extra_1.default.readJSONSync(configPath);
-        const newPackageJson = lodash_1.default.merge({}, rcJson, {
-            lowcodeCustomComponents: {
-                name
-            }
-        });
-        fs_extra_1.default.writeJSONSync(configPath, newPackageJson, { spaces: 2 });
-    });
-}
-function _install(compsPath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const res = yield (0, utils_1.execWithLoading)(() => __awaiter(this, void 0, void 0, function* () {
-            const npmOptions = [
-                '--prefer-offline',
-                '--no-audit',
-                '--progress=false',
-                '--registry=https://mirrors.tencent.com/npm/',
-                '--legacy-peer-deps',
-            ];
-            yield (0, util_1.promisify)(child_process_1.exec)(['npm install', ...npmOptions].join(' '), {
-                cwd: compsPath,
-                env: process.env,
-            });
-        }), {
-            startTip: '组件库 - 依赖安装中',
-            successTip: '组件库 - 依赖安装成功',
-            failTip: '组件库 - 依赖安装失败, 请手动安装依赖'
-        }).then(() => {
-            return true;
-        }).catch(() => {
-            return false;
-        });
-        return res;
-    });
-}
 function _build(compsPath) {
     return __awaiter(this, void 0, void 0, function* () {
         yield (0, utils_1.execWithLoading)(() => __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "1.12.2-beta",
+    "version": "1.12.4-alpha.0",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -31,8 +31,8 @@
     "dependencies": {
         "@cloudbase/cloud-api": "^0.4.0",
         "@cloudbase/framework-core": "^1.6.1",
-        "@cloudbase/lowcode-cli": "^0.12.2",
-        "@cloudbase/manager-node": "3.11.1-beta",
+        "@cloudbase/lowcode-cli": "^0.12.11-alpha.1",
+        "@cloudbase/manager-node": "3.12.1",
         "@cloudbase/toolbox": "^0.7.2",
         "@sentry/node": "^5.10.2",
         "address": "^1.1.2",

package/src/commands/lowcode/comps.ts

@@ -4,7 +4,6 @@ import { Command, ICommand } from '../common'
 import { InjectParams, Log, Logger, ArgsParams, ArgsOptions, CmdContext } from '../../decorators'
 import { CloudApiService, execWithLoading, fetchStream } from '../../utils'
 import { CloudBaseError } from '../../error'
-import { unzipStream } from '@cloudbase/toolbox'
 import chalk from 'chalk'
 import { 
     build as buildComps, 
@@ -14,12 +13,11 @@ import {
     graceDebugComps,
     gracePublishComps,
     IPublishCompsInfo,
-    publishVersion
+    publishVersion,
+    bootstrap,
 } from '@cloudbase/lowcode-cli'
-import { exec } from 'child_process'
 import { prompt } from 'enquirer'
 import fse from 'fs-extra'
-import { promisify } from 'util'
 import * as semver from 'semver'
 
 const cloudService = CloudApiService.getInstance('lowcode')
@@ -67,24 +65,9 @@ export class LowCodeCreateComps extends Command {
             }
         }
 
-        // 拼接模板路径
-        const compsPath = path.resolve(process.cwd(), compsName)
-        if (fse.pathExistsSync(compsPath)) {
-            throw new CloudBaseError(`当前目录下已存在组件库 ${compsName} ！`)
-        }
+        // TODO: 逻辑迁移到 lowcode-cli
+        await bootstrap(compsName, log);
 
-        // 下载模板
-        await _download(compsPath, compsName)
-        // 安装依赖
-        const installed = await _install(compsPath)
-        // 用户提示
-        log.success('组件库 - 创建成功\n')
-        log.info(`👉 执行命令 ${chalk.bold.cyan(`cd ${compsName}`)} 进入文件夹`)
-        if (!installed) {
-            log.info(`👉 执行命令 ${chalk.bold.cyan('npm install')} 手动安装依赖`)
-        }
-        log.info(`👉 执行命令 ${chalk.bold.cyan('tcb lowcode debug')} 调试组件库`)
-        log.info(`👉 执行命令 ${chalk.bold.cyan('tcb lowcode publish')} 发布组件库`)
     }
 }
 
@@ -313,73 +296,6 @@ export class LowCodePublishVersionComps extends Command {
     }
 }
 
-async function _download(compsPath, compsName) {
-    await execWithLoading(
-        async () => {
-            await fetchStream(DEFAULE_TEMPLATE_PATH).then(async (res) => {
-                if (!res) {
-                    throw new CloudBaseError('请求异常')
-                }
-        
-                if (res.status !== 200) {
-                    throw new CloudBaseError('未找到组件库模板')
-                }
-        
-                // 解压缩文件
-                await unzipStream(res.body, compsPath)
-                
-                // 修改cloudbaserc.json
-                _renamePackage(path.resolve(compsPath, 'cloudbaserc.json'), compsName)
-            })
-        },
-        {
-            startTip: '组件库 - 下载模板中',
-            successTip: '组件库 - 下载模板成功'
-        }
-    )
-}
-
-async function _renamePackage(configPath, name) {
-    if (!fse.existsSync(configPath)) {
-        throw new CloudBaseError(`组件库缺少配置文件: ${configPath}`)
-    }
-    const rcJson = fse.readJSONSync(configPath)
-    const newPackageJson = _.merge({}, rcJson, {
-        lowcodeCustomComponents: {
-            name
-        }
-    })
-    fse.writeJSONSync(configPath, newPackageJson, { spaces: 2 })
-}
-
-async function _install(compsPath): Promise<boolean> {
-    const res = await execWithLoading(
-        async () => {
-            const npmOptions = [
-                '--prefer-offline',
-                '--no-audit',
-                '--progress=false',
-                '--registry=https://mirrors.tencent.com/npm/',
-                '--legacy-peer-deps',
-            ]
-            await promisify(exec)(['npm install', ...npmOptions].join(' '), {
-                cwd: compsPath, 
-                env: process.env,
-            })
-        },
-        {
-            startTip: '组件库 - 依赖安装中',
-            successTip: '组件库 - 依赖安装成功',
-            failTip: '组件库 - 依赖安装失败, 请手动安装依赖'
-        }
-    ).then(() => {
-        return true
-    }).catch(() => {
-        return false
-    })
-
-    return res
-}
 
 async function _build(compsPath) {
     await execWithLoading(

package/tsconfig.json

@@ -6,6 +6,7 @@
         "outDir": "lib",
         "removeComments": true,
         "types": ["node"],
+        "skipLibCheck": true,
         "esModuleInterop": true,
         "declaration": true,
         "declarationDir": "./types",