From 032232c70707f1deca8554a163c41677192e61e5 Mon Sep 17 00:00:00 2001 From: Ricardo Gobbo de Souza Date: Mon, 4 May 2020 15:06:59 -0300 Subject: [PATCH] chore: update module (#87) --- .eslintignore | 5 + .gitignore | 4 +- README.md | 6 +- package.json | 62 ++----- .../configs/postcss/custom-options-fn.js | 4 +- .../fixture/configs/postcss/custom-options.js | 4 +- test/fixture/configs/postcss/default.js | 4 +- test/fixture/configs/postcss/disabled.js | 4 +- .../configs/webpack/custom-options-fn.js | 4 +- .../fixture/configs/webpack/custom-options.js | 4 +- test/fixture/configs/webpack/default.js | 4 +- test/fixture/configs/webpack/dev.js | 4 +- test/fixture/configs/webpack/disabled.js | 4 +- test/module.test.js | 36 ++-- yarn.lock | 175 ++---------------- 15 files changed, 78 insertions(+), 246 deletions(-) create mode 100644 .eslintignore diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..f79529d --- /dev/null +++ b/.eslintignore @@ -0,0 +1,5 @@ +# Common +node_modules +dist +.nuxt +coverage diff --git a/.gitignore b/.gitignore index cdbed60..915f6ad 100755 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,8 @@ node_modules *.iml .idea *.log* -.nuxt* +.nuxt .vscode -.DS_STORE +.DS_Store coverage dist diff --git a/README.md b/README.md index 02b6624..7591a3c 100755 --- a/README.md +++ b/README.md @@ -42,7 +42,6 @@ export default { :warning: If you are using Nuxt **< v2.9** you have to install the module as a `dependency` (No `--dev` or `--save-dev` flags) and use `modules` section in `nuxt.config.js` instead of `buildModules`. - ## Options ### Defaults @@ -105,7 +104,6 @@ export default { ### Override a default value - ```js //nuxt.config.js export default { @@ -121,7 +119,6 @@ export default { ### Append a value to the defaults - ```js //nuxt.config.js export default { @@ -137,7 +134,6 @@ export default { ### Override a default value - ```js //nuxt.config.js export default { @@ -152,6 +148,7 @@ export default { ``` ### Use custom extractors + Only one extractor can be applied to each file extention. If you want to apply a custom extractor to the extensions that the default extractor already covers, you have to override the default extractor. This is only possible with the functional notation. @@ -218,4 +215,3 @@ Copyright (c) Alexander Lichter [license-src]: https://img.shields.io/npm/l/nuxt-purgecss.svg [license-href]: https://npmjs.com/package/nuxt-purgecss - diff --git a/package.json b/package.json index b04e3c1..a508933 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,14 @@ "name": "nuxt-purgecss", "version": "1.0.0", "description": "Drop superfluous CSS! A neat PurgeCSS wrapper for Nuxt.js", + "keywords": [ + "nuxtjs", + "nuxt", + "nuxt-module", + "purgecss", + "css" + ], + "repository": "Developmint/nuxt-purgecss", "license": "MIT", "contributors": [ { @@ -9,51 +17,21 @@ } ], "main": "lib/module.js", - "repository": { - "mode": "git", - "url": "git+https://github.com/Developmint/nuxt-purgecss" - }, - "bugs": { - "url": "https://github.com/Developmint/nuxt-purgecss/issues" - }, - "publishConfig": { - "access": "public" - }, + "files": [ + "lib" + ], "scripts": { "dev": "nuxt --config-file test/fixture/configs/postcss/default.js", "lint": "eslint --ext .js,.vue .", "release": "yarn test && standard-version && git push --follow-tags && npm publish", "test": "yarn lint && jest" }, - "files": [ - "lib" - ], - "keywords": [ - "nuxtjs", - "nuxt", - "nuxt-module", - "purgecss", - "css" - ], - "engines": { - "node": ">=10.0.0", - "npm": ">=5.0.0" - }, - "jest": { - "testEnvironment": "node", - "collectCoverage": true, - "coveragePathIgnorePatterns": [ - "/node_modules/", - "/test/fixture" - ], - "forceExit": true - }, "dependencies": { - "@fullhuman/postcss-purgecss": "^2.0.5", - "consola": "^1.4.5", - "glob-all": "^3.1.0", - "purgecss": "^2.0.5", - "purgecss-webpack-plugin": "^2.0.5" + "@fullhuman/postcss-purgecss": "^2.1.2", + "consola": "^2.11.3", + "glob-all": "^3.2.1", + "purgecss": "^2.1.2", + "purgecss-webpack-plugin": "^2.1.2" }, "devDependencies": { "@commitlint/cli": "latest", @@ -63,14 +41,10 @@ "eslint": "latest", "husky": "latest", "jest": "latest", - "jsdom": "latest", "nuxt-edge": "latest", "standard-version": "latest" }, - "husky": { - "hooks": { - "pre-commit": "yarn run lint", - "commit-msg": "yarn run commitlint" - } + "publishConfig": { + "access": "public" } } diff --git a/test/fixture/configs/postcss/custom-options-fn.js b/test/fixture/configs/postcss/custom-options-fn.js index 968f016..9d8e0c5 100644 --- a/test/fixture/configs/postcss/custom-options-fn.js +++ b/test/fixture/configs/postcss/custom-options-fn.js @@ -8,7 +8,9 @@ module.exports = { resourceHints: false }, dev: false, - modules: ['@@'], + buildModules: [ + { handler: require('../../../../') } + ], build: { quiet: false, optimization: { diff --git a/test/fixture/configs/postcss/custom-options.js b/test/fixture/configs/postcss/custom-options.js index bbbd11f..3cb82b3 100644 --- a/test/fixture/configs/postcss/custom-options.js +++ b/test/fixture/configs/postcss/custom-options.js @@ -8,7 +8,9 @@ module.exports = { resourceHints: false }, dev: false, - modules: [['@@', { mode: 'postcss' }]], + buildModules: [ + [require('../../../../'), { mode: 'postcss' }] + ], build: { quiet: false, optimization: { diff --git a/test/fixture/configs/postcss/default.js b/test/fixture/configs/postcss/default.js index 2e4615f..16f31c7 100644 --- a/test/fixture/configs/postcss/default.js +++ b/test/fixture/configs/postcss/default.js @@ -8,7 +8,9 @@ module.exports = { resourceHints: false }, dev: false, - modules: ['@@'], + buildModules: [ + { handler: require('../../../../') } + ], build: { quiet: false, optimization: { diff --git a/test/fixture/configs/postcss/disabled.js b/test/fixture/configs/postcss/disabled.js index 5672b4d..9ca7575 100644 --- a/test/fixture/configs/postcss/disabled.js +++ b/test/fixture/configs/postcss/disabled.js @@ -8,7 +8,9 @@ module.exports = { resourceHints: false }, dev: false, - modules: ['@@'], + buildModules: [ + { handler: require('../../../../') } + ], build: { quiet: false, optimization: { diff --git a/test/fixture/configs/webpack/custom-options-fn.js b/test/fixture/configs/webpack/custom-options-fn.js index 8be9e97..09e779e 100644 --- a/test/fixture/configs/webpack/custom-options-fn.js +++ b/test/fixture/configs/webpack/custom-options-fn.js @@ -8,7 +8,9 @@ module.exports = { resourceHints: false }, dev: false, - modules: ['@@'], + buildModules: [ + { handler: require('../../../../') } + ], build: { quiet: false, extractCSS: true, diff --git a/test/fixture/configs/webpack/custom-options.js b/test/fixture/configs/webpack/custom-options.js index 43260af..1d95dab 100644 --- a/test/fixture/configs/webpack/custom-options.js +++ b/test/fixture/configs/webpack/custom-options.js @@ -8,7 +8,9 @@ module.exports = { resourceHints: false }, dev: false, - modules: ['@@'], + buildModules: [ + { handler: require('../../../../') } + ], build: { quiet: false, extractCSS: true, diff --git a/test/fixture/configs/webpack/default.js b/test/fixture/configs/webpack/default.js index efb1cb6..e29ce47 100644 --- a/test/fixture/configs/webpack/default.js +++ b/test/fixture/configs/webpack/default.js @@ -8,7 +8,9 @@ module.exports = { resourceHints: false }, dev: false, - modules: ['@@'], + buildModules: [ + { handler: require('../../../../') } + ], build: { quiet: false, extractCSS: true, diff --git a/test/fixture/configs/webpack/dev.js b/test/fixture/configs/webpack/dev.js index a127024..5712f3e 100644 --- a/test/fixture/configs/webpack/dev.js +++ b/test/fixture/configs/webpack/dev.js @@ -7,7 +7,9 @@ module.exports = { render: { resourceHints: false }, - modules: ['@@'], + buildModules: [ + { handler: require('../../../../') } + ], build: { quiet: false, extractCSS: true, diff --git a/test/fixture/configs/webpack/disabled.js b/test/fixture/configs/webpack/disabled.js index 65c834e..06b60f4 100644 --- a/test/fixture/configs/webpack/disabled.js +++ b/test/fixture/configs/webpack/disabled.js @@ -8,7 +8,9 @@ module.exports = { resourceHints: false }, dev: false, - modules: ['@@'], + buildModules: [ + { handler: require('../../../../') } + ], purgeCSS: { mode: 'webpack', enabled: false diff --git a/test/module.test.js b/test/module.test.js index a5edf51..d8e8d8d 100644 --- a/test/module.test.js +++ b/test/module.test.js @@ -4,26 +4,24 @@ const { promisify } = require('util') const readFile = promisify(fsReadFile) -const consola = require('consola') const { setup } = require('@nuxtjs/module-test-utils') +const logger = require('../lib/logger') +logger.mockTypes(() => jest.fn()) jest.setTimeout(60 * 1000) describe('nuxt-purgecss', () => { - let log let nuxt beforeEach(() => { - log = jest.fn() - consola.clear().add({ log }) + logger.clear() }) describe('webpack', () => { test('extract and purge css by default', async () => { ({ nuxt } = await setup(require('./fixture/configs/webpack/default'))) - const consolaMessages = getConsolaMessages(log) - expect(consolaMessages).toContain('Module initialized in webpack mode') + expect(logger.success).toHaveBeenCalledWith('Module initialized in webpack mode') const actualGlobalCSS = await getGlobalCSS() const expectedGlobalCSS = { @@ -45,15 +43,13 @@ describe('nuxt-purgecss', () => { test('don\'t show webpack error message in dev', async () => { ({ nuxt } = await setup(require('./fixture/configs/webpack/dev'))) - const consolaMessages = getConsolaMessages(log) - expect(consolaMessages).not.toContain('Webpack mode only works with build.extractCSS set to *true*. Either extract your CSS or use \'postcss\' mode') + expect(logger.error).not.toContain('Webpack mode only works with build.extractCSS set to *true*. Either extract your CSS or use \'postcss\' mode') }) test('globally disable module', async () => { ({ nuxt } = await setup(require('./fixture/configs/webpack/disabled'))) - const consolaMessages = getConsolaMessages(log) - expect(consolaMessages).toContain('Module is not enabled') + expect(logger.info).toHaveBeenCalledWith('Module is not enabled') const globalCSS = await getGlobalCSS() const expectedGlobalCSS = { @@ -72,8 +68,7 @@ describe('nuxt-purgecss', () => { test('define custom options for css lookup (concatenating)', async () => { ({ nuxt } = await setup(require('./fixture/configs/webpack/custom-options'))) - const consolaMessages = getConsolaMessages(log) - expect(consolaMessages).toContain('Module initialized in webpack mode') + expect(logger.success).toHaveBeenCalledWith('Module initialized in webpack mode') const globalCSS = await getGlobalCSS() const expectedGlobalCSS = { @@ -94,8 +89,7 @@ describe('nuxt-purgecss', () => { test('define custom function options for css lookup (overriding)', async () => { ({ nuxt } = await setup(require('./fixture/configs/webpack/custom-options-fn'))) - const consolaMessages = getConsolaMessages(log) - expect(consolaMessages).toContain('Module initialized in webpack mode') + expect(logger.success).toHaveBeenCalledWith('Module initialized in webpack mode') const globalCSS = await getGlobalCSS() const expectedGlobalCSS = { @@ -139,8 +133,7 @@ describe('nuxt-purgecss', () => { test('purge css by default', async () => { ({ nuxt } = await setup(require('./fixture/configs/postcss/default'))) - const consolaMessages = getConsolaMessages(log) - expect(consolaMessages).toContain('Module initialized in postcss mode') + expect(logger.success).toHaveBeenCalledWith('Module initialized in postcss mode') const actualGlobalCSS = await getGlobalCSS('js') const expectedGlobalCSS = { @@ -161,8 +154,7 @@ describe('nuxt-purgecss', () => { test('globally disable module', async () => { ({ nuxt } = await setup(require('./fixture/configs/postcss/disabled'))) - const consolaMessages = getConsolaMessages(log) - expect(consolaMessages).toContain('Module is not enabled') + expect(logger.info).toHaveBeenCalledWith('Module is not enabled') const globalCSS = await getGlobalCSS('js') const expectedGlobalCSS = { @@ -181,8 +173,7 @@ describe('nuxt-purgecss', () => { test('define custom options for css lookup (concatenating)', async () => { ({ nuxt } = await setup(require('./fixture/configs/postcss/custom-options'))) - const consolaMessages = getConsolaMessages(log) - expect(consolaMessages).toContain('Module initialized in postcss mode') + expect(logger.success).toHaveBeenCalledWith('Module initialized in postcss mode') const globalCSS = await getGlobalCSS('js') const expectedGlobalCSS = { @@ -203,8 +194,7 @@ describe('nuxt-purgecss', () => { test('define custom function options for css lookup (overriding)', async () => { ({ nuxt } = await setup(require('./fixture/configs/postcss/custom-options-fn'))) - const consolaMessages = getConsolaMessages(log) - expect(consolaMessages).toContain('Module initialized in postcss mode') + expect(logger.success).toHaveBeenCalledWith('Module initialized in postcss mode') const globalCSS = await getGlobalCSS('js') const expectedGlobalCSS = { @@ -247,5 +237,3 @@ const checkCSS = (expected, actual) => { } const getFileContent = path => readFile(path, 'utf-8') - -const getConsolaMessages = log => log.mock.calls.map(([res]) => res.message) diff --git a/yarn.lock b/yarn.lock index 9c81d00..7440913 100644 --- a/yarn.lock +++ b/yarn.lock @@ -965,7 +965,7 @@ resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== -"@fullhuman/postcss-purgecss@^2.0.5": +"@fullhuman/postcss-purgecss@^2.1.2": version "2.1.2" resolved "https://registry.yarnpkg.com/@fullhuman/postcss-purgecss/-/postcss-purgecss-2.1.2.tgz#8fe4d4ae2b58214b5452cb490a31c7146517442f" integrity sha512-Jf34YVBK9GtXTblpu0svNUJdA7rTQoRMz+yEJe6mwTnXDIGipWLzaX/VgU/x6IPC6WvU5SY/XlawwqhxoyFPTg== @@ -2061,7 +2061,7 @@ JSONStream@^1.0.4: jsonparse "^1.2.0" through ">=2.2.7 <3" -abab@^2.0.0, abab@^2.0.3: +abab@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a" integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg== @@ -2082,14 +2082,6 @@ acorn-globals@^4.3.2: acorn "^6.0.1" acorn-walk "^6.0.1" -acorn-globals@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" - integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== - dependencies: - acorn "^7.1.1" - acorn-walk "^7.1.1" - acorn-jsx@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe" @@ -3019,7 +3011,7 @@ chrome-trace-event@^1.0.2: dependencies: tslib "^1.9.0" -ci-info@^1.5.0, ci-info@^1.6.0: +ci-info@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A== @@ -3273,16 +3265,6 @@ connect@^3.7.0: parseurl "~1.3.3" utils-merge "1.0.1" -consola@^1.4.5: - version "1.4.5" - resolved "https://registry.yarnpkg.com/consola/-/consola-1.4.5.tgz#09732d07cb50af07332e54e0f42fafb92b962c4a" - integrity sha512-movqq3MbyXbSf7cG/x+EbO3VjKQVZPB/zeB5+lN1TuBYh9BWDemLQca9P+a4xpO4lXva9rz+Bd8XyqlH136Lww== - dependencies: - chalk "^2.3.2" - figures "^2.0.0" - lodash "^4.17.5" - std-env "^1.1.0" - consola@^2.10.0, consola@^2.10.1, consola@^2.11.3, consola@^2.6.0, consola@^2.9.0: version "2.11.3" resolved "https://registry.yarnpkg.com/consola/-/consola-2.11.3.tgz#f7315836224c143ac5094b47fd4c816c2cd1560e" @@ -3845,7 +3827,7 @@ csso@^4.0.2: dependencies: css-tree "1.0.0-alpha.39" -cssom@^0.4.1, cssom@^0.4.4: +cssom@^0.4.1: version "0.4.4" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== @@ -3855,7 +3837,7 @@ cssom@~0.3.6: resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== -cssstyle@^2.0.0, cssstyle@^2.2.0: +cssstyle@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.2.0.tgz#e4c44debccd6b7911ed617a4395e5754bba59992" integrity sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA== @@ -3902,15 +3884,6 @@ data-urls@^1.1.0: whatwg-mimetype "^2.2.0" whatwg-url "^7.0.0" -data-urls@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" - integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== - dependencies: - abab "^2.0.3" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" - dateformat@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" @@ -3948,11 +3921,6 @@ decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= -decimal.js@^10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.0.tgz#39466113a9e036111d02f82489b5fd6b0b5ed231" - integrity sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw== - decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" @@ -4113,13 +4081,6 @@ domexception@^1.0.1: dependencies: webidl-conversions "^4.0.2" -domexception@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" - integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== - dependencies: - webidl-conversions "^5.0.0" - domhandler@^2.3.0: version "2.4.2" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" @@ -4329,7 +4290,7 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -escodegen@^1.11.1, escodegen@^1.14.1: +escodegen@^1.11.1: version "1.14.1" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457" integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ== @@ -4812,13 +4773,6 @@ figures@3.1.0: dependencies: escape-string-regexp "^1.0.5" -figures@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" - integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= - dependencies: - escape-string-regexp "^1.0.5" - figures@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -5175,7 +5129,7 @@ gitconfiglocal@^1.0.0: dependencies: ini "^1.3.2" -glob-all@^3.1.0: +glob-all@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/glob-all/-/glob-all-3.2.1.tgz#082ca81afd2247cbd3ed2149bb2630f4dc877d95" integrity sha512-x877rVkzB3ipid577QOp+eQCR6M5ZyiwrtaYgrX/z3EThaSPFtLDwBXFHc3sH1cG0R0vFYI5SRYeWMMSEyXkUw== @@ -5433,13 +5387,6 @@ html-encoding-sniffer@^1.0.2: dependencies: whatwg-encoding "^1.0.1" -html-encoding-sniffer@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" - integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== - dependencies: - whatwg-encoding "^1.0.5" - html-entities@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44" @@ -5799,13 +5746,6 @@ is-callable@^1.1.4, is-callable@^1.1.5: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q== -is-ci@^1.1.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" - integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg== - dependencies: - ci-info "^1.5.0" - is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -5964,11 +5904,6 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-potential-custom-element-name@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" - integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= - is-promise@^2.1.0: version "2.2.2" resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" @@ -6522,38 +6457,6 @@ jsdom@^15.2.1: ws "^7.0.0" xml-name-validator "^3.0.0" -jsdom@latest: - version "16.2.2" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.2.2.tgz#76f2f7541646beb46a938f5dc476b88705bedf2b" - integrity sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg== - dependencies: - abab "^2.0.3" - acorn "^7.1.1" - acorn-globals "^6.0.0" - cssom "^0.4.4" - cssstyle "^2.2.0" - data-urls "^2.0.0" - decimal.js "^10.2.0" - domexception "^2.0.1" - escodegen "^1.14.1" - html-encoding-sniffer "^2.0.1" - is-potential-custom-element-name "^1.0.0" - nwsapi "^2.2.0" - parse5 "5.1.1" - request "^2.88.2" - request-promise-native "^1.0.8" - saxes "^5.0.0" - symbol-tree "^3.2.4" - tough-cookie "^3.0.1" - w3c-hr-time "^1.0.2" - w3c-xmlserializer "^2.0.0" - webidl-conversions "^6.0.0" - whatwg-encoding "^1.0.5" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" - ws "^7.2.3" - xml-name-validator "^3.0.0" - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -7782,11 +7685,6 @@ parse5@5.1.0: resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== -parse5@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" - integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== - parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -8792,7 +8690,7 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -purgecss-webpack-plugin@^2.0.5: +purgecss-webpack-plugin@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/purgecss-webpack-plugin/-/purgecss-webpack-plugin-2.1.2.tgz#64cab0873754299c821b6e5940aca4232071e36e" integrity sha512-O431LQL245lRfVF4D8qTZzcN7Gv8nxsDDFB2VFsAdaKj3NKmag73A4B5mJTSIgAw68pW/5Lrrj+wky+1FSyHZQ== @@ -8801,7 +8699,7 @@ purgecss-webpack-plugin@^2.0.5: webpack "^4.42.1" webpack-sources "^1.4.3" -purgecss@^2.0.5, purgecss@^2.1.2: +purgecss@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-2.1.2.tgz#96f666d04c56705208aaa1a544b5f22e13828955" integrity sha512-5oDBxiT9VonwKmEMohPFRFZrj8fdSVKxHPwq7G5Rx/2pXicZFJu+D4m5bb3NuV0sSK3ooNxq5jFIwwHzifP5FA== @@ -9387,13 +9285,6 @@ saxes@^3.1.9: dependencies: xmlchars "^2.1.1" -saxes@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" - integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== - dependencies: - xmlchars "^2.2.0" - schema-utils@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" @@ -9826,13 +9717,6 @@ static-extend@^0.1.1: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= -std-env@^1.1.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/std-env/-/std-env-1.3.1.tgz#4e1758412439e9ece1d437b1b098551911aa44ee" - integrity sha512-KI2F2pPJpd3lHjng+QLezu0eq+QDtXcv1um016mhOPAJFHKL+09ykK5PUBWta2pZDC8BVV0VPya08A15bUXSLQ== - dependencies: - is-ci "^1.1.0" - std-env@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/std-env/-/std-env-2.2.1.tgz#2ffa0fdc9e2263e0004c1211966e960948a40f6b" @@ -10118,7 +10002,7 @@ svgo@^1.0.0: unquote "~1.1.1" util.promisify "~1.0.0" -symbol-tree@^3.2.2, symbol-tree@^3.2.4: +symbol-tree@^3.2.2: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== @@ -10348,13 +10232,6 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" -tr46@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479" - integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg== - dependencies: - punycode "^2.1.1" - trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" @@ -10803,7 +10680,7 @@ vuex@^3.1.3: resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.3.0.tgz#665b4630ea1347317139fcc5cb495aab3ec5e513" integrity sha512-1MfcBt+YFd20DPwKe0ThhYm1UEXZya4gVKUvCy7AtS11YAOUR+9a6u4fsv1Rr6ePZCDNxW/M1zuIaswp6nNv8Q== -w3c-hr-time@^1.0.1, w3c-hr-time@^1.0.2: +w3c-hr-time@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== @@ -10819,13 +10696,6 @@ w3c-xmlserializer@^1.1.2: webidl-conversions "^4.0.2" xml-name-validator "^3.0.0" -w3c-xmlserializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" - integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== - dependencies: - xml-name-validator "^3.0.0" - walker@^1.0.7, walker@~1.0.5: version "1.0.7" resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" @@ -10847,16 +10717,6 @@ webidl-conversions@^4.0.2: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== -webidl-conversions@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" - integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== - -webidl-conversions@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" - integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== - webpack-bundle-analyzer@^3.6.1: version "3.7.0" resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.7.0.tgz#84da434e89442899b884d9ad38e466d0db02a56f" @@ -10993,15 +10853,6 @@ whatwg-url@^7.0.0: tr46 "^1.0.1" webidl-conversions "^4.0.2" -whatwg-url@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.0.0.tgz#37f256cb746398e19b107bd6ef820b4ae2d15871" - integrity sha512-41ou2Dugpij8/LPO5Pq64K5q++MnRCBpEHvQr26/mArEKTkCV5aoXIqyhuYtE0pkqScXwhf2JP57rkRTYM29lQ== - dependencies: - lodash.sortby "^4.7.0" - tr46 "^2.0.0" - webidl-conversions "^5.0.0" - which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" @@ -11109,7 +10960,7 @@ ws@^6.0.0: dependencies: async-limiter "~1.0.0" -ws@^7.0.0, ws@^7.2.3: +ws@^7.0.0: version "7.2.5" resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d" integrity sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA== @@ -11119,7 +10970,7 @@ xml-name-validator@^3.0.0: resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== -xmlchars@^2.1.1, xmlchars@^2.2.0: +xmlchars@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==