@lazycatcloud/lzc-cli 1.2.41 → 1.2.42

package/lib/app/lpk_build.js

@@ -187,6 +187,11 @@ export class LpkBuild {
     if (!isValidPackageName(this.manifest["package"])) {
       throw `${this.manifest["package"]} 含有非法字符，请使用正确的包名格式(java的包名格式)，如：cloud.lazycat.apps.video`
     }
+
+    if (!this.manifest["application"]["subdomain"]) {
+      throw `application 模块下的 subdomain 字段不能为空`
+    }
+
     return this.manifest
   }
 

package/lib/app/lpk_create.js

@@ -28,7 +28,11 @@ export class LpkManifest {
     if (!manifestFilePath) {
       manifestFilePath = path.join(
         this.pwd,
-        "../../template/_lpk/manifest.yml.in"
+        "..",
+        "..",
+        "template",
+        "_lpk",
+        "manifest.yml.in"
       )
     }
 
@@ -88,7 +92,11 @@ export class TemplateInit {
     // 优先使用模板项目自定义的模板文件
     const typeTemplatePath = path.join(
       contextDirname(import.meta.url),
-      `../../template/_lpk/${this.type}.manifest.yml.in`
+      "..",
+      "..",
+      "template",
+      "_lpk",
+      `${this.type}.manifest.yml.in`
     )
     const templatePath = isFileExist(typeTemplatePath) ? typeTemplatePath : ""
     await this.lpkManifest.init(templatePath, true)

package/lib/app/lpk_create_generator.js

@@ -10,10 +10,10 @@ import logger from "loglevel"
 const __dirname = contextDirname(import.meta.url)
 
 async function loadFiles(dirPath, prefix = "") {
-  const templateRoot = path.join(__dirname, "../../template/")
+  const templateRoot = path.join(__dirname, "..", "..", "template")
   const templateDir = path.join(templateRoot, dirPath)
 
-  const _files = await glob(["**/*"], { cwd: templateDir })
+  const _files = await glob(["**/*", "**/.*", ".*"], { cwd: templateDir })
   let content
   let files = {}
   for (let p of _files) {
@@ -59,7 +59,11 @@ function appendREADME(dir) {
   const readme = path.resolve(dir, "README.md")
   const readmeTemplate = path.resolve(
     __dirname,
-    "../../template/_lpk/README.md"
+    "..",
+    "..",
+    "template",
+    "_lpk",
+    "README.md"
   )
   if (!isFileExist(readme)) {
     fs.copyFileSync(readmeTemplate, readme)
@@ -85,14 +89,22 @@ function vueTemplate(type) {
 
       const lzcBuildTemplatePath = path.resolve(
         __dirname,
-        `../../template/_lpk/vue.lzc-build.yml.in`
+        "..",
+        "..",
+        "template",
+        "_lpk",
+        "vue.lzc-build.yml.in"
       )
       logger.debug("复制", lzcBuildTemplatePath)
       fs.copyFileSync(lzcBuildTemplatePath, path.resolve(name, "lzc-build.yml"))
 
       const iconPngPath = path.resolve(
         __dirname,
-        "../../template/_lpk/lazycat.png"
+        "..",
+        "..",
+        "template",
+        "_lpk",
+        "lazycat.png"
       )
       fs.copyFileSync(iconPngPath, path.resolve(name, "lazycat.png"))
 

package/lib/app/lpk_installer.js

@@ -93,8 +93,12 @@ export class LpkInstaller {
     const tempDir = fs.mkdtempSync(".lzc-cli-install")
     let manifest
     try {
-      unzipSync(pkgPath, tempDir)
+      unzipSync(pkgPath, tempDir, ["manifest.yml", "icon.png"])
       manifest = loadFromYaml(path.join(tempDir, "manifest.yml"))
+      if (!manifest["application"]["subdomain"]) {
+        throw "manifest.yml 中的 `application.subdomain` 字段不能为空"
+      }
+
       logger.debug("是否生成APK:", installConfig.apk)
       if (installConfig.apk) {
         await triggerApk(

package/lib/appstore/prePublish.js

@@ -6,6 +6,7 @@ import inquirer from "inquirer"
 import path from "node:path"
 import { isFileExist, isPngWithFile, unzipSync } from "../utils.js"
 import env from "../env.js"
+import { Publish } from "./publish.js"
 
 async function askChangeLog() {
   const noEmpty = (value) => value != ""
@@ -37,36 +38,6 @@ export class PrePublish {
     this.baseUrl = baseUrl
   }
 
-  /**
-   * @param {string} raw
-   */
-  isJSON(raw) {
-    const ml = raw.length
-    if (ml <= 1) return false
-    return raw[0] == "{" && raw[ml - 1] == "}"
-  }
-
-  preCheck(pkgPath) {
-    const tempDir = fs.mkdtempSync(".lzc-cli-publish")
-    try {
-      unzipSync(pkgPath, tempDir)
-      if (isFileExist(path.join(tempDir, "devshell"))) {
-        logger.error(
-          "不能发布一个devshell的版本，请重新使用 `lzc-cli project build` 构建"
-        )
-        return false
-      }
-      const tempIcon = path.join(tempDir, "icon.png")
-      if (!isFileExist(tempIcon) || !isPngWithFile(tempIcon)) {
-        logger.error("icon 必须是 png 格式")
-        return false
-      }
-      return true
-    } finally {
-      fs.rmSync(tempDir, { recursive: true })
-    }
-  }
-
   async getDict() {
     const url = this.baseUrl + "/groups/dict"
     const token = env.get("token")
@@ -77,7 +48,7 @@ export class PrePublish {
       }
     })
     const text = (await res.text()).trim()
-    if (!this.isJSON(text)) {
+    if (!Publish.isJSON(text)) {
       logger.error(`parse error: dict resp text not is json`)
       return
     }
@@ -101,7 +72,7 @@ export class PrePublish {
       }
     })
     const text = (await res.text()).trim()
-    if (!this.isJSON(text)) {
+    if (!Publish.isJSON(text)) {
       logger.error(`parse error: upload resp text not is json`)
       return
     }
@@ -115,7 +86,7 @@ export class PrePublish {
    * @param {string} changelog
    */
   async publish(pkgPath, changelog, gid) {
-    if (!this.preCheck(pkgPath)) return
+    if (!Publish.preCheck(pkgPath)) return
 
     await autoLogin()
 

package/lib/appstore/publish.js

@@ -26,16 +26,16 @@ export class Publish {
   /**
    * @param {string} raw
    */
-  isJSON(raw) {
+  static isJSON(raw) {
     const ml = raw.length
     if (ml <= 1) return false
     return raw[0] == "{" && raw[ml - 1] == "}"
   }
 
-  preCheck(pkgPath) {
+  static preCheck(pkgPath) {
     const tempDir = fs.mkdtempSync(".lzc-cli-publish")
     try {
-      unzipSync(pkgPath, tempDir)
+      unzipSync(pkgPath, tempDir, ["devshell", "icon.png"])
       if (isFileExist(path.join(tempDir, "devshell"))) {
         logger.error(
           "不能发布一个devshell的版本，请重新使用 `lzc-cli project build` 构建"
@@ -44,7 +44,7 @@ export class Publish {
       }
       const tempIcon = path.join(tempDir, "icon.png")
       if (!isFileExist(tempIcon) || !isPngWithFile(tempIcon)) {
-        logger.error("icon 必须是 png 格式")
+        logger.error("icon 必须存在且要求是 png 格式")
         return false
       }
       return true
@@ -58,7 +58,7 @@ export class Publish {
    * @param {string} changelog
    */
   async publish(pkgPath, changelog) {
-    if (!this.preCheck(pkgPath)) return
+    if (!Publish.preCheck(pkgPath)) return
 
     await autoLogin()
 
@@ -80,7 +80,7 @@ export class Publish {
       body: form
     })
     const text = (await res.text()).trim()
-    if (!this.isJSON(text)) {
+    if (!Publish.isJSON(text)) {
       logger.info("upload lpk fail", text)
       return
     }

package/lib/utils.js

@@ -474,14 +474,24 @@ export async function resolveDomain(domain) {
   }
 }
 
-export function unzipSync(zipPath, destPath) {
+export function unzipSync(zipPath, destPath, entries = []) {
   // 确保目标目录存在
   fs.mkdirSync(destPath, { recursive: true })
   // 创建 zip 实例
   const zip = new AdmZip(zipPath)
 
-  // 同步解压所有文件
-  zip.extractAllTo(destPath, true)
+  if (entries.length > 0) {
+    entries.forEach((entry) => {
+      try {
+        zip.extractEntryTo(entry, destPath, false, true)
+      } catch {
+        logger.debug(`压缩包中没有找到 ${entry} 文件`)
+      }
+    })
+  } else {
+    // 同步解压所有文件
+    zip.extractAllTo(destPath, true)
+  }
 }
 
 export function findSshPublicKey() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.41",
+  "version": "1.2.42",
   "description": "lazycat cloud developer kit",
   "files": [
     "template",

package/template/lite/_gitignore

@@ -0,0 +1,4 @@
+**/*.lpk
+**/*.tar.gz
+**/*.md5
+/.pushed.timestamp

package/template/vue/_gitignore

@@ -0,0 +1,25 @@
+.DS_Store
+node_modules
+dist
+*.lpk
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+.temp
+.cache