Skip to content

Commit 4f2c718

Browse files
author
Guillaume Chau
committed
chore: merge dev
2 parents 7482244 + 5bab29a commit 4f2c718

File tree

43 files changed

+308
-103
lines changed

Some content is hidden

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

43 files changed

+308
-103
lines changed

CHANGELOG.md

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,42 @@
1+
<a name="3.0.0-beta.11"></a>
2+
# [3.0.0-beta.11](https://github.com/vuejs/vue-cli/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2018-05-21)
3+
4+
5+
### Bug Fixes
6+
7+
* css sourceMap in production ([#1270](https://github.com/vuejs/vue-cli/issues/1270)) ([2d09a4c](https://github.com/vuejs/vue-cli/commit/2d09a4c))
8+
* **css:** css-loader importLoaders should account for vue-loader's injected ([853662c](https://github.com/vuejs/vue-cli/commit/853662c)), closes [#1267](https://github.com/vuejs/vue-cli/issues/1267)
9+
* fix babel.config.js compat in vue-jest ([48d7e00](https://github.com/vuejs/vue-cli/commit/48d7e00))
10+
* fix transpileDependencies by always using babel.config.js ([1279b3e](https://github.com/vuejs/vue-cli/commit/1279b3e))
11+
* **eslint:** ensure all config values are contained in config file ([83f5f4f](https://github.com/vuejs/vue-cli/commit/83f5f4f)), closes [#1006](https://github.com/vuejs/vue-cli/issues/1006) [#1313](https://github.com/vuejs/vue-cli/issues/1313)
12+
* fix ts/tsx rule separation ([41a56f1](https://github.com/vuejs/vue-cli/commit/41a56f1)), closes [#1315](https://github.com/vuejs/vue-cli/issues/1315)
13+
* handle failed git commit ([a1ccde8](https://github.com/vuejs/vue-cli/commit/a1ccde8)), closes [#1306](https://github.com/vuejs/vue-cli/issues/1306)
14+
* rename test-utils `shallow` to `shallowMount` ([#1269](https://github.com/vuejs/vue-cli/issues/1269)) ([5c54df7](https://github.com/vuejs/vue-cli/commit/5c54df7))
15+
* stringifyJS should be used in all call sites ([07ac887](https://github.com/vuejs/vue-cli/commit/07ac887))
16+
* typo in vue-loader compilerOptions ([#1263](https://github.com/vuejs/vue-cli/issues/1263)) ([b2b277a](https://github.com/vuejs/vue-cli/commit/b2b277a))
17+
18+
19+
### Features
20+
21+
* **build:** add 'watch' option ([#1332](https://github.com/vuejs/vue-cli/issues/1332)) ([6ea17c9](https://github.com/vuejs/vue-cli/commit/6ea17c9))
22+
* **cli-service:** add assetsDir option to specify assets root directory ([#1322](https://github.com/vuejs/vue-cli/issues/1322)) ([9638d90](https://github.com/vuejs/vue-cli/commit/9638d90)), closes [#1311](https://github.com/vuejs/vue-cli/issues/1311)
23+
* **eslint:** add --max-warnings and --max-errors for cli-plugin-eslint ([#1289](https://github.com/vuejs/vue-cli/issues/1289)) ([ab877a2](https://github.com/vuejs/vue-cli/commit/ab877a2)), closes [#1268](https://github.com/vuejs/vue-cli/issues/1268)
24+
* **eslint:** enable caching ([ff0f97b](https://github.com/vuejs/vue-cli/commit/ff0f97b))
25+
* **eslint:** pass cli arguments to linter ([#1258](https://github.com/vuejs/vue-cli/issues/1258)) ([9ac2642](https://github.com/vuejs/vue-cli/commit/9ac2642)), closes [#1255](https://github.com/vuejs/vue-cli/issues/1255)
26+
* **inspect:** add --rule and --plugin options for inspect command ([82349ba](https://github.com/vuejs/vue-cli/commit/82349ba))
27+
* **inspect:** add --rules and --plugins options for inspect command ([fd1c0d5](https://github.com/vuejs/vue-cli/commit/fd1c0d5))
28+
* support `<style lang="postcss">` ([#1259](https://github.com/vuejs/vue-cli/issues/1259)) ([1037b9c](https://github.com/vuejs/vue-cli/commit/1037b9c))
29+
* **inspect:** improve `vue inspect` output with webpack-chain hints ([f6bfb63](https://github.com/vuejs/vue-cli/commit/f6bfb63)), closes [#881](https://github.com/vuejs/vue-cli/issues/881)
30+
* allow disabling serve progress via devServer.progress ([da38747](https://github.com/vuejs/vue-cli/commit/da38747)), closes [#1284](https://github.com/vuejs/vue-cli/issues/1284)
31+
* allow router/vuex to be late added via `vue add` ([2a195f0](https://github.com/vuejs/vue-cli/commit/2a195f0)), closes [#1202](https://github.com/vuejs/vue-cli/issues/1202) [#1204](https://github.com/vuejs/vue-cli/issues/1204)
32+
* ask for whether to use taobao registry when getting versions ([#1273](https://github.com/vuejs/vue-cli/issues/1273)) ([8fbbd35](https://github.com/vuejs/vue-cli/commit/8fbbd35))
33+
* GeneratorAPI: addImports & addRootOptions ([8b32f4a](https://github.com/vuejs/vue-cli/commit/8b32f4a))
34+
* make it possible to opt-out of Babel ([d75ea99](https://github.com/vuejs/vue-cli/commit/d75ea99)), closes [#1199](https://github.com/vuejs/vue-cli/issues/1199)
35+
* support webp ([763cf7a](https://github.com/vuejs/vue-cli/commit/763cf7a)), closes [#1321](https://github.com/vuejs/vue-cli/issues/1321)
36+
* temporarily fix source map by patching babel ([453597a](https://github.com/vuejs/vue-cli/commit/453597a))
37+
38+
39+
140
<a name="3.0.0-beta.10"></a>
241
# [3.0.0-beta.10](https://github.com/vuejs/vue-cli/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2018-05-11)
342

@@ -54,7 +93,7 @@ modifications must be webpcak 4 compatible. Drop support
5493
for webpack plugins that do not work with v4 or above.
5594
* dll option has been removed.
5695
* the "vueLoader" option has been removed. To modify vue-loader
57-
options, use chainWebpack then `config.module.rule('vue').use('vue-loader').tap()`.
96+
options, use chainWebpack then `config.module.rule(vue).use(vue-loader).tap()`.
5897
vue-loader has been upgraded to v15 and expects different options from v14.
5998
* To include a dependency for Babel transpilation, tapping
6099
babel-loader and adding .include() will no longer work. Use the new

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"lerna": "2.5.1",
33
"npmClient": "yarn",
44
"useWorkspaces": true,
5-
"version": "3.0.0-beta.10"
5+
"version": "3.0.0-beta.11"
66
}

packages/@vue/babel-preset-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/babel-preset-app",
3-
"version": "3.0.0-beta.10",
3+
"version": "3.0.0-beta.11",
44
"description": "babel-preset-app for vue-cli",
55
"main": "index.js",
66
"publishConfig": {

packages/@vue/cli-init/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-init",
3-
"version": "3.0.0-beta.10",
3+
"version": "3.0.0-beta.11",
44
"description": "init addon for vue-cli",
55
"main": "index.js",
66
"publishConfig": {

packages/@vue/cli-overlay/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-overlay",
3-
"version": "3.0.0-beta.10",
3+
"version": "3.0.0-beta.11",
44
"description": "error overlay & dev server middleware for vue-cli",
55
"main": "dist/client.js",
66
"files": [

packages/@vue/cli-plugin-babel/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-babel",
3-
"version": "3.0.0-beta.10",
3+
"version": "3.0.0-beta.11",
44
"description": "babel plugin for vue-cli",
55
"main": "index.js",
66
"repository": {
@@ -20,7 +20,7 @@
2020
"homepage": "https://github.com/vuejs/vue-cli/packages/@vue/cli-plugin-babel#readme",
2121
"dependencies": {
2222
"@babel/core": "7.0.0-beta.47",
23-
"@vue/babel-preset-app": "^3.0.0-beta.10",
23+
"@vue/babel-preset-app": "^3.0.0-beta.11",
2424
"babel-loader": "^8.0.0-0"
2525
},
2626
"publishConfig": {

packages/@vue/cli-plugin-e2e-cypress/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-e2e-cypress",
3-
"version": "3.0.0-beta.10",
3+
"version": "3.0.0-beta.11",
44
"description": "e2e-cypress plugin for vue-cli",
55
"main": "index.js",
66
"repository": {

packages/@vue/cli-plugin-e2e-nightwatch/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-e2e-nightwatch",
3-
"version": "3.0.0-beta.10",
3+
"version": "3.0.0-beta.11",
44
"description": "e2e-nightwatch plugin for vue-cli",
55
"main": "index.js",
66
"repository": {

packages/@vue/cli-plugin-eslint/generator.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ module.exports = (api, { config, lintOn = [] }) => {
1616
if (config === 'airbnb') {
1717
eslintConfig.extends.push('@vue/airbnb')
1818
Object.assign(pkg.devDependencies, {
19-
'@vue/eslint-config-airbnb': '^3.0.0-beta.10'
19+
'@vue/eslint-config-airbnb': '^3.0.0-beta.11'
2020
})
2121
} else if (config === 'standard') {
2222
eslintConfig.extends.push('@vue/standard')
2323
Object.assign(pkg.devDependencies, {
24-
'@vue/eslint-config-standard': '^3.0.0-beta.10'
24+
'@vue/eslint-config-standard': '^3.0.0-beta.11'
2525
})
2626
} else if (config === 'prettier') {
2727
eslintConfig.extends.push('@vue/prettier')
2828
Object.assign(pkg.devDependencies, {
29-
'@vue/eslint-config-prettier': '^3.0.0-beta.10'
29+
'@vue/eslint-config-prettier': '^3.0.0-beta.11'
3030
})
3131
} else {
3232
// default
@@ -37,7 +37,7 @@ module.exports = (api, { config, lintOn = [] }) => {
3737
if (api.hasPlugin('typescript')) {
3838
eslintConfig.extends.push('@vue/typescript')
3939
Object.assign(pkg.devDependencies, {
40-
'@vue/eslint-config-typescript': '^3.0.0-beta.10'
40+
'@vue/eslint-config-typescript': '^3.0.0-beta.11'
4141
})
4242
}
4343

packages/@vue/cli-plugin-eslint/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-eslint",
3-
"version": "3.0.0-beta.10",
3+
"version": "3.0.0-beta.11",
44
"description": "eslint plugin for vue-cli",
55
"main": "index.js",
66
"repository": {

0 commit comments

Comments
 (0)