diff --git a/.eslintrc.js b/.eslintrc.js index 664363b257..ee496200f6 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -17,6 +17,7 @@ module.exports = { }], "node/no-extraneous-require": ["error", { "allowModules": [ + "@vue/cli-service", "@vue/cli-test-utils" ] }] diff --git a/packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js b/packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js index 68aa476c78..8839f24b44 100644 --- a/packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js +++ b/packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js @@ -14,19 +14,19 @@ const defaults = { const defaultManifest = { icons: [ { - "src": "./img/icons/android-chrome-192x192.png", - "sizes": "192x192", - "type": "image/png" + 'src': './img/icons/android-chrome-192x192.png', + 'sizes': '192x192', + 'type': 'image/png' }, { - "src": "./img/icons/android-chrome-512x512.png", - "sizes": "512x512", - "type": "image/png" + 'src': './img/icons/android-chrome-512x512.png', + 'sizes': '512x512', + 'type': 'image/png' } ], start_url: '.', display: 'standalone', - background_color: "#000000" + background_color: '#000000' } const defaultIconPaths = { @@ -128,8 +128,6 @@ module.exports = class HtmlPwaPlugin { cb(null, data) }) - - }) compiler.hooks.emit.tapAsync(ID, (data, cb) => { diff --git a/packages/@vue/cli-service-global/lib/globalConfigPlugin.js b/packages/@vue/cli-service-global/lib/globalConfigPlugin.js index 9fa8806c4e..72b4fa0bcc 100644 --- a/packages/@vue/cli-service-global/lib/globalConfigPlugin.js +++ b/packages/@vue/cli-service-global/lib/globalConfigPlugin.js @@ -48,6 +48,7 @@ module.exports = function createConfigPlugin (context, entry, asLib) { resolve.sync('vue-hot-reload-api', { basedir: context }) } catch (e) { config.resolve.alias + // eslint-disable-next-line node/no-extraneous-require .set('vue-hot-reload-api', require.resolve('vue-hot-reload-api')) } diff --git a/packages/@vue/cli-service-global/package.json b/packages/@vue/cli-service-global/package.json index d69cb42b13..c1c4d3d33a 100644 --- a/packages/@vue/cli-service-global/package.json +++ b/packages/@vue/cli-service-global/package.json @@ -28,8 +28,10 @@ "@vue/cli-service": "^4.0.0-alpha.0", "babel-eslint": "^10.0.1", "chalk": "^2.4.2", + "core-js": "^3.0.1", "eslint": "^5.16.0", "eslint-plugin-vue": "^5.2.2", + "regenerator-runtime": "^0.13.2", "resolve": "^1.10.1", "vue": "^2.6.10", "vue-template-compiler": "^2.6.10"