@lazycatcloud/lzc-cli 1.3.6 → 1.3.8

package/changelog.md

@@ -1,3 +1,11 @@
+# 1.3.8
+
+1. 修复hellowrold路由路径不对
+
+# 1.3.7
+
+1. 修复错误的 lzc-manifest 字段读取匹配
+
 # 1.3.6
 
 1. 处理创建的应用模板 `routes` 字段命名错误问题

package/lib/app/lpk_build.js

@@ -211,6 +211,9 @@ export class LpkBuild {
     let lpkM = new LpkManifest()
     await lpkM.init(this.manifestFilePath)
     this.manifest = lpkM.manifest
+    // manifest使用 text/template模板时，标记为异常manifest
+    // 创建lpk时，直接将源文件拷入 lpk
+    this.excpManifest = lpkM.excpManifest
 
     if (!isValidPackageName(this.manifest["package"])) {
       throw `${this.manifest["package"]} 含有非法字符，请使用正确的包名格式(java的包名格式)，如：cloud.lazycat.apps.video`
@@ -331,7 +334,12 @@ export class LpkBuild {
         )
       } else {
         logger.debug("manifest\n", manifest)
-        dumpToYaml(manifest, path.join(tempDir, "manifest.yml"))
+        // 异常的manifest，就将源文件给转到lpk内
+        if (this.excpManifest) {
+          fs.writeFileSync(path.join(tempDir, "manifest.yml"), fs.readFileSync(this.manifestFilePath, "utf8"))
+        } else {
+          dumpToYaml(manifest, path.join(tempDir, "manifest.yml"))
+        }
       }
 
       // compose.override.yml

package/lib/app/lpk_create.js

@@ -45,6 +45,7 @@ export class LpkManifest {
         this.manifest = loadFromYaml(manifestFilePath)
       } catch (err) {
         this.manifest = fakeLoadManifestYml(manifestFilePath)
+        this.excpManifest = true
       }
     }
   }

package/lib/utils.js

@@ -178,16 +178,23 @@ export function fakeLoadManifestYml(file) {
       subdomain: undefined,
     },
   }
+
   res.split("\n").forEach(v => {
-    let line = v.trim().replace(" ", "")
-    if (line.includes("package") && line.split(":").length == 2) {
-      obj.package = line.split(":")[1]
+    let line = v.trim()
+    const arr = line.split(":")
+    if (arr.length != 2) {
+      return
+    }
+    let [key, value] = arr
+    value = value.trim()
+    if (!obj.package && key == "package") {
+      obj.package = value
     }
-    if (line.includes("subdomain") && line.split(":").length == 2) {
-      obj.application.subdomain = line.split(":")[1]
+    if (!obj.application.subdomain && key == "subdomain") {
+      obj.application.subdomain = value
     }
-    if (line.includes("version") && line.split(":").length == 2) {
-      obj.version = line.split(":")[1]
+    if (!obj.version && key == "version") {
+      obj.version = value
     }
   })
   return obj

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "description": "lazycat cloud developer kit",
   "scripts": {
     "prepublishOnly": "node check-changelog.js"

package/template/_lpk/manifest.yml.in

@@ -11,4 +11,4 @@ author: # app author
 application:
   subdomain: ${subdomain} #期望的app域名
   routes:
-    - /=file:///lzcapp/pkg/content
+    - /=file:///lzcapp/pkg/content/dist