@cloudbase/cli 2.6.0-alpha.4 → 2.6.0-alpha.6

package/lib/commands/fun/base.js

@@ -175,7 +175,7 @@ let FunDeployCommand = class FunDeployCommand extends common_1.Command {
                 Limit: 1,
                 Offset: 0
             });
-            if (fetchSvrRes.ServerName && fetchSvrRes.Tag !== 'function') {
+            if (fetchSvrRes.ServerName && !_isFunRunService(fetchSvrRes.Tag)) {
                 log.error(`${serviceName} 服务已存在，但不是一个函数式托管服务，请使用另外的服务名称`);
                 return;
             }
@@ -229,7 +229,7 @@ let FunDeployCommand = class FunDeployCommand extends common_1.Command {
                     envId,
                     serviceName,
                     filePath: source,
-                    fileToIgnore: includeNodeModules ? [] : ['node_modules/**/*']
+                    fileToIgnore: includeNodeModules ? [] : ['node_modules', 'node_modules/**/*']
                 });
                 packageName = PackageName;
                 packageVersion = PackageVersion;
@@ -410,3 +410,10 @@ function _inputAppId(defaultVal = '') {
         return answers['appId'];
     });
 }
+function _isFunRunService(tagStr) {
+    if (!tagStr)
+        return false;
+    const tags = tagStr.split(',');
+    const tagList = tags.map((item) => item.split(':')[0]);
+    return tagList.includes('function');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.6.0-alpha.4",
+    "version": "2.6.0-alpha.6",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {