Skip to content

Commit 19c0f5e

Browse files
Merge pull request #18 from vuejs/dev
Rollup of 8 pull requests
2 parents 6158cbe + 649b564 commit 19c0f5e

File tree

15 files changed

+2509
-5059
lines changed

15 files changed

+2509
-5059
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ module.exports = {
1717
}],
1818
"node/no-extraneous-require": ["error", {
1919
"allowModules": [
20+
"@vue/cli-service",
2021
"@vue/cli-test-utils"
2122
]
2223
}]

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@
4444
},
4545
"devDependencies": {
4646
"@babel/core": "^7.4.4",
47-
"@vuepress/plugin-pwa": "^1.0.0-alpha.47",
48-
"@vuepress/theme-vue": "1.0.0-alpha.44",
47+
"@vuepress/plugin-pwa": "^1.0.0-alpha.48",
48+
"@vuepress/theme-vue": "^1.0.0-alpha.48",
4949
"babel-core": "7.0.0-bridge.0",
5050
"babel-eslint": "^10.0.1",
5151
"babel-jest": "^24.7.1",
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": "^8.0.0",
56+
"eslint-plugin-node": "^9.0.1",
5757
"eslint-plugin-vue": "^5.2.2",
5858
"eslint-plugin-vue-libs": "^3.0.0",
5959
"execa": "^1.0.0",

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ const defaults = {
1414
const defaultManifest = {
1515
icons: [
1616
{
17-
"src": "./img/icons/android-chrome-192x192.png",
18-
"sizes": "192x192",
19-
"type": "image/png"
17+
'src': './img/icons/android-chrome-192x192.png',
18+
'sizes': '192x192',
19+
'type': 'image/png'
2020
},
2121
{
22-
"src": "./img/icons/android-chrome-512x512.png",
23-
"sizes": "512x512",
24-
"type": "image/png"
22+
'src': './img/icons/android-chrome-512x512.png',
23+
'sizes': '512x512',
24+
'type': 'image/png'
2525
}
2626
],
2727
start_url: '.',
2828
display: 'standalone',
29-
background_color: "#000000"
29+
background_color: '#000000'
3030
}
3131

3232
const defaultIconPaths = {
@@ -128,8 +128,6 @@ module.exports = class HtmlPwaPlugin {
128128

129129
cb(null, data)
130130
})
131-
132-
133131
})
134132

135133
compiler.hooks.emit.tapAsync(ID, (data, cb) => {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@vue/cli-shared-utils": "^4.0.0-alpha.0",
2828
"fork-ts-checker-webpack-plugin": "^1.2.0",
2929
"globby": "^9.2.0",
30-
"ts-loader": "^5.4.4",
30+
"ts-loader": "^6.0.1",
3131
"tslint": "^5.16.0",
3232
"webpack": ">=4 < 4.29"
3333
},

packages/@vue/cli-service-global/lib/globalConfigPlugin.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ module.exports = function createConfigPlugin (context, entry, asLib) {
4848
resolve.sync('vue-hot-reload-api', { basedir: context })
4949
} catch (e) {
5050
config.resolve.alias
51+
// eslint-disable-next-line node/no-extraneous-require
5152
.set('vue-hot-reload-api', require.resolve('vue-hot-reload-api'))
5253
}
5354

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@
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",
3132
"eslint": "^5.16.0",
3233
"eslint-plugin-vue": "^5.2.2",
34+
"regenerator-runtime": "^0.13.2",
3335
"resolve": "^1.10.1",
3436
"vue": "^2.6.10",
3537
"vue-template-compiler": "^2.6.10"

packages/@vue/cli-service/lib/config/dev.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ module.exports = (api, options) => {
1111
.use(require('webpack/lib/HotModuleReplacementPlugin'))
1212

1313
// https://github.com/webpack/webpack/issues/6642
14+
// https://github.com/vuejs/vue-cli/issues/3539
1415
webpackConfig
1516
.output
16-
.globalObject('this')
17+
.globalObject(`(typeof self !== 'undefined' ? self : this)`)
1718

1819
if (!process.env.VUE_CLI_TEST && options.devServer.progress !== false) {
1920
webpackConfig

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"cssnano": "^4.1.10",
4747
"current-script-polyfill": "^1.0.0",
4848
"debug": "^4.1.1",
49-
"dotenv": "^7.0.0",
49+
"dotenv": "^8.0.0",
5050
"dotenv-expand": "^5.1.0",
5151
"file-loader": "^3.0.1",
5252
"fs-extra": "^7.0.1",

packages/@vue/cli-shared-utils/lib/openBrowser.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
*
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file at
6-
* https://github.com/facebookincubator/create-react-app/blob/master/LICENSE
6+
* https://github.com/facebook/create-react-app/blob/master/LICENSE
77
*/
88

9-
const opn = require('opn')
9+
const open = require('open')
1010
const execa = require('execa')
1111
const chalk = require('chalk')
1212
const execSync = require('child_process').execSync
1313

14-
// https://github.com/sindresorhus/opn#app
14+
// https://github.com/sindresorhus/open#app
1515
const OSX_CHROME = 'google chrome'
1616

1717
const Actions = Object.freeze({
@@ -23,7 +23,7 @@ const Actions = Object.freeze({
2323
function getBrowserEnv () {
2424
// Attempt to honor this environment variable.
2525
// It is specific to the operating system.
26-
// See https://github.com/sindresorhus/opn#app for documentation.
26+
// See https://github.com/sindresorhus/open#app for documentation.
2727
const value = process.env.BROWSER
2828
let action
2929
if (!value) {
@@ -85,26 +85,26 @@ function startBrowserProcess (browser, url) {
8585
}
8686

8787
// Another special case: on OS X, check if BROWSER has been set to "open".
88-
// In this case, instead of passing `open` to `opn` (which won't work),
88+
// In this case, instead of passing the string `open` to `open` function (which won't work),
8989
// just ignore it (thus ensuring the intended behavior, i.e. opening the system browser):
90-
// https://github.com/facebookincubator/create-react-app/pull/1690#issuecomment-283518768
90+
// https://github.com/facebook/create-react-app/pull/1690#issuecomment-283518768
9191
if (process.platform === 'darwin' && browser === 'open') {
9292
browser = undefined
9393
}
9494

95-
// Fallback to opn
95+
// Fallback to open
9696
// (It will always open new tab)
9797
try {
9898
var options = { app: browser }
99-
opn(url, options).catch(() => {}) // Prevent `unhandledRejection` error.
99+
open(url, options).catch(() => {}) // Prevent `unhandledRejection` error.
100100
return true
101101
} catch (err) {
102102
return false
103103
}
104104
}
105105

106106
/**
107-
* Reads the BROWSER evironment variable and decides what to do with it. Returns
107+
* Reads the BROWSER environment variable and decides what to do with it. Returns
108108
* true if it opened a browser or ran a node.js script, otherwise false.
109109
*/
110110
exports.openBrowser = function (url) {

packages/@vue/cli-shared-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"launch-editor": "^2.2.1",
2727
"lru-cache": "^5.1.1",
2828
"node-ipc": "^9.1.1",
29-
"opn": "^5.3.0",
29+
"open": "^6.3.0",
3030
"ora": "^3.4.0",
3131
"request": "^2.87.0",
3232
"request-promise-native": "^1.0.7",

packages/@vue/cli/lib/GeneratorAPI.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const ejs = require('ejs')
33
const path = require('path')
44
const merge = require('deepmerge')
55
const resolve = require('resolve')
6-
const isBinary = require('isbinaryfile')
6+
const { isBinaryFileSync } = require('isbinaryfile')
77
const mergeDeps = require('./util/mergeDeps')
88
const stringifyJS = require('./util/stringifyJS')
99
const ConfigTransform = require('./ConfigTransform')
@@ -308,7 +308,7 @@ function extractCallDir () {
308308
const replaceBlockRE = /<%# REPLACE %>([^]*?)<%# END_REPLACE %>/g
309309

310310
function renderFile (name, data, ejsOptions) {
311-
if (isBinary.sync(name)) {
311+
if (isBinaryFileSync(name)) {
312312
return fs.readFileSync(name) // return buffer
313313
}
314314
const template = fs.readFileSync(name, 'utf-8')

packages/@vue/cli/lib/invoke.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const execa = require('execa')
44
const chalk = require('chalk')
55
const globby = require('globby')
66
const inquirer = require('inquirer')
7-
const isBinary = require('isbinaryfile')
7+
const { isBinaryFileSync } = require('isbinaryfile')
88
const Generator = require('./Generator')
99
const { loadOptions } = require('./options')
1010
const { installDeps } = require('./util/installDeps')
@@ -32,7 +32,7 @@ async function readFiles (context) {
3232
const res = {}
3333
for (const file of files) {
3434
const name = path.resolve(context, file)
35-
res[file] = isBinary.sync(name)
35+
res[file] = isBinaryFileSync(name)
3636
? fs.readFileSync(name)
3737
: fs.readFileSync(name, 'utf-8')
3838
}

packages/@vue/cli/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
"globby": "^9.2.0",
4343
"import-global": "^0.1.0",
4444
"inquirer": "^6.3.1",
45-
"isbinaryfile": "^3.0.2",
45+
"isbinaryfile": "^4.0.0",
4646
"javascript-stringify": "^1.6.0",
4747
"js-yaml": "^3.13.1",
4848
"jscodeshift": "^0.6.4",
4949
"lodash.clonedeep": "^4.5.0",
5050
"minimist": "^1.2.0",
51-
"recast": "^0.17.6",
51+
"recast": "^0.18.1",
5252
"request": "^2.87.0",
5353
"request-promise-native": "^1.0.7",
5454
"resolve": "^1.10.1",

packages/@vue/eslint-config-standard/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"dependencies": {
2525
"eslint-config-standard": "^12.0.0",
2626
"eslint-plugin-import": "^2.17.2",
27-
"eslint-plugin-node": "^8.0.1",
27+
"eslint-plugin-node": "^9.0.1",
2828
"eslint-plugin-promise": "^4.1.1",
2929
"eslint-plugin-standard": "^4.0.0"
3030
}

0 commit comments

Comments
 (0)