From a5405ad1795320d6eacd6448f525323750553bfa Mon Sep 17 00:00:00 2001 From: Ztj Date: Sat, 14 Mar 2020 19:53:34 +0800 Subject: [PATCH 01/23] =?UTF-8?q?warn:=20=E6=89=93=E7=A0=B4=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E6=80=A7=E7=89=88=E6=9C=AC=E8=BF=AD=E4=BB=A3=E5=BC=80?= =?UTF-8?q?=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 199828fc3934cb09b67a82d4648f0ce7ceb43ed7 Mon Sep 17 00:00:00 2001 From: Ztj Date: Sat, 14 Mar 2020 19:54:41 +0800 Subject: [PATCH 02/23] =?UTF-8?q?fix:=20proxy=20=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/build.js b/modules/build.js index 825519e..ad53cdb 100644 --- a/modules/build.js +++ b/modules/build.js @@ -103,7 +103,7 @@ function get_proxy_configure() { }; } - return proxy; + return {proxy: proxy}; } function get_definitions_configure() { From fdcb5a7451ab3dd59bcc7fd0b0b9751348775438 Mon Sep 17 00:00:00 2001 From: Ztj Date: Sat, 14 Mar 2020 19:57:28 +0800 Subject: [PATCH 03/23] optimize: pages && definitions --- modules/build.js | 60 ++++++++++-------------------------------------- vue.config.js | 6 ++--- 2 files changed, 14 insertions(+), 52 deletions(-) diff --git a/modules/build.js b/modules/build.js index ad53cdb..547610f 100644 --- a/modules/build.js +++ b/modules/build.js @@ -36,53 +36,15 @@ function configure_single_html(config, options) { function get_pages_configure() { if (process.env.PAGES_ENABLE !== 'true') return {}; - const pages = { - ...get_index_entry(), - ...get_page_entries(), - ...get_single_entries(), - }; - - return {pages: pages}; -} - -function get_index_entry() { - return { - "index": { - entry: 'src/main.js', - }, - } -} - -function get_page_entries() { - const pages = {}; - const entries = glob.sync('src/entries/*.js'); + const entries = glob.sync('src/**/page.options.js'); + let pages = {}; entries.forEach(function (entry) { - let name = path.basename(entry, '.js'); - if (name[0] === '_') return; - name = 'html-page/' + name; - pages[name] = { - entry: entry, - } + const page = path.join(process.env.INIT_CWD, entry); + pages = Object.assign(pages, require(page)); }); - return pages; -} - -function get_single_entries() { - const pages = {}; - const entries = glob.sync('src/single/*/entry.js'); - - entries.forEach(function (entry) { - let name = entry.replace('/entry.js', '').replace(/(.+?)\//g, ''); - name = 'html-single/' + name; - pages[name] = { - entry: entry, - inlineSource: '(.css|.js)', - } - }); - - return pages; + return {pages: pages}; } function get_proxy_configure() { @@ -106,21 +68,23 @@ function get_proxy_configure() { return {proxy: proxy}; } -function get_definitions_configure() { +function configure_definitions(config) { const options = {}; - const files = glob.sync('src/definitions/*.js'); + const files = glob.sync('src/**/*.definition.js'); files.forEach(function (file) { - let name = path.basename(file, '.js'); + const name = path.basename(file).replace('.definition.js', ''); options[name] = require.resolve('../' + file); }); - return options; + config.plugin().use(require.resolve('webpack/lib/ProvidePlugin'), [{ + ...options, + }]); } module.exports = { configure_single_html, get_pages_configure, get_proxy_configure, - get_definitions_configure, + configure_definitions, }; diff --git a/vue.config.js b/vue.config.js index 3ed5757..36e633e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -9,10 +9,8 @@ module.exports = { ...build.get_proxy_configure(), }, chainWebpack: config => { - config.plugin().use(require.resolve('webpack/lib/ProvidePlugin'), [{ - ...build.get_definitions_configure(), - }]); - + // 全局定义配置 + build.configure_definitions(config); // 单 HTML 内联样式和脚本配置 build.configure_single_html(config, options); }, From 31b8a4c13bf1007d5f26f1b56aea5285b9761d50 Mon Sep 17 00:00:00 2001 From: Ztj Date: Sat, 14 Mar 2020 20:00:48 +0800 Subject: [PATCH 04/23] optimize: .eslintrc.js --- .eslintrc.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index e2a98ef..efaa902 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,10 +1,10 @@ const glob = require('glob'); const path = require('path'); const globals = {}; -const definitions = glob.sync('src/definitions/*.js'); +const definitions = glob.sync('src/**/*.definition.js'); -definitions.forEach(function (entry) { - let name = path.basename(entry, '.js'); +definitions.forEach(function (file) { + const name = path.basename(file).replace('.definition.js', ''); globals[name] = true; }); From 5c9646acf23053e73a0e5be1bf7a299fcde4dcc2 Mon Sep 17 00:00:00 2001 From: Ztj Date: Sat, 14 Mar 2020 20:01:11 +0800 Subject: [PATCH 05/23] optimize: modules/definitions/axios.js --- modules/definitions/axios.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/definitions/axios.js b/modules/definitions/axios.js index 769ce3e..97bb80d 100644 --- a/modules/definitions/axios.js +++ b/modules/definitions/axios.js @@ -1,4 +1,4 @@ -let axios = require("axios"); +const axios = require("axios"); axios.defaults.timeout = 10000; axios.defaults.baseURL = process.env.VUE_APP_API_URI; From f73ae94b88f8eabce21f659595248626b59d1419 Mon Sep 17 00:00:00 2001 From: Ztj Date: Sat, 14 Mar 2020 20:01:46 +0800 Subject: [PATCH 06/23] update: modules/definitions/utils.js --- modules/definitions/utils.js | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/modules/definitions/utils.js b/modules/definitions/utils.js index 2999956..c8f256d 100644 --- a/modules/definitions/utils.js +++ b/modules/definitions/utils.js @@ -3,9 +3,12 @@ var Utils = (function () { this.debug = true; } - Utils.prototype.log = function (message) { - this.debug && window.console.log(message); - }; + Utils.prototype.log = window.console.log; + + Utils.prototype.error = window.console.error; + + Utils.prototype.warn = window.console.warn; + Utils.prototype.object_to_object = function (source, target) { if (!source) return; if (typeof (source) !== 'object') return; @@ -18,6 +21,20 @@ var Utils = (function () { } }); }; + + Utils.prototype.set_window_cache = function (name, value) { + if (!window.cache) window.cache = {}; + window.cache[name] = value; + }; + + Utils.prototype.get_window_cache = function (name) { + if (!window.cache) return undefined; + if (name in window.cache) { + return window.cache[name]; + } else { + return undefined; + } + }; return Utils; }()); From 0bbedb259f9b4102da744b8ca24a8a7af835175c Mon Sep 17 00:00:00 2001 From: Ztj Date: Sat, 14 Mar 2020 20:05:53 +0800 Subject: [PATCH 07/23] optimize: modules/development --- modules/dev/mock.js | 11 ----------- modules/{dev => development}/design.js | 0 modules/{dev => development}/layout.scss | 2 +- modules/development/mock.js | 22 ++++++++++++++++++++++ 4 files changed, 23 insertions(+), 12 deletions(-) delete mode 100644 modules/dev/mock.js rename modules/{dev => development}/design.js (100%) rename modules/{dev => development}/layout.scss (94%) create mode 100644 modules/development/mock.js diff --git a/modules/dev/mock.js b/modules/dev/mock.js deleted file mode 100644 index 75946db..0000000 --- a/modules/dev/mock.js +++ /dev/null @@ -1,11 +0,0 @@ -import Mock from "mockjs"; - -Mock.setup({ - timeout: '1000-3000' -}); - -let files = null; -files = require.context('../../src', true, /\/mock\/index.js$/); -files.keys().map(key => { - files(key) -}); diff --git a/modules/dev/design.js b/modules/development/design.js similarity index 100% rename from modules/dev/design.js rename to modules/development/design.js diff --git a/modules/dev/layout.scss b/modules/development/layout.scss similarity index 94% rename from modules/dev/layout.scss rename to modules/development/layout.scss index 74f8086..9235f4f 100644 --- a/modules/dev/layout.scss +++ b/modules/development/layout.scss @@ -1,4 +1,4 @@ -.dev { +.development { .layout.block { background-color: red; diff --git a/modules/development/mock.js b/modules/development/mock.js new file mode 100644 index 0000000..a29adb5 --- /dev/null +++ b/modules/development/mock.js @@ -0,0 +1,22 @@ +import Mock from "mockjs"; + +Mock.setup({ + timeout: '1000-3000' +}); + +let files = null; + +files = require.context('../../src', true, /\/mock\/index.js$/); +files.keys().map(key => { + files(key) +}); + +files = require.context('../../src', true, /\/mock\.js$/); +files.keys().map(key => { + files(key) +}); + +files = require.context('../../src', true, /\/(.+?).mock\.js$/); +files.keys().map(key => { + files(key) +}); From 4f29b63bd86db3929dea082747d8d3793a66073e Mon Sep 17 00:00:00 2001 From: Ztj Date: Sat, 14 Mar 2020 20:11:28 +0800 Subject: [PATCH 08/23] add: modules/vue files --- modules/vue/axios.js | 16 +++++++--------- modules/vue/bus.js | 9 +++++++++ modules/vue/i18n.js | 10 ++++++++++ modules/vue/router.js | 23 +++++++++++++++++++++++ modules/vue/viser.js | 4 ++++ modules/vue/vuex.js | 10 ++++++++++ 6 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 modules/vue/bus.js create mode 100644 modules/vue/i18n.js create mode 100644 modules/vue/router.js create mode 100644 modules/vue/viser.js create mode 100644 modules/vue/vuex.js diff --git a/modules/vue/axios.js b/modules/vue/axios.js index d397442..e9feed8 100644 --- a/modules/vue/axios.js +++ b/modules/vue/axios.js @@ -1,13 +1,11 @@ -import Vue from 'vue' import axios from "../definitions/axios"; -let ApiPlugin = function () { +const AxiosPlugin = { + install: (Vue, options) => { + Vue.prototype.$axios = axios.create({ + ...options, + }); + }, }; -ApiPlugin.install = function (Vue, options) { - Vue.prototype.$axios = axios.create({ - ...options, - }); -}; - -Vue.use(ApiPlugin); +export default AxiosPlugin; diff --git a/modules/vue/bus.js b/modules/vue/bus.js new file mode 100644 index 0000000..876fbae --- /dev/null +++ b/modules/vue/bus.js @@ -0,0 +1,9 @@ +import Vue from 'vue' + +let ApiPlugin = { + install: () => { + Vue.prototype.$bus = new Vue(); + }, +}; + +Vue.use(ApiPlugin); diff --git a/modules/vue/i18n.js b/modules/vue/i18n.js new file mode 100644 index 0000000..8e5edf3 --- /dev/null +++ b/modules/vue/i18n.js @@ -0,0 +1,10 @@ +import VueI18n from 'vue-i18n' + +const I18nPlugin = { + install: (Vue, options = {}) => { + Vue.use(VueI18n); + Vue.prototype._i18n = new VueI18n(options); + }, +}; + +export default I18nPlugin; diff --git a/modules/vue/router.js b/modules/vue/router.js new file mode 100644 index 0000000..ea55e85 --- /dev/null +++ b/modules/vue/router.js @@ -0,0 +1,23 @@ +import VueRouter from 'vue-router' + +const RouterPlugin = { + install: (Vue, options = {}) => { + options = Object.assign({ + routes: [], + }, options); + const routes = options.routes; + const router = new VueRouter({ + mode: process.env.ROUTER_MODE || 'hash', + base: process.env.BASE_URL, + routes, + }); + Vue.mixin({ + beforeCreate: function beforeCreate() { + this.$options.router = router; + Vue.use(VueRouter); + }, + }); + }, +}; + +export default RouterPlugin; diff --git a/modules/vue/viser.js b/modules/vue/viser.js new file mode 100644 index 0000000..133bf42 --- /dev/null +++ b/modules/vue/viser.js @@ -0,0 +1,4 @@ +import Vue from 'vue' +import Viser from 'viser-vue' + +Vue.use(Viser); diff --git a/modules/vue/vuex.js b/modules/vue/vuex.js new file mode 100644 index 0000000..51f715a --- /dev/null +++ b/modules/vue/vuex.js @@ -0,0 +1,10 @@ +import Vuex from 'vuex' + +const VuexPlugin = { + install: (Vue, options = {}) => { + Vue.use(Vuex); + Vue.prototype.$store = new Vuex.Store(options); + }, +}; + +export default VuexPlugin; From 7c5fb5297cbd4fdbc2da1fc1bb7073e0434737c7 Mon Sep 17 00:00:00 2001 From: Ztj Date: Sat, 14 Mar 2020 20:11:44 +0800 Subject: [PATCH 09/23] add: modules/utils files --- modules/utils/development.js | 6 ++++++ modules/utils/i18n.js | 20 ++++++++++++++++++++ modules/utils/index.js | 4 ++++ modules/utils/router.js | 17 +++++++++++++++++ 4 files changed, 47 insertions(+) create mode 100644 modules/utils/development.js create mode 100644 modules/utils/i18n.js create mode 100644 modules/utils/index.js create mode 100644 modules/utils/router.js diff --git a/modules/utils/development.js b/modules/utils/development.js new file mode 100644 index 0000000..f0cfbb5 --- /dev/null +++ b/modules/utils/development.js @@ -0,0 +1,6 @@ +if (process.env.NODE_ENV === 'development') { + const files = require.context('../../src', true, /\/development\/index\.js$/); + files.keys().map(key => { + files(key) + }); +} diff --git a/modules/utils/i18n.js b/modules/utils/i18n.js new file mode 100644 index 0000000..b895395 --- /dev/null +++ b/modules/utils/i18n.js @@ -0,0 +1,20 @@ +import Vue from 'vue' +import I18nPlugin from "../../modules/vue/i18n"; + +const files = require.context('../../src', true, /\/locales\/(.*)[a-z]{2}-[A-Z]{2}\.json$/); + +let messages = {}; +files.keys().map(file => { + let locale = file.substr(-10, 5); + messages[locale] = files(file) +}); + +let options = { + locale: process.env.VUE_APP_I18N_LOCALE || 'zh-CN', + fallbackLocale: process.env.VUE_APP_I18N_FALLBACK_LOCALE || 'zh-CN', + silentTranslationWarn: true, + formatFallbackMessages: true, + messages: messages, +}; + +Vue.use(I18nPlugin, options); diff --git a/modules/utils/index.js b/modules/utils/index.js new file mode 100644 index 0000000..c3494c3 --- /dev/null +++ b/modules/utils/index.js @@ -0,0 +1,4 @@ +const files = require.context('../../src', true, /\/utils\/index\.js$/); +files.keys().map(key => { + files(key) +}); diff --git a/modules/utils/router.js b/modules/utils/router.js new file mode 100644 index 0000000..04a6780 --- /dev/null +++ b/modules/utils/router.js @@ -0,0 +1,17 @@ +import Vue from 'vue' +import RouterPlugin from '../../modules/vue/router'; + +let files = null; +let routes = []; + +files = require.context('../../src', true, /\/router.js$/); +files.keys().map(key => { + routes.push(...files(key).default) +}); + +files = require.context('../../src', true, /\/(.+?).router.js$/); +files.keys().map(key => { + routes.push(...files(key).default) +}); + +Vue.use(RouterPlugin, {routes: routes}); From a968a79941528b7834a6dcb0bf1819e7144ba66a Mon Sep 17 00:00:00 2001 From: Ztj Date: Sat, 14 Mar 2020 20:13:40 +0800 Subject: [PATCH 10/23] optimize: modules/utils/development.js --- modules/utils/development.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/utils/development.js b/modules/utils/development.js index f0cfbb5..d88fe52 100644 --- a/modules/utils/development.js +++ b/modules/utils/development.js @@ -1,5 +1,12 @@ if (process.env.NODE_ENV === 'development') { - const files = require.context('../../src', true, /\/development\/index\.js$/); + let files = null; + + files = require.context('../../src', true, /\/development\/index\.js$/); + files.keys().map(key => { + files(key) + }); + + files = require.context('../../src', true, /\/(.+?).development.js$/); files.keys().map(key => { files(key) }); From a193ce0f0d8e3e015503689900f509e69c7f8c06 Mon Sep 17 00:00:00 2001 From: Ztj Date: Sat, 14 Mar 2020 20:15:13 +0800 Subject: [PATCH 11/23] optimize: src/main.js --- src/main.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main.js b/src/main.js index cd15c9e..60b22d9 100644 --- a/src/main.js +++ b/src/main.js @@ -1,14 +1,12 @@ import Vue from 'vue' import App from './main.vue' -import router from './router' -import store from './store' -import './utils' +import '../modules/utils' Vue.config.productionTip = false; -new Vue({ - router, - store, +let app = new Vue({ render: h => h(App), }).$mount('#app'); + +window.app = app; From 33f5d8d779a997db656e209b11e9f9b4cf21f98f Mon Sep 17 00:00:00 2001 From: Ztj Date: Sat, 14 Mar 2020 20:15:29 +0800 Subject: [PATCH 12/23] =?UTF-8?q?clear:=20=E6=97=A0=E7=94=A8=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/development/index.js | 8 -------- src/router/index.js | 20 -------------------- src/store/index.js | 11 ----------- src/utils/index.js | 6 ------ 4 files changed, 45 deletions(-) delete mode 100644 src/development/index.js delete mode 100644 src/router/index.js delete mode 100644 src/store/index.js delete mode 100644 src/utils/index.js diff --git a/src/development/index.js b/src/development/index.js deleted file mode 100644 index 26b22bd..0000000 --- a/src/development/index.js +++ /dev/null @@ -1,8 +0,0 @@ -if (process.env.NODE_ENV === 'development') { - let files = null; - files = require.context('./', false, /[scss|js]$/); - files.keys().map(key => { - if(key === './index.js') return; - files(key) - }); -} diff --git a/src/router/index.js b/src/router/index.js deleted file mode 100644 index a72e2df..0000000 --- a/src/router/index.js +++ /dev/null @@ -1,20 +0,0 @@ -import Vue from 'vue' -import VueRouter from 'vue-router' - -let files = null; -let routes = []; - -Vue.use(VueRouter); - -files = require.context('./', false, /.router.js$/); -files.keys().map(key => { - routes.push(...files(key)); -}); - -const router = new VueRouter({ - mode: 'history', - base: process.env.BASE_URL, - routes, -}); - -export default router diff --git a/src/store/index.js b/src/store/index.js deleted file mode 100644 index 45a583a..0000000 --- a/src/store/index.js +++ /dev/null @@ -1,11 +0,0 @@ -import Vue from 'vue' -import Vuex from 'vuex' - -Vue.use(Vuex); - -export default new Vuex.Store({ - state: {}, - mutations: {}, - actions: {}, - modules: {} -}); diff --git a/src/utils/index.js b/src/utils/index.js deleted file mode 100644 index 161b143..0000000 --- a/src/utils/index.js +++ /dev/null @@ -1,6 +0,0 @@ -let files = require.context('./', false, /[scss|js]$/); - -files.keys().map(key => { - if(key === './index.js') return; - files(key) -}); From ff2a795008e371e383f846cf60980663d0829f67 Mon Sep 17 00:00:00 2001 From: Ztj Date: Sun, 15 Mar 2020 11:07:30 +0800 Subject: [PATCH 13/23] update: package --- package.json | 20 +- yarn.lock | 655 ++++++++++++++++++++++++++------------------------- 2 files changed, 345 insertions(+), 330 deletions(-) diff --git a/package.json b/package.json index 636c51d..2f20027 100644 --- a/package.json +++ b/package.json @@ -8,16 +8,16 @@ "lint": "vue-cli-service lint" }, "devDependencies": { - "@vue/cli-plugin-babel": "^4.2.2", - "@vue/cli-plugin-eslint": "^4.2.2", - "@vue/cli-plugin-router": "^4.2.2", - "@vue/cli-plugin-vuex": "^4.2.2", - "@vue/cli-service": "^4.2.2", + "@vue/cli-plugin-babel": "^4.2.3", + "@vue/cli-plugin-eslint": "^4.2.3", + "@vue/cli-plugin-router": "^4.2.3", + "@vue/cli-plugin-vuex": "^4.2.3", + "@vue/cli-service": "^4.2.3", "axios": "^0.19.2", - "babel-eslint": "^10.0.3", + "babel-eslint": "^10.1.0", "core-js": "^3.6.4", "eslint": "^6.8.0", - "eslint-plugin-vue": "^6.2.1", + "eslint-plugin-vue": "^6.2.2", "html-webpack-inline-source-plugin": "^0.0.10", "mockjs": "^1.1.0", "node-sass": "^4.13.1", @@ -26,11 +26,13 @@ "postcss-px-to-viewport": "^1.1.1", "postcss-viewport-units": "^0.1.6", "sass-loader": "^8.0.2", + "vconsole": "^3.3.4", "vue": "^2.6.11", + "vue-i18n": "^8.15.5", "vue-lazyload": "^1.3.3", - "vue-router": "^3.1.5", + "vue-router": "^3.1.6", "vue-template-compiler": "^2.6.11", - "vuex": "^3.1.2" + "vuex": "^3.1.3" }, "browserslist": [ "> 1%", diff --git a/yarn.lock b/yarn.lock index cdfdb39..d5ff20f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,27 +9,27 @@ dependencies: "@babel/highlight" "^7.8.3" -"@babel/compat-data@^7.8.4": - version "7.8.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.5.tgz#d28ce872778c23551cbb9432fc68d28495b613b9" - integrity sha512-jWYUqQX/ObOhG1UiEkbH5SANsE/8oKXiQWjj7p7xgj9Zmnt//aUvyz4dBkK0HNsS8/cbyC5NmmH87VekW+mXFg== +"@babel/compat-data@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.6.tgz#7eeaa0dfa17e50c7d9c0832515eee09b56f04e35" + integrity sha512-CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q== dependencies: browserslist "^4.8.5" invariant "^2.2.4" semver "^5.5.0" "@babel/core@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz#d496799e5c12195b3602d0fddd77294e3e38e80e" - integrity sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA== + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b" + integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA== dependencies: "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.4" + "@babel/generator" "^7.8.7" "@babel/helpers" "^7.8.4" - "@babel/parser" "^7.8.4" - "@babel/template" "^7.8.3" - "@babel/traverse" "^7.8.4" - "@babel/types" "^7.8.3" + "@babel/parser" "^7.8.7" + "@babel/template" "^7.8.6" + "@babel/traverse" "^7.8.6" + "@babel/types" "^7.8.7" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" @@ -39,12 +39,12 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz#35bbc74486956fe4251829f9f6c48330e8d0985e" - integrity sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA== +"@babel/generator@^7.8.6", "@babel/generator@^7.8.7": + version "7.8.8" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.8.tgz#cdcd58caab730834cee9eeadb729e833b625da3e" + integrity sha512-HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg== dependencies: - "@babel/types" "^7.8.3" + "@babel/types" "^7.8.7" jsesc "^2.5.1" lodash "^4.17.13" source-map "^0.5.0" @@ -64,45 +64,46 @@ "@babel/helper-explode-assignable-expression" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/helper-call-delegate@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz#de82619898aa605d409c42be6ffb8d7204579692" - integrity sha512-6Q05px0Eb+N4/GTyKPPvnkig7Lylw+QzihMpws9iiZQv7ZImf84ZsZpQH7QoWN4n4tm81SnSzPgHw2qtO0Zf3A== +"@babel/helper-call-delegate@^7.8.7": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz#28a279c2e6c622a6233da548127f980751324cab" + integrity sha512-doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ== dependencies: "@babel/helper-hoist-variables" "^7.8.3" "@babel/traverse" "^7.8.3" - "@babel/types" "^7.8.3" + "@babel/types" "^7.8.7" -"@babel/helper-compilation-targets@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.4.tgz#03d7ecd454b7ebe19a254f76617e61770aed2c88" - integrity sha512-3k3BsKMvPp5bjxgMdrFyq0UaEO48HciVrOVF0+lon8pp95cyJ2ujAh0TrBHNMnJGT2rr0iKOJPFFbSqjDyf/Pg== +"@babel/helper-compilation-targets@^7.8.4", "@babel/helper-compilation-targets@^7.8.7": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde" + integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw== dependencies: - "@babel/compat-data" "^7.8.4" - browserslist "^4.8.5" + "@babel/compat-data" "^7.8.6" + browserslist "^4.9.1" invariant "^2.2.4" levenary "^1.1.1" semver "^5.5.0" "@babel/helper-create-class-features-plugin@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz#5b94be88c255f140fd2c10dd151e7f98f4bff397" - integrity sha512-qmp4pD7zeTxsv0JNecSBsEmG1ei2MqwJq4YQcK3ZWm/0t07QstWfvuV/vm3Qt5xNMFETn2SZqpMx2MQzbtq+KA== + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz#243a5b46e2f8f0f674dc1387631eb6b28b851de0" + integrity sha512-klTBDdsr+VFFqaDHm5rR69OpEQtO2Qv8ECxHS1mNhJJvaHArR6a1xTf5K/eZW7eZpJbhCx3NW1Yt/sKsLXLblg== dependencies: "@babel/helper-function-name" "^7.8.3" "@babel/helper-member-expression-to-functions" "^7.8.3" "@babel/helper-optimise-call-expression" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" - "@babel/helper-replace-supers" "^7.8.3" + "@babel/helper-replace-supers" "^7.8.6" "@babel/helper-split-export-declaration" "^7.8.3" -"@babel/helper-create-regexp-features-plugin@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz#c774268c95ec07ee92476a3862b75cc2839beb79" - integrity sha512-Gcsm1OHCUr9o9TcJln57xhWHtdXbA2pgQ58S0Lxlks0WMGNXuki4+GLfX0p+L2ZkINUGZvfkz8rzoqJQSthI+Q== +"@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8": + version "7.8.8" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087" + integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg== dependencies: + "@babel/helper-annotate-as-pure" "^7.8.3" "@babel/helper-regex" "^7.8.3" - regexpu-core "^4.6.0" + regexpu-core "^4.7.0" "@babel/helper-define-map@^7.8.3": version "7.8.3" @@ -159,15 +160,16 @@ "@babel/types" "^7.8.3" "@babel/helper-module-transforms@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz#d305e35d02bee720fbc2c3c3623aa0c316c01590" - integrity sha512-C7NG6B7vfBa/pwCOshpMbOYUmrYQDfCpVL/JCRu0ek8B5p8kue1+BCXpg2vOYs7w5ACB9GTOBYQ5U6NwrMg+3Q== + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz#6a13b5eecadc35692047073a64e42977b97654a4" + integrity sha512-RDnGJSR5EFBJjG3deY0NiL0K9TO8SXxS9n/MPsbPK/s9LbQymuLNtlzvDiNS7IpecuL45cMeLVkA+HfmlrnkRg== dependencies: "@babel/helper-module-imports" "^7.8.3" + "@babel/helper-replace-supers" "^7.8.6" "@babel/helper-simple-access" "^7.8.3" "@babel/helper-split-export-declaration" "^7.8.3" - "@babel/template" "^7.8.3" - "@babel/types" "^7.8.3" + "@babel/template" "^7.8.6" + "@babel/types" "^7.8.6" lodash "^4.17.13" "@babel/helper-optimise-call-expression@^7.8.3": @@ -200,15 +202,15 @@ "@babel/traverse" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/helper-replace-supers@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz#91192d25f6abbcd41da8a989d4492574fb1530bc" - integrity sha512-xOUssL6ho41U81etpLoT2RTdvdus4VfHamCuAm4AHxGr+0it5fnwoVdwUJ7GFEqCsQYzJUhcbsN9wB9apcYKFA== +"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8" + integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA== dependencies: "@babel/helper-member-expression-to-functions" "^7.8.3" "@babel/helper-optimise-call-expression" "^7.8.3" - "@babel/traverse" "^7.8.3" - "@babel/types" "^7.8.3" + "@babel/traverse" "^7.8.6" + "@babel/types" "^7.8.6" "@babel/helper-simple-access@^7.8.3": version "7.8.3" @@ -253,10 +255,10 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.8.3", "@babel/parser@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz#d1dbe64691d60358a974295fa53da074dd2ce8e8" - integrity sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw== +"@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.8.7": + version "7.8.8" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.8.tgz#4c3b7ce36db37e0629be1f0d50a571d2f86f6cd4" + integrity sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA== "@babel/plugin-proposal-async-generator-functions@^7.8.3": version "7.8.3" @@ -333,11 +335,11 @@ "@babel/plugin-syntax-optional-chaining" "^7.8.0" "@babel/plugin-proposal-unicode-property-regex@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz#b646c3adea5f98800c9ab45105ac34d06cd4a47f" - integrity sha512-1/1/rEZv2XGweRwwSkLpY+s60za9OZ1hJs4YDqFHCw0kYWYwL5IFljVY1MYBL+weT1l9pokDO2uhSTLVxzoHkQ== + version "7.8.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d" + integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.8.3" + "@babel/helper-create-regexp-features-plugin" "^7.8.8" "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-async-generators@^7.8.0": @@ -441,17 +443,17 @@ "@babel/helper-plugin-utils" "^7.8.3" lodash "^4.17.13" -"@babel/plugin-transform-classes@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz#46fd7a9d2bb9ea89ce88720477979fe0d71b21b8" - integrity sha512-SjT0cwFJ+7Rbr1vQsvphAHwUHvSUPmMjMU/0P59G8U2HLFqSa082JO7zkbDNWs9kH/IUqpHI6xWNesGf8haF1w== +"@babel/plugin-transform-classes@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz#77534447a477cbe5995ae4aee3e39fbc8090c46d" + integrity sha512-k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg== dependencies: "@babel/helper-annotate-as-pure" "^7.8.3" "@babel/helper-define-map" "^7.8.3" "@babel/helper-function-name" "^7.8.3" "@babel/helper-optimise-call-expression" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" - "@babel/helper-replace-supers" "^7.8.3" + "@babel/helper-replace-supers" "^7.8.6" "@babel/helper-split-export-declaration" "^7.8.3" globals "^11.1.0" @@ -463,9 +465,9 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-transform-destructuring@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz#20ddfbd9e4676906b1056ee60af88590cc7aaa0b" - integrity sha512-H4X646nCkiEcHZUZaRkhE2XVsoz0J/1x3VVujnn96pSoGCtKPA99ZZA+va+gK+92Zycd6OBKCD8tDb/731bhgQ== + version "7.8.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz#fadb2bc8e90ccaf5658de6f8d4d22ff6272a2f4b" + integrity sha512-eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ== dependencies: "@babel/helper-plugin-utils" "^7.8.3" @@ -492,10 +494,10 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-for-of@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.4.tgz#6fe8eae5d6875086ee185dd0b098a8513783b47d" - integrity sha512-iAXNlOWvcYUYoV8YIxwS7TxGRJcxyl8eQCfT+A5j8sKUzRFvJdcyjp97jL2IghWSRDaL2PU2O2tX8Cu9dTBq5A== +"@babel/plugin-transform-for-of@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz#a051bd1b402c61af97a27ff51b468321c7c2a085" + integrity sha512-M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw== dependencies: "@babel/helper-plugin-utils" "^7.8.3" @@ -580,12 +582,12 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/helper-replace-supers" "^7.8.3" -"@babel/plugin-transform-parameters@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz#1d5155de0b65db0ccf9971165745d3bb990d77d3" - integrity sha512-IsS3oTxeTsZlE5KqzTbcC2sV0P9pXdec53SU+Yxv7o/6dvGM5AkTotQKhoSffhNgZ/dftsSiOoxy7evCYJXzVA== +"@babel/plugin-transform-parameters@^7.8.7": + version "7.8.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.8.tgz#0381de466c85d5404565243660c4496459525daf" + integrity sha512-hC4Ld/Ulpf1psQciWWwdnUspQoQco2bMzSrwU6TmzRlvoYQe4rQFy9vnCZDTlVeCQj0JPfL+1RX0V8hCJvkgBA== dependencies: - "@babel/helper-call-delegate" "^7.8.3" + "@babel/helper-call-delegate" "^7.8.7" "@babel/helper-get-function-arity" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" @@ -596,12 +598,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-regenerator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz#b31031e8059c07495bf23614c97f3d9698bc6ec8" - integrity sha512-qt/kcur/FxrQrzFR432FGZznkVAjiyFtCOANjkAKwCbt465L6ZCiUQh2oMYGU3Wo8LRFJxNDFwWn106S5wVUNA== +"@babel/plugin-transform-regenerator@^7.8.7": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8" + integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA== dependencies: - regenerator-transform "^0.14.0" + regenerator-transform "^0.14.2" "@babel/plugin-transform-reserved-words@^7.8.3": version "7.8.3" @@ -666,12 +668,12 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/preset-env@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.4.tgz#9dac6df5f423015d3d49b6e9e5fa3413e4a72c4e" - integrity sha512-HihCgpr45AnSOHRbS5cWNTINs0TwaR8BS8xIIH+QwiW8cKL0llV91njQMpeMReEPVs+1Ao0x3RLEBLtt1hOq4w== + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.7.tgz#1fc7d89c7f75d2d70c2b6768de6c2e049b3cb9db" + integrity sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw== dependencies: - "@babel/compat-data" "^7.8.4" - "@babel/helper-compilation-targets" "^7.8.4" + "@babel/compat-data" "^7.8.6" + "@babel/helper-compilation-targets" "^7.8.7" "@babel/helper-module-imports" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-proposal-async-generator-functions" "^7.8.3" @@ -694,13 +696,13 @@ "@babel/plugin-transform-async-to-generator" "^7.8.3" "@babel/plugin-transform-block-scoped-functions" "^7.8.3" "@babel/plugin-transform-block-scoping" "^7.8.3" - "@babel/plugin-transform-classes" "^7.8.3" + "@babel/plugin-transform-classes" "^7.8.6" "@babel/plugin-transform-computed-properties" "^7.8.3" "@babel/plugin-transform-destructuring" "^7.8.3" "@babel/plugin-transform-dotall-regex" "^7.8.3" "@babel/plugin-transform-duplicate-keys" "^7.8.3" "@babel/plugin-transform-exponentiation-operator" "^7.8.3" - "@babel/plugin-transform-for-of" "^7.8.4" + "@babel/plugin-transform-for-of" "^7.8.6" "@babel/plugin-transform-function-name" "^7.8.3" "@babel/plugin-transform-literals" "^7.8.3" "@babel/plugin-transform-member-expression-literals" "^7.8.3" @@ -711,9 +713,9 @@ "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3" "@babel/plugin-transform-new-target" "^7.8.3" "@babel/plugin-transform-object-super" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.8.4" + "@babel/plugin-transform-parameters" "^7.8.7" "@babel/plugin-transform-property-literals" "^7.8.3" - "@babel/plugin-transform-regenerator" "^7.8.3" + "@babel/plugin-transform-regenerator" "^7.8.7" "@babel/plugin-transform-reserved-words" "^7.8.3" "@babel/plugin-transform-shorthand-properties" "^7.8.3" "@babel/plugin-transform-spread" "^7.8.3" @@ -721,7 +723,7 @@ "@babel/plugin-transform-template-literals" "^7.8.3" "@babel/plugin-transform-typeof-symbol" "^7.8.4" "@babel/plugin-transform-unicode-regex" "^7.8.3" - "@babel/types" "^7.8.3" + "@babel/types" "^7.8.7" browserslist "^4.8.5" core-js-compat "^3.6.2" invariant "^2.2.2" @@ -729,40 +731,40 @@ semver "^5.5.0" "@babel/runtime@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308" - integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ== + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz#8fefce9802db54881ba59f90bb28719b4996324d" + integrity sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg== dependencies: - regenerator-runtime "^0.13.2" + regenerator-runtime "^0.13.4" -"@babel/template@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8" - integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ== +"@babel/template@^7.8.3", "@babel/template@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b" + integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg== dependencies: "@babel/code-frame" "^7.8.3" - "@babel/parser" "^7.8.3" - "@babel/types" "^7.8.3" + "@babel/parser" "^7.8.6" + "@babel/types" "^7.8.6" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz#f0845822365f9d5b0e312ed3959d3f827f869e3c" - integrity sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg== +"@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff" + integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A== dependencies: "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.4" + "@babel/generator" "^7.8.6" "@babel/helper-function-name" "^7.8.3" "@babel/helper-split-export-declaration" "^7.8.3" - "@babel/parser" "^7.8.4" - "@babel/types" "^7.8.3" + "@babel/parser" "^7.8.6" + "@babel/types" "^7.8.6" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c" - integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg== +"@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d" + integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw== dependencies: esutils "^2.0.2" lodash "^4.17.13" @@ -856,9 +858,9 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "13.7.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.2.tgz#50375b95b5845a34efda2ffb3a087c7becbc46c6" - integrity sha512-uvilvAQbdJvnSBFcKJ2td4016urcGvsiR+N4dHGU87ml8O2Vl6l+ErOi9w0kXSPiwJ1AYlIW+0pDXDWWMOiWbw== + version "13.9.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.1.tgz#96f606f8cd67fb018847d9b61e93997dabdefc72" + integrity sha512-E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -887,10 +889,10 @@ lodash.kebabcase "^4.1.1" svg-tags "^1.0.0" -"@vue/babel-preset-app@^4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-4.2.2.tgz#c7a0a685a5eb92e1b1538f8d1fc4f5ac00dccec1" - integrity sha512-QGgL+iR+ZdNO9xcFJqYjg938bwjArgIyNOFfM0m+dNSOt7wWVrlFA2v0C6aVN1sJ+IEjdurEolBTZ7hXp6Fbsg== +"@vue/babel-preset-app@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-4.2.3.tgz#608b2c9f7ca677e793833662fc727ff9137a9a35" + integrity sha512-Xlc8d9Ebgu9pNZMUxKZWVP2CctVZzfX3LAxjBDWAAIiVpdXX4IkQQCevDhgiANFzlmE3KXtiSgPGs57Sso2g7Q== dependencies: "@babel/core" "^7.8.4" "@babel/helper-compilation-targets" "^7.8.4" @@ -954,59 +956,59 @@ "@vue/babel-plugin-transform-vue-jsx" "^1.1.2" camelcase "^5.0.0" -"@vue/cli-overlay@^4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-4.2.2.tgz#43184ab5b7bc491cac46e3c3e375ec4976fbea5f" - integrity sha512-6hMYDkH/rSzFkSKuu/EfTXVkUaBDR6sq5vJ161pN1q46zUB5uN1L7rJHQDjxTy1EZazk1MqU5cS10vRVhIeWvw== +"@vue/cli-overlay@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-4.2.3.tgz#fc26d2d48fe189e48d185910ff92433509789515" + integrity sha512-V51eS7NIsK/rv19oK0+B5Yl/VNWCJTTkjibreIXDknOLSH3MKTOJamUI1BEYo5FOXBWw+7DLmaNF3XKemQ5Y/w== "@vue/cli-plugin-babel@^4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.2.2.tgz#c65cad9921713b9233bab49306559c553a78ee1d" - integrity sha512-uCXDlgUp4ehHoYosr6kbyJYeQ+aQ4lR9Zn0Bf58MFbZbmjBCi8dBKzQf7ve4bo8L8CTGjWirnzgA7pStRmWx0g== + version "4.2.3" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.2.3.tgz#8633795126f4d78c517bff9a2539229c9e0c8db4" + integrity sha512-vbK6f7dN4gj+6xyhTZkvjjbz1vsTwX+ObRD0ElaaipXo2oVSBAAPPGHkLjnH8C2brDLPeLHdUCzERzx2kc2lmQ== dependencies: "@babel/core" "^7.8.4" - "@vue/babel-preset-app" "^4.2.2" - "@vue/cli-shared-utils" "^4.2.2" + "@vue/babel-preset-app" "^4.2.3" + "@vue/cli-shared-utils" "^4.2.3" babel-loader "^8.0.6" cache-loader "^4.1.0" thread-loader "^2.1.3" webpack "^4.0.0" "@vue/cli-plugin-eslint@^4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.2.2.tgz#ea0ecfc3f816102f61df3050d82f23909aa3df1b" - integrity sha512-C6Foeq+XjsAMy+F9XTXGUtCKBgTJXGRjqUdmehU5J4i84erSIRulOahqjHr6J6IslJcDAmBekF8xXhMzX839NA== + version "4.2.3" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.2.3.tgz#2a70df99aaa60697a13893e94034a1386f31c3ee" + integrity sha512-r3J0OAa8x0tZZYFxxFZ/C5WWxYGGH8hLfUUhs3FePo0VsBci28lrgvnBqr69uj/T40v/ndBh0geAz28mjjQ+mg== dependencies: - "@vue/cli-shared-utils" "^4.2.2" + "@vue/cli-shared-utils" "^4.2.3" eslint-loader "^2.1.2" globby "^9.2.0" inquirer "^6.3.1" webpack "^4.0.0" yorkie "^2.0.0" -"@vue/cli-plugin-router@^4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-4.2.2.tgz#2e510668341e3d2ff839a7b6a76e1250e1734223" - integrity sha512-F6uYaKKpXXgub9vd3QFNS673HIXB8+U2XGtLp7yUo00/iuLWodrzPE1zLk6i/R6o/MCtDU6Tqfow/fFeIFVLZg== +"@vue/cli-plugin-router@^4.2.2", "@vue/cli-plugin-router@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-4.2.3.tgz#c64594e7e7e20ba76c71262f283b6199f5afd463" + integrity sha512-RGtgFQCTMS1X1wtFt752RMgr/LlF9cfpH37MkwjhF2wpnyTp+hkKl/09QORAKW91I8iFpZFH7xZKMBS3r1WbCw== dependencies: - "@vue/cli-shared-utils" "^4.2.2" + "@vue/cli-shared-utils" "^4.2.3" -"@vue/cli-plugin-vuex@^4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.2.2.tgz#f504b554e7edde945342e3c42cffad80ffa41933" - integrity sha512-/Bir5gCjesHSa+2F2CDD10QefuGJogIJ5VA6wp+zARjDIl4xg2f0SbROnompBS03K7cNNDdRXdS/o/fzKmH1yg== +"@vue/cli-plugin-vuex@^4.2.2", "@vue/cli-plugin-vuex@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.2.3.tgz#aa1d8e824dd82b8718c0c40e3906c34ccd752516" + integrity sha512-7M4CaoAD4W/GdiDI4+Gh2tATPFBnb/u7bCiLLDsuL9ztypv7l3p4cu43zkDpTCCuufkZFYtZwysOAY8SbGqOjg== "@vue/cli-service@^4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-4.2.2.tgz#b2bc820a46c080a7564df23cf7e5c9592d1acc99" - integrity sha512-uB+32EoXL3FvgJ/uReDMGT6KohX++qilWN58Dzgi5ixrgD1abQgIjGr9AW5SATwjcWNbU0uKP4FltWq56dxswA== + version "4.2.3" + resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-4.2.3.tgz#aabb8edfea5dbb59df5b42464f876158b43dd065" + integrity sha512-eSsmrt7nIZInmEvVW5x7eQLdEywBin79nKduB2PgYx0Me82wRfKDa8JpkCM6jZV0AxIuaF7N4RkPOtlkrBKX9Q== dependencies: "@intervolga/optimize-cssnano-plugin" "^1.0.5" "@soda/friendly-errors-webpack-plugin" "^1.7.1" - "@vue/cli-overlay" "^4.2.2" - "@vue/cli-plugin-router" "^4.2.2" - "@vue/cli-plugin-vuex" "^4.2.2" - "@vue/cli-shared-utils" "^4.2.2" + "@vue/cli-overlay" "^4.2.3" + "@vue/cli-plugin-router" "^4.2.3" + "@vue/cli-plugin-vuex" "^4.2.3" + "@vue/cli-shared-utils" "^4.2.3" "@vue/component-compiler-utils" "^3.0.2" "@vue/preload-webpack-plugin" "^1.1.0" "@vue/web-component-wrapper" "^1.2.0" @@ -1054,10 +1056,10 @@ webpack-dev-server "^3.10.2" webpack-merge "^4.2.2" -"@vue/cli-shared-utils@^4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.2.2.tgz#953fec34115cb12d0820012a9d7400f8c27d6660" - integrity sha512-EK5wcxgjadqUpSzfh6Bnxd46Zx+SAaHusygqV11UZKHr4EObc/SjCpq7c7drmFkBjRqmVvrHs4jRnJJo5VgCgQ== +"@vue/cli-shared-utils@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.2.3.tgz#13646452cc25b0ab68a57cb52cac27983cee39a4" + integrity sha512-GCoTB6vMZsi9z/Bmn8/C9IlnUw8eeHONOGE+48TJkZyulftVFhlwVWjTFp5GuDAlwpTWarHchW9IoVu3pIIGfA== dependencies: "@hapi/joi" "^15.0.1" chalk "^2.4.2" @@ -1267,30 +1269,25 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" -acorn-jsx@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384" - integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw== - -acorn-walk@^6.1.1: - version "6.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c" - integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== +acorn-jsx@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe" + integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ== -acorn-walk@^7.0.0: +acorn-walk@^7.0.0, acorn-walk@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e" integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ== -acorn@^6.0.7, acorn@^6.2.1: - version "6.4.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" - integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== +acorn@^6.2.1: + version "6.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" + integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== -acorn@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c" - integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ== +acorn@^7.1.0, acorn@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" + integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== address@^1.1.2: version "1.1.2" @@ -1315,10 +1312,10 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5: - version "6.11.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9" - integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA== +ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5: + version "6.12.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7" + integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw== dependencies: fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" @@ -1346,11 +1343,11 @@ ansi-escapes@^3.2.0: integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== ansi-escapes@^4.2.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz#a4ce2b33d6b214b7950d8595c212f12ac9cc569d" - integrity sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg== + version "4.3.1" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" + integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== dependencies: - type-fest "^0.8.1" + type-fest "^0.11.0" ansi-html@0.0.7: version "0.0.7" @@ -1584,14 +1581,14 @@ axios@^0.19.2: follow-redirects "1.5.10" babel-eslint@^10.0.3: - version "10.0.3" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz#81a2c669be0f205e19462fed2482d33e4687a88a" - integrity sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA== + version "10.1.0" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" + integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg== dependencies: "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.0.0" - "@babel/traverse" "^7.0.0" - "@babel/types" "^7.0.0" + "@babel/parser" "^7.7.0" + "@babel/traverse" "^7.7.0" + "@babel/types" "^7.7.0" eslint-visitor-keys "^1.0.0" resolve "^1.12.0" @@ -1817,14 +1814,14 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.8.3, browserslist@^4.8.5, browserslist@^4.8.6: - version "4.8.7" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz#ec8301ff415e6a42c949d0e66b405eb539c532d0" - integrity sha512-gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA== +browserslist@^4.0.0, browserslist@^4.8.3, browserslist@^4.8.5, browserslist@^4.8.6, browserslist@^4.9.1: + version "4.9.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.9.1.tgz#01ffb9ca31a1aef7678128fc6a2253316aa7287c" + integrity sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw== dependencies: - caniuse-lite "^1.0.30001027" - electron-to-chromium "^1.3.349" - node-releases "^1.1.49" + caniuse-lite "^1.0.30001030" + electron-to-chromium "^1.3.363" + node-releases "^1.1.50" buffer-from@^1.0.0: version "1.1.1" @@ -2012,10 +2009,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001027: - version "1.0.30001028" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001028.tgz#f2241242ac70e0fa9cda55c2776d32a0867971c2" - integrity sha512-Vnrq+XMSHpT7E+LWoIYhs3Sne8h9lx9YJV3acH3THNCwU/9zV93/ta4xVfzTtnqd3rvnuVpVjE3DFqf56tr3aQ== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001030: + version "1.0.30001035" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e" + integrity sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ== case-sensitive-paths-webpack-plugin@^2.3.0: version "2.3.0" @@ -2287,9 +2284,9 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: delayed-stream "~1.0.0" commander@*: - version "4.1.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" - integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== + version "5.0.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-5.0.0.tgz#dbf1909b49e5044f8fdaf0adc809f0c0722bdfd0" + integrity sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ== commander@2.17.x: version "2.17.1" @@ -3056,10 +3053,10 @@ ejs@^2.6.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== -electron-to-chromium@^1.3.349: - version "1.3.355" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.355.tgz#ff805ed8a3d68e550a45955134e4e81adf1122ba" - integrity sha512-zKO/wS+2ChI/jz9WAo647xSW8t2RmgRLFdbUb/77cORkUTargO+SCj4ctTHjBn2VeNFrsLgDT7IuDVrd3F8mLQ== +electron-to-chromium@^1.3.363: + version "1.3.376" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.376.tgz#7cb7b5205564a06c8f8ecfbe832cbd47a1224bb1" + integrity sha512-cv/PYVz5szeMz192ngilmezyPNFkUjuynuL2vNdiqIrio440nfTDdc0JJU0TS2KHLSVCs9gBbt4CFqM+HcBnjw== elliptic@^6.0.0: version "6.5.2" @@ -3089,6 +3086,11 @@ emojis-list@^2.0.0: resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -3189,9 +3191,9 @@ eslint-loader@^2.1.2: rimraf "^2.6.1" eslint-plugin-vue@^6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.1.tgz#ca802df5c33146aed1e56bb21d250c1abb6120a3" - integrity sha512-MiIDOotoWseIfLIfGeDzF6sDvHkVvGd2JgkvjyHtN3q4RoxdAXrAMuI3SXTOKatljgacKwpNAYShmcKZa4yZzw== + version "6.2.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz#27fecd9a3a24789b0f111ecdd540a9e56198e0fe" + integrity sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ== dependencies: natural-compare "^1.4.0" semver "^5.6.0" @@ -3269,12 +3271,12 @@ eslint@^6.8.0: v8-compile-cache "^2.0.3" espree@^6.1.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d" - integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA== + version "6.2.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" + integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw== dependencies: - acorn "^7.1.0" - acorn-jsx "^5.1.0" + acorn "^7.1.1" + acorn-jsx "^5.2.0" eslint-visitor-keys "^1.1.0" esprima@^4.0.0: @@ -3612,12 +3614,12 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: pkg-dir "^3.0.0" find-cache-dir@^3.0.0, find-cache-dir@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.2.0.tgz#e7fe44c1abc1299f516146e563108fd1006c1874" - integrity sha512-1JKclkYYsf1q9WIJKLZa9S9muC+08RIjzAlLrK4QcYLJMS6mk9yombQ9qf+zJ7H9LS800k0s44L4sDq9VYzqyg== + version "3.3.1" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" + integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== dependencies: commondir "^1.0.1" - make-dir "^3.0.0" + make-dir "^3.0.2" pkg-dir "^4.1.0" find-up@^1.0.0: @@ -3899,9 +3901,9 @@ globals@^11.1.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^12.1.0: - version "12.3.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13" - integrity sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw== + version "12.4.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" + integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== dependencies: type-fest "^0.8.1" @@ -4108,9 +4110,9 @@ hoopy@^0.1.4: integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== hosted-git-info@^2.1.4: - version "2.8.5" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c" - integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg== + version "2.8.8" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" + integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== hpack.js@^2.1.6: version "2.1.6" @@ -4433,22 +4435,22 @@ inquirer@^6.3.1: through "^2.3.6" inquirer@^7.0.0: - version "7.0.4" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz#99af5bde47153abca23f5c7fc30db247f39da703" - integrity sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ== + version "7.1.0" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29" + integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg== dependencies: ansi-escapes "^4.2.1" - chalk "^2.4.2" + chalk "^3.0.0" cli-cursor "^3.1.0" cli-width "^2.0.0" external-editor "^3.0.3" figures "^3.0.0" lodash "^4.17.15" mute-stream "0.0.8" - run-async "^2.2.0" + run-async "^2.4.0" rxjs "^6.5.3" string-width "^4.1.0" - strip-ansi "^5.1.0" + strip-ansi "^6.0.0" through "^2.3.6" internal-ip@^4.3.0: @@ -4486,12 +4488,7 @@ ip@^1.1.0, ip@^1.1.5: resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= -ipaddr.js@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65" - integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA== - -ipaddr.js@^1.9.0: +ipaddr.js@1.9.1, ipaddr.js@^1.9.0: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== @@ -5044,12 +5041,12 @@ loader-utils@^0.2.16: object-assign "^4.0.1" loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" - integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== + version "1.4.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== dependencies: big.js "^5.2.2" - emojis-list "^2.0.0" + emojis-list "^3.0.0" json5 "^1.0.1" locate-path@^3.0.0: @@ -5157,7 +5154,7 @@ make-dir@^2.0.0: pify "^4.0.1" semver "^5.6.0" -make-dir@^3.0.0: +make-dir@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.2.tgz#04a1acbf22221e1d6ef43559f43e05a90dbb4392" integrity sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w== @@ -5372,9 +5369,9 @@ minimist@0.0.8: integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= minimist@^1.1.3, minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== minipass-collect@^1.0.2: version "1.0.2" @@ -5544,9 +5541,9 @@ natural-compare@^1.4.0: integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= needle@^2.2.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz#3342dea100b7160960a450dc8c22160ac712a528" - integrity sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w== + version "2.3.3" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117" + integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw== dependencies: debug "^3.2.6" iconv-lite "^0.4.4" @@ -5651,10 +5648,10 @@ node-pre-gyp@*: semver "^5.3.0" tar "^4.4.2" -node-releases@^1.1.49: - version "1.1.49" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz#67ba5a3fac2319262675ef864ed56798bb33b93e" - integrity sha512-xH8t0LS0disN0mtRCh+eByxFPie+msJUBL/lJDBuap53QGiYPa9joh83K4pCZgWJ+2L4b9h88vCVdXQ60NO2bg== +node-releases@^1.1.50: + version "1.1.52" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9" + integrity sha512-snSiT1UypkgGt2wxPqS6ImEUICbNCMb31yaxWrOLXjhlt2z2/IBpaOxzONExqSm4y5oLnAqjjRWu+wsDzK5yNQ== dependencies: semver "^6.3.0" @@ -5689,9 +5686,9 @@ node-sass@^4.13.1: abbrev "1" nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= + version "4.0.3" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" + integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== dependencies: abbrev "1" osenv "^0.1.4" @@ -6720,7 +6717,7 @@ pretty-error@^2.0.2: renderkid "^2.0.1" utila "~0.4" -private@^0.1.6: +private@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== @@ -6746,12 +6743,12 @@ promise-inflight@^1.0.1: integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= proxy-addr@~2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34" - integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ== + version "2.0.6" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" + integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== dependencies: forwarded "~0.1.2" - ipaddr.js "1.9.0" + ipaddr.js "1.9.1" prr@~1.0.1: version "1.0.1" @@ -6964,10 +6961,10 @@ redent@^1.0.0: indent-string "^2.1.0" strip-indent "^1.0.1" -regenerate-unicode-properties@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e" - integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA== +regenerate-unicode-properties@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" + integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA== dependencies: regenerate "^1.4.0" @@ -6976,17 +6973,18 @@ regenerate@^1.4.0: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== -regenerator-runtime@^0.13.2: - version "0.13.3" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" - integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== +regenerator-runtime@^0.13.4: + version "0.13.5" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" + integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== -regenerator-transform@^0.14.0: - version "0.14.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb" - integrity sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ== +regenerator-transform@^0.14.2: + version "0.14.3" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.3.tgz#54aebff2ef58c0ae61e695ad1b9a9d65995fff78" + integrity sha512-zXHNKJspmONxBViAb3ZUmFoFPnTBs3zFhCEZJiwp/gkNzxVbTqNJVjYKx6Qk1tQ1P4XLf4TbH9+KBB7wGoAaUw== dependencies: - private "^0.1.6" + "@babel/runtime" "^7.8.4" + private "^0.1.8" regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" @@ -7009,27 +7007,27 @@ regexpp@^2.0.1: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== -regexpu-core@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6" - integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg== +regexpu-core@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938" + integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ== dependencies: regenerate "^1.4.0" - regenerate-unicode-properties "^8.1.0" - regjsgen "^0.5.0" - regjsparser "^0.6.0" + regenerate-unicode-properties "^8.2.0" + regjsgen "^0.5.1" + regjsparser "^0.6.4" unicode-match-property-ecmascript "^1.0.4" - unicode-match-property-value-ecmascript "^1.1.0" + unicode-match-property-value-ecmascript "^1.2.0" -regjsgen@^0.5.0: +regjsgen@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c" integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg== -regjsparser@^0.6.0: - version "0.6.3" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz#74192c5805d35e9f5ebe3c1fb5b40d40a8a38460" - integrity sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA== +regjsparser@^0.6.4: + version "0.6.4" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272" + integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw== dependencies: jsesc "~0.5.0" @@ -7220,10 +7218,10 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -run-async@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" - integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA= +run-async@^2.2.0, run-async@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8" + integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg== dependencies: is-promise "^2.1.0" @@ -7299,11 +7297,11 @@ schema-utils@^1.0.0: ajv-keywords "^3.1.0" schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.4: - version "2.6.4" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz#a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53" - integrity sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ== + version "2.6.5" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz#c758f0a7e624263073d396e29cd40aa101152d8a" + integrity sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ== dependencies: - ajv "^6.10.2" + ajv "^6.12.0" ajv-keywords "^3.4.1" scss-tokenizer@^0.2.3: @@ -8030,9 +8028,9 @@ terser-webpack-plugin@^2.3.4: webpack-sources "^1.4.3" terser@^4.1.2, terser@^4.4.3: - version "4.6.3" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz#e33aa42461ced5238d352d2df2a67f21921f8d87" - integrity sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ== + version "4.6.6" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.6.tgz#da2382e6cafbdf86205e82fb9a115bd664d54863" + integrity sha512-4lYPyeNmstjIIESr/ysHg2vUPRGf2tzF9z2yYwnowXVuVzLEamPN1Gfrz7f8I9uEPuHcbFlW4PLIAsJoxXyJ1g== dependencies: commander "^2.20.0" source-map "~0.6.1" @@ -8179,9 +8177,9 @@ ts-pnp@^1.1.6: integrity sha512-CrG5GqAAzMT7144Cl+UIFP7mz/iIhiy+xQ6GGcnjTezhALT02uPMRw7tgDSESgB5MsfKt55+GPWw4ir1kVtMIQ== tslib@^1.9.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" - integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== + version "1.11.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" + integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== tty-browserify@0.0.0: version "0.0.0" @@ -8207,6 +8205,11 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" +type-fest@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" + integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== + type-fest@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" @@ -8251,15 +8254,15 @@ unicode-match-property-ecmascript@^1.0.4: unicode-canonical-property-names-ecmascript "^1.0.4" unicode-property-aliases-ecmascript "^1.0.4" -unicode-match-property-value-ecmascript@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277" - integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g== +unicode-match-property-value-ecmascript@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531" + integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ== unicode-property-aliases-ecmascript@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57" - integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw== + version "1.1.0" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4" + integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg== union-value@^1.0.0: version "1.0.1" @@ -8440,6 +8443,11 @@ vary@~1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= +vconsole@^3.3.4: + version "3.3.4" + resolved "https://registry.yarnpkg.com/vconsole/-/vconsole-3.3.4.tgz#a7dacd8887b3d3e902e8d18425cda56c34e77f51" + integrity sha512-9yihsic96NPoMLQx/lCQwH9d89H0bbMW3LZPzo/t4yGQcS1X+vTCe9OHm1XSH7WNxzGDmcSwBiKLsFGwvJpQBg== + vendors@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" @@ -8476,6 +8484,11 @@ vue-hot-reload-api@^2.3.0: resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== +vue-i18n@^8.15.3: + version "8.15.5" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.15.5.tgz#e39e4724c88ec38ef72217de325e8b10a35718cf" + integrity sha512-lIej02+w8lP0k1PEN1xtXqKpQ1hDh17zvDF+7Oc2qJi+cTMDlfPM771w4euVaHO67AxEz4WL9MIgkyn3tkeCtQ== + vue-lazyload@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.3.3.tgz#4df50a271bde9b74c3caf7a228d6e0af50d5682f" @@ -8493,9 +8506,9 @@ vue-loader@^15.8.3: vue-style-loader "^4.1.0" vue-router@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.5.tgz#ff29b8a1e1306c526b52d4dc0532109f16c41231" - integrity sha512-BszkPvhl7I9h334GjckCh7sVFyjTPMMJFJ4Bsrem/Ik+B/9gt5tgrk8k4gGLO4ZpdvciVdg7O41gW4DisQWurg== + version "3.1.6" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.6.tgz#45f5a3a3843e31702c061dd829393554e4328f89" + integrity sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA== vue-style-loader@^4.1.0, vue-style-loader@^4.1.2: version "4.1.2" @@ -8524,9 +8537,9 @@ vue@^2.6.11: integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ== vuex@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.1.2.tgz#a2863f4005aa73f2587e55c3fadf3f01f69c7d4d" - integrity sha512-ha3jNLJqNhhrAemDXcmMJMKf1Zu4sybMPr9KxJIuOpVcsDQlTBYLLladav2U+g1AvdYDG5Gs0xBTb0M5pXXYFQ== + version "3.1.3" + resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.1.3.tgz#f2ad73e3fb73691698b38c93f66e58e267947180" + integrity sha512-k8vZqNMSNMgKelVZAPYw5MNb2xWSmVgCKtYKAptvm9YtZiOXnRXFWu//Y9zQNORTrm3dNj1n/WaZZI26tIX6Mw== watchpack@^1.6.0: version "1.6.0" @@ -8552,12 +8565,12 @@ wcwidth@^1.0.1: defaults "^1.0.3" webpack-bundle-analyzer@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.0.tgz#39b3a8f829ca044682bc6f9e011c95deb554aefd" - integrity sha512-orUfvVYEfBMDXgEKAKVvab5iQ2wXneIEorGNsyuOyVYpjYrI7CUOhhXNDd3huMwQ3vNNWWlGP+hzflMFYNzi2g== + version "3.6.1" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.1.tgz#bdb637c2304424f2fbff9a950c7be42a839ae73b" + integrity sha512-Nfd8HDwfSx1xBwC+P8QMGvHAOITxNBSvu/J/mCJvOwv+G4VWkU7zir9SSenTtyCi0LnVtmsc7G5SZo1uV+bxRw== dependencies: - acorn "^6.0.7" - acorn-walk "^6.1.1" + acorn "^7.1.1" + acorn-walk "^7.1.1" bfj "^6.1.1" chalk "^2.4.1" commander "^2.18.0" @@ -8652,9 +8665,9 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack- source-map "~0.6.1" webpack@^4.0.0: - version "4.41.6" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.6.tgz#12f2f804bf6542ef166755050d4afbc8f66ba7e1" - integrity sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA== + version "4.42.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz#b901635dd6179391d90740a63c93f76f39883eb8" + integrity sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w== dependencies: "@webassemblyjs/ast" "1.8.5" "@webassemblyjs/helper-module-context" "1.8.5" @@ -8811,10 +8824,10 @@ yargs-parser@^11.1.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^16.1.0: - version "16.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz#73747d53ae187e7b8dbe333f95714c76ea00ecf1" - integrity sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg== +yargs-parser@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.0.tgz#1b0ab1118ebd41f68bb30e729f4c83df36ae84c3" + integrity sha512-o/Jr6JBOv6Yx3pL+5naWSoIA2jJ+ZkMYQG/ie9qFbukBe4uzmBatlXFOiu/tNKRWEtyf+n5w7jc/O16ufqOTdQ== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" @@ -8845,9 +8858,9 @@ yargs@12.0.5: yargs-parser "^11.1.1" yargs@^15.0.0: - version "15.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz#e111381f5830e863a89550bd4b136bb6a5f37219" - integrity sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg== + version "15.3.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.0.tgz#403af6edc75b3ae04bf66c94202228ba119f0976" + integrity sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA== dependencies: cliui "^6.0.0" decamelize "^1.2.0" @@ -8859,7 +8872,7 @@ yargs@^15.0.0: string-width "^4.2.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^16.1.0" + yargs-parser "^18.1.0" yargs@^7.0.0: version "7.1.0" From fec1afeb50caf5968d829bcda873738a42aa8384 Mon Sep 17 00:00:00 2001 From: Ztj Date: Wed, 8 Apr 2020 00:09:26 +0800 Subject: [PATCH 14/23] add: example/multiple-entry --- example/multiple-entry/page.options.js | 10 ++++++++++ example/multiple-entry/page1.entry.js | 10 ++++++++++ example/multiple-entry/page1.vue | 3 +++ example/multiple-entry/page2.entry.js | 10 ++++++++++ example/multiple-entry/page2.vue | 3 +++ 5 files changed, 36 insertions(+) create mode 100644 example/multiple-entry/page.options.js create mode 100644 example/multiple-entry/page1.entry.js create mode 100644 example/multiple-entry/page1.vue create mode 100644 example/multiple-entry/page2.entry.js create mode 100644 example/multiple-entry/page2.vue diff --git a/example/multiple-entry/page.options.js b/example/multiple-entry/page.options.js new file mode 100644 index 0000000..49361b0 --- /dev/null +++ b/example/multiple-entry/page.options.js @@ -0,0 +1,10 @@ +module.exports = { + 'multiple-entry-page1': { + entry: 'src/multiple-entry/page1.entry.js', + title: '测试多入口一', + }, + 'multiple-entry-page2': { + entry: 'src/multiple-entry/page2.entry.js', + title: '测试多入口二', + }, +}; diff --git a/example/multiple-entry/page1.entry.js b/example/multiple-entry/page1.entry.js new file mode 100644 index 0000000..64be443 --- /dev/null +++ b/example/multiple-entry/page1.entry.js @@ -0,0 +1,10 @@ +import Vue from 'vue' +import App from './page1.vue' + +Vue.config.productionTip = false; + +let app = new Vue({ + render: h => h(App), +}).$mount('#app'); + +window.app = app; diff --git a/example/multiple-entry/page1.vue b/example/multiple-entry/page1.vue new file mode 100644 index 0000000..ceb2fdc --- /dev/null +++ b/example/multiple-entry/page1.vue @@ -0,0 +1,3 @@ + diff --git a/example/multiple-entry/page2.entry.js b/example/multiple-entry/page2.entry.js new file mode 100644 index 0000000..3122025 --- /dev/null +++ b/example/multiple-entry/page2.entry.js @@ -0,0 +1,10 @@ +import Vue from 'vue' +import App from './page2.vue' + +Vue.config.productionTip = false; + +let app = new Vue({ + render: h => h(App), +}).$mount('#app'); + +window.app = app; diff --git a/example/multiple-entry/page2.vue b/example/multiple-entry/page2.vue new file mode 100644 index 0000000..9d2c434 --- /dev/null +++ b/example/multiple-entry/page2.vue @@ -0,0 +1,3 @@ + From e9aaa282d7c0564285caadbdd68f0b96b8a68259 Mon Sep 17 00:00:00 2001 From: Ztj Date: Wed, 8 Apr 2020 00:11:43 +0800 Subject: [PATCH 15/23] doc: refactor multiple-entry.md --- docs/usage/multiple-entry.md | 47 ++++-------------------------------- docs/usage/vue-pages.md | 2 -- 2 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 docs/usage/vue-pages.md diff --git a/docs/usage/multiple-entry.md b/docs/usage/multiple-entry.md index 7c577a2..c917f03 100644 --- a/docs/usage/multiple-entry.md +++ b/docs/usage/multiple-entry.md @@ -1,50 +1,13 @@ -# 多入口文件 +# 多入口多页面功能 多入口文件,主要用于多页构建。 -但本脚手架中的入口文件不仅仅是多页构建,还包括动态多入口。 - -脚手架的入口主要有三个: -- 主入口 -- 自定义入口 -- 单页入口 - -参考: -``` -example/sample/entries/sample.js -example/sample/single/sample/entry.js -``` +本脚手架中的入口文件不仅仅是多页构建,还包括动态多入口。 注意:多入口需要先开启环境变量 ``` PAGES_ENABLE=true ``` -## 主入口 -文件: -``` -src/main.js -``` -路由: -``` -/ -``` - -## 自定义入口 -文件: -``` -src/entries/*.js -``` -路由: -``` -/html-page/* -``` - -## 单页入口 -文件: -``` -src/single/*/entry.js -``` -路由: -``` -/html-single/* -``` +脚手架的入口参考: +- 主入口:参考 `src/main.js` 文件 +- 自定义入口:参考 `example/multiple-entry/page.options.js` 文件 diff --git a/docs/usage/vue-pages.md b/docs/usage/vue-pages.md deleted file mode 100644 index dc62c39..0000000 --- a/docs/usage/vue-pages.md +++ /dev/null @@ -1,2 +0,0 @@ -# VUE 多页面功能 -VUE 多页面功能是一个由多入口定义的,具体参考《多入口文件》文档。 From 245908d99e889f5a584335fff1c346901e575720 Mon Sep 17 00:00:00 2001 From: Ztj Date: Wed, 8 Apr 2020 00:22:15 +0800 Subject: [PATCH 16/23] doc: global-plugin.md --- docs/usage/global-plugin.md | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/docs/usage/global-plugin.md b/docs/usage/global-plugin.md index ef0ac1e..98f0e13 100644 --- a/docs/usage/global-plugin.md +++ b/docs/usage/global-plugin.md @@ -1,18 +1,14 @@ # 自动加载全局插件并配置 ESLint 在开发中,我们需要用到一些全局插件,如 jQuery,自定义的全局库等。 -在 vue cli 中,这些是需要手动配置的,但在本框架中,只需要放入指定的位置即可。 +在 vue cli 中,这些是需要手动配置的,但在本框架中,只需要创建指定的文件即可。 -## 全局插件目录 -``` -/src/definitions -``` - -## 示例 +## 定义规则 +在 `src` 下任意目录创建 `{alias}.definition.js` 文件即可。 -### 添加全局 axios -新建文件:`/src/definitions/axios.js` +## 示例:axios +新建文件:`/src/axios.definition.js` ``` -module.exports = require('../../modules/definitions/axios'); +module.exports = require('../modules/definitions/axios'); ``` 页面中使用(无需引入包): From b3ba38f8f8201d4929ec139aed7abfddac09e067 Mon Sep 17 00:00:00 2001 From: Ztj Date: Wed, 8 Apr 2020 00:26:41 +0800 Subject: [PATCH 17/23] optimize: router vue import path --- modules/utils/router.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/utils/router.js b/modules/utils/router.js index 04a6780..401fe15 100644 --- a/modules/utils/router.js +++ b/modules/utils/router.js @@ -1,5 +1,5 @@ import Vue from 'vue' -import RouterPlugin from '../../modules/vue/router'; +import RouterPlugin from '../vue/router'; let files = null; let routes = []; From bafff99e9163969a10864f13008be253b1ff441e Mon Sep 17 00:00:00 2001 From: Ztj Date: Wed, 8 Apr 2020 00:34:06 +0800 Subject: [PATCH 18/23] transfer: multiple router example --- {modules/router => example/multiple-router}/pages.router.js | 0 {modules/router => example/multiple-router}/single.router.js | 0 {modules/router => example/multiple-router}/testing.router.js | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {modules/router => example/multiple-router}/pages.router.js (100%) rename {modules/router => example/multiple-router}/single.router.js (100%) rename {modules/router => example/multiple-router}/testing.router.js (100%) diff --git a/modules/router/pages.router.js b/example/multiple-router/pages.router.js similarity index 100% rename from modules/router/pages.router.js rename to example/multiple-router/pages.router.js diff --git a/modules/router/single.router.js b/example/multiple-router/single.router.js similarity index 100% rename from modules/router/single.router.js rename to example/multiple-router/single.router.js diff --git a/modules/router/testing.router.js b/example/multiple-router/testing.router.js similarity index 100% rename from modules/router/testing.router.js rename to example/multiple-router/testing.router.js From 72bcc7c9085535cf82b9eeebeb8262878728541e Mon Sep 17 00:00:00 2001 From: Ztj Date: Wed, 8 Apr 2020 00:34:30 +0800 Subject: [PATCH 19/23] doc: multiple-router.md --- docs/usage/multiple-router.md | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/docs/usage/multiple-router.md b/docs/usage/multiple-router.md index f955ae7..29bf798 100644 --- a/docs/usage/multiple-router.md +++ b/docs/usage/multiple-router.md @@ -1,32 +1,12 @@ -# 多路由文件 +# 多路由文件功能 -多路由功能可以完全的自定义路由,定义的路由放在 `src/router` 目录即可。 +多路由功能可以完全的自定义路由,只需要先引入 `modules/utils/router.js` 文件即可。 定义的文件名命名规范为:`*.router.js` 返回的数据要求是一个路由列表,参考: ``` -example/sample/router/sample.router.js -modules/router/pages.router.js -modules/router/single.router.js -modules/router/testing.router.js +example/multiple-router/pages.router.js +example/multiple-router/single.router.js +example/multiple-router/testing.router.js ``` - -## 公有路由说明 - -### pages.router.js -定义了 `src/pages/{name}.vue` 的所有路由。 - -路由访问:`/page/{name}` - -### single.router.js -定义了 `src/single/*/index.vue` 的所有路由。 - -路由访问:`/single/{name}` - -### testing.router.js -定义了 `src/**/testing.vue` 的所有路由。 - -路由访问:`/testing/{name}` - -这个路由用于写组件的测试文件。 From 8809f853771feea367c287c8ce7427e6df5703c9 Mon Sep 17 00:00:00 2001 From: Ztj Date: Wed, 8 Apr 2020 00:38:19 +0800 Subject: [PATCH 20/23] optimize: clear sample example --- example/sample/components/Sample.vue | 3 --- example/sample/entries/sample.js | 10 ---------- example/sample/pages/sample.vue | 3 --- example/sample/router/sample.router.js | 5 ----- example/sample/single/sample/entry.js | 8 -------- example/sample/single/sample/index.vue | 3 --- example/sample/views/sample.vue | 14 -------------- 7 files changed, 46 deletions(-) delete mode 100644 example/sample/components/Sample.vue delete mode 100644 example/sample/entries/sample.js delete mode 100644 example/sample/pages/sample.vue delete mode 100644 example/sample/router/sample.router.js delete mode 100644 example/sample/single/sample/entry.js delete mode 100644 example/sample/single/sample/index.vue delete mode 100644 example/sample/views/sample.vue diff --git a/example/sample/components/Sample.vue b/example/sample/components/Sample.vue deleted file mode 100644 index 410d95f..0000000 --- a/example/sample/components/Sample.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/example/sample/entries/sample.js b/example/sample/entries/sample.js deleted file mode 100644 index 0a64e8e..0000000 --- a/example/sample/entries/sample.js +++ /dev/null @@ -1,10 +0,0 @@ -import Vue from 'vue' -import App from '../pages/sample.vue' - -import '../utils' - -Vue.config.productionTip = false; - -new Vue({ - render: h => h(App), -}).$mount('#app'); diff --git a/example/sample/pages/sample.vue b/example/sample/pages/sample.vue deleted file mode 100644 index c0f39c5..0000000 --- a/example/sample/pages/sample.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/example/sample/router/sample.router.js b/example/sample/router/sample.router.js deleted file mode 100644 index 2988ccc..0000000 --- a/example/sample/router/sample.router.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = [{ - path: '/', - name: 'Sample', - component: () => import('../views/sample.vue') -}]; diff --git a/example/sample/single/sample/entry.js b/example/sample/single/sample/entry.js deleted file mode 100644 index 663ab8b..0000000 --- a/example/sample/single/sample/entry.js +++ /dev/null @@ -1,8 +0,0 @@ -import Vue from 'vue' -import App from './index.vue' - -Vue.config.productionTip = false; - -new Vue({ - render: h => h(App), -}).$mount('#app'); diff --git a/example/sample/single/sample/index.vue b/example/sample/single/sample/index.vue deleted file mode 100644 index 9d655eb..0000000 --- a/example/sample/single/sample/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/example/sample/views/sample.vue b/example/sample/views/sample.vue deleted file mode 100644 index 0657c29..0000000 --- a/example/sample/views/sample.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - From 2543b9d3c2aa3adca223aede544db9a0c3c8f8a6 Mon Sep 17 00:00:00 2001 From: Ztj Date: Mon, 13 Apr 2020 15:48:49 +0800 Subject: [PATCH 21/23] transfer: main --- {src => modules/main}/main.js | 2 +- {src => modules/main}/main.vue | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {src => modules/main}/main.js (86%) rename {src => modules/main}/main.vue (100%) diff --git a/src/main.js b/modules/main/main.js similarity index 86% rename from src/main.js rename to modules/main/main.js index 60b22d9..976d536 100644 --- a/src/main.js +++ b/modules/main/main.js @@ -1,7 +1,7 @@ import Vue from 'vue' import App from './main.vue' -import '../modules/utils' +import '../utils' Vue.config.productionTip = false; diff --git a/src/main.vue b/modules/main/main.vue similarity index 100% rename from src/main.vue rename to modules/main/main.vue From 26e9b6f571bac9054a7c101440be2a6456b8c64a Mon Sep 17 00:00:00 2001 From: Ztj Date: Mon, 13 Apr 2020 15:49:16 +0800 Subject: [PATCH 22/23] ignore: /src --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a0dddc6..a1c3fc0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules /dist +/src # local env files .env.local From 87b12e8e681c9bbf585ca74fb2e14492cb37bfee Mon Sep 17 00:00:00 2001 From: Ztj Date: Sun, 19 Apr 2020 01:59:58 +0800 Subject: [PATCH 23/23] doc: update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 17357d9..bc47a35 100644 --- a/README.md +++ b/README.md @@ -12,12 +12,11 @@ ## 项目功能 - vue, vue-router, vuex, sass -- [vue pages](./docs/usage/vue-pages.md) +- [vue pages/multiple entry/多页面多入口功能](./docs/usage/multiple-entry.md) - [px to viewport](./docs/usage/px-to-viewport.md) - [px to rem](./docs/usage/px-to-rem.md) - [单 HTML 文件打包](./docs/usage/single-html.md) -- [多入口文件](./docs/usage/multiple-entry.md) -- [多路由文件](./docs/usage/multiple-router.md) +- [multiple router/多路由文件功能](./docs/usage/multiple-router.md) - [全局插件并配置 eslint](./docs/usage/global-plugin.md) ## Project setup