Skip to content

Commit c078633

Browse files
committed
chore: merge branch 'dev' into docs
2 parents 3195287 + aa50bf5 commit c078633

File tree

51 files changed

+315
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+315
-189
lines changed

CHANGELOG.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,41 @@
1+
# [3.4.1](https://github.com/vuejs/vue-cli/compare/v3.4.0...v3.4.1) (2019-02-20)
2+
3+
## cli-plugin-babel
4+
5+
#### Bug Fixes
6+
7+
* fix hash difference on different terminal sessions ([a2bc927](https://github.com/vuejs/vue-cli/commit/a2bc927)), closes [#3416](https://github.com/vuejs/vue-cli/issues/3416)
8+
9+
## cli-plugin-eslint
10+
11+
#### Bug Fixes
12+
13+
* respect command line --ignore-pattern option ([f819f51](https://github.com/vuejs/vue-cli/commit/f819f51))
14+
* **cli-plugin-eslint:** make eslint deps optional ([#3068](https://github.com/vuejs/vue-cli/issues/3068)) ([114313c](https://github.com/vuejs/vue-cli/commit/114313c))
15+
16+
## cli-plugin-typescript
17+
18+
#### Bug Fixes
19+
20+
* **tslint:** don't reread the input file on ts linting (close [#2786](https://github.com/vuejs/vue-cli/issues/2786)) ([#2787](https://github.com/vuejs/vue-cli/issues/2787)) ([364f28f](https://github.com/vuejs/vue-cli/commit/364f28f))
21+
22+
## cli-service
23+
24+
#### Bug Fixes
25+
26+
* run modern build in separate process ([#3477](https://github.com/vuejs/vue-cli/issues/3477)) ([e0983f4](https://github.com/vuejs/vue-cli/commit/e0983f4)), closes [#3438](https://github.com/vuejs/vue-cli/issues/3438) [#3474](https://github.com/vuejs/vue-cli/issues/3474)
27+
#### Features
28+
29+
* **cli-service:** add history api fallback for multi-page mode ([#3181](https://github.com/vuejs/vue-cli/issues/3181)) ([ea5d9f7](https://github.com/vuejs/vue-cli/commit/ea5d9f7))
30+
31+
## cli-ui
32+
33+
#### Bug Fixes
34+
35+
* import createTimeAgo from vue-timeago because it isn't a default export ([#3437](https://github.com/vuejs/vue-cli/issues/3437)) ([38aa8d9](https://github.com/vuejs/vue-cli/commit/38aa8d9))
36+
37+
38+
139
# [3.4.0](https://github.com/vuejs/vue-cli/compare/v3.3.0...v3.4.0) (2019-01-31)
240

341
## babel-preset-app

docs/.vuepress/config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ module.exports = {
22
locales: {
33
'/': {
44
lang: 'en-US',
5-
title: 'Vue CLI 3',
5+
title: 'Vue CLI',
66
description: '🛠️ Standard Tooling for Vue.js Development'
77
},
88
'/zh/': {
99
lang: 'zh-CN',
10-
title: 'Vue CLI 3',
10+
title: 'Vue CLI',
1111
description: '🛠️ Vue.js 开发的标准工具'
1212
},
1313
'/ru/': {
1414
lang: 'ru',
15-
title: 'Vue CLI 3',
15+
title: 'Vue CLI',
1616
description: '🛠️ Стандартный инструментарий для разработки на Vue.js'
1717
}
1818
},

docs/dev-guide/plugin-dev.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ Example:
781781
{
782782
"name": "vue-cli-plugin-apollo",
783783
"version": "0.7.7",
784-
"description": "vue-cli 3 plugin to add Apollo and GraphQL"
784+
"description": "vue-cli plugin to add Apollo and GraphQL"
785785
}
786786
```
787787

docs/dev-guide/ui-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ A Client addon is a JS bundle which is dynamically loaded into the cli-ui. It is
628628

629629
### Create a client addon
630630

631-
The recommended way to create a Client addon is by creating a new project using vue-cli 3. You can either do this in a subfolder of your plugin or in a different npm package.
631+
The recommended way to create a Client addon is by creating a new project using vue cli. You can either do this in a subfolder of your plugin or in a different npm package.
632632

633633
Install `@vue/cli-ui` as a dev dependency.
634634

docs/dev-guide/ui-info.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Example:
2222
{
2323
"name": "vue-cli-plugin-apollo",
2424
"version": "0.7.7",
25-
"description": "vue-cli 3 plugin to add Apollo and GraphQL"
25+
"description": "vue-cli plugin to add Apollo and GraphQL"
2626
}
2727
```
2828

docs/guide/creating-a-project.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ vue create hello-world
1010

1111
::: warning
1212
If you are on Windows using Git Bash with minTTY, the interactive prompts will not work. You must launch the command as `winpty vue.cmd create hello-world`.
13-
If you however want to still use the `vue create hello-world` syntax, you can alias the command by adding the following line to your `~/.bashrc` file.
14-
`alias vue='winpty vue.cmd'`
13+
If you however want to still use the `vue create hello-world` syntax, you can alias the command by adding the following line to your `~/.bashrc` file.
14+
`alias vue='winpty vue.cmd'`
1515
You will need to restart your Git Bash terminal session to pull in the updated bashrc file.
1616
:::
1717

@@ -73,7 +73,7 @@ The above command will open a browser window with a GUI that guides you through
7373

7474
## Pulling 2.x Templates (Legacy)
7575

76-
Vue CLI 3 uses the same `vue` binary, so it overwrites Vue CLI 2 (`vue-cli`). If you still need the legacy `vue init` functionality, you can install a global bridge:
76+
Vue CLI >= 3 uses the same `vue` binary, so it overwrites Vue CLI 2 (`vue-cli`). If you still need the legacy `vue init` functionality, you can install a global bridge:
7777

7878
``` bash
7979
npm install -g @vue/cli-init

docs/guide/mode-and-env.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ FOO=bar
4646
VUE_APP_SECRET=secret
4747
```
4848

49+
For more detailed env parsing rules, please refer to [the documentation of `dotenv`](https://github.com/motdotla/dotenv#rules).
50+
4951
Loaded variables will become available to all `vue-cli-service` commands, plugins and dependencies.
5052

5153
::: tip Env Loading Priorities

docs/ru/dev-guide/ui-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ api.addTask({
628628

629629
### Создание клиентского дополнения
630630

631-
Рекомендуемый способ создания клиентского дополнения — создать новый проект с помощью vue-cli 3. Вы можете либо сделать это в подкаталоге вашего плагина, либо в другом npm пакете.
631+
Рекомендуемый способ создания клиентского дополнения — создать новый проект с помощью vue cli. Вы можете либо сделать это в подкаталоге вашего плагина, либо в другом npm пакете.
632632

633633
Установите `@vue/cli-ui` в качестве зависимости для разработки (dev dependency).
634634

docs/ru/dev-guide/ui-info.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
{
2323
"name": "vue-cli-plugin-apollo",
2424
"version": "0.7.7",
25-
"description": "vue-cli 3 plugin to add Apollo and GraphQL"
25+
"description": "vue-cli plugin to add Apollo and GraphQL"
2626
}
2727
```
2828

docs/ru/guide/creating-a-project.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ vue ui
7373

7474
## Шаблоны для версии 2.x (старое поведение)
7575

76-
Vue CLI 3 использует команду `vue`, поэтому он перезаписывает Vue CLI 2 (`vue-cli`). Если вам по-прежнему необходимо старое поведение и функциональность команды `vue init`, нужно лишь установить глобально дополнительный плагин `@vue/cli-init`:
76+
Vue CLI >= 3 использует команду `vue`, поэтому он перезаписывает Vue CLI 2 (`vue-cli`). Если вам по-прежнему необходимо старое поведение и функциональность команды `vue init`, нужно лишь установить глобально дополнительный плагин `@vue/cli-init`:
7777

7878
``` bash
7979
npm install -g @vue/cli-init

0 commit comments

Comments
 (0)