Skip to content

Commit d30bc2d

Browse files
GulajavaMinistudioGulajavaMinistudio
authored
Merge pull request #20 from vuejs/dev
withInfo show functions
2 parents f926787 + 2ce1fc0 commit d30bc2d

File tree

41 files changed

+464
-141
lines changed

Some content is hidden

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

41 files changed

+464
-141
lines changed

‎package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,22 @@
4343
]
4444
},
4545
"devDependencies": {
46-
"@babel/core": "^7.4.4",
46+
"@babel/core": "^7.4.5",
4747
"@vuepress/plugin-pwa": "^1.0.0-alpha.48",
4848
"@vuepress/theme-vue": "^1.0.0-alpha.48",
4949
"babel-core": "7.0.0-bridge.0",
5050
"babel-eslint": "^10.0.1",
51-
"babel-jest": "^24.7.1",
51+
"babel-jest": "^24.8.0",
5252
"chromedriver": "^74.0.0",
5353
"debug": "^4.1.0",
5454
"eslint": "^5.16.0",
5555
"eslint-plugin-graphql": "^3.0.3",
56-
"eslint-plugin-node": "^9.0.1",
56+
"eslint-plugin-node": "^9.1.0",
5757
"eslint-plugin-vue": "^5.2.2",
5858
"eslint-plugin-vue-libs": "^3.0.0",
5959
"execa": "^1.0.0",
6060
"globby": "^9.2.0",
61-
"graphql": "^14.2.1",
61+
"graphql": "^14.3.1",
6262
"http-server": "^0.11.1",
6363
"inquirer": "^6.3.1",
6464
"jest": "^24.7.1",
@@ -70,7 +70,7 @@
7070
"request": "^2.83.0",
7171
"request-promise-native": "^1.0.7",
7272
"rimraf": "^2.6.2",
73-
"semver": "^6.0.0",
73+
"semver": "^6.1.0",
7474
"typescript": "^3.4.5",
7575
"vuepress": "1.0.0-alpha.47",
7676
"webpack": ">=4 < 4.29",

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
2929
"@babel/plugin-syntax-jsx": "^7.0.0",
3030
"@babel/plugin-transform-runtime": "^7.4.3",
31-
"@babel/preset-env": "^7.4.3",
32-
"@babel/runtime": "^7.4.3",
33-
"@babel/runtime-corejs3": "^7.4.3",
31+
"@babel/preset-env": "^7.4.5",
32+
"@babel/runtime": "^7.4.5",
33+
"@babel/runtime-corejs3": "^7.4.5",
3434
"@vue/babel-preset-jsx": "^1.0.0",
3535
"babel-plugin-dynamic-import-node": "^2.2.0",
3636
"babel-plugin-module-resolver": "^3.2.0",
37-
"core-js": "^3.0.1",
38-
"core-js-compat": "^3.0.1"
37+
"core-js": "^3.1.2",
38+
"core-js-compat": "^3.1.2"
3939
}
4040
}

‎packages/@vue/cli-plugin-babel/generator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = api => {
1010
presets: ['@vue/app']
1111
},
1212
dependencies: {
13-
'core-js': '^3.0.1'
13+
'core-js': '^3.1.2'
1414
}
1515
})
1616
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
},
2121
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-babel#readme",
2222
"dependencies": {
23-
"@babel/core": "^7.4.4",
23+
"@babel/core": "^7.4.5",
2424
"@vue/babel-preset-app": "^4.0.0-alpha.0",
2525
"@vue/cli-shared-utils": "^4.0.0-alpha.0",
26-
"babel-loader": "^8.0.5",
26+
"babel-loader": "^8.0.6",
2727
"webpack": ">=4 < 4.29"
2828
},
2929
"publishConfig": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"dependencies": {
2626
"@vue/cli-shared-utils": "^4.0.0-alpha.0",
27-
"cypress": "^3.2.0",
27+
"cypress": "^3.3.1",
2828
"eslint-plugin-cypress": "^2.2.1"
2929
}
3030
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@vue/cli-shared-utils": "^4.0.0-alpha.0",
2727
"deepmerge": "^3.2.0",
2828
"execa": "^1.0.0",
29-
"nightwatch": "^1.0.19",
29+
"nightwatch": "^1.1.11",
3030
"selenium-server": "^3.141.59"
3131
},
3232
"devDependencies": {

‎packages/@vue/cli-plugin-pwa/__tests__/pwaPlugin.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jest.setTimeout(50000)
22

33
const path = require('path')
44
const portfinder = require('portfinder')
5-
const { createServer } = require('http-server')
5+
const createServer = require('@vue/cli-test-utils/createServer')
66
const { defaultPreset } = require('@vue/cli/lib/options')
77
const create = require('@vue/cli-test-utils/createTestProject')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

‎packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ const defaults = {
88
appleMobileWebAppStatusBarStyle: 'default',
99
assetsVersion: '',
1010
manifestPath: 'manifest.json',
11-
manifestOptions: {}
11+
manifestOptions: {},
12+
manifestCrossorigin: undefined
1213
}
1314

1415
const defaultManifest = {
@@ -61,7 +62,8 @@ module.exports = class HtmlPwaPlugin {
6162
appleMobileWebAppStatusBarStyle,
6263
assetsVersion,
6364
manifestPath,
64-
iconPaths
65+
iconPaths,
66+
manifestCrossorigin
6567
} = this.options
6668
const { publicPath } = compiler.options.output
6769

@@ -83,10 +85,17 @@ module.exports = class HtmlPwaPlugin {
8385
}),
8486

8587
// Add to home screen for Android and modern mobile browsers
86-
makeTag('link', {
87-
rel: 'manifest',
88-
href: `${publicPath}${manifestPath}${assetsVersionStr}`
89-
}),
88+
makeTag('link', manifestCrossorigin
89+
? {
90+
rel: 'manifest',
91+
href: `${publicPath}${manifestPath}${assetsVersionStr}`,
92+
crossorigin: manifestCrossorigin
93+
}
94+
: {
95+
rel: 'manifest',
96+
href: `${publicPath}${manifestPath}${assetsVersionStr}`
97+
}
98+
),
9099
makeTag('meta', {
91100
name: 'theme-color',
92101
content: themeColor

‎packages/@vue/cli-plugin-pwa/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"dependencies": {
2626
"@vue/cli-shared-utils": "^4.0.0-alpha.0",
2727
"webpack": ">=4 < 4.29",
28-
"workbox-webpack-plugin": "^4.3.0"
28+
"workbox-webpack-plugin": "^4.3.1"
2929
},
3030
"devDependencies": {
3131
"register-service-worker": "^1.6.2"

‎packages/@vue/cli-plugin-pwa/ui.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,28 @@ module.exports = api => {
7676
description: 'org.vue.pwa.config.pwa.appleMobileWebAppStatusBarStyle.description',
7777
default: 'default',
7878
value: data.vue && data.vue.pwa && data.vue.pwa.appleMobileWebAppStatusBarStyle
79+
},
80+
{
81+
name: 'manifestCrossorigin',
82+
type: 'list',
83+
message: 'org.vue.pwa.config.pwa.manifestCrossorigin.message',
84+
description: 'org.vue.pwa.config.pwa.manifestCrossorigin.description',
85+
default: undefined,
86+
value: data.vue && data.vue.pwa && data.vue.pwa.manifestCrossorigin,
87+
choices: [
88+
{
89+
name: 'none',
90+
value: undefined
91+
},
92+
{
93+
name: 'anonymous',
94+
value: 'anonymous'
95+
},
96+
{
97+
name: 'use-credentials',
98+
value: 'use-credentials'
99+
}
100+
]
79101
}
80102
]
81103
}

‎packages/@vue/cli-plugin-typescript/__tests__/tsPlugin.helper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const path = require('path')
22
const portfinder = require('portfinder')
3-
const { createServer } = require('http-server')
3+
const createServer = require('@vue/cli-test-utils/createServer')
44
const create = require('@vue/cli-test-utils/createTestProject')
55
const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
66
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

‎packages/@vue/cli-plugin-typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"dependencies": {
2626
"@types/webpack-env": "^1.13.9",
2727
"@vue/cli-shared-utils": "^4.0.0-alpha.0",
28-
"fork-ts-checker-webpack-plugin": "^1.2.0",
28+
"fork-ts-checker-webpack-plugin": "^1.3.4",
2929
"globby": "^9.2.0",
3030
"ts-loader": "^6.0.1",
3131
"tslint": "^5.16.0",

‎packages/@vue/cli-plugin-unit-jest/generator/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ module.exports = (api, _, __, invoking) => {
5454
if (api.hasPlugin('babel')) {
5555
api.extendPackage({
5656
devDependencies: {
57-
'babel-jest': '^24.7.1',
58-
'@babel/core': '^7.4.4'
57+
'babel-jest': '^24.8.0',
58+
'@babel/core': '^7.4.5'
5959
}
6060
})
6161
} else {
@@ -105,7 +105,7 @@ const applyTS = (module.exports.applyTS = (api, invoking) => {
105105
},
106106
devDependencies: {
107107
// this is for now necessary to force ts-jest and vue-jest to use babel 7
108-
'@babel/core': '^7.4.4',
108+
'@babel/core': '^7.4.5',
109109
'babel-core': '7.0.0-bridge.0'
110110
}
111111
})

‎packages/@vue/cli-plugin-unit-jest/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
"access": "public"
2424
},
2525
"dependencies": {
26-
"@babel/core": "^7.4.4",
26+
"@babel/core": "^7.4.5",
2727
"@babel/plugin-transform-modules-commonjs": "^7.4.4",
2828
"@vue/cli-shared-utils": "^4.0.0-alpha.0",
2929
"babel-core": "7.0.0-bridge.0",
30-
"babel-jest": "^24.7.1",
31-
"jest": "^24.7.1",
30+
"babel-jest": "^24.8.0",
31+
"jest": "^24.8.0",
3232
"jest-serializer-vue": "^2.0.2",
3333
"jest-transform-stub": "^2.0.0",
34-
"jest-watch-typeahead": "^0.3.0",
34+
"jest-watch-typeahead": "^0.3.1",
3535
"vue-jest": "^3.0.4"
3636
},
3737
"devDependencies": {

‎packages/@vue/cli-plugin-unit-mocha/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-unit-mocha#readme",
2424
"dependencies": {
2525
"@vue/cli-shared-utils": "^4.0.0-alpha.0",
26-
"jsdom": "^15.0.0",
26+
"jsdom": "^15.1.0",
2727
"jsdom-global": "^3.0.2",
2828
"mocha": "^6.1.4",
2929
"mochapack": "^1.1.1"

‎packages/@vue/cli-service-global/__tests__/globalService.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jest.setTimeout(40000)
33
const fs = require('fs-extra')
44
const path = require('path')
55
const portfinder = require('portfinder')
6-
const { createServer } = require('http-server')
6+
const createServer = require('@vue/cli-test-utils/createServer')
77
const execa = require('execa')
88
const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
99
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

‎packages/@vue/cli-service-global/__tests__/globalServiceBuildLib.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jest.setTimeout(20000)
33
const fs = require('fs-extra')
44
const path = require('path')
55
const portfinder = require('portfinder')
6-
const { createServer } = require('http-server')
6+
const createServer = require('@vue/cli-test-utils/createServer')
77
const execa = require('execa')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
99

‎packages/@vue/cli-service-global/__tests__/globalServiceBuildWc.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jest.setTimeout(20000)
33
const fs = require('fs-extra')
44
const path = require('path')
55
const portfinder = require('portfinder')
6-
const { createServer } = require('http-server')
6+
const createServer = require('@vue/cli-test-utils/createServer')
77
const execa = require('execa')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
99

‎packages/@vue/cli-service-global/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
"@vue/cli-service": "^4.0.0-alpha.0",
2929
"babel-eslint": "^10.0.1",
3030
"chalk": "^2.4.2",
31-
"core-js": "^3.0.1",
31+
"core-js": "^3.1.2",
3232
"eslint": "^5.16.0",
3333
"eslint-plugin-vue": "^5.2.2",
3434
"regenerator-runtime": "^0.13.2",
35-
"resolve": "^1.10.1",
35+
"resolve": "^1.11.0",
3636
"vue": "^2.6.10",
3737
"vue-template-compiler": "^2.6.10"
3838
}

‎packages/@vue/cli-service/__tests__/build.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jest.setTimeout(30000)
22

33
const path = require('path')
44
const portfinder = require('portfinder')
5-
const { createServer } = require('http-server')
5+
const createServer = require('@vue/cli-test-utils/createServer')
66
const { defaultPreset } = require('@vue/cli/lib/options')
77
const create = require('@vue/cli-test-utils/createTestProject')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

‎packages/@vue/cli-service/__tests__/buildLib.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jest.setTimeout(40000)
22

33
const path = require('path')
44
const portfinder = require('portfinder')
5-
const { createServer } = require('http-server')
5+
const createServer = require('@vue/cli-test-utils/createServer')
66
const { defaultPreset } = require('@vue/cli/lib/options')
77
const create = require('@vue/cli-test-utils/createTestProject')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

‎packages/@vue/cli-service/__tests__/buildWc.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jest.setTimeout(30000)
22

33
const path = require('path')
44
const portfinder = require('portfinder')
5-
const { createServer } = require('http-server')
5+
const createServer = require('@vue/cli-test-utils/createServer')
66
const { defaultPreset } = require('@vue/cli/lib/options')
77
const create = require('@vue/cli-test-utils/createTestProject')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

‎packages/@vue/cli-service/__tests__/buildWcAsync.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jest.setTimeout(15000)
22

33
const path = require('path')
44
const portfinder = require('portfinder')
5-
const { createServer } = require('http-server')
5+
const createServer = require('@vue/cli-test-utils/createServer')
66
const { defaultPreset } = require('@vue/cli/lib/options')
77
const create = require('@vue/cli-test-utils/createTestProject')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

‎packages/@vue/cli-service/__tests__/cors.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jest.setTimeout(30000)
22

33
const path = require('path')
44
const portfinder = require('portfinder')
5-
const { createServer } = require('http-server')
5+
const createServer = require('@vue/cli-test-utils/createServer')
66
const { defaultPreset } = require('@vue/cli/lib/options')
77
const create = require('@vue/cli-test-utils/createTestProject')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

‎packages/@vue/cli-service/__tests__/modernMode.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jest.setTimeout(50000)
33
const fs = require('fs-extra')
44
const path = require('path')
55
const portfinder = require('portfinder')
6-
const { createServer } = require('http-server')
6+
const createServer = require('@vue/cli-test-utils/createServer')
77
const { defaultPreset } = require('@vue/cli/lib/options')
88
const create = require('@vue/cli-test-utils/createTestProject')
99
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

‎packages/@vue/cli-service/__tests__/multiPage.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jest.setTimeout(80000)
22

33
const path = require('path')
44
const portfinder = require('portfinder')
5-
const { createServer } = require('http-server')
5+
const createServer = require('@vue/cli-test-utils/createServer')
66
const { defaultPreset } = require('@vue/cli/lib/options')
77
const create = require('@vue/cli-test-utils/createTestProject')
88
const serve = require('@vue/cli-test-utils/serveWithPuppeteer')

‎packages/@vue/cli-service/generator/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = (api, options) => {
1212
'vue': '^2.6.10'
1313
},
1414
devDependencies: {
15-
'vue-template-compiler': '^2.5.21'
15+
'vue-template-compiler': '^2.6.10'
1616
},
1717
'postcss': {
1818
'plugins': {

‎packages/@vue/cli-service/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
"acorn-walk": "^6.1.1",
3535
"address": "^1.1.0",
3636
"autoprefixer": "^9.5.1",
37-
"browserslist": "^4.5.5",
38-
"cache-loader": "^3.0.0",
37+
"browserslist": "^4.6.0",
38+
"cache-loader": "^3.0.1",
3939
"case-sensitive-paths-webpack-plugin": "^2.2.0",
4040
"chalk": "^2.4.2",
41-
"cli-highlight": "^2.1.0",
41+
"cli-highlight": "^2.1.1",
4242
"clipboardy": "^2.0.0",
4343
"cliui": "^5.0.0",
4444
"copy-webpack-plugin": "^5.0.3",
@@ -63,12 +63,12 @@
6363
"portfinder": "^1.0.20",
6464
"postcss-loader": "^3.0.0",
6565
"read-pkg": "^5.1.1",
66-
"semver": "^6.0.0",
66+
"semver": "^6.1.0",
6767
"slash": "^3.0.0",
6868
"source-map-url": "^0.4.0",
6969
"ssri": "^6.0.1",
7070
"string.prototype.padend": "^3.0.0",
71-
"terser-webpack-plugin": "^1.2.3",
71+
"terser-webpack-plugin": "^1.3.0",
7272
"thread-loader": "^2.1.2",
7373
"url-loader": "^1.1.2",
7474
"vue-loader": "^15.7.0",

0 commit comments

Comments
 (0)