Merge branch 'main' into code

Author: Mister-Hope

.eslintrc.js

@@ -19,6 +19,20 @@ module.exports = {
         '@typescript-eslint/no-explicit-any': 'off',
         '@typescript-eslint/no-non-null-assertion': 'off',
         '@typescript-eslint/no-var-requires': 'off',
+        'import/no-extraneous-dependencies': [
+          'error',
+          {
+            devDependencies: false,
+            optionalDependencies: false,
+          },
+        ],
+      },
+    },
+    {
+      files: ['*.vue'],
+      rules: {
+        // disable for setup script
+        '@typescript-eslint/no-unused-vars': 'off',
       },
     },
     {
@@ -35,6 +49,13 @@ module.exports = {
       rules: {
         '@typescript-eslint/explicit-function-return-type': 'off',
         'vue/one-component-per-file': 'off',
+        'import/no-extraneous-dependencies': 'off',
+      },
+    },
+    {
+      files: ['docs/**'],
+      rules: {
+        'import/no-extraneous-dependencies': 'off',
       },
     },
   ],

CHANGELOG.md

@@ -3,6 +3,56 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.0.0-beta.16](https://github.com/vuepress/vuepress-next/compare/v2.0.0-beta.15...v2.0.0-beta.16) (2021-05-28)
+
+
+### Bug Fixes
+
+* **plugin-pwa-popup:** increase default z-index ([67242e8](https://github.com/vuepress/vuepress-next/commit/67242e896f52c09c1e42566a32ae10291d0fb648))
+* **theme-default:** increase medium-zoom delay ([9c92443](https://github.com/vuepress/vuepress-next/commit/9c9244385f4fe6f65115cab6ba08f47dffc1580a))
+
+
+### Features
+
+* **bundler-vite:** configure postcss by default ([6197578](https://github.com/vuepress/vuepress-next/commit/61975781151ace783f3021bd6a3c55c4fa7b12bd))
+* **plugin-back-to-top:** add z-index variable ([3d7d4a4](https://github.com/vuepress/vuepress-next/commit/3d7d4a4ba173dab4c3ad80abea5ac96cc1eb0bde))
+* **plugin-medium-zoom:** add more css variables (close [#174](https://github.com/vuepress/vuepress-next/issues/174)) ([d717800](https://github.com/vuepress/vuepress-next/commit/d71780094839db02424b60f3a2877871e34eaf64))
+* **plugin-nprogress:** add z-index variable ([151e087](https://github.com/vuepress/vuepress-next/commit/151e087c289a387d7ff77654059de9d71910263a))
+* **plugin-pwa-popup:** add more css variables ([3ae6f72](https://github.com/vuepress/vuepress-next/commit/3ae6f72a1fb981ff132325637d5996c5c07b52f2))
+
+
+
+
+
+# [2.0.0-beta.15](https://github.com/vuepress/vuepress-next/compare/v2.0.0-beta.14...v2.0.0-beta.15) (2021-05-27)
+
+
+### Bug Fixes
+
+* **markdown:** decode assets link to ensure bundler can find the file ([#144](https://github.com/vuepress/vuepress-next/issues/144)) ([d3e5409](https://github.com/vuepress/vuepress-next/commit/d3e5409246a47edae93209c9ce5dd2614e14c936))
+* **theme-default:** handle rotate events on iPad ([#150](https://github.com/vuepress/vuepress-next/issues/150)) ([bbdda60](https://github.com/vuepress/vuepress-next/commit/bbdda60bba0a56590535f3e762dec55767ec031c))
+* **theme-default:** show header anchors when being focused ([#164](https://github.com/vuepress/vuepress-next/issues/164)) ([8de5f0f](https://github.com/vuepress/vuepress-next/commit/8de5f0fa2873f64be0622aced46e1512c7f4fac5))
+
+
+### Features
+
+* **bundler-webpack:** bump webpack-dev-server to 4.0.0-beta.3 ([2e86826](https://github.com/vuepress/vuepress-next/commit/2e8682680eba7736bcf3325014a927a87503ba0b))
+* **cli:** allow setting default app config ([41f9dc6](https://github.com/vuepress/vuepress-next/commit/41f9dc612d65a7aae777a75ee00715f0b7bab7c6))
+* **plugin-search:** add --search-bg-color variable ([6c778a8](https://github.com/vuepress/vuepress-next/commit/6c778a83b5d26529c830057aadc9c6fde8dc1805))
+* **plugin-search:** improve a11y support ([#165](https://github.com/vuepress/vuepress-next/issues/165)) ([205aafe](https://github.com/vuepress/vuepress-next/commit/205aafe4e6600987e06730b926abe2be3e4d5d73))
+* **theme-default:** support dark mode (close [#29](https://github.com/vuepress/vuepress-next/issues/29)) ([680e429](https://github.com/vuepress/vuepress-next/commit/680e4298a80ddb06b0381af48644124ffb0b0c4c))
+* **theme-default:** support full link for github repo ([#152](https://github.com/vuepress/vuepress-next/issues/152)) ([8a5055b](https://github.com/vuepress/vuepress-next/commit/8a5055b57d2068e73b4a1c52601c94bdbbc1a7c5))
+* **theme-default:** support Gitee repo ([5cad664](https://github.com/vuepress/vuepress-next/commit/5cad664bd7224a08e679dc06f61f17af6c790b97))
+
+
+### BREAKING CHANGES
+
+* **theme-default:** most sass variables are migrated to css variables
+
+
+
+
+
 # [2.0.0-beta.14](https://github.com/vuepress/vuepress-next/compare/v2.0.0-beta.13...v2.0.0-beta.14) (2021-05-12)
 
 

docs/.vuepress/configs/navbar/en.ts

@@ -5,18 +5,6 @@ export const en: NavbarConfig = [
     text: 'Guide',
     link: '/guide/',
   },
-  {
-    text: 'Advanced',
-    children: [
-      '/advanced/architecture.md',
-      '/advanced/plugin.md',
-      '/advanced/theme.md',
-      {
-        text: 'Cookbook',
-        link: '/advanced/cookbook/',
-      },
-    ],
-  },
   {
     text: 'Reference',
     children: [
@@ -63,6 +51,18 @@ export const en: NavbarConfig = [
   {
     text: 'Learn More',
     children: [
+      {
+        text: 'Advanced',
+        children: [
+          '/advanced/architecture.md',
+          '/advanced/plugin.md',
+          '/advanced/theme.md',
+          {
+            text: 'Cookbook',
+            link: '/advanced/cookbook/',
+          },
+        ],
+      },
       {
         text: 'Resources',
         children: [
@@ -78,18 +78,18 @@ export const en: NavbarConfig = [
           },
         ],
       },
+    ],
+  },
+  {
+    text: 'v2.x',
+    children: [
       {
-        text: 'Legacy Version',
-        children: [
-          {
-            text: 'v1 docs',
-            link: 'https://v1.vuepress.vuejs.org',
-          },
-          {
-            text: 'v0 docs',
-            link: 'https://v0.vuepress.vuejs.org',
-          },
-        ],
+        text: 'v1.x',
+        link: 'https://v1.vuepress.vuejs.org',
+      },
+      {
+        text: 'v0.x',
+        link: 'https://v0.vuepress.vuejs.org',
       },
     ],
   },

docs/.vuepress/configs/navbar/zh.ts

@@ -5,18 +5,6 @@ export const zh: NavbarConfig = [
     text: '指南',
     link: '/zh/guide/',
   },
-  {
-    text: '深入',
-    children: [
-      '/zh/advanced/architecture.md',
-      '/zh/advanced/plugin.md',
-      '/zh/advanced/theme.md',
-      {
-        text: 'Cookbook',
-        link: '/zh/advanced/cookbook/',
-      },
-    ],
-  },
   {
     text: '参考',
     children: [
@@ -60,6 +48,18 @@ export const zh: NavbarConfig = [
   {
     text: '了解更多',
     children: [
+      {
+        text: '深入',
+        children: [
+          '/zh/advanced/architecture.md',
+          '/zh/advanced/plugin.md',
+          '/zh/advanced/theme.md',
+          {
+            text: 'Cookbook',
+            link: '/zh/advanced/cookbook/',
+          },
+        ],
+      },
       {
         text: '其他资源',
         children: [
@@ -75,18 +75,18 @@ export const zh: NavbarConfig = [
           },
         ],
       },
+    ],
+  },
+  {
+    text: 'v2.x',
+    children: [
       {
-        text: '旧版本',
-        children: [
-          {
-            text: 'v1 文档',
-            link: 'https://v1.vuepress.vuejs.org/zh/',
-          },
-          {
-            text: 'v0 文档',
-            link: 'https://v0.vuepress.vuejs.org/zh/',
-          },
-        ],
+        text: 'v1.x',
+        link: 'https://v1.vuepress.vuejs.org',
+      },
+      {
+        text: 'v0.x',
+        link: 'https://v0.vuepress.vuejs.org',
       },
     ],
   },

docs/.vuepress/styles/palette.scss

@@ -81,7 +81,7 @@ export default defineClientAppEnhance(({ app, router, siteData }) => {
 ```
 
 ::: warning
-It not recommended to use `addRoute` method to add dynamic routes here, because those routes will **NOT** be pre-rendered in build mode.
+It's not recommended to use `addRoute` method to add dynamic routes here, because those routes will **NOT** be pre-rendered in build mode.
 
 But you can still do that if you understand the drawback.
 :::

docs/advanced/cookbook/usage-of-client-app-enhance.md

@@ -147,7 +147,7 @@ The palette system is extracted to [@vuepress/plugin-palette](../reference/plugi
 
 Theme authors can use their own way to allow users to custom styles, and not be limited with stylus.
 
-If you are using default theme, the palette system is still available but migrated to SASS. See [Default Theme > Styles](../reference/default-theme/styles.md).
+If you are using default theme, the palette system is still available but migrated to SASS, while most variables have been migrated to CSS variables. See [Default Theme > Styles](../reference/default-theme/styles.md).
 
 ### Conventional Files Change
 
@@ -228,7 +228,7 @@ Removed.
 
 #### Palette System
 
-The palette system of default theme has migrated to SASS.
+The palette system of default theme has migrated to SASS and CSS variables.
 
 See [Default Theme > Styles](../reference/default-theme/styles.md).
 

docs/guide/migration.md

@@ -146,7 +146,7 @@ module.exports = {
     // If you set it in the form of `organization/repository`
     // we will take it as a GitHub repo
     repo: 'vuejs/vuepress',
-    // Use url directly if you are not using GitHub
+    // You can also set it to a URL directly
     repo: 'https://gitlab.com/foo/bar',
   },
 }
@@ -362,7 +362,7 @@ module.exports = {
 
   This will be used for generating the _edit this page_ link.
 
-  If you don't set this option, the pattern will be inferred from the [docsRepo](#docsrepo) option. But if your documentation repository is not hosted on a common platform, for example, GitHub, GitLab, Bitbucket, etc., you have to set this option explicitly to make the _edit this page_ link work.
+  If you don't set this option, the pattern will be inferred from the [docsRepo](#docsrepo) option. But if your documentation repository is not hosted on a common platform, for example, GitHub, GitLab, Bitbucket, Gitee, etc., you have to set this option explicitly to make the _edit this page_ link work.
 
 - Usage:
 
@@ -495,7 +495,7 @@ module.exports = {
 
 - Type: `string`
 
-- Default: `'WARNING'`
+- Default: `'DANGER'`
 
 - Details:
 
@@ -535,7 +535,7 @@ module.exports = {
 
   This is mainly for a11y purpose.
 
-## Plugins
+## Plugins Config
 
 ### themePlugins
 
@@ -545,7 +545,7 @@ module.exports = {
 
   Default theme is using some plugins by default. You can disable a plugin if you really do not want to use it. Make sure you understand what the plugin is for before disabling it.
 
-#### themePlugins.activeHeaderLinks
+### themePlugins.activeHeaderLinks
 
 - Type: `boolean`
 
@@ -555,7 +555,7 @@ module.exports = {
 
   Enable [@vuepress/plugin-active-header-links](../plugin/active-header-links.md) or not.
 
-#### themePlugins.backToTop
+### themePlugins.backToTop
 
 - Type: `boolean`
 
@@ -565,7 +565,7 @@ module.exports = {
 
   Enable [@vuepress/plugin-back-to-top](../plugin/back-to-top.md) or not.
 
-#### themePlugins.container
+### themePlugins.container
 
 - Type: `Record<ContainerType, boolean>`
 
@@ -585,7 +585,7 @@ module.exports = {
 - Also see:
   - [Default Theme > Markdown > Custom Containers](./markdown.md#custom-containers)
 
-#### themePlugins.git
+### themePlugins.git
 
 - Type: `boolean`
 
@@ -595,7 +595,7 @@ module.exports = {
 
   Enable [@vuepress/plugin-git](../plugin/git.md) or not.
 
-#### themePlugins.mediumZoom
+### themePlugins.mediumZoom
 
 - Type: `boolean`
 
@@ -605,7 +605,7 @@ module.exports = {
 
   Enable [@vuepress/plugin-medium-zoom](../plugin/medium-zoom.md) or not.
 
-#### themePlugins.nprogress
+### themePlugins.nprogress
 
 - Type: `boolean`
 

docs/reference/default-theme/config.md

@@ -8,16 +8,32 @@ Users can custom style variables via [palette file](#palette-file), and add extr
 
 ## Palette File
 
-You can create a `.vuepress/styles/palette.scss` file to override predefined variables of default theme:
+The path of palette file is `.vuepress/styles/palette.scss`.
 
+You can make use of it to override predefined SASS variables of default theme.
+
+::: details Click to expand SASS variables
 @[code{3-} scss](@vuepress/theme-default/src/client/styles/_variables.scss)
+:::
 
 ## Style File
 
-You can override default styles or add extra styles in `.vuepress/styles/index.scss` file. For example:
+The path of style file is `.vuepress/styles/index.scss`.
+
+You can add extra styles here, or override default styles:
 
 ```scss
 :root {
   scroll-behavior: smooth;
 }
 ```
+
+You can also make use of it to override predefined CSS variables of default theme.
+
+::: details Click to expand CSS variables
+@[code scss](@vuepress/theme-default/src/client/styles/vars.scss)
+:::
+
+::: details Click to expand dark mode CSS variables
+@[code scss](@vuepress/theme-default/src/client/styles/vars-dark.scss)
+:::