Update ci

Signed-off-by: Kang Huaishuai <khs1994@khs1994.com>

.github/workflows/ci.yaml

@@ -62,4 +62,5 @@ jobs:
           ls -la qrcode.png
       - name: upload to wechat
         run: |
+          rm -rf client/project.config.json
           npm run upload

.gitignore

@@ -4,8 +4,8 @@ node_modules
 !node_modules/@types/wx-server-sdk
 miniprogram_npm
 
-!package-lock.json
-!yarn.lock
+package-lock.json
+yarn.lock
 
 client/pages/**/*.js
 client/app.js

.prettierignore

@@ -21,3 +21,5 @@ project.config.json
 functions/sitemap/sitemap.js
 
 .vscode/settings.json
+
+schema

.vscode/settings.json

@@ -1,5 +1,37 @@
 {
   "files.exclude": {
     "client/pages/**/index.js": true
-  }
+  },
+  "json.schemas": [
+    {
+      "fileMatch": [
+        "client/app.json"
+      ],
+      "url": "/schema/app.json"
+    },
+    {
+      "fileMatch": [
+        "client/sitemap.json"
+      ],
+      "url": "/schema/sitemap.json"
+    },
+    {
+      "fileMatch": [
+        "project.config.json"
+      ],
+      "url": "/schema/projectconfig.json"
+    },
+    {
+      "fileMatch": [
+        "client/theme.json"
+      ],
+      "url": "/schema/theme.json"
+    },
+    {
+      "fileMatch": [
+        "client/pages/*.json"
+      ],
+      "url": "/schema/page.json"
+    },
+  ]
 }

README.md

@@ -21,14 +21,15 @@
 
 ## 开发者
 
-- `$ npm -g i typescript fs-extra`
-- 复制 `SUMMARY.md` 到 `summary/summary.source.md`
+- `$ npm -g i typescript fs-extra miniprogram-ci`
+- **可选** 复制 `SUMMARY.md` 到 `summary/summary.source.md`
 - 安装依赖 `$ cd client ; npm install`
 - 执行 `$ npm run gitbook:summary:generate`
 - 执行 `$ npm run gitbook:summary:towxml`
 - 执行 `$ npm run towxml:build`
-- 微信开发者工具 -> 工具 -> 构建 npm
+- [ 微信开发者工具 -> 工具 -> 构建 npm ](项目贡献者) 或者 `$ npm run npm:build`(项目所有者)
 - 编译
+- 上传预览 `$ npm run upload` (项目所有者)
 
 ## 致谢
 

client/pages/mdContent/index.ts

@@ -34,7 +34,7 @@ Page({
     theme = app.globalData.theme;
     this.setData({
       theme,
-    })
+    });
 
     key = options.key;
     title = options.title;
@@ -179,8 +179,7 @@ Page({
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function () {
-  },
+  onReady: function () {},
 
   /**
    * 生命周期函数--监听页面显示

client/theme.json

@@ -0,0 +1,4 @@
+{
+  "light": {},
+  "dark": {}
+}

package.json

@@ -10,10 +10,11 @@
     "cloud:db:summary": "",
     "cloud:db:news": "",
     "towxml:build": "cd client && npm run towxml:build",
-    "npm:build": "npx miniprogram-ci pack-npm --pp ./client --pkp ./private.wxb830c3abf8a658a5.key --appid wxb830c3abf8a658a5",
-    "upload": "npx miniprogram-ci upload --pp ./client/ --pkp ./private.wxb830c3abf8a658a5.key --appid wxb830c3abf8a658a5 --uv 0.1.0 -r 1 --enable-es7 --enable-es6 --enable-autoprefixwxss --enable-minify-js --enable-minify-wxss --project-type miniProgram",
+    "npm:build": "npx miniprogram-ci pack-npm --pp ./ --pkp ./private.wxb830c3abf8a658a5.key --appid wxb830c3abf8a658a5",
+    "upload": "npx miniprogram-ci upload --pp ./ --pkp ./private.wxb830c3abf8a658a5.key --appid wxb830c3abf8a658a5 --uv 0.1.0 -r 1 --enable-es7 --enable-es6 --enable-autoprefixwxss --enable-minify-js --enable-minify-wxss --project-type miniProgram",
     "tsc": "cd client && npm run compile",
-    "tsc:pro": "cd client && npm run compile:pro"
+    "tsc:pro": "cd client && npm run compile:pro",
+    "schema": "node schema/generate.js"
   },
   "devDependencies": {
     "iview-weapp": "*",

project.config.json

@@ -4,7 +4,7 @@
 		"ignore": []
 	},
 	"compileType": "miniprogram",
-	"libVersion": "2.10.4",
+	"libVersion": "2.11.0",
 	"projectname": "docker",
 	"miniprogramRoot": "client/",
 	"cloudfunctionRoot": "functions/",
@@ -23,7 +23,7 @@
 		"newFeature": true,
 		"coverView": true,
 		"nodeModules": true,
-		"autoAudits": true,
+		"autoAudits": false,
 		"showShadowRootInWxmlPanel": true,
 		"scopeDataCheck": false,
 		"uglifyFileName": false,

schema/app.json

@@ -0,0 +1 @@
+{"type":"object","properties":{"__warning__":{"type":"string"},"pages":{"type":"array","items":{"type":"string"}},"window":{"$ref":"#/definitions/IWindow"},"plugins":{"type":"object","additionalProperties":{"$ref":"#/definitions/IPluginConfig"}},"entryPagePath":{"type":"string"},"permission":{"type":"object","properties":{"scope.userLocation":{"type":"object","properties":{"desc":{"type":"string"}},"additionalProperties":false,"required":["desc"]}},"additionalProperties":false},"workers":{"type":"string"},"subPackages":{"type":"array","items":{"$ref":"#/definitions/ISubPackageItem"}},"subpackages":{"type":"array","items":{"$ref":"#/definitions/ISubPackageItem"}},"preloadRule":{"type":"object","additionalProperties":{"type":"object","properties":{"network":{"enum":["all","wifi"],"type":"string"},"packages":{"type":"array","items":{"type":"string"}}},"additionalProperties":false,"required":["packages"]}},"usingComponents":{"type":"object","additionalProperties":{"type":"string"}},"tabBar":{"$ref":"#/definitions/ITabBar"},"requiredBackgroundModes":{"type":"array","items":{"type":"string"}},"mimeTypeDeclarations":{"type":"object","additionalProperties":{"type":"array","items":{"type":"string"}}},"networkTimeout":{"type":"object","properties":{"request":{"type":"number"},"connectSocket":{"type":"number"},"uploadFile":{"type":"number"},"downloadFile":{"type":"number"}},"additionalProperties":false},"debug":{"type":"boolean"},"resizable":{"type":"boolean"},"functionalPages":{"anyOf":[{"type":"object","properties":{"independent":{"type":"boolean"}},"additionalProperties":false,"required":["independent"]},{"type":"boolean"}]},"cloud":{"type":"boolean"},"openLocationPagePath":{"type":"string"},"sitemapLocation":{"type":"string"},"serviceProviderTicket":{"type":"string"},"style":{"enum":["v2"],"type":"string"},"useExtendedLib":{"type":"object","additionalProperties":{"type":"boolean"}},"entranceDeclare":{"type":"object","properties":{"locationMessage":{"type":"object","properties":{"path":{"type":"string"},"query":{"type":"string"}},"additionalProperties":false}},"additionalProperties":false},"darkmode":{"type":"boolean"},"themeLocation":{"type":"string"},"theme":{"type":"string"},"singlePage":{"type":"object","properties":{"navigationBarFit":{"enum":["float","squeezed"],"type":"string"}},"additionalProperties":false}},"additionalProperties":false,"required":["pages"],"definitions":{"IWindow":{"type":"object","properties":{"backgroundColorTop":{"type":"string"},"backgroundColorBottom":{"type":"string"},"backgroundColor":{"type":"string"},"enablePullDownRefresh":{"type":"boolean"},"navigationBarTextStyle":{"enum":["black","white"],"type":"string"},"navigationBarTitleText":{"type":"string"},"navigationStyle":{"enum":["custom","default"],"type":"string"},"backgroundTextStyle":{"enum":["dark","light"],"type":"string"},"onReachBottomDistance":{"type":"number"},"pageOrientation":{"enum":["auto","landscape","portrait"],"type":"string"},"navigationBarBackgroundColor":{"type":"string"},"renderingMode":{"enum":["mixed","seperated"],"type":"string"},"restartStrategy":{"enum":["homePage","homePageAndLatestPage"],"type":"string"}},"additionalProperties":false},"IPluginConfig":{"type":"object","properties":{"provider":{"type":"string"},"version":{"type":"string"},"path":{"type":"string"},"export":{"type":"string"}},"additionalProperties":false,"required":["provider","version"]},"ISubPackageItem":{"type":"object","properties":{"independent":{"type":"boolean"},"name":{"type":"string"},"root":{"type":"string"},"pages":{"type":"array","items":{"type":"string"}},"plugins":{"type":"object","additionalProperties":{"$ref":"#/definitions/IPluginConfig"}}},"additionalProperties":false,"required":["pages","root"]},"ITabBar":{"type":"object","properties":{"custom":{"type":"boolean"},"list":{"type":"array","items":{"type":"object","properties":{"pagePath":{"type":"string"},"text":{"type":"string"},"iconPath":{"type":"string"},"selectedIconPath":{"type":"string"}},"additionalProperties":false,"required":["pagePath"]}},"borderStyle":{"enum":["black","white"],"type":"string"},"position":{"enum":["bottom","top"],"type":"string"},"color":{"type":"string"},"selectedColor":{"type":"string"},"backgroundColor":{"type":"string"}},"additionalProperties":false,"required":["list"]}},"$schema":"http://json-schema.org/draft-07/schema#","$version":1588056780910}

schema/ext.json

@@ -0,0 +1 @@
+{"type":"object","properties":{"extAppid":{"type":"string"},"extEnable":{"type":"boolean"},"directCommit":{"type":"boolean"},"ext":{"type":"object","additionalProperties":{}},"extPages":{"type":"object","additionalProperties":{"$ref":"#/definitions/IPageJSON"}},"__warning__":{"type":"string"},"pages":{"type":"array","items":{"type":"string"}},"window":{"$ref":"#/definitions/IWindow"},"plugins":{"type":"object","additionalProperties":{"$ref":"#/definitions/IPluginConfig"}},"entryPagePath":{"type":"string"},"permission":{"type":"object","properties":{"scope.userLocation":{"type":"object","properties":{"desc":{"type":"string"}},"additionalProperties":false,"required":["desc"]}},"additionalProperties":false},"workers":{"type":"string"},"subPackages":{"type":"array","items":{"$ref":"#/definitions/ISubPackageItem"}},"subpackages":{"type":"array","items":{"$ref":"#/definitions/ISubPackageItem"}},"preloadRule":{"type":"object","additionalProperties":{"type":"object","properties":{"network":{"enum":["all","wifi"],"type":"string"},"packages":{"type":"array","items":{"type":"string"}}},"additionalProperties":false,"required":["packages"]}},"usingComponents":{"type":"object","additionalProperties":{"type":"string"}},"tabBar":{"$ref":"#/definitions/ITabBar"},"requiredBackgroundModes":{"type":"array","items":{"type":"string"}},"mimeTypeDeclarations":{"type":"object","additionalProperties":{"type":"array","items":{"type":"string"}}},"networkTimeout":{"type":"object","properties":{"request":{"type":"number"},"connectSocket":{"type":"number"},"uploadFile":{"type":"number"},"downloadFile":{"type":"number"}},"additionalProperties":false},"debug":{"type":"boolean"},"resizable":{"type":"boolean"},"functionalPages":{"anyOf":[{"type":"object","properties":{"independent":{"type":"boolean"}},"additionalProperties":false,"required":["independent"]},{"type":"boolean"}]},"cloud":{"type":"boolean"},"openLocationPagePath":{"type":"string"},"sitemapLocation":{"type":"string"},"serviceProviderTicket":{"type":"string"},"style":{"enum":["v2"],"type":"string"},"useExtendedLib":{"type":"object","additionalProperties":{"type":"boolean"}},"entranceDeclare":{"type":"object","properties":{"locationMessage":{"type":"object","properties":{"path":{"type":"string"},"query":{"type":"string"}},"additionalProperties":false}},"additionalProperties":false},"darkmode":{"type":"boolean"},"themeLocation":{"type":"string"},"theme":{"type":"string"}},"additionalProperties":false,"required":["extAppid"],"definitions":{"IPageJSON":{"type":"object","properties":{"navigationBarBackgroundColor":{"type":"string"},"navigationBarTextStyle":{"enum":["black","white"],"type":"string"},"navigationBarTitleText":{"type":"string"},"navigationStyle":{"enum":["custom","default"],"type":"string"},"backgroundColor":{"type":"string"},"backgroundTextStyle":{"enum":["dark","light"],"type":"string"},"enablePullDownRefresh":{"type":"boolean"},"onReachBottomDistance":{"type":"number"},"disableScroll":{"type":"boolean"},"disableSwipeBack":{"type":"boolean"},"backgroundColorTop":{"type":"string"},"backgroundColorBottom":{"type":"string"},"usingComponents":{"type":"object","additionalProperties":{"type":"string"}},"pageOrientation":{"enum":["auto","landscape","portrait"],"type":"string"},"restartStrategy":{"enum":["homePage","homePageAndLatestPage"],"type":"string"},"component":{"type":"boolean"},"componentGenerics":{"type":"object","additionalProperties":{"anyOf":[{"type":"object","additionalProperties":{"type":"string"}},{"type":"boolean"}]}},"singlePage":{"type":"object","properties":{"navigationBarFit":{"enum":["float","squeezed"],"type":"string"}},"additionalProperties":false},"pageJSONLight":{"$ref":"#/definitions/IOriginalPageJSON"},"pageJSONDark":{"$ref":"#/definitions/IOriginalPageJSON"}},"additionalProperties":false},"IOriginalPageJSON":{"type":"object","properties":{"navigationBarBackgroundColor":{"type":"string"},"navigationBarTextStyle":{"enum":["black","white"],"type":"string"},"navigationBarTitleText":{"type":"string"},"navigationStyle":{"enum":["custom","default"],"type":"string"},"backgroundColor":{"type":"string"},"backgroundTextStyle":{"enum":["dark","light"],"type":"string"},"enablePullDownRefresh":{"type":"boolean"},"onReachBottomDistance":{"type":"number"},"disableScroll":{"type":"boolean"},"disableSwipeBack":{"type":"boolean"},"backgroundColorTop":{"type":"string"},"backgroundColorBottom":{"type":"string"},"usingComponents":{"type":"object","additionalProperties":{"type":"string"}},"pageOrientation":{"enum":["auto","landscape","portrait"],"type":"string"},"restartStrategy":{"enum":["homePage","homePageAndLatestPage"],"type":"string"},"component":{"type":"boolean"},"componentGenerics":{"type":"object","additionalProperties":{"anyOf":[{"type":"object","additionalProperties":{"type":"string"}},{"type":"boolean"}]}},"singlePage":{"type":"object","properties":{"navigationBarFit":{"enum":["float","squeezed"],"type":"string"}},"additionalProperties":false}},"additionalProperties":false},"IWindow":{"type":"object","properties":{"backgroundColorTop":{"type":"string"},"backgroundColorBottom":{"type":"string"},"backgroundColor":{"type":"string"},"enablePullDownRefresh":{"type":"boolean"},"navigationBarTextStyle":{"enum":["black","white"],"type":"string"},"navigationBarTitleText":{"type":"string"},"navigationStyle":{"enum":["custom","default"],"type":"string"},"backgroundTextStyle":{"enum":["dark","light"],"type":"string"},"onReachBottomDistance":{"type":"number"},"pageOrientation":{"enum":["auto","landscape","portrait"],"type":"string"},"navigationBarBackgroundColor":{"type":"string"},"renderingMode":{"enum":["mixed","seperated"],"type":"string"},"restartStrategy":{"enum":["homePage","homePageAndLatestPage"],"type":"string"}},"additionalProperties":false},"IPluginConfig":{"type":"object","properties":{"provider":{"type":"string"},"version":{"type":"string"},"path":{"type":"string"},"export":{"type":"string"}},"additionalProperties":false,"required":["provider","version"]},"ISubPackageItem":{"type":"object","properties":{"independent":{"type":"boolean"},"name":{"type":"string"},"root":{"type":"string"},"pages":{"type":"array","items":{"type":"string"}},"plugins":{"type":"object","additionalProperties":{"$ref":"#/definitions/IPluginConfig"}}},"additionalProperties":false,"required":["pages","root"]},"ITabBar":{"type":"object","properties":{"custom":{"type":"boolean"},"list":{"type":"array","items":{"type":"object","properties":{"pagePath":{"type":"string"},"text":{"type":"string"},"iconPath":{"type":"string"},"selectedIconPath":{"type":"string"}},"additionalProperties":false,"required":["pagePath"]}},"borderStyle":{"enum":["black","white"],"type":"string"},"position":{"enum":["bottom","top"],"type":"string"},"color":{"type":"string"},"selectedColor":{"type":"string"},"backgroundColor":{"type":"string"}},"additionalProperties":false,"required":["list"]}},"$schema":"http://json-schema.org/draft-07/schema#","$version":1587708294481}

schema/game.json

@@ -0,0 +1 @@
+{"type":"object","properties":{"deviceOrientation":{"enum":["landscape","landscapeLeft","landscapeRight","portrait"],"type":"string"},"networkTimeout":{"type":"object","properties":{"request":{"type":"number"},"connectSocket":{"type":"number"},"uploadFile":{"type":"number"},"downloadFile":{"type":"number"}},"additionalProperties":false},"openDataContext":{"type":"string"},"showStatusBar":{"type":"boolean"},"workers":{"type":"string"},"disableSetUserStorageFromMiniProgram":{"type":"boolean"},"permission":{"type":"object","properties":{"scope.userLocation":{"type":"object","properties":{"desc":{"type":"string"}},"additionalProperties":false,"required":["desc"]}},"additionalProperties":false},"subPackages":{"type":"array","items":{"$ref":"#/definitions/ISubPackageItem"}},"subpackages":{"type":"array","items":{"$ref":"#/definitions/ISubPackageItem"}},"loadingImageInfo":{"type":"object","properties":{"path":{"type":"string"},"progressBarColor":{"type":"string"}},"additionalProperties":false,"required":["path"]},"plugins":{"type":"object","additionalProperties":{"$ref":"#/definitions/IPluginConfig"}}},"additionalProperties":false,"definitions":{"ISubPackageItem":{"type":"object","properties":{"independent":{"type":"boolean"},"name":{"type":"string"},"root":{"type":"string"},"plugins":{"type":"object","additionalProperties":{"$ref":"#/definitions/IPluginConfig"}}},"additionalProperties":false,"required":["root"]},"IPluginConfig":{"type":"object","properties":{"provider":{"type":"string"},"version":{"type":"string"},"path":{"type":"string"}},"additionalProperties":false,"required":["provider","version"]}},"$schema":"http://json-schema.org/draft-07/schema#","$version":1587708294482}

schema/generate.js

@@ -0,0 +1,14 @@
+const fs = require('fs');
+const path = require('path');
+
+let { app, ext, game, page, plugin, pluginpage, projectconfig, sitemap, theme } = require('miniprogram-ci/dist/schema/dist').config;
+
+fs.writeFileSync(path.join(__dirname, 'app.json'), JSON.stringify(app));
+fs.writeFileSync(path.join(__dirname, 'ext.json'), JSON.stringify(ext));
+fs.writeFileSync(path.join(__dirname, 'game.json'), JSON.stringify(game));
+fs.writeFileSync(path.join(__dirname, 'page.json'), JSON.stringify(page));
+fs.writeFileSync(path.join(__dirname, 'plugin.json'), JSON.stringify(plugin));
+fs.writeFileSync(path.join(__dirname, 'pluginpage.json'), JSON.stringify(pluginpage));
+fs.writeFileSync(path.join(__dirname, 'projectconfig.json'), JSON.stringify(projectconfig));
+fs.writeFileSync(path.join(__dirname, 'theme.json'), JSON.stringify(theme));
+fs.writeFileSync(path.join(__dirname, 'sitemap.json'), JSON.stringify(sitemap));