diff --git a/build/insertPreload.js b/build/insertPreload.js index d25521b..7469ad0 100644 --- a/build/insertPreload.js +++ b/build/insertPreload.js @@ -3,28 +3,79 @@ * 依赖: * https://github.com/jantimon/html-webpack-plugin * @vue/preload-webpack-plugin (fork:https://github.com/GoogleChromeLabs/preload-webpack-plugin) + * 合并: https://github.com/szrenwei/inline-manifest-webpack-plugin * @Author: Maorey * @Date: 2019-01-17 11:42:24 */ +const sourceMappingURL = require('source-map-url') const PLUGIN_NAME = 'insert-preload' +function getAssetName(chunks, reg) { + const match = [] + for (let chunk of chunks) { + reg.test(chunk.name) && + match.push({ name: chunk.name, file: chunk.files[0] }) + } + return match +} +function inlineWhenMatched(compilation, scripts, manifestAssetNames) { + return scripts.map(script => { + if (script.tagName === 'script') { + const src = script.attributes.src + for (let item of manifestAssetNames) { + if (src.indexOf(item.file) >= 0) { + return { + tagName: 'script', + closeTag: true, + attributes: { + type: 'text/javascript', + }, + innerHTML: sourceMappingURL.removeFrom( + compilation.assets[item.file].source(), + ), + } + } + } + } + + return script + }) +} + /** 插入 preload 的资源插件 */ module.exports = class { /** * @param {Object} option 选项 * { - * runtime:String 待移除preload的runtime名 - * falsy: 不移除, true = 'runtime', String: 指定名字 + * runtime:String|Array|RegExp 内联runtime * defer:Boolean 脚本是否defer 默认true * async:Boolean 脚本是否async 默认false (和defer只能有一个) * } */ constructor(option = {}) { let runtime = option.runtime - runtime === true && (runtime = 'runtime') - this._REG_REMOVE = runtime && new RegExp(`(?:[\\/]|^)${runtime}\\..*\\.js$`) + if (runtime) { + if (typeof runtime.test === 'function') { + this._REG_RUNTIME = runtime + } else { + typeof runtime === 'string' && (runtime = [runtime]) + for (let i = 0; i < runtime.length; i++) { + runtime[i] = new RegExp(runtime[i]) + } + this._REG_RUNTIME = { + test(str) { + for (let reg of runtime) { + if (reg.test(str)) { + return true + } + } + return false + }, + } + } + } this._SA = option.defer === false ? option.async === true && 'async' : 'defer' } @@ -42,6 +93,75 @@ module.exports = class { htmlPluginData => this.insert(htmlPluginData), ), ) + // inline-manifest + const REG_RUNTIME = this._REG_RUNTIME + if (REG_RUNTIME) { + compiler.hooks.emit.tap(PLUGIN_NAME, compilation => { + for (let item of getAssetName(compilation.chunks, REG_RUNTIME)) { + delete compilation.assets[item.file] + } + }) + compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => { + compilation.hooks.htmlWebpackPluginAlterAssetTags.tapAsync( + PLUGIN_NAME, + (data, cb) => { + const manifestAssetNames = getAssetName( + compilation.chunks, + REG_RUNTIME, + ) + + manifestAssetNames.length && + ['head', 'body'].forEach(section => { + data[section] = inlineWhenMatched( + compilation, + data[section], + manifestAssetNames, + ) + }) + + cb(null, data) + }, + ) + + compilation.hooks.htmlWebpackPluginBeforeHtmlGeneration.tapAsync( + PLUGIN_NAME, + (htmlPluginData, cb) => { + const runtime = [] + const assets = htmlPluginData.assets + const manifestAssetNames = getAssetName( + compilation.chunks, + REG_RUNTIME, + ) + + if ( + manifestAssetNames.length && + htmlPluginData.plugin.options.inject === false + ) { + for (let item of manifestAssetNames) { + runtime.push('') + + const runtimeIndex = assets.js.indexOf( + assets.publicPath + item.file, + ) + if (runtimeIndex >= 0) { + assets.js.splice(runtimeIndex, 1) + delete assets.chunks[item.name] + } + } + } + + assets.runtime = runtime.join('') + cb(null, htmlPluginData) + }, + ) + }) + } // 不能这么加loader // const REG_EXCLUDE = /[\\/]node_modules[\\/]/ // const REG_INCLUDE = /\.(?:ts|vue|tsx|js|jsx)$/ @@ -67,7 +187,7 @@ module.exports = class { const script = 'script' const relStyle = 'stylesheet' - const REG_RUNTIME = this._REG_REMOVE + const REG_RUNTIME = this._REG_RUNTIME const SCRIPT_ATTRIBUTE = this._SA let el diff --git a/build/production.config.js b/build/production.config.js index 34f4a2e..660372d 100644 --- a/build/production.config.js +++ b/build/production.config.js @@ -4,7 +4,6 @@ * @Date: 2019-04-01 13:28:06 */ const path = require('path') -const RUNTIME_CHUNK = 'runtime' const getLoaderOption = name => ({ limit: 4096, @@ -43,7 +42,7 @@ function fileName(config) { .options(getLoaderOption('media/' + FileName)) } -function plugin(config, DIR) { +function plugin(config, DIR, pages) { // 【弃 过时但有效】固定打包文件哈希, 避免相同代码打包出不同哈希 // (排除 boilerplate(runtime and manifest)等影响) // config.plugin('md5-hash').use('webpack-md5-hash') @@ -55,12 +54,17 @@ function plugin(config, DIR) { config .plugin('insert-preload') .use(path.join(DIR, 'build/insertPreload.js'), [ - { runtime: RUNTIME_CHUNK, defer: true }, + { + runtime: (() => { + const RUNTIMES = [] + for (const entry in pages) { + RUNTIMES.push(entry + '_') + } + return RUNTIMES + })(), + defer: true, + }, ]) - // runtime Chunk 内联到html - config - .plugin('inline-manifest') - .use('inline-manifest-webpack-plugin', [RUNTIME_CHUNK]) // 文件 gzip 压缩 https://webpack.docschina.org/plugins/compression-webpack-plugin/ config.plugin('gzip').use('compression-webpack-plugin', [ { @@ -84,9 +88,10 @@ function plugin(config, DIR) { /** webpack 配置 * @param {chainWebpack} config 配置对象 * @param {Object} ENV 环境变量 + * @param {Object} pages 入口 * https://github.com/neutrinojs/webpack-chain#getting-started */ -module.exports = function(config, ENV) { +module.exports = function(config, ENV, pages) { const DIR = process.cwd() config.merge({ // https://webpack.js.org/configuration/other-options/#recordspath @@ -117,11 +122,11 @@ module.exports = function(config, ENV) { // .loader(loader) // } fileName(config) - plugin(config, DIR) + plugin(config, DIR, pages) /// 【优化(optimization)】 /// // https://webpack.docschina.org/configuration/optimization 默认就好 - config.optimization.runtimeChunk({ name: RUNTIME_CHUNK }) + config.optimization.runtimeChunk({ name: o => o.name + '_' }) /// 【代码分割(optimization.splitChunks 不能config.merge({}))】 /// // https://webpack.docschina.org/plugins/split-chunks-plugin @@ -168,14 +173,37 @@ module.exports = function(config, ENV) { reuseExistingChunk: true, test: /[\\/]node_modules[\\/]core-js(?:-pure)?[\\/]/, }, - // configs (每个页面分开应无必要) + // configs conf: { name: 'conf', chunks: 'all', enforce: true, // 确保会创建这个chunk (否则可能会根据splitChunks选项被合并/拆分) - priority: 666, - test: /[\\/]config[\\/]/, + priority: 66, + test: /src[\\/](?:[^\\/]+[\\/])*config[\\/]/, }, + // 各入口的配置文件 + ...(() => { + const group = {} + const prefix = 'conf.' + const REG = /[\\/]/g + const STR = '[\\\\/]' + const STR_ = '[^\\\\/]' + const REG_SUB = /[^\\/]+$/ + let name + let entry + for (name in pages) { + entry = pages[name].entry.replace(REG_SUB, '').replace(REG, STR) + name = prefix + name + group[name] = { + name, + chunks: 'all', + enforce: true, + priority: 666, + test: new RegExp(`${entry}(?:${STR_}+${STR})*config${STR}`), + } + } + return group + })(), // json文件 (-> json.*.*.js) // json: { // name: 'json', @@ -184,21 +212,13 @@ module.exports = function(config, ENV) { // priority: 668, // test: /[\\/]?.+\.json(?:[^\w].*)?$/, // 或者 type: 'json' // }, - // vue - v: { - name: 'v', - chunks: 'all', - enforce: true, - priority: 66, - test: /[\\/]node_modules[\\/]vue[\\/]/, - }, - // vue全家桶全搜集 (vuex/vue-router...) - vf: { - name: 'vf', + // vue全搜集 (vue/vuex/vue-router...) + vue: { + name: 'vue', chunks: 'all', priority: 66, reuseExistingChunk: true, - test: /[\\/]node_modules[\\/]vue.+[\\/]/, + test: /[\\/]node_modules[\\/]vue.*[\\/]/, }, // elementUI (建议按需引入) eui: { @@ -208,14 +228,6 @@ module.exports = function(config, ENV) { reuseExistingChunk: true, test: /[\\/]node_modules[\\/]element-ui[\\/]/, }, - // d3.js - d3: { - name: 'd3', - chunks: 'all', - priority: 66, - reuseExistingChunk: true, - test: /[\\/]node_modules[\\/]d3[\\/]/, - }, // zrender (二维绘图引擎) zrd: { name: 'zrd', @@ -232,6 +244,14 @@ module.exports = function(config, ENV) { reuseExistingChunk: true, test: /[\\/]node_modules[\\/]echarts[\\/]/, }, + // d3.js + d3: { + name: 'd3', + chunks: 'all', + priority: 66, + reuseExistingChunk: true, + test: /[\\/]node_modules[\\/]d3[\\/]/, + }, // zdog zdg: { name: 'zdg', diff --git a/package.json b/package.json index e151d79..d76cc5e 100644 --- a/package.json +++ b/package.json @@ -29,10 +29,10 @@ }, "dependencies": { "axios": "^0.19.0", - "core-js": "^3.4.1", + "core-js": "^3.4.2", "crypto-js": "^3.1.9-1", "d3": "^5.14.1", - "echarts": "^4.4.0", + "echarts": "^4.5.0", "element-ui": "^2.12.0", "jsencrypt": "^3.0.0-rc.1", "luma.gl": "^7.3.2", @@ -58,8 +58,8 @@ "@types/d3": "^5.7.2", "@types/echarts": "^4.4.1", "@types/jest": "^24.0.23", - "@typescript-eslint/eslint-plugin": "^2.7.0", - "@typescript-eslint/parser": "^2.7.0", + "@typescript-eslint/eslint-plugin": "^2.8.0", + "@typescript-eslint/parser": "^2.8.0", "@vue/cli-plugin-babel": "^4.0.5", "@vue/cli-plugin-e2e-cypress": "^4.0.5", "@vue/cli-plugin-eslint": "^4.0.5", @@ -69,23 +69,26 @@ "@vue/cli-plugin-unit-jest": "^4.0.5", "@vue/cli-plugin-vuex": "^4.0.5", "@vue/cli-service": "^4.0.5", - "@vue/eslint-config-standard": "^4.0.0", + "@vue/eslint-config-standard": "^5.0.0", "@vue/eslint-config-typescript": "^5.0.0", "@vue/test-utils": "^1.0.0-beta.29", "compression-webpack-plugin": "^3.0.0", "eslint": "^6.6.0", + "eslint-plugin-import": "^2.18.2", + "eslint-plugin-node": "^10.0.0", + "eslint-plugin-promise": "^4.2.1", + "eslint-plugin-standard": "^4.0.1", "eslint-plugin-vue": "^6.0.1", "fibers": "^4.0.2", - "inline-manifest-webpack-plugin": "^4.0.2", "lint-staged": "^9.4.3", "regenerate": "^1.4.0", "regjsgen": "^0.5.1", "regjsparser": "^0.6.0", - "sass": "^1.23.6", + "sass": "^1.23.7", "sass-loader": "^8.0.0", "stylelint": "^12.0.0", "stylelint-config-scss-maorey": "^1.1.1", - "stylelint-webpack-plugin": "^1.0.4", + "stylelint-webpack-plugin": "^1.1.0", "typescript": "^3.7.2", "unicode-match-property-ecmascript": "^1.0.4", "unicode-match-property-value-ecmascript": "^1.1.0", diff --git a/src/pages/index/components/charts/Line.vue b/src/pages/index/components/charts/Line.vue index 9f7fd2a..a010dee 100644 --- a/src/pages/index/components/charts/Line.vue +++ b/src/pages/index/components/charts/Line.vue @@ -41,6 +41,7 @@ export default class extends Vue { private mounted() { this.init() } + private destroyed() { this.clear() } @@ -157,6 +158,7 @@ export default class extends Vue { this.interval = setInterval(() => this.refresh(), INTERVAL) } } + private clear() { clearInterval(this.interval) } diff --git a/src/pages/index/components/charts/Rose.vue b/src/pages/index/components/charts/Rose.vue index e916ee2..ef52b88 100644 --- a/src/pages/index/components/charts/Rose.vue +++ b/src/pages/index/components/charts/Rose.vue @@ -39,13 +39,16 @@ export default class extends Vue { private onDataChange(/* data?: EChartOption.SeriesPie */) { this.init() } + /// LifeCycle (private beforeCreate/created/.../destroyed) /// private mounted() { this.init() } + private destroyed() { this.clear() } + /// methods (private/public) /// private init() { this.clear() @@ -91,6 +94,7 @@ export default class extends Vue { this.interval = setInterval(() => this.refresh(), INTERVAL) } } + private clear() { clearInterval(this.interval) } diff --git a/src/pages/index/components/visual/Balls.vue b/src/pages/index/components/visual/Balls.vue index dddf959..e51f47c 100644 --- a/src/pages/index/components/visual/Balls.vue +++ b/src/pages/index/components/visual/Balls.vue @@ -54,26 +54,18 @@ export default class extends Vue { return } - let camera: PerspectiveCamera - let scene: Scene - let renderer: WebGLRenderer - let clock: Clock - let group: Group - let composer1: EffectComposer - let composer2: EffectComposer - // init - camera = new PerspectiveCamera( + const camera: PerspectiveCamera = new PerspectiveCamera( 45, (canvas.offsetWidth * 0.5) / canvas.offsetHeight, 1, 2000, ) camera.position.z = 500 - scene = new Scene() + const scene: Scene = new Scene() scene.background = null scene.fog = new Fog(0x666666, 100, 1500) - clock = new Clock() + const clock: Clock = new Clock() const hemiLight = new HemisphereLight(0xffffff, 0x444444) hemiLight.position.set(0, 1000, 0) @@ -82,7 +74,7 @@ export default class extends Vue { dirLight.position.set(-3000, 1000, -1000) scene.add(dirLight) - group = new Group() + const group: Group = new Group() const geometry = new IcosahedronBufferGeometry(10, 2) const material = new MeshStandardMaterial({ color: 0xee0808, @@ -98,7 +90,7 @@ export default class extends Vue { } scene.add(group) - renderer = new WebGLRenderer({ + const renderer: WebGLRenderer = new WebGLRenderer({ canvas, context: canvas.getContext( WEBGL.isWebGL2Available() ? 'webgl2' : 'webgl', @@ -112,7 +104,7 @@ export default class extends Vue { const renderPass = new RenderPass(scene, camera) const copyPass = new ShaderPass(CopyShader) - composer1 = new EffectComposer( + const composer1: EffectComposer = new EffectComposer( renderer, new WebGLMultisampleRenderTarget(size.width, size.height, { format: RGBAFormat, @@ -122,7 +114,7 @@ export default class extends Vue { composer1.addPass(renderPass) composer1.addPass(copyPass) - composer2 = new EffectComposer(renderer) + const composer2: EffectComposer = new EffectComposer(renderer) composer2.addPass(renderPass) composer2.addPass(copyPass) diff --git a/src/pages/index/components/visual/Bubble.vue b/src/pages/index/components/visual/Bubble.vue index 3965ff2..5bdf1fd 100644 --- a/src/pages/index/components/visual/Bubble.vue +++ b/src/pages/index/components/visual/Bubble.vue @@ -86,6 +86,7 @@ export default class extends Vue { offset.top += halfHeight this.offset = offset } + /// methods (private/public) /// private move(event: MouseEvent) { const root = this.root as SimulationNodeDatum diff --git a/src/pages/index/views/Home/ModuleOne.vue b/src/pages/index/views/Home/ModuleOne.vue index 27b55fe..600e38e 100644 --- a/src/pages/index/views/Home/ModuleOne.vue +++ b/src/pages/index/views/Home/ModuleOne.vue @@ -39,6 +39,7 @@ export default class extends Vue { private created() { this.get() } + /// methods (private/public) /// private get() { line() diff --git a/src/pages/index/views/Home/ModuleTwo.vue b/src/pages/index/views/Home/ModuleTwo.vue index d6467b8..168582a 100644 --- a/src/pages/index/views/Home/ModuleTwo.vue +++ b/src/pages/index/views/Home/ModuleTwo.vue @@ -40,6 +40,7 @@ export default class extends Vue { private created() { this.get() } + /// methods (private/public) /// private get() { pie() diff --git a/src/store/prefer.ts b/src/store/prefer.ts index f871e65..6d62d70 100644 --- a/src/store/prefer.ts +++ b/src/store/prefer.ts @@ -34,6 +34,7 @@ class Prefer extends VuexModule implements IPrefer { protected LANG(lang: string) { this.lang = PREFER.lang = lang } + @Mutation protected SKIN(skin: string) { this.skin = PREFER.skin = SKIN.value = skin @@ -47,6 +48,7 @@ class Prefer extends VuexModule implements IPrefer { setSkin(skin: string = process.env.THEME) { this.context.commit('SKIN', skin) } + /** 设置语言 * @param {String} lang 语言 */ diff --git a/src/store/user.ts b/src/store/user.ts index e4ad911..6d254dd 100644 --- a/src/store/user.ts +++ b/src/store/user.ts @@ -40,6 +40,7 @@ class User extends VuexModule implements IUser { protected INFO(info?: IInfo) { this.info = USER_INFO.info = info } + @Mutation protected MENU(menu?: string[]) { this.menu = USER_INFO.menu = menu @@ -58,6 +59,7 @@ class User extends VuexModule implements IUser { context.commit('MENU', data.menu) USER_INFO.token = data.token } + /** 注销 */ @Action diff --git a/src/utils/skin.ts b/src/utils/skin.ts index 16c0122..902c9a5 100644 --- a/src/utils/skin.ts +++ b/src/utils/skin.ts @@ -13,7 +13,7 @@ const DEFAULT = process.env.THEME */ let theme = DEFAULT -let state = {} +const state = {} Object.defineProperty(state, 'value', { get: () => theme, set(skin = DEFAULT) { diff --git a/src/utils/storage.ts b/src/utils/storage.ts index 873b8b8..8c733a1 100644 --- a/src/utils/storage.ts +++ b/src/utils/storage.ts @@ -240,7 +240,7 @@ const local = { return } // 加时间戳 - let temp = (CACHE[key] = CACHE[key] || {}) + const temp = (CACHE[key] = CACHE[key] || {}) expires === undefined ? (str = (temp.e || diff --git a/vue.config.js b/vue.config.js index 91abe7e..e3c7580 100644 --- a/vue.config.js +++ b/vue.config.js @@ -59,6 +59,6 @@ module.exports = { /// 【不同环境配置】 /// require(isProd ? './build/production.config' - : './build/development.config')(config, ENV) + : './build/development.config')(config, ENV, pages) }, } diff --git a/yarn.lock b/yarn.lock index 483ed92..6aceb05 100644 --- a/yarn.lock +++ b/yarn.lock @@ -933,31 +933,31 @@ "@types/istanbul-reports" "^1.1.1" "@types/yargs" "^13.0.0" -"@loaders.gl/core@1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@loaders.gl/core/-/core-1.3.4.tgz#eb6222865bf121f0063c4355121f92b499a3df17" - integrity sha512-9yjNuWL/qaN68tDY/HnWjQ/5YMtIXo/Rw1NgGyrIpt+aQpK9YhIg7ZLd06vIOzEg1N/3FxjaEcauRTOKpiiMHA== +"@loaders.gl/core@1.3.5": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/core/-/core-1.3.5.tgz#e7046b0e75e45db9fa6c4f0816395ef69aa7d9a8" + integrity sha512-aCVHgLrFuVvxqEP2soN/nst22mfEzAfhhe9LuFQbLcg2oUKbaW6eh1EW6AeYSkkjCmRkCmXRYLFWNvjbg2R55g== dependencies: "@babel/runtime" "^7.3.1" "@loaders.gl/gltf@^1.3.0": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@loaders.gl/gltf/-/gltf-1.3.4.tgz#ec28412f0f2bbcb19fca70b6cbec9546d58d322a" - integrity sha512-vNFJfavybsCSD3dTuy96wIttqoJnQrfnppceOrOPGJma0SuSLSy/hjCRzEFRF1lU8XWw+Nq4HVJTKWas78jvzQ== + version "1.3.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/gltf/-/gltf-1.3.5.tgz#bc7500eaad3429d41d071059757723d34ad7037a" + integrity sha512-JLsa0Q7h8Nt+FUECIaEewdJ6DusQxycazfiUo3D2gj8Lt15ydsdPtWLwDhyWRhm80i4FtqO5IqZTQIyTNAlOmA== dependencies: - "@loaders.gl/core" "1.3.4" - "@loaders.gl/images" "1.3.4" - "@loaders.gl/loader-utils" "1.3.4" + "@loaders.gl/core" "1.3.5" + "@loaders.gl/images" "1.3.5" + "@loaders.gl/loader-utils" "1.3.5" -"@loaders.gl/images@1.3.4", "@loaders.gl/images@^1.3.0": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@loaders.gl/images/-/images-1.3.4.tgz#cddf36b43b1e10ff8d8fab13626398589b7eaab3" - integrity sha512-zsIlJ8PWkOjp62DoTmvU6AgoAe9zk5MckHGTybd8aQG7UHsjiRYiWYcJJvZ5oat5SEeULxVUcpI3ShUxB/lgpA== +"@loaders.gl/images@1.3.5", "@loaders.gl/images@^1.3.0": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/images/-/images-1.3.5.tgz#7e34847c66418879e5bad96f7667ab3a34d4825e" + integrity sha512-96F9a1+7HsFEr+bnZh04r4pI2J7iXq4CvaQowCd75sFzgiHBvniHjMDNhjpbzHqGskXoKrSCJUeQ/EVUPCxZtw== -"@loaders.gl/loader-utils@1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@loaders.gl/loader-utils/-/loader-utils-1.3.4.tgz#e39b1e6cbdfc10072433b7928bbbbb8555d39745" - integrity sha512-TSolYGo70IksbmjjXZmYsiWlieRrMAlcOcR0XVQPMPmt8XlfL4IwSnS5FuMeRWzZ06bv538zRHNmNZtG/M3m2Q== +"@loaders.gl/loader-utils@1.3.5": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/loader-utils/-/loader-utils-1.3.5.tgz#89f2074c2566168bb0f53844d4b4ac493ff85fff" + integrity sha512-dml8IP4n49ftX4ew+olTRhWY0pm4A8nZKpXFq2o541vvrJIRaahp6oCbrlJGwcEMCDFfVXEqThsP2dicgDwL3A== dependencies: "@babel/runtime" "^7.3.1" @@ -1508,9 +1508,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.7.tgz#2496e9ff56196cc1429c72034e07eab6121b6f3f" - integrity sha512-CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw== + version "7.0.8" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.8.tgz#479a4ee3e291a403a1096106013ec22cf9b64012" + integrity sha512-yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw== dependencies: "@babel/types" "^7.3.0" @@ -1814,9 +1814,9 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "12.12.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.8.tgz#dab418655af39ce2fa99286a0bed21ef8072ac9d" - integrity sha512-XLla8N+iyfjvsa0KKV+BP/iGSoTmwxsu5Ci5sM33z9TjohF72DEz95iNvD6pPmemvbQgxAv/909G73gUn8QR7w== + version "12.12.11" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.11.tgz#bec2961975888d964196bf0016a2f984d793d3ce" + integrity sha512-O+x6uIpa6oMNTkPuHDa9MhMMehlxLAd5QcOvKRjAFsBVpeFWTOPnXbDvILvFgFFZfQ1xh1EZi1FbXxUix+zpsQ== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -1896,43 +1896,44 @@ resolved "https://registry.yarnpkg.com/@types/zrender/-/zrender-4.0.0.tgz#a6806f12ec4eccaaebd9b0d816f049aca6188fbd" integrity sha512-s89GOIeKFiod2KSqHkfd2rzx+T2DVu7ihZCBEBnhFrzvQPUmzvDSBot9Fi1DfMQm9Odg+rTqoMGC38RvrwJK2w== -"@typescript-eslint/eslint-plugin@^2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.7.0.tgz#dff176bdb73dfd7e2e43062452189bd1b9db6021" - integrity sha512-H5G7yi0b0FgmqaEUpzyBlVh0d9lq4cWG2ap0RKa6BkF3rpBb6IrAoubt1NWh9R2kRs/f0k6XwRDiDz3X/FqXhQ== +"@typescript-eslint/eslint-plugin@^2.8.0": + version "2.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.8.0.tgz#eca584d46094ebebc3cb3e9fb625bfbc904a534d" + integrity sha512-ohqul5s6XEB0AzPWZCuJF5Fd6qC0b4+l5BGEnrlpmvXxvyymb8yw8Bs4YMF8usNAeuCJK87eFIHy8g8GFvOtGA== dependencies: - "@typescript-eslint/experimental-utils" "2.7.0" - eslint-utils "^1.4.2" + "@typescript-eslint/experimental-utils" "2.8.0" + eslint-utils "^1.4.3" functional-red-black-tree "^1.0.1" - regexpp "^2.0.1" + regexpp "^3.0.0" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.7.0.tgz#58d790a3884df3041b5a5e08f9e5e6b7c41864b5" - integrity sha512-9/L/OJh2a5G2ltgBWJpHRfGnt61AgDeH6rsdg59BH0naQseSwR7abwHq3D5/op0KYD/zFT4LS5gGvWcMmegTEg== +"@typescript-eslint/experimental-utils@2.8.0": + version "2.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.8.0.tgz#208b4164d175587e9b03ce6fea97d55f19c30ca9" + integrity sha512-jZ05E4SxCbbXseQGXOKf3ESKcsGxT8Ucpkp1jiVp55MGhOvZB2twmWKf894PAuVQTCgbPbJz9ZbRDqtUWzP8xA== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.7.0" + "@typescript-eslint/typescript-estree" "2.8.0" eslint-scope "^5.0.0" -"@typescript-eslint/parser@^2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.7.0.tgz#b5e6a4944e2b68dba1e7fbfd5242e09ff552fd12" - integrity sha512-ctC0g0ZvYclxMh/xI+tyqP0EC2fAo6KicN9Wm2EIao+8OppLfxji7KAGJosQHSGBj3TcqUrA96AjgXuKa5ob2g== +"@typescript-eslint/parser@^2.8.0": + version "2.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.8.0.tgz#e10f7c40c8cf2fb19920c879311e6c46ad17bacb" + integrity sha512-NseXWzhkucq+JM2HgqAAoKEzGQMb5LuTRjFPLQzGIdLthXMNUfuiskbl7QSykvWW6mvzCtYbw1fYWGa2EIaekw== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.7.0" - "@typescript-eslint/typescript-estree" "2.7.0" + "@typescript-eslint/experimental-utils" "2.8.0" + "@typescript-eslint/typescript-estree" "2.8.0" eslint-visitor-keys "^1.1.0" -"@typescript-eslint/typescript-estree@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.7.0.tgz#34fd98c77a07b40d04d5b4203eddd3abeab909f4" - integrity sha512-vVCE/DY72N4RiJ/2f10PTyYekX2OLaltuSIBqeHYI44GQ940VCYioInIb8jKMrK9u855OEJdFC+HmWAZTnC+Ag== +"@typescript-eslint/typescript-estree@2.8.0": + version "2.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.8.0.tgz#fcc3fe6532840085d29b75432c8a59895876aeca" + integrity sha512-ksvjBDTdbAQ04cR5JyFSDX113k66FxH1tAXmi+dj6hufsl/G0eMc/f1GgLjEVPkYClDbRKv+rnBFuE5EusomUw== dependencies: debug "^4.1.1" - glob "^7.1.4" + eslint-visitor-keys "^1.1.0" + glob "^7.1.6" is-glob "^4.0.1" lodash.unescape "4.0.1" semver "^6.3.0" @@ -2211,16 +2212,12 @@ source-map "~0.6.1" vue-template-es2015-compiler "^1.9.0" -"@vue/eslint-config-standard@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@vue/eslint-config-standard/-/eslint-config-standard-4.0.0.tgz#6be447ee674e3b0f733c584098fd9a22e6d76fcd" - integrity sha512-bQghq1cw1BuMRHNhr3tRpAJx1tpGy0QtajQX873kLtA9YVuOIoXR7nAWnTN09bBHnSUh2N288vMsqPi2fI4Hzg== +"@vue/eslint-config-standard@^5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@vue/eslint-config-standard/-/eslint-config-standard-5.0.0.tgz#2ffabb4056205a86782cd5a641cdbcd330d905b4" + integrity sha512-t1mQIqtoQ3FsAx/8RnzT9VCCdbKD0O1pzvVzsN5WrIVIgos5RVII7aSTdh3HjAVn5+UmWLnG/OK+fow4EY7YsA== dependencies: - eslint-config-standard "^12.0.0" - eslint-plugin-import "^2.14.0" - eslint-plugin-node "^8.0.0" - eslint-plugin-promise "^4.0.1" - eslint-plugin-standard "^4.0.0" + eslint-config-standard "^14.1.0" "@vue/eslint-config-typescript@^5.0.0": version "5.0.0" @@ -2764,16 +2761,16 @@ atob@^2.1.1: integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== autoprefixer@^9.0.0, autoprefixer@^9.5.1, autoprefixer@^9.7.1: - version "9.7.1" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.1.tgz#9ffc44c55f5ca89253d9bb7186cefb01ef57747f" - integrity sha512-w3b5y1PXWlhYulevrTJ0lizkQ5CyqfeU6BIRDbuhsMupstHQOeb1Ur80tcB1zxSu7AwyY/qCQ7Vvqklh31ZBFw== + version "9.7.2" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.2.tgz#26cf729fbb709323b40171a874304884dcceffed" + integrity sha512-LCAfcdej1182uVvPOZnytbq61AhnOZ/4JelDaJGDeNwewyU1AMaNthcHsyz1NRjTmd2FkurMckLWfkHg3Z//KA== dependencies: - browserslist "^4.7.2" - caniuse-lite "^1.0.30001006" + browserslist "^4.7.3" + caniuse-lite "^1.0.30001010" chalk "^2.4.2" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^7.0.21" + postcss "^7.0.23" postcss-value-parser "^4.0.2" aws-sign2@~0.7.0: @@ -3198,14 +3195,14 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.7.1, browserslist@^4.7.2: - version "4.7.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.2.tgz#1bb984531a476b5d389cedecb195b2cd69fb1348" - integrity sha512-uZavT/gZXJd2UTi9Ov7/Z340WOSQ3+m1iBVRUknf+okKxonL9P83S3ctiBDtuRmRu8PiCHjqyueqQ9HYlJhxiw== +browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.7.1, browserslist@^4.7.3: + version "4.7.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.3.tgz#02341f162b6bcc1e1028e30624815d4924442dc3" + integrity sha512-jWvmhqYpx+9EZm/FxcZSbUZyDEvDTLDi3nSAKbzEkyWvtI0mNSmUosey+5awDW1RUlrgXbQb5A6qY1xQH9U6MQ== dependencies: - caniuse-lite "^1.0.30001004" - electron-to-chromium "^1.3.295" - node-releases "^1.1.38" + caniuse-lite "^1.0.30001010" + electron-to-chromium "^1.3.306" + node-releases "^1.1.40" bs-logger@0.x: version "0.2.6" @@ -3440,10 +3437,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.30001004, caniuse-lite@^1.0.30001006: - version "1.0.30001010" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001010.tgz#397a14034d384260453cc81994f494626d34b938" - integrity sha512-RA5GH9YjFNea4ZQszdWgh2SC+dpLiRAg4VDQS2b5JRI45OxmbGrYocYHTa9x0bKMQUE7uvHkNPNffUr+pCxSGw== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001010: + version "1.0.30001011" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001011.tgz#0d6c4549c78c4a800bb043a83ca0cbe0aee6c6e1" + integrity sha512-h+Eqyn/YA6o6ZTqpS86PyRmNWOs1r54EBDcd2NTwwfsXQ8re1B38SnB+p2RKF8OUsyEIjeDU8XGec1RGO/wYCg== capture-exit@^2.0.0: version "2.0.0" @@ -4016,27 +4013,27 @@ copy-webpack-plugin@^5.0.3: webpack-log "^2.0.0" core-js-compat@^3.1.1, core-js-compat@^3.3.2: - version "3.4.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.4.1.tgz#e12c5a3ef9fcb50fd9d9a32805bfe674f9139246" - integrity sha512-YdeJI26gLc0CQJ9asLE5obEgBz2I0+CIgnoTbS2T0d5IPQw/OCgCIFR527RmpduxjrB3gSEHoGOCTq9sigOyfw== + version "3.4.2" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.4.2.tgz#652fa7c54652b7f6586a893e37001df55ea2ac37" + integrity sha512-W0Aj+LM3EAxxjD0Kp2o4be8UlnxIZHNupBv2znqrheR4aY2nOn91794k/xoSp+SxqqriiZpTsSwBtZr60cbkwQ== dependencies: - browserslist "^4.7.2" + browserslist "^4.7.3" semver "^6.3.0" core-js-pure@^3.0.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.4.1.tgz#483dbc687016b45cab4c185cf998c2c59e772c2a" - integrity sha512-q3FgAYoFGS0LaqV4K7oMsJUpGU7Ud3IR6D2qcu7BAvg0OQPuwakrdNlal+0Zsm3bUPBpI5i/r9C6W3uQCcCrSw== + version "3.4.2" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.4.2.tgz#ffd4ea4dc1f8517f75d4a929986a214629477417" + integrity sha512-6+iSif/3zO0bSkhjVY9o4MTdv36X+rO6rqs/UxQ+uxBevmC4fsfwyQwFVdZXXONmLlKVLiXCG8PDvQ2Gn/iteA== core-js@^2.4.0: version "2.6.10" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f" integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA== -core-js@^3.3.2, core-js@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.4.1.tgz#76dd6828412900ab27c8ce0b22e6114d7ce21b18" - integrity sha512-KX/dnuY/J8FtEwbnrzmAjUYgLqtk+cxM86hfG60LGiW3MmltIc2yAmDgBgEkfm0blZhUrdr1Zd84J2Y14mLxzg== +core-js@^3.3.2, core-js@^3.4.2: + version "3.4.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.4.2.tgz#ee2b1a60b50388d8ddcda8cdb44a92c7a9ea76df" + integrity sha512-bUTfqFWtNKWp73oNIfRkqwYZJeNT3lstzZcAkhhiuvDraRSgOH1/+F9ZklbpR4zpdKuo4cpXN8tKP7s61yjX+g== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -4410,9 +4407,9 @@ d3-axis@1: integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ== d3-brush@1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.4.tgz#a457887f558eb094b07d3db5c633facac6bd4cc4" - integrity sha512-DRcFXGcVZiJF644i78m/HM8P0U19hWYRFcAnacOVGvpOpzkqGm3H0EAoAH6jwyY/lqfH49d+5vz2TgznP/zlMA== + version "1.1.5" + resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.5.tgz#066b8e84d17b192986030446c97c0fba7e1bacdc" + integrity sha512-rEaJ5gHlgLxXugWjIkolTA0OyMvw8UWU1imYXy1v642XyyswmI1ybKOv05Ft+ewq+TFmdliD3VuK0pRp1VT/5A== dependencies: d3-dispatch "1" d3-drag "1" @@ -4507,9 +4504,9 @@ d3-hierarchy@1: integrity sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ== d3-interpolate@1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.3.3.tgz#cef4ba06dfccebcc45e4ae9d4d836a931a945076" - integrity sha512-wTsi4AqnC2raZ3Q9eqFxiZGUf5r6YiEdi23vXjjKSWXFYLCQNUtBVMk6uk2tg4cOY6YrjRdmSmI/Mf0ze1zPzQ== + version "1.4.0" + resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987" + integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA== dependencies: d3-color "1" @@ -4583,9 +4580,9 @@ d3-timer@1: integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw== d3-transition@1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.1.tgz#3bce9a6a85f12fac107db05e798b49731800378d" - integrity sha512-bZYkOFBZaX+2ixSK3jnKJvGBoDWGlSOc80i0HBKg7iVCFmUDvMQgYFrofNfjAxN72rP20sfUSfQ/qtpP3v3ajw== + version "1.3.2" + resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398" + integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA== dependencies: d3-color "1" d3-dispatch "1" @@ -4611,9 +4608,9 @@ d3-zoom@1: d3-transition "1" d3@^5.14.1: - version "5.14.1" - resolved "https://registry.yarnpkg.com/d3/-/d3-5.14.1.tgz#42e2a5728f8043ccbe67a82d5b09365c4db768b4" - integrity sha512-x5VpyP/IS8DP8zePZtcoXmILmM3+YeF4mbvhH6bHICQPPuPYgfcxuGsZZBTh8+e2w9L/5myX76IVxWcPdizNxg== + version "5.14.2" + resolved "https://registry.yarnpkg.com/d3/-/d3-5.14.2.tgz#a3fb3af016d362aaf4dacbe618ae949c1744b8c4" + integrity sha512-Ccipa9XrYW5N0QkP6u0Qb8kU6WekIXBiDenmZm1zLvuq/9pBBhRCJLCICEOsH5Og4B0Xw02bhqGkK5VN/oPH0w== dependencies: d3-array "1" d3-axis "1" @@ -5060,12 +5057,12 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -echarts@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.4.0.tgz#d5260566cef0b98f5a00baf1b5010e92c1c23661" - integrity sha512-zJD1YaONA2Ib6rKCpkU9rT/K+OFJ/F0/3Mj5FamGLXytBV5g36gsQGv8sYL7fVs/BFj/sn3wemyctlgIHMCA5w== +echarts@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.5.0.tgz#2111960645a345eb819ddac4792a2c065bdff162" + integrity sha512-q9M0errodeX/786uPifro76x0elbrUQkbSHh235QzbkaASuvP9AQoMErhGBno4iC/yq6kFDLqgmm3XCPWQGLzA== dependencies: - zrender "^4.1.2" + zrender "4.1.2" editorconfig@^0.15.3: version "0.15.3" @@ -5083,14 +5080,14 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= ejs@^2.6.1: - version "2.7.2" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.2.tgz#749037c4c09bd57626a6140afbe6b7e650661614" - integrity sha512-rHGwtpl67oih3xAHbZlpw5rQAt+YV1mSCu2fUZ9XNrfaGEhom7E+AUiMci+ByP4aSfuAWx7hE0BPuJLMrpXwOw== + version "2.7.4" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" + integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== -electron-to-chromium@^1.3.295: - version "1.3.306" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.306.tgz#e8265301d053d5f74e36cb876486830261fbe946" - integrity sha512-frDqXvrIROoYvikSKTIKbHbzO6M3/qC6kCIt/1FOa9kALe++c4VAJnwjSFvf1tYLEUsP2n9XZ4XSCyqc3l7A/A== +electron-to-chromium@^1.3.306: + version "1.3.310" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.310.tgz#a6c0c194d93ff54fcdc6dc3843689abb5c4dec0c" + integrity sha512-ixvxy46JrDv5c8k1+th66Z+xDZD8zShNs6oh7hgyMpNZUgaoRBisXgFZKAyyhQTAj7oU2Y/uZ0AAsj/TY4N0tA== elegant-spinner@^1.0.1: version "1.0.1" @@ -5241,10 +5238,10 @@ escodegen@^1.11.1, escodegen@^1.9.1: optionalDependencies: source-map "~0.6.1" -eslint-config-standard@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz#638b4c65db0bd5a41319f96bba1f15ddad2107d9" - integrity sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ== +eslint-config-standard@^14.1.0: + version "14.1.0" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-14.1.0.tgz#b23da2b76fe5a2eba668374f246454e7058f15d4" + integrity sha512-EF6XkrrGVbvv8hL/kYa/m6vnvmUT+K82pJJc4JJVMM6+Qgqh0pnwprSxdduDLB9p/7bIxD+YV5O0wfb8lmcPbA== eslint-import-resolver-node@^0.3.2: version "0.3.2" @@ -5280,15 +5277,15 @@ eslint-plugin-cypress@^2.7.0: dependencies: globals "^11.12.0" -eslint-plugin-es@^1.3.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz#12acae0f4953e76ba444bfd1b2271081ac620998" - integrity sha512-5fa/gR2yR3NxQf+UXkeLeP8FBBl6tSgdrAz1+cF84v1FMM4twGwQoqTnn+QxFLcPOrF4pdKEJKDB/q9GoyJrCA== +eslint-plugin-es@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz#0f5f5da5f18aa21989feebe8a73eadefb3432976" + integrity sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ== dependencies: eslint-utils "^1.4.2" - regexpp "^2.0.1" + regexpp "^3.0.0" -eslint-plugin-import@^2.14.0: +eslint-plugin-import@^2.18.2: version "2.18.2" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6" integrity sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ== @@ -5305,24 +5302,24 @@ eslint-plugin-import@^2.14.0: read-pkg-up "^2.0.0" resolve "^1.11.0" -eslint-plugin-node@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-8.0.1.tgz#55ae3560022863d141fa7a11799532340a685964" - integrity sha512-ZjOjbjEi6jd82rIpFSgagv4CHWzG9xsQAVp1ZPlhRnnYxcTgENUVBvhYmkQ7GvT1QFijUSo69RaiOJKhMu6i8w== +eslint-plugin-node@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz#fd1adbc7a300cf7eb6ac55cf4b0b6fc6e577f5a6" + integrity sha512-1CSyM/QCjs6PXaT18+zuAXsjXGIGo5Rw630rSKwokSs2jrYURQc4R5JZpoanNCqwNmepg+0eZ9L7YiRUJb8jiQ== dependencies: - eslint-plugin-es "^1.3.1" - eslint-utils "^1.3.1" - ignore "^5.0.2" + eslint-plugin-es "^2.0.0" + eslint-utils "^1.4.2" + ignore "^5.1.1" minimatch "^3.0.4" - resolve "^1.8.1" - semver "^5.5.0" + resolve "^1.10.1" + semver "^6.1.0" -eslint-plugin-promise@^4.0.1: +eslint-plugin-promise@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a" integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw== -eslint-plugin-standard@^4.0.0: +eslint-plugin-standard@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4" integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ== @@ -5350,7 +5347,7 @@ eslint-scope@^5.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.3.1, eslint-utils@^1.4.2, eslint-utils@^1.4.3: +eslint-utils@^1.4.2, eslint-utils@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== @@ -5863,12 +5860,12 @@ file-entry-cache@^5.0.1: flat-cache "^2.0.1" file-loader@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.2.0.tgz#5fb124d2369d7075d70a9a5abecd12e60a95215e" - integrity sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ== + version "4.3.0" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz#780f040f729b3d18019f20605f723e844b8a58af" + integrity sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA== dependencies: loader-utils "^1.2.3" - schema-utils "^2.0.0" + schema-utils "^2.5.0" filesize@^3.6.1: version "3.6.1" @@ -6245,7 +6242,7 @@ glob-to-regexp@^0.3.0: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= -glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: +glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -6377,9 +6374,9 @@ handle-thing@^2.0.0: integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ== handlebars@^4.1.2: - version "4.5.2" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.2.tgz#5a4eb92ab5962ca3415ac188c86dc7f784f76a0f" - integrity sha512-29Zxv/cynYB7mkT1rVWQnV7mGX6v7H/miQ6dbEpYTKq5eJBN7PsRB+ViYJlcT6JINTSu4dVB9kOqEun78h6Exg== + version "4.5.3" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482" + integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA== dependencies: neo-async "^2.6.0" optimist "^0.6.1" @@ -6417,7 +6414,7 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-symbols@^1.0.0: +has-symbols@^1.0.0, has-symbols@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== @@ -6726,7 +6723,7 @@ ignore@^4.0.3, ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.0.2, ignore@^5.0.4, ignore@^5.1.1, ignore@^5.1.4: +ignore@^5.0.4, ignore@^5.1.1, ignore@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== @@ -6839,13 +6836,6 @@ ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== -inline-manifest-webpack-plugin@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/inline-manifest-webpack-plugin/-/inline-manifest-webpack-plugin-4.0.2.tgz#39bf4144c3a6210686bfe44c73f2c883681e51bb" - integrity sha512-j1Q0Y7m2GVsTxnOzQ7YzIlfn5Th2Ga6Ivoqme1G0iGZc8m7R3aQY8HfzLW7ew3CwmqdZb/O26mf9Ak2JA7zzKg== - dependencies: - source-map-url "0.4.0" - inquirer@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.0.tgz#9e2b032dde77da1db5db804758b8fea3a970519a" @@ -7254,11 +7244,11 @@ is-svg@^3.0.0: html-comment-regex "^1.1.0" is-symbol@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38" - integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw== + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" + integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== dependencies: - has-symbols "^1.0.0" + has-symbols "^1.0.1" is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" @@ -8265,6 +8255,21 @@ lodash.defaultsdeep@^4.6.1: resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6" integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA== +lodash.isboolean@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" + integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= + +lodash.isregexp@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/lodash.isregexp/-/lodash.isregexp-4.0.1.tgz#e13e647b30cd559752a04cd912086faf7da1c30b" + integrity sha1-4T5kezDNVZdSoEzZEghvr32hwws= + +lodash.isstring@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" + integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= + lodash.kebabcase@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" @@ -9005,10 +9010,10 @@ node-pre-gyp@^0.12.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.38: - version "1.1.40" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.40.tgz#a94facfa8e2d612302601ca1361741d529c4515a" - integrity sha512-r4LPcC5b/bS8BdtWH1fbeK88ib/wg9aqmg6/s3ngNLn2Ewkn/8J6Iw3P9RTlfIAdSdvYvQl2thCY5Y+qTAQ2iQ== +node-releases@^1.1.40: + version "1.1.41" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.41.tgz#57674a82a37f812d18e3b26118aefaf53a00afed" + integrity sha512-+IctMa7wIs8Cfsa8iYzeaLTFwv5Y4r5jZud+4AnfymzeEXKBCavFX0KBgzVaPVqf0ywa6PrO8/b+bPqdwjGBSg== dependencies: semver "^6.3.0" @@ -9635,9 +9640,9 @@ path-key@^2.0.0, path-key@^2.0.1: integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= path-key@^3.0.0, path-key@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3" - integrity sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg== + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.6: version "1.0.6" @@ -10282,10 +10287,10 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9" integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ== -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7: - version "7.0.21" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17" - integrity sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ== +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.23, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7: + version "7.0.23" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.23.tgz#9f9759fad661b15964f3cfc3140f66f1e05eadc1" + integrity sha512-hOlMf3ouRIFXD+j2VJecwssTwbvsPGJVMzupptg+85WA+i7MwyrydmQAgY3R+m0Bc0exunhbJmijy8u8+vufuQ== dependencies: chalk "^2.4.2" source-map "^0.6.1" @@ -10656,6 +10661,13 @@ redent@^2.0.0: indent-string "^3.0.0" strip-indent "^2.0.0" +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== + dependencies: + regenerate "^1.4.0" + regenerate@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" @@ -10698,6 +10710,11 @@ regexpp@^2.0.1: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== +regexpp@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e" + integrity sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g== + regexpu-core@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6" @@ -10708,7 +10725,7 @@ register-service-worker@^1.6.2: resolved "https://registry.yarnpkg.com/register-service-worker/-/register-service-worker-1.6.2.tgz#9297e54c205c371c6e49bfa88f6997e8dd315f4c" integrity sha512-I8L87fX2TK29LDx+wgyOUh2BJ3rDIRC1FtRZEHeP3rivzDv6p1DDZLGGtPucqjEkm45+2crtFIFssEWv56+9Wg== -regjsgen@^0.5.1: +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== @@ -10924,10 +10941,10 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@1.x, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1: - version "1.12.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6" - integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w== +resolve@1.x, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1: + version "1.12.2" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.2.tgz#08b12496d9aa8659c75f534a8f05f0d892fff594" + integrity sha512-cAVTI2VLHWYsGOirfeYVVQ7ZDejtQ9fp4YhYckWDEkFfqbVjaT11iM8k6xSAfGFMM+gDpZjMnFssPu8we+mqFw== dependencies: path-parse "^1.0.6" @@ -11108,10 +11125,10 @@ sass-loader@^8.0.0: schema-utils "^2.1.0" semver "^6.3.0" -sass@^1.23.6: - version "1.23.6" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.23.6.tgz#7cce6dbeac1b8caeb33301a817642ee2708f7d7e" - integrity sha512-awBvj9xrAuiS2TOCcYSUGCmaBV3UW6fVSK4oJ2LHS8IRfnRLc5EJihw90C7ZJ/skcEwFGSf9/XO5NlMiKupBCg== +sass@^1.23.7: + version "1.23.7" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.23.7.tgz#090254e006af1219d442f1bff31e139d5e085dff" + integrity sha512-cYgc0fanwIpi0rXisGxl+/wadVQ/HX3RhpdRcjLdj2o2ye/sxUTpAxIhbmJy3PLQgRFbf6Pn8Jsrta2vdXcoOQ== dependencies: chokidar ">=2.0.0 <4.0.0" @@ -11136,7 +11153,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.0.0, schema-utils@^2.1.0, schema-utils@^2.4.1, schema-utils@^2.5.0: +schema-utils@^2.0.0, schema-utils@^2.1.0, schema-utils@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.5.0.tgz#8f254f618d402cc80257486213c8970edfd7c22f" integrity sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ== @@ -11439,7 +11456,7 @@ source-map-support@^0.5.6, source-map-support@~0.5.12: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-url@0.4.0, source-map-url@^0.4.0: +source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= @@ -11882,20 +11899,22 @@ stylelint-order@^3.1.1: postcss-sorting "^5.0.1" stylelint-scss@^3.11.1: - version "3.12.1" - resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.12.1.tgz#0b06122a33dd2ef368121e920bd3ecfa323bedf2" - integrity sha512-k6B78HrqJ6pib5yOtmId7osVGrE2Amcf0VU+tdzk+oqwXe/0+VKtbkogeXrmGKt+z54QhxvjEO++qlE/a7EWlA== + version "3.13.0" + resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.13.0.tgz#875c76e61d95333c4f0ae737a310be6f1d27d780" + integrity sha512-SaLnvQyndaPcsgVJsMh6zJ1uKVzkRZJx+Wg/stzoB1mTBdEmGketbHrGbMQNymzH/0mJ06zDSpeCDvNxqIJE5A== dependencies: - lodash "^4.17.15" + lodash.isboolean "^3.0.3" + lodash.isregexp "^4.0.1" + lodash.isstring "^4.0.1" postcss-media-query-parser "^0.2.3" postcss-resolve-nested-selector "^0.1.1" postcss-selector-parser "^6.0.2" postcss-value-parser "^4.0.2" -stylelint-webpack-plugin@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/stylelint-webpack-plugin/-/stylelint-webpack-plugin-1.0.4.tgz#3fe696aa38f6e105f5a2ac56f49d17949800c630" - integrity sha512-klDJLPDGX4kbXcya4CSK0Bvot2isVx1+mCKGM8WYVhFBTqHhvTOMxoz1JJnLaDwfMzdXJh7bA/REPCgipfp6WQ== +stylelint-webpack-plugin@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/stylelint-webpack-plugin/-/stylelint-webpack-plugin-1.1.0.tgz#c89a0b5b346ce87ac428a28fdc93f40a8aa1ebef" + integrity sha512-wv4YnpGgdkLTKTYAL2iNVTBz90tnQV2KEvrMlm+CQyoJKzG5JKI/YdmC8jkpOoQqXDT8hhJvw9vIELeqpS29lg== dependencies: arrify "^2.0.1" micromatch "^4.0.2" @@ -12368,9 +12387,9 @@ tryer@^1.0.1: integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== ts-jest@^24.1.0: - version "24.1.0" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.1.0.tgz#2eaa813271a2987b7e6c3fefbda196301c131734" - integrity sha512-HEGfrIEAZKfu1pkaxB9au17b1d9b56YZSqz5eCVE8mX68+5reOvlM93xGOzzCREIov9mdH7JBG+s0UyNAqr0tQ== + version "24.2.0" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.2.0.tgz#7abca28c2b4b0a1fdd715cd667d65d047ea4e768" + integrity sha512-Yc+HLyldlIC9iIK8xEN7tV960Or56N49MDP7hubCZUeI7EbIOTsas6rXCMB4kQjLACJ7eDOF4xWEO5qumpKsag== dependencies: bs-logger "0.x" buffer-from "1.x" @@ -12692,13 +12711,13 @@ urix@^0.1.0: integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= url-loader@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.2.0.tgz#af321aece1fd0d683adc8aaeb27829f29c75b46e" - integrity sha512-G8nk3np8ZAnwhHXas1JxJEwJyQdqFXAKJehfgZ/XrC48volFBRtO+FIKtF2u0Ma3bw+4vnDVjHPAQYlF9p2vsw== + version "2.3.0" + resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.3.0.tgz#e0e2ef658f003efb8ca41b0f3ffbf76bab88658b" + integrity sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog== dependencies: loader-utils "^1.2.3" mime "^2.4.4" - schema-utils "^2.4.1" + schema-utils "^2.5.0" url-parse@^1.4.3: version "1.4.7" @@ -13184,9 +13203,9 @@ which@^1.2.9, which@^1.3.0, which@^1.3.1: isexe "^2.0.0" which@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.1.tgz#f1cf94d07a8e571b6ff006aeb91d0300c47ef0a4" - integrity sha512-N7GBZOTswtB9lkQBZA4+zAXrjEIWAUOB93AvzUiudRzRxhUdLURQ7D/gAIMY1gatT/LTbmbcv8SiYazy3eYB7w== + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" @@ -13555,9 +13574,9 @@ yargs@^13.3.0: yargs-parser "^13.1.1" yargs@^15.0.0: - version "15.0.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.0.1.tgz#558d03c3e5d873431d500f871168967ef673620e" - integrity sha512-47i2DJb+gkLpioPBdMmnvb4QkAuyz7tLes9nCgYDXEdPf05tqjCQpUELea3MfmoomS9NKAZlZEifstKIXiASMw== + version "15.0.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.0.2.tgz#4248bf218ef050385c4f7e14ebdf425653d13bd3" + integrity sha512-GH/X/hYt+x5hOat4LMnCqMd8r5Cv78heOMIJn1hr7QPPBqfeC6p89Y78+WB9yGDvfpCvgasfmWLzNzEioOUD9Q== dependencies: cliui "^6.0.0" decamelize "^1.2.0" @@ -13601,7 +13620,7 @@ zdog@^1.1.1: resolved "https://registry.yarnpkg.com/zdog/-/zdog-1.1.1.tgz#6c5d1e5acd3f2b4ead4a15b76e1284432d80abbe" integrity sha512-e6xvLe4nURPsrOYmNWY35DRHJ13O3W/VnucRJDlq/3bvcv7E4/OW68VWUIXLBTJxeuR8K7JC4yEU1MYyopFXDQ== -zrender@^4.1.2: +zrender@4.1.2, zrender@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/zrender/-/zrender-4.1.2.tgz#8368deff24c7e237cbcbd3a2ff93017905ae43f7" integrity sha512-MJYEo1ZOVesjxYsfcGtPXnUREmh4ACMV08QZLGZ3S7D1xOd96iz3O6nf6pv5PHb5NSHkbizr7ChSIgtAGwncvA==