From 6ad44fd75543519cf3fff50321009f964f989ec5 Mon Sep 17 00:00:00 2001 From: Necmettin Karakaya Date: Sat, 18 Jul 2020 21:22:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Fix=20typo=20=F0=9F=91=87=F0=9F=8F=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/vuejs/vue-cli/blob/master/docs/guide/deployment.md#L133: corrected "wih" to "with" https://github.com/vuejs/vue-cli/blob/master/docs/dev-guide/ui-localization.md#L5: corrected "synchronisation" to "synchronization" https://github.com/vuejs/vue-cli/blob/master/docs/config/README.md#L260: corrected "explictly" to "explicitly" https://github.com/vuejs/vue-cli/blob/master/packages/@vue/cli-service/lib/util/resolveLoaderError.js#L23: corrected "defualt" to "default" https://github.com/vuejs/vue-cli/blob/master/packages/@vue/cli-service/lib/config/terserOptions.js#L22: corrected "noticable" to "noticeable" https://github.com/vuejs/vue-cli/blob/master/packages/@vue/cli-plugin-e2e-nightwatch/__tests__/lib/globals-generated.js#L2: corrected "inpsect" to "inspect" https://github.com/vuejs/vue-cli/blob/master/packages/@vue/cli-plugin-typescript/__tests__/tsPluginTSLint.spec.js#L109: corrected "behaviour" to "behavior" https://github.com/vuejs/vue-cli/blob/master/packages/@vue/cli/lib/util/confirmIfGitDirty.js#L24: corrected "uncommited" to "uncommitted" https://github.com/vuejs/vue-cli/blob/master/packages/@vue/cli/__tests__/invoke.spec.js#L153: corrected "uncommited" to "uncommitted" https://github.com/vuejs/vue-cli/blob/master/packages/@vue/cli/lib/GeneratorAPI.js#L230: corrected "compatiblity" to "compatibility" https://github.com/vuejs/vue-cli/blob/master/packages/@vue/babel-preset-app/index.js#L98: corrected "envrionment" to "environment" https://github.com/vuejs/vue-cli/blob/master/packages/@vue/cli-plugin-eslint/generator/index.js#L46: corrected "extentions" to "extensions" https://github.com/vuejs/vue-cli/blob/master/CHANGELOG.md#L1678: corrected "behaviour" to "behavior" https://github.com/vuejs/vue-cli/blob/master/CHANGELOG.md#L3275: corrected "detials" to "details" https://github.com/vuejs/vue-cli/blob/master/CHANGELOG.md#L4165: corrected "casuing" to "causing" https://github.com/vuejs/vue-cli/blob/master/CHANGELOG.md#L4241: corrected "dahsboard" to "dashboard" --- CHANGELOG.md | 8 ++++---- docs/config/README.md | 2 +- docs/dev-guide/ui-localization.md | 2 +- docs/guide/deployment.md | 2 +- packages/@vue/babel-preset-app/index.js | 2 +- .../__tests__/lib/globals-generated.js | 2 +- packages/@vue/cli-plugin-eslint/generator/index.js | 2 +- .../__tests__/tsPluginTSLint.spec.js | 2 +- packages/@vue/cli-service/lib/config/terserOptions.js | 2 +- packages/@vue/cli-service/lib/util/resolveLoaderError.js | 2 +- packages/@vue/cli/__tests__/invoke.spec.js | 2 +- packages/@vue/cli/lib/GeneratorAPI.js | 2 +- packages/@vue/cli/lib/util/confirmIfGitDirty.js | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b4a31523c..7ffdebf686 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1675,7 +1675,7 @@ Most of the following new features and bugfixes also applies to v3.8.0 * [#1531](https://github.com/vuejs/vue-cli/pull/1531) support PNPM as a package manager ([@robertkruis](https://github.com/robertkruis)) * [#3790](https://github.com/vuejs/vue-cli/pull/3790) fix PNPM compatibility issues during scaffolding ([@sodatea](https://github.com/sodatea)) * `@vue/cli-plugin-eslint`, `@vue/cli-service` - * [#3572](https://github.com/vuejs/vue-cli/pull/3572) add 3rd option to `lintOnSave` to support 'default' behaviour (Closes [#3552](https://github.com/vuejs/vue-cli/issues/3552)) ([@LinusBorg](https://github.com/LinusBorg)) + * [#3572](https://github.com/vuejs/vue-cli/pull/3572) add 3rd option to `lintOnSave` to support 'default' behavior (Closes [#3552](https://github.com/vuejs/vue-cli/issues/3552)) ([@LinusBorg](https://github.com/LinusBorg)) * `@vue/cli-plugin-unit-jest` * [#3589](https://github.com/vuejs/vue-cli/pull/3589) add jest typeahead plugin ([@sodatea](https://github.com/sodatea)) @@ -3272,7 +3272,7 @@ will need to explicitly install `typescript` in your project. * **ui:** improved remote preset checking ([0ba5e09](https://github.com/vuejs/vue-cli/commit/0ba5e09)) * **ui:** list item hover background more subtle ([a5bb260](https://github.com/vuejs/vue-cli/commit/a5bb260)) * **ui:** more spacing in status bar ([80a847f](https://github.com/vuejs/vue-cli/commit/80a847f)) -* **ui:** project create detials: bigger grid gap ([cfed833](https://github.com/vuejs/vue-cli/commit/cfed833)) +* **ui:** project create details: bigger grid gap ([cfed833](https://github.com/vuejs/vue-cli/commit/cfed833)) * **ui:** project creation not reset ([9efdfaf](https://github.com/vuejs/vue-cli/commit/9efdfaf)) * **ui:** remove console.log ([04d76a2](https://github.com/vuejs/vue-cli/commit/04d76a2)) * **ui:** reset webpack.config.js service on correct CWD, closes [#1555](https://github.com/vuejs/vue-cli/issues/1555) ([dc2f8e8](https://github.com/vuejs/vue-cli/commit/dc2f8e8)) @@ -4162,7 +4162,7 @@ sepcify the default mode for a registered command, the plugins should expose * **ui:** PluginAdd tab check ([ca01d95](https://github.com/vuejs/vue-cli/commit/ca01d95)) * **ui:** pormpts remove result in answers when disabled ([a29a3b4](https://github.com/vuejs/vue-cli/commit/a29a3b4)) * **ui:** stderr new lines + selected task status color ([b949406](https://github.com/vuejs/vue-cli/commit/b949406)) -* **ui:** progress handler should not throw error (casuing process to exit) ([3d4d8f0](https://github.com/vuejs/vue-cli/commit/3d4d8f0)) +* **ui:** progress handler should not throw error (causing process to exit) ([3d4d8f0](https://github.com/vuejs/vue-cli/commit/3d4d8f0)) * **ui:** ProjectNav padding ([4fd8885](https://github.com/vuejs/vue-cli/commit/4fd8885)) * **ui:** ProjectNavButton tooltip delay ([131cc46](https://github.com/vuejs/vue-cli/commit/131cc46)) * **ui:** prompt margins ([100a12e](https://github.com/vuejs/vue-cli/commit/100a12e)) @@ -4238,7 +4238,7 @@ sepcify the default mode for a registered command, the plugins should expose #### Bug Fixes -* **ui:** deps + dahsboard plugin ([a628b43](https://github.com/vuejs/vue-cli/commit/a628b43)) +* **ui:** deps + dashboard plugin ([a628b43](https://github.com/vuejs/vue-cli/commit/a628b43)) * **ui:** display 0 instead of NaN ([21d3e94](https://github.com/vuejs/vue-cli/commit/21d3e94)) #### Features diff --git a/docs/config/README.md b/docs/config/README.md index de9b4d9c67..3831134663 100644 --- a/docs/config/README.md +++ b/docs/config/README.md @@ -257,7 +257,7 @@ In v3 this means the opposite of `css.requireModuleExtension`. By default, only files that ends in `*.module.[ext]` are treated as CSS modules. Setting this to `false` will allow you to drop `.module` in the filenames and treat all `*.(css|scss|sass|less|styl(us)?)` files as CSS modules. ::: tip - If you have customized CSS Modules configurations in `css.loaderOptions.css`, then the `css.requireModuleExtension` field must be explictly configured to `true` or `false`, otherwise we can't be sure whether you want to apply these options to all CSS files or not. + If you have customized CSS Modules configurations in `css.loaderOptions.css`, then the `css.requireModuleExtension` field must be explicitly configured to `true` or `false`, otherwise we can't be sure whether you want to apply these options to all CSS files or not. ::: See also: [Working with CSS > CSS Modules](../guide/css.md#css-modules) diff --git a/docs/dev-guide/ui-localization.md b/docs/dev-guide/ui-localization.md index 8ea036ce8e..295ae387b5 100644 --- a/docs/dev-guide/ui-localization.md +++ b/docs/dev-guide/ui-localization.md @@ -2,7 +2,7 @@ ## Translate the standard UI -To make collaboration and synchronisation easier, the English source locale from the `dev` branch is automatically imported to [Transifex](https://www.transifex.com/vuejs/vue-cli/dashboard/), a platform for collaborative translation. +To make collaboration and synchronization easier, the English source locale from the `dev` branch is automatically imported to [Transifex](https://www.transifex.com/vuejs/vue-cli/dashboard/), a platform for collaborative translation. For existing languages, you can [sign up as a translator](https://www.transifex.com/vuejs/vue-cli/dashboard/). For new languages, you can [request the new language](https://www.transifex.com/vuejs/vue-cli/dashboard/) after signing up. diff --git a/docs/guide/deployment.md b/docs/guide/deployment.md index 2dbd89dc54..a8199cb9a2 100644 --- a/docs/guide/deployment.md +++ b/docs/guide/deployment.md @@ -130,7 +130,7 @@ pages: # the job must be named pages - npm run build - mv public public-vue # GitLab Pages hooks on the public folder - mv dist public # rename the dist folder (result of npm run build) - # optionally, you can activate gzip support wih the following line: + # optionally, you can activate gzip support with the following line: - find public -type f -regex '.*\.\(htm\|html\|txt\|text\|js\|css\)$' -exec gzip -f -k {} \; artifacts: paths: diff --git a/packages/@vue/babel-preset-app/index.js b/packages/@vue/babel-preset-app/index.js index ab8722f75c..a70ca12061 100644 --- a/packages/@vue/babel-preset-app/index.js +++ b/packages/@vue/babel-preset-app/index.js @@ -95,7 +95,7 @@ module.exports = (context, options = {}) => { const plugins = [] const defaultEntryFiles = JSON.parse(process.env.VUE_CLI_ENTRY_FILES || '[]') - // Though in the vue-cli repo, we only use the two envrionment variables + // Though in the vue-cli repo, we only use the two environment variables // for tests, users may have relied on them for some features, // dropping them may break some projects. // So in the following blocks we don't directly test the `NODE_ENV`. diff --git a/packages/@vue/cli-plugin-e2e-nightwatch/__tests__/lib/globals-generated.js b/packages/@vue/cli-plugin-e2e-nightwatch/__tests__/lib/globals-generated.js index 3f3139b2d6..d55c671040 100644 --- a/packages/@vue/cli-plugin-e2e-nightwatch/__tests__/lib/globals-generated.js +++ b/packages/@vue/cli-plugin-e2e-nightwatch/__tests__/lib/globals-generated.js @@ -1,5 +1,5 @@ /** - * This file is copied during the test inside the project folder and used to inpsect the results + * This file is copied during the test inside the project folder and used to inspect the results */ const fs = require('fs') diff --git a/packages/@vue/cli-plugin-eslint/generator/index.js b/packages/@vue/cli-plugin-eslint/generator/index.js index 042c4fdf56..2af82ed749 100644 --- a/packages/@vue/cli-plugin-eslint/generator/index.js +++ b/packages/@vue/cli-plugin-eslint/generator/index.js @@ -43,7 +43,7 @@ module.exports = (api, { config, lintOn = [] }, _, invoking) => { pkg.gitHooks = { 'pre-commit': 'lint-staged' } - const extentions = require('../eslintOptions').extensions(api) + const extensions = require('../eslintOptions').extensions(api) .map(ext => ext.replace(/^\./, '')) // remove the leading `.` pkg['lint-staged'] = { [`*.{${extentions.join(',')}}`]: ['vue-cli-service lint', 'git add'] diff --git a/packages/@vue/cli-plugin-typescript/__tests__/tsPluginTSLint.spec.js b/packages/@vue/cli-plugin-typescript/__tests__/tsPluginTSLint.spec.js index a487e70241..cb82ea30fa 100644 --- a/packages/@vue/cli-plugin-typescript/__tests__/tsPluginTSLint.spec.js +++ b/packages/@vue/cli-plugin-typescript/__tests__/tsPluginTSLint.spec.js @@ -106,7 +106,7 @@ test('should be able to fix mixed line endings', async () => { await write('src/bad.vue', buf) // Try twice to fix the file. - // For now, it will fail the first time, which corresponds to the behaviour of tslint. + // For now, it will fail the first time, which corresponds to the behavior of tslint. try { await run('vue-cli-service lint -- src/bad.vue') } catch (e) { } diff --git a/packages/@vue/cli-service/lib/config/terserOptions.js b/packages/@vue/cli-service/lib/config/terserOptions.js index f4eeb87264..aef50d590b 100644 --- a/packages/@vue/cli-service/lib/config/terserOptions.js +++ b/packages/@vue/cli-service/lib/config/terserOptions.js @@ -19,7 +19,7 @@ module.exports = options => ({ toplevel: false, typeofs: false, - // a few flags with noticable gains/speed ratio + // a few flags with noticeable gains/speed ratio // numbers based on out of the box vendor bundle booleans: true, // 0.7kb if_return: true, // 0.4kb diff --git a/packages/@vue/cli-service/lib/util/resolveLoaderError.js b/packages/@vue/cli-service/lib/util/resolveLoaderError.js index 4d43eff724..ba037a067e 100644 --- a/packages/@vue/cli-service/lib/util/resolveLoaderError.js +++ b/packages/@vue/cli-service/lib/util/resolveLoaderError.js @@ -20,7 +20,7 @@ exports.transformer = error => { const match = message.match(re) if (match) { return Object.assign({}, error, { - // type is necessary to avoid being printed as defualt error + // type is necessary to avoid being printed as default error // by friendly-error-webpack-plugin type, shortMessage: msg(error, match) diff --git a/packages/@vue/cli/__tests__/invoke.spec.js b/packages/@vue/cli/__tests__/invoke.spec.js index cb7f883e86..a74920488e 100644 --- a/packages/@vue/cli/__tests__/invoke.spec.js +++ b/packages/@vue/cli/__tests__/invoke.spec.js @@ -150,7 +150,7 @@ test('invoking a plugin that renames files', async () => { expect(project.has('src/main.js')).toBe(false) }) -test('should prompt if invoking in a git repository with uncommited changes', async () => { +test('should prompt if invoking in a git repository with uncommitted changes', async () => { delete process.env.VUE_CLI_SKIP_DIRTY_GIT_PROMPT const project = await create('invoke-dirty', { plugins: { diff --git a/packages/@vue/cli/lib/GeneratorAPI.js b/packages/@vue/cli/lib/GeneratorAPI.js index fdf40fe3dd..f7ea81b638 100644 --- a/packages/@vue/cli/lib/GeneratorAPI.js +++ b/packages/@vue/cli/lib/GeneratorAPI.js @@ -227,7 +227,7 @@ class GeneratorAPI { warnIncompatibleVersions: true } - // this condition statement is added for compatiblity reason, because + // this condition statement is added for compatibility reason, because // in version 4.0.0 to 4.1.2, there's no `options` object, but a `forceNewVersion` flag if (typeof options === 'boolean') { extendOptions.warnIncompatibleVersions = !options diff --git a/packages/@vue/cli/lib/util/confirmIfGitDirty.js b/packages/@vue/cli/lib/util/confirmIfGitDirty.js index b9db1fbc49..5caf2b1a40 100644 --- a/packages/@vue/cli/lib/util/confirmIfGitDirty.js +++ b/packages/@vue/cli/lib/util/confirmIfGitDirty.js @@ -21,7 +21,7 @@ module.exports = async function confirmIfGitDirty (context) { return true } - warn(`There are uncommited changes in the current repository, it's recommended to commit or stash them first.`) + warn(`There are uncommitted changes in the current repository, it's recommended to commit or stash them first.`) const { ok } = await inquirer.prompt([ { name: 'ok', From 2de324074719100344c66715c5e62ea8d5b3c79d Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Mon, 10 Aug 2020 00:03:32 +0800 Subject: [PATCH 2/2] Update index.js --- packages/@vue/cli-plugin-eslint/generator/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@vue/cli-plugin-eslint/generator/index.js b/packages/@vue/cli-plugin-eslint/generator/index.js index 2af82ed749..cb0526f901 100644 --- a/packages/@vue/cli-plugin-eslint/generator/index.js +++ b/packages/@vue/cli-plugin-eslint/generator/index.js @@ -46,7 +46,7 @@ module.exports = (api, { config, lintOn = [] }, _, invoking) => { const extensions = require('../eslintOptions').extensions(api) .map(ext => ext.replace(/^\./, '')) // remove the leading `.` pkg['lint-staged'] = { - [`*.{${extentions.join(',')}}`]: ['vue-cli-service lint', 'git add'] + [`*.{${extensions.join(',')}}`]: ['vue-cli-service lint', 'git add'] } }