Skip to content

Commit 53cfc78

Browse files
committed
Merge branch 'master' into next
2 parents 037080d + 2bf6bb9 commit 53cfc78

File tree

7 files changed

+32
-6
lines changed

7 files changed

+32
-6
lines changed

CHANGELOG.md

+21
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
<a name="0.14.4"></a>
2+
## [0.14.4](https://github.com/vuejs/vuepress/compare/v0.14.3...v0.14.4) (2018-09-15)
3+
4+
5+
### Bug Fixes
6+
7+
* missing config.base in google analytics page view URL (close: [#818](https://github.com/vuejs/vuepress/issues/818)) ([#834](https://github.com/vuejs/vuepress/issues/834)) ([559888b](https://github.com/vuejs/vuepress/commit/559888b))
8+
* **$markdown:** sidebar headers not being detected (close: [#841](https://github.com/vuejs/vuepress/issues/841)) ([181c1e5](https://github.com/vuejs/vuepress/commit/181c1e5))
9+
10+
11+
12+
<a name="0.14.3"></a>
13+
## [0.14.3](https://github.com/vuejs/vuepress/compare/v0.14.2...v0.14.3) (2018-09-13)
14+
15+
16+
### Bug Fixes
17+
18+
* **$build:** do not pick "babel.config.js" at user-land (close: [#797](https://github.com/vuejs/vuepress/issues/797)) ([48be61b](https://github.com/vuejs/vuepress/commit/48be61b))
19+
20+
21+
122
<a name="0.14.2"></a>
223
## [0.14.2](https://github.com/vuejs/vuepress/compare/v0.14.1...v0.14.2) (2018-08-14)
324

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ Websites built with VuePress:
7272

7373
* [cr-vue](https://cr-vue.mio3io.com/)
7474
* [vuesax](https://lusaxweb.github.io/vuesax/)
75+
* [vuemeetups](https://vuemeetups.org)
7576

7677
## Todo Features
7778

packages/@vuepress/core/lib/dev.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) {
3636
'.vuepress/components/**/*.vue'
3737
], {
3838
cwd: sourceDir,
39-
ignored: '.vuepress/**/*.md',
39+
ignored: ['.vuepress/**/*.md', 'node_modules'],
4040
ignoreInitial: true
4141
})
4242
pagesWatcher.on('add', update)

packages/@vuepress/core/lib/webpack/createBaseConfig.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,11 @@ module.exports = function createBaseConfig ({
173173
.use('babel-loader')
174174
.loader('babel-loader')
175175
.options({
176-
// do not pick local project babel config
176+
// do not pick local project babel config (.babelrc)
177177
babelrc: false,
178+
// do not pick local project babel config (babel.config.js)
179+
// ref: http://babeljs.io/docs/en/config-files
180+
configFile: false,
178181
presets: [
179182
require.resolve('@vue/babel-preset-app')
180183
]

packages/@vuepress/theme-default/components/Home.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
>
3131
<div
3232
class="feature"
33-
v-for="feature in data.features"
33+
v-for="(feature, index) in data.features"
34+
:key="index"
3435
>
3536
<h2>{{ feature.title }}</h2>
3637
<p>{{ feature.details }}</p>

packages/docs/docs/guide/markdown.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ This is a warning
181181
:::
182182

183183
::: danger
184-
This is a dangerous thing
184+
This is a dangerous warning
185185
:::
186186

187187
You can also customize the title of the block:

packages/docs/docs/zh/guide/getting-started.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
yarn global add vuepress # 或者:npm install -g vuepress
1414

1515
# 新建一个 markdown 文件
16-
echo "# Hello VuePress!" > README.md
16+
echo '# Hello VuePress!' > README.md
1717

1818
# 开始写作
1919
vuepress dev .
@@ -34,7 +34,7 @@ yarn add -D vuepress # 或者:npm install -D vuepress
3434
mkdir docs
3535

3636
# 新建一个 markdown 文件
37-
echo "# Hello VuePress!" > docs/README.md
37+
echo '# Hello VuePress!' > docs/README.md
3838

3939
# 开始写作
4040
npx vuepress dev docs

0 commit comments

Comments
 (0)