Merge branch 'master' of https://github.com/WeBankFinTech/fes.js

docs/.vuepress/config.ts

@@ -5,7 +5,7 @@ import { navbar, sidebar } from './configs'
 const config: UserConfig<DefaultThemeOptions> = {
   base: '/fesjs/',
 
-  evergreen: process.env.NODE_ENV !== 'production',
+  // evergreen: process.env.NODE_ENV !== 'production',
 
   head: [['link', { rel: 'manifest', href: '/fesjs/manifest.webmanifest' }], ['link', { rel: 'icon', href: `/fesjs/logo.png` }]],
 

docs/.vuepress/configs/sidebar/en.ts

@@ -3,7 +3,7 @@ import type { SidebarConfig } from '@vuepress/theme-default'
 export const en: SidebarConfig = {
   '/guide/': [
     {
-      isGroup: true,
+      // isGroup: true,
       text: '介绍',
       children: [
         '/guide/README.md',
@@ -11,7 +11,7 @@ export const en: SidebarConfig = {
       ],
     },
     {
-      isGroup: true,
+      // isGroup: true,
       text: '基础',
       children: [
         '/guide/directory-structure.md',
@@ -26,7 +26,7 @@ export const en: SidebarConfig = {
       ]
     },
     {
-      isGroup: true,
+      // isGroup: true,
       text: '进阶',
       children: [
       ]
@@ -42,13 +42,13 @@ export const en: SidebarConfig = {
   ],
   '/reference/plugin/': [
     {
-      isGroup: true,
+      // isGroup: true,
       text: 'Presets',
       children: [
       ],
     },
     {
-      isGroup: true,
+      // isGroup: true,
       text: 'Plugins',
       children: [
         '/reference/plugin/plugins/access.md',
@@ -66,7 +66,7 @@ export const en: SidebarConfig = {
       ],
     },
     {
-      isGroup: true,
+      // isGroup: true,
       text: '插件开发',
       children: [
         '/reference/plugin/dev/README.md',

docs/.vuepress/configs/sidebar/zh.ts

@@ -3,7 +3,7 @@ import type { SidebarConfig } from '@vuepress/theme-default'
 export const zh: SidebarConfig = {
   '/zh/guide/': [
     {
-      isGroup: true,
+      // isGroup: true,
       text: '介绍',
       children: [
         '/zh/guide/README.md',
@@ -11,7 +11,7 @@ export const zh: SidebarConfig = {
       ],
     },
     {
-      isGroup: true,
+      // isGroup: true,
       text: '基础',
       children: [
         '/zh/guide/directory-structure.md',
@@ -26,7 +26,7 @@ export const zh: SidebarConfig = {
       ]
     },
     {
-      isGroup: true,
+      // isGroup: true,
       text: '进阶',
       children: [
       ]
@@ -42,13 +42,13 @@ export const zh: SidebarConfig = {
   ],
   '/zh/reference/plugin/': [
     {
-      isGroup: true,
+      // isGroup: true,
       text: 'Presets',
       children: [
       ],
     },
     {
-      isGroup: true,
+      // isGroup: true,
       text: 'Plugins',
       children: [
         '/zh/reference/plugin/plugins/access.md',
@@ -66,7 +66,7 @@ export const zh: SidebarConfig = {
       ],
     },
     {
-      isGroup: true,
+      // isGroup: true,
       text: '插件开发',
       children: [
         '/zh/reference/plugin/dev/README.md',

docs/reference/plugin/plugins/layout.md

@@ -57,6 +57,7 @@ export default {
 </config>
 ```
 如果只是不想展示`side`，则：
+```
 <config lang="json">
 {
     "layout": {

docs/zh/reference/plugin/plugins/layout.md

@@ -57,6 +57,7 @@ export default {
 </config>
 ```
 如果只是不想展示`side`，则：
+```
 <config lang="json">
 {
     "layout": {

package.json

@@ -31,20 +31,16 @@
   "devDependencies": {
     "@commitlint/cli": "^11.0.0",
     "@commitlint/config-conventional": "^11.0.0",
-    "@vuepress/plugin-docsearch": "^2.0.0-alpha.18",
-    "@vuepress/plugin-pwa": "^2.0.0-alpha.18",
-    "@vuepress/plugin-pwa-popup": "^2.0.0-alpha.18",
-    "@vuepress/theme-vue": "^2.0.0-alpha.18",
+    "@vuepress/plugin-docsearch": "^2.0.0-beta.22",
+    "@vuepress/plugin-pwa": "^2.0.0-beta.22",
+    "@vuepress/plugin-pwa-popup": "^2.0.0-beta.22",
     "@webank/eslint-config-webank": "0.3.0",
     "commitizen": "^4.2.1",
     "cz-conventional-changelog": "^3.3.0",
-    "esbuild-loader": "^2.7.0",
-    "postcss-loader": "^5.0.0",
-    "postcss": "^8.0.0",
     "father-build": "^1.19.1",
     "husky": "^4.3.0",
     "lint-staged": "^10.4.0",
-    "vuepress": "^2.0.0-alpha.18"
+    "vuepress": "^2.0.0-beta.22"
   },
   "lint-staged": {
     "*.{js,jsx,vue,ts}": [

packages/fes-plugin-layout/package.json

@@ -32,7 +32,7 @@
   "peerDependencies": {
     "@ant-design/icons-vue": "^5.1.6",
     "@fesjs/fes": "^2.0.0",
-    "ant-design-vue": "2.0.0",
+    "ant-design-vue": "^2.2.0",
     "vue": "^3.0.5"
   }
 }

packages/fes-plugin-locale/package.json

@@ -33,7 +33,7 @@
   "peerDependencies": {
     "@ant-design/icons-vue": "^5.1.6",
     "@fesjs/fes": "^2.0.0",
-    "ant-design-vue": "2.0.0",
+    "ant-design-vue": "^2.2.0",
     "vue": "^3.0.5"
   }
 }

packages/fes-plugin-qiankun/examples/app1/package.json

@@ -48,7 +48,7 @@
   "dependencies": {
     "@fesjs/fes": "^2.0.0",
     "vue": "^3.0.5",
-    "ant-design-vue": "2.0.0"
+    "ant-design-vue": "^2.2.0"
   },
   "private": true
 }

packages/fes-plugin-qiankun/examples/main/package.json

@@ -48,7 +48,7 @@
   "dependencies": {
     "@fesjs/fes": "^2.0.0",
     "vue": "^3.0.5",
-    "ant-design-vue": "2.0.0"
+    "ant-design-vue": "^2.2.0"
   },
   "private": true
 }

packages/fes-template/package.json

@@ -57,8 +57,8 @@
     "@fesjs/plugin-request": "^2.0.0",
     "@fesjs/plugin-qiankun": "^2.0.0",
     "@fesjs/plugin-sass": "^2.0.0",
-    "@fesjs/plugin-monaco-editor": "^2.0.0-rc.0",
-    "ant-design-vue": "2.0.0",
+    "@fesjs/plugin-monaco-editor": "^2.0.0-beta.0",
+    "ant-design-vue": "^2.2.0",
     "vue": "^3.0.5",
     "vuex": "^4.0.0"
   },