From f14b2da97333afc78afa3fbe3e8b1e5f52303a7c Mon Sep 17 00:00:00 2001 From: Xin Tan Date: Thu, 9 Jan 2020 22:19:18 +0800 Subject: [PATCH 01/11] docs: update zh-cn translation in config lintOnSave section (#5031) [ci skip] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修正lintOnSave的默认type类型 * 修正lint编译错误时新增warning类型 * 修正md内字符串需要引号 * trim line ending space --- docs/zh/config/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/zh/config/README.md b/docs/zh/config/README.md index 94d131fa26..74d4eff725 100644 --- a/docs/zh/config/README.md +++ b/docs/zh/config/README.md @@ -138,12 +138,12 @@ module.exports = { ### lintOnSave -- Type: `boolean` | `'error'` +- Type: `boolean` | `'warning'` | `'default'` | `'error'` - Default: `true` 是否在开发环境下通过 [eslint-loader](https://github.com/webpack-contrib/eslint-loader) 在每次保存时 lint 代码。这个值会在 [`@vue/cli-plugin-eslint`](https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-eslint) 被安装之后生效。 - 设置为 `true` 时，`eslint-loader` 会将 lint 错误输出为编译警告。默认情况下，警告仅仅会被输出到命令行，且不会使得编译失败。 + 设置为 `true` 或 `'warning'` 时，`eslint-loader` 会将 lint 错误输出为编译警告。默认情况下，警告仅仅会被输出到命令行，且不会使得编译失败。 如果你希望让 lint 错误在开发时直接显示在浏览器中，你可以使用 `lintOnSave: 'error'`。这会强制 `eslint-loader` 将 lint 错误输出为编译错误，同时也意味着 lint 错误将会导致编译失败。 From 74d801e61fa2e61659be861629dc9370efe53fb2 Mon Sep 17 00:00:00 2001 From: Xin Tan Date: Fri, 3 Jan 2020 16:06:06 +0800 Subject: [PATCH 02/11] Updated zh-cn translation in cli section (#5019) * UPDATDED: translation in simplified Chinese for 'yorkie' and 'husky' in warning * UPDATED: add missing code snippits in EN doc --- docs/zh/guide/cli-service.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/zh/guide/cli-service.md b/docs/zh/guide/cli-service.md index 9dbd7e449a..28ae6b70d7 100644 --- a/docs/zh/guide/cli-service.md +++ b/docs/zh/guide/cli-service.md @@ -126,12 +126,18 @@ npx vue-cli-service help [command] { "gitHooks": { "pre-commit": "lint-staged" + }, + "lint-staged": { + "*.{js,vue}": [ + "vue-cli-service lint", + "git add" + ] } } ``` ::: warning -`yorkie` fork 自 [`husky`](https://github.com/typicode/husky) 且并不和之后的版本兼容。 +`yorkie` fork 自 [`husky`](https://github.com/typicode/husky) 且并与后者不兼容。 ::: ## 配置时无需 Eject From e8fb3d98e82ccd186b7e5e359d34c645bd902b17 Mon Sep 17 00:00:00 2001 From: ntnyq Date: Thu, 9 Jan 2020 20:18:10 +0800 Subject: [PATCH 03/11] docs(zh): Sync Chinese translation (#5051) [ci skip] --- docs/zh/guide/css.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/zh/guide/css.md b/docs/zh/guide/css.md index 1c43282863..c08d5b0f58 100644 --- a/docs/zh/guide/css.md +++ b/docs/zh/guide/css.md @@ -100,8 +100,13 @@ module.exports = { css: { loaderOptions: { css: { - localIdentName: '[name]-[hash]', - camelCase: 'only' + // 注意：以下配置在 Vue CLI v4 与 v3 之间存在差异。 + // Vue CLI v3 用户可参考 css-loader v1 文档 + // https://github.com/webpack-contrib/css-loader/tree/v1.0.1 + modules: { + localIdentName: '[name]-[hash]' + }, + localsConvention: 'camelCaseOnly' } } } From 49f70ba27d35b761bdd5dc583c982de30f99d557 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Mon, 13 Jan 2020 21:46:17 +0800 Subject: [PATCH 04/11] docs: mention the precedence of `.vue` & `.ts(x)` extensions (#5055) closes #4936 --- docs/migrating-from-v3/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/migrating-from-v3/README.md b/docs/migrating-from-v3/README.md index df7a64ca48..576af31f84 100644 --- a/docs/migrating-from-v3/README.md +++ b/docs/migrating-from-v3/README.md @@ -266,7 +266,7 @@ As in the cypress plugin, the support for legacy `vue-cli-service e2e` command h ### `@vue/cli-plugin-typescript` -When using Typescript, the webpack resolve options now [prefer `ts(x)` file extensions over `js(x)` ones](https://github.com/vuejs/vue-cli/pull/3909). +When importing a file without extension, the webpack resolve options now prefer [prefer `.ts(x)` files over `.js(x)` and `.vue` ones](https://github.com/vuejs/vue-cli/pull/3909). We strongly recommend you to always include the file extension when importing `.vue` files. ### `@vue/cli-plugin-unit-jest` From 1790205ded0ffa609471d7e5da4cce0c1a94f46b Mon Sep 17 00:00:00 2001 From: Natalia Tepluhina Date: Tue, 14 Jan 2020 03:58:20 +0200 Subject: [PATCH 05/11] fix: fix a typo (#5078) --- docs/migrating-from-v3/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/migrating-from-v3/README.md b/docs/migrating-from-v3/README.md index 576af31f84..3ca517ceb4 100644 --- a/docs/migrating-from-v3/README.md +++ b/docs/migrating-from-v3/README.md @@ -266,7 +266,7 @@ As in the cypress plugin, the support for legacy `vue-cli-service e2e` command h ### `@vue/cli-plugin-typescript` -When importing a file without extension, the webpack resolve options now prefer [prefer `.ts(x)` files over `.js(x)` and `.vue` ones](https://github.com/vuejs/vue-cli/pull/3909). We strongly recommend you to always include the file extension when importing `.vue` files. +When importing a file without extension, the webpack resolve options now [prefer `.ts(x)` files over `.js(x)` and `.vue` ones](https://github.com/vuejs/vue-cli/pull/3909). We strongly recommend you to always include the file extension when importing `.vue` files. ### `@vue/cli-plugin-unit-jest` From cf5f00932750e9a5d05d4bf04d40ad2b0409874c Mon Sep 17 00:00:00 2001 From: Natalia Tepluhina Date: Tue, 14 Jan 2020 04:04:21 +0200 Subject: [PATCH 06/11] Mention that Vue CLI should be installed in Prototyping guide (#5079) * docs: clarified that we need CLI installed * docs: added vue-cli to bash script * Update docs/guide/prototyping.md Co-Authored-By: Pavan Kumar Sunkara Co-authored-by: Pavan Kumar Sunkara --- docs/guide/prototyping.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/guide/prototyping.md b/docs/guide/prototyping.md index c56a7d03bc..4c083ed5d3 100644 --- a/docs/guide/prototyping.md +++ b/docs/guide/prototyping.md @@ -1,11 +1,11 @@ # Instant Prototyping -You can rapidly prototype with just a single `*.vue` file with the `vue serve` and `vue build` commands, but they require an additional global addon to be installed first: +You can rapidly prototype with just a single `*.vue` file with the `vue serve` and `vue build` commands, but they require a global addon to be installed along with the Vue CLI: ``` bash -npm install -g @vue/cli-service-global +npm install -g @vue/cli @vue/cli-service-global # or -yarn global add @vue/cli-service-global +yarn global add @vue/cli @vue/cli-service-global ``` The drawback of `vue serve` is that it relies on globally installed dependencies which may be inconsistent on different machines. Therefore this is only recommended for rapid prototyping. From b5dedc175c660114ee0e5f52bb1cfd25c719fef0 Mon Sep 17 00:00:00 2001 From: Frank Fang Date: Tue, 14 Jan 2020 21:32:41 +0800 Subject: [PATCH 07/11] Add a demo for multiple loaders (#5076) --- docs/guide/webpack.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/guide/webpack.md b/docs/guide/webpack.md index b59f123bca..38b4015f15 100644 --- a/docs/guide/webpack.md +++ b/docs/guide/webpack.md @@ -81,6 +81,10 @@ module.exports = { .use('graphql-tag/loader') .loader('graphql-tag/loader') .end() + // Add another loader + .use('other-loader') + .loader('other-loader') + .end() } } ``` From 5edafc09fa8afe1ce0bc71f76ee77ad48c750e28 Mon Sep 17 00:00:00 2001 From: defead Date: Wed, 15 Jan 2020 01:08:10 +0800 Subject: [PATCH 08/11] line 477 according to english version (#5081) '@vue/babel-preset-env' to '@vue/babel-preset-app' --- docs/zh/guide/browser-compatibility.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh/guide/browser-compatibility.md b/docs/zh/guide/browser-compatibility.md index 098297ca53..cf6a77150a 100644 --- a/docs/zh/guide/browser-compatibility.md +++ b/docs/zh/guide/browser-compatibility.md @@ -44,7 +44,7 @@ ### 构建库或是 Web Component 时的 Polyfills -当使用 Vue CLI 来[构建一个库或是 Web Component](./build-targets.md) 时，推荐给 `@vue/babel-preset-env` 传入 `useBuiltIns: false` 选项。这能够确保你的库或是组件不包含不必要的 polyfills。通常来说，打包 polyfills 应当是最终使用你的库的应用的责任。 +当使用 Vue CLI 来[构建一个库或是 Web Component](./build-targets.md) 时，推荐给 `@vue/babel-preset-app` 传入 `useBuiltIns: false` 选项。这能够确保你的库或是组件不包含不必要的 polyfills。通常来说，打包 polyfills 应当是最终使用你的库的应用的责任。 ## 现代模式 From ff8f035ba656cc465879e91295ac714e76f74579 Mon Sep 17 00:00:00 2001 From: Alexander Sokolov Date: Sun, 19 Jan 2020 22:05:04 +0300 Subject: [PATCH 09/11] docs: [RU] Translation update (#5094) * docs: [RU] update migrating-from-v3.md * docs: [RU] update prototyping.md * docs: [RU] update webpack.md * docs: [RU] fix typos in cli-service.md * Update docs/ru/guide/prototyping.md Co-Authored-By: Natalia Tepluhina Co-authored-by: Natalia Tepluhina --- docs/ru/guide/cli-service.md | 4 ++-- docs/ru/guide/prototyping.md | 6 +++--- docs/ru/guide/webpack.md | 4 ++++ docs/ru/migrating-from-v3/README.md | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/ru/guide/cli-service.md b/docs/ru/guide/cli-service.md index 20ffeec0ca..bab720a5cc 100644 --- a/docs/ru/guide/cli-service.md +++ b/docs/ru/guide/cli-service.md @@ -51,7 +51,7 @@ npx vue-cli-service serve --port определить порт (по умолчанию: 8080) --https использовать https (по умолчанию: false) --public указать URL-адрес публичной сети для клиента HMR - --skip-plugins имёна плагинов через запятую, которые следует пропустить при запуске + --skip-plugins имена плагинов через запятую, которые следует пропустить при запуске ``` ::: tip --copy @@ -83,7 +83,7 @@ npx vue-cli-service serve --no-clean не удалять каталог dist перед сборкой проекта --report сгенерировать report.html для анализа содержимого сборки --report-json сгенерировать report.json для анализа содержимого сборки - --skip-plugins имёна плагинов через запятую, которые следует пропустить при запуске + --skip-plugins имена плагинов через запятую, которые следует пропустить при запуске --watch отслеживать изменения ``` diff --git a/docs/ru/guide/prototyping.md b/docs/ru/guide/prototyping.md index f60f4b2e13..553a46c603 100644 --- a/docs/ru/guide/prototyping.md +++ b/docs/ru/guide/prototyping.md @@ -1,11 +1,11 @@ # Мгновенное прототипирование -Вы можете быстро создавать прототип в одном файле `*.vue` с помощью команд `vue serve` и `vue build`, но для них сначала потребуется глобально установить дополнительный плагин: +Вы можете быстро создавать прототип в одном файле `*.vue` с помощью команд `vue serve` и `vue build`, но для них сначала потребуется глобально установить плагин в дополнение к Vue CLI: ```bash -npm install -g @vue/cli-service-global +npm install -g @vue/cli @vue/cli-service-global # или -yarn global add @vue/cli-service-global +yarn global add @vue/cli @vue/cli-service-global ``` Недостаток `vue serve` в том, что он полагается на глобально установленные зависимости, которые могут отличаться на разных машинах. Поэтому его рекомендуется использовать только для быстрого прототипирования. diff --git a/docs/ru/guide/webpack.md b/docs/ru/guide/webpack.md index 0dd02a874c..8811953aa7 100644 --- a/docs/ru/guide/webpack.md +++ b/docs/ru/guide/webpack.md @@ -81,6 +81,10 @@ module.exports = { .use('graphql-tag/loader') .loader('graphql-tag/loader') .end() + // Добавление ещё одного загрузчика + .use('other-loader') + .loader('other-loader') + .end() } } ``` diff --git a/docs/ru/migrating-from-v3/README.md b/docs/ru/migrating-from-v3/README.md index d79818e955..dca2a7baf7 100644 --- a/docs/ru/migrating-from-v3/README.md +++ b/docs/ru/migrating-from-v3/README.md @@ -261,7 +261,7 @@ Nightwatch.js обновлён с версии 0.9 до 1.x. Рекоменду ### `@vue/cli-plugin-typescript` -При использовании Typescript, webpack в настройках разрешения модулей теперь [отдаёт предпочтение файлам с расширениями `ts(x)`, а не `js(x)`](https://github.com/vuejs/vue-cli/pull/3909). +При импорте файла без расширения, настройки webpack по разрешению модулей теперь [отдают предпочтение файлам с расширениями `ts(x)` вместо `js(x)` и `.vue`](https://github.com/vuejs/vue-cli/pull/3909). Настоятельно рекомендуется всегда указывать расширение файла при импорте `.vue` файлов. ### `@vue/cli-plugin-unit-jest` From 771182ebbc9575f5e00a9053b5ff899b81e72bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=96=B0?= Date: Tue, 28 Jan 2020 16:52:37 +0800 Subject: [PATCH 10/11] docs(zh): update polyfill import according to core-js 3 docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * vue-cli@4 use core.js@^3.4.3 when use core.js@^3.4.3， you should use ```import "core-js/stable";import "regenerator-runtime/runtime";``` [this is an doc about core.js@3](https://github.com/zloirock/core-js/blob/master/docs/2019-03-19-core-js-3-babel-and-a-look-into-the-future.md#babelpolyfill) * add space * use single quote to keep the code style consistent Co-authored-by: Haoqun Jiang --- docs/zh/guide/browser-compatibility.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh/guide/browser-compatibility.md b/docs/zh/guide/browser-compatibility.md index cf6a77150a..9db5cf5fc9 100644 --- a/docs/zh/guide/browser-compatibility.md +++ b/docs/zh/guide/browser-compatibility.md @@ -38,7 +38,7 @@ 我们推荐以这种方式添加 polyfill 而不是在源代码中直接导入它们，因为如果这里列出的 polyfill 在 `browserslist` 的目标中不需要，则它会被自动排除。 ::: -3. **如果该依赖交付 ES5 代码，但使用了 ES6+ 特性且没有显式地列出需要的 polyfill (例如 Vuetify)：**请使用 `useBuiltIns: 'entry'` 然后在入口文件添加 `import '@babel/polyfill'`。这会根据 `browserslist` 目标导入**所有** polyfill，这样你就不用再担心依赖的 polyfill 问题了，但是因为包含了一些没有用到的 polyfill 所以最终的包大小可能会增加。 +3. **如果该依赖交付 ES5 代码，但使用了 ES6+ 特性且没有显式地列出需要的 polyfill (例如 Vuetify)：**请使用 `useBuiltIns: 'entry'` 然后在入口文件添加 `import 'core-js/stable'; import 'regenerator-runtime/runtime';`。这会根据 `browserslist` 目标导入**所有** polyfill，这样你就不用再担心依赖的 polyfill 问题了，但是因为包含了一些没有用到的 polyfill 所以最终的包大小可能会增加。 更多细节可查阅 [@babel-preset/env 文档](https://new.babeljs.io/docs/en/next/babel-preset-env.html#usebuiltins-usage)。 From 9e18f3c01db34a4ea3cf5a89d6e18a74f43c5a9d Mon Sep 17 00:00:00 2001 From: Frank Fang Date: Thu, 30 Jan 2020 22:01:31 +0800 Subject: [PATCH 11/11] Add a demo for multiple loader (#5122) English version already merged https://github.com/vuejs/vue-cli/pull/5076/files --- docs/zh/guide/webpack.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/zh/guide/webpack.md b/docs/zh/guide/webpack.md index 5f52620491..66790a82f7 100644 --- a/docs/zh/guide/webpack.md +++ b/docs/zh/guide/webpack.md @@ -81,6 +81,10 @@ module.exports = { .use('graphql-tag/loader') .loader('graphql-tag/loader') .end() + // 你还可以再添加一个 loader + .use('other-loader') + .loader('other-loader') + .end() } } ```