Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,22 @@
]
},
"devDependencies": {
"@babel/core": "^7.4.4",
"@babel/core": "^7.4.5",
"@vuepress/plugin-pwa": "^1.0.0-alpha.48",
"@vuepress/theme-vue": "^1.0.0-alpha.48",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.7.1",
"babel-jest": "^24.8.0",
"chromedriver": "^74.0.0",
"debug": "^4.1.0",
"eslint": "^5.16.0",
"eslint-plugin-graphql": "^3.0.3",
"eslint-plugin-node": "^9.0.1",
"eslint-plugin-node": "^9.1.0",
"eslint-plugin-vue": "^5.2.2",
"eslint-plugin-vue-libs": "^3.0.0",
"execa": "^1.0.0",
"globby": "^9.2.0",
"graphql": "^14.2.1",
"graphql": "^14.3.1",
"http-server": "^0.11.1",
"inquirer": "^6.3.1",
"jest": "^24.7.1",
Expand All @@ -70,7 +70,7 @@
"request": "^2.83.0",
"request-promise-native": "^1.0.7",
"rimraf": "^2.6.2",
"semver": "^6.0.0",
"semver": "^6.1.0",
"typescript": "^3.4.5",
"vuepress": "1.0.0-alpha.47",
"webpack": ">=4 < 4.29",
Expand Down
10 changes: 5 additions & 5 deletions packages/@vue/babel-preset-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-syntax-jsx": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.4.3",
"@babel/preset-env": "^7.4.3",
"@babel/runtime": "^7.4.3",
"@babel/runtime-corejs3": "^7.4.3",
"@babel/preset-env": "^7.4.5",
"@babel/runtime": "^7.4.5",
"@babel/runtime-corejs3": "^7.4.5",
"@vue/babel-preset-jsx": "^1.0.0",
"babel-plugin-dynamic-import-node": "^2.2.0",
"babel-plugin-module-resolver": "^3.2.0",
"core-js": "^3.0.1",
"core-js-compat": "^3.0.1"
"core-js": "^3.1.2",
"core-js-compat": "^3.1.2"
}
}
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-babel/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = api => {
presets: ['@vue/app']
},
dependencies: {
'core-js': '^3.0.1'
'core-js': '^3.1.2'
}
})
}
4 changes: 2 additions & 2 deletions packages/@vue/cli-plugin-babel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
},
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-babel#readme",
"dependencies": {
"@babel/core": "^7.4.4",
"@babel/core": "^7.4.5",
"@vue/babel-preset-app": "^4.0.0-alpha.0",
"@vue/cli-shared-utils": "^4.0.0-alpha.0",
"babel-loader": "^8.0.5",
"babel-loader": "^8.0.6",
"webpack": ">=4 < 4.29"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-e2e-cypress/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"dependencies": {
"@vue/cli-shared-utils": "^4.0.0-alpha.0",
"cypress": "^3.2.0",
"cypress": "^3.3.1",
"eslint-plugin-cypress": "^2.2.1"
}
}
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-e2e-nightwatch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@vue/cli-shared-utils": "^4.0.0-alpha.0",
"deepmerge": "^3.2.0",
"execa": "^1.0.0",
"nightwatch": "^1.0.19",
"nightwatch": "^1.1.11",
"selenium-server": "^3.141.59"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-pwa/__tests__/pwaPlugin.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ jest.setTimeout(50000)

const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
21 changes: 15 additions & 6 deletions packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ const defaults = {
appleMobileWebAppStatusBarStyle: 'default',
assetsVersion: '',
manifestPath: 'manifest.json',
manifestOptions: {}
manifestOptions: {},
manifestCrossorigin: undefined
}

const defaultManifest = {
Expand Down Expand Up @@ -61,7 +62,8 @@ module.exports = class HtmlPwaPlugin {
appleMobileWebAppStatusBarStyle,
assetsVersion,
manifestPath,
iconPaths
iconPaths,
manifestCrossorigin
} = this.options
const { publicPath } = compiler.options.output

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

// Add to home screen for Android and modern mobile browsers
makeTag('link', {
rel: 'manifest',
href: `${publicPath}${manifestPath}${assetsVersionStr}`
}),
makeTag('link', manifestCrossorigin
? {
rel: 'manifest',
href: `${publicPath}${manifestPath}${assetsVersionStr}`,
crossorigin: manifestCrossorigin
}
: {
rel: 'manifest',
href: `${publicPath}${manifestPath}${assetsVersionStr}`
}
),
makeTag('meta', {
name: 'theme-color',
content: themeColor
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-pwa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"dependencies": {
"@vue/cli-shared-utils": "^4.0.0-alpha.0",
"webpack": ">=4 < 4.29",
"workbox-webpack-plugin": "^4.3.0"
"workbox-webpack-plugin": "^4.3.1"
},
"devDependencies": {
"register-service-worker": "^1.6.2"
Expand Down
22 changes: 22 additions & 0 deletions packages/@vue/cli-plugin-pwa/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,28 @@ module.exports = api => {
description: 'org.vue.pwa.config.pwa.appleMobileWebAppStatusBarStyle.description',
default: 'default',
value: data.vue && data.vue.pwa && data.vue.pwa.appleMobileWebAppStatusBarStyle
},
{
name: 'manifestCrossorigin',
type: 'list',
message: 'org.vue.pwa.config.pwa.manifestCrossorigin.message',
description: 'org.vue.pwa.config.pwa.manifestCrossorigin.description',
default: undefined,
value: data.vue && data.vue.pwa && data.vue.pwa.manifestCrossorigin,
choices: [
{
name: 'none',
value: undefined
},
{
name: 'anonymous',
value: 'anonymous'
},
{
name: 'use-credentials',
value: 'use-credentials'
}
]
}
]
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const create = require('@vue/cli-test-utils/createTestProject')
const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"dependencies": {
"@types/webpack-env": "^1.13.9",
"@vue/cli-shared-utils": "^4.0.0-alpha.0",
"fork-ts-checker-webpack-plugin": "^1.2.0",
"fork-ts-checker-webpack-plugin": "^1.3.4",
"globby": "^9.2.0",
"ts-loader": "^6.0.1",
"tslint": "^5.16.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/@vue/cli-plugin-unit-jest/generator/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ module.exports = (api, _, __, invoking) => {
if (api.hasPlugin('babel')) {
api.extendPackage({
devDependencies: {
'babel-jest': '^24.7.1',
'@babel/core': '^7.4.4'
'babel-jest': '^24.8.0',
'@babel/core': '^7.4.5'
}
})
} else {
Expand Down Expand Up @@ -105,7 +105,7 @@ const applyTS = (module.exports.applyTS = (api, invoking) => {
},
devDependencies: {
// this is for now necessary to force ts-jest and vue-jest to use babel 7
'@babel/core': '^7.4.4',
'@babel/core': '^7.4.5',
'babel-core': '7.0.0-bridge.0'
}
})
Expand Down
8 changes: 4 additions & 4 deletions packages/@vue/cli-plugin-unit-jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"access": "public"
},
"dependencies": {
"@babel/core": "^7.4.4",
"@babel/core": "^7.4.5",
"@babel/plugin-transform-modules-commonjs": "^7.4.4",
"@vue/cli-shared-utils": "^4.0.0-alpha.0",
"babel-core": "7.0.0-bridge.0",
"babel-jest": "^24.7.1",
"jest": "^24.7.1",
"babel-jest": "^24.8.0",
"jest": "^24.8.0",
"jest-serializer-vue": "^2.0.2",
"jest-transform-stub": "^2.0.0",
"jest-watch-typeahead": "^0.3.0",
"jest-watch-typeahead": "^0.3.1",
"vue-jest": "^3.0.4"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-unit-mocha/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-unit-mocha#readme",
"dependencies": {
"@vue/cli-shared-utils": "^4.0.0-alpha.0",
"jsdom": "^15.0.0",
"jsdom": "^15.1.0",
"jsdom-global": "^3.0.2",
"mocha": "^6.1.4",
"mochapack": "^1.1.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jest.setTimeout(40000)
const fs = require('fs-extra')
const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const execa = require('execa')
const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jest.setTimeout(20000)
const fs = require('fs-extra')
const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const execa = require('execa')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jest.setTimeout(20000)
const fs = require('fs-extra')
const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const execa = require('execa')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/cli-service-global/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
"@vue/cli-service": "^4.0.0-alpha.0",
"babel-eslint": "^10.0.1",
"chalk": "^2.4.2",
"core-js": "^3.0.1",
"core-js": "^3.1.2",
"eslint": "^5.16.0",
"eslint-plugin-vue": "^5.2.2",
"regenerator-runtime": "^0.13.2",
"resolve": "^1.10.1",
"resolve": "^1.11.0",
"vue": "^2.6.10",
"vue-template-compiler": "^2.6.10"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/__tests__/build.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ jest.setTimeout(30000)

const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/__tests__/buildLib.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ jest.setTimeout(40000)

const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/__tests__/buildWc.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ jest.setTimeout(30000)

const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/__tests__/buildWcAsync.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ jest.setTimeout(15000)

const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/__tests__/cors.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ jest.setTimeout(30000)

const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/__tests__/modernMode.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jest.setTimeout(50000)
const fs = require('fs-extra')
const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/__tests__/multiPage.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ jest.setTimeout(80000)

const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/generator/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = (api, options) => {
'vue': '^2.6.10'
},
devDependencies: {
'vue-template-compiler': '^2.5.21'
'vue-template-compiler': '^2.6.10'
},
'postcss': {
'plugins': {
Expand Down
10 changes: 5 additions & 5 deletions packages/@vue/cli-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
"acorn-walk": "^6.1.1",
"address": "^1.1.0",
"autoprefixer": "^9.5.1",
"browserslist": "^4.5.5",
"cache-loader": "^3.0.0",
"browserslist": "^4.6.0",
"cache-loader": "^3.0.1",
"case-sensitive-paths-webpack-plugin": "^2.2.0",
"chalk": "^2.4.2",
"cli-highlight": "^2.1.0",
"cli-highlight": "^2.1.1",
"clipboardy": "^2.0.0",
"cliui": "^5.0.0",
"copy-webpack-plugin": "^5.0.3",
Expand All @@ -63,12 +63,12 @@
"portfinder": "^1.0.20",
"postcss-loader": "^3.0.0",
"read-pkg": "^5.1.1",
"semver": "^6.0.0",
"semver": "^6.1.0",
"slash": "^3.0.0",
"source-map-url": "^0.4.0",
"ssri": "^6.0.1",
"string.prototype.padend": "^3.0.0",
"terser-webpack-plugin": "^1.2.3",
"terser-webpack-plugin": "^1.3.0",
"thread-loader": "^2.1.2",
"url-loader": "^1.1.2",
"vue-loader": "^15.7.0",
Expand Down
Loading