@cloudbase/cli 2.6.0-alpha.3 → 2.6.0-alpha.5

package/lib/commands/fun/base.js

@@ -54,7 +54,6 @@ let FunListCommand = class FunListCommand extends common_1.Command {
         };
     }
     execute(envId, log) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const loading = (0, utils_1.loadingFactory)();
             if (!envId) {
@@ -69,10 +68,13 @@ let FunListCommand = class FunListCommand extends common_1.Command {
                     .request('DescribeCloudBaseRunServers', {
                     EnvId: envId,
                     Limit: 100,
-                    Offset: 0
+                    Offset: 0,
+                    Filter: {
+                        Tag: 'function'
+                    }
                 })
                     .finally(() => loading.stop());
-                const serverList = (_a = serverListRes.CloudBaseRunServerSet) === null || _a === void 0 ? void 0 : _a.filter((item) => item.Tag === 'function');
+                const serverList = serverListRes.CloudBaseRunServerSet;
                 const head = ['服务名称', '状态', '创建时间', '更新时间'];
                 const tableData = serverList.map((serverItem) => [
                     serverItem.ServerName,
@@ -121,6 +123,10 @@ let FunDeployCommand = class FunDeployCommand extends common_1.Command {
                 {
                     flags: '--source <source>',
                     desc: '目标函数文件所在目录路径。默认为当前路径'
+                },
+                {
+                    flags: '--includeNodeModules',
+                    desc: '包含本地 node_modules 目录，默认为 false 不包含'
                 }
             ],
             requiredEnvId: false,
@@ -130,7 +136,7 @@ let FunDeployCommand = class FunDeployCommand extends common_1.Command {
     }
     execute(envId, log, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { serviceName, appId, source } = options;
+            let { serviceName, appId, source, includeNodeModules = false } = options;
             const target = 'main';
             source = path_1.default.resolve(source || process.cwd());
             const loadResult = yield (0, functions_framework_1.loadUserFunction)(source, target);
@@ -171,7 +177,7 @@ let FunDeployCommand = class FunDeployCommand extends common_1.Command {
                 Limit: 1,
                 Offset: 0
             });
-            if (fetchSvrRes.ServerName && fetchSvrRes.Tag !== 'function') {
+            if (fetchSvrRes.ServerName && !_hasTag(fetchSvrRes.Tags, 'function')) {
                 log.error(`${serviceName} 服务已存在，但不是一个函数式托管服务，请使用另外的服务名称`);
                 return;
             }
@@ -224,7 +230,8 @@ let FunDeployCommand = class FunDeployCommand extends common_1.Command {
                 const { PackageName, PackageVersion } = yield (0, run_1.packageDeploy)({
                     envId,
                     serviceName,
-                    filePath: source
+                    filePath: source,
+                    fileToIgnore: includeNodeModules ? [] : ['node_modules/**/*']
                 });
                 packageName = PackageName;
                 packageVersion = PackageVersion;
@@ -405,3 +412,8 @@ function _inputAppId(defaultVal = '') {
         return answers['appId'];
     });
 }
+function _hasTag(tagsStr, target) {
+    const tags = tagsStr.split(',');
+    const tag_list = tags.map((item) => item.split(':')[0]);
+    return tag_list.includes(target);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.6.0-alpha.3",
+    "version": "2.6.0-alpha.5",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -33,7 +33,7 @@
     "dependencies": {
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.9.7",
-        "@cloudbase/functions-framework": "^0.0.12",
+        "@cloudbase/functions-framework": "^1.0.0-beta.3",
         "@cloudbase/lowcode-cli": "^0.21.1",
         "@cloudbase/manager-node": "4.2.8",
         "@cloudbase/toolbox": "^0.7.5",