Skip to content

Commit 05057c1

Browse files
committed
chore: Merge branch 'master' into dev
2 parents b1772ca + 830f08c commit 05057c1

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

docs/config/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ In v3 this means the opposite of `css.requireModuleExtension`.
330330

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

333-
- 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.
333+
- 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.
334334

335335
### devServer.proxy
336336

docs/zh/config/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ module.exports = {
319319

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

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

324324
### devServer.proxy
325325

packages/@vue/babel-preset-app/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ This is the default Babel preset used in all Vue CLI projects. **Note: this pres
1111
- `modules: false`
1212
- auto set to `'commonjs'` in Jest tests
1313
- [`useBuiltIns: 'usage'`](#usebuiltins)
14-
- `targets` is determined:
15-
- using `browserslist` field in `package.json` when building for browsers
14+
- `targets`:
15+
- 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.
1616
- set to `{ node: 'current' }` when running unit tests in Node.js
1717
- Includes `Promise` polyfill by default so that they are usable even in non-transpiled dependencies (only for environments that need it)
1818

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

5252
- Default:
53-
- determined from `browserslist` field in `package.json` when building for browsers
53+
- `@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.
5454
- set to `{ node: 'current' }` when running unit tests in Node.js
5555

5656
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.

0 commit comments

Comments
 (0)