@cloudbase/cli 2.2.0-alpha.9 → 2.2.0-beta.1

package/bin/tcb.js

@@ -53,12 +53,13 @@ console.log(chalk.gray(`CloudBase Framework ${frameworkPkg.version}`))
 
 const yargsParsedResult = yargsParser(process.argv.slice(2));
 const config = await getCloudBaseConfig(yargsParsedResult.configFile);
-const privateSettings = getPrivateSettings(config, yargsParsedResult._?.[0])
-
-if (privateSettings) {
+const isPrivateEnv = Boolean(getPrivateSettings(config))
+if (isPrivateEnv) {
     console.log(chalk.gray(`检测到私有化配置`))
-    // 初始化 lowcode 服务cliapi入口
-    process.env.CLOUDBASE_LOWCODE_CLOUDAPI_URL = privateSettings.endpoints.cliApi;
+    if(privateSettings.endpoints && privateSettings.endpoints.cliApi){
+        // 初始化 lowcode 服务cliapi入口
+        process.env.CLOUDBASE_LOWCODE_CLOUDAPI_URL = privateSettings.endpoints.cliApi;
+    }
 
 }
 // 注册命令

package/lib/commands/functions/index.js

@@ -30,3 +30,4 @@ __exportStar(require("./code-download"), exports);
 __exportStar(require("./version"), exports);
 __exportStar(require("./concurrency"), exports);
 __exportStar(require("./alias"), exports);
+__exportStar(require("./layer"), exports);

package/lib/commands/functions/layer/create.js

@@ -50,7 +50,7 @@ let CreateFileLayer = class CreateFileLayer extends common_1.Command {
             const { file } = options;
             const layerName = `${alias}_${envId}`;
             const filePath = path_1.default.resolve(file);
-            const runtimes = ['Nodejs8.9', 'Php7', 'Java8'];
+            const runtimes = ['Nodejs12.16', 'Nodejs8.9', 'Php7', 'Java8'];
             const loading = (0, utils_1.loadingFactory)();
             loading.start('文件层创建中...');
             yield (0, function_1.createLayer)({

package/lib/commands/lowcode/app.js

@@ -77,6 +77,10 @@ let LowCodeWatch = class LowCodeWatch extends common_1.Command {
                 {
                     flags: '--wx-devtool-path <wxDevtoolPath>',
                     desc: '微信开发者工具的安装路径'
+                },
+                {
+                    flags: '--force-install',
+                    desc: '是否忽略安装依赖包'
                 }
             ],
             desc: '开启微搭低代码的本地构建模式',
@@ -90,7 +94,8 @@ let LowCodeWatch = class LowCodeWatch extends common_1.Command {
             Promise.resolve().then(() => __importStar(require('@cloudbase/lowcode-cli'))).then((res) => __awaiter(this, void 0, void 0, function* () {
                 yield res.watchApp({
                     watchPort: 8288,
-                    wxDevtoolPath: mergesOptions === null || mergesOptions === void 0 ? void 0 : mergesOptions.wxDevtoolPath
+                    wxDevtoolPath: options === null || options === void 0 ? void 0 : options.wxDevtoolPath,
+                    forceInstall: options === null || options === void 0 ? void 0 : options.forceInstall
                 });
             }));
         });
@@ -188,7 +193,7 @@ let LowCodeDeployApp = class LowCodeDeployApp extends common_1.Command {
                 projectPath: process.cwd(),
                 logger: log,
                 privateSettings
-            }, Object.assign(Object.assign({ credential }, restMergedOptions), { projectPath: src }));
+            }, Object.assign(Object.assign({ credential }, restMergedOptions), { projectPath: src || restMergedOptions.projectPath }));
         });
     }
 };

package/lib/function/layer/create.js

@@ -22,7 +22,7 @@ function createLayer(options) {
     return __awaiter(this, void 0, void 0, function* () {
         const { contentPath = '', layerName, base64Content = '', runtimes = [] } = options;
         (0, utils_1.checkFullAccess)(contentPath);
-        const validRuntime = ['Nodejs8.9', 'Php7', 'Java8'];
+        const validRuntime = ['Nodejs8.9', 'Php7', 'Java8', 'Nodejs12.16'];
         if (runtimes.some(item => validRuntime.indexOf(item) === -1)) {
             throw new toolbox_1.CloudBaseError(`Invalid runtime value. Now only support: ${validRuntime.join(', ')}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.2.0-alpha.9",
+    "version": "2.2.0-beta.1",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -32,9 +32,9 @@
     "dependencies": {
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.9.6",
-        "@cloudbase/lowcode-cli": "0.17.0-alpha.9",
+        "@cloudbase/lowcode-cli": "^0.18.0",
         "@cloudbase/manager-node": "4.0.1",
-        "@cloudbase/toolbox": "^0.7.3",
+        "@cloudbase/toolbox": "^0.7.4",
         "@sentry/node": "^5.10.2",
         "address": "^1.1.2",
         "chalk": "^2.4.2",

package/types/commands/functions/index.d.ts

@@ -14,3 +14,4 @@ export * from './code-download';
 export * from './version';
 export * from './concurrency';
 export * from './alias';
+export * from './layer';