Skip to content

Commit

Permalink
chore: Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
haoqunjiang committed Jul 24, 2020
2 parents b1772ca + 830f08c commit 05057c1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/config/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ In v3 this means the opposite of `css.requireModuleExtension`.

- Some values like `host`, `port` and `https` may be overwritten by command line flags.

- Some values like `publicPath` and `historyApiFallback` should not be modified as they need to be synchronized with [publicPath](#baseurl) for the dev server to function properly.
- Some values like `publicPath` and `historyApiFallback` should not be modified as they need to be synchronized with [publicPath](#publicPath) for the dev server to function properly.

### devServer.proxy

Expand Down
2 changes: 1 addition & 1 deletion docs/zh/config/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ module.exports = {

- 有些值像 `host``port``https` 可能会被命令行参数覆写。

- 有些值像 `publicPath``historyApiFallback` 不应该被修改,因为它们需要和开发服务器的 [publicPath](#baseurl) 同步以保障正常的工作。
- 有些值像 `publicPath``historyApiFallback` 不应该被修改,因为它们需要和开发服务器的 [publicPath](#publicpath) 同步以保障正常的工作。

### devServer.proxy

Expand Down
6 changes: 3 additions & 3 deletions packages/@vue/babel-preset-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ This is the default Babel preset used in all Vue CLI projects. **Note: this pres
- `modules: false`
- auto set to `'commonjs'` in Jest tests
- [`useBuiltIns: 'usage'`](#usebuiltins)
- `targets` is determined:
- using `browserslist` field in `package.json` when building for browsers
- `targets`:
- by default `@babel/preset-env` will use [`browserslist config sources`](https://github.com/browserslist/browserslist#queries) (browserslist key in package.json file is recommend) unless either the [`targets`](https://babeljs.io/docs/en/babel-preset-env#targets) or [`ignoreBrowserslistConfig`](https://babeljs.io/docs/en/babel-preset-env#ignorebrowserslistconfig) options are set.
- set to `{ node: 'current' }` when running unit tests in Node.js
- Includes `Promise` polyfill by default so that they are usable even in non-transpiled dependencies (only for environments that need it)

Expand Down Expand Up @@ -50,7 +50,7 @@ Explicitly set `modules` option for `babel-preset-env`. See [babel-preset-env do
### targets

- Default:
- determined from `browserslist` field in `package.json` when building for browsers
- `@vue/babel-preset-app` will use [`browserslist config sources`](https://github.com/browserslist/browserslist#queries) (browserslist key in package.json file is recommend) unless either the [`targets`](https://babeljs.io/docs/en/babel-preset-env#targets) or [`ignoreBrowserslistConfig`](https://babeljs.io/docs/en/babel-preset-env#ignorebrowserslistconfig) options are set.
- set to `{ node: 'current' }` when running unit tests in Node.js

Explicitly set `targets` option for `babel-preset-env`. See [babel-preset-env docs](https://github.com/babel/babel/tree/master/packages/babel-preset-env#targets) for more details.
Expand Down

0 comments on commit 05057c1

Please sign in to comment.