@cloudbase/cli 2.2.14 → 2.3.0

package/lib/commands/lowcode/app.js

@@ -81,6 +81,10 @@ let LowCodeWatch = class LowCodeWatch extends common_1.Command {
                 {
                     flags: '--force-install',
                     desc: '是否忽略安装依赖包'
+                },
+                {
+                    flags: '-p, --path <localProjectPath>',
+                    desc: '本地开发的本地项目路径'
                 }
             ],
             desc: '开启微搭低代码的本地构建模式',
@@ -95,7 +99,8 @@ let LowCodeWatch = class LowCodeWatch extends common_1.Command {
                 yield res.watchApp({
                     watchPort: 8288,
                     wxDevtoolPath: options === null || options === void 0 ? void 0 : options.wxDevtoolPath,
-                    forceInstall: options === null || options === void 0 ? void 0 : options.forceInstall
+                    forceInstall: options === null || options === void 0 ? void 0 : options.forceInstall,
+                    projectPath: options === null || options === void 0 ? void 0 : options.path
                 });
             }));
         });

package/lib/commands/lowcode/comps.js

@@ -235,7 +235,9 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], LowCodeDebugComps.prototype, "execute", null);
 LowCodeDebugComps = __decorate([
-    (0, common_1.ICommand)()
+    (0, common_1.ICommand)({
+        supportPrivate: true
+    })
 ], LowCodeDebugComps);
 exports.LowCodeDebugComps = LowCodeDebugComps;
 let LowCodePublishComps = class LowCodePublishComps extends common_1.Command {

package/lib/commands/storage/storage.js

@@ -398,7 +398,7 @@ let StorageDetailCommand = class StorageDetailCommand extends common_1.Command {
             const storageService = yield getStorageService(envId);
             const fileInfo = yield storageService.getFileInfo(cloudPath);
             const date = (0, utils_1.formatDate)(fileInfo.Date, 'yyyy-MM-dd hh:mm:ss');
-            const logInfo = `文件大小：${fileInfo.Size}\n文件类型：${fileInfo.Type}\n修改日期：${date}\nETag：${fileInfo.ETag}
+            const logInfo = `文件大小：${fileInfo.Size}\n文件类型：${fileInfo.Type}\n修改日期：${date}\nETag：${fileInfo.ETag}
             `;
             console.log(logInfo);
         });

package/lib/env/login.js

@@ -16,13 +16,13 @@ exports.updateLoginConfig = exports.createLoginConfig = exports.getLoginConfigLi
 const crypto_1 = __importDefault(require("crypto"));
 const net_1 = require("../utils/net");
 const error_1 = require("../error");
-const publicRsaKey = `
------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0ZLB0ZpWWFsHPnDDw++Nc2wI3
-nl2uyOrIJ5FUfxt4GAmt1Faf5pgMxAnL9exEUrrUDUX8Ri1R0KyfnHQQwCvKt8T8
-bgILIJe9UB8e9dvFqgqH2oA8Vqwi0YqDcvFLFJk2BJbm/0QYtZ563FumW8LEXAgu
-UeHi/0OZN9vQ33jWMQIDAQAB
------END PUBLIC KEY-----
+const publicRsaKey = `
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0ZLB0ZpWWFsHPnDDw++Nc2wI3
+nl2uyOrIJ5FUfxt4GAmt1Faf5pgMxAnL9exEUrrUDUX8Ri1R0KyfnHQQwCvKt8T8
+bgILIJe9UB8e9dvFqgqH2oA8Vqwi0YqDcvFLFJk2BJbm/0QYtZ563FumW8LEXAgu
+UeHi/0OZN9vQ33jWMQIDAQAB
+-----END PUBLIC KEY-----
 `;
 function rsaEncrypt(data) {
     const buffer = Buffer.from(data);

package/lib/utils/checkTcbrEnv.js

@@ -16,28 +16,28 @@ exports.logEnvCheck = exports.checkTcbrEnv = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const error_1 = require("../error");
 const tcbrApi_1 = require("./tcbrApi");
-const oldCmdSet = `
-服务列表：tcb run:deprecated list --envId <envId>
-创建服务：tcb run:deprecated create --envId <envId> --name <name>
-删除服务：tcb run:deprecated delete --envId <envId> --serviceName <serviceName>
-
-版本列表：tcb run:deprecated version list --envId <envId> --serviceName <serviceName>
-创建版本：tcb run:deprecated version create --envId <envId> --serviceName <serviceName>
-分配流量：tcb run:deprecated version modify --envId <envId> --serviceName <serviceName>
-滚动更新：tcb run:deprecated version update --envId <envId> --serviceName <serviceName> --versionName <versionName>
-删除版本：tcb run:deprecated version delete --envId <envId> --serviceName <serviceName> --versionName <versionName>
-
-查看镜像：tcb run:deprecated image list --envId <envId> --serviceName <serviceName>
-上传镜像：tcb run:deprecated image upload --envId <envId> --serviceName <serviceName> --imageId <imageId> --imageTag <imageTag>
-下载镜像：tcb run:deprecated image download --envId <envId> --serviceName <serviceName> --imageTag <imageTag>
-删除镜像：tcb run:deprecated image delete --envId <envId> --serviceName <serviceName> --imageTag <imageTag>
+const oldCmdSet = `
+服务列表：tcb run:deprecated list --envId <envId>
+创建服务：tcb run:deprecated create --envId <envId> --name <name>
+删除服务：tcb run:deprecated delete --envId <envId> --serviceName <serviceName>
+
+版本列表：tcb run:deprecated version list --envId <envId> --serviceName <serviceName>
+创建版本：tcb run:deprecated version create --envId <envId> --serviceName <serviceName>
+分配流量：tcb run:deprecated version modify --envId <envId> --serviceName <serviceName>
+滚动更新：tcb run:deprecated version update --envId <envId> --serviceName <serviceName> --versionName <versionName>
+删除版本：tcb run:deprecated version delete --envId <envId> --serviceName <serviceName> --versionName <versionName>
+
+查看镜像：tcb run:deprecated image list --envId <envId> --serviceName <serviceName>
+上传镜像：tcb run:deprecated image upload --envId <envId> --serviceName <serviceName> --imageId <imageId> --imageTag <imageTag>
+下载镜像：tcb run:deprecated image download --envId <envId> --serviceName <serviceName> --imageTag <imageTag>
+删除镜像：tcb run:deprecated image delete --envId <envId> --serviceName <serviceName> --imageTag <imageTag>
 `;
-const newCmdSet = `
-查看环境下服务：tcb run service:list --envId <envId>
-创建云托管服务：tcb run service:create --envId <envId> --serviceName <serviceName> --containerPort <containerPort>
-更新云托管服务：tcb run service:update --envId <envId> --serviceName <serviceName> --containerPort <containerPort>
-部署云托管服务：tcb run deploy --envId <envId> --serviceName <serviceName> --containerPort <containerPort>
-更新服务基础配置：tcb run service:config --envId <envId> --serviceName <serviceName>
+const newCmdSet = `
+查看环境下服务：tcb run service:list --envId <envId>
+创建云托管服务：tcb run service:create --envId <envId> --serviceName <serviceName> --containerPort <containerPort>
+更新云托管服务：tcb run service:update --envId <envId> --serviceName <serviceName> --containerPort <containerPort>
+部署云托管服务：tcb run deploy --envId <envId> --serviceName <serviceName> --containerPort <containerPort>
+更新服务基础配置：tcb run service:config --envId <envId> --serviceName <serviceName>
 `;
 function checkTcbrEnv(envId, isTcbr) {
     return __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.2.14",
+    "version": "2.3.0",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
-        "build": "rimraf lib types && tsc",
+        "build": "rimraf lib types && tsc --resolveJsonModule",
         "watch": "rimraf lib types && tsc -w",
         "dev": "rimraf lib types && tsc -w",
         "eslint": "eslint \"./**/*.ts\"",
@@ -32,9 +32,9 @@
     "dependencies": {
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.9.6",
-        "@cloudbase/lowcode-cli": "^0.18.5",
+        "@cloudbase/lowcode-cli": "^0.20.0",
         "@cloudbase/manager-node": "4.2.3",
-        "@cloudbase/toolbox": "^0.7.4",
+        "@cloudbase/toolbox": "^0.7.5",
         "@sentry/node": "^5.10.2",
         "address": "^1.1.2",
         "chalk": "^2.4.2",
@@ -86,4 +86,4 @@
         "ts-jest": "^27",
         "typescript": "^4.7.2"
     }
-}
+}

package/post-install.js

@@ -1,61 +1,61 @@
-/* eslint-disable */
-const chalk = require('chalk')
-const { execSync } = require('child_process')
-
-const isWin32 = process.platform === 'win32'
-
-const print = (color = null) => (str = '') => {
-    const terminalCols = retrieveCols()
-    const strLength = str.replace(/\u001B\[[0-9]{2}m/g, '').length
-    const leftPaddingLength = Math.floor((terminalCols - strLength) / 2)
-    const leftPadding = ' '.repeat(Math.max(leftPaddingLength, 0))
-    if (color) {
-        str = chalk[color](str)
-    }
-
-    console.log(leftPadding, str)
-}
-
-const retrieveCols = (() => {
-    let result = false
-
-    return () => {
-        if (result) {
-            return result
-        }
-        const defaultCols = 80
-
-        try {
-            const terminalCols = execSync('tput cols', { stdio: ['pipe', 'pipe', 'ignore'] })
-            result = parseInt(terminalCols.toString()) || defaultCols
-        } catch (e) {
-            result = defaultCols
-        }
-
-        return result
-    }
-})()
-
-// 只在 osx 系统上展示 emoji
-const emoji = (emoji) => (process.stdout.isTTY && !isWin32 ? emoji : '')
-
-function printFooter() {
-    const yellow = print('yellow')
-    // const yellow = str => console.log(chalk.yellow(str))
-    const emptyLine = print()
-
-    emptyLine()
-
-    yellow('了解如何使用 CloudBase CLI')
-    yellow('请查看使用文档')
-
-    print()(
-        ' '.repeat(15) +
-            `${chalk.bold(emoji('👉'))} ${chalk.underline(
-                'https://docs.cloudbase.net/cli-v1/quick-start.html'
-            )}`
-    )
-    emptyLine()
-}
-
-printFooter()
+/* eslint-disable */
+const chalk = require('chalk')
+const { execSync } = require('child_process')
+
+const isWin32 = process.platform === 'win32'
+
+const print = (color = null) => (str = '') => {
+    const terminalCols = retrieveCols()
+    const strLength = str.replace(/\u001B\[[0-9]{2}m/g, '').length
+    const leftPaddingLength = Math.floor((terminalCols - strLength) / 2)
+    const leftPadding = ' '.repeat(Math.max(leftPaddingLength, 0))
+    if (color) {
+        str = chalk[color](str)
+    }
+
+    console.log(leftPadding, str)
+}
+
+const retrieveCols = (() => {
+    let result = false
+
+    return () => {
+        if (result) {
+            return result
+        }
+        const defaultCols = 80
+
+        try {
+            const terminalCols = execSync('tput cols', { stdio: ['pipe', 'pipe', 'ignore'] })
+            result = parseInt(terminalCols.toString()) || defaultCols
+        } catch (e) {
+            result = defaultCols
+        }
+
+        return result
+    }
+})()
+
+// 只在 osx 系统上展示 emoji
+const emoji = (emoji) => (process.stdout.isTTY && !isWin32 ? emoji : '')
+
+function printFooter() {
+    const yellow = print('yellow')
+    // const yellow = str => console.log(chalk.yellow(str))
+    const emptyLine = print()
+
+    emptyLine()
+
+    yellow('了解如何使用 CloudBase CLI')
+    yellow('请查看使用文档')
+
+    print()(
+        ' '.repeat(15) +
+            `${chalk.bold(emoji('👉'))} ${chalk.underline(
+                'https://docs.cloudbase.net/cli-v1/quick-start.html'
+            )}`
+    )
+    emptyLine()
+}
+
+printFooter()