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.0.1
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.0.2
Choose a head ref
  • 13 commits
  • 30 files changed
  • 7 contributors

Commits on Jun 10, 2019

  1. chore: 1.0.1 changelog

    ulivz committed Jun 10, 2019
    Copy the full SHA
    58cb3b1 View commit details

Commits on Jun 11, 2019

  1. chore: update workbox-build to v4 (#1607)

    fixed annoying deprecation warnings of the outdated joi dependencies
    haoqunjiang authored and ulivz committed Jun 11, 2019
    Copy the full SHA
    386d676 View commit details
  2. chore: add contributors graph

    ulivz authored Jun 11, 2019
    Copy the full SHA
    6c60e54 View commit details
  3. feat($plugin-medium-zoom): custom options (#1649)

    Also update medium-zoom to v1.0.4
    Raiondesu authored and ulivz committed Jun 11, 2019
    Copy the full SHA
    54bb2f3 View commit details
  4. Copy the full SHA
    42f19e0 View commit details
  5. chore: readme

    ulivz committed Jun 11, 2019
    Copy the full SHA
    05120bf View commit details
  6. chore: readme

    ulivz committed Jun 11, 2019
    Copy the full SHA
    e0ae28c View commit details

Commits on Jun 22, 2019

  1. docs($cn): fix typo

    siberiawolf authored and ulivz committed Jun 22, 2019
    Copy the full SHA
    998cfa3 View commit details
  2. chore: remove parentheses around site url (#1666)

    As VSCode makes `http://localhost:8080/)` including trailing parentheses which leads to a 404.
    morrislaptop authored and ulivz committed Jun 22, 2019
    Copy the full SHA
    9923f83 View commit details
  3. updates default preset link (#1668)

    the previous link currently gives a 404
    edm00se authored and ulivz committed Jun 22, 2019
    Copy the full SHA
    77d6733 View commit details
  4. Copy the full SHA
    17ba325 View commit details
  5. Copy the full SHA
    1aaa6e3 View commit details
  6. v1.0.2

    ulivz committed Jun 22, 2019
    Copy the full SHA
    cdd6843 View commit details
Showing with 147 additions and 59 deletions.
  1. +12 −0 CHANGELOG.md
  2. +21 −4 README.md
  3. +1 −1 lerna.json
  4. +1 −1 packages/@vuepress/core/lib/node/App.js
  5. +1 −1 packages/@vuepress/core/lib/node/theme-api/index.js
  6. +1 −1 packages/@vuepress/core/lib/node/webpack/DevLogPlugin.js
  7. +6 −6 packages/@vuepress/core/package.json
  8. +2 −2 packages/@vuepress/markdown-loader/package.json
  9. +3 −3 packages/@vuepress/markdown/package.json
  10. +1 −1 packages/@vuepress/plugin-active-header-links/package.json
  11. +1 −1 packages/@vuepress/plugin-back-to-top/package.json
  12. +1 −1 packages/@vuepress/plugin-google-analytics/package.json
  13. +1 −1 packages/@vuepress/plugin-last-updated/package.json
  14. +2 −2 packages/@vuepress/plugin-medium-zoom/clientRootMixin.js
  15. +2 −1 packages/@vuepress/plugin-medium-zoom/index.js
  16. +2 −2 packages/@vuepress/plugin-medium-zoom/package.json
  17. +1 −1 packages/@vuepress/plugin-nprogress/package.json
  18. +3 −3 packages/@vuepress/plugin-pwa/package.json
  19. +2 −2 packages/@vuepress/plugin-register-components/package.json
  20. +1 −1 packages/@vuepress/plugin-search/package.json
  21. +1 −1 packages/@vuepress/shared-utils/package.json
  22. +3 −3 packages/@vuepress/test-utils/package.json
  23. +4 −4 packages/@vuepress/theme-default/package.json
  24. +2 −2 packages/@vuepress/theme-vue/package.json
  25. +1 −1 packages/docs/docs/config/README.md
  26. +29 −1 packages/docs/docs/plugin/official/plugin-medium-zoom.md
  27. +1 −1 packages/docs/docs/zh/guide/markdown.md
  28. +31 −1 packages/docs/docs/zh/plugin/official/plugin-medium-zoom.md
  29. +7 −7 packages/docs/package.json
  30. +3 −3 packages/vuepress/package.json
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## [1.0.1](https://github.com/vuejs/vuepress/compare/v1.0.0...v1.0.1) (2019-06-10)


### Bug Fixes

* **$theme-default:** using '.theme-default-content' to replace '.content' in 404 layout ([#1646](https://github.com/vuejs/vuepress/issues/1646)) ([f0d1344](https://github.com/vuejs/vuepress/commit/f0d1344))


### Features

* **$theme-default:** enhance the styles of `blockquote` ([9d20d5f](https://github.com/vuejs/vuepress/commit/9d20d5f))


# [1.0.0](https://github.com/vuejs/vuepress/compare/v1.0.0-rc.1...v1.0.0) (2019-06-08)

25 changes: 21 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -12,7 +12,14 @@
<a href="https://discordapp.com/invite/HBherRA"><img src="https://img.shields.io/badge/Discord-join%20chat-738bd7.svg" alt="vuepress channel on Discord"></a>
</p>

> This is the branch for `VuePress 1.x` and docs are available at https://v1.vuepress.vuejs.org.
<h2 align="center">Supporting VuePress</h2>

Maintaining and developing new features to VuePress takes a considerable amount of time (if you know that Gastby's team is a company), and I am currently exploring the possibility of working on VuePress fulltime.

- [Sponsor ULIVZ on Patreon](https://www.patreon.com/ulivz)
- [Sponsor Vue.js](https://vuejs.org/support-vuejs)

> "VuePress is much more than that." —— ULIVZ
## Install

@@ -23,19 +30,29 @@ yarn add vuepress@next -D # Install 1.x.

## Showcase

Check out [Awesome Vuepress](https://github.com/ulivz/awesome-vuepress) to find awesome things related to VuePress 1.x .
- [Awesome Vuepress](https://github.com/ulivz/awesome-vuepress)
- [vuepress.gallery](https://vuepress.gallery) (by [@vicbergquist](https://twitter.com/vicbergquist))

## Documentation

## Development
This is the branch for `VuePress 1.x` and docs are available at https://v1.vuepress.vuejs.org.

> Please make sure your version of Node.js is greater than 8.
## Contribution

``` bash
yarn bootstrap # Install and link dependencies for this lerna repo
yarn dev # serves VuePress' own docs with itself
yarn test # make sure your code change pass the test
```

If you intend to make `"substantial"` changes to VuePress or its documentation, please checkout [VuePress RFCs](./rfcs/README.md).

If you have a VuePress-related project/component/tool, add it with a pull request to [this curated list](https://github.com/ulivz/awesome-vuepress)!

Thank you to all the people who already contributed to VuePress!

![contributors](https://opencollective.com/vuepress/contributors.svg?width=890)

## License

[MIT](https://github.com/vuejs/vuepress/blob/master/LICENSE)
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@
"lerna": "2.5.1",
"npmClient": "yarn",
"useWorkspaces": true,
"version": "1.0.1"
"version": "1.0.2"
}
2 changes: 1 addition & 1 deletion packages/@vuepress/core/lib/node/App.js
Original file line number Diff line number Diff line change
@@ -385,7 +385,7 @@ module.exports = class App {
return current
}
if (this.themeAPI.existsParentTheme) {
const parent = path.resolve(this.themeAPI.theme.path, filepath)
const parent = path.resolve(this.themeAPI.parentTheme.path, filepath)
if (fs.existsSync(parent)) {
return parent
}
2 changes: 1 addition & 1 deletion packages/@vuepress/core/lib/node/theme-api/index.js
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@ module.exports = class ThemeAPI {
isInternal: true
}
logger.warn(
`[vuepress] Cannot resolve Layout.vue file in \n ${Layout.path},`
`[vuepress] Cannot resolve Layout.vue file in \n ${Layout.path}, `
+ `fallback to default layout: ${fallbackLayoutPath}`
)
}
2 changes: 1 addition & 1 deletion packages/@vuepress/core/lib/node/webpack/DevLogPlugin.js
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ module.exports = class DevLogPlugin {
+ (
isFirst
? ''
: `${chalk.gray(`(${displayUrl})`)}`
: `${chalk.gray(`( ${displayUrl} )`)}`
)
)
if (isFirst) {
12 changes: 6 additions & 6 deletions packages/@vuepress/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/core",
"version": "1.0.1",
"version": "1.0.2",
"description": "Minimalistic doc generator with Vue component based layout system",
"main": "lib/index.js",
"repository": {
@@ -31,11 +31,11 @@
"dependencies": {
"@babel/core": "^7.0.0",
"@vue/babel-preset-app": "^3.1.1",
"@vuepress/markdown": "^1.0.1",
"@vuepress/markdown-loader": "^1.0.1",
"@vuepress/plugin-last-updated": "^1.0.1",
"@vuepress/plugin-register-components": "^1.0.1",
"@vuepress/shared-utils": "^1.0.1",
"@vuepress/markdown": "^1.0.2",
"@vuepress/markdown-loader": "^1.0.2",
"@vuepress/plugin-last-updated": "^1.0.2",
"@vuepress/plugin-register-components": "^1.0.2",
"@vuepress/shared-utils": "^1.0.2",
"autoprefixer": "^9.5.1",
"babel-loader": "^8.0.4",
"cache-loader": "^3.0.0",
4 changes: 2 additions & 2 deletions packages/@vuepress/markdown-loader/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/markdown-loader",
"version": "1.0.1",
"version": "1.0.2",
"description": "markdown-loader for vuepress",
"main": "index.js",
"publishConfig": {
@@ -18,7 +18,7 @@
"generator"
],
"dependencies": {
"@vuepress/markdown": "^1.0.1",
"@vuepress/markdown": "^1.0.2",
"loader-utils": "^1.1.0",
"lru-cache": "^5.1.1"
},
6 changes: 3 additions & 3 deletions packages/@vuepress/markdown/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/markdown",
"version": "1.0.1",
"version": "1.0.2",
"description": "markdown for vuepress",
"main": "index.js",
"publishConfig": {
@@ -19,7 +19,7 @@
"markdown"
],
"dependencies": {
"@vuepress/shared-utils": "^1.0.1",
"@vuepress/shared-utils": "^1.0.2",
"markdown-it": "^8.4.1",
"markdown-it-anchor": "^5.0.2",
"markdown-it-chain": "^1.3.0",
@@ -28,7 +28,7 @@
"prismjs": "^1.13.0"
},
"devDependencies": {
"@vuepress/test-utils": "^1.0.1"
"@vuepress/test-utils": "^1.0.2"
},
"author": "Evan You",
"maintainers": [
2 changes: 1 addition & 1 deletion packages/@vuepress/plugin-active-header-links/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/plugin-active-header-links",
"version": "1.0.1",
"version": "1.0.2",
"description": "active-header-links plugin for vuepress",
"main": "index.js",
"publishConfig": {
2 changes: 1 addition & 1 deletion packages/@vuepress/plugin-back-to-top/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/plugin-back-to-top",
"version": "1.0.1",
"version": "1.0.2",
"description": "back-to-top plugin for vuepress",
"main": "index.js",
"publishConfig": {
2 changes: 1 addition & 1 deletion packages/@vuepress/plugin-google-analytics/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/plugin-google-analytics",
"version": "1.0.1",
"version": "1.0.2",
"description": "google-analytics plugin for vuepress",
"main": "index.js",
"publishConfig": {
2 changes: 1 addition & 1 deletion packages/@vuepress/plugin-last-updated/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/plugin-last-updated",
"version": "1.0.1",
"version": "1.0.2",
"description": "last-updated plugin for vuepress",
"main": "index.js",
"publishConfig": {
4 changes: 2 additions & 2 deletions packages/@vuepress/plugin-medium-zoom/clientRootMixin.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* global SELECTOR */
/* global SELECTOR, OPTIONS */

import './style.css'
import zoom from 'medium-zoom'
@@ -20,7 +20,7 @@ export default {
if (this.zoom) {
this.zoom.detach()
}
this.zoom = zoom(SELECTOR)
this.zoom = zoom(SELECTOR, OPTIONS)
}, 1000)
}
}
3 changes: 2 additions & 1 deletion packages/@vuepress/plugin-medium-zoom/index.js
Original file line number Diff line number Diff line change
@@ -2,7 +2,8 @@ const { path } = require('@vuepress/shared-utils')

module.exports = (options, context) => ({
define: {
SELECTOR: options.selector || '.content img'
SELECTOR: options.selector || '.theme-default-content img',
OPTIONS: options.options
},
clientRootMixin: path.resolve(__dirname, 'clientRootMixin.js')
})
4 changes: 2 additions & 2 deletions packages/@vuepress/plugin-medium-zoom/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/plugin-medium-zoom",
"version": "1.0.1",
"version": "1.0.2",
"description": "medium-zoom plugin for vuepress",
"main": "index.js",
"publishConfig": {
@@ -18,7 +18,7 @@
"generator"
],
"dependencies": {
"medium-zoom": "^0.4.0"
"medium-zoom": "^1.0.4"
},
"author": "ULIVZ <chl814@foxmail.com>",
"license": "MIT",
2 changes: 1 addition & 1 deletion packages/@vuepress/plugin-nprogress/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/plugin-nprogress",
"version": "1.0.1",
"version": "1.0.2",
"description": "nprogress plugin for vuepress",
"main": "index.js",
"publishConfig": {
6 changes: 3 additions & 3 deletions packages/@vuepress/plugin-pwa/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/plugin-pwa",
"version": "1.0.1",
"version": "1.0.2",
"description": "pwa plugin for vuepress",
"main": "index.js",
"publishConfig": {
@@ -18,9 +18,9 @@
"generator"
],
"dependencies": {
"@vuepress/shared-utils": "^1.0.1",
"@vuepress/shared-utils": "^1.0.2",
"register-service-worker": "^1.5.2",
"workbox-build": "^3.1.0"
"workbox-build": "^4.3.1"
},
"author": "ULIVZ <chl814@foxmail.com>",
"license": "MIT",
4 changes: 2 additions & 2 deletions packages/@vuepress/plugin-register-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/plugin-register-components",
"version": "1.0.1",
"version": "1.0.2",
"description": "register-global-components plugin for vuepress",
"main": "index.js",
"publishConfig": {
@@ -24,6 +24,6 @@
},
"homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/plugin-register-components#readme",
"dependencies": {
"@vuepress/shared-utils": "^1.0.1"
"@vuepress/shared-utils": "^1.0.2"
}
}
2 changes: 1 addition & 1 deletion packages/@vuepress/plugin-search/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/plugin-search",
"version": "1.0.1",
"version": "1.0.2",
"description": "search plugin for vuepress",
"main": "index.js",
"publishConfig": {
2 changes: 1 addition & 1 deletion packages/@vuepress/shared-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/shared-utils",
"version": "1.0.1",
"version": "1.0.2",
"description": "shared-utils for vuepress",
"main": "lib/index.js",
"types": "types/index.d.ts",
6 changes: 3 additions & 3 deletions packages/@vuepress/test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/test-utils",
"version": "1.0.1",
"version": "1.0.2",
"description": "test-utils for vuepress",
"main": "index.js",
"publishConfig": {
@@ -22,8 +22,8 @@
"@babel/preset-env": "^7.0.0",
"@types/jest": "^24.0.9",
"@vue/test-utils": "^1.0.0-beta.29",
"@vuepress/core": "^1.0.1",
"@vuepress/shared-utils": "^1.0.1",
"@vuepress/core": "^1.0.2",
"@vuepress/shared-utils": "^1.0.2",
"babel-jest": "^24.7.1",
"execa": "^1.0.0",
"jest": "^24.7.1",
8 changes: 4 additions & 4 deletions packages/@vuepress/theme-default/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/theme-default",
"version": "1.0.1",
"version": "1.0.2",
"description": "Default theme for VuePress",
"main": "index.js",
"publishConfig": {
@@ -30,9 +30,9 @@
},
"homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/theme-default#readme",
"dependencies": {
"@vuepress/plugin-active-header-links": "^1.0.1",
"@vuepress/plugin-nprogress": "^1.0.1",
"@vuepress/plugin-search": "^1.0.1",
"@vuepress/plugin-active-header-links": "^1.0.2",
"@vuepress/plugin-nprogress": "^1.0.2",
"@vuepress/plugin-search": "^1.0.2",
"docsearch.js": "^2.5.2",
"stylus": "^0.54.5",
"stylus-loader": "^3.0.2",
4 changes: 2 additions & 2 deletions packages/@vuepress/theme-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/theme-vue",
"version": "1.0.1",
"version": "1.0.2",
"description": "VuePress theme for official Vue projects",
"main": "index.js",
"publishConfig": {
@@ -30,6 +30,6 @@
},
"homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/theme-vue#readme",
"dependencies": {
"@vuepress/theme-default": "^1.0.1"
"@vuepress/theme-default": "^1.0.2"
}
}
2 changes: 1 addition & 1 deletion packages/docs/docs/config/README.md
Original file line number Diff line number Diff line change
@@ -135,7 +135,7 @@ module.exports = {

### palette.styl

If you wish to apply simple color overrides to the styling of the [default preset](https://github.com/vuejs/vuepress/blob/master/packages/@vuepress/core/lib/app/style/config.styl) or define some color variables for using later, you can create an `.vuepress/styles/palette.styl` file.
If you wish to apply simple color overrides to the styling of the [default preset](https://github.com/vuejs/vuepress/blob/master/packages/@vuepress/core/lib/client/style/config.styl) or define some color variables for using later, you can create an `.vuepress/styles/palette.styl` file.

There are a few color variables you can tweak:

Loading