Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vuejs/vuepress
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.5.2
Choose a base ref
...
head repository: vuejs/vuepress
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.5.3
Choose a head ref
Loading
Showing with 776 additions and 634 deletions.
  1. +10 −95 .all-contributorsrc
  2. +0 −123 .circleci/config.yml
  3. +17 −0 .dependabot/config.yml
  4. +10 −5 .github/CONTRIBUTING.md
  5. +42 −0 .github/workflows/pull-request-ci.yml
  6. +21 −9 CHANGELOG.md
  7. +28 −15 README.md
  8. +1 −1 lerna.json
  9. 0 packages/@vuepress/core/lib/node/App.js
  10. 0 packages/@vuepress/core/lib/node/internal-plugins/enhanceApp.js
  11. 0 packages/@vuepress/core/lib/node/loadTheme.js
  12. +1 −1 packages/@vuepress/core/lib/node/webpack/createBaseConfig.js
  13. +6 −6 packages/@vuepress/core/package.json
  14. +2 −2 packages/@vuepress/markdown-loader/package.json
  15. +46 −36 packages/@vuepress/markdown/__tests__/__snapshots__/snippet.spec.js.snap
  16. +1 −0 packages/@vuepress/markdown/__tests__/fragments/code-snippet-highlightLines-single-and-multiple.md
  17. +6 −0 packages/@vuepress/markdown/__tests__/snippet.spec.js
  18. +1 −1 packages/@vuepress/markdown/lib/snippet.js
  19. +2 −2 packages/@vuepress/markdown/package.json
  20. +1 −1 packages/@vuepress/plugin-active-header-links/package.json
  21. +1 −1 packages/@vuepress/plugin-back-to-top/package.json
  22. +1 −1 packages/@vuepress/plugin-google-analytics/package.json
  23. +1 −1 packages/@vuepress/plugin-last-updated/package.json
  24. +1 −1 packages/@vuepress/plugin-medium-zoom/package.json
  25. +1 −1 packages/@vuepress/plugin-nprogress/package.json
  26. +2 −2 packages/@vuepress/plugin-pwa/package.json
  27. +2 −2 packages/@vuepress/plugin-register-components/package.json
  28. +1 −1 packages/@vuepress/plugin-search/package.json
  29. +2 −1 packages/@vuepress/shared-utils/package.json
  30. +3 −3 packages/@vuepress/test-utils/package.json
  31. +1 −1 packages/@vuepress/theme-default/components/DropdownLink.vue
  32. +4 −1 packages/@vuepress/theme-default/components/NavLink.vue
  33. +16 −4 packages/@vuepress/theme-default/components/PageEdit.vue
  34. +1 −0 packages/@vuepress/theme-default/components/SidebarGroup.vue
  35. +3 −2 packages/@vuepress/theme-default/components/SidebarLinks.vue
  36. +4 −4 packages/@vuepress/theme-default/package.json
  37. +1 −0 packages/@vuepress/theme-default/util/index.js
  38. +1 −1 packages/@vuepress/theme-vue/components/CarbonAds.vue
  39. +2 −2 packages/@vuepress/theme-vue/package.json
  40. 0 packages/docs/docs/.vuepress/config.js
  41. +11 −9 packages/docs/docs/README.md
  42. +4 −4 packages/docs/docs/guide/assets.md
  43. +3 −3 packages/docs/docs/guide/basic-config.md
  44. +20 −20 packages/docs/docs/guide/deploy.md
  45. +3 −3 packages/docs/docs/guide/directory-structure.md
  46. +26 −17 packages/docs/docs/guide/frontmatter.md
  47. +28 −5 packages/docs/docs/guide/getting-started.md
  48. +8 −12 packages/docs/docs/guide/global-computed.md
  49. +2 −2 packages/docs/docs/guide/i18n.md
  50. +5 −5 packages/docs/docs/guide/markdown-slot.md
  51. +49 −9 packages/docs/docs/guide/markdown.md
  52. +15 −17 packages/docs/docs/guide/permalinks.md
  53. +11 −11 packages/docs/docs/guide/using-vue.md
  54. +1 −1 packages/docs/docs/miscellaneous/glossary.md
  55. +123 −51 packages/docs/docs/miscellaneous/local-development.md
  56. +1 −1 packages/docs/docs/plugin/README.md
  57. +7 −4 packages/docs/docs/theme/default-theme-config.md
  58. 0 packages/docs/docs/theme/inheritance.md
  59. 0 packages/docs/docs/theme/option-api.md
  60. +26 −0 packages/docs/docs/zh/guide/deploy.md
  61. +65 −0 packages/docs/docs/zh/guide/markdown.md
  62. 0 packages/docs/docs/zh/miscellaneous/glossary.md
  63. +24 −2 packages/docs/docs/zh/plugin/official/plugin-last-updated.md
  64. +2 −1 packages/docs/docs/zh/theme/default-theme-config.md
  65. 0 packages/docs/docs/zh/theme/inheritance.md
  66. 0 packages/docs/docs/zh/theme/option-api.md
  67. 0 packages/docs/docs/zh/theme/writing-a-theme.md
  68. +7 −7 packages/docs/package.json
  69. +3 −3 packages/vuepress/package.json
  70. +1 −1 scripts/test.js
  71. +88 −120 yarn.lock
105 changes: 10 additions & 95 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -10,44 +10,6 @@
"commit": false,
"commitConvention": "none",
"contributors": [
{
"login": "yyx990803",
"name": "Evan You",
"avatar_url": "https://avatars1.githubusercontent.com/u/499550?v=4",
"profile": "http://evanyou.me",
"contributions": [
"code"
]
},
{
"login": "ulivz",
"name": "ULIVZ",
"avatar_url": "https://avatars1.githubusercontent.com/u/23133919?v=4",
"profile": "http://ulivz.com",
"contributions": [
"code",
"doc"
]
},
{
"login": "kefranabg",
"name": "Franck Abgrall",
"avatar_url": "https://avatars3.githubusercontent.com/u/9840435?v=4",
"profile": "https://www.franck-abgrall.me/",
"contributions": [
"code",
"question"
]
},
{
"login": "f3ltron",
"name": "Giraud Florent",
"avatar_url": "https://avatars1.githubusercontent.com/u/11556276?v=4",
"profile": "https://github.com/f3ltron",
"contributions": [
"code"
]
},
{
"login": "newsbielt703",
"name": "Billyyyyy3320",
@@ -64,27 +26,8 @@
"profile": "http://www.bencodezen.io",
"contributions": [
"code",
"blog"
]
},
{
"login": "vicbergquist",
"name": "Victoria Bergquist",
"avatar_url": "https://avatars0.githubusercontent.com/u/25737281?v=4",
"profile": "https://twitter.com/vicbergquist",
"contributions": [
"code",
"design"
]
},
{
"login": "sarahdayan",
"name": "Sarah Dayan",
"avatar_url": "https://avatars0.githubusercontent.com/u/5370675?v=4",
"profile": "https://frontstuff.io/",
"contributions": [
"code",
"doc"
"doc",
"question"
]
},
{
@@ -95,52 +38,24 @@
"code"
]
},
{
"login": "sobolevn",
"name": "Nikita Sobolev",
"avatar_url": "https://avatars1.githubusercontent.com/u/4660275?v=4",
"profile": "https://sobolevn.me",
"contributions": [
"code",
"doc"
]
},
{
"login": "CodesOfRa",
"name": "Ramona",
"avatar_url": "https://avatars0.githubusercontent.com/u/945186?v=4",
"profile": "https://twitter.com/CodesOfRa",
"contributions": [
"code"
]
},
{
"login": "fatihacet",
"name": "Fatih Acet",
"avatar_url": "https://avatars3.githubusercontent.com/u/712419?v=4",
"profile": "https://fatihacet.com",
"contributions": [
"code"
]
},
{
"login": "farcaller",
"name": "Vladimir Pouzanov",
"avatar_url": "https://avatars2.githubusercontent.com/u/693?v=4",
"profile": "http://farcaller.net/",
"contributions": [
"code"
"code",
"doc"
]
},
{
"login": "vinayakkulkarni",
"name": "Vinayak Kulkarni",
"avatar_url": "https://avatars2.githubusercontent.com/u/19776877?v=4",
"profile": "https://twitter.com/_vinayak_k",
{
"login": "kefranabg",
"name": "Franck Abgrall",
"avatar_url": "https://avatars3.githubusercontent.com/u/9840435?v=4",
"profile": "https://www.franck-abgrall.me/",
"contributions": [
"plugin",
"code",
"blog"
"question"
]
}
],
123 changes: 0 additions & 123 deletions .circleci/config.yml

This file was deleted.

17 changes: 17 additions & 0 deletions .dependabot/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: 1
update_configs:
# Keep package.json (& lockfiles) up to date as soon as
# new versions are published to the npm registry
- package_manager: "javascript"
directory: "/"
update_schedule: "live"
# Apply default reviewer and label to created
# pull requests
default_reviewers:
- "bencodezen"
default_labels:
- "dependencies"
commit_message:
prefix: "fix"
prefix_development: "chore"
include_scope: true
15 changes: 10 additions & 5 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -4,17 +4,14 @@ This project uses a monorepo setup that requires using [Yarn](https://yarnpkg.co

``` sh
# Install all dependencies.
yarn install
yarn

# Serves VuePress' own docs with itself.
yarn dev

# Build VuePress' own docs with itself.
yarn build

# Execute all the test suites.
yarn test

# Clean dependencies.
yarn clean

@@ -24,7 +21,15 @@ yarn boot

## Testing Setup

> TODO
VuePress leverages [jest](https://jestjs.io/) for its tests, testing process depends on some setup located at [scripts/test.js](../scripts/test.js).

```bash
# Execute all the test suites.
yarn test

# Execute tests under specfic package.
yarn test -p=core ## OR --package=core
```

## Core Packages

42 changes: 42 additions & 0 deletions .github/workflows/pull-request-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Pull request workflow

on:
pull_request:

jobs:
pr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: '12'
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v1
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-node-modules-
${{ runner.os }}-
- name: Install dependencies
if: steps.yarn-cache.outputs.cache-hit != 'true'
run: yarn

- name: Run tsc
run: yarn tsc

- name: Run unit tests
run: yarn test

- name: Check linter
run: yarn lint

- name: Check markdown linter
run: yarn workspace docs lint-md

- name: Build vuepress
run: yarn build
Loading