@lazycatcloud/lzc-cli 1.2.59 → 1.2.61

package/changelog.md

@@ -1,3 +1,11 @@
+# 1.2.61
+1. 修复 lzc-build 文件配置 `compose.override` 字段不生效问题
+
+# 1.2.60
+1. 添加用户登录友好提示
+2. 移除已弃用模版
+3. 支持 lzc-build 文件配置 `compose.override` 字段
+
 # 1.2.59
 
 1. 修复 copy-image 网关超时

package/lib/app/lpk_build.js

@@ -305,6 +305,11 @@ export class LpkBuild {
         dumpToYaml(manifest, path.join(tempDir, "manifest.yml"))
       }
 
+      // compose.override.yml
+      if (this.options['compose_override']) {
+        dumpToYaml(this.options['compose_override'], path.join(tempDir, "compose.override.yml"))
+      }
+
       // 打包 lpk
       if (this.beforeDumpLpkFn.length > 0) {
         await this.beforeDumpLpkFn.reduce(async (prev, curr) => {

package/lib/app/lpk_create_generator.js

@@ -55,81 +55,6 @@ export async function generate(type, to, opts = {}) {
   writeFileTree(to, files)
 }
 
-function appendREADME(dir) {
-  const readme = path.resolve(dir, "README.md")
-  const readmeTemplate = path.resolve(
-    __dirname,
-    "..",
-    "..",
-    "template",
-    "_lpk",
-    "README.md"
-  )
-  if (!isFileExist(readme)) {
-    fs.copyFileSync(readmeTemplate, readme)
-  } else {
-    const contentStream = fs.readFileSync(readmeTemplate, {
-      encoding: "utf-8"
-    })
-    fs.writeFileSync(readme, contentStream, { flag: "a" })
-  }
-}
-
-function vueTemplate(type) {
-  const v = type == "vue3" ? "vue@3" : "vue@2"
-  return {
-    build: async (to, option) => {
-      spawn.sync("npm", ["init", v, path.basename(to)], { stdio: "inherit" })
-    },
-    after: async function (name, cwd) {
-      spawn.sync("npm", ["install"], {
-        cwd: path.resolve(cwd, name),
-        stdio: "inherit"
-      })
-
-      const lzcBuildTemplatePath = path.resolve(
-        __dirname,
-        "..",
-        "..",
-        "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"
-      )
-      fs.copyFileSync(iconPngPath, path.resolve(name, "lazycat.png"))
-
-      // 更改默认的端口
-      const packageJson = path.resolve(name, "package.json")
-      const pkgInfo = JSON.parse(fs.readFileSync(packageJson))
-      pkgInfo["scripts"]["dev"] = `vite --port 3000 --host`
-      fs.writeFileSync(packageJson, JSON.stringify(pkgInfo, null, "  "))
-
-      appendREADME(path.resolve(cwd, name))
-
-      console.log(
-        chalk.green(
-          `
-🚀 构建 lpk 包
-  ${chalk.yellow(`lzc-cli project build -o ${name}.lpk`)}
-⚙️ 将应用安装至设备中:
-  ${chalk.yellow(`lzc-cli app install ${name}.lpk`)}
-   `.trim()
-        )
-      )
-    }
-  }
-}
-
 function appCreateSuccessTip(name) {
   console.log(
     chalk.green(
@@ -162,82 +87,5 @@ export const TemplateConfig = {
         )
       )
     }
-  },
-  // vue3: vueTemplate("vue3"),
-  vue2: vueTemplate("vue2"),
-  lite: {
-    build: async (to, option) => {
-      await generate("lite", to, option)
-    },
-    after: async function (name, cwd) {
-      appendREADME(path.resolve(cwd, name))
-
-      console.log(
-        chalk.green(
-          `
-✨ 懒猫云应用 ${name} 已创建:
-  ${chalk.yellow(`cd ${name}`)}
-🚀 构建 lpk 包
-  ${chalk.yellow(`lzc-cli project build -o ${name}.lpk`)}
-⚙️ 将应用安装至设备中:
-  ${chalk.yellow(`lzc-cli app install ${name}.lpk`)}
-   `.trim()
-        )
-      )
-    }
-  },
-  ionic_vue3: {
-    build: async (to, option) => {
-      await generate("ionic_vue3", to, option)
-    },
-    after: async function (name, cwd) {
-      appendREADME(path.resolve(cwd, name))
-
-      console.log(chalk.green("开始安装依赖"))
-      spawn.sync("npm", ["install"], {
-        cwd: path.join(cwd, name),
-        stdio: "inherit"
-      })
-
-      console.log(
-        chalk.green(
-          `
-✨ 懒猫云应用 ${name} 已创建:
-  ${chalk.yellow(`cd ${name}`)}
-  ${chalk.yellow(`npm run dev`)}
-🚀 构建 lpk 包
-  ${chalk.yellow(`lzc-cli project build -o ${name}.lpk`)}
-⚙️ 将应用安装至设备中:
-  ${chalk.yellow(`lzc-cli app install ${name}.lpk`)}
-📄 生成android代码:
-  ${chalk.yellow(`npm run build_android`)}
-📄 生成ios代码:
-  ${chalk.yellow(`npm run build_ios`)}
-   `.trim()
-        )
-      )
-    }
-  },
-  golang: {
-    build: async (to, option) => {
-      await generate("golang", to, option)
-    },
-    after: function (name, cwd) {
-      appendREADME(path.resolve(cwd, name))
-
-      console.log(
-        chalk.green(
-          `
-✨ 懒猫云应用 ${name} 已创建:
-  ${chalk.yellow(`cd ${name}`)}
-  ${chalk.yellow(`go run .`)}
-🚀 构建 lpk 包
-  ${chalk.yellow(`lzc-cli project build -o ${name}.lpk`)}
-⚙️ 将应用安装至设备中:
-  ${chalk.yellow(`lzc-cli app install ${name}.lpk`)}
-`.trim()
-        )
-      )
-    }
   }
 }

package/lib/appstore/login.js

@@ -84,11 +84,19 @@ async function interactiveLogin() {
     await login(info.username, info.password)
   } catch (e) {
     logger.debug("login error: ", e)
-    logger.info("帐号或者密码错误，请重新输入!")
+    logger.error("帐号或者密码错误，请重新输入!")
     return interactiveLogin()
   }
 }
 
+function tipsFirstLogin() {
+    let token = env.get("token")
+    if (!token) {
+      // 还没登录过的用户提示用户前往 https://developer.lazycat.cloud/manage 注册开发者账号
+      logger.info("请登录懒猫微服社区账号，账号注册以及开发者权限申请地址: https://developer.lazycat.cloud/manage")
+    }
+}
+
 export async function reLogin() {
   let token = await isLogin()
   if (token) {
@@ -105,6 +113,8 @@ export async function reLogin() {
       logger.info(`token: ${token}`)
       return
     }
+  } else {
+    tipsFirstLogin()
   }
   await interactiveLogin()
 }
@@ -114,6 +124,8 @@ export async function autoLogin() {
   if (token) {
     logger.debug("appstore 已经登录")
     return
+  } else {
+    tipsFirstLogin()
   }
 
   logger.debug("token错误，尝试自动登录")

package/package.json

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

package/template/blank/lzc-build.yml

@@ -3,13 +3,13 @@
 # buildscript
 # - 可以为构建脚本的路径地址
 # - 如果构建命令简单，也可以直接写 sh 的命令
-buildscript: npm run build
+# buildscript:
 
 # manifest: 指定 lpk 包的 manifest.yml 文件路径
 manifest: ./lzc-manifest.yml
 
 # contentdir: 指定打包的内容，将会打包到 lpk 中
-contentdir: ./dist
+# contentdir: ./
 
 # pkgout: lpk 包的输出路径
 pkgout: ./
@@ -17,7 +17,6 @@ pkgout: ./
 # icon 指定 lpk 包 icon 的路径路径，如果不指定将会警告
 # icon 仅仅允许 png 后缀的文件
 icon: ./lzc-icon.png
-
 # devshell 自定义应用的开发容器环境
 # - routers 指定应用容器的访问路由
 
@@ -44,16 +43,16 @@ icon: ./lzc-icon.png
 # dvshell 指定开发依赖的情况
 # 这种情况下，选用 alpine:latest 作为基础镜像，在 dependencies 中添加所需要的开发依赖即可
 # 如果 dependencies 和 build 同时存在，将会优先使用 dependencies
-devshell:
-  routes:
-    - /=http://127.0.0.1:3000
-  dependencies:
-    - nodejs
-    - npm
-  # setupscript 每次进入到app container后都会执行的配置脚本
-  # - 可以为脚本的路径地址
-  # - 如果构建命令简单，也可以直接写 sh 的命令
-  # setupscript: export GOPROXY=https://goproxy.cn
-  # setupscript: ./setupscript.sh
-  setupscript: |
-    export npm_config_registry=https://registry.npmmirror.com
+# devshell:
+#   routes:
+#     - /=http://127.0.0.1:3000
+#   dependencies:
+#     - nodejs
+#     - npm
+#   # setupscript 每次进入到app container后都会执行的配置脚本
+#   # - 可以为脚本的路径地址
+#   # - 如果构建命令简单，也可以直接写 sh 的命令
+#   # setupscript: export GOPROXY=https://goproxy.cn
+#   # setupscript: ./setupscript.sh
+#   setupscript: |
+#     export npm_config_registry=https://registry.npmmirror.com

package/template/blank/lzc-manifest.yml

@@ -2,11 +2,11 @@ lzc-sdk-version: 0.1
 name: helloworld
 package: cloud.lazycat.app.helloworld
 version: 0.0.1
-description: 
+description:
 license: https://choosealicense.com/licenses/mit/
-homepage: 
-author: 
+homepage:
+author:
 application:
   subdomain: helloworld
   routes:
-    - /=file:///lzcapp/pkg/content/dist
+    - /=https://developer.lazycat.cloud/

package/template/_lpk/golang.manifest.yml.in

@@ -1,16 +0,0 @@
-lzc-sdk-version: 0.1
-
-package: ${package}              # app的唯一标识符
-version: ${version}         # app的版本
-name: ${name}               # app名称
-description: ${description} # app描述
-
-license: https://choosealicense.com/licenses/mit/
-homepage: ${homepage}       # 出现bug时候提交反馈的地方
-author: ${author}           # app author
-
-#application作为一个特殊的container运行，对应的service名称为固定的`app`，其他service可以通过此名称与app进行通讯
-application:
-  subdomain: ${subdomain}  #期望的app域名
-  routes:
-    - /=exec://3000,/lzcapp/pkg/content/rego -html /lzcapp/pkg/content/index.html

package/template/_lpk/lite.manifest.yml.in

@@ -1,19 +0,0 @@
-lzc-sdk-version: 0.1
-
-package: ${package}         # app的唯一标识符
-version: ${version}         # app的版本
-name: ${name}               # app名称
-description: ${description} # app描述
-
-license: https://choosealicense.com/licenses/mit/
-homepage: ${homepage}       # 出现bug时候提交反馈的地方
-author: ${author}           # app author
-
-#application作为一个特殊的container运行，对应的service名称为固定的`app`，其他service可以通过此名称与app进行通讯
-application:
-  subdomain: ${subdomain}  #期望的app域名
-  routes:
-    - /=https://lazycat.cloud
-  handlers:
-    error_page_templates:
-      502: /lzcapp/pkg/content/502.html.tpl

package/template/golang/.godir

@@ -1 +0,0 @@
-rego

package/template/golang/README.md

@@ -1,10 +0,0 @@
-# rego
-
-Rego is an online Go regular expression tester
-
-Inspired by [rubular](http://rubular.com/).
-
-## TODO
-
-- Sharing (permalink)
-- Add developer documentation

package/template/golang/_gitignore

@@ -1,2 +0,0 @@
-build/*
-*.lpk