From a5370ce9386878d25fe63ddb9bce6b474bd7df05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Mon, 1 Feb 2021 20:02:02 +0800 Subject: [PATCH 01/31] feat: fes-plugin-unit-jest --- .fatherrc.js | 3 +- packages/fes-plugin-unit-jest/.fatherrc.js | 3 + packages/fes-plugin-unit-jest/LICENSE | 21 + packages/fes-plugin-unit-jest/README.md | 2 + .../helpers/setupFiles/jasmine.js | 1 + .../helpers/setupFiles/shim.js | 6 + .../helpers/transformers/css.js | 9 + .../helpers/transformers/javascript.js | 7 + packages/fes-plugin-unit-jest/package.json | 48 + .../src/createDefaultConfig.js | 39 + packages/fes-plugin-unit-jest/src/index.js | 82 + packages/fes-template/.eslintrc.js | 10 + packages/fes-template/__tests__/add.js | 5 + packages/fes-template/package.json | 4 +- packages/fes-template/src/utils/sum.js | 3 + packages/fes/package.json | 1 - packages/fes/src/cli.js | 40 +- yarn.lock | 2227 +++++++++++++++-- 18 files changed, 2306 insertions(+), 205 deletions(-) create mode 100644 packages/fes-plugin-unit-jest/.fatherrc.js create mode 100644 packages/fes-plugin-unit-jest/LICENSE create mode 100644 packages/fes-plugin-unit-jest/README.md create mode 100644 packages/fes-plugin-unit-jest/helpers/setupFiles/jasmine.js create mode 100644 packages/fes-plugin-unit-jest/helpers/setupFiles/shim.js create mode 100644 packages/fes-plugin-unit-jest/helpers/transformers/css.js create mode 100644 packages/fes-plugin-unit-jest/helpers/transformers/javascript.js create mode 100644 packages/fes-plugin-unit-jest/package.json create mode 100644 packages/fes-plugin-unit-jest/src/createDefaultConfig.js create mode 100644 packages/fes-plugin-unit-jest/src/index.js create mode 100644 packages/fes-template/.eslintrc.js create mode 100644 packages/fes-template/__tests__/add.js create mode 100644 packages/fes-template/src/utils/sum.js diff --git a/.fatherrc.js b/.fatherrc.js index 680c2f30..4728149c 100644 --- a/.fatherrc.js +++ b/.fatherrc.js @@ -16,7 +16,8 @@ const headPkgs = [ "fes-plugin-icon", "fes-plugin-locale", "fes-plugin-enums", - "create-fes-app" + "fes-plugin-unit-jest", + "create-fes-app", ]; const tailPkgs = []; // const otherPkgs = readdirSync(join(__dirname, 'packages')).filter( diff --git a/packages/fes-plugin-unit-jest/.fatherrc.js b/packages/fes-plugin-unit-jest/.fatherrc.js new file mode 100644 index 00000000..332f1bff --- /dev/null +++ b/packages/fes-plugin-unit-jest/.fatherrc.js @@ -0,0 +1,3 @@ +export default { + disableTypeCheck: false, +}; diff --git a/packages/fes-plugin-unit-jest/LICENSE b/packages/fes-plugin-unit-jest/LICENSE new file mode 100644 index 00000000..0978fbf7 --- /dev/null +++ b/packages/fes-plugin-unit-jest/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020-present webank + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/packages/fes-plugin-unit-jest/README.md b/packages/fes-plugin-unit-jest/README.md new file mode 100644 index 00000000..139597f9 --- /dev/null +++ b/packages/fes-plugin-unit-jest/README.md @@ -0,0 +1,2 @@ + + diff --git a/packages/fes-plugin-unit-jest/helpers/setupFiles/jasmine.js b/packages/fes-plugin-unit-jest/helpers/setupFiles/jasmine.js new file mode 100644 index 00000000..addfbcc4 --- /dev/null +++ b/packages/fes-plugin-unit-jest/helpers/setupFiles/jasmine.js @@ -0,0 +1 @@ +jasmine.DEFAULT_TIMEOUT_INTERVAL = 200000; // eslint-disable-line diff --git a/packages/fes-plugin-unit-jest/helpers/setupFiles/shim.js b/packages/fes-plugin-unit-jest/helpers/setupFiles/shim.js new file mode 100644 index 00000000..8c5e66ec --- /dev/null +++ b/packages/fes-plugin-unit-jest/helpers/setupFiles/shim.js @@ -0,0 +1,6 @@ +require('core-js/stable'); +require('regenerator-runtime/runtime'); + +if (typeof window !== 'undefined') { + require('whatwg-fetch'); +} diff --git a/packages/fes-plugin-unit-jest/helpers/transformers/css.js b/packages/fes-plugin-unit-jest/helpers/transformers/css.js new file mode 100644 index 00000000..327fba7c --- /dev/null +++ b/packages/fes-plugin-unit-jest/helpers/transformers/css.js @@ -0,0 +1,9 @@ +module.exports = { + process() { + return 'module.exports = {};'; + }, + getCacheKey() { + // The output is always the same. + return 'css'; + } +}; diff --git a/packages/fes-plugin-unit-jest/helpers/transformers/javascript.js b/packages/fes-plugin-unit-jest/helpers/transformers/javascript.js new file mode 100644 index 00000000..c232155e --- /dev/null +++ b/packages/fes-plugin-unit-jest/helpers/transformers/javascript.js @@ -0,0 +1,7 @@ +const babelJest = require('babel-jest'); + +module.exports = babelJest.createTransformer({ + presets: [require.resolve('@umijs/babel-preset-umi/node')], + babelrc: false, + configFile: false +}); diff --git a/packages/fes-plugin-unit-jest/package.json b/packages/fes-plugin-unit-jest/package.json new file mode 100644 index 00000000..3b431d64 --- /dev/null +++ b/packages/fes-plugin-unit-jest/package.json @@ -0,0 +1,48 @@ +{ + "name": "@webank/fes-plugin-unit-jest", + "version": "2.0.0-alpha.2", + "description": "@webank/fes-plugin-unit-jest", + "main": "lib/index.js", + "files": [ + "lib" + ], + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/WeBankFinTech/fes.js.git", + "directory": "packages/fes-plugin-unit-jest" + }, + "keywords": [ + "fes", + "unit", + "jest" + ], + "author": "harrywan", + "license": "MIT", + "bugs": { + "url": "https://github.com/WeBankFinTech/fes.js/issues" + }, + "homepage": "https://github.com/WeBankFinTech/fes.js#readme", + "publishConfig": { + "access": "public" + }, + "dependencies": { + "@babel/core": "7.11.6", + "@umijs/babel-preset-umi": "3.2.24", + "core-js": "3.6.5", + "babel-core": "^7.0.0-bridge.0", + "regenerator-runtime": "^0.13.7", + "@webank/fes-compiler": "^2.0.0-alpha.2", + "jest": "^26.6.3", + "jest-cli": "^26.6.3", + "jest-serializer-vue": "^2.0.2", + "jest-transform-stub": "^2.0.0", + "jest-watch-typeahead": "^0.6.1", + "babel-jest": "^26.6.3", + "vue-jest": "^5.0.5-0", + "whatwg-fetch": "^3.4.1", + "typescript": "~4.1.2" + } +} diff --git a/packages/fes-plugin-unit-jest/src/createDefaultConfig.js b/packages/fes-plugin-unit-jest/src/createDefaultConfig.js new file mode 100644 index 00000000..a0b1d3fe --- /dev/null +++ b/packages/fes-plugin-unit-jest/src/createDefaultConfig.js @@ -0,0 +1,39 @@ +export default () => ({ + moduleFileExtensions: [ + 'js', + 'jsx', + 'json', + // tell Jest to handle *.vue files + 'vue' + ], + transform: { + // process *.vue files with vue-jest + '^.+\\.vue$': require.resolve('vue-jest'), + '.+\\.(css|styl|less|sass|scss|jpg|jpeg|png|svg|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': + require.resolve('jest-transform-stub'), + '^.+\\.jsx?$': require.resolve( + '../helpers/transformers/javascript' + ) + }, + setupFiles: [require.resolve('../helpers/setupFiles/shim')], + setupFilesAfterEnv: [require.resolve('../helpers/setupFiles/jasmine')], + transformIgnorePatterns: ['/node_modules/'], + // support the same @ -> src alias mapping in source code + moduleNameMapper: { + '^@/(.*)$': '/src/$1' + }, + // serializer for snapshots + snapshotSerializers: [ + 'jest-serializer-vue' + ], + testMatch: [ + '**/tests/unit/**/*.spec.[jt]s?(x)', + '**/__tests__/*.[jt]s?(x)' + ], + // https://github.com/facebook/jest/issues/6766 + testURL: 'http://localhost/', + watchPlugins: [ + require.resolve('jest-watch-typeahead/filename'), + require.resolve('jest-watch-typeahead/testname') + ] +}); diff --git a/packages/fes-plugin-unit-jest/src/index.js b/packages/fes-plugin-unit-jest/src/index.js new file mode 100644 index 00000000..8acde537 --- /dev/null +++ b/packages/fes-plugin-unit-jest/src/index.js @@ -0,0 +1,82 @@ +import { runCLI } from 'jest'; +import assert from 'assert'; +import { join } from 'path'; +import { existsSync } from 'fs'; +import { Logger } from '@webank/fes-compiler'; +import { options as CliOptions } from 'jest-cli/build/cli/args'; +import createDefaultConfig from './createDefaultConfig'; + +const logger = new Logger('fes:plugin-built-in'); + +export default function (api) { + const { utils: { mergeConfig }, cwd } = api; + + api.registerCommand({ + name: 'test:unit', + usage: 'fes test:unit [options] ', + description: 'run unit tests with jest', + options: { + '--watch': 'run tests in watch mode', + '--debug': 'debug' + }, + details: + 'All jest command line options are supported.\n' + + 'See https://facebook.github.io/jest/docs/en/cli.html for more details.', + async fn({ args }) { + console.log(args); + + process.env.NODE_ENV = 'test'; + + args.debug && logger.log(`args: ${JSON.stringify(args)}`); + + // Read config from cwd/jest.config.js + const userJestConfigFile = join(cwd, 'jest.config.js'); + const userJestConfig = existsSync(userJestConfigFile) && require(userJestConfigFile); + args.debug && logger.log(`config from jest.config.js: ${JSON.stringify(userJestConfig)}`); + + // Read jest config from package.json + const packageJSONPath = join(cwd, 'package.json'); + const packageJestConfig = existsSync(packageJSONPath) && require(packageJSONPath).jest; + args.debug && logger.log(`jest config from package.json: ${JSON.stringify(packageJestConfig)}`); + + // Merge configs + // user config and args config could have value function for modification + const config = mergeConfig( + createDefaultConfig(cwd, args), + packageJestConfig, + userJestConfig + ); + args.debug && logger.log(`final config: ${JSON.stringify(config)}`); + + // Generate jest options + const argsConfig = Object.keys(CliOptions).reduce((prev, name) => { + if (args[name]) prev[name] = args[name]; + + // Convert alias args into real one + const { alias } = CliOptions[name]; + if (alias && args[alias]) prev[name] = args[alias]; + return prev; + }, {}); + args.debug && logger.log(`config from args: ${JSON.stringify(argsConfig)}`); + + // Run jest + const result = await runCLI( + { + // @ts-ignore + _: args._ || [], + // @ts-ignore + $0: args.$0 || '', + // 必须是单独的 config 配置，值为 string，否则不生效 + // @ts-ignore + config: JSON.stringify(config), + ...argsConfig + }, + [cwd] + ); + args.debug && logger.log(result); + + // Throw error when run failed + assert(result.results.success, 'Test with jest failed'); + } + }); +} diff --git a/packages/fes-template/.eslintrc.js b/packages/fes-template/.eslintrc.js new file mode 100644 index 00000000..57c7f909 --- /dev/null +++ b/packages/fes-template/.eslintrc.js @@ -0,0 +1,10 @@ +module.exports = { + extends: [require.resolve('@webank/eslint-config-webank')], + files: [ + '**/__tests__/*.{j,t}s?(x)', + '**/tests/unit/**/*.spec.{j,t}s?(x)' + ], + env: { + jest: true + } +}; diff --git a/packages/fes-template/__tests__/add.js b/packages/fes-template/__tests__/add.js new file mode 100644 index 00000000..5eaa2245 --- /dev/null +++ b/packages/fes-template/__tests__/add.js @@ -0,0 +1,5 @@ +import sum from "@/utils/sum" + +test('adds 1 + 2 to equal 3', () => { + expect(sum(1, 2)).toBe(3); +}); diff --git a/packages/fes-template/package.json b/packages/fes-template/package.json index 162a3098..d30b578b 100644 --- a/packages/fes-template/package.json +++ b/packages/fes-template/package.json @@ -6,7 +6,8 @@ "build": "fes build", "prod": "FES_ENV=prod fes build", "analyze": "ANALYZE=1 fes build", - "dev": "fes dev" + "dev": "fes dev", + "test:unit": "fes test:unit" }, "keywords": [ "管理端", @@ -52,6 +53,7 @@ "@webank/fes-plugin-locale": "^2.0.0-alpha.0", "@webank/fes-plugin-model": "^2.0.0-alpha.0", "@webank/fes-plugin-enums": "^2.0.0-alpha.0", + "@webank/fes-plugin-unit-jest": "^2.0.0-alpha.0", "ant-design-vue": "2.0.0-rc.3", "vue": "3.0.4" }, diff --git a/packages/fes-template/src/utils/sum.js b/packages/fes-template/src/utils/sum.js new file mode 100644 index 00000000..54b28e5a --- /dev/null +++ b/packages/fes-template/src/utils/sum.js @@ -0,0 +1,3 @@ +export default function sum(a, b) { + return a + b; +} diff --git a/packages/fes/package.json b/packages/fes/package.json index 29c3696b..440ce8ab 100644 --- a/packages/fes/package.json +++ b/packages/fes/package.json @@ -45,7 +45,6 @@ "@webank/fes-runtime": "^2.0.0-alpha.2", "commander": "^6.2.1", "envinfo": "^7.7.3", - "leven": "^3.1.0", "resolve-cwd": "^3.0.0" }, "engines": { diff --git a/packages/fes/src/cli.js b/packages/fes/src/cli.js index f96aaa1b..9a0964bc 100644 --- a/packages/fes/src/cli.js +++ b/packages/fes/src/cli.js @@ -1,6 +1,5 @@ import { chalk, yParser, semver } from '@umijs/utils'; import program from 'commander'; -import leven from 'leven'; import { Service } from './serviceWithBuiltIn'; import fork from './utils/fork'; import getCwd from './utils/getCwd'; @@ -24,23 +23,6 @@ function checkNodeVersion(wanted, id) { checkNodeVersion(requiredVersion, '@webank/fes'); -function suggestCommands(unknownCommand) { - const availableCommands = program.commands.map(cmd => cmd._name); - - let suggestion; - - availableCommands.forEach((cmd) => { - const isBestMatch = leven(cmd, unknownCommand) < leven(suggestion || '', unknownCommand); - if (leven(cmd, unknownCommand) < 3 && isBestMatch) { - suggestion = cmd; - } - }); - - if (suggestion) { - console.log(` ${chalk.red(`Did you mean ${chalk.yellow(suggestion)}?`)}`); - } -} - // process.argv: [node, fes.js, command, args] const args = yParser(process.argv.slice(2)); @@ -117,16 +99,24 @@ program .then(console.log); }); -// output help information on unknown commands program .arguments('[command]') - .action((cmd) => { + .option('--debug', 'Skip prompts and use default preset') + .action(async (cmd) => { if (cmd) { - program.outputHelp(); - console.log(` ${chalk.red(`Unknown command ${chalk.yellow(cmd)}.`)}`); - console.log(); - suggestCommands(cmd); - process.exitCode = 1; + try { + await new Service({ + cwd: getCwd(), + pkg: getPkg(process.cwd()) + }).run({ + name: cmd, + args + }); + } catch (e) { + console.error(chalk.red(e.message)); + console.error(e.stack); + process.exit(1); + } } }); diff --git a/yarn.lock b/yarn.lock index 1898ddf9..2baa54e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -172,16 +172,16 @@ dependencies: "@babel/highlight" "^7.10.4" +"@babel/compat-data@^7.10.4", "@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41" + integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw== + "@babel/compat-data@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz#d7386a689aa0ddf06255005b4b991988021101a0" integrity sha512-725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ== -"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41" - integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw== - "@babel/core@7.12.3", "@babel/core@^7.4.5": version "7.12.3" resolved "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8" @@ -224,7 +224,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.11.1": +"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.7.5": version "7.12.10" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== @@ -245,6 +245,15 @@ semver "^5.4.1" source-map "^0.5.0" +"@babel/generator@^7.10.4", "@babel/generator@^7.11.5", "@babel/generator@^7.12.10", "@babel/generator@^7.12.11": + version "7.12.11" + resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af" + integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA== + dependencies: + "@babel/types" "^7.12.11" + jsesc "^2.5.1" + source-map "^0.5.0" + "@babel/generator@^7.12.1", "@babel/generator@^7.4.0", "@babel/generator@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz#0d70be32bdaa03d7c51c8597dda76e0df1f15468" @@ -254,15 +263,6 @@ jsesc "^2.5.1" source-map "^0.5.0" -"@babel/generator@^7.12.10", "@babel/generator@^7.12.11": - version "7.12.11" - resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af" - integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA== - dependencies: - "@babel/types" "^7.12.11" - jsesc "^2.5.1" - source-map "^0.5.0" - "@babel/generator@^7.12.5": version "7.12.5" resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de" @@ -279,6 +279,13 @@ dependencies: "@babel/types" "^7.10.4" +"@babel/helper-annotate-as-pure@^7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d" + integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ== + dependencies: + "@babel/types" "^7.12.10" + "@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4": version "7.10.4" resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3" @@ -304,6 +311,16 @@ "@babel/helper-annotate-as-pure" "^7.10.4" "@babel/types" "^7.10.4" +"@babel/helper-compilation-targets@^7.10.4", "@babel/helper-compilation-targets@^7.12.5": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831" + integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw== + dependencies: + "@babel/compat-data" "^7.12.5" + "@babel/helper-validator-option" "^7.12.1" + browserslist "^4.14.5" + semver "^5.5.0" + "@babel/helper-compilation-targets@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz#310e352888fbdbdd8577be8dfdd2afb9e7adcf50" @@ -314,17 +331,7 @@ browserslist "^4.12.0" semver "^5.5.0" -"@babel/helper-compilation-targets@^7.12.5": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831" - integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw== - dependencies: - "@babel/compat-data" "^7.12.5" - "@babel/helper-validator-option" "^7.12.1" - browserslist "^4.14.5" - semver "^5.5.0" - -"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.4.4": +"@babel/helper-create-class-features-plugin@^7.10.4", "@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e" integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w== @@ -558,20 +565,34 @@ chalk "^2.0.0" js-tokens "^4.0.0" +"@babel/parser@7.11.5": + version "7.11.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037" + integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q== + "@babel/parser@7.12.5", "@babel/parser@^7.12.5": version "7.12.5" resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0" integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.11.5", "@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7": + version "7.12.11" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79" + integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg== + "@babel/parser@^7.10.4", "@babel/parser@^7.12.0", "@babel/parser@^7.12.1", "@babel/parser@^7.12.3", "@babel/parser@^7.4.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0": version "7.12.3" resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz#a305415ebe7a6c7023b40b5122a0662d928334cd" integrity sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw== -"@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7": - version "7.12.11" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79" - integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg== +"@babel/plugin-proposal-async-generator-functions@^7.10.4": + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz#04b8f24fd4532008ab4e79f788468fd5a8476566" + integrity sha512-nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-remap-async-to-generator" "^7.12.1" + "@babel/plugin-syntax-async-generators" "^7.8.0" "@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.2.0": version "7.12.1" @@ -582,7 +603,15 @@ "@babel/helper-remap-async-to-generator" "^7.12.1" "@babel/plugin-syntax-async-generators" "^7.8.0" -"@babel/plugin-proposal-class-properties@7.12.1", "@babel/plugin-proposal-class-properties@^7.12.1": +"@babel/plugin-proposal-class-properties@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807" + integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-proposal-class-properties@7.12.1", "@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de" integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w== @@ -598,6 +627,15 @@ "@babel/helper-create-class-features-plugin" "^7.4.4" "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-proposal-decorators@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.4.tgz#fe20ef10cc73f386f70910fca48798041cd357c7" + integrity sha512-JHTWjQngOPv+ZQQqOGv2x6sCCr4IYWy7S1/VH6BE9ZfkoLrdQ2GpEP3tfb5M++G9PwvqjhY8VC/C3tXm+/eHvA== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-decorators" "^7.10.4" + "@babel/plugin-proposal-decorators@7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz#59271439fed4145456c41067450543aee332d15f" @@ -616,6 +654,14 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-decorators" "^7.2.0" +"@babel/plugin-proposal-do-expressions@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.10.4.tgz#9a5190f3bf4818f83e41d673ee517ff76cf8e4ed" + integrity sha512-Gcc2wLVeMceRdP6m9tdDygP01lbUVmaQGBRoIRJZxzPfB5VTiUgmn1jGfORgqbEVgUpG0IQm/z4q5Y/qzG+8JQ== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-do-expressions" "^7.10.4" + "@babel/plugin-proposal-do-expressions@7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.12.1.tgz#8d7f1bc532d8168147555c26e3db922cc0dfd2f8" @@ -632,7 +678,7 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-do-expressions" "^7.2.0" -"@babel/plugin-proposal-dynamic-import@^7.12.1": +"@babel/plugin-proposal-dynamic-import@^7.10.4", "@babel/plugin-proposal-dynamic-import@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc" integrity sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ== @@ -640,6 +686,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-dynamic-import" "^7.8.0" +"@babel/plugin-proposal-export-default-from@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.10.4.tgz#08f66eef0067cbf6a7bc036977dcdccecaf0c6c5" + integrity sha512-G1l00VvDZ7Yk2yRlC5D8Ybvu3gmeHS3rCHoUYdjrqGYUtdeOBoRypnvDZ5KQqxyaiiGHWnVDeSEzA5F9ozItig== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-export-default-from" "^7.10.4" + "@babel/plugin-proposal-export-default-from@7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.1.tgz#c6e62d668a8abcfe0d28b82f560395fecb611c5a" @@ -672,6 +726,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" +"@babel/plugin-proposal-function-bind@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-function-bind/-/plugin-proposal-function-bind-7.10.4.tgz#20473ab9c3b22fb9314fcc78ab2cdcc5e5f9adb6" + integrity sha512-7l1vyaVdRHQJ9m7Gr4tPyjfXcyhzPoulezpfDtOY+c471griieTUMoPdqTo/oSzVdsNT5uQOt05kFyprDTieYA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-function-bind" "^7.10.4" + "@babel/plugin-proposal-function-bind@7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-function-bind/-/plugin-proposal-function-bind-7.12.1.tgz#8b891b412ffbc8e8ff3fd4df67b8d4bbe5947004" @@ -680,7 +742,7 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-function-bind" "^7.12.1" -"@babel/plugin-proposal-json-strings@^7.12.1", "@babel/plugin-proposal-json-strings@^7.2.0": +"@babel/plugin-proposal-json-strings@^7.10.4", "@babel/plugin-proposal-json-strings@^7.12.1", "@babel/plugin-proposal-json-strings@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c" integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw== @@ -688,6 +750,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-json-strings" "^7.8.0" +"@babel/plugin-proposal-logical-assignment-operators@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.10.4.tgz#e62b5cf38e494d6cc24683e2a26cba4a28f7ea44" + integrity sha512-gyZd+5BZdK3rTpLCw0cTXUESWywH4wvugdzuUYkDKhtP0Obkp2ebZZzVE24UhVOb47vTDNwbUzQpei9psxYj6A== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-proposal-logical-assignment-operators@7.12.1", "@babel/plugin-proposal-logical-assignment-operators@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751" @@ -696,7 +766,15 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-proposal-nullish-coalescing-operator@7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1": +"@babel/plugin-proposal-nullish-coalescing-operator@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a" + integrity sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" + +"@babel/plugin-proposal-nullish-coalescing-operator@7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4", "@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c" integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg== @@ -712,6 +790,14 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.7.4" +"@babel/plugin-proposal-numeric-separator@^7.10.4", "@babel/plugin-proposal-numeric-separator@^7.12.7": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b" + integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/plugin-proposal-numeric-separator@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz#0e2c6774c4ce48be412119b4d693ac777f7685a6" @@ -720,15 +806,7 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-numeric-separator@^7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b" - integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - -"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.4.4": +"@babel/plugin-proposal-object-rest-spread@^7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069" integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA== @@ -737,7 +815,7 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.0" "@babel/plugin-transform-parameters" "^7.12.1" -"@babel/plugin-proposal-optional-catch-binding@^7.12.1", "@babel/plugin-proposal-optional-catch-binding@^7.2.0": +"@babel/plugin-proposal-optional-catch-binding@^7.10.4", "@babel/plugin-proposal-optional-catch-binding@^7.12.1", "@babel/plugin-proposal-optional-catch-binding@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942" integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g== @@ -745,6 +823,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" +"@babel/plugin-proposal-optional-chaining@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz#750f1255e930a1f82d8cdde45031f81a0d0adff7" + integrity sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-optional-chaining" "^7.8.0" + "@babel/plugin-proposal-optional-chaining@7.12.1", "@babel/plugin-proposal-optional-chaining@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz#cce122203fc8a32794296fc377c6dedaf4363797" @@ -762,7 +848,7 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-optional-chaining" "^7.7.4" -"@babel/plugin-proposal-optional-chaining@^7.12.7": +"@babel/plugin-proposal-optional-chaining@^7.10.4", "@babel/plugin-proposal-optional-chaining@^7.12.7": version "7.12.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c" integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA== @@ -771,6 +857,14 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" "@babel/plugin-syntax-optional-chaining" "^7.8.0" +"@babel/plugin-proposal-pipeline-operator@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-pipeline-operator/-/plugin-proposal-pipeline-operator-7.10.4.tgz#14d76c110409416f84c520d8a617bbe7f6a754dc" + integrity sha512-NL4M3pQrvBZKrudP2WybWIHWgLR4ZwWiIYPk1T0jbXl665Ao7ODn+OLksv2+1bMGwOIE49vNcmhaAMA0uqRgGA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-pipeline-operator" "^7.10.4" + "@babel/plugin-proposal-pipeline-operator@7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-pipeline-operator/-/plugin-proposal-pipeline-operator-7.12.1.tgz#4bd377bc7e5be92f22f1c08b3f3963636bd8f4a1" @@ -779,7 +873,7 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-pipeline-operator" "^7.12.1" -"@babel/plugin-proposal-private-methods@^7.12.1": +"@babel/plugin-proposal-private-methods@^7.10.4", "@babel/plugin-proposal-private-methods@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389" integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w== @@ -787,7 +881,7 @@ "@babel/helper-create-class-features-plugin" "^7.12.1" "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": +"@babel/plugin-proposal-unicode-property-regex@^7.10.4", "@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072" integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w== @@ -795,28 +889,35 @@ "@babel/helper-create-regexp-features-plugin" "^7.12.1" "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-async-generators@^7.2.0", "@babel/plugin-syntax-async-generators@^7.8.0": +"@babel/plugin-syntax-async-generators@^7.2.0", "@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-class-properties@^7.12.1": +"@babel/plugin-syntax-bigint@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" + integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-class-properties@^7.10.4", "@babel/plugin-syntax-class-properties@^7.12.1", "@babel/plugin-syntax-class-properties@^7.8.3": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978" integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-decorators@^7.12.1", "@babel/plugin-syntax-decorators@^7.2.0": +"@babel/plugin-syntax-decorators@^7.10.4", "@babel/plugin-syntax-decorators@^7.12.1", "@babel/plugin-syntax-decorators@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz#81a8b535b284476c41be6de06853a8802b98c5dd" integrity sha512-ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-do-expressions@^7.12.1", "@babel/plugin-syntax-do-expressions@^7.2.0": +"@babel/plugin-syntax-do-expressions@^7.10.4", "@babel/plugin-syntax-do-expressions@^7.12.1", "@babel/plugin-syntax-do-expressions@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-syntax-do-expressions/-/plugin-syntax-do-expressions-7.12.1.tgz#6b83dfab79540b66912b559860ce6d4be4f7d960" integrity sha512-a9TknRXkzfetNjOWSWnPIG/Y7x+elzcmKng2Qpvh8QaqdPo0OABizTjco8YO8r5xZNQfE58YHq7lWR+PKwHyxg== @@ -837,7 +938,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-export-default-from@^7.12.1", "@babel/plugin-syntax-export-default-from@^7.2.0": +"@babel/plugin-syntax-export-default-from@^7.10.4", "@babel/plugin-syntax-export-default-from@^7.12.1", "@babel/plugin-syntax-export-default-from@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.12.1.tgz#a9eb31881f4f9a1115a3d2c6d64ac3f6016b5a9d" integrity sha512-dP5eGg6tHEkhnRD2/vRG/KJKRSg8gtxu2i+P/8/yFPJn/CfPU5G0/7Gks2i3M6IOVAPQekmsLN9LPsmXFFL4Uw== @@ -851,14 +952,21 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-function-bind@^7.12.1": +"@babel/plugin-syntax-function-bind@^7.10.4", "@babel/plugin-syntax-function-bind@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-syntax-function-bind/-/plugin-syntax-function-bind-7.12.1.tgz#1e15da3e568c96dabe21579f2d66821db98aafcc" integrity sha512-YN14nxb0Q3/M7AUDnwnjFYpUylysfZ4KY/byhIz5PN7JyMJldjuUS+UmV7bOL6crQ0M69tuoevD/AlOveDeyMQ== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-json-strings@^7.2.0", "@babel/plugin-syntax-json-strings@^7.8.0": +"@babel/plugin-syntax-import-meta@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" + integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-json-strings@^7.2.0", "@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3": version "7.8.3" resolved "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== @@ -872,56 +980,63 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": +"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-nullish-coalescing-operator@^7.7.4", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0": +"@babel/plugin-syntax-nullish-coalescing-operator@^7.7.4", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": version "7.8.3" resolved "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-numeric-separator@^7.10.4": +"@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3": version "7.10.4" resolved "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-object-rest-spread@^7.2.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0": +"@babel/plugin-syntax-object-rest-spread@^7.2.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3": version "7.8.3" resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-optional-catch-binding@^7.2.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.0": +"@babel/plugin-syntax-optional-catch-binding@^7.2.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3": version "7.8.3" resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-optional-chaining@^7.7.4", "@babel/plugin-syntax-optional-chaining@^7.8.0": +"@babel/plugin-syntax-optional-chaining@^7.7.4", "@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3": version "7.8.3" resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-pipeline-operator@^7.12.1": +"@babel/plugin-syntax-pipeline-operator@^7.10.4", "@babel/plugin-syntax-pipeline-operator@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-syntax-pipeline-operator/-/plugin-syntax-pipeline-operator-7.12.1.tgz#6186f1d5feb86d315a920a5056a86c991bf4b7f4" integrity sha512-NazCTl1P9Kp+790g7gDRQEvhU0+OYbZVsuW45ThfgVCdUyhtxzFJeFrzY6BX/u/NfFyXWbKAIl6wR0PhJWwyDA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-top-level-await@7.12.1", "@babel/plugin-syntax-top-level-await@^7.12.1": +"@babel/plugin-syntax-top-level-await@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz#4bbeb8917b54fcf768364e0a81f560e33a3ef57d" + integrity sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-top-level-await@7.12.1", "@babel/plugin-syntax-top-level-await@^7.10.4", "@babel/plugin-syntax-top-level-await@^7.12.1", "@babel/plugin-syntax-top-level-await@^7.8.3": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0" integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A== @@ -935,14 +1050,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-arrow-functions@^7.12.1", "@babel/plugin-transform-arrow-functions@^7.2.0": +"@babel/plugin-transform-arrow-functions@^7.10.4", "@babel/plugin-transform-arrow-functions@^7.12.1", "@babel/plugin-transform-arrow-functions@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3" integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-async-to-generator@^7.12.1", "@babel/plugin-transform-async-to-generator@^7.4.4": +"@babel/plugin-transform-async-to-generator@^7.10.4", "@babel/plugin-transform-async-to-generator@^7.12.1", "@babel/plugin-transform-async-to-generator@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1" integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A== @@ -951,13 +1066,20 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-remap-async-to-generator" "^7.12.1" -"@babel/plugin-transform-block-scoped-functions@^7.12.1", "@babel/plugin-transform-block-scoped-functions@^7.2.0": +"@babel/plugin-transform-block-scoped-functions@^7.10.4", "@babel/plugin-transform-block-scoped-functions@^7.12.1", "@babel/plugin-transform-block-scoped-functions@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9" integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" +"@babel/plugin-transform-block-scoping@^7.10.4", "@babel/plugin-transform-block-scoping@^7.12.11": + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz#d93a567a152c22aea3b1929bb118d1d0a175cdca" + integrity sha512-VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1" @@ -965,14 +1087,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-block-scoping@^7.12.11": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz#d93a567a152c22aea3b1929bb118d1d0a175cdca" - integrity sha512-VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.4.4": +"@babel/plugin-transform-classes@^7.10.4", "@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6" integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog== @@ -986,21 +1101,28 @@ "@babel/helper-split-export-declaration" "^7.10.4" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.12.1", "@babel/plugin-transform-computed-properties@^7.2.0": +"@babel/plugin-transform-computed-properties@^7.10.4", "@babel/plugin-transform-computed-properties@^7.12.1", "@babel/plugin-transform-computed-properties@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852" integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-destructuring@7.12.1", "@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.4.4": +"@babel/plugin-transform-destructuring@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz#70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5" + integrity sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-destructuring@7.12.1", "@babel/plugin-transform-destructuring@^7.10.4", "@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847" integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4": +"@babel/plugin-transform-dotall-regex@^7.10.4", "@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975" integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA== @@ -1008,14 +1130,14 @@ "@babel/helper-create-regexp-features-plugin" "^7.12.1" "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-duplicate-keys@^7.12.1", "@babel/plugin-transform-duplicate-keys@^7.2.0": +"@babel/plugin-transform-duplicate-keys@^7.10.4", "@babel/plugin-transform-duplicate-keys@^7.12.1", "@babel/plugin-transform-duplicate-keys@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228" integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-exponentiation-operator@^7.12.1", "@babel/plugin-transform-exponentiation-operator@^7.2.0": +"@babel/plugin-transform-exponentiation-operator@^7.10.4", "@babel/plugin-transform-exponentiation-operator@^7.12.1", "@babel/plugin-transform-exponentiation-operator@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0" integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug== @@ -1023,14 +1145,14 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.4.4": +"@babel/plugin-transform-for-of@^7.10.4", "@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa" integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-function-name@^7.12.1", "@babel/plugin-transform-function-name@^7.4.4": +"@babel/plugin-transform-function-name@^7.10.4", "@babel/plugin-transform-function-name@^7.12.1", "@babel/plugin-transform-function-name@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667" integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw== @@ -1038,21 +1160,21 @@ "@babel/helper-function-name" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-literals@^7.12.1", "@babel/plugin-transform-literals@^7.2.0": +"@babel/plugin-transform-literals@^7.10.4", "@babel/plugin-transform-literals@^7.12.1", "@babel/plugin-transform-literals@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57" integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-member-expression-literals@^7.12.1", "@babel/plugin-transform-member-expression-literals@^7.2.0": +"@babel/plugin-transform-member-expression-literals@^7.10.4", "@babel/plugin-transform-member-expression-literals@^7.12.1", "@babel/plugin-transform-member-expression-literals@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad" integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.2.0": +"@babel/plugin-transform-modules-amd@^7.10.4", "@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9" integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ== @@ -1071,7 +1193,7 @@ "@babel/helper-simple-access" "^7.1.0" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.4.4": +"@babel/plugin-transform-modules-commonjs@^7.10.4", "@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.2.0", "@babel/plugin-transform-modules-commonjs@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648" integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag== @@ -1081,7 +1203,7 @@ "@babel/helper-simple-access" "^7.12.1" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.4.4": +"@babel/plugin-transform-modules-systemjs@^7.10.4", "@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086" integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q== @@ -1092,7 +1214,7 @@ "@babel/helper-validator-identifier" "^7.10.4" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-umd@^7.12.1", "@babel/plugin-transform-modules-umd@^7.2.0": +"@babel/plugin-transform-modules-umd@^7.10.4", "@babel/plugin-transform-modules-umd@^7.12.1", "@babel/plugin-transform-modules-umd@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902" integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q== @@ -1100,21 +1222,21 @@ "@babel/helper-module-transforms" "^7.12.1" "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.4.5": +"@babel/plugin-transform-named-capturing-groups-regex@^7.10.4", "@babel/plugin-transform-named-capturing-groups-regex@^7.12.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.4.5": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753" integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.12.1" -"@babel/plugin-transform-new-target@^7.12.1", "@babel/plugin-transform-new-target@^7.4.4": +"@babel/plugin-transform-new-target@^7.10.4", "@babel/plugin-transform-new-target@^7.12.1", "@babel/plugin-transform-new-target@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0" integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-object-super@^7.12.1", "@babel/plugin-transform-object-super@^7.2.0": +"@babel/plugin-transform-object-super@^7.10.4", "@babel/plugin-transform-object-super@^7.12.1", "@babel/plugin-transform-object-super@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e" integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw== @@ -1122,14 +1244,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-replace-supers" "^7.12.1" -"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.4.4": +"@babel/plugin-transform-parameters@^7.10.4", "@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d" integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-property-literals@^7.12.1", "@babel/plugin-transform-property-literals@^7.2.0": +"@babel/plugin-transform-property-literals@^7.10.4", "@babel/plugin-transform-property-literals@^7.12.1", "@babel/plugin-transform-property-literals@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd" integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ== @@ -1143,13 +1265,20 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-react-display-name@^7.0.0", "@babel/plugin-transform-react-display-name@^7.12.1": +"@babel/plugin-transform-react-display-name@^7.0.0", "@babel/plugin-transform-react-display-name@^7.10.4", "@babel/plugin-transform-react-display-name@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz#1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d" integrity sha512-cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w== dependencies: "@babel/helper-plugin-utils" "^7.10.4" +"@babel/plugin-transform-react-jsx-development@^7.10.4": + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.12.tgz#bccca33108fe99d95d7f9e82046bfe762e71f4e7" + integrity sha512-i1AxnKxHeMxUaWVXQOSIco4tvVvvCxMSfeBMnMM06mpaJt3g+MpxYQQrDfojUQldP1xxraPSJYSMEljoWM/dCg== + dependencies: + "@babel/plugin-transform-react-jsx" "^7.12.12" + "@babel/plugin-transform-react-jsx-development@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.1.tgz#0b8f8cd531dcf7991f1e5f2c10a2a4f1cfc78e36" @@ -1159,14 +1288,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-jsx" "^7.12.1" -"@babel/plugin-transform-react-jsx-self@^7.0.0", "@babel/plugin-transform-react-jsx-self@^7.12.1": +"@babel/plugin-transform-react-jsx-self@^7.0.0", "@babel/plugin-transform-react-jsx-self@^7.10.4", "@babel/plugin-transform-react-jsx-self@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz#ef43cbca2a14f1bd17807dbe4376ff89d714cf28" integrity sha512-FbpL0ieNWiiBB5tCldX17EtXgmzeEZjFrix72rQYeq9X6nUK38HCaxexzVQrZWXanxKJPKVVIU37gFjEQYkPkA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-react-jsx-source@^7.0.0", "@babel/plugin-transform-react-jsx-source@^7.12.1": +"@babel/plugin-transform-react-jsx-source@^7.0.0", "@babel/plugin-transform-react-jsx-source@^7.10.4", "@babel/plugin-transform-react-jsx-source@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz#d07de6863f468da0809edcf79a1aa8ce2a82a26b" integrity sha512-keQ5kBfjJNRc6zZN1/nVHCd6LLIHq4aUKcVnvE/2l+ZZROSbqoiGFRtT5t3Is89XJxBQaP7NLZX2jgGHdZvvFQ== @@ -1183,7 +1312,18 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-jsx" "^7.12.1" -"@babel/plugin-transform-react-pure-annotations@^7.12.1": +"@babel/plugin-transform-react-jsx@^7.10.4", "@babel/plugin-transform-react-jsx@^7.12.12": + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.12.tgz#b0da51ffe5f34b9a900e9f1f5fb814f9e512d25e" + integrity sha512-JDWGuzGNWscYcq8oJVCtSE61a5+XAOos+V0HrxnDieUus4UMnBEosDnY1VJqU5iZ4pA04QY7l0+JvHL1hZEfsw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.12.10" + "@babel/helper-module-imports" "^7.12.5" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-jsx" "^7.12.1" + "@babel/types" "^7.12.12" + +"@babel/plugin-transform-react-pure-annotations@^7.10.4", "@babel/plugin-transform-react-pure-annotations@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42" integrity sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg== @@ -1191,20 +1331,30 @@ "@babel/helper-annotate-as-pure" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-regenerator@^7.12.1", "@babel/plugin-transform-regenerator@^7.4.5": +"@babel/plugin-transform-regenerator@^7.10.4", "@babel/plugin-transform-regenerator@^7.12.1", "@babel/plugin-transform-regenerator@^7.4.5": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753" integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng== dependencies: regenerator-transform "^0.14.2" -"@babel/plugin-transform-reserved-words@^7.12.1", "@babel/plugin-transform-reserved-words@^7.2.0": +"@babel/plugin-transform-reserved-words@^7.10.4", "@babel/plugin-transform-reserved-words@^7.12.1", "@babel/plugin-transform-reserved-words@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8" integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A== dependencies: "@babel/helper-plugin-utils" "^7.10.4" +"@babel/plugin-transform-runtime@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.4.tgz#594fb53453ea1b6f0779cceb48ce0718a447feb7" + integrity sha512-8ULlGv8p+Vuxu+kz2Y1dk6MYS2b/Dki+NO6/0ZlfSj5tMalfDL7jI/o/2a+rrWLqSXvnadEqc2WguB4gdQIxZw== + dependencies: + "@babel/helper-module-imports" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + resolve "^1.8.1" + semver "^5.5.1" + "@babel/plugin-transform-runtime@7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz#04b792057eb460389ff6a4198e377614ea1e7ba5" @@ -1225,14 +1375,14 @@ resolve "^1.8.1" semver "^5.5.1" -"@babel/plugin-transform-shorthand-properties@^7.12.1", "@babel/plugin-transform-shorthand-properties@^7.2.0": +"@babel/plugin-transform-shorthand-properties@^7.10.4", "@babel/plugin-transform-shorthand-properties@^7.12.1", "@babel/plugin-transform-shorthand-properties@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3" integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-spread@^7.12.1", "@babel/plugin-transform-spread@^7.2.0": +"@babel/plugin-transform-spread@^7.10.4", "@babel/plugin-transform-spread@^7.12.1", "@babel/plugin-transform-spread@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e" integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng== @@ -1240,6 +1390,13 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" +"@babel/plugin-transform-sticky-regex@^7.10.4", "@babel/plugin-transform-sticky-regex@^7.12.7": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad" + integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-transform-sticky-regex@^7.12.1", "@babel/plugin-transform-sticky-regex@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz#5c24cf50de396d30e99afc8d1c700e8bce0f5caf" @@ -1248,20 +1405,20 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-regex" "^7.10.4" -"@babel/plugin-transform-sticky-regex@^7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad" - integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.4.4": +"@babel/plugin-transform-template-literals@^7.10.4", "@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843" integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw== dependencies: "@babel/helper-plugin-utils" "^7.10.4" +"@babel/plugin-transform-typeof-symbol@^7.10.4", "@babel/plugin-transform-typeof-symbol@^7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b" + integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-transform-typeof-symbol@^7.12.1", "@babel/plugin-transform-typeof-symbol@^7.2.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a" @@ -1269,14 +1426,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-typeof-symbol@^7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b" - integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-transform-typescript@^7.12.1", "@babel/plugin-transform-typescript@^7.3.2": +"@babel/plugin-transform-typescript@^7.10.4", "@babel/plugin-transform-typescript@^7.12.1", "@babel/plugin-transform-typescript@^7.3.2": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz#d92cc0af504d510e26a754a7dbc2e5c8cd9c7ab4" integrity sha512-VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw== @@ -1285,14 +1435,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-typescript" "^7.12.1" -"@babel/plugin-transform-unicode-escapes@^7.12.1": +"@babel/plugin-transform-unicode-escapes@^7.10.4", "@babel/plugin-transform-unicode-escapes@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709" integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-unicode-regex@^7.12.1", "@babel/plugin-transform-unicode-regex@^7.4.4": +"@babel/plugin-transform-unicode-regex@^7.10.4", "@babel/plugin-transform-unicode-regex@^7.12.1", "@babel/plugin-transform-unicode-regex@^7.4.4": version "7.12.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb" integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg== @@ -1300,6 +1450,76 @@ "@babel/helper-create-regexp-features-plugin" "^7.12.1" "@babel/helper-plugin-utils" "^7.10.4" +"@babel/preset-env@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.4.tgz#fbf57f9a803afd97f4f32e4f798bb62e4b2bef5f" + integrity sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw== + dependencies: + "@babel/compat-data" "^7.10.4" + "@babel/helper-compilation-targets" "^7.10.4" + "@babel/helper-module-imports" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-proposal-async-generator-functions" "^7.10.4" + "@babel/plugin-proposal-class-properties" "^7.10.4" + "@babel/plugin-proposal-dynamic-import" "^7.10.4" + "@babel/plugin-proposal-json-strings" "^7.10.4" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4" + "@babel/plugin-proposal-numeric-separator" "^7.10.4" + "@babel/plugin-proposal-object-rest-spread" "^7.10.4" + "@babel/plugin-proposal-optional-catch-binding" "^7.10.4" + "@babel/plugin-proposal-optional-chaining" "^7.10.4" + "@babel/plugin-proposal-private-methods" "^7.10.4" + "@babel/plugin-proposal-unicode-property-regex" "^7.10.4" + "@babel/plugin-syntax-async-generators" "^7.8.0" + "@babel/plugin-syntax-class-properties" "^7.10.4" + "@babel/plugin-syntax-dynamic-import" "^7.8.0" + "@babel/plugin-syntax-json-strings" "^7.8.0" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" + "@babel/plugin-syntax-optional-chaining" "^7.8.0" + "@babel/plugin-syntax-top-level-await" "^7.10.4" + "@babel/plugin-transform-arrow-functions" "^7.10.4" + "@babel/plugin-transform-async-to-generator" "^7.10.4" + "@babel/plugin-transform-block-scoped-functions" "^7.10.4" + "@babel/plugin-transform-block-scoping" "^7.10.4" + "@babel/plugin-transform-classes" "^7.10.4" + "@babel/plugin-transform-computed-properties" "^7.10.4" + "@babel/plugin-transform-destructuring" "^7.10.4" + "@babel/plugin-transform-dotall-regex" "^7.10.4" + "@babel/plugin-transform-duplicate-keys" "^7.10.4" + "@babel/plugin-transform-exponentiation-operator" "^7.10.4" + "@babel/plugin-transform-for-of" "^7.10.4" + "@babel/plugin-transform-function-name" "^7.10.4" + "@babel/plugin-transform-literals" "^7.10.4" + "@babel/plugin-transform-member-expression-literals" "^7.10.4" + "@babel/plugin-transform-modules-amd" "^7.10.4" + "@babel/plugin-transform-modules-commonjs" "^7.10.4" + "@babel/plugin-transform-modules-systemjs" "^7.10.4" + "@babel/plugin-transform-modules-umd" "^7.10.4" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.10.4" + "@babel/plugin-transform-new-target" "^7.10.4" + "@babel/plugin-transform-object-super" "^7.10.4" + "@babel/plugin-transform-parameters" "^7.10.4" + "@babel/plugin-transform-property-literals" "^7.10.4" + "@babel/plugin-transform-regenerator" "^7.10.4" + "@babel/plugin-transform-reserved-words" "^7.10.4" + "@babel/plugin-transform-shorthand-properties" "^7.10.4" + "@babel/plugin-transform-spread" "^7.10.4" + "@babel/plugin-transform-sticky-regex" "^7.10.4" + "@babel/plugin-transform-template-literals" "^7.10.4" + "@babel/plugin-transform-typeof-symbol" "^7.10.4" + "@babel/plugin-transform-unicode-escapes" "^7.10.4" + "@babel/plugin-transform-unicode-regex" "^7.10.4" + "@babel/preset-modules" "^0.1.3" + "@babel/types" "^7.10.4" + browserslist "^4.12.0" + core-js-compat "^3.6.2" + invariant "^2.2.2" + levenary "^1.1.1" + semver "^5.5.0" + "@babel/preset-env@7.12.1", "@babel/preset-env@^7.4.5": version "7.12.1" resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2" @@ -1520,6 +1740,19 @@ "@babel/plugin-transform-react-jsx-self" "^7.0.0" "@babel/plugin-transform-react-jsx-source" "^7.0.0" +"@babel/preset-react@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.4.tgz#92e8a66d816f9911d11d4cc935be67adfc82dbcf" + integrity sha512-BrHp4TgOIy4M19JAfO1LhycVXOPWdDbTRep7eVyatf174Hff+6Uk53sDyajqZPu8W1qXRBiYOfIamek6jA7YVw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-transform-react-display-name" "^7.10.4" + "@babel/plugin-transform-react-jsx" "^7.10.4" + "@babel/plugin-transform-react-jsx-development" "^7.10.4" + "@babel/plugin-transform-react-jsx-self" "^7.10.4" + "@babel/plugin-transform-react-jsx-source" "^7.10.4" + "@babel/plugin-transform-react-pure-annotations" "^7.10.4" + "@babel/preset-react@7.12.1", "@babel/preset-react@^7.0.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.12.1.tgz#7f022b13f55b6dd82f00f16d1c599ae62985358c" @@ -1533,6 +1766,14 @@ "@babel/plugin-transform-react-jsx-source" "^7.12.1" "@babel/plugin-transform-react-pure-annotations" "^7.12.1" +"@babel/preset-typescript@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.10.4.tgz#7d5d052e52a682480d6e2cc5aa31be61c8c25e36" + integrity sha512-SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-transform-typescript" "^7.10.4" + "@babel/preset-typescript@7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.1.tgz#86480b483bb97f75036e8864fe404cc782cc311b" @@ -1549,6 +1790,17 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-transform-typescript" "^7.3.2" +"@babel/register@7.11.5": + version "7.11.5" + resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.11.5.tgz#79becf89e0ddd0fba8b92bc279bc0f5d2d7ce2ea" + integrity sha512-CAml0ioKX+kOAvBQDHa/+t1fgOt3qkTIz0TrRtRAT6XY0m5qYZXR85k6/sLCNPMGhYDlCFHCYuU0ybTJbvlC6w== + dependencies: + find-cache-dir "^2.0.0" + lodash "^4.17.19" + make-dir "^2.1.0" + pirates "^4.0.0" + source-map-support "^0.5.16" + "@babel/register@7.12.1", "@babel/register@^7.12.1": version "7.12.1" resolved "https://registry.npmjs.org/@babel/register/-/register-7.12.1.tgz#cdb087bdfc4f7241c03231f22e15d211acf21438" @@ -1572,6 +1824,13 @@ pirates "^4.0.0" source-map-support "^0.5.9" +"@babel/runtime@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.4.tgz#a6724f1a6b8d2f6ea5236dbfe58c7d7ea9c5eb99" + integrity sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/runtime@7.12.5", "@babel/runtime@^7.10.4", "@babel/runtime@^7.10.5": version "7.12.5" resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" @@ -1586,7 +1845,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.0.0", "@babel/template@^7.12.7": +"@babel/template@^7.0.0", "@babel/template@^7.12.7", "@babel/template@^7.3.3": version "7.12.7" resolved "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== @@ -1604,6 +1863,36 @@ "@babel/parser" "^7.10.4" "@babel/types" "^7.10.4" +"@babel/traverse@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.4.tgz#e642e5395a3b09cc95c8e74a27432b484b697818" + integrity sha512-aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.10.4" + "@babel/helper-function-name" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/parser" "^7.10.4" + "@babel/types" "^7.10.4" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.13" + +"@babel/traverse@7.11.5": + version "7.11.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3" + integrity sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.11.5" + "@babel/helper-function-name" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.11.0" + "@babel/parser" "^7.11.5" + "@babel/types" "^7.11.5" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.19" + "@babel/traverse@7.12.5": version "7.12.5" resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz#78a0c68c8e8a35e4cacfd31db8bb303d5606f095" @@ -1634,6 +1923,21 @@ globals "^11.1.0" lodash "^4.17.19" +"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5": + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376" + integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w== + dependencies: + "@babel/code-frame" "^7.12.11" + "@babel/generator" "^7.12.11" + "@babel/helper-function-name" "^7.12.11" + "@babel/helper-split-export-declaration" "^7.12.11" + "@babel/parser" "^7.12.11" + "@babel/types" "^7.12.12" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.19" + "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0": version "7.12.1" resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz#941395e0c5cc86d5d3e75caa095d3924526f0c1e" @@ -1649,20 +1953,14 @@ globals "^11.1.0" lodash "^4.17.19" -"@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376" - integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w== +"@babel/types@7.11.5": + version "7.11.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d" + integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q== dependencies: - "@babel/code-frame" "^7.12.11" - "@babel/generator" "^7.12.11" - "@babel/helper-function-name" "^7.12.11" - "@babel/helper-split-export-declaration" "^7.12.11" - "@babel/parser" "^7.12.11" - "@babel/types" "^7.12.12" - debug "^4.1.0" - globals "^11.1.0" + "@babel/helper-validator-identifier" "^7.10.4" lodash "^4.17.19" + to-fast-properties "^2.0.0" "@babel/types@7.12.6", "@babel/types@^7.12.5": version "7.12.6" @@ -1691,7 +1989,7 @@ lodash "^4.17.19" to-fast-properties "^2.0.0" -"@babel/types@^7.12.12": +"@babel/types@^7.11.5", "@babel/types@^7.12.12", "@babel/types@^7.3.0", "@babel/types@^7.3.3": version "7.12.12" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299" integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ== @@ -1700,6 +1998,19 @@ lodash "^4.17.19" to-fast-properties "^2.0.0" +"@bcoe/v8-coverage@^0.2.3": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" + integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== + +"@cnakazawa/watch@^1.0.3": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" + integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ== + dependencies: + exec-sh "^0.3.2" + minimist "^1.2.0" + "@commitlint/cli@^11.0.0": version "11.0.0" resolved "https://registry.npmjs.org/@commitlint/cli/-/cli-11.0.0.tgz#698199bc52afed50aa28169237758fa14a67b5d3" @@ -2047,6 +2358,193 @@ resolved "https://registry.npmjs.org/@intlify/shared/-/shared-9.0.0-beta.15.tgz#beab8c49e0efd5cd5c4b9add2b71b9395e7cc7a1" integrity sha512-f7qkzA8tUdGD5T7xUoNSiYA/qvPJSwu5DKt6xCrpitF2Ol+0QTLuk6jyZq81WKwo38DrTD/wjaM6STX/pF5zJg== +"@istanbuljs/load-nyc-config@^1.0.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" + integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ== + dependencies: + camelcase "^5.3.1" + find-up "^4.1.0" + get-package-type "^0.1.0" + js-yaml "^3.13.1" + resolve-from "^5.0.0" + +"@istanbuljs/schema@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" + integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== + +"@jest/console@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2" + integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g== + dependencies: + "@jest/types" "^26.6.2" + "@types/node" "*" + chalk "^4.0.0" + jest-message-util "^26.6.2" + jest-util "^26.6.2" + slash "^3.0.0" + +"@jest/core@^26.6.3": + version "26.6.3" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad" + integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw== + dependencies: + "@jest/console" "^26.6.2" + "@jest/reporters" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + exit "^0.1.2" + graceful-fs "^4.2.4" + jest-changed-files "^26.6.2" + jest-config "^26.6.3" + jest-haste-map "^26.6.2" + jest-message-util "^26.6.2" + jest-regex-util "^26.0.0" + jest-resolve "^26.6.2" + jest-resolve-dependencies "^26.6.3" + jest-runner "^26.6.3" + jest-runtime "^26.6.3" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" + jest-watcher "^26.6.2" + micromatch "^4.0.2" + p-each-series "^2.1.0" + rimraf "^3.0.0" + slash "^3.0.0" + strip-ansi "^6.0.0" + +"@jest/environment@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c" + integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA== + dependencies: + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + jest-mock "^26.6.2" + +"@jest/fake-timers@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad" + integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA== + dependencies: + "@jest/types" "^26.6.2" + "@sinonjs/fake-timers" "^6.0.1" + "@types/node" "*" + jest-message-util "^26.6.2" + jest-mock "^26.6.2" + jest-util "^26.6.2" + +"@jest/globals@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a" + integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA== + dependencies: + "@jest/environment" "^26.6.2" + "@jest/types" "^26.6.2" + expect "^26.6.2" + +"@jest/reporters@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6" + integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw== + dependencies: + "@bcoe/v8-coverage" "^0.2.3" + "@jest/console" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" + chalk "^4.0.0" + collect-v8-coverage "^1.0.0" + exit "^0.1.2" + glob "^7.1.2" + graceful-fs "^4.2.4" + istanbul-lib-coverage "^3.0.0" + istanbul-lib-instrument "^4.0.3" + istanbul-lib-report "^3.0.0" + istanbul-lib-source-maps "^4.0.0" + istanbul-reports "^3.0.2" + jest-haste-map "^26.6.2" + jest-resolve "^26.6.2" + jest-util "^26.6.2" + jest-worker "^26.6.2" + slash "^3.0.0" + source-map "^0.6.0" + string-length "^4.0.1" + terminal-link "^2.0.0" + v8-to-istanbul "^7.0.0" + optionalDependencies: + node-notifier "^8.0.0" + +"@jest/source-map@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535" + integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA== + dependencies: + callsites "^3.0.0" + graceful-fs "^4.2.4" + source-map "^0.6.0" + +"@jest/test-result@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18" + integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ== + dependencies: + "@jest/console" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/istanbul-lib-coverage" "^2.0.0" + collect-v8-coverage "^1.0.0" + +"@jest/test-sequencer@^26.6.3": + version "26.6.3" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17" + integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw== + dependencies: + "@jest/test-result" "^26.6.2" + graceful-fs "^4.2.4" + jest-haste-map "^26.6.2" + jest-runner "^26.6.3" + jest-runtime "^26.6.3" + +"@jest/transform@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b" + integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA== + dependencies: + "@babel/core" "^7.1.0" + "@jest/types" "^26.6.2" + babel-plugin-istanbul "^6.0.0" + chalk "^4.0.0" + convert-source-map "^1.4.0" + fast-json-stable-stringify "^2.0.0" + graceful-fs "^4.2.4" + jest-haste-map "^26.6.2" + jest-regex-util "^26.0.0" + jest-util "^26.6.2" + micromatch "^4.0.2" + pirates "^4.0.1" + slash "^3.0.0" + source-map "^0.6.1" + write-file-atomic "^3.0.0" + +"@jest/types@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e" + integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^15.0.0" + chalk "^4.0.0" + "@lerna/add@3.21.0": version "3.21.0" resolved "https://registry.npmjs.org/@lerna/add/-/add-3.21.0.tgz#27007bde71cc7b0a2969ab3c2f0ae41578b4577b" @@ -2954,6 +3452,20 @@ resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== +"@sinonjs/commons@^1.7.0": + version "1.8.2" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b" + integrity sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw== + dependencies: + type-detect "4.0.8" + +"@sinonjs/fake-timers@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40" + integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA== + dependencies: + "@sinonjs/commons" "^1.7.0" + "@surma/rollup-plugin-off-main-thread@^1.4.1": version "1.4.2" resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.2.tgz#e6786b6af5799f82f7ab3a82e53f6182d2b91a58" @@ -3091,6 +3603,39 @@ resolved "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA== +"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": + version "7.1.12" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d" + integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + "@types/babel__generator" "*" + "@types/babel__template" "*" + "@types/babel__traverse" "*" + +"@types/babel__generator@*": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8" + integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ== + dependencies: + "@babel/types" "^7.0.0" + +"@types/babel__template@*": + version "7.4.0" + resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be" + integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + +"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0" + integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg== + dependencies: + "@babel/types" "^7.3.0" + "@types/body-parser@*": version "1.19.0" resolved "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" @@ -3254,6 +3799,13 @@ "@types/tough-cookie" "*" form-data "^2.5.0" +"@types/graceful-fs@^4.1.2": + version "4.1.4" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.4.tgz#4ff9f641a7c6d1a3508ff88bc3141b152772e753" + integrity sha512-mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg== + dependencies: + "@types/node" "*" + "@types/hapi__joi@16.0.12": version "16.0.12" resolved "https://registry.npmjs.org/@types/hapi__joi/-/hapi__joi-16.0.12.tgz#fb9113f17cf5764d6b3586ae9817d1606cc7c90c" @@ -3281,6 +3833,25 @@ dependencies: "@types/node" "*" +"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" + integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw== + +"@types/istanbul-lib-report@*": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" + integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== + dependencies: + "@types/istanbul-lib-coverage" "*" + +"@types/istanbul-reports@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" + integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== + dependencies: + "@types/istanbul-lib-report" "*" + "@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": version "7.0.6" resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" @@ -3392,6 +3963,11 @@ resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.0.tgz#5f96562c1075ee715a5b138f0b7f591c1f40f6b8" integrity sha512-hiYA88aHiEIgDmeKlsyVsuQdcFn3Z2VuFd/Xm/HCnGnPD8UFU5BM128uzzRVVGEzKDKYUrRsRH9S2o+NUy/3IA== +"@types/prettier@^2.0.0": + version "2.1.6" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.6.tgz#f4b1efa784e8db479cdb8b14403e2144b1e9ff03" + integrity sha512-6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA== + "@types/prop-types@*": version "15.7.3" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" @@ -3491,6 +4067,21 @@ dependencies: "@types/node" "*" +"@types/stack-utils@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff" + integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw== + +"@types/strip-bom@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/strip-bom/-/strip-bom-3.0.0.tgz#14a8ec3956c2e81edb7520790aecf21c290aebd2" + integrity sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I= + +"@types/strip-json-comments@0.0.30": + version "0.0.30" + resolved "https://registry.yarnpkg.com/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1" + integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ== + "@types/tapable@*", "@types/tapable@1.0.6": version "1.0.6" resolved "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74" @@ -3587,6 +4178,13 @@ dependencies: "@types/yargs-parser" "*" +"@types/yargs@^15.0.0": + version "15.0.13" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc" + integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ== + dependencies: + "@types/yargs-parser" "*" + "@umijs/ast@3.3.3": version "3.3.3" resolved "https://registry.npmjs.org/@umijs/ast/-/ast-3.3.3.tgz#5c70ce8ce4a2d2020dd7f65ead42dbd5b02b3aee" @@ -3594,11 +4192,27 @@ dependencies: "@umijs/utils" "3.3.3" +"@umijs/babel-plugin-auto-css-modules@3.2.24": + version "3.2.24" + resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-auto-css-modules/-/babel-plugin-auto-css-modules-3.2.24.tgz#13d25c1d7402fe529d92a77e76da5297a3c85829" + integrity sha512-sOmFU7UJS3isoKx+qDyLt06c/CjaVmiQe4/BaO4rwRjcXbb6Bejd4JvEw6SI/ZVR1C1b5sENDpSTd9W85cwTlA== + dependencies: + "@babel/traverse" "7.10.4" + "@umijs/utils" "3.2.24" + "@umijs/babel-plugin-auto-css-modules@3.3.3": version "3.3.3" resolved "https://registry.npmjs.org/@umijs/babel-plugin-auto-css-modules/-/babel-plugin-auto-css-modules-3.3.3.tgz#2fa1e4640edea129810413f6d136fbdb6d7412c0" integrity sha512-irLgUIg/vBRBEFTOjmMOBm6j8G1WbRU+smIr/hYhZDNEMnEt7lQB/gTq7LTdyCLR6RJgG7CHBiMNfkwcRmTguw== +"@umijs/babel-plugin-import-to-await-require@3.2.24": + version "3.2.24" + resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-import-to-await-require/-/babel-plugin-import-to-await-require-3.2.24.tgz#3c5e6ff41b4c38cd9049f2cdbb06152823e27f1e" + integrity sha512-D/1NXJiXl4dVOstMrhKjKCjdoqtRrcOXsJUPPeCFSHYwa0EGFfr8Vcw3ITqE+o3aYaoQ7iezTC88guoUmR8kIQ== + dependencies: + "@babel/traverse" "7.10.4" + "@umijs/utils" "3.2.24" + "@umijs/babel-plugin-import-to-await-require@3.3.3": version "3.3.3" resolved "https://registry.npmjs.org/@umijs/babel-plugin-import-to-await-require/-/babel-plugin-import-to-await-require-3.3.3.tgz#10dca62ed284a8652c265f4316c72adfadbcf3aa" @@ -3606,6 +4220,14 @@ dependencies: "@babel/types" "7.12.6" +"@umijs/babel-plugin-lock-core-js-3@3.2.24": + version "3.2.24" + resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-lock-core-js-3/-/babel-plugin-lock-core-js-3-3.2.24.tgz#68134cac78244aad4fc782f4eaf8495575bd0712" + integrity sha512-I2CPEpmj4HFPgkVVccj+YJqysXqTIkfzKO8Rh8IeAATiJGrVAFUJDG7kWSxEIT1wMoA+F1nDvxg/nvSxE9gXDw== + dependencies: + "@umijs/utils" "3.2.24" + core-js "3.6.5" + "@umijs/babel-plugin-lock-core-js-3@3.3.3": version "3.3.3" resolved "https://registry.npmjs.org/@umijs/babel-plugin-lock-core-js-3/-/babel-plugin-lock-core-js-3-3.3.3.tgz#8e1595e54e50ea9f4ab772cfc565e12af6828dcd" @@ -3614,6 +4236,38 @@ "@umijs/utils" "3.3.3" core-js "3.6.5" +"@umijs/babel-preset-umi@3.2.24": + version "3.2.24" + resolved "https://registry.yarnpkg.com/@umijs/babel-preset-umi/-/babel-preset-umi-3.2.24.tgz#bf890b4eb25f9d034f7beb33ae36d8a052de4973" + integrity sha512-cgRXbAaDB0/QcpxyR+afD2xDTPq9LVpqM9Veqm0q6TybeEn4lXwKoFjgNFY1Pc2GGoDuQR1NjMHI1/j4oCicfQ== + dependencies: + "@babel/plugin-proposal-class-properties" "7.10.4" + "@babel/plugin-proposal-decorators" "7.10.4" + "@babel/plugin-proposal-do-expressions" "7.10.4" + "@babel/plugin-proposal-export-default-from" "7.10.4" + "@babel/plugin-proposal-function-bind" "7.10.4" + "@babel/plugin-proposal-logical-assignment-operators" "7.10.4" + "@babel/plugin-proposal-nullish-coalescing-operator" "7.10.4" + "@babel/plugin-proposal-optional-chaining" "7.10.4" + "@babel/plugin-proposal-pipeline-operator" "7.10.4" + "@babel/plugin-syntax-top-level-await" "7.10.4" + "@babel/plugin-transform-destructuring" "7.10.4" + "@babel/plugin-transform-runtime" "7.10.4" + "@babel/preset-env" "7.10.4" + "@babel/preset-react" "7.10.4" + "@babel/preset-typescript" "7.10.4" + "@babel/runtime" "7.10.4" + "@svgr/webpack" "4.3.3" + "@umijs/babel-plugin-auto-css-modules" "3.2.24" + "@umijs/babel-plugin-import-to-await-require" "3.2.24" + "@umijs/babel-plugin-lock-core-js-3" "3.2.24" + babel-plugin-dynamic-import-node "2.3.3" + babel-plugin-import "^1.13.0" + babel-plugin-named-asset-import "0.3.6" + babel-plugin-react-require "3.1.3" + babel-plugin-transform-react-remove-prop-types "0.4.24" + babel-plugin-transform-typescript-metadata "0.3.0" + "@umijs/babel-preset-umi@3.3.3": version "3.3.3" resolved "https://registry.npmjs.org/@umijs/babel-preset-umi/-/babel-preset-umi-3.3.3.tgz#7c3672578dcbe7e06cdef0fad8cc0bae75194c68" @@ -3767,6 +4421,55 @@ "@umijs/utils" "3.3.3" webpack-chain "6.5.1" +"@umijs/utils@3.2.24": + version "3.2.24" + resolved "https://registry.yarnpkg.com/@umijs/utils/-/utils-3.2.24.tgz#57e0d6a8c97317191f5122bfec3bdc7e7d7ef720" + integrity sha512-zCI/QwiYmQlQDZO1/DmEV8bM3n380Wkst++h6zvoKe2K0gZiKps7NJhby77iMVJuT28cBAm0pMk8Zr9HjulMjg== + dependencies: + "@babel/parser" "7.11.5" + "@babel/register" "7.11.5" + "@babel/traverse" "7.11.5" + "@babel/types" "7.11.5" + "@types/cheerio" "0.22.21" + "@types/color" "3.0.1" + "@types/cross-spawn" "6.0.2" + "@types/debug" "4.1.5" + "@types/glob" "7.1.3" + "@types/got" "9.6.11" + "@types/lodash" "4.14.161" + "@types/mkdirp" "1.0.1" + "@types/mustache" "4.0.1" + "@types/resolve" "1.17.1" + "@types/rimraf" "3.0.0" + "@types/semver" "7.3.3" + "@types/signale" "1.4.1" + "@types/yargs" "15.0.5" + "@types/yargs-parser" "15.0.0" + address "1.1.2" + chalk "4.1.0" + cheerio "1.0.0-rc.3" + chokidar "3.4.2" + clipboardy "2.3.0" + color "3.1.2" + crequire "1.8.1" + cross-spawn "7.0.3" + debug "4.1.1" + deepmerge "4.2.2" + execa "4.0.3" + glob "7.1.6" + got "9.6.0" + lodash "4.17.20" + mkdirp "1.0.4" + mustache "4.0.1" + pkg-up "3.1.0" + portfinder "1.0.28" + resolve "1.17.0" + rimraf "3.0.2" + semver "7.3.2" + signale "1.4.0" + yargs "15.4.1" + yargs-parser "18.1.3" + "@umijs/utils@3.3.3": version "3.3.3" resolved "https://registry.npmjs.org/@umijs/utils/-/utils-3.3.3.tgz#4bc2c539e29e4e34d866b7380b7b1870211b8230" @@ -4584,6 +5287,11 @@ JSONStream@^1.0.4, JSONStream@^1.3.4: jsonparse "^1.2.0" through ">=2.2.7 <3" +abab@^2.0.3: + version "2.0.5" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" + integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== + abbrev@1: version "1.1.1" resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -4617,11 +5325,24 @@ accord@^0.29.0: uglify-js "^2.8.22" when "^3.7.8" +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.0.0, acorn-jsx@^5.3.1: version "5.3.1" resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== +acorn-walk@^7.1.1: + version "7.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== + acorn-walk@^8.0.0: version "8.0.0" resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.0.0.tgz#56ae4c0f434a45fff4a125e7ea95fa9c98f67a16" @@ -4632,7 +5353,7 @@ acorn@^6.0.2, acorn@^6.0.7, acorn@^6.4.1: resolved "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== -acorn@^7.1.0, acorn@^7.4.0: +acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0: version "7.4.1" resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== @@ -4905,7 +5626,7 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -anymatch@~3.1.1: +anymatch@^3.0.3, anymatch@~3.1.1: version "3.1.1" resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== @@ -5233,6 +5954,20 @@ babel-helper-vue-jsx-merge-props@^2.0.3: resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6" integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg== +babel-jest@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056" + integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA== + dependencies: + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/babel__core" "^7.1.7" + babel-plugin-istanbul "^6.0.0" + babel-preset-jest "^26.6.2" + chalk "^4.0.0" + graceful-fs "^4.2.4" + slash "^3.0.0" + babel-loader@8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3" @@ -5251,7 +5986,7 @@ babel-plugin-dynamic-import-node@2.3.3, babel-plugin-dynamic-import-node@^2.3.0, dependencies: object.assign "^4.1.0" -babel-plugin-import@1.13.3: +babel-plugin-import@1.13.3, babel-plugin-import@^1.13.0: version "1.13.3" resolved "https://registry.yarnpkg.com/babel-plugin-import/-/babel-plugin-import-1.13.3.tgz#9dbbba7d1ac72bd412917a830d445e00941d26d7" integrity sha512-1qCWdljJOrDRH/ybaCZuDgySii4yYrtQ8OJQwrcDqdt0y67N30ng3X3nABg6j7gR7qUJgcMa9OMhc4AGViDwWw== @@ -5277,6 +6012,32 @@ babel-plugin-istanbul@^5.2.0: istanbul-lib-instrument "^3.3.0" test-exclude "^5.2.3" +babel-plugin-istanbul@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" + integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@istanbuljs/load-nyc-config" "^1.0.0" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-instrument "^4.0.0" + test-exclude "^6.0.0" + +babel-plugin-jest-hoist@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d" + integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw== + dependencies: + "@babel/template" "^7.3.3" + "@babel/types" "^7.3.3" + "@types/babel__core" "^7.0.0" + "@types/babel__traverse" "^7.0.6" + +babel-plugin-named-asset-import@0.3.6: + version "0.3.6" + resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.6.tgz#c9750a1b38d85112c9e166bf3ef7c5dbc605f4be" + integrity sha512-1aGDUfL1qOOIoqk9QKGIo2lANk+C7ko/fqH0uIyC71x3PEGz0uVP8ISgfEsFuG+FKmjHTvFK/nNM8dowpmUxLA== + babel-plugin-named-asset-import@0.3.7: version "0.3.7" resolved "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz#156cd55d3f1228a5765774340937afc8398067dd" @@ -5297,6 +6058,13 @@ babel-plugin-transform-react-remove-prop-types@0.4.24: resolved "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a" integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA== +babel-plugin-transform-typescript-metadata@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-typescript-metadata/-/babel-plugin-transform-typescript-metadata-0.3.0.tgz#70093ea8611baf985293fb3ec704d1b7db737ad9" + integrity sha512-ASYrM+bxtpfgZKsAOqQfjmLlekIDigRnNCfQBDOOdaqL18hLhZIsbdiHsuaNDTkljlqnbV/DlufaWY55jC2PBg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + babel-plugin-transform-typescript-metadata@0.3.1: version "0.3.1" resolved "https://registry.npmjs.org/babel-plugin-transform-typescript-metadata/-/babel-plugin-transform-typescript-metadata-0.3.1.tgz#d86599b7139131ba5e917f5f568d0c824a5cdfc3" @@ -5304,6 +6072,32 @@ babel-plugin-transform-typescript-metadata@0.3.1: dependencies: "@babel/helper-plugin-utils" "^7.0.0" +babel-preset-current-node-syntax@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" + integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ== + dependencies: + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-bigint" "^7.8.3" + "@babel/plugin-syntax-class-properties" "^7.8.3" + "@babel/plugin-syntax-import-meta" "^7.8.3" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.8.3" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-top-level-await" "^7.8.3" + +babel-preset-jest@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee" + integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ== + dependencies: + babel-plugin-jest-hoist "^26.6.2" + babel-preset-current-node-syntax "^1.0.0" + balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -5478,6 +6272,11 @@ brorand@^1.0.1: resolved "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= +browser-process-hrtime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" + integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== + browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.2.0" resolved "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" @@ -5571,6 +6370,13 @@ browserslist@^4.6.4: escalade "^3.1.1" node-releases "^1.1.66" +bser@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" + integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== + dependencies: + node-int64 "^0.4.0" + btoa-lite@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337" @@ -5867,6 +6673,13 @@ caniuse-lite@^1.0.30001173: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001178.tgz#3ad813b2b2c7d585b0be0a2440e1e233c6eabdbc" integrity sha512-VtdZLC0vsXykKni8Uztx45xynytOi71Ufx9T8kHptSw9AL4dpqailUJJHavttuzUe1KYuBYtChiWv+BAb7mPmQ== +capture-exit@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4" + integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g== + dependencies: + rsvp "^4.8.4" + cardinal@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz#7cc1055d822d212954d07b085dea251cc7bc5505" @@ -5888,7 +6701,7 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: +chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -5916,6 +6729,11 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" +char-regex@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" + integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== + chardet@^0.7.0: version "0.7.0" resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -6032,6 +6850,11 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" +cjs-module-lexer@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f" + integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw== + class-utils@^0.3.5: version "0.3.6" resolved "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" @@ -6204,6 +7027,11 @@ cloneable-readable@^1.0.0: process-nextick-args "^2.0.0" readable-stream "^2.3.5" +co@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= + coa@^2.0.2: version "2.0.2" resolved "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" @@ -6218,6 +7046,11 @@ code-point-at@^1.0.0: resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= +collect-v8-coverage@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" + integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== + collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -6309,7 +7142,7 @@ commander@2.17.x: resolved "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== -commander@^2.20.0: +commander@^2.19.0, commander@^2.20.0: version "2.20.3" resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -6451,7 +7284,16 @@ concat-with-sourcemaps@^1.0.5: dependencies: source-map "^0.6.1" -config-chain@^1.1.11: +condense-newlines@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f" + integrity sha1-PemFVTE5R10yUCyDsC9gaE0kxV8= + dependencies: + extend-shallow "^2.0.1" + is-whitespace "^0.3.0" + kind-of "^3.0.2" + +config-chain@^1.1.11, config-chain@^1.1.12: version "1.1.12" resolved "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA== @@ -6622,7 +7464,7 @@ conventional-recommended-bump@^5.0.0: meow "^4.0.0" q "^1.5.1" -convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.7.0: +convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.7.0" resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== @@ -6989,7 +7831,7 @@ css-what@^3.2.1: resolved "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== -css@^2.0.0: +css@^2.0.0, css@^2.1.0: version "2.2.4" resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929" integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw== @@ -7089,6 +7931,23 @@ csso@^4.0.2: dependencies: css-tree "^1.0.0" +cssom@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" + integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== + +cssom@~0.3.6: + version "0.3.8" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" + integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== + +cssstyle@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" + integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== + dependencies: + cssom "~0.3.6" + csstype@^2.6.8: version "2.6.13" resolved "https://registry.npmjs.org/csstype/-/csstype-2.6.13.tgz#a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f" @@ -7144,6 +8003,15 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.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.npmjs.org/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" @@ -7202,6 +8070,11 @@ decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0: resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= +decimal.js@^10.2.0: + version "10.2.1" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3" + integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw== + decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" @@ -7236,7 +8109,7 @@ deep-extend@^0.6.0: resolved "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== -deep-is@^0.1.3: +deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.3" resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= @@ -7366,6 +8239,11 @@ detect-indent@^5.0.0: resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= +detect-newline@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" + integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== + detect-node@^2.0.4: version "2.0.4" resolved "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -7379,6 +8257,11 @@ dezalgo@^1.0.0: asap "^2.0.0" wrappy "1" +diff-sequences@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" + integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== + diffie-hellman@^5.0.0: version "5.0.3" resolved "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" @@ -7511,6 +8394,13 @@ domelementtype@^2.1.0: resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e" integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w== +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.npmjs.org/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" @@ -7612,6 +8502,16 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" +editorconfig@^0.15.3: + version "0.15.3" + resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5" + integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g== + dependencies: + commander "^2.19.0" + lru-cache "^4.1.5" + semver "^5.6.0" + sigmund "^1.0.1" + ee-first@1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -7657,6 +8557,11 @@ elliptic@^6.5.3: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" +emittery@^0.7.1: + version "0.7.2" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82" + integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ== + emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -7857,6 +8762,23 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +escape-string-regexp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== + +escodegen@^1.14.1: + version "1.14.3" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" + integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== + dependencies: + esprima "^4.0.1" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + eslint-import-resolver-node@^0.3.4: version "0.3.4" resolved "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" @@ -8034,7 +8956,7 @@ espree@^7.3.0, espree@^7.3.1: acorn-jsx "^5.3.1" eslint-visitor-keys "^1.3.0" -esprima@^4.0.0, esprima@~4.0.0: +esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0: version "4.0.1" resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== @@ -8053,7 +8975,7 @@ esrecurse@^4.1.0, esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1: +estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== @@ -8118,6 +9040,11 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" +exec-sh@^0.3.2: + version "0.3.4" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5" + integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A== + execa@4.0.3: version "4.0.3" resolved "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2" @@ -8189,6 +9116,11 @@ execa@^5.0.0: signal-exit "^3.0.3" strip-final-newline "^2.0.0" +exit@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" + integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= + expand-brackets@^2.1.4: version "2.1.4" resolved "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" @@ -8209,6 +9141,18 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" +expect@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417" + integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA== + dependencies: + "@jest/types" "^26.6.2" + ansi-styles "^4.0.0" + jest-get-type "^26.3.0" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-regex-util "^26.0.0" + express@4.17.1, express@^4.17.1: version "4.17.1" resolved "https://registry.npmjs.org/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" @@ -8295,6 +9239,13 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" +extract-from-css@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/extract-from-css/-/extract-from-css-0.4.4.tgz#1ea7df2e7c7c6eb9922fa08e8adaea486f6f8f92" + integrity sha1-HqffLnx8brmSL6COitrqSG9vj5I= + dependencies: + css "^2.1.0" + extsprintf@1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" @@ -8354,7 +9305,7 @@ fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-levenshtein@^2.0.6: +fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= @@ -8435,6 +9386,13 @@ faye-websocket@^0.11.3: dependencies: websocket-driver ">=0.5.1" +fb-watchman@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" + integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== + dependencies: + bser "2.1.1" + figgy-pudding@^3.4.1, figgy-pudding@^3.5.1: version "3.5.2" resolved "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" @@ -8808,16 +9766,16 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" +fsevents@^2.1.2, fsevents@~2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f" + integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw== + fsevents@~2.1.2: version "2.1.3" resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== -fsevents@~2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f" - integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw== - function-bind@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -8887,6 +9845,11 @@ get-own-enumerable-property-symbols@^3.0.0: resolved "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== +get-package-type@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" + integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== + get-pkg-repo@^1.0.0: version "1.4.0" resolved "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d" @@ -9062,7 +10025,7 @@ glob@7.1.4: once "^1.3.0" path-is-absolute "^1.0.0" -glob@7.1.6, glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@7.1.6, glob@^7.0.5, 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.npmjs.org/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -9178,6 +10141,11 @@ gray-matter@^4.0.2: section-matter "^1.0.0" strip-bom-string "^1.0.0" +growly@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" + integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= + gulp-if@2.0.2: version "2.0.2" resolved "https://registry.npmjs.org/gulp-if/-/gulp-if-2.0.2.tgz#a497b7e7573005041caa2bc8b7dda3c80444d629" @@ -9271,7 +10239,7 @@ hard-rejection@^2.1.0: resolved "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== -hard-source-webpack-plugin@^0.13.1: +hard-source-webpack-plugin@0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/hard-source-webpack-plugin/-/hard-source-webpack-plugin-0.13.1.tgz#a99071e25b232f1438a5bc3c99f10a3869e4428e" integrity sha512-r9zf5Wq7IqJHdVAQsZ4OP+dcUSvoHqDMxJlIzaE2J0TZWn3UjMMrHqwDHR8Jr/pzPfG7XxSe36E7Y8QGNdtuAw== @@ -9443,11 +10411,23 @@ html-comment-regex@^1.1.0: resolved "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7" integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ== +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.3.1: version "1.4.0" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc" integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA== +html-escaper@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== + html-minifier-terser@^5.0.1: version "5.1.1" resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054" @@ -9781,6 +10761,14 @@ import-local@^2.0.0: pkg-dir "^3.0.0" resolve-cwd "^2.0.0" +import-local@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" + integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== + dependencies: + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" + imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -9925,6 +10913,11 @@ invert-kv@^3.0.0: resolved "https://registry.npmjs.org/invert-kv/-/invert-kv-3.0.1.tgz#a93c7a3d4386a1dc8325b97da9bb1620c0282523" integrity sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw== +ip-regex@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" + integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= + ip-regex@^4.0.0: version "4.2.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.2.0.tgz#a03f5eb661d9a154e3973a03de8b23dd0ad6892e" @@ -10039,6 +11032,13 @@ is-core-module@^2.0.0: dependencies: has "^1.0.3" +is-core-module@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" + integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== + dependencies: + has "^1.0.3" + is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -10125,6 +11125,11 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== +is-generator-fn@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" + integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== + is-generator-function@^1.0.7: version "1.0.8" resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.8.tgz#dfb5c2b120e02b0a8d9d2c6806cd5621aa922f7b" @@ -10250,6 +11255,11 @@ is-plain-object@^5.0.0: resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== +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-reference@^1.1.2: version "1.2.1" resolved "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7" @@ -10335,7 +11345,7 @@ is-typed-array@^1.1.3: foreach "^2.0.5" has-symbols "^1.0.1" -is-typedarray@~1.0.0: +is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= @@ -10357,6 +11367,11 @@ is-valid-glob@^1.0.0: resolved "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao= +is-whitespace@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/is-whitespace/-/is-whitespace-0.3.0.tgz#1639ecb1be036aec69a54cbb401cfbed7114ab7f" + integrity sha1-Fjnssb4DauxppUy7QBz77XEUq38= + is-windows@^1.0.0, is-windows@^1.0.1, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -10367,7 +11382,7 @@ is-wsl@^1.1.0: resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= -is-wsl@^2.1.1: +is-wsl@^2.1.1, is-wsl@^2.2.0: version "2.2.0" resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== @@ -10416,6 +11431,11 @@ istanbul-lib-coverage@^2.0.5: resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49" integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA== +istanbul-lib-coverage@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" + integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== + istanbul-lib-instrument@^3.3.0: version "3.3.0" resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630" @@ -10429,6 +11449,42 @@ istanbul-lib-instrument@^3.3.0: istanbul-lib-coverage "^2.0.5" semver "^6.0.0" +istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" + integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== + dependencies: + "@babel/core" "^7.7.5" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-coverage "^3.0.0" + semver "^6.3.0" + +istanbul-lib-report@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" + integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== + dependencies: + istanbul-lib-coverage "^3.0.0" + make-dir "^3.0.0" + supports-color "^7.1.0" + +istanbul-lib-source-maps@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" + integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== + dependencies: + debug "^4.1.1" + istanbul-lib-coverage "^3.0.0" + source-map "^0.6.1" + +istanbul-reports@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b" + integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw== + dependencies: + html-escaper "^2.0.0" + istanbul-lib-report "^3.0.0" + jake@^10.6.1: version "10.8.2" resolved "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" @@ -10444,6 +11500,386 @@ javascript-stringify@^2.0.1: resolved "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.0.1.tgz#6ef358035310e35d667c675ed63d3eb7c1aa19e5" integrity sha512-yV+gqbd5vaOYjqlbk16EG89xB5udgjqQF3C5FAORDg4f/IS1Yc5ERCv5e/57yBcfJYw05V5JyIXabhwb75Xxow== +jest-changed-files@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0" + integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ== + dependencies: + "@jest/types" "^26.6.2" + execa "^4.0.0" + throat "^5.0.0" + +jest-cli@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a" + integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg== + dependencies: + "@jest/core" "^26.6.3" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" + chalk "^4.0.0" + exit "^0.1.2" + graceful-fs "^4.2.4" + import-local "^3.0.2" + is-ci "^2.0.0" + jest-config "^26.6.3" + jest-util "^26.6.2" + jest-validate "^26.6.2" + prompts "^2.0.1" + yargs "^15.4.1" + +jest-config@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349" + integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg== + dependencies: + "@babel/core" "^7.1.0" + "@jest/test-sequencer" "^26.6.3" + "@jest/types" "^26.6.2" + babel-jest "^26.6.3" + chalk "^4.0.0" + deepmerge "^4.2.2" + glob "^7.1.1" + graceful-fs "^4.2.4" + jest-environment-jsdom "^26.6.2" + jest-environment-node "^26.6.2" + jest-get-type "^26.3.0" + jest-jasmine2 "^26.6.3" + jest-regex-util "^26.0.0" + jest-resolve "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" + micromatch "^4.0.2" + pretty-format "^26.6.2" + +jest-diff@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" + integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA== + dependencies: + chalk "^4.0.0" + diff-sequences "^26.6.2" + jest-get-type "^26.3.0" + pretty-format "^26.6.2" + +jest-docblock@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5" + integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w== + dependencies: + detect-newline "^3.0.0" + +jest-each@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb" + integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A== + dependencies: + "@jest/types" "^26.6.2" + chalk "^4.0.0" + jest-get-type "^26.3.0" + jest-util "^26.6.2" + pretty-format "^26.6.2" + +jest-environment-jsdom@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e" + integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q== + dependencies: + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + jest-mock "^26.6.2" + jest-util "^26.6.2" + jsdom "^16.4.0" + +jest-environment-node@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c" + integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag== + dependencies: + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + jest-mock "^26.6.2" + jest-util "^26.6.2" + +jest-get-type@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" + integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== + +jest-haste-map@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa" + integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w== + dependencies: + "@jest/types" "^26.6.2" + "@types/graceful-fs" "^4.1.2" + "@types/node" "*" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.4" + jest-regex-util "^26.0.0" + jest-serializer "^26.6.2" + jest-util "^26.6.2" + jest-worker "^26.6.2" + micromatch "^4.0.2" + sane "^4.0.3" + walker "^1.0.7" + optionalDependencies: + fsevents "^2.1.2" + +jest-jasmine2@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd" + integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg== + dependencies: + "@babel/traverse" "^7.1.0" + "@jest/environment" "^26.6.2" + "@jest/source-map" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + chalk "^4.0.0" + co "^4.6.0" + expect "^26.6.2" + is-generator-fn "^2.0.0" + jest-each "^26.6.2" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-runtime "^26.6.3" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + pretty-format "^26.6.2" + throat "^5.0.0" + +jest-leak-detector@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af" + integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg== + dependencies: + jest-get-type "^26.3.0" + pretty-format "^26.6.2" + +jest-matcher-utils@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a" + integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw== + dependencies: + chalk "^4.0.0" + jest-diff "^26.6.2" + jest-get-type "^26.3.0" + pretty-format "^26.6.2" + +jest-message-util@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07" + integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA== + dependencies: + "@babel/code-frame" "^7.0.0" + "@jest/types" "^26.6.2" + "@types/stack-utils" "^2.0.0" + chalk "^4.0.0" + graceful-fs "^4.2.4" + micromatch "^4.0.2" + pretty-format "^26.6.2" + slash "^3.0.0" + stack-utils "^2.0.2" + +jest-mock@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302" + integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew== + dependencies: + "@jest/types" "^26.6.2" + "@types/node" "*" + +jest-pnp-resolver@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" + integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== + +jest-regex-util@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" + integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A== + +jest-resolve-dependencies@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6" + integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg== + dependencies: + "@jest/types" "^26.6.2" + jest-regex-util "^26.0.0" + jest-snapshot "^26.6.2" + +jest-resolve@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507" + integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ== + dependencies: + "@jest/types" "^26.6.2" + chalk "^4.0.0" + graceful-fs "^4.2.4" + jest-pnp-resolver "^1.2.2" + jest-util "^26.6.2" + read-pkg-up "^7.0.1" + resolve "^1.18.1" + slash "^3.0.0" + +jest-runner@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159" + integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ== + dependencies: + "@jest/console" "^26.6.2" + "@jest/environment" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + chalk "^4.0.0" + emittery "^0.7.1" + exit "^0.1.2" + graceful-fs "^4.2.4" + jest-config "^26.6.3" + jest-docblock "^26.0.0" + jest-haste-map "^26.6.2" + jest-leak-detector "^26.6.2" + jest-message-util "^26.6.2" + jest-resolve "^26.6.2" + jest-runtime "^26.6.3" + jest-util "^26.6.2" + jest-worker "^26.6.2" + source-map-support "^0.5.6" + throat "^5.0.0" + +jest-runtime@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b" + integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw== + dependencies: + "@jest/console" "^26.6.2" + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/globals" "^26.6.2" + "@jest/source-map" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/yargs" "^15.0.0" + chalk "^4.0.0" + cjs-module-lexer "^0.6.0" + collect-v8-coverage "^1.0.0" + exit "^0.1.2" + glob "^7.1.3" + graceful-fs "^4.2.4" + jest-config "^26.6.3" + jest-haste-map "^26.6.2" + jest-message-util "^26.6.2" + jest-mock "^26.6.2" + jest-regex-util "^26.0.0" + jest-resolve "^26.6.2" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" + slash "^3.0.0" + strip-bom "^4.0.0" + yargs "^15.4.1" + +jest-serializer-vue@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/jest-serializer-vue/-/jest-serializer-vue-2.0.2.tgz#b238ef286357ec6b480421bd47145050987d59b3" + integrity sha1-sjjvKGNX7GtIBCG9RxRQUJh9WbM= + dependencies: + pretty "2.0.0" + +jest-serializer@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1" + integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g== + dependencies: + "@types/node" "*" + graceful-fs "^4.2.4" + +jest-snapshot@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84" + integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og== + dependencies: + "@babel/types" "^7.0.0" + "@jest/types" "^26.6.2" + "@types/babel__traverse" "^7.0.4" + "@types/prettier" "^2.0.0" + chalk "^4.0.0" + expect "^26.6.2" + graceful-fs "^4.2.4" + jest-diff "^26.6.2" + jest-get-type "^26.3.0" + jest-haste-map "^26.6.2" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-resolve "^26.6.2" + natural-compare "^1.4.0" + pretty-format "^26.6.2" + semver "^7.3.2" + +jest-transform-stub@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/jest-transform-stub/-/jest-transform-stub-2.0.0.tgz#19018b0851f7568972147a5d60074b55f0225a7d" + integrity sha512-lspHaCRx/mBbnm3h4uMMS3R5aZzMwyNpNIJLXj4cEsV0mIUtS4IjYJLSoyjRCtnxb6RIGJ4NL2quZzfIeNhbkg== + +jest-util@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1" + integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q== + dependencies: + "@jest/types" "^26.6.2" + "@types/node" "*" + chalk "^4.0.0" + graceful-fs "^4.2.4" + is-ci "^2.0.0" + micromatch "^4.0.2" + +jest-validate@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec" + integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ== + dependencies: + "@jest/types" "^26.6.2" + camelcase "^6.0.0" + chalk "^4.0.0" + jest-get-type "^26.3.0" + leven "^3.1.0" + pretty-format "^26.6.2" + +jest-watch-typeahead@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.6.1.tgz#45221b86bb6710b7e97baaa1640ae24a07785e63" + integrity sha512-ITVnHhj3Jd/QkqQcTqZfRgjfyRhDFM/auzgVo2RKvSwi18YMvh0WvXDJFoFED6c7jd/5jxtu4kSOb9PTu2cPVg== + dependencies: + ansi-escapes "^4.3.1" + chalk "^4.0.0" + jest-regex-util "^26.0.0" + jest-watcher "^26.3.0" + slash "^3.0.0" + string-length "^4.0.1" + strip-ansi "^6.0.0" + +jest-watcher@^26.3.0, jest-watcher@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975" + integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ== + dependencies: + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + jest-util "^26.6.2" + string-length "^4.0.1" + jest-worker@^24.6.0: version "24.9.0" resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5" @@ -10461,6 +11897,15 @@ jest-worker@^26.2.1, jest-worker@^26.5.0, jest-worker@^26.6.2: merge-stream "^2.0.0" supports-color "^7.0.0" +jest@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef" + integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q== + dependencies: + "@jest/core" "^26.6.3" + import-local "^3.0.2" + jest-cli "^26.6.3" + joi@17.3.0: version "17.3.0" resolved "https://registry.npmjs.org/joi/-/joi-17.3.0.tgz#f1be4a6ce29bc1716665819ac361dfa139fff5d2" @@ -10472,6 +11917,17 @@ joi@17.3.0: "@sideway/formula" "^3.0.0" "@sideway/pinpoint" "^2.0.0" +js-beautify@^1.6.12: + version "1.13.5" + resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.13.5.tgz#a08a97890cae55daf1d758d3f6577bd4a64d7014" + integrity sha512-MsXlH6Z/BiRYSkSRW3clNDqDjSpiSNOiG8xYVUBXt4k0LnGvDhlTGOlHX1VFtAdoLmtwjxMG5qiWKy/g+Ipv5w== + dependencies: + config-chain "^1.1.12" + editorconfig "^0.15.3" + glob "^7.1.3" + mkdirp "^1.0.4" + nopt "^5.0.0" + js-levenshtein@^1.1.3: version "1.1.6" resolved "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d" @@ -10503,6 +11959,38 @@ jsbn@~0.1.0: resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= +jsdom@^16.4.0: + version "16.4.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" + integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w== + 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.1.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.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -10658,6 +12146,11 @@ kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== +kleur@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" + integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== + klona@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0" @@ -10791,6 +12284,13 @@ leven@^3.1.0: resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== +levenary@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77" + integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ== + dependencies: + leven "^3.1.0" + levn@^0.4.1: version "0.4.1" resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" @@ -10799,6 +12299,14 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + line-diff@^2.0.1: version "2.1.1" resolved "https://registry.npmjs.org/line-diff/-/line-diff-2.1.1.tgz#a389799b931375a3b1e764964ad0b0b3ce60d6f6" @@ -11078,7 +12586,7 @@ lodash@4.17.15: resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== -lodash@4.17.20, "lodash@>=3.5 <5", lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1: +lodash@4.17.20, "lodash@>=3.5 <5", lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1: version "4.17.20" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -11152,7 +12660,7 @@ lowercase-keys@^2.0.0: resolved "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== -lru-cache@^4.0.1: +lru-cache@^4.0.1, lru-cache@^4.1.5: version "4.1.5" resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -11201,7 +12709,7 @@ make-dir@^2.0.0, make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" -make-dir@^3.0.2: +make-dir@^3.0.0, make-dir@^3.0.2: version "3.1.0" resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== @@ -11225,6 +12733,13 @@ make-fetch-happen@^5.0.0: socks-proxy-agent "^4.0.0" ssri "^6.0.0" +makeerror@1.0.x: + version "1.0.11" + resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" + integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= + dependencies: + tmpl "1.0.x" + map-age-cleaner@^0.1.3: version "0.1.3" resolved "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" @@ -11623,7 +13138,7 @@ minimist-options@^3.0.1: arrify "^1.0.1" is-plain-obj "^1.1.0" -minimist@1.2.5, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: +minimist@1.2.5, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== @@ -11934,6 +13449,11 @@ node-gyp@^5.0.2: tar "^4.4.12" which "^1.3.1" +node-int64@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" + integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= + node-libs-browser@^2.2.1: version "2.2.1" resolved "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" @@ -11968,6 +13488,18 @@ node-modules-regexp@^1.0.0: resolved "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= +node-notifier@^8.0.0: + version "8.0.1" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1" + integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA== + dependencies: + growly "^1.3.0" + is-wsl "^2.2.0" + semver "^7.3.2" + shellwords "^0.1.1" + uuid "^8.3.0" + which "^2.0.2" + node-object-hash@^1.2.0: version "1.4.2" resolved "https://registry.yarnpkg.com/node-object-hash/-/node-object-hash-1.4.2.tgz#385833d85b229902b75826224f6077be969a9e94" @@ -11996,6 +13528,13 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -12150,6 +13689,11 @@ number-is-nan@^1.0.0: resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= +nwsapi@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" + integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== + oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" @@ -12312,6 +13856,18 @@ optimize-css-assets-webpack-plugin@5.0.4: cssnano "^4.1.10" last-call-webpack-plugin "^3.0.0" +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + optionator@^0.9.1: version "0.9.1" resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" @@ -12402,6 +13958,11 @@ p-defer@^1.0.0: resolved "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= +p-each-series@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a" + integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA== + p-event@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/p-event/-/p-event-4.2.0.tgz#af4b049c8acd91ae81083ebd1e6f5cae2044c1b5" @@ -12663,6 +14224,11 @@ parse-url@^5.0.0: parse-path "^4.0.0" protocols "^1.4.0" +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== + parse5@^3.0.1: version "3.0.3" resolved "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c" @@ -12821,7 +14387,7 @@ pinkie@^2.0.0: resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= -pirates@^4.0.0: +pirates@^4.0.0, pirates@^4.0.1: version "4.0.1" resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== @@ -13723,6 +15289,11 @@ prelude-ls@^1.2.1: resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + prepend-http@^1.0.0: version "1.0.4" resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" @@ -13751,11 +15322,30 @@ pretty-error@^2.0.2, pretty-error@^2.1.1: lodash "^4.17.20" renderkid "^2.0.4" +pretty-format@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" + integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg== + dependencies: + "@jest/types" "^26.6.2" + ansi-regex "^5.0.0" + ansi-styles "^4.0.0" + react-is "^17.0.1" + pretty-time@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e" integrity sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA== +pretty@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pretty/-/pretty-2.0.0.tgz#adbc7960b7bbfe289a557dc5f737619a220d06a5" + integrity sha1-rbx5YLe7/iiaVX3F9zdhmiINBqU= + dependencies: + condense-newlines "^0.2.1" + extend-shallow "^2.0.1" + js-beautify "^1.6.12" + prismjs@^1.23.0: version "1.23.0" resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33" @@ -13810,6 +15400,14 @@ promise@~7.0.1: dependencies: asap "~2.0.3" +prompts@^2.0.1: + version "2.4.0" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7" + integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ== + dependencies: + kleur "^3.0.3" + sisteransi "^1.0.5" + promzard@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee" @@ -14017,6 +15615,11 @@ react-error-overlay@6.0.7: resolved "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz#1dcfb459ab671d53f660a991513cb2f0a0553108" integrity sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA== +react-is@^17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" + integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== + read-cmd-shim@^1.0.1: version "1.0.5" resolved "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16" @@ -14231,7 +15834,7 @@ regenerate@^1.4.0: resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== -regenerator-runtime@^0.13.4: +regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7: version "0.13.7" resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== @@ -14367,7 +15970,23 @@ replace-ext@^1.0.0: resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw== -request@^2.83.0, request@^2.88.0: +request-promise-core@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" + integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw== + dependencies: + lodash "^4.17.19" + +request-promise-native@^1.0.8: + version "1.0.9" + resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" + integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== + dependencies: + request-promise-core "1.1.4" + stealthy-require "^1.1.1" + tough-cookie "^2.3.3" + +request@^2.83.0, request@^2.88.0, request@^2.88.2: version "2.88.2" resolved "https://registry.npmjs.org/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -14496,6 +16115,14 @@ resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.1 is-core-module "^2.0.0" path-parse "^1.0.6" +resolve@^1.18.1: + version "1.19.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" + integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== + dependencies: + is-core-module "^2.1.0" + path-parse "^1.0.6" + resolve@~1.1.6: version "1.1.7" resolved "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" @@ -14568,7 +16195,7 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -rimraf@3.0.2, rimraf@^3.0.2: +rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -14735,6 +16362,11 @@ rollup@^2.25.0: optionalDependencies: fsevents "~2.1.2" +rsvp@^4.8.4: + version "4.8.5" + resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" + integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== + run-async@^2.2.0, run-async@^2.4.0: version "2.4.1" resolved "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" @@ -14781,11 +16413,33 @@ safe-regex@^1.1.0: resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +sane@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded" + integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA== + dependencies: + "@cnakazawa/watch" "^1.0.3" + anymatch "^2.0.0" + capture-exit "^2.0.0" + exec-sh "^0.3.2" + execa "^1.0.0" + fb-watchman "^2.0.0" + micromatch "^3.1.4" + minimist "^1.1.1" + walker "~1.0.5" + sax@~1.2.4: version "1.2.4" resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +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.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" @@ -15046,6 +16700,16 @@ shebang-regex@^3.0.0: resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== +shellwords@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" + integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== + +sigmund@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" + integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA= + signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.3" resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" @@ -15076,6 +16740,11 @@ sirv@^1.0.7: mime "^2.3.1" totalist "^1.0.0" +sisteransi@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" + integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== + slash2@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/slash2/-/slash2-2.0.0.tgz#f4e0a11708b8545b912695981cf7096f52c63487" @@ -15216,7 +16885,7 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.16, source-map-support@^0.5.9, source-map-support@~0.5.12, source-map-support@~0.5.19: +source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@^0.5.9, source-map-support@~0.5.12, source-map-support@~0.5.19: version "0.5.19" resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== @@ -15365,6 +17034,13 @@ stable@^0.1.8: resolved "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== +stack-utils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277" + integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw== + dependencies: + escape-string-regexp "^2.0.0" + stackframe@^1.1.1: version "1.2.0" resolved "https://registry.npmjs.org/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303" @@ -15397,6 +17073,11 @@ std-env@^2.2.1: dependencies: ci-info "^1.6.0" +stealthy-require@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" + integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= + stream-browserify@^2.0.1: version "2.0.2" resolved "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" @@ -15449,6 +17130,14 @@ string-hash@^1.1.1: resolved "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b" integrity sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs= +string-length@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" + integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== + dependencies: + char-regex "^1.0.2" + strip-ansi "^6.0.0" + string-width@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -15556,7 +17245,7 @@ strip-bom-string@^1.0.0: resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" integrity sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI= -strip-bom@4.0.0: +strip-bom@4.0.0, strip-bom@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== @@ -15612,16 +17301,16 @@ strip-json-comments@3.0.1: resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== +strip-json-comments@^2.0.0, strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - strong-log-transformer@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10" @@ -15711,7 +17400,7 @@ supports-color@^7.0.0, supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -supports-hyperlinks@^2.1.0: +supports-hyperlinks@^2.0.0, supports-hyperlinks@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== @@ -15748,6 +17437,11 @@ svgo@1.3.2, svgo@^1.0.0, svgo@^1.2.2: unquote "~1.1.1" util.promisify "~1.0.0" +symbol-tree@^3.2.4: + 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== + table@^6.0.4: version "6.0.4" resolved "https://registry.npmjs.org/table/-/table-6.0.4.tgz#c523dd182177e926c723eb20e1b341238188aa0d" @@ -15837,6 +17531,14 @@ term-size@^1.2.0: dependencies: execa "^0.7.0" +terminal-link@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" + integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== + dependencies: + ansi-escapes "^4.2.1" + supports-hyperlinks "^2.0.0" + ternary-stream@^2.0.1: version "2.1.1" resolved "https://registry.npmjs.org/ternary-stream/-/ternary-stream-2.1.1.tgz#4ad64b98668d796a085af2c493885a435a8a8bfc" @@ -15917,6 +17619,15 @@ test-exclude@^5.2.3: read-pkg-up "^4.0.0" require-main-filename "^2.0.0" +test-exclude@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" + integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== + dependencies: + "@istanbuljs/schema" "^0.1.2" + glob "^7.1.4" + minimatch "^3.0.4" + text-extensions@^1.0.0: version "1.9.0" resolved "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26" @@ -15941,6 +17652,11 @@ thenify-all@^1.0.0: dependencies: any-promise "^1.0.0" +throat@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" + integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== + through2-filter@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254" @@ -16011,6 +17727,11 @@ tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" +tmpl@1.0.x: + version "1.0.4" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" + integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= + to-absolute-glob@^2.0.0: version "2.0.2" resolved "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b" @@ -16093,7 +17814,7 @@ totalist@^1.0.0: resolved "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df" integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g== -tough-cookie@~2.5.0: +tough-cookie@^2.3.3, tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== @@ -16101,6 +17822,15 @@ tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" +tough-cookie@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" + integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg== + dependencies: + ip-regex "^2.1.0" + psl "^1.1.28" + punycode "^2.1.1" + tr46@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" @@ -16108,6 +17838,13 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" +tr46@^2.0.2: + 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.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" @@ -16149,6 +17886,16 @@ tsconfig-paths@^3.9.0: minimist "^1.2.0" strip-bom "^3.0.0" +tsconfig@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7" + integrity sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw== + dependencies: + "@types/strip-bom" "^3.0.0" + "@types/strip-json-comments" "0.0.30" + strip-bom "^3.0.0" + strip-json-comments "^2.0.0" + tslib@1.10.0: version "1.10.0" resolved "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" @@ -16188,6 +17935,18 @@ type-check@^0.4.0, type-check@~0.4.0: dependencies: prelude-ls "^1.2.1" +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + dependencies: + prelude-ls "~1.1.2" + +type-detect@4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== + type-fest@^0.11.0: version "0.11.0" resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" @@ -16231,6 +17990,13 @@ type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -16241,6 +18007,11 @@ typescript@^3.7.3: resolved "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== +typescript@~4.1.2: + version "4.1.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7" + integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg== + uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" @@ -16575,11 +18346,25 @@ uuid@^3.0.1, uuid@^3.3.2, uuid@^3.4.0: resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== +uuid@^8.3.0: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + v8-compile-cache@^2.0.3: version "2.2.0" resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== +v8-to-istanbul@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07" + integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.1" + convert-source-map "^1.6.0" + source-map "^0.7.3" + validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3: version "3.0.4" resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -16712,6 +18497,17 @@ vue-i18n@^9.0.0-beta.15: "@intlify/shared" "9.0.0-beta.15" "@vue/devtools-api" "^6.0.0-beta.2" +vue-jest@^5.0.5-0: + version "5.0.0-alpha.8" + resolved "https://registry.yarnpkg.com/vue-jest/-/vue-jest-5.0.0-alpha.8.tgz#45b12335dbb73c9ab8309f1e24b2fc8781d519f9" + integrity sha512-4FqH69T6X6rOglrEui/mDWvOTGB9ammmCXLVdS4s524D4Emx8fBC4sKAPFAUZfbWpYh/7i7xWoPwF4agfyGWwA== + dependencies: + "@babel/plugin-transform-modules-commonjs" "^7.2.0" + chalk "^2.1.0" + convert-source-map "^1.6.0" + extract-from-css "^0.4.4" + tsconfig "^7.0.0" + vue-loader@^16.1.2: version "16.1.2" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.1.2.tgz#5c03b6c50d2a5f983c7ceba15c50d78ca2b298f4" @@ -16757,6 +18553,27 @@ vuepress@^2.0.0-alpha.18: "@vuepress/core" "2.0.0-alpha.18" "@vuepress/theme-default" "2.0.0-alpha.18" +w3c-hr-time@^1.0.2: + 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== + dependencies: + browser-process-hrtime "^1.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" + integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= + dependencies: + makeerror "1.0.x" + warning@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" @@ -16809,6 +18626,16 @@ webidl-conversions@^4.0.2: resolved "https://registry.npmjs.org/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.1.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@4.3.0: version "4.3.0" resolved "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.3.0.tgz#2f3c0ca9041d5ee47fa418693cf56b4a518b578b" @@ -17019,6 +18846,23 @@ websocket-extensions@>=0.1.1: resolved "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== +whatwg-encoding@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" + integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== + dependencies: + iconv-lite "0.4.24" + +whatwg-fetch@^3.4.1: + version "3.5.0" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz#605a2cd0a7146e5db141e29d1c62ab84c0c4c868" + integrity sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A== + +whatwg-mimetype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" + integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== + whatwg-url@^7.0.0: version "7.1.0" resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06" @@ -17028,6 +18872,15 @@ whatwg-url@^7.0.0: tr46 "^1.0.1" webidl-conversions "^4.0.2" +whatwg-url@^8.0.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837" + integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw== + dependencies: + lodash.sortby "^4.7.0" + tr46 "^2.0.2" + webidl-conversions "^6.1.0" + when@^3.7.8: version "3.7.8" resolved "https://registry.npmjs.org/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82" @@ -17063,7 +18916,7 @@ which@^1.2.14, which@^1.2.9, which@^1.3.1: dependencies: isexe "^2.0.0" -which@^2.0.1: +which@^2.0.1, which@^2.0.2: version "2.0.2" resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== @@ -17101,7 +18954,7 @@ windows-release@^3.1.0: dependencies: execa "^1.0.0" -word-wrap@^1.0.3, word-wrap@^1.2.3: +word-wrap@^1.0.3, word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== @@ -17319,6 +19172,16 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0, write-file-atomic@^2.4.2: imurmurhash "^0.1.4" signal-exit "^3.0.2" +write-file-atomic@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + write-json-file@^2.2.0, write-json-file@^2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f" @@ -17351,21 +19214,31 @@ write-pkg@^3.1.0: sort-keys "^2.0.0" write-json-file "^2.2.0" +ws@^7.2.3, ws@^7.4.0: + version "7.4.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd" + integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA== + ws@^7.3.1: version "7.4.1" resolved "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb" integrity sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ== -ws@^7.4.0: - version "7.4.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd" - integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA== - xdg-basedir@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= +xml-name-validator@^3.0.0: + version "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.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" @@ -17420,7 +19293,7 @@ yargs-parser@^15.0.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs@15.4.1, yargs@^15.1.0: +yargs@15.4.1, yargs@^15.1.0, yargs@^15.4.1: version "15.4.1" resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== From 86b1c25764cace310219910948a6ec3539465a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Tue, 2 Feb 2021 10:56:09 +0800 Subject: [PATCH 02/31] =?UTF-8?q?feat:=20=20command=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E4=BD=BF=E7=94=A8commander=E7=9A=84=E5=AE=9E=E7=8E=B0=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 能借用commander强大的提示能力 --- packages/fes-compiler/package.json | 3 +- packages/fes-compiler/src/service/index.js | 70 +++++++---- .../fes-compiler/src/service/pluginAPI.js | 22 ++-- packages/fes-plugin-unit-jest/src/index.js | 8 +- packages/fes-preset-built-in/package.json | 3 +- packages/fes-preset-built-in/src/index.js | 4 +- .../src/plugins/commands/build/index.js | 2 +- .../src/plugins/commands/dev/index.js | 8 +- .../src/plugins/commands/help/index.js | 11 ++ .../src/plugins/commands/info/index.js | 27 ++++ packages/fes/package.json | 2 - packages/fes/src/cli.js | 115 +++--------------- packages/fes/src/forkedDev.js | 4 +- 13 files changed, 137 insertions(+), 142 deletions(-) create mode 100644 packages/fes-preset-built-in/src/plugins/commands/help/index.js create mode 100644 packages/fes-preset-built-in/src/plugins/commands/info/index.js diff --git a/packages/fes-compiler/package.json b/packages/fes-compiler/package.json index 54cd1aec..72ed6684 100644 --- a/packages/fes-compiler/package.json +++ b/packages/fes-compiler/package.json @@ -31,6 +31,7 @@ "joi": "17.3.0", "readline": "^1.3.0", "set-value": "3.0.2", - "tapable": "2.0.0" + "tapable": "2.0.0", + "commander": "^6.2.1" } } diff --git a/packages/fes-compiler/src/service/index.js b/packages/fes-compiler/src/service/index.js index f3e12dd4..91e9c7a3 100644 --- a/packages/fes-compiler/src/service/index.js +++ b/packages/fes-compiler/src/service/index.js @@ -3,7 +3,8 @@ import { EventEmitter } from 'events'; import assert from 'assert'; import { AsyncSeriesWaterfallHook } from 'tapable'; import { existsSync } from 'fs'; -import { BabelRegister, lodash } from '@umijs/utils'; +import { BabelRegister, lodash, chalk } from '@umijs/utils'; +import { Command } from 'commander'; import { resolvePresets, pathToObj, resolvePlugins } from './utils/pluginUtils'; import loadDotEnv from './utils/loadDotEnv'; import isPromise from './utils/isPromise'; @@ -87,6 +88,8 @@ export default class Service extends EventEmitter { // repoDir should be the root dir of repo this.pkg = opts.pkg || this.resolvePackage(); this.env = opts.env || process.env.NODE_ENV; + this.fesPkg = opts.fesPkg || {}; + assert(existsSync(this.cwd), `cwd ${this.cwd} does not exist.`); @@ -111,6 +114,10 @@ export default class Service extends EventEmitter { env: this.env }); + this.program = new Command(); + + this.initCommand(); + // setup initial plugins const baseOpts = { pkg: this.pkg, @@ -479,12 +486,28 @@ export default class Service extends EventEmitter { } } - async run({ name, args = {} }) { - args._ = args._ || []; - // shift the command itself - if (args._[0] === name) args._.shift(); + initCommand() { + this.program + .usage(' [options]') + .version(`@webank/fes ${this.fesPkg.version}`, '-v, --vers', 'output the current version') + .description('一个好用的前端解决方案'); + } - this.args = args; + parseCommand() { + this.program.on('--help', () => { + console.log(); + console.log( + ` Run ${chalk.cyan( + 'fes --help' + )} for detailed usage of given command.` + ); + console.log(); + }); + this.program.commands.forEach(c => c.on('--help', () => console.log())); + this.program.parse(process.argv); + } + + async run({ rawArgv = {}, args = {} }) { await this.init(); this.setStage(ServiceStage.run); @@ -496,27 +519,28 @@ export default class Service extends EventEmitter { } }); - return this.runCommand({ - name, - args - }); + this.runCommand({ rawArgv, args }); } - async runCommand({ name, args = {} }) { + async runCommand({ rawArgv = {}, args = {} }) { assert(this.stage >= ServiceStage.init, 'service is not initialized.'); - args._ = args._ || []; - // shift the command itself - if (args._[0] === name) args._.shift(); - - const command = typeof this.commands[name] === 'string' - ? this.commands[this.commands[name]] - : this.commands[name]; - assert(command, `run command failed, command ${name} does not exists.`); - - const { fn } = command; - return fn({ - args + Object.keys(this.commands).forEach((command) => { + const commandOption = this.commands[command]; + const program = this.program; + let c = program.command(command).description(commandOption.description); + if (commandOption.options) { + Object.keys(commandOption.options).forEach((option) => { + c = c.option(option, commandOption.options[option]); + }); + } + if (commandOption.fn) { + c.action(async () => { + await commandOption.fn({ rawArgv, args, program }); + }); + } }); + + this.parseCommand(); } } diff --git a/packages/fes-compiler/src/service/pluginAPI.js b/packages/fes-compiler/src/service/pluginAPI.js index d4d67511..ffa83f3f 100644 --- a/packages/fes-compiler/src/service/pluginAPI.js +++ b/packages/fes-compiler/src/service/pluginAPI.js @@ -3,6 +3,7 @@ import * as utils from '@umijs/utils'; import { isValidPlugin, pathToObj } from './utils/pluginUtils'; import { EnableBy, PluginType, ServiceStage } from './enums'; import Logger from '../logger'; + // TODO // 标准化 logger export default class PluginAPI { @@ -62,16 +63,21 @@ export default class PluginAPI { ).concat(hook); } - registerCommand(command) { - const { name, alias } = command; + registerCommand(commandOption) { + const { command, fn } = commandOption; assert( - !this.service.commands[name], - `api.registerCommand() failed, the command ${name} is exists.` + !this.service.commands[command], + `api.registerCommand() failed, the command ${command} is exists.` ); - this.service.commands[name] = command; - if (alias) { - this.service.commands[alias] = name; - } + assert( + typeof command === 'string', + 'api.registerCommand() failed, the command must be String.' + ); + assert( + typeof fn === 'function', + 'api.registerCommand() failed, the fn must be function.' + ); + this.service.commands[command] = commandOption; } // 在 preset 初始化阶段放后面，在插件注册阶段放前面 diff --git a/packages/fes-plugin-unit-jest/src/index.js b/packages/fes-plugin-unit-jest/src/index.js index 8acde537..27d79816 100644 --- a/packages/fes-plugin-unit-jest/src/index.js +++ b/packages/fes-plugin-unit-jest/src/index.js @@ -12,19 +12,13 @@ export default function (api) { const { utils: { mergeConfig }, cwd } = api; api.registerCommand({ - name: 'test:unit', - usage: 'fes test:unit [options] ', + command: 'test:unit', description: 'run unit tests with jest', options: { '--watch': 'run tests in watch mode', '--debug': 'debug' }, - details: - 'All jest command line options are supported.\n' - + 'See https://facebook.github.io/jest/docs/en/cli.html for more details.', async fn({ args }) { - console.log(args); - process.env.NODE_ENV = 'test'; args.debug && logger.log(`args: ${JSON.stringify(args)}`); diff --git a/packages/fes-preset-built-in/package.json b/packages/fes-preset-built-in/package.json index 6c871441..8a262f38 100644 --- a/packages/fes-preset-built-in/package.json +++ b/packages/fes-preset-built-in/package.json @@ -38,6 +38,7 @@ "vue-loader": "^16.1.2", "webpack-bundle-analyzer": "4.3.0", "babel-plugin-import": "1.13.3", - "hard-source-webpack-plugin": "0.13.1" + "hard-source-webpack-plugin": "0.13.1", + "envinfo": "^7.7.3" } } diff --git a/packages/fes-preset-built-in/src/index.js b/packages/fes-preset-built-in/src/index.js index 68f57d92..bb2cda71 100644 --- a/packages/fes-preset-built-in/src/index.js +++ b/packages/fes-preset-built-in/src/index.js @@ -53,7 +53,9 @@ export default function () { // commands require.resolve('./plugins/commands/build'), - require.resolve('./plugins/commands/dev') + require.resolve('./plugins/commands/dev'), + require.resolve('./plugins/commands/help'), + require.resolve('./plugins/commands/info') ] }; } diff --git a/packages/fes-preset-built-in/src/plugins/commands/build/index.js b/packages/fes-preset-built-in/src/plugins/commands/build/index.js index e6236bfd..e97482eb 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/build/index.js +++ b/packages/fes-preset-built-in/src/plugins/commands/build/index.js @@ -17,7 +17,7 @@ export default function (api) { } = api; api.registerCommand({ - name: 'build', + command: 'build', description: 'build application for production', async fn() { cleanTmpPathExceptCache({ diff --git a/packages/fes-preset-built-in/src/plugins/commands/dev/index.js b/packages/fes-preset-built-in/src/plugins/commands/dev/index.js index d7529aec..1c6342d4 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/dev/index.js +++ b/packages/fes-preset-built-in/src/plugins/commands/dev/index.js @@ -29,8 +29,12 @@ export default (api) => { } api.registerCommand({ - name: 'dev', - description: 'start a dev server for development', + command: 'dev', + description: 'start a local http service for development', + options: { + '--port': 'http service port, like 8080', + '--https': 'whether to turn on the https service' + }, async fn({ args = {} }) { const defaultPort = process.env.PORT || args.port || api.config.devServer?.port; port = await portfinder.getPortPromise({ diff --git a/packages/fes-preset-built-in/src/plugins/commands/help/index.js b/packages/fes-preset-built-in/src/plugins/commands/help/index.js new file mode 100644 index 00000000..c4350c25 --- /dev/null +++ b/packages/fes-preset-built-in/src/plugins/commands/help/index.js @@ -0,0 +1,11 @@ + + +export default function (api) { + api.registerCommand({ + command: 'help', + description: 'show command helps', + async fn({ program }) { + program.outputHelp(); + } + }); +} diff --git a/packages/fes-preset-built-in/src/plugins/commands/info/index.js b/packages/fes-preset-built-in/src/plugins/commands/info/index.js new file mode 100644 index 00000000..ff01b352 --- /dev/null +++ b/packages/fes-preset-built-in/src/plugins/commands/info/index.js @@ -0,0 +1,27 @@ + + +import envinfo from 'envinfo'; + +export default function (api) { + api.registerCommand({ + command: 'info', + description: 'print debugging information about your environment', + async fn() { + envinfo.run( + { + System: ['OS', 'CPU'], + Binaries: ['Node', 'Yarn', 'npm'], + Browsers: ['Chrome', 'Edge', 'Firefox', 'Safari'], + npmPackages: '/**/{typescript,*vue*,@webank/*/}', + npmGlobalPackages: ['@webank/fes'] + }, + { + showNotFound: true, + duplicates: true, + fullTree: true + } + ) + .then(console.log); + } + }); +} diff --git a/packages/fes/package.json b/packages/fes/package.json index 440ce8ab..b3267c35 100644 --- a/packages/fes/package.json +++ b/packages/fes/package.json @@ -43,8 +43,6 @@ "@webank/fes-compiler": "^2.0.0-alpha.2", "@webank/fes-preset-built-in": "^2.0.0-alpha.2", "@webank/fes-runtime": "^2.0.0-alpha.2", - "commander": "^6.2.1", - "envinfo": "^7.7.3", "resolve-cwd": "^3.0.0" }, "engines": { diff --git a/packages/fes/src/cli.js b/packages/fes/src/cli.js index 9a0964bc..0b68e86d 100644 --- a/packages/fes/src/cli.js +++ b/packages/fes/src/cli.js @@ -1,5 +1,4 @@ import { chalk, yParser, semver } from '@umijs/utils'; -import program from 'commander'; import { Service } from './serviceWithBuiltIn'; import fork from './utils/fork'; import getCwd from './utils/getCwd'; @@ -24,18 +23,13 @@ function checkNodeVersion(wanted, id) { checkNodeVersion(requiredVersion, '@webank/fes'); // process.argv: [node, fes.js, command, args] -const args = yParser(process.argv.slice(2)); +const rawArgv = process.argv.slice(2); +const args = yParser(rawArgv); -program - .version(`@webank/fes ${fesPkg.version}`, '-v, --vers', 'output the current version') - .usage(' [options]') - .description(fesPkg.description); - -program - .command('dev') - .description('run local http service for development') - .action(() => { - try { +(async () => { + try { + const command = args._[0]; + if (command === 'dev') { const child = fork({ scriptPath: require.resolve('./forkedDev') }); @@ -49,91 +43,22 @@ program child.kill('SIGTERM'); process.exit(1); }); - } catch (e) { - console.error(chalk.red(e.message)); - console.error(e.stack); - process.exit(1); - } - }); - -program - .command('build') - .description('compile and package code') - .action(async () => { - try { - process.env.NODE_ENV = 'production'; + } else { + if (command === 'build') { + process.env.NODE_ENV = 'production'; + } await new Service({ cwd: getCwd(), - pkg: getPkg(process.cwd()) + pkg: getPkg(process.cwd()), + fesPkg }).run({ - name: 'build', - args + args, + rawArgv }); - } catch (e) { - console.error(chalk.red(e.message)); - console.error(e.stack); - process.exit(1); } - }); - -program - .command('info') - .description('print debugging information about your environment') - .action(() => { - console.log(chalk.bold('\nEnvironment Info:')); - require('envinfo') - .run( - { - System: ['OS', 'CPU'], - Binaries: ['Node', 'Yarn', 'npm'], - Browsers: ['Chrome', 'Edge', 'Firefox', 'Safari'], - npmPackages: '/**/{typescript,*vue*,@webank/*/}', - npmGlobalPackages: ['@webank/fes'] - }, - { - showNotFound: true, - duplicates: true, - fullTree: true - } - ) - .then(console.log); - }); - -program - .arguments('[command]') - .option('--debug', 'Skip prompts and use default preset') - .action(async (cmd) => { - if (cmd) { - try { - await new Service({ - cwd: getCwd(), - pkg: getPkg(process.cwd()) - }).run({ - name: cmd, - args - }); - } catch (e) { - console.error(chalk.red(e.message)); - console.error(e.stack); - process.exit(1); - } - } - }); - -program.on('--help', () => { - console.log(); - console.log( - ` Run ${chalk.cyan( - 'fes --help' - )} for detailed usage of given command.` - ); - console.log(); -}); - -program.commands.forEach(c => c.on('--help', () => console.log())); - -program.parse(process.argv); - -if (!process.argv.slice(2).length) { - program.outputHelp(); -} + } catch (e) { + console.error(chalk.red(e.message)); + console.error(e.stack); + process.exit(1); + } +})(); diff --git a/packages/fes/src/forkedDev.js b/packages/fes/src/forkedDev.js index edd5e924..7e2eb7a6 100644 --- a/packages/fes/src/forkedDev.js +++ b/packages/fes/src/forkedDev.js @@ -2,6 +2,7 @@ import { chalk, yParser } from '@umijs/utils'; import { Service } from './serviceWithBuiltIn'; import getCwd from './utils/getCwd'; import getPkg from './utils/getPkg'; +import fesPkg from '../package.json'; const args = yParser(process.argv.slice(2)); @@ -26,7 +27,8 @@ function onSignal(signal, service) { process.env.NODE_ENV = 'development'; const service = new Service({ cwd: getCwd(), - pkg: getPkg(process.cwd()) + pkg: getPkg(process.cwd()), + fesPkg }); await service.run({ name: 'dev', From 1e9c8e295257783e132c118ae0c8bf195b3b51b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Tue, 2 Feb 2021 12:04:51 +0800 Subject: [PATCH 03/31] =?UTF-8?q?fix:=20eslint=E5=8E=BB=E6=8E=89files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-plugin-unit-jest/src/index.js | 4 ++-- packages/fes-template/.eslintrc.js | 4 ---- packages/fes-template/__tests__/add.js | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/fes-plugin-unit-jest/src/index.js b/packages/fes-plugin-unit-jest/src/index.js index 27d79816..e5b80b8d 100644 --- a/packages/fes-plugin-unit-jest/src/index.js +++ b/packages/fes-plugin-unit-jest/src/index.js @@ -6,7 +6,7 @@ import { Logger } from '@webank/fes-compiler'; import { options as CliOptions } from 'jest-cli/build/cli/args'; import createDefaultConfig from './createDefaultConfig'; -const logger = new Logger('fes:plugin-built-in'); +const logger = new Logger('fes:plugin-unit-jest'); export default function (api) { const { utils: { mergeConfig }, cwd } = api; @@ -16,7 +16,7 @@ export default function (api) { description: 'run unit tests with jest', options: { '--watch': 'run tests in watch mode', - '--debug': 'debug' + '--debug': 'print debug logs' }, async fn({ args }) { process.env.NODE_ENV = 'test'; diff --git a/packages/fes-template/.eslintrc.js b/packages/fes-template/.eslintrc.js index 57c7f909..7d04898c 100644 --- a/packages/fes-template/.eslintrc.js +++ b/packages/fes-template/.eslintrc.js @@ -1,9 +1,5 @@ module.exports = { extends: [require.resolve('@webank/eslint-config-webank')], - files: [ - '**/__tests__/*.{j,t}s?(x)', - '**/tests/unit/**/*.spec.{j,t}s?(x)' - ], env: { jest: true } diff --git a/packages/fes-template/__tests__/add.js b/packages/fes-template/__tests__/add.js index 5eaa2245..d5c874a0 100644 --- a/packages/fes-template/__tests__/add.js +++ b/packages/fes-template/__tests__/add.js @@ -1,4 +1,4 @@ -import sum from "@/utils/sum" +import sum from '@/utils/sum'; test('adds 1 + 2 to equal 3', () => { expect(sum(1, 2)).toBe(3); From c49b3ca3aa2c055c0447f8e1b39f9ad878c68144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Tue, 2 Feb 2021 12:06:15 +0800 Subject: [PATCH 04/31] =?UTF-8?q?Revert=20"fix:=20eslint=E5=8E=BB=E6=8E=89?= =?UTF-8?q?files"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1e9c8e295257783e132c118ae0c8bf195b3b51b0. --- packages/fes-plugin-unit-jest/src/index.js | 4 ++-- packages/fes-template/.eslintrc.js | 4 ++++ packages/fes-template/__tests__/add.js | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/fes-plugin-unit-jest/src/index.js b/packages/fes-plugin-unit-jest/src/index.js index e5b80b8d..27d79816 100644 --- a/packages/fes-plugin-unit-jest/src/index.js +++ b/packages/fes-plugin-unit-jest/src/index.js @@ -6,7 +6,7 @@ import { Logger } from '@webank/fes-compiler'; import { options as CliOptions } from 'jest-cli/build/cli/args'; import createDefaultConfig from './createDefaultConfig'; -const logger = new Logger('fes:plugin-unit-jest'); +const logger = new Logger('fes:plugin-built-in'); export default function (api) { const { utils: { mergeConfig }, cwd } = api; @@ -16,7 +16,7 @@ export default function (api) { description: 'run unit tests with jest', options: { '--watch': 'run tests in watch mode', - '--debug': 'print debug logs' + '--debug': 'debug' }, async fn({ args }) { process.env.NODE_ENV = 'test'; diff --git a/packages/fes-template/.eslintrc.js b/packages/fes-template/.eslintrc.js index 7d04898c..57c7f909 100644 --- a/packages/fes-template/.eslintrc.js +++ b/packages/fes-template/.eslintrc.js @@ -1,5 +1,9 @@ module.exports = { extends: [require.resolve('@webank/eslint-config-webank')], + files: [ + '**/__tests__/*.{j,t}s?(x)', + '**/tests/unit/**/*.spec.{j,t}s?(x)' + ], env: { jest: true } diff --git a/packages/fes-template/__tests__/add.js b/packages/fes-template/__tests__/add.js index d5c874a0..5eaa2245 100644 --- a/packages/fes-template/__tests__/add.js +++ b/packages/fes-template/__tests__/add.js @@ -1,4 +1,4 @@ -import sum from '@/utils/sum'; +import sum from "@/utils/sum" test('adds 1 + 2 to equal 3', () => { expect(sum(1, 2)).toBe(3); From 325f8567692ce6ac3479533e6a22c9742142ba00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Tue, 2 Feb 2021 13:08:03 +0800 Subject: [PATCH 05/31] =?UTF-8?q?feat:=20=20plugin-jest=EF=BC=8C=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=8F=82=E8=80=83https://jestjs.io/docs/en/cli?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 单元测试、覆盖测试 --- .fatherrc.js | 2 +- .../.fatherrc.js | 0 .../LICENSE | 0 .../README.md | 0 .../helpers/setupFiles/jasmine.js | 0 .../helpers/setupFiles/shim.js | 0 .../helpers/transformers/css.js | 0 .../helpers/transformers/javascript.js | 0 .../package.json | 10 ++- .../src/createDefaultConfig.js | 60 +++++++++++++++ .../src/index.js | 30 ++++++-- .../src/createDefaultConfig.js | 39 ---------- packages/fes-template/.gitignore | 2 +- packages/fes-template/package.json | 2 +- yarn.lock | 75 +++++++++++++++---- 15 files changed, 155 insertions(+), 65 deletions(-) rename packages/{fes-plugin-unit-jest => fes-plugin-jest}/.fatherrc.js (100%) rename packages/{fes-plugin-unit-jest => fes-plugin-jest}/LICENSE (100%) rename packages/{fes-plugin-unit-jest => fes-plugin-jest}/README.md (100%) rename packages/{fes-plugin-unit-jest => fes-plugin-jest}/helpers/setupFiles/jasmine.js (100%) rename packages/{fes-plugin-unit-jest => fes-plugin-jest}/helpers/setupFiles/shim.js (100%) rename packages/{fes-plugin-unit-jest => fes-plugin-jest}/helpers/transformers/css.js (100%) rename packages/{fes-plugin-unit-jest => fes-plugin-jest}/helpers/transformers/javascript.js (100%) rename packages/{fes-plugin-unit-jest => fes-plugin-jest}/package.json (85%) create mode 100644 packages/fes-plugin-jest/src/createDefaultConfig.js rename packages/{fes-plugin-unit-jest => fes-plugin-jest}/src/index.js (81%) delete mode 100644 packages/fes-plugin-unit-jest/src/createDefaultConfig.js diff --git a/.fatherrc.js b/.fatherrc.js index 4728149c..888c4339 100644 --- a/.fatherrc.js +++ b/.fatherrc.js @@ -16,7 +16,7 @@ const headPkgs = [ "fes-plugin-icon", "fes-plugin-locale", "fes-plugin-enums", - "fes-plugin-unit-jest", + "fes-plugin-jest", "create-fes-app", ]; const tailPkgs = []; diff --git a/packages/fes-plugin-unit-jest/.fatherrc.js b/packages/fes-plugin-jest/.fatherrc.js similarity index 100% rename from packages/fes-plugin-unit-jest/.fatherrc.js rename to packages/fes-plugin-jest/.fatherrc.js diff --git a/packages/fes-plugin-unit-jest/LICENSE b/packages/fes-plugin-jest/LICENSE similarity index 100% rename from packages/fes-plugin-unit-jest/LICENSE rename to packages/fes-plugin-jest/LICENSE diff --git a/packages/fes-plugin-unit-jest/README.md b/packages/fes-plugin-jest/README.md similarity index 100% rename from packages/fes-plugin-unit-jest/README.md rename to packages/fes-plugin-jest/README.md diff --git a/packages/fes-plugin-unit-jest/helpers/setupFiles/jasmine.js b/packages/fes-plugin-jest/helpers/setupFiles/jasmine.js similarity index 100% rename from packages/fes-plugin-unit-jest/helpers/setupFiles/jasmine.js rename to packages/fes-plugin-jest/helpers/setupFiles/jasmine.js diff --git a/packages/fes-plugin-unit-jest/helpers/setupFiles/shim.js b/packages/fes-plugin-jest/helpers/setupFiles/shim.js similarity index 100% rename from packages/fes-plugin-unit-jest/helpers/setupFiles/shim.js rename to packages/fes-plugin-jest/helpers/setupFiles/shim.js diff --git a/packages/fes-plugin-unit-jest/helpers/transformers/css.js b/packages/fes-plugin-jest/helpers/transformers/css.js similarity index 100% rename from packages/fes-plugin-unit-jest/helpers/transformers/css.js rename to packages/fes-plugin-jest/helpers/transformers/css.js diff --git a/packages/fes-plugin-unit-jest/helpers/transformers/javascript.js b/packages/fes-plugin-jest/helpers/transformers/javascript.js similarity index 100% rename from packages/fes-plugin-unit-jest/helpers/transformers/javascript.js rename to packages/fes-plugin-jest/helpers/transformers/javascript.js diff --git a/packages/fes-plugin-unit-jest/package.json b/packages/fes-plugin-jest/package.json similarity index 85% rename from packages/fes-plugin-unit-jest/package.json rename to packages/fes-plugin-jest/package.json index 3b431d64..24fe0345 100644 --- a/packages/fes-plugin-unit-jest/package.json +++ b/packages/fes-plugin-jest/package.json @@ -1,10 +1,11 @@ { - "name": "@webank/fes-plugin-unit-jest", + "name": "@webank/fes-plugin-jest", "version": "2.0.0-alpha.2", - "description": "@webank/fes-plugin-unit-jest", + "description": "@webank/fes-plugin-jest", "main": "lib/index.js", "files": [ - "lib" + "lib", + "helpers" ], "scripts": { "test": "echo \"Error: no test specified\" && exit 1" @@ -12,7 +13,7 @@ "repository": { "type": "git", "url": "git+https://github.com/WeBankFinTech/fes.js.git", - "directory": "packages/fes-plugin-unit-jest" + "directory": "packages/fes-plugin-jest" }, "keywords": [ "fes", @@ -42,6 +43,7 @@ "jest-watch-typeahead": "^0.6.1", "babel-jest": "^26.6.3", "vue-jest": "^5.0.5-0", + "ts-jest": "^26.5.0", "whatwg-fetch": "^3.4.1", "typescript": "~4.1.2" } diff --git a/packages/fes-plugin-jest/src/createDefaultConfig.js b/packages/fes-plugin-jest/src/createDefaultConfig.js new file mode 100644 index 00000000..809809d1 --- /dev/null +++ b/packages/fes-plugin-jest/src/createDefaultConfig.js @@ -0,0 +1,60 @@ +import { existsSync } from 'fs'; +import { join } from 'path'; + +export default (cwd, args) => { + const testMatchTypes = ['spec', 'test']; + if (args.e2e) { + testMatchTypes.push('e2e'); + } + const hasSrc = existsSync(join(cwd, 'src')); + return { + collectCoverageFrom: [ + 'index.{js,jsx,ts,tsx,vue}', + hasSrc && 'src/**/*.{js,jsx,ts,tsx,vue}', + '!**/.fes/**', + '!**/typings/**', + '!**/types/**', + '!**/fixtures/**', + '!**/examples/**', + '!**/*.d.ts' + ].filter(Boolean), + moduleFileExtensions: [ + 'js', + 'jsx', + 'json', + // tell Jest to handle *.vue files + 'vue' + ], + transform: { + // process *.vue files with vue-jest + '^.+\\.vue$': require.resolve('vue-jest'), + '.+\\.(css|styl|less|sass|scss|jpg|jpeg|png|svg|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': + require.resolve('jest-transform-stub'), + '^.+\\.jsx?$': require.resolve( + '../helpers/transformers/javascript' + ) + }, + setupFiles: [require.resolve('../helpers/setupFiles/shim')], + setupFilesAfterEnv: [require.resolve('../helpers/setupFiles/jasmine')], + transformIgnorePatterns: ['/node_modules/'], + // support the same @ -> src alias mapping in source code + moduleNameMapper: { + '^@/(.*)$': '/src/$1' + }, + // serializer for snapshots + snapshotSerializers: [ + 'jest-serializer-vue' + ], + testMatch: [ + `**/tests/**/*.(${testMatchTypes.join('|')}).[jt]s?(x)`, + '**/__tests__/**/*.[jt]s?(x)' + ], + // https://github.com/facebook/jest/issues/6766 + testURL: 'http://localhost/', + watchPlugins: [ + require.resolve('jest-watch-typeahead/filename'), + require.resolve('jest-watch-typeahead/testname') + ], + verbose: true + }; +}; diff --git a/packages/fes-plugin-unit-jest/src/index.js b/packages/fes-plugin-jest/src/index.js similarity index 81% rename from packages/fes-plugin-unit-jest/src/index.js rename to packages/fes-plugin-jest/src/index.js index 27d79816..cce830f2 100644 --- a/packages/fes-plugin-unit-jest/src/index.js +++ b/packages/fes-plugin-jest/src/index.js @@ -6,21 +6,39 @@ import { Logger } from '@webank/fes-compiler'; import { options as CliOptions } from 'jest-cli/build/cli/args'; import createDefaultConfig from './createDefaultConfig'; -const logger = new Logger('fes:plugin-built-in'); +const logger = new Logger('fes:plugin-unit-jest'); + +function getCommandOptiton() { + const opt = {}; + Object.keys(CliOptions).forEach((key) => { + const option = CliOptions[key]; + let otpKey = ''; + if (option.alias) { + otpKey = `-${option.alias} --${key}`; + } else { + otpKey = `--${key}`; + } + if (key !== 'version') { + opt[otpKey] = option.description; + } + }); + return opt; +} export default function (api) { const { utils: { mergeConfig }, cwd } = api; api.registerCommand({ - command: 'test:unit', + command: 'test', description: 'run unit tests with jest', - options: { - '--watch': 'run tests in watch mode', - '--debug': 'debug' - }, + options: getCommandOptiton(), async fn({ args }) { process.env.NODE_ENV = 'test'; + if (args._[0] === 'test') { + args._.shift(); + } + args.debug && logger.log(`args: ${JSON.stringify(args)}`); // Read config from cwd/jest.config.js diff --git a/packages/fes-plugin-unit-jest/src/createDefaultConfig.js b/packages/fes-plugin-unit-jest/src/createDefaultConfig.js deleted file mode 100644 index a0b1d3fe..00000000 --- a/packages/fes-plugin-unit-jest/src/createDefaultConfig.js +++ /dev/null @@ -1,39 +0,0 @@ -export default () => ({ - moduleFileExtensions: [ - 'js', - 'jsx', - 'json', - // tell Jest to handle *.vue files - 'vue' - ], - transform: { - // process *.vue files with vue-jest - '^.+\\.vue$': require.resolve('vue-jest'), - '.+\\.(css|styl|less|sass|scss|jpg|jpeg|png|svg|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': - require.resolve('jest-transform-stub'), - '^.+\\.jsx?$': require.resolve( - '../helpers/transformers/javascript' - ) - }, - setupFiles: [require.resolve('../helpers/setupFiles/shim')], - setupFilesAfterEnv: [require.resolve('../helpers/setupFiles/jasmine')], - transformIgnorePatterns: ['/node_modules/'], - // support the same @ -> src alias mapping in source code - moduleNameMapper: { - '^@/(.*)$': '/src/$1' - }, - // serializer for snapshots - snapshotSerializers: [ - 'jest-serializer-vue' - ], - testMatch: [ - '**/tests/unit/**/*.spec.[jt]s?(x)', - '**/__tests__/*.[jt]s?(x)' - ], - // https://github.com/facebook/jest/issues/6766 - testURL: 'http://localhost/', - watchPlugins: [ - require.resolve('jest-watch-typeahead/filename'), - require.resolve('jest-watch-typeahead/testname') - ] -}); diff --git a/packages/fes-template/.gitignore b/packages/fes-template/.gitignore index 15fc6484..df903b98 100644 --- a/packages/fes-template/.gitignore +++ b/packages/fes-template/.gitignore @@ -2,7 +2,7 @@ # dependencies /node_modules - +/coverage # fes /src/.fes diff --git a/packages/fes-template/package.json b/packages/fes-template/package.json index ad202592..3fffbd36 100644 --- a/packages/fes-template/package.json +++ b/packages/fes-template/package.json @@ -53,7 +53,7 @@ "@webank/fes-plugin-locale": "^2.0.0-alpha.0", "@webank/fes-plugin-model": "^2.0.0-alpha.0", "@webank/fes-plugin-enums": "^2.0.0-alpha.0", - "@webank/fes-plugin-unit-jest": "^2.0.0-alpha.0", + "@webank/fes-plugin-jest": "^2.0.0-alpha.0", "ant-design-vue": "2.0.0-rc.3", "vue": "3.0.4" }, diff --git a/yarn.lock b/yarn.lock index 6bdbc701..e07c5da5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3874,6 +3874,14 @@ dependencies: "@types/istanbul-lib-report" "*" +"@types/jest@26.x": + version "26.0.20" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.20.tgz#cd2f2702ecf69e86b586e1f5223a60e454056307" + integrity sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA== + dependencies: + jest-diff "^26.0.0" + pretty-format "^26.0.0" + "@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": version "7.0.6" resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" @@ -6397,6 +6405,13 @@ browserslist@^4.6.4: escalade "^3.1.1" node-releases "^1.1.66" +bs-logger@0.x: + version "0.2.6" + resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8" + integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog== + dependencies: + fast-json-stable-stringify "2.x" + bser@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" @@ -6414,7 +6429,7 @@ buffer-equal@^1.0.0: resolved "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= -buffer-from@^1.0.0: +buffer-from@1.x, buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== @@ -9321,7 +9336,7 @@ fast-glob@^3.1.1, fast-glob@^3.2.4: micromatch "^4.0.2" picomatch "^2.2.1" -fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: +fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== @@ -11573,7 +11588,7 @@ jest-config@^26.6.3: micromatch "^4.0.2" pretty-format "^26.6.2" -jest-diff@^26.6.2: +jest-diff@^26.0.0, jest-diff@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA== @@ -11851,7 +11866,7 @@ jest-transform-stub@^2.0.0: resolved "https://registry.yarnpkg.com/jest-transform-stub/-/jest-transform-stub-2.0.0.tgz#19018b0851f7568972147a5d60074b55f0225a7d" integrity sha512-lspHaCRx/mBbnm3h4uMMS3R5aZzMwyNpNIJLXj4cEsV0mIUtS4IjYJLSoyjRCtnxb6RIGJ4NL2quZzfIeNhbkg== -jest-util@^26.6.2: +jest-util@^26.1.0, jest-util@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1" integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q== @@ -12069,6 +12084,13 @@ json3@^3.3.3: resolved "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== +json5@2.x: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== + dependencies: + minimist "^1.2.5" + json5@^0.5.0: version "0.5.1" resolved "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" @@ -12607,7 +12629,7 @@ lodash@4.17.15: resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== -lodash@4.17.20, "lodash@>=3.5 <5", lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1: +lodash@4.17.20, lodash@4.x, "lodash@>=3.5 <5", lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1: version "4.17.20" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -12737,6 +12759,11 @@ make-dir@^3.0.0, make-dir@^3.0.2: dependencies: semver "^6.0.0" +make-error@1.x: + version "1.3.6" + resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" + integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== + make-fetch-happen@^5.0.0: version "5.0.2" resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd" @@ -13259,7 +13286,7 @@ mkdirp-promise@^5.0.1: dependencies: mkdirp "*" -mkdirp@*, mkdirp@1.0.4, mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4: +mkdirp@*, mkdirp@1.0.4, mkdirp@1.x, mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== @@ -15343,7 +15370,7 @@ pretty-error@^2.0.2, pretty-error@^2.1.1: lodash "^4.17.20" renderkid "^2.0.4" -pretty-format@^26.6.2: +pretty-format@^26.0.0, pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg== @@ -16552,18 +16579,18 @@ semver@7.3.2: resolved "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== -semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.2.1, semver@^7.3.2: +semver@7.x, semver@^7.2.1, semver@^7.3.2: version "7.3.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== dependencies: lru-cache "^6.0.0" +semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + send@0.17.1: version "0.17.1" resolved "https://registry.npmjs.org/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -17886,6 +17913,23 @@ trim-off-newlines@^1.0.0: resolved "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3" integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM= +ts-jest@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.0.tgz#3e3417d91bc40178a6716d7dacc5b0505835aa21" + integrity sha512-Ya4IQgvIFNa2Mgq52KaO8yBw2W8tWp61Ecl66VjF0f5JaV8u50nGoptHVILOPGoI7SDnShmEqnYQEmyHdQ+56g== + dependencies: + "@types/jest" "26.x" + bs-logger "0.x" + buffer-from "1.x" + fast-json-stable-stringify "2.x" + jest-util "^26.1.0" + json5 "2.x" + lodash "4.x" + make-error "1.x" + mkdirp "1.x" + semver "7.x" + yargs-parser "20.x" + ts-loader@^6.0.2: version "6.2.2" resolved "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.2.tgz#dffa3879b01a1a1e0a4b85e2b8421dc0dfff1c58" @@ -19294,6 +19338,11 @@ yargs-parser@18.1.3, yargs-parser@^18.1.2, yargs-parser@^18.1.3: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@20.x: + version "20.2.4" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" + integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + yargs-parser@^15.0.1: version "15.0.1" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz#54786af40b820dcb2fb8025b11b4d659d76323b3" From e441e96f6fc71223300e1f58c67ce751d559a397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Tue, 2 Feb 2021 15:22:07 +0800 Subject: [PATCH 06/31] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-compiler/src/service/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fes-compiler/src/service/index.js b/packages/fes-compiler/src/service/index.js index 91e9c7a3..1d957cd1 100644 --- a/packages/fes-compiler/src/service/index.js +++ b/packages/fes-compiler/src/service/index.js @@ -490,7 +490,7 @@ export default class Service extends EventEmitter { this.program .usage(' [options]') .version(`@webank/fes ${this.fesPkg.version}`, '-v, --vers', 'output the current version') - .description('一个好用的前端解决方案'); + .description(chalk.cyan('一个好用的前端应用解决方案')); } parseCommand() { From c1f49f39590c080868a4ce735d4bd29c946258c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Tue, 2 Feb 2021 15:33:15 +0800 Subject: [PATCH 07/31] =?UTF-8?q?feat:=20=20plugin-layout=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0footer=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-plugin-layout/src/index.js | 1 + .../fes-plugin-layout/src/runtime/views/BaseLayout.vue | 7 ++++--- packages/fes-template/.fes.js | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/fes-plugin-layout/src/index.js b/packages/fes-plugin-layout/src/index.js index b4e8efcf..8b3eb02d 100644 --- a/packages/fes-plugin-layout/src/index.js +++ b/packages/fes-plugin-layout/src/index.js @@ -33,6 +33,7 @@ export default (api) => { // .fes配置 const userConfig = { title: name, + footer: 'Created by Fes.js', ...(api.config.layout || {}) }; diff --git a/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue b/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue index 0773a683..df25b5a9 100644 --- a/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue +++ b/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue @@ -56,8 +56,8 @@ - - Fes.js ©2020 Created by MumbleFe + + {{footer}} @@ -128,7 +128,8 @@ export default { sideWidth: { type: Number, default: 200 - } + }, + footer: String }, setup(props) { const collapsed = ref(false); diff --git a/packages/fes-template/.fes.js b/packages/fes-template/.fes.js index bd048ea3..db77aa6f 100644 --- a/packages/fes-template/.fes.js +++ b/packages/fes-template/.fes.js @@ -14,6 +14,7 @@ export default { }, layout: { title: "Fes.js", + footer: 'Created by MumbelFe', multiTabs: false, menus: [{ name: 'index' From 8e4a9c9e8613d96d4b05280e4acf70422334abf6 Mon Sep 17 00:00:00 2001 From: aringlai Date: Tue, 2 Feb 2021 16:56:02 +0800 Subject: [PATCH 08/31] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0vuex=E6=8F=92?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .fatherrc.js | 1 + packages/fes-plugin-jest/package.json | 2 +- packages/fes-plugin-vuex/.fatherrc.js | 3 + packages/fes-plugin-vuex/LICENSE | 21 + packages/fes-plugin-vuex/README.md | 2 + packages/fes-plugin-vuex/package.json | 34 + packages/fes-plugin-vuex/src/index.js | 83 + .../fes-plugin-vuex/src/runtime/runtime.tpl | 10 + packages/fes-template/.eslintrc.js | 12 +- packages/fes-template/package.json | 4 +- packages/fes-template/src/pages/index.vue | 10 +- packages/fes-template/src/stores/counter.js | 23 + .../fes-template/src/stores/plugin-loger.js | 3 + packages/fes-template/src/stores/user.js | 25 + yarn.lock | 6974 ++++++++--------- 15 files changed, 3488 insertions(+), 3719 deletions(-) create mode 100644 packages/fes-plugin-vuex/.fatherrc.js create mode 100644 packages/fes-plugin-vuex/LICENSE create mode 100644 packages/fes-plugin-vuex/README.md create mode 100644 packages/fes-plugin-vuex/package.json create mode 100644 packages/fes-plugin-vuex/src/index.js create mode 100644 packages/fes-plugin-vuex/src/runtime/runtime.tpl create mode 100644 packages/fes-template/src/stores/counter.js create mode 100644 packages/fes-template/src/stores/plugin-loger.js create mode 100644 packages/fes-template/src/stores/user.js diff --git a/.fatherrc.js b/.fatherrc.js index 888c4339..f0d53670 100644 --- a/.fatherrc.js +++ b/.fatherrc.js @@ -17,6 +17,7 @@ const headPkgs = [ "fes-plugin-locale", "fes-plugin-enums", "fes-plugin-jest", + "fes-plugin-vuex", "create-fes-app", ]; const tailPkgs = []; diff --git a/packages/fes-plugin-jest/package.json b/packages/fes-plugin-jest/package.json index 24fe0345..11aff9f6 100644 --- a/packages/fes-plugin-jest/package.json +++ b/packages/fes-plugin-jest/package.json @@ -42,7 +42,7 @@ "jest-transform-stub": "^2.0.0", "jest-watch-typeahead": "^0.6.1", "babel-jest": "^26.6.3", - "vue-jest": "^5.0.5-0", + "vue-jest": "^5.0.0-0", "ts-jest": "^26.5.0", "whatwg-fetch": "^3.4.1", "typescript": "~4.1.2" diff --git a/packages/fes-plugin-vuex/.fatherrc.js b/packages/fes-plugin-vuex/.fatherrc.js new file mode 100644 index 00000000..332f1bff --- /dev/null +++ b/packages/fes-plugin-vuex/.fatherrc.js @@ -0,0 +1,3 @@ +export default { + disableTypeCheck: false, +}; diff --git a/packages/fes-plugin-vuex/LICENSE b/packages/fes-plugin-vuex/LICENSE new file mode 100644 index 00000000..0978fbf7 --- /dev/null +++ b/packages/fes-plugin-vuex/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020-present webank + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/packages/fes-plugin-vuex/README.md b/packages/fes-plugin-vuex/README.md new file mode 100644 index 00000000..139597f9 --- /dev/null +++ b/packages/fes-plugin-vuex/README.md @@ -0,0 +1,2 @@ + + diff --git a/packages/fes-plugin-vuex/package.json b/packages/fes-plugin-vuex/package.json new file mode 100644 index 00000000..dc483b2f --- /dev/null +++ b/packages/fes-plugin-vuex/package.json @@ -0,0 +1,34 @@ +{ + "name": "@webank/fes-plugin-vuex", + "version": "2.0.0-alpha.2", + "description": "@webank/fes-plugin-vuex", + "main": "lib/index.js", + "files": [ + "lib" + ], + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/WeBankFinTech/fes.js.git", + "directory": "packages/fes-plugin-vuex" + }, + "keywords": [ + "fes" + ], + "author": "aringlai", + "license": "MIT", + "bugs": { + "url": "https://github.com/WeBankFinTech/fes.js/issues" + }, + "homepage": "https://github.com/WeBankFinTech/fes.js#readme", + "publishConfig": { + "access": "public" + }, + "peerDependencies": { + "@webank/fes": "^2.0.0-alpha.0", + "vue": "^3.0.4", + "vuex": "^4.0.0-rc.2" + } +} diff --git a/packages/fes-plugin-vuex/src/index.js b/packages/fes-plugin-vuex/src/index.js new file mode 100644 index 00000000..22705455 --- /dev/null +++ b/packages/fes-plugin-vuex/src/index.js @@ -0,0 +1,83 @@ +import { readdirSync, readFileSync, statSync } from 'fs'; +import { join } from 'path'; + +const namespace = 'plugin-vuex'; + +export default (api) => { + const { + paths, + utils: { Mustache } + } = api; + + /** + * 获取文件夹所有JS文件路径 + * @param {string} dir + */ + function getDirFilePaths(dir) { + const dirs = readdirSync(dir); + let pathList = []; + for (const name of dirs) { + const path = join(dir, name); + const info = statSync(path); + if (info.isDirectory()) { + pathList = pathList.concat(getDirFilePaths(path)); + } else if (path.endsWith('.js')) { + pathList.push(path); + } + } + return pathList; + } + + /** + * 解析vuex模块及插件文件 + * @param {Array} pathList 文件路径 + * @param {string} root + */ + function parseStore(pathList, root) { + const store = { + modules: [], + plugins: [], + importModules: [], + importPlugins: [] + }; + for (const path of pathList) { + const moduleName = path.replace(root, '').replace('.js', '').replace(/(\/|\.|-|_)\S/g, text => text[1].toUpperCase()); + if (path.indexOf('plugin') > -1) { + store.importPlugins.push(`import ${moduleName} from '${path}'`); + store.plugins.push(moduleName); + } else { + store.importModules.push(`import ${moduleName} from '${path}'`); + store.modules.push(`${moduleName}`); + } + } + return store; + } + + const absRuntimeFilePath = join(namespace, 'runtime.js'); + api.onGenerateFiles(() => { + const root = join(paths.absSrcPath, 'stores'); + const storePaths = getDirFilePaths(root); + const store = parseStore(storePaths, join(root, '/')); + + // 文件写出 + api.writeTmpFile({ + path: absRuntimeFilePath, + content: Mustache.render( + readFileSync(join(__dirname, 'runtime/runtime.tpl'), 'utf-8'), + { + IMPORT_MODULES: store.importModules.join('\n'), + IMPORT_PLUGINS: store.importPlugins.join('\n'), + MODULES: `{ ${store.modules.join(', ')} }`, + PLUGINS: `[${store.plugins.join(', ')}]` + } + ) + }); + + api.copyTmpFiles({ + namespace, + path: join(__dirname, 'runtime'), + ignore: ['.tpl'] + }); + }); + api.addRuntimePlugin(() => `@@/${absRuntimeFilePath}`); +}; diff --git a/packages/fes-plugin-vuex/src/runtime/runtime.tpl b/packages/fes-plugin-vuex/src/runtime/runtime.tpl new file mode 100644 index 00000000..bf0aec46 --- /dev/null +++ b/packages/fes-plugin-vuex/src/runtime/runtime.tpl @@ -0,0 +1,10 @@ +import { createStore } from 'vuex' +{{{IMPORT_MODULES}}} +{{{IMPORT_PLUGINS}}} + +export function onAppCreated({ app }) { + app.use(createStore({ + modules: {{{MODULES}}}, + plugins: {{{PLUGINS}}} + })) +} \ No newline at end of file diff --git a/packages/fes-template/.eslintrc.js b/packages/fes-template/.eslintrc.js index 57c7f909..6300816f 100644 --- a/packages/fes-template/.eslintrc.js +++ b/packages/fes-template/.eslintrc.js @@ -1,8 +1,12 @@ module.exports = { - extends: [require.resolve('@webank/eslint-config-webank')], - files: [ - '**/__tests__/*.{j,t}s?(x)', - '**/tests/unit/**/*.spec.{j,t}s?(x)' + extends: ['@webank/eslint-config-webank/vue.js'], + overrides: [ + { + files: [ + '**/__tests__/*.{j,t}s?(x)', + '**/tests/unit/**/*.spec.{j,t}s?(x)' + ] + } ], env: { jest: true diff --git a/packages/fes-template/package.json b/packages/fes-template/package.json index 3fffbd36..cf96427e 100644 --- a/packages/fes-template/package.json +++ b/packages/fes-template/package.json @@ -54,8 +54,10 @@ "@webank/fes-plugin-model": "^2.0.0-alpha.0", "@webank/fes-plugin-enums": "^2.0.0-alpha.0", "@webank/fes-plugin-jest": "^2.0.0-alpha.0", + "@webank/fes-plugin-vuex": "^2.0.0-alpha.0", "ant-design-vue": "2.0.0-rc.3", - "vue": "3.0.4" + "vue": "3.0.4", + "vuex": "^4.0.0-rc.2" }, "private": true } diff --git a/packages/fes-template/src/pages/index.vue b/packages/fes-template/src/pages/index.vue index bf40156a..3a304634 100644 --- a/packages/fes-template/src/pages/index.vue +++ b/packages/fes-template/src/pages/index.vue @@ -9,6 +9,7 @@
{{item.value}}：{{item.key}}
{{item.name}}：{{item.disabled}}
{{enumsGet('roles', '2', { dir: 'eName' })}}
+

Vuex

@@ -18,7 +19,8 @@ } diff --git a/packages/create-fes-app/templates/app/pc/src/stores/counter.js b/packages/create-fes-app/templates/app/pc/src/stores/counter.js new file mode 100644 index 00000000..78070ba3 --- /dev/null +++ b/packages/create-fes-app/templates/app/pc/src/stores/counter.js @@ -0,0 +1,23 @@ +export default { + namespaced: true, + state: () => ({ + count: 0 + }), + mutations: { + increment(state) { + state.count++; + } + }, + getters: { + doubleCount(state) { + return state.count * 2; + } + }, + actions: { + asyncIncrement({ commit }) { + setTimeout(() => { + commit('increment'); + }, 2000); + } + } +}; diff --git a/packages/create-fes-app/templates/app/pc/src/stores/plugin-loger.js b/packages/create-fes-app/templates/app/pc/src/stores/plugin-loger.js new file mode 100644 index 00000000..6b8a9826 --- /dev/null +++ b/packages/create-fes-app/templates/app/pc/src/stores/plugin-loger.js @@ -0,0 +1,3 @@ +import { createLogger } from 'vuex'; + +export default createLogger(); diff --git a/packages/create-fes-app/templates/app/pc/src/stores/user.js b/packages/create-fes-app/templates/app/pc/src/stores/user.js new file mode 100644 index 00000000..e6ffcceb --- /dev/null +++ b/packages/create-fes-app/templates/app/pc/src/stores/user.js @@ -0,0 +1,25 @@ +export default { + namespaced: true, + state: () => ({ + name: 'aring', + age: 20, + count: 0 + }), + mutations: { + increment(state) { + state.count++; + } + }, + getters: { + doubleCount(state) { + return state.count * 2; + } + }, + actions: { + asyncIncrement({ commit }) { + setTimeout(() => { + commit('increment'); + }, 2000); + } + } +}; diff --git a/packages/create-fes-app/templates/app/pc/src/utils/sum.js b/packages/create-fes-app/templates/app/pc/src/utils/sum.js new file mode 100644 index 00000000..54b28e5a --- /dev/null +++ b/packages/create-fes-app/templates/app/pc/src/utils/sum.js @@ -0,0 +1,3 @@ +export default function sum(a, b) { + return a + b; +} From 27e0a1191287516a0afbf246c1185203ebd738be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Wed, 3 Feb 2021 10:17:03 +0800 Subject: [PATCH 15/31] chore(release): publish --- lerna.json | 2 +- packages/create-fes-app/package.json | 2 +- packages/fes-compiler/package.json | 6 +++--- packages/fes-plugin-access/package.json | 2 +- packages/fes-plugin-enums/package.json | 2 +- packages/fes-plugin-icon/package.json | 2 +- packages/fes-plugin-jest/package.json | 16 ++++++++-------- packages/fes-plugin-layout/package.json | 2 +- packages/fes-plugin-locale/package.json | 2 +- packages/fes-plugin-model/package.json | 2 +- packages/fes-plugin-request/package.json | 2 +- packages/fes-plugin-vuex/package.json | 2 +- packages/fes-preset-built-in/package.json | 12 ++++++------ packages/fes-runtime/package.json | 2 +- packages/fes/package.json | 8 ++++---- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index c80a8f92..a0f051c9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.0-alpha.5", + "version": "2.0.0-alpha.6", "changelog": { "repo": "WeBankFinTech/fes.js", "cacheDir": ".changelog", diff --git a/packages/create-fes-app/package.json b/packages/create-fes-app/package.json index 164e4cfb..dd0dfb9c 100644 --- a/packages/create-fes-app/package.json +++ b/packages/create-fes-app/package.json @@ -1,6 +1,6 @@ { "name": "@webank/create-fes-app", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.6", "description": "create a app base on fes.js", "main": "lib/index.js", "files": [ diff --git a/packages/fes-compiler/package.json b/packages/fes-compiler/package.json index 72ed6684..167f89be 100644 --- a/packages/fes-compiler/package.json +++ b/packages/fes-compiler/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-compiler", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.6", "description": "@webank/fes-compiler", "main": "lib/index.js", "files": [ @@ -27,11 +27,11 @@ "@babel/register": "^7.12.1", "@umijs/babel-preset-umi": "3.3.3", "@umijs/utils": "3.3.3", + "commander": "^6.2.1", "dotenv": "8.2.0", "joi": "17.3.0", "readline": "^1.3.0", "set-value": "3.0.2", - "tapable": "2.0.0", - "commander": "^6.2.1" + "tapable": "2.0.0" } } diff --git a/packages/fes-plugin-access/package.json b/packages/fes-plugin-access/package.json index a031e445..eadedb22 100644 --- a/packages/fes-plugin-access/package.json +++ b/packages/fes-plugin-access/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-access", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.6", "description": "@webank/fes-plugin-access", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-enums/package.json b/packages/fes-plugin-enums/package.json index 1d93c983..94266d1f 100644 --- a/packages/fes-plugin-enums/package.json +++ b/packages/fes-plugin-enums/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-enums", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.6", "description": "@webank/fes-plugin-enums", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-icon/package.json b/packages/fes-plugin-icon/package.json index 9e06a5c3..fddaebd7 100644 --- a/packages/fes-plugin-icon/package.json +++ b/packages/fes-plugin-icon/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-icon", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.6", "description": "@webank/fes-plugin-icon", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-jest/package.json b/packages/fes-plugin-jest/package.json index 11aff9f6..ac35eb6a 100644 --- a/packages/fes-plugin-jest/package.json +++ b/packages/fes-plugin-jest/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-jest", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.6", "description": "@webank/fes-plugin-jest", "main": "lib/index.js", "files": [ @@ -32,19 +32,19 @@ "dependencies": { "@babel/core": "7.11.6", "@umijs/babel-preset-umi": "3.2.24", - "core-js": "3.6.5", + "@webank/fes-compiler": "^2.0.0-alpha.6", "babel-core": "^7.0.0-bridge.0", - "regenerator-runtime": "^0.13.7", - "@webank/fes-compiler": "^2.0.0-alpha.2", + "babel-jest": "^26.6.3", + "core-js": "3.6.5", "jest": "^26.6.3", "jest-cli": "^26.6.3", "jest-serializer-vue": "^2.0.2", "jest-transform-stub": "^2.0.0", "jest-watch-typeahead": "^0.6.1", - "babel-jest": "^26.6.3", - "vue-jest": "^5.0.0-0", + "regenerator-runtime": "^0.13.7", "ts-jest": "^26.5.0", - "whatwg-fetch": "^3.4.1", - "typescript": "~4.1.2" + "typescript": "~4.1.2", + "vue-jest": "^5.0.0-0", + "whatwg-fetch": "^3.4.1" } } diff --git a/packages/fes-plugin-layout/package.json b/packages/fes-plugin-layout/package.json index f0234b5a..eced7374 100644 --- a/packages/fes-plugin-layout/package.json +++ b/packages/fes-plugin-layout/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-layout", - "version": "2.0.0-alpha.5", + "version": "2.0.0-alpha.6", "description": "@webank/fes-plugin-layout", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-locale/package.json b/packages/fes-plugin-locale/package.json index 7a9761d6..4bcfaf1d 100644 --- a/packages/fes-plugin-locale/package.json +++ b/packages/fes-plugin-locale/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-locale", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.6", "description": "@webank/fes-plugin-locale", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-model/package.json b/packages/fes-plugin-model/package.json index 4ea0072f..ccc9ba23 100644 --- a/packages/fes-plugin-model/package.json +++ b/packages/fes-plugin-model/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-model", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.6", "description": "@webank/fes-plugin-model", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-request/package.json b/packages/fes-plugin-request/package.json index 1c90632c..28fee689 100644 --- a/packages/fes-plugin-request/package.json +++ b/packages/fes-plugin-request/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-request", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.6", "description": "@webank/fes-plugin-request", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-vuex/package.json b/packages/fes-plugin-vuex/package.json index 5074d0a7..d0068e01 100644 --- a/packages/fes-plugin-vuex/package.json +++ b/packages/fes-plugin-vuex/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-vuex", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.6", "description": "@webank/fes-plugin-vuex", "main": "lib/index.js", "files": [ diff --git a/packages/fes-preset-built-in/package.json b/packages/fes-preset-built-in/package.json index 8a262f38..bfecf48b 100644 --- a/packages/fes-preset-built-in/package.json +++ b/packages/fes-preset-built-in/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-preset-built-in", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.6", "description": "@webank/fes-preset-built-in", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -31,14 +31,14 @@ "@vue/babel-plugin-jsx": "^1.0.0-rc.5", "@vue/compiler-sfc": "^3.0.4", "@vue/preload-webpack-plugin": "1.1.2", - "@webank/fes-compiler": "^2.0.0-alpha.2", + "@webank/fes-compiler": "^2.0.0-alpha.6", + "babel-plugin-import": "1.13.3", "cliui": "6.0.0", + "envinfo": "^7.7.3", + "hard-source-webpack-plugin": "0.13.1", "html-webpack-plugin": "^3.2.0", "html-webpack-tags-plugin": "2.0.17", "vue-loader": "^16.1.2", - "webpack-bundle-analyzer": "4.3.0", - "babel-plugin-import": "1.13.3", - "hard-source-webpack-plugin": "0.13.1", - "envinfo": "^7.7.3" + "webpack-bundle-analyzer": "4.3.0" } } diff --git a/packages/fes-runtime/package.json b/packages/fes-runtime/package.json index dd5125ff..86881ec2 100644 --- a/packages/fes-runtime/package.json +++ b/packages/fes-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-runtime", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.6", "description": "@webank/fes-runtime", "main": "dist/index.js", "files": [ diff --git a/packages/fes/package.json b/packages/fes/package.json index b3267c35..f4847870 100644 --- a/packages/fes/package.json +++ b/packages/fes/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.6", "description": "一个好用的前端管理台快速开发框架", "preferGlobal": true, "scripts": { @@ -40,9 +40,9 @@ ], "dependencies": { "@umijs/utils": "3.3.3", - "@webank/fes-compiler": "^2.0.0-alpha.2", - "@webank/fes-preset-built-in": "^2.0.0-alpha.2", - "@webank/fes-runtime": "^2.0.0-alpha.2", + "@webank/fes-compiler": "^2.0.0-alpha.6", + "@webank/fes-preset-built-in": "^2.0.0-alpha.6", + "@webank/fes-runtime": "^2.0.0-alpha.6", "resolve-cwd": "^3.0.0" }, "engines": { From bf2723fd7149ef14f9108a2a90026a17ee2ab9f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Wed, 3 Feb 2021 10:19:55 +0800 Subject: [PATCH 16/31] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=B8=AD=E4=BE=9D=E8=B5=96=E7=9A=84=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/app/h5/package.json | 8 ++++---- .../templates/app/pc/package.json | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/create-fes-app/templates/app/h5/package.json b/packages/create-fes-app/templates/app/h5/package.json index e1903a71..5c7f53e6 100644 --- a/packages/create-fes-app/templates/app/h5/package.json +++ b/packages/create-fes-app/templates/app/h5/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-template-h5", - "version": "2.0.0-alpha.1", + "version": "2.0.0-alpha", "description": "fes 移动端项目模版", "scripts": { "build": "fes build", @@ -44,9 +44,9 @@ "postcss-px-to-viewport": "1.1.1" }, "dependencies": { - "@webank/fes": "^2.0.0-alpha.0", - "@webank/fes-plugin-icon": "^2.0.0-alpha.0", - "@webank/fes-plugin-request": "^2.0.0-alpha.0", + "@webank/fes": "^2.0.0-alpha.6", + "@webank/fes-plugin-icon": "^2.0.0-alpha.6", + "@webank/fes-plugin-request": "^2.0.0-alpha.6", "vue": "3.0.5" }, "private": true diff --git a/packages/create-fes-app/templates/app/pc/package.json b/packages/create-fes-app/templates/app/pc/package.json index d5e5c1de..6a541f22 100644 --- a/packages/create-fes-app/templates/app/pc/package.json +++ b/packages/create-fes-app/templates/app/pc/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-template", - "version": "2.0.0-alpha.1", + "version": "2.0.0-alpha", "description": "fes项目模版", "scripts": { "build": "fes build", @@ -46,14 +46,14 @@ "@webank/eslint-config-webank": "^0.2.10" }, "dependencies": { - "@webank/fes": "^2.0.0-alpha.0", - "@webank/fes-plugin-access": "^2.0.0-alpha.0", - "@webank/fes-plugin-layout": "^2.0.0-alpha.0", - "@webank/fes-plugin-locale": "^2.0.0-alpha.0", - "@webank/fes-plugin-model": "^2.0.0-alpha.0", - "@webank/fes-plugin-enums": "^2.0.0-alpha.0", - "@webank/fes-plugin-jest": "^2.0.0-alpha.0", - "@webank/fes-plugin-vuex": "^2.0.0-alpha.0", + "@webank/fes": "^2.0.0-alpha.6", + "@webank/fes-plugin-access": "^2.0.0-alpha.6", + "@webank/fes-plugin-layout": "^2.0.0-alpha.6", + "@webank/fes-plugin-locale": "^2.0.0-alpha.6", + "@webank/fes-plugin-model": "^2.0.0-alpha.6", + "@webank/fes-plugin-enums": "^2.0.0-alpha.6", + "@webank/fes-plugin-jest": "^2.0.0-alpha.6", + "@webank/fes-plugin-vuex": "^2.0.0-alpha.6", "ant-design-vue": "2.0.0-rc.3", "vue": "3.0.5", "vuex": "^4.0.0-rc.2" From 46ea2eedddee927b2b0fe5834fc422dfe1475c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Wed, 3 Feb 2021 10:28:09 +0800 Subject: [PATCH 17/31] =?UTF-8?q?chore:=20=E6=B7=BB=E5=8A=A0README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/create-fes-app/README.md | 3 +++ packages/fes-compiler/README copy.md | 3 +++ packages/fes-compiler/README.md | 3 +++ packages/fes-plugin-access/README.md | 3 ++- packages/fes-plugin-enums/README.md | 3 ++- packages/fes-plugin-icon/README.md | 3 +++ packages/fes-plugin-jest/README.md | 3 ++- packages/fes-plugin-model/README.md | 3 +++ packages/fes-plugin-vuex/README.md | 3 ++- packages/fes-preset-built-in/README.md | 4 ++++ packages/fes-runtime/README.md | 3 +++ packages/fes-utils/README.md | 3 +++ packages/fes/README.md | 32 ++------------------------ 13 files changed, 35 insertions(+), 34 deletions(-) create mode 100644 packages/create-fes-app/README.md create mode 100644 packages/fes-compiler/README copy.md create mode 100644 packages/fes-compiler/README.md create mode 100644 packages/fes-plugin-icon/README.md create mode 100644 packages/fes-plugin-model/README.md create mode 100644 packages/fes-runtime/README.md create mode 100644 packages/fes-utils/README.md diff --git a/packages/create-fes-app/README.md b/packages/create-fes-app/README.md new file mode 100644 index 00000000..14704fc6 --- /dev/null +++ b/packages/create-fes-app/README.md @@ -0,0 +1,3 @@ +# fes + +一个好用的前端应用解决方案 \ No newline at end of file diff --git a/packages/fes-compiler/README copy.md b/packages/fes-compiler/README copy.md new file mode 100644 index 00000000..14704fc6 --- /dev/null +++ b/packages/fes-compiler/README copy.md @@ -0,0 +1,3 @@ +# fes + +一个好用的前端应用解决方案 \ No newline at end of file diff --git a/packages/fes-compiler/README.md b/packages/fes-compiler/README.md new file mode 100644 index 00000000..14704fc6 --- /dev/null +++ b/packages/fes-compiler/README.md @@ -0,0 +1,3 @@ +# fes + +一个好用的前端应用解决方案 \ No newline at end of file diff --git a/packages/fes-plugin-access/README.md b/packages/fes-plugin-access/README.md index 139597f9..14704fc6 100644 --- a/packages/fes-plugin-access/README.md +++ b/packages/fes-plugin-access/README.md @@ -1,2 +1,3 @@ +# fes - +一个好用的前端应用解决方案 \ No newline at end of file diff --git a/packages/fes-plugin-enums/README.md b/packages/fes-plugin-enums/README.md index 139597f9..14704fc6 100644 --- a/packages/fes-plugin-enums/README.md +++ b/packages/fes-plugin-enums/README.md @@ -1,2 +1,3 @@ +# fes - +一个好用的前端应用解决方案 \ No newline at end of file diff --git a/packages/fes-plugin-icon/README.md b/packages/fes-plugin-icon/README.md new file mode 100644 index 00000000..14704fc6 --- /dev/null +++ b/packages/fes-plugin-icon/README.md @@ -0,0 +1,3 @@ +# fes + +一个好用的前端应用解决方案 \ No newline at end of file diff --git a/packages/fes-plugin-jest/README.md b/packages/fes-plugin-jest/README.md index 139597f9..14704fc6 100644 --- a/packages/fes-plugin-jest/README.md +++ b/packages/fes-plugin-jest/README.md @@ -1,2 +1,3 @@ +# fes - +一个好用的前端应用解决方案 \ No newline at end of file diff --git a/packages/fes-plugin-model/README.md b/packages/fes-plugin-model/README.md new file mode 100644 index 00000000..14704fc6 --- /dev/null +++ b/packages/fes-plugin-model/README.md @@ -0,0 +1,3 @@ +# fes + +一个好用的前端应用解决方案 \ No newline at end of file diff --git a/packages/fes-plugin-vuex/README.md b/packages/fes-plugin-vuex/README.md index 139597f9..14704fc6 100644 --- a/packages/fes-plugin-vuex/README.md +++ b/packages/fes-plugin-vuex/README.md @@ -1,2 +1,3 @@ +# fes - +一个好用的前端应用解决方案 \ No newline at end of file diff --git a/packages/fes-preset-built-in/README.md b/packages/fes-preset-built-in/README.md index e38285b0..3a71337c 100644 --- a/packages/fes-preset-built-in/README.md +++ b/packages/fes-preset-built-in/README.md @@ -1,3 +1,7 @@ +# fes + +一个好用的前端应用解决方案 + # 内置插件 ## TODO diff --git a/packages/fes-runtime/README.md b/packages/fes-runtime/README.md new file mode 100644 index 00000000..14704fc6 --- /dev/null +++ b/packages/fes-runtime/README.md @@ -0,0 +1,3 @@ +# fes + +一个好用的前端应用解决方案 \ No newline at end of file diff --git a/packages/fes-utils/README.md b/packages/fes-utils/README.md new file mode 100644 index 00000000..14704fc6 --- /dev/null +++ b/packages/fes-utils/README.md @@ -0,0 +1,3 @@ +# fes + +一个好用的前端应用解决方案 \ No newline at end of file diff --git a/packages/fes/README.md b/packages/fes/README.md index 4440a103..14704fc6 100644 --- a/packages/fes/README.md +++ b/packages/fes/README.md @@ -1,31 +1,3 @@ -# fes-cli +# fes -`fes-cli`是命令行工具，解决创建工程、开发调试、打包发布。 - -## TODO - -* 以插件化的形式重写 fes-cli - -## 安装 - -npm install -g @webank/fes-cli - -## 使用 - -### 创建项目 - -fes init [project] - -### 开发调试 - -fes dev - -启动http服务，默认监听localhost:5000 - -### 编译打包 - -fes build - -## 文档 - -详细使用请查看[文档](https://webankfintech.github.io/fes.js/) +一个好用的前端应用解决方案 \ No newline at end of file From 2681773b57a6abf6d8f5c752b7da6dfc2987121b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Wed, 3 Feb 2021 10:30:37 +0800 Subject: [PATCH 18/31] chore(release): publish --- lerna.json | 2 +- packages/create-fes-app/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index a0f051c9..bb764400 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.7", "changelog": { "repo": "WeBankFinTech/fes.js", "cacheDir": ".changelog", diff --git a/packages/create-fes-app/package.json b/packages/create-fes-app/package.json index dd0dfb9c..bb8e9cbb 100644 --- a/packages/create-fes-app/package.json +++ b/packages/create-fes-app/package.json @@ -1,6 +1,6 @@ { "name": "@webank/create-fes-app", - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.7", "description": "create a app base on fes.js", "main": "lib/index.js", "files": [ From 4506033725d8d9ddfa556b85d32d841ece082db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Wed, 3 Feb 2021 10:56:15 +0800 Subject: [PATCH 19/31] chore(release): publish --- lerna.json | 2 +- packages/create-fes-app/package.json | 2 +- packages/fes-compiler/package.json | 2 +- packages/fes-plugin-access/package.json | 2 +- packages/fes-plugin-enums/package.json | 2 +- packages/fes-plugin-icon/package.json | 2 +- packages/fes-plugin-jest/package.json | 4 ++-- packages/fes-plugin-layout/package.json | 2 +- packages/fes-plugin-locale/package.json | 2 +- packages/fes-plugin-model/package.json | 2 +- packages/fes-plugin-request/package.json | 2 +- packages/fes-plugin-vuex/package.json | 2 +- packages/fes-preset-built-in/package.json | 4 ++-- packages/fes-runtime/package.json | 2 +- packages/fes/package.json | 8 ++++---- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lerna.json b/lerna.json index bb764400..71814b8a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.0-alpha.7", + "version": "2.0.0-alpha.8", "changelog": { "repo": "WeBankFinTech/fes.js", "cacheDir": ".changelog", diff --git a/packages/create-fes-app/package.json b/packages/create-fes-app/package.json index bb8e9cbb..d68b67cc 100644 --- a/packages/create-fes-app/package.json +++ b/packages/create-fes-app/package.json @@ -1,6 +1,6 @@ { "name": "@webank/create-fes-app", - "version": "2.0.0-alpha.7", + "version": "2.0.0-alpha.8", "description": "create a app base on fes.js", "main": "lib/index.js", "files": [ diff --git a/packages/fes-compiler/package.json b/packages/fes-compiler/package.json index 167f89be..27a02d34 100644 --- a/packages/fes-compiler/package.json +++ b/packages/fes-compiler/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-compiler", - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.8", "description": "@webank/fes-compiler", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-access/package.json b/packages/fes-plugin-access/package.json index eadedb22..1470ab11 100644 --- a/packages/fes-plugin-access/package.json +++ b/packages/fes-plugin-access/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-access", - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.8", "description": "@webank/fes-plugin-access", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-enums/package.json b/packages/fes-plugin-enums/package.json index 94266d1f..01f55fda 100644 --- a/packages/fes-plugin-enums/package.json +++ b/packages/fes-plugin-enums/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-enums", - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.8", "description": "@webank/fes-plugin-enums", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-icon/package.json b/packages/fes-plugin-icon/package.json index fddaebd7..063d892f 100644 --- a/packages/fes-plugin-icon/package.json +++ b/packages/fes-plugin-icon/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-icon", - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.8", "description": "@webank/fes-plugin-icon", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-jest/package.json b/packages/fes-plugin-jest/package.json index ac35eb6a..54d75c18 100644 --- a/packages/fes-plugin-jest/package.json +++ b/packages/fes-plugin-jest/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-jest", - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.8", "description": "@webank/fes-plugin-jest", "main": "lib/index.js", "files": [ @@ -32,7 +32,7 @@ "dependencies": { "@babel/core": "7.11.6", "@umijs/babel-preset-umi": "3.2.24", - "@webank/fes-compiler": "^2.0.0-alpha.6", + "@webank/fes-compiler": "^2.0.0-alpha.8", "babel-core": "^7.0.0-bridge.0", "babel-jest": "^26.6.3", "core-js": "3.6.5", diff --git a/packages/fes-plugin-layout/package.json b/packages/fes-plugin-layout/package.json index eced7374..75d3b32a 100644 --- a/packages/fes-plugin-layout/package.json +++ b/packages/fes-plugin-layout/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-layout", - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.8", "description": "@webank/fes-plugin-layout", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-locale/package.json b/packages/fes-plugin-locale/package.json index 4bcfaf1d..75f9a388 100644 --- a/packages/fes-plugin-locale/package.json +++ b/packages/fes-plugin-locale/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-locale", - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.8", "description": "@webank/fes-plugin-locale", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-model/package.json b/packages/fes-plugin-model/package.json index ccc9ba23..7a867297 100644 --- a/packages/fes-plugin-model/package.json +++ b/packages/fes-plugin-model/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-model", - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.8", "description": "@webank/fes-plugin-model", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-request/package.json b/packages/fes-plugin-request/package.json index 28fee689..55a5e263 100644 --- a/packages/fes-plugin-request/package.json +++ b/packages/fes-plugin-request/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-request", - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.8", "description": "@webank/fes-plugin-request", "main": "lib/index.js", "files": [ diff --git a/packages/fes-plugin-vuex/package.json b/packages/fes-plugin-vuex/package.json index d0068e01..c7a03d1a 100644 --- a/packages/fes-plugin-vuex/package.json +++ b/packages/fes-plugin-vuex/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-plugin-vuex", - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.8", "description": "@webank/fes-plugin-vuex", "main": "lib/index.js", "files": [ diff --git a/packages/fes-preset-built-in/package.json b/packages/fes-preset-built-in/package.json index bfecf48b..df5bdb24 100644 --- a/packages/fes-preset-built-in/package.json +++ b/packages/fes-preset-built-in/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-preset-built-in", - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.8", "description": "@webank/fes-preset-built-in", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -31,7 +31,7 @@ "@vue/babel-plugin-jsx": "^1.0.0-rc.5", "@vue/compiler-sfc": "^3.0.4", "@vue/preload-webpack-plugin": "1.1.2", - "@webank/fes-compiler": "^2.0.0-alpha.6", + "@webank/fes-compiler": "^2.0.0-alpha.8", "babel-plugin-import": "1.13.3", "cliui": "6.0.0", "envinfo": "^7.7.3", diff --git a/packages/fes-runtime/package.json b/packages/fes-runtime/package.json index 86881ec2..89cbe670 100644 --- a/packages/fes-runtime/package.json +++ b/packages/fes-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes-runtime", - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.8", "description": "@webank/fes-runtime", "main": "dist/index.js", "files": [ diff --git a/packages/fes/package.json b/packages/fes/package.json index f4847870..cd87ba5a 100644 --- a/packages/fes/package.json +++ b/packages/fes/package.json @@ -1,6 +1,6 @@ { "name": "@webank/fes", - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.8", "description": "一个好用的前端管理台快速开发框架", "preferGlobal": true, "scripts": { @@ -40,9 +40,9 @@ ], "dependencies": { "@umijs/utils": "3.3.3", - "@webank/fes-compiler": "^2.0.0-alpha.6", - "@webank/fes-preset-built-in": "^2.0.0-alpha.6", - "@webank/fes-runtime": "^2.0.0-alpha.6", + "@webank/fes-compiler": "^2.0.0-alpha.8", + "@webank/fes-preset-built-in": "^2.0.0-alpha.8", + "@webank/fes-runtime": "^2.0.0-alpha.8", "resolve-cwd": "^3.0.0" }, "engines": { From 0c74a62fa0da77f2c8928b69fb68bb2b7326bf4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Wed, 3 Feb 2021 17:30:18 +0800 Subject: [PATCH 20/31] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0plugin-webpack?= =?UTF-8?q?=EF=BC=8C=E6=89=93=E5=8D=B0webpack=E9=85=8D=E7=BD=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-compiler/package.json | 2 +- packages/fes-compiler/src/service/index.js | 4 +- packages/fes-preset-built-in/package.json | 4 +- packages/fes-preset-built-in/src/index.js | 3 +- .../src/plugins/commands/webpack/index.js | 43 +++++++++++ .../src/plugins/features/analyze.js | 2 +- packages/fes-template/.fes.js | 2 +- packages/fes-template/src/pages/index.vue | 2 + yarn.lock | 71 +++++++++++++++++-- 9 files changed, 122 insertions(+), 11 deletions(-) create mode 100644 packages/fes-preset-built-in/src/plugins/commands/webpack/index.js diff --git a/packages/fes-compiler/package.json b/packages/fes-compiler/package.json index 27a02d34..ba7b0b8d 100644 --- a/packages/fes-compiler/package.json +++ b/packages/fes-compiler/package.json @@ -27,7 +27,7 @@ "@babel/register": "^7.12.1", "@umijs/babel-preset-umi": "3.3.3", "@umijs/utils": "3.3.3", - "commander": "^6.2.1", + "commander": "^7.0.0", "dotenv": "8.2.0", "joi": "17.3.0", "readline": "^1.3.0", diff --git a/packages/fes-compiler/src/service/index.js b/packages/fes-compiler/src/service/index.js index 1d957cd1..ccc112d9 100644 --- a/packages/fes-compiler/src/service/index.js +++ b/packages/fes-compiler/src/service/index.js @@ -536,7 +536,9 @@ export default class Service extends EventEmitter { } if (commandOption.fn) { c.action(async () => { - await commandOption.fn({ rawArgv, args, program }); + await commandOption.fn({ + rawArgv, args, options: c.opts(), program + }); }); } }); diff --git a/packages/fes-preset-built-in/package.json b/packages/fes-preset-built-in/package.json index df5bdb24..4e9260c1 100644 --- a/packages/fes-preset-built-in/package.json +++ b/packages/fes-preset-built-in/package.json @@ -39,6 +39,8 @@ "html-webpack-plugin": "^3.2.0", "html-webpack-tags-plugin": "2.0.17", "vue-loader": "^16.1.2", - "webpack-bundle-analyzer": "4.3.0" + "webpack-bundle-analyzer": "4.3.0", + "cli-highlight": "^2.1.4", + "webpack-chain": "6.5.1" } } diff --git a/packages/fes-preset-built-in/src/index.js b/packages/fes-preset-built-in/src/index.js index bb2cda71..e4d3599c 100644 --- a/packages/fes-preset-built-in/src/index.js +++ b/packages/fes-preset-built-in/src/index.js @@ -55,7 +55,8 @@ export default function () { require.resolve('./plugins/commands/build'), require.resolve('./plugins/commands/dev'), require.resolve('./plugins/commands/help'), - require.resolve('./plugins/commands/info') + require.resolve('./plugins/commands/info'), + require.resolve('./plugins/commands/webpack') ] }; } diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpack/index.js b/packages/fes-preset-built-in/src/plugins/commands/webpack/index.js new file mode 100644 index 00000000..f6944d67 --- /dev/null +++ b/packages/fes-preset-built-in/src/plugins/commands/webpack/index.js @@ -0,0 +1,43 @@ + +import assert from 'assert'; +import { getBundleAndConfigs } from '../../../utils/buildDevUtils'; + +export default function (api) { + api.registerCommand({ + command: 'webpack', + description: 'inspect webpack configurations', + options: { + '--rule ': 'inspect a specific module rule', + '--plugin ': 'inspect a specific plugin', + '--rules': 'list all module rule names', + '--plugins': 'list all plugin names', + '--verbose': 'show full function definitions in output' + }, + async fn({ options }) { + const { toString } = require('webpack-chain'); + const { highlight } = require('cli-highlight'); + const { bundleConfigs } = await getBundleAndConfigs({ api }); + + let config = bundleConfigs.filter(bundleConfig => bundleConfig.entry?.fes)[0]; + assert(config, 'No valid config found with fes entry.'); + + if (options.rule) { + config = config.module.rules.find( + r => r.__ruleNames[0] === options.rule + ); + } else if (options.plugin) { + config = config.plugins.find( + p => p.__pluginName === options.plugin + ); + } else if (options.rules) { + config = config.module.rules.map(r => r.__ruleNames[0]); + } else if (options.plugins) { + config = config.plugins.map( + p => p.__pluginName || p.constructor.name + ); + } + + console.log(highlight(toString(config, { verbose: options.verbose }), { language: 'js' })); + } + }); +} diff --git a/packages/fes-preset-built-in/src/plugins/features/analyze.js b/packages/fes-preset-built-in/src/plugins/features/analyze.js index ea643eee..28ef0b23 100644 --- a/packages/fes-preset-built-in/src/plugins/features/analyze.js +++ b/packages/fes-preset-built-in/src/plugins/features/analyze.js @@ -36,7 +36,7 @@ export default (api) => { webpackConfig .plugin('bundle-analyzer') .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin, [ - api.config?.analyze || {} + api.config?.analyze || {} ]); } return webpackConfig; diff --git a/packages/fes-template/.fes.js b/packages/fes-template/.fes.js index db77aa6f..e9a7d3f3 100644 --- a/packages/fes-template/.fes.js +++ b/packages/fes-template/.fes.js @@ -4,7 +4,7 @@ export default { base: '/foo/', define: { - __DEV__: false + __DEV__: true }, publicPath: '/', access: { diff --git a/packages/fes-template/src/pages/index.vue b/packages/fes-template/src/pages/index.vue index 3a304634..1ba658b3 100644 --- a/packages/fes-template/src/pages/index.vue +++ b/packages/fes-template/src/pages/index.vue @@ -25,6 +25,8 @@ import { access, useAccess, useRouter, useI18n, locale, enums } from '@webank/fes'; +console.log(__DEV__); + export default { setup() { const fes = ref('fes upgrade to vue3'); diff --git a/yarn.lock b/yarn.lock index b2582f5d..c1d2842e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6521,6 +6521,18 @@ cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" +cli-highlight@^2.1.4: + version "2.1.10" + resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.10.tgz#26a087da9209dce4fcb8cf5427dc97cd96ac173a" + integrity sha512-CcPFD3JwdQ2oSzy+AMG6j3LRTkNjM82kzcSKzoVw6cLanDCJNlsLjeqVTOTfOfucnWv5F0rmBemVf1m9JiIasw== + dependencies: + chalk "^4.0.0" + highlight.js "^10.0.0" + mz "^2.4.0" + parse5 "^5.1.1" + parse5-htmlparser2-tree-adapter "^6.0.0" + yargs "^16.0.0" + cli-spinners@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.5.0.tgz#12763e47251bf951cb75c201dfa58ff1bcb2d047" @@ -6597,6 +6609,15 @@ cliui@^5.0.0: strip-ansi "^5.2.0" wrap-ansi "^5.1.0" +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + clone-buffer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" @@ -6773,11 +6794,16 @@ commander@^4.1.1: resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== -commander@^6.2.0, commander@^6.2.1: +commander@^6.2.0: version "6.2.1" resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== +commander@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2" + integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA== + commander@~2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" @@ -9427,7 +9453,7 @@ gensync@^1.0.0-beta.1: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== -get-caller-file@^2.0.1: +get-caller-file@^2.0.1, get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== @@ -9966,6 +9992,11 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== +highlight.js@^10.0.0: + version "10.5.0" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.5.0.tgz#3f09fede6a865757378f2d9ebdcbc15ba268f98f" + integrity sha512-xTmvd9HiIHR6L53TMC7TKolEj65zG1XU+Onr8oi86mYa+nLcIbxTTWkpW7CsEwv/vK7u1zb8alZIMLDqqN6KTw== + hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -12940,7 +12971,7 @@ mute-stream@0.0.8, mute-stream@~0.0.4: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -mz@^2.5.0: +mz@^2.4.0, mz@^2.5.0: version "2.7.0" resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== @@ -13839,7 +13870,14 @@ parse-url@^5.0.0: parse-path "^4.0.0" protocols "^1.4.0" -parse5@5.1.1: +parse5-htmlparser2-tree-adapter@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" + integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== + dependencies: + parse5 "^6.0.1" + +parse5@5.1.1, 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== @@ -13851,6 +13889,11 @@ parse5@^3.0.1: dependencies: "@types/node" "*" +parse5@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== + parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -18797,6 +18840,11 @@ y18n@^4.0.0: resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== +y18n@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" + integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== + yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" @@ -18833,7 +18881,7 @@ yargs-parser@18.1.3, yargs-parser@^18.1.2: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@20.x, yargs-parser@^20.2.3: +yargs-parser@20.x, yargs-parser@^20.2.2, yargs-parser@^20.2.3: version "20.2.4" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== @@ -18880,6 +18928,19 @@ yargs@^14.2.2: y18n "^4.0.0" yargs-parser "^15.0.1" +yargs@^16.0.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + yargs@~3.10.0: version "3.10.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" From 4c1831cf64fdcde7039a0dc1fe2fc0c51f17422c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Wed, 3 Feb 2021 18:59:24 +0800 Subject: [PATCH 21/31] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DhardSoureWebpack?= =?UTF-8?q?Plugin=E5=9C=A8webpack=E7=9A=84define=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=97=B6=E4=BE=9D=E7=84=B6=E4=BD=BF=E7=94=A8?= =?UTF-8?q?cache=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 默认使用node-object-hash对webpackConfig处理计算hash，插件配置解析为[Object, object]，所以define插件配置发生变化，产生的hash一样 --- .../src/plugins/features/hardSource.js | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/packages/fes-preset-built-in/src/plugins/features/hardSource.js b/packages/fes-preset-built-in/src/plugins/features/hardSource.js index 7622f399..59e1d132 100644 --- a/packages/fes-preset-built-in/src/plugins/features/hardSource.js +++ b/packages/fes-preset-built-in/src/plugins/features/hardSource.js @@ -1,8 +1,3 @@ -import { - winPath -} from '@umijs/utils'; -import HardSourceWebpackPlugin from 'hard-source-webpack-plugin'; - export default (api) => { api.describe({ key: 'hardSource', @@ -14,12 +9,31 @@ export default (api) => { }); api.chainWebpack((webpackConfig) => { + const HardSourceWebpackPlugin = require('hard-source-webpack-plugin'); + const { winPath } = require('@umijs/utils'); + const crypto = require('crypto'); + const path = require('path'); + const { toString } = require('webpack-chain'); const cwd = api.cwd; if (api.env === 'development') { webpackConfig .plugin('hardSource') .use(HardSourceWebpackPlugin, [{ cacheDirectory: winPath(`${cwd}/.cache/hard-source/[confighash]`), + configHash: (config) => { + const hardSourcePlugin = config.plugins.find( + ({ constructor }) => constructor.name === 'HardSourceWebpackPlugin' + ); + const cacheDir = hardSourcePlugin.getCachePath(); + const context = path.resolve(process.cwd(), config.context); + const clone = Object.assign({}, config, { + context: path.relative(cacheDir, context) + }); + return crypto + .createHash('sha256') + .update(toString(clone)) + .digest('hex'); + }, ...api.config.hardSource || {} }]); webpackConfig From 4dfe9e5647c385860b90e85d3991e2e8af57c56a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Thu, 4 Feb 2021 12:43:05 +0800 Subject: [PATCH 22/31] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96command?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-compiler/src/service/index.js | 23 ++++++++++++------- packages/fes-plugin-jest/src/index.js | 19 +++++++-------- .../src/plugins/commands/dev/index.js | 11 +++++---- .../src/plugins/commands/webpack/index.js | 23 +++++++++++++------ 4 files changed, 48 insertions(+), 28 deletions(-) diff --git a/packages/fes-compiler/src/service/index.js b/packages/fes-compiler/src/service/index.js index ccc112d9..6e8a0e95 100644 --- a/packages/fes-compiler/src/service/index.js +++ b/packages/fes-compiler/src/service/index.js @@ -4,7 +4,7 @@ import assert from 'assert'; import { AsyncSeriesWaterfallHook } from 'tapable'; import { existsSync } from 'fs'; import { BabelRegister, lodash, chalk } from '@umijs/utils'; -import { Command } from 'commander'; +import { Command, Option } from 'commander'; import { resolvePresets, pathToObj, resolvePlugins } from './utils/pluginUtils'; import loadDotEnv from './utils/loadDotEnv'; import isPromise from './utils/isPromise'; @@ -526,17 +526,24 @@ export default class Service extends EventEmitter { assert(this.stage >= ServiceStage.init, 'service is not initialized.'); Object.keys(this.commands).forEach((command) => { - const commandOption = this.commands[command]; + const commandOptionConfig = this.commands[command]; const program = this.program; - let c = program.command(command).description(commandOption.description); - if (commandOption.options) { - Object.keys(commandOption.options).forEach((option) => { - c = c.option(option, commandOption.options[option]); + let c = program.command(command).description(commandOptionConfig.description); + if (Array.isArray(commandOptionConfig.options)) { + commandOptionConfig.options.forEach((config) => { + const option = new Option(config.name, config.description); + if (config.default) { + option.default(config.default); + } + if (config.choices) { + option.choices(config.choices); + } + c = c.addOption(option); }); } - if (commandOption.fn) { + if (commandOptionConfig.fn) { c.action(async () => { - await commandOption.fn({ + await commandOptionConfig.fn({ rawArgv, args, options: c.opts(), program }); }); diff --git a/packages/fes-plugin-jest/src/index.js b/packages/fes-plugin-jest/src/index.js index 5e88cdb3..2081b5c5 100644 --- a/packages/fes-plugin-jest/src/index.js +++ b/packages/fes-plugin-jest/src/index.js @@ -9,20 +9,21 @@ import createDefaultConfig from './createDefaultConfig'; const logger = new Logger('fes:plugin-unit-jest'); function getCommandOptiton() { - const opt = {}; + const opts = []; Object.keys(CliOptions).forEach((key) => { const option = CliOptions[key]; - let otpKey = ''; - if (option.alias) { - otpKey = `-${option.alias} --${key}`; - } else { - otpKey = `--${key}`; - } + const opt = {}; if (key !== 'version') { - opt[otpKey] = option.description; + if (option.alias) { + opt.name = `-${option.alias} --${key}`; + } else { + opt.name = `--${key}`; + } + opt.description = option.description; + opts.push(opt); } }); - return opt; + return opts; } export default function (api) { diff --git a/packages/fes-preset-built-in/src/plugins/commands/dev/index.js b/packages/fes-preset-built-in/src/plugins/commands/dev/index.js index 7275508f..26aa0f7e 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/dev/index.js +++ b/packages/fes-preset-built-in/src/plugins/commands/dev/index.js @@ -30,10 +30,13 @@ export default (api) => { api.registerCommand({ command: 'dev', description: 'start a local http service for development', - options: { - '--port': 'http service port, like 8080', - '--https': 'whether to turn on the https service' - }, + options: [{ + name: '--port', + description: 'http service port, like 8080' + }, { + name: '--https', + description: 'whether to turn on the https service' + }], async fn({ args = {} }) { const defaultPort = process.env.PORT || args.port || api.config.devServer?.port; port = await portfinder.getPortPromise({ diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpack/index.js b/packages/fes-preset-built-in/src/plugins/commands/webpack/index.js index f6944d67..d0b3754f 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpack/index.js +++ b/packages/fes-preset-built-in/src/plugins/commands/webpack/index.js @@ -6,13 +6,22 @@ export default function (api) { api.registerCommand({ command: 'webpack', description: 'inspect webpack configurations', - options: { - '--rule ': 'inspect a specific module rule', - '--plugin ': 'inspect a specific plugin', - '--rules': 'list all module rule names', - '--plugins': 'list all plugin names', - '--verbose': 'show full function definitions in output' - }, + options: [{ + name: '--rule ', + description: 'inspect a specific module rule' + }, { + name: '--plugin ', + description: 'inspect a specific plugin' + }, { + name: '--rules', + description: 'list all module rule names' + }, { + name: '--plugins', + description: 'list all plugin names' + }, { + name: '--verbose', + description: 'show full function definitions in output' + }], async fn({ options }) { const { toString } = require('webpack-chain'); const { highlight } = require('cli-highlight'); From f576e406cc436d80921b973591b92902a16d08cd Mon Sep 17 00:00:00 2001 From: tianxuan Date: Thu, 4 Feb 2021 13:43:16 +0800 Subject: [PATCH 23/31] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9Emock=E6=8F=92?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-preset-built-in/package.json | 5 +- packages/fes-preset-built-in/src/index.js | 5 +- .../src/plugins/commands/mock/index.js | 174 ++++++++++++++++++ packages/fes-template/.fes.js | 9 + packages/fes-template/mock.js | 130 +++++++++++++ packages/fes-template/package.json | 1 + packages/fes-template/src/pages/index.vue | 23 ++- 7 files changed, 342 insertions(+), 5 deletions(-) create mode 100644 packages/fes-preset-built-in/src/plugins/commands/mock/index.js create mode 100644 packages/fes-template/mock.js diff --git a/packages/fes-preset-built-in/package.json b/packages/fes-preset-built-in/package.json index 4e9260c1..0cced841 100644 --- a/packages/fes-preset-built-in/package.json +++ b/packages/fes-preset-built-in/package.json @@ -41,6 +41,9 @@ "vue-loader": "^16.1.2", "webpack-bundle-analyzer": "4.3.0", "cli-highlight": "^2.1.4", - "webpack-chain": "6.5.1" + "webpack-chain": "6.5.1", + "body-parser": "^1.19.0", + "cookie-parser": "^1.4.5", + "mockjs": "^1.1.0" } } diff --git a/packages/fes-preset-built-in/src/index.js b/packages/fes-preset-built-in/src/index.js index e4d3599c..a9fd1dff 100644 --- a/packages/fes-preset-built-in/src/index.js +++ b/packages/fes-preset-built-in/src/index.js @@ -56,7 +56,10 @@ export default function () { require.resolve('./plugins/commands/dev'), require.resolve('./plugins/commands/help'), require.resolve('./plugins/commands/info'), - require.resolve('./plugins/commands/webpack') + require.resolve('./plugins/commands/webpack'), + + // mock + require.resolve('./plugins/commands/mock') ] }; } diff --git a/packages/fes-preset-built-in/src/plugins/commands/mock/index.js b/packages/fes-preset-built-in/src/plugins/commands/mock/index.js new file mode 100644 index 00000000..c76ab0af --- /dev/null +++ b/packages/fes-preset-built-in/src/plugins/commands/mock/index.js @@ -0,0 +1,174 @@ +import { existsSync, readFileSync } from 'fs'; +import { resolve } from 'path'; +import { chokidar, lodash } from '@umijs/utils'; +import bodyParser from 'body-parser'; +import cookieParser from 'cookie-parser'; +import Mock from 'mockjs'; + + +export default (api) => { + let mockFlag = false; // mock 开关flag + let mockPrefix = '/'; // mock 过滤前缀 + let mockFile = ''; // mock 文件 + let loadMock = ''; // mock 对象 + + api.describe({ + key: 'mock', + config: { + schema(joi) { + return joi.alternatives(joi.boolean(), joi.object()); + } + } + }); + + const createMock = () => { + // 判断是否为 Object，仅 {} + function isObject(value) { + return Object.prototype.toString.call(value) === '[object Object]'; + } + // 对 array、object 遍历处理 + function traversalHandler(val, callback) { + if (lodash.isArray(val)) { + val.forEach(callback); + } + if (isObject(val)) { + Object.keys(val).forEach((key) => { callback(val[key], key); }); + } + } + // 根据参数个数获取配置 + function getOption(arg) { + const len = arg.length; + // 默认配置 + const option = { + headers: { + 'Cache-Control': 'no-cache' + }, + statusCode: 200, + cookies: [], + timeout: 0 + }; + if (len === 0) return option; + if (len === 1) { + const newOption = arg[0]; + if (isObject(newOption)) { + traversalHandler(newOption, (value, key) => { + if (key === 'headers') { + traversalHandler(newOption.headers, (headervalue, headerkey) => { + option.headers[headerkey] = newOption.headers[headerkey]; + }); + } else { + option[key] = newOption[key]; + } + }); + } + } else { + option.url = arg[0]; + option.result = arg[1]; + } + return option; + } + // 把基于 cgiMockfile 的相对绝对转成绝对路径 + function parsePath(value) { + const PROJECT_DIR = process.env.PWD || process.cwd(); + return resolve(PROJECT_DIR, value); + } + + const requestList = []; + const cgiMock = (...arg) => { + const option = getOption(arg); + if (!option.url || !option.result) return; + requestList.push(option); + }; + cgiMock.file = function (file) { + return readFileSync(parsePath(file)); + }; + + // mock是否打开 + mockFlag = isObject(api.config.mock) ? true : api.config.mock; + if (!mockFlag) return; + // mock打开情况下，配置的过滤前缀 + mockPrefix = api.config.mock.prefix || mockPrefix; + // mock文件处理 + mockFile = parsePath('./mock.js'); + if (!existsSync(mockFile)) { + api.logger.info('mock.js File does not exist, please check'); return; + } + // 清除require的缓存，保证 mock 文件修改后拿到最新的 mock.js + if (require.cache[mockFile]) { + delete require.cache[mockFile]; + } + const projectMock = require(mockFile); + if (!lodash.isFunction(projectMock)) { + api.logger.info('mock.js should export Function'); return; + } + // mock对象与 mock.js 结合 + projectMock(cgiMock, Mock); + + return (req, res, next) => { + // 如果请求不是以 cgiMock.prefix 开头，直接 next `${mockPrefix}/` + if (!req.path.startsWith(`${mockPrefix}/`)) { + return next(); + } + + // 请求以 cgiMock.prefix 开头，匹配处理 + const matchRequet = requestList.filter(item => req.path.search(item.url) !== -1)[0]; + if (!matchRequet) { + return next(); + } + + // set header + res.set(matchRequet.headers); + // set Content-Type + matchRequet.type && res.type(matchRequet.type); + // set status code + res.status(matchRequet.statusCode); + // set cookie + traversalHandler(matchRequet.cookies, (item) => { + const name = item.name; + const value = item.value; + delete item.name; + delete item.value; + res.cookie(name, value, item); + }); + + // do result + if (lodash.isFunction(matchRequet.result)) { + matchRequet.result(req, res); + } else if ( + lodash.isArray(matchRequet.result) || isObject(matchRequet.result) + ) { + !matchRequet.type && res.type('json'); + res.json(matchRequet.result); + } else { + !matchRequet.type && res.type('text'); + res.send(matchRequet.result.toString()); + } + }; + }; + + api.onStart(() => { + loadMock = createMock(); + if (!mockFlag) return; + + chokidar.watch(mockFile, { + ignoreInitial: true + }).on('change', () => { + api.logger.info('mock.js changed，reload'); + loadMock = createMock(); + }); + }); + api.addBeforeMiddlewares(() => { + if (!mockFlag) return []; + return [ + bodyParser.json(), + bodyParser.urlencoded({ + extended: false + }), + cookieParser() + ]; + }); + api.addBeforeMiddlewares(() => (req, res, next) => { + if (!mockFlag) return next(); + loadMock(req, res, next); + }); +}; diff --git a/packages/fes-template/.fes.js b/packages/fes-template/.fes.js index e9a7d3f3..c1e2d4e3 100644 --- a/packages/fes-template/.fes.js +++ b/packages/fes-template/.fes.js @@ -12,6 +12,15 @@ export default { admin: ["/", "/onepiece"] } }, + mock: { + prefix: '/v2' + }, + proxy: { + '/v2': { + 'target': 'https://api.douban.com/', + 'changeOrigin': true, + }, + }, layout: { title: "Fes.js", footer: 'Created by MumbelFe', diff --git a/packages/fes-template/mock.js b/packages/fes-template/mock.js new file mode 100644 index 00000000..b48cd9dc --- /dev/null +++ b/packages/fes-template/mock.js @@ -0,0 +1,130 @@ +module.exports = (cgiMock, Mock) => { + const { Random } = Mock; + + // 测试 proxy 与 mock 用例集合 + cgiMock('/movie/in_theaters_mock', (req, res) => { + res.send(JSON.stringify({ + code: '0', + msg: '', + result: { + text: 'movie: movie/in_theaters_mock ~~~~~' + } + })); + }); + cgiMock('/movie/test_mock', (req, res) => { + res.send(JSON.stringify({ + code: '0', + msg: '', + result: { + text: 'mock: movie/test_mock' + } + })); + }); + + // 测试用例: mock.js change，重现请求，需要能拉最新的数据 + cgiMock('/watchtest', (req, res) => { + res.send(JSON.stringify({ + code: '0', + msg: '', + result: { + text: '通过 register 测试 mock watch: 初始状态' + } + })); + }); + + // 返回一个数字 + // cgiMock('/number', 666); + cgiMock('/number', 999); + + // 返回一个json + cgiMock({ + url: '/json', + result: { + code: '400101', msg: "不合法的请求:Missing cookie 'wb_app_id' for method parameter of type String", transactionTime: '20170309171146', success: false + } + }); + + // 利用 mock.js 产生随机文本 + cgiMock('/text', Random.cparagraph()); + + // 返回一个字符串 利用 mock.js 产生随机字符 + cgiMock('/random', Mock.mock({ + 'string|1-10': '★' + })); + + // 正则匹配url, 返回一个字符串 + cgiMock(/\/abc|\/xyz/, 'regexp test!'); + + // option.result 参数如果是一个函数, 可以实现自定义返回内容, 接收的参数是是经过 express 封装的 req 和 res 对象. + cgiMock(/\/function$/, (req, res) => { + res.send('function test'); + }); + + // 返回文本 readFileSync + cgiMock('/file', cgiMock.file('./package.json')); + + // 更复杂的规则配置 + cgiMock({ + url: /\/who/, + method: 'GET', + result(req, res) { + if (req.query.name === 'kwan') { + res.json({ kwan: '孤独患者' }); + } else { + res.send('Nooooooooooo'); + } + }, + headers: { + 'Content-Type': 'text/plain', + 'Content-Length': '123', + ETag: '12345' + }, + cookies: [ + { + name: 'myname', value: 'kwan', maxAge: 900000, httpOnly: true + } + ] + }); + + // 携带参数的请求 + cgiMock('/v2/audit/list', (req, res) => { + const { + currentPage, pageSize, isAudited + } = req.body; + res.send({ + code: '0', + msg: '', + data: { + currentPage, + pageSize, + totalPage: 2, + totalCount: 12, + pageData: Array.from({ length: pageSize }, () => ({ + title: Random.title(), + authorName: Random.cname(), + authorId: Random.name(), + createTime: Date.now(), + updateTime: Date.now(), + readCount: Random.integer(60, 1000), + favoriteCount: Random.integer(1, 50), + postId: '12323', + serviceTag: '业务类型', + productTag: '产品类型', + requestTag: '需求类型', + handleTag: '已采纳', + postType: 'voice', + postStatus: isAudited ? 'pass' : 'auditing', + auditStatus: 'audit1' + })) + } + }); + }); + + // multipart/form-data 类型 + cgiMock('/v2/upload', (req, res) => { + res.send({ + code: '0', + msg: '文件上传成功' + }); + }); +}; diff --git a/packages/fes-template/package.json b/packages/fes-template/package.json index d5e5c1de..1cc9e9bf 100644 --- a/packages/fes-template/package.json +++ b/packages/fes-template/package.json @@ -54,6 +54,7 @@ "@webank/fes-plugin-enums": "^2.0.0-alpha.0", "@webank/fes-plugin-jest": "^2.0.0-alpha.0", "@webank/fes-plugin-vuex": "^2.0.0-alpha.0", + "@webank/fes-plugin-request": "2.0.0-alpha.1", "ant-design-vue": "2.0.0-rc.3", "vue": "3.0.5", "vuex": "^4.0.0-rc.2" diff --git a/packages/fes-template/src/pages/index.vue b/packages/fes-template/src/pages/index.vue index 1ba658b3..c7e30af0 100644 --- a/packages/fes-template/src/pages/index.vue +++ b/packages/fes-template/src/pages/index.vue @@ -22,11 +22,9 @@ import { ref, onMounted, computed } from 'vue'; import { useStore } from 'vuex'; import { - access, useAccess, useRouter, useI18n, locale, enums + access, useAccess, useRouter, useI18n, locale, enums, request } from '@webank/fes'; -console.log(__DEV__); - export default { setup() { const fes = ref('fes upgrade to vue3'); @@ -81,6 +79,25 @@ export default { accessId.value = '11'; }, 4000); // router.push('/onepiece'); + + console.log('测试 mock!!'); + request('/v2/file').then((data) => { + console.log(data); + }).catch((err) => { + console.log(err); + }); + request('/v2/movie/in_theaters_mock').then((data) => { + console.log(data); + }).catch((err) => { + console.log(err); + }); + + console.log('测试 proxy!!'); + request('/v2/movie/in_theaters_proxy').then((resp) => { + console.log(resp); + }).catch((err) => { + console.log(err); + }); }); return { accessId, From 32e6278b7436ce3b235cf6d68178f08ba80a8f44 Mon Sep 17 00:00:00 2001 From: aringlai Date: Thu, 4 Feb 2021 21:36:51 +0800 Subject: [PATCH 24/31] =?UTF-8?q?refactor:=20vuex=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E9=87=8D=E6=9E=84=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-plugin-vuex/package.json | 3 + packages/fes-plugin-vuex/src/helper.js | 160 ++++++++++++++++++ packages/fes-plugin-vuex/src/index.js | 79 ++++----- packages/fes-plugin-vuex/src/runtime/core.tpl | 26 +++ .../fes-plugin-vuex/src/runtime/runtime.js | 6 + .../fes-plugin-vuex/src/runtime/runtime.tpl | 10 -- packages/fes-template/.fes.js | 7 +- packages/fes-template/src/pages/index.vue | 10 +- packages/fes-template/src/pages/store.vue | 50 ++++++ packages/fes-template/src/stores/foo/bar.js | 23 +++ packages/fes-template/src/stores/user.js | 29 ++++ 11 files changed, 334 insertions(+), 69 deletions(-) create mode 100644 packages/fes-plugin-vuex/src/helper.js create mode 100644 packages/fes-plugin-vuex/src/runtime/core.tpl create mode 100644 packages/fes-plugin-vuex/src/runtime/runtime.js delete mode 100644 packages/fes-plugin-vuex/src/runtime/runtime.tpl create mode 100644 packages/fes-template/src/pages/store.vue create mode 100644 packages/fes-template/src/stores/foo/bar.js diff --git a/packages/fes-plugin-vuex/package.json b/packages/fes-plugin-vuex/package.json index 5074d0a7..bab1b6f0 100644 --- a/packages/fes-plugin-vuex/package.json +++ b/packages/fes-plugin-vuex/package.json @@ -26,6 +26,9 @@ "publishConfig": { "access": "public" }, + "dependencies": { + "@umijs/utils": "3.3.3" + }, "peerDependencies": { "@webank/fes": "^2.0.0-alpha.0", "vue": "3.0.5", diff --git a/packages/fes-plugin-vuex/src/helper.js b/packages/fes-plugin-vuex/src/helper.js new file mode 100644 index 00000000..9cec46dd --- /dev/null +++ b/packages/fes-plugin-vuex/src/helper.js @@ -0,0 +1,160 @@ +import { parser } from '@umijs/utils'; +import { readdirSync, readFileSync, statSync } from 'fs'; +import { join } from 'path'; + +/** + * 获取文件夹所有JS文件路径 + * @param {string} dir + */ +function getDirFilePaths(dir) { + const dirs = readdirSync(dir); + let pathList = []; + for (const name of dirs) { + const path = join(dir, name); + const info = statSync(path); + if (info.isDirectory()) { + pathList = pathList.concat(getDirFilePaths(path)); + } else if (path.endsWith('.js')) { + pathList.push(path); + } + } + return pathList; +} + +/** + * 路径转驼峰 + * @param {*} path + */ +function pathToHump(path, root) { + return path.replace(root, '') + .replace('.js', '') + .replace(/(\/|\.|-|_)\S/g, text => text[1].toUpperCase()) + .replace(/\S/, text => text.toLowerCase()); +} + +/** + * 获取vuex模块的mutations、actions、getters类型 + * @param {*} ast + * @param {*} name + */ +function getModelTypes(ast, name, namespace = '') { + const types = { + mutations: {}, + actions: {}, + getters: {} + }; + let namespaced = false; + if (ast.type !== 'ObjectExpression') return types; + ast.properties.forEach((node) => { + if (node.key.name === 'namespaced' && node.value.value) { + namespaced = true; + return; + } + if (Object.keys(types).includes(node.key.name)) { + let type = types[node.key.name]; + if (namespaced) { + type = types[node.key.name][name]; + if (!type) { + // eslint-disable-next-line no-multi-assign + type = types[node.key.name][name] = {}; + } + } + node.value.properties.forEach((prop) => { + const key = prop.key && prop.key.name; + if (key) { + type[key] = `${namespace}${namespaced ? `${name}/` : ''}${key}`; + } + }); + return; + } + if (node.key.name === 'modules') { + node.value.properties.forEach((prop) => { + const subTypes = getModelTypes(prop.value, prop.key.name, `${namespace}${namespaced ? `${name}/` : ''}`); + Object.keys(types).forEach((key) => { + if (namespaced) { + types[key][name] = { + ...subTypes[key], + ...types[key][name] + }; + } else { + types[key] = { + ...subTypes[key], + ...types[key] + }; + } + }); + }); + } + }); + return types; +} + +/** + * 解析模块 + * @param {*} paths + * @param {*} root + */ +function parseModel(paths = [], root) { + const modules = []; + const importModules = []; + let MUTATION_TYPES = {}; + let ACTION_TYPES = {}; + let GETTER_TYPES = {}; + paths.forEach((path) => { + const moduleName = pathToHump(path, root); + importModules.push(`import ${moduleName} from '${path}'`); + modules.push(moduleName); + const content = readFileSync(path).toString('utf-8'); + let ast = parser.parse(content, { + sourceType: 'module', + plugins: ['jsx', 'typescript'] + }); + ast = ast.program.body.filter(body => body.type === 'ExportDefaultDeclaration')[0]; + if (ast) { + const { mutations, actions, getters } = getModelTypes(ast.declaration, moduleName); + MUTATION_TYPES = { + ...mutations, + ...MUTATION_TYPES + }; + ACTION_TYPES = { + ...actions, + ...ACTION_TYPES + }; + GETTER_TYPES = { + ...getters, + ...GETTER_TYPES + }; + } + }); + return { + modules, importModules, MUTATION_TYPES, ACTION_TYPES, GETTER_TYPES + }; +} + +function parsePlugin(paths = [], root) { + const plugins = []; + const importPlugins = []; + paths.forEach((path) => { + const moduleName = pathToHump(path, root); + importPlugins.push(`import ${moduleName} from '${path}'`); + plugins.push(moduleName); + }); + return { plugins, importPlugins }; +} + +export function parseStore(root) { + const paths = getDirFilePaths(root); + const modelPaths = []; + const pluginPaths = []; + paths.forEach((path) => { + if (path.indexOf('plugin') > -1) { + pluginPaths.push(path); + } else { + modelPaths.push(path); + } + }); + return { + ...parsePlugin(pluginPaths, root), + ...parseModel(modelPaths, root) + }; +} diff --git a/packages/fes-plugin-vuex/src/index.js b/packages/fes-plugin-vuex/src/index.js index 22705455..7f92ffd6 100644 --- a/packages/fes-plugin-vuex/src/index.js +++ b/packages/fes-plugin-vuex/src/index.js @@ -1,5 +1,6 @@ -import { readdirSync, readFileSync, statSync } from 'fs'; +import { readFileSync } from 'fs'; import { join } from 'path'; +import { parseStore } from './helper'; const namespace = 'plugin-vuex'; @@ -9,66 +10,36 @@ export default (api) => { utils: { Mustache } } = api; - /** - * 获取文件夹所有JS文件路径 - * @param {string} dir - */ - function getDirFilePaths(dir) { - const dirs = readdirSync(dir); - let pathList = []; - for (const name of dirs) { - const path = join(dir, name); - const info = statSync(path); - if (info.isDirectory()) { - pathList = pathList.concat(getDirFilePaths(path)); - } else if (path.endsWith('.js')) { - pathList.push(path); - } + api.describe({ + key: 'vuex', + config: { + schema(joi) { + return joi.object(); + }, + onChange: api.ConfigChangeType.regenerateTmpFiles } - return pathList; - } - - /** - * 解析vuex模块及插件文件 - * @param {Array} pathList 文件路径 - * @param {string} root - */ - function parseStore(pathList, root) { - const store = { - modules: [], - plugins: [], - importModules: [], - importPlugins: [] - }; - for (const path of pathList) { - const moduleName = path.replace(root, '').replace('.js', '').replace(/(\/|\.|-|_)\S/g, text => text[1].toUpperCase()); - if (path.indexOf('plugin') > -1) { - store.importPlugins.push(`import ${moduleName} from '${path}'`); - store.plugins.push(moduleName); - } else { - store.importModules.push(`import ${moduleName} from '${path}'`); - store.modules.push(`${moduleName}`); - } - } - return store; - } + }); + const absCoreFilePath = join(namespace, 'core.js'); const absRuntimeFilePath = join(namespace, 'runtime.js'); api.onGenerateFiles(() => { - const root = join(paths.absSrcPath, 'stores'); - const storePaths = getDirFilePaths(root); - const store = parseStore(storePaths, join(root, '/')); - + const root = join(paths.absSrcPath, api.config.singular ? 'store' : 'stores'); + const store = parseStore(root); + const vuexConfig = api.config.vuex || {}; // 文件写出 api.writeTmpFile({ - path: absRuntimeFilePath, + path: absCoreFilePath, content: Mustache.render( - readFileSync(join(__dirname, 'runtime/runtime.tpl'), 'utf-8'), + readFileSync(join(__dirname, 'runtime/core.tpl'), 'utf-8'), { IMPORT_MODULES: store.importModules.join('\n'), IMPORT_PLUGINS: store.importPlugins.join('\n'), MODULES: `{ ${store.modules.join(', ')} }`, - PLUGINS: `[${store.plugins.join(', ')}]` + PLUGINS: `[${store.plugins.join(', ')}]`, + MUTATION_TYPES: JSON.stringify(store.MUTATION_TYPES), + ACTION_TYPES: JSON.stringify(store.ACTION_TYPES), + GETTER_TYPES: JSON.stringify(store.GETTER_TYPES), + VUEX_CONFIG: JSON.stringify(vuexConfig) } ) }); @@ -79,5 +50,13 @@ export default (api) => { ignore: ['.tpl'] }); }); + + api.addPluginExports(() => [ + { + specifiers: ['MUTATION_TYPES', 'ACTION_TYPES', 'GETTER_TYPES'], + source: absCoreFilePath + } + ]); + api.addRuntimePlugin(() => `@@/${absRuntimeFilePath}`); }; diff --git a/packages/fes-plugin-vuex/src/runtime/core.tpl b/packages/fes-plugin-vuex/src/runtime/core.tpl new file mode 100644 index 00000000..7366fc01 --- /dev/null +++ b/packages/fes-plugin-vuex/src/runtime/core.tpl @@ -0,0 +1,26 @@ +import { createStore } from 'vuex'; +{{{IMPORT_MODULES}}}; +{{{IMPORT_PLUGINS}}}; + +const modules = {{{MODULES}}}; +const MUTATION_TYPES = {{{MUTATION_TYPES}}}; +const ACTION_TYPES = {{{ACTION_TYPES}}}; +const GETTER_TYPES = {{{GETTER_TYPES}}}; +const conifg = {{{VUEX_CONFIG}}}; + + +const install = function (app) { + app.use(createStore({ + modules: modules, + plugins: {{{PLUGINS}}}, + strict: conifg.strict, + devtools: conifg.devtools + })); +} + +export { + install, + MUTATION_TYPES, + ACTION_TYPES, + GETTER_TYPES +}; diff --git a/packages/fes-plugin-vuex/src/runtime/runtime.js b/packages/fes-plugin-vuex/src/runtime/runtime.js new file mode 100644 index 00000000..d775ceb9 --- /dev/null +++ b/packages/fes-plugin-vuex/src/runtime/runtime.js @@ -0,0 +1,6 @@ +// eslint-disable-next-line import/extensions +import { install } from './core'; + +export function onAppCreated({ app }) { + install(app); +} diff --git a/packages/fes-plugin-vuex/src/runtime/runtime.tpl b/packages/fes-plugin-vuex/src/runtime/runtime.tpl deleted file mode 100644 index bf0aec46..00000000 --- a/packages/fes-plugin-vuex/src/runtime/runtime.tpl +++ /dev/null @@ -1,10 +0,0 @@ -import { createStore } from 'vuex' -{{{IMPORT_MODULES}}} -{{{IMPORT_PLUGINS}}} - -export function onAppCreated({ app }) { - app.use(createStore({ - modules: {{{MODULES}}}, - plugins: {{{PLUGINS}}} - })) -} \ No newline at end of file diff --git a/packages/fes-template/.fes.js b/packages/fes-template/.fes.js index db77aa6f..5c5f5dee 100644 --- a/packages/fes-template/.fes.js +++ b/packages/fes-template/.fes.js @@ -9,7 +9,7 @@ export default { publicPath: '/', access: { roles: { - admin: ["/", "/onepiece"] + admin: ["/", "/onepiece", '/store'] } }, layout: { @@ -20,6 +20,8 @@ export default { name: 'index' }, { name: 'onepiece' + }, { + name: 'store' }] }, locale: { @@ -30,5 +32,8 @@ export default { }, enums: { status: [['0', '无效的'], ['1', '有效的']] + }, + vuex: { + strict: true } }; diff --git a/packages/fes-template/src/pages/index.vue b/packages/fes-template/src/pages/index.vue index 3a304634..bf40156a 100644 --- a/packages/fes-template/src/pages/index.vue +++ b/packages/fes-template/src/pages/index.vue @@ -9,7 +9,6 @@
{{item.value}}：{{item.key}}
{{item.name}}：{{item.disabled}}
{{enumsGet('roles', '2', { dir: 'eName' })}}
-

Vuex

@@ -19,8 +18,7 @@ } + + diff --git a/packages/fes-template/src/stores/foo/bar.js b/packages/fes-template/src/stores/foo/bar.js new file mode 100644 index 00000000..78070ba3 --- /dev/null +++ b/packages/fes-template/src/stores/foo/bar.js @@ -0,0 +1,23 @@ +export default { + namespaced: true, + state: () => ({ + count: 0 + }), + mutations: { + increment(state) { + state.count++; + } + }, + getters: { + doubleCount(state) { + return state.count * 2; + } + }, + actions: { + asyncIncrement({ commit }) { + setTimeout(() => { + commit('increment'); + }, 2000); + } + } +}; diff --git a/packages/fes-template/src/stores/user.js b/packages/fes-template/src/stores/user.js index e6ffcceb..337bf8f8 100644 --- a/packages/fes-template/src/stores/user.js +++ b/packages/fes-template/src/stores/user.js @@ -20,6 +20,35 @@ export default { setTimeout(() => { commit('increment'); }, 2000); + }, + login() { + return new Promise((reslove) => { + setTimeout(() => { + console.log('login'); + reslove('OK'); + }, 1000); + }); + } + }, + modules: { + address: { + state: () => ({ + province: '广东省', + city: '深圳市', + zone: '南山区' + }), + getters: { + address(state) { + return state.province + state.city + state.zone; + } + } + }, + posts: { + namespaced: true, + state: () => ({}), + mutations: { + doSomething() {} + } } } }; From d5bfc61b01d28cd0da50198299fafa7eb3393ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Fri, 5 Feb 2021 11:43:24 +0800 Subject: [PATCH 25/31] =?UTF-8?q?feat:=20=20=E4=BC=98=E5=8C=96getConfigFil?= =?UTF-8?q?e=E5=92=8ChardSourePlugin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. getConfigFile函数直接拿到所有配置文件，包含env和local 2. hardSourcePlugin会监听configFile的变化，更新缓存 --- packages/fes-compiler/src/config/index.js | 75 ++++++++++--------- packages/fes-compiler/src/service/index.js | 1 + .../src/plugins/features/hardSource.js | 30 +++----- packages/fes-template/.fes.js | 2 +- packages/fes-template/.fes.local.js | 5 ++ 5 files changed, 56 insertions(+), 57 deletions(-) create mode 100644 packages/fes-template/.fes.local.js diff --git a/packages/fes-compiler/src/config/index.js b/packages/fes-compiler/src/config/index.js index 7ce22819..ea8d6a60 100644 --- a/packages/fes-compiler/src/config/index.js +++ b/packages/fes-compiler/src/config/index.js @@ -130,41 +130,9 @@ export default class Config { getUserConfig() { const configFile = this.getConfigFile(); this.configFile = configFile; - // 潜在问题： - // .local 和 .env 的配置必须有 configFile 才有效 - if (configFile) { - let envConfigFile; - if (process.env.FES_ENV) { - const envConfigFileName = this.addAffix( - configFile, - process.env.FES_ENV - ); - const fileNameWithoutExt = envConfigFileName.replace( - extname(envConfigFileName), - '' - ); - envConfigFile = getFile({ - base: this.cwd, - fileNameWithoutExt, - type: 'javascript' - }).filename; - if (!envConfigFile) { - throw new Error( - `get user config failed, ${envConfigFile} does not exist, but process.env.FES_ENV is set to ${process.env.FES_ENV}.` - ); - } - } - const files = [ - configFile, - envConfigFile, - this.localConfig && this.addAffix(configFile, 'local') - ] - .filter(f => !!f) - .map(f => join(this.cwd, f)) - .filter(f => existsSync(f)); - + if (configFile.length > 0) { // clear require cache and set babel register - const requireDeps = files.reduce((memo, file) => { + const requireDeps = configFile.reduce((memo, file) => { memo = memo.concat(parseRequireDeps(file)); return memo; }, []); @@ -175,7 +143,7 @@ export default class Config { }); // require config and merge - return this.mergeConfig(...this.requireConfigs(files)); + return this.mergeConfig(...this.requireConfigs(configFile)); } return {}; } @@ -201,8 +169,41 @@ export default class Config { getConfigFile() { // TODO: support custom config file - const configFile = CONFIG_FILES.find(f => existsSync(join(this.cwd, f))); - return configFile ? winPath(configFile) : null; + let configFile = CONFIG_FILES.find(f => existsSync(join(this.cwd, f))); + if (!configFile) return []; + configFile = winPath(configFile); + let envConfigFile; + // 潜在问题： + // .local 和 .env 的配置必须有 configFile 才有效 + if (process.env.FES_ENV) { + const envConfigFileName = this.addAffix( + configFile, + process.env.FES_ENV + ); + const fileNameWithoutExt = envConfigFileName.replace( + extname(envConfigFileName), + '' + ); + envConfigFile = getFile({ + base: this.cwd, + fileNameWithoutExt, + type: 'javascript' + }).filename; + if (!envConfigFile) { + throw new Error( + `get user config failed, ${envConfigFile} does not exist, but process.env.FES_ENV is set to ${process.env.FES_ENV}.` + ); + } + } + const files = [ + configFile, + envConfigFile, + this.localConfig && this.addAffix(configFile, 'local') + ] + .filter(f => !!f) + .map(f => join(this.cwd, f)) + .filter(f => existsSync(f)); + return files; } getWatchFilesAndDirectories() { diff --git a/packages/fes-compiler/src/service/index.js b/packages/fes-compiler/src/service/index.js index 6e8a0e95..91277b34 100644 --- a/packages/fes-compiler/src/service/index.js +++ b/packages/fes-compiler/src/service/index.js @@ -265,6 +265,7 @@ export default class Service extends EventEmitter { 'paths', 'cwd', 'pkg', + 'configInstance', 'userConfig', 'config', 'env', diff --git a/packages/fes-preset-built-in/src/plugins/features/hardSource.js b/packages/fes-preset-built-in/src/plugins/features/hardSource.js index 59e1d132..465eb318 100644 --- a/packages/fes-preset-built-in/src/plugins/features/hardSource.js +++ b/packages/fes-preset-built-in/src/plugins/features/hardSource.js @@ -9,30 +9,22 @@ export default (api) => { }); api.chainWebpack((webpackConfig) => { - const HardSourceWebpackPlugin = require('hard-source-webpack-plugin'); - const { winPath } = require('@umijs/utils'); - const crypto = require('crypto'); - const path = require('path'); - const { toString } = require('webpack-chain'); - const cwd = api.cwd; if (api.env === 'development') { + const HardSourceWebpackPlugin = require('hard-source-webpack-plugin'); + const { winPath } = require('@umijs/utils'); + const path = require('path'); + const cwd = api.cwd; + const configFiles = (api.configInstance.configFile || []).map(item => path.relative(cwd, item)); + webpackConfig .plugin('hardSource') .use(HardSourceWebpackPlugin, [{ cacheDirectory: winPath(`${cwd}/.cache/hard-source/[confighash]`), - configHash: (config) => { - const hardSourcePlugin = config.plugins.find( - ({ constructor }) => constructor.name === 'HardSourceWebpackPlugin' - ); - const cacheDir = hardSourcePlugin.getCachePath(); - const context = path.resolve(process.cwd(), config.context); - const clone = Object.assign({}, config, { - context: path.relative(cacheDir, context) - }); - return crypto - .createHash('sha256') - .update(toString(clone)) - .digest('hex'); + environmentHash: { + root: cwd, + files: ['package-lock.json', 'yarn.lock'].concat( + Array.isArray(configFiles) ? configFiles : [configFiles] + ) }, ...api.config.hardSource || {} }]); diff --git a/packages/fes-template/.fes.js b/packages/fes-template/.fes.js index e9a7d3f3..db77aa6f 100644 --- a/packages/fes-template/.fes.js +++ b/packages/fes-template/.fes.js @@ -4,7 +4,7 @@ export default { base: '/foo/', define: { - __DEV__: true + __DEV__: false }, publicPath: '/', access: { diff --git a/packages/fes-template/.fes.local.js b/packages/fes-template/.fes.local.js new file mode 100644 index 00000000..62fab3c1 --- /dev/null +++ b/packages/fes-template/.fes.local.js @@ -0,0 +1,5 @@ +export default { + // define: { + // __DEV__: true + // }, +} \ No newline at end of file From c29f705bd876e45badf8c45465a9fb3365d5844a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Fri, 5 Feb 2021 14:12:05 +0800 Subject: [PATCH 26/31] =?UTF-8?q?fix:=20hardSourcePlugin=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-preset-built-in/src/plugins/features/hardSource.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fes-preset-built-in/src/plugins/features/hardSource.js b/packages/fes-preset-built-in/src/plugins/features/hardSource.js index 465eb318..520a2332 100644 --- a/packages/fes-preset-built-in/src/plugins/features/hardSource.js +++ b/packages/fes-preset-built-in/src/plugins/features/hardSource.js @@ -23,7 +23,7 @@ export default (api) => { environmentHash: { root: cwd, files: ['package-lock.json', 'yarn.lock'].concat( - Array.isArray(configFiles) ? configFiles : [configFiles] + Array.isArray(configFiles) ? configFiles : [] ) }, ...api.config.hardSource || {} From 906dc665d72641f829688a857f6b91a7f763b685 Mon Sep 17 00:00:00 2001 From: tianxuan Date: Fri, 5 Feb 2021 15:03:13 +0800 Subject: [PATCH 27/31] =?UTF-8?q?fix:=20mock=E6=8F=92=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9pr=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/plugins/commands/mock/index.js | 131 +++++++++--------- packages/fes-template/mock.js | 2 +- 2 files changed, 67 insertions(+), 66 deletions(-) diff --git a/packages/fes-preset-built-in/src/plugins/commands/mock/index.js b/packages/fes-preset-built-in/src/plugins/commands/mock/index.js index c76ab0af..753931c2 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/mock/index.js +++ b/packages/fes-preset-built-in/src/plugins/commands/mock/index.js @@ -5,7 +5,6 @@ import bodyParser from 'body-parser'; import cookieParser from 'cookie-parser'; import Mock from 'mockjs'; - export default (api) => { let mockFlag = false; // mock 开关flag let mockPrefix = '/'; // mock 过滤前缀 @@ -21,58 +20,56 @@ export default (api) => { } }); - const createMock = () => { - // 判断是否为 Object，仅 {} - function isObject(value) { - return Object.prototype.toString.call(value) === '[object Object]'; + // 对 array、object 遍历处理 + function traversalHandler(val, callback) { + if (lodash.isArray(val)) { + val.forEach(callback); } - // 对 array、object 遍历处理 - function traversalHandler(val, callback) { - if (lodash.isArray(val)) { - val.forEach(callback); - } - if (isObject(val)) { - Object.keys(val).forEach((key) => { callback(val[key], key); }); - } - } - // 根据参数个数获取配置 - function getOption(arg) { - const len = arg.length; - // 默认配置 - const option = { - headers: { - 'Cache-Control': 'no-cache' - }, - statusCode: 200, - cookies: [], - timeout: 0 - }; - if (len === 0) return option; - if (len === 1) { - const newOption = arg[0]; - if (isObject(newOption)) { - traversalHandler(newOption, (value, key) => { - if (key === 'headers') { - traversalHandler(newOption.headers, (headervalue, headerkey) => { - option.headers[headerkey] = newOption.headers[headerkey]; - }); - } else { - option[key] = newOption[key]; - } - }); - } - } else { - option.url = arg[0]; - option.result = arg[1]; - } - return option; - } - // 把基于 cgiMockfile 的相对绝对转成绝对路径 - function parsePath(value) { - const PROJECT_DIR = process.env.PWD || process.cwd(); - return resolve(PROJECT_DIR, value); + if (lodash.isPlainObject(val)) { + Object.keys(val).forEach((key) => { callback(val[key], key); }); } + } + // 根据参数个数获取配置 + function getOption(arg) { + const len = arg.length; + // 默认配置 + const option = { + headers: { + 'Cache-Control': 'no-cache' + }, + statusCode: 200, + cookies: [], + timeout: 0 + }; + if (len === 0) return option; + if (len === 1) { + const newOption = arg[0]; + if (lodash.isPlainObject(newOption)) { + traversalHandler(newOption, (value, key) => { + if (key === 'headers') { + traversalHandler(newOption.headers, (headervalue, headerkey) => { + option.headers[headerkey] = newOption.headers[headerkey]; + }); + } else { + option[key] = newOption[key]; + } + }); + } + } else { + option.url = arg[0]; + option.result = arg[1]; + } + return option; + } + + // 把基于 cgiMockfile 的相对绝对转成绝对路径 + function parsePath(value) { + const PROJECT_DIR = process.env.PWD || api.cwd; + return resolve(PROJECT_DIR, value); + } + + const createMock = () => { const requestList = []; const cgiMock = (...arg) => { const option = getOption(arg); @@ -83,11 +80,9 @@ export default (api) => { return readFileSync(parsePath(file)); }; - // mock是否打开 - mockFlag = isObject(api.config.mock) ? true : api.config.mock; - if (!mockFlag) return; // mock打开情况下，配置的过滤前缀 - mockPrefix = api.config.mock.prefix || mockPrefix; + const mockPrefixTemp = api.config.mock.prefix || mockPrefix; + mockPrefix = mockPrefixTemp === mockPrefix ? mockPrefixTemp : `${mockPrefixTemp}/`; // mock文件处理 mockFile = parsePath('./mock.js'); if (!existsSync(mockFile)) { @@ -97,21 +92,24 @@ export default (api) => { if (require.cache[mockFile]) { delete require.cache[mockFile]; } - const projectMock = require(mockFile); - if (!lodash.isFunction(projectMock)) { - api.logger.info('mock.js should export Function'); return; + // require最新的 mock.js 文件 + try { + const projectMock = require(mockFile); + if (!lodash.isFunction(projectMock)) { + api.logger.info('mock.js should export Function'); return; + } + projectMock({ cgiMock, Mock }); + } catch (err) { + api.logger.info('mock.js run fail!'); } - // mock对象与 mock.js 结合 - projectMock(cgiMock, Mock); return (req, res, next) => { - // 如果请求不是以 cgiMock.prefix 开头，直接 next `${mockPrefix}/` - if (!req.path.startsWith(`${mockPrefix}/`)) { + // 如果请求不是以 cgiMock.prefix 开头，直接 next + if (!req.path.startsWith(mockPrefix)) { return next(); } - // 请求以 cgiMock.prefix 开头，匹配处理 - const matchRequet = requestList.filter(item => req.path.search(item.url) !== -1)[0]; + const matchRequet = requestList.find(item => req.path.search(item.url) !== -1); if (!matchRequet) { return next(); } @@ -135,7 +133,7 @@ export default (api) => { if (lodash.isFunction(matchRequet.result)) { matchRequet.result(req, res); } else if ( - lodash.isArray(matchRequet.result) || isObject(matchRequet.result) + lodash.isArray(matchRequet.result) || lodash.isPlainObject(matchRequet.result) ) { !matchRequet.type && res.type('json'); res.json(matchRequet.result); @@ -147,9 +145,11 @@ export default (api) => { }; api.onStart(() => { - loadMock = createMock(); + // 获取mock配置: 是否打开 + mockFlag = lodash.isPlainObject(api.config.mock) ? true : api.config.mock; if (!mockFlag) return; + loadMock = createMock(); chokidar.watch(mockFile, { ignoreInitial: true }).on('change', () => { @@ -157,6 +157,7 @@ export default (api) => { loadMock = createMock(); }); }); + api.addBeforeMiddlewares(() => { if (!mockFlag) return []; return [ diff --git a/packages/fes-template/mock.js b/packages/fes-template/mock.js index b48cd9dc..31323115 100644 --- a/packages/fes-template/mock.js +++ b/packages/fes-template/mock.js @@ -1,4 +1,4 @@ -module.exports = (cgiMock, Mock) => { +module.exports = ({ cgiMock, Mock }) => { const { Random } = Mock; // 测试 proxy 与 mock 用例集合 From 5d2271bcd3af7efd7e795553b2862fd18c357cc8 Mon Sep 17 00:00:00 2001 From: tianxuan Date: Thu, 4 Feb 2021 13:43:16 +0800 Subject: [PATCH 28/31] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9Emock=E6=8F=92?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-preset-built-in/package.json | 5 +- packages/fes-preset-built-in/src/index.js | 5 +- .../src/plugins/commands/mock/index.js | 174 ++++++++++++++++++ packages/fes-template/.fes.js | 9 + packages/fes-template/mock.js | 130 +++++++++++++ packages/fes-template/package.json | 1 + packages/fes-template/src/pages/index.vue | 23 ++- 7 files changed, 342 insertions(+), 5 deletions(-) create mode 100644 packages/fes-preset-built-in/src/plugins/commands/mock/index.js create mode 100644 packages/fes-template/mock.js diff --git a/packages/fes-preset-built-in/package.json b/packages/fes-preset-built-in/package.json index 4e9260c1..0cced841 100644 --- a/packages/fes-preset-built-in/package.json +++ b/packages/fes-preset-built-in/package.json @@ -41,6 +41,9 @@ "vue-loader": "^16.1.2", "webpack-bundle-analyzer": "4.3.0", "cli-highlight": "^2.1.4", - "webpack-chain": "6.5.1" + "webpack-chain": "6.5.1", + "body-parser": "^1.19.0", + "cookie-parser": "^1.4.5", + "mockjs": "^1.1.0" } } diff --git a/packages/fes-preset-built-in/src/index.js b/packages/fes-preset-built-in/src/index.js index e4d3599c..a9fd1dff 100644 --- a/packages/fes-preset-built-in/src/index.js +++ b/packages/fes-preset-built-in/src/index.js @@ -56,7 +56,10 @@ export default function () { require.resolve('./plugins/commands/dev'), require.resolve('./plugins/commands/help'), require.resolve('./plugins/commands/info'), - require.resolve('./plugins/commands/webpack') + require.resolve('./plugins/commands/webpack'), + + // mock + require.resolve('./plugins/commands/mock') ] }; } diff --git a/packages/fes-preset-built-in/src/plugins/commands/mock/index.js b/packages/fes-preset-built-in/src/plugins/commands/mock/index.js new file mode 100644 index 00000000..c76ab0af --- /dev/null +++ b/packages/fes-preset-built-in/src/plugins/commands/mock/index.js @@ -0,0 +1,174 @@ +import { existsSync, readFileSync } from 'fs'; +import { resolve } from 'path'; +import { chokidar, lodash } from '@umijs/utils'; +import bodyParser from 'body-parser'; +import cookieParser from 'cookie-parser'; +import Mock from 'mockjs'; + + +export default (api) => { + let mockFlag = false; // mock 开关flag + let mockPrefix = '/'; // mock 过滤前缀 + let mockFile = ''; // mock 文件 + let loadMock = ''; // mock 对象 + + api.describe({ + key: 'mock', + config: { + schema(joi) { + return joi.alternatives(joi.boolean(), joi.object()); + } + } + }); + + const createMock = () => { + // 判断是否为 Object，仅 {} + function isObject(value) { + return Object.prototype.toString.call(value) === '[object Object]'; + } + // 对 array、object 遍历处理 + function traversalHandler(val, callback) { + if (lodash.isArray(val)) { + val.forEach(callback); + } + if (isObject(val)) { + Object.keys(val).forEach((key) => { callback(val[key], key); }); + } + } + // 根据参数个数获取配置 + function getOption(arg) { + const len = arg.length; + // 默认配置 + const option = { + headers: { + 'Cache-Control': 'no-cache' + }, + statusCode: 200, + cookies: [], + timeout: 0 + }; + if (len === 0) return option; + if (len === 1) { + const newOption = arg[0]; + if (isObject(newOption)) { + traversalHandler(newOption, (value, key) => { + if (key === 'headers') { + traversalHandler(newOption.headers, (headervalue, headerkey) => { + option.headers[headerkey] = newOption.headers[headerkey]; + }); + } else { + option[key] = newOption[key]; + } + }); + } + } else { + option.url = arg[0]; + option.result = arg[1]; + } + return option; + } + // 把基于 cgiMockfile 的相对绝对转成绝对路径 + function parsePath(value) { + const PROJECT_DIR = process.env.PWD || process.cwd(); + return resolve(PROJECT_DIR, value); + } + + const requestList = []; + const cgiMock = (...arg) => { + const option = getOption(arg); + if (!option.url || !option.result) return; + requestList.push(option); + }; + cgiMock.file = function (file) { + return readFileSync(parsePath(file)); + }; + + // mock是否打开 + mockFlag = isObject(api.config.mock) ? true : api.config.mock; + if (!mockFlag) return; + // mock打开情况下，配置的过滤前缀 + mockPrefix = api.config.mock.prefix || mockPrefix; + // mock文件处理 + mockFile = parsePath('./mock.js'); + if (!existsSync(mockFile)) { + api.logger.info('mock.js File does not exist, please check'); return; + } + // 清除require的缓存，保证 mock 文件修改后拿到最新的 mock.js + if (require.cache[mockFile]) { + delete require.cache[mockFile]; + } + const projectMock = require(mockFile); + if (!lodash.isFunction(projectMock)) { + api.logger.info('mock.js should export Function'); return; + } + // mock对象与 mock.js 结合 + projectMock(cgiMock, Mock); + + return (req, res, next) => { + // 如果请求不是以 cgiMock.prefix 开头，直接 next `${mockPrefix}/` + if (!req.path.startsWith(`${mockPrefix}/`)) { + return next(); + } + + // 请求以 cgiMock.prefix 开头，匹配处理 + const matchRequet = requestList.filter(item => req.path.search(item.url) !== -1)[0]; + if (!matchRequet) { + return next(); + } + + // set header + res.set(matchRequet.headers); + // set Content-Type + matchRequet.type && res.type(matchRequet.type); + // set status code + res.status(matchRequet.statusCode); + // set cookie + traversalHandler(matchRequet.cookies, (item) => { + const name = item.name; + const value = item.value; + delete item.name; + delete item.value; + res.cookie(name, value, item); + }); + + // do result + if (lodash.isFunction(matchRequet.result)) { + matchRequet.result(req, res); + } else if ( + lodash.isArray(matchRequet.result) || isObject(matchRequet.result) + ) { + !matchRequet.type && res.type('json'); + res.json(matchRequet.result); + } else { + !matchRequet.type && res.type('text'); + res.send(matchRequet.result.toString()); + } + }; + }; + + api.onStart(() => { + loadMock = createMock(); + if (!mockFlag) return; + + chokidar.watch(mockFile, { + ignoreInitial: true + }).on('change', () => { + api.logger.info('mock.js changed，reload'); + loadMock = createMock(); + }); + }); + api.addBeforeMiddlewares(() => { + if (!mockFlag) return []; + return [ + bodyParser.json(), + bodyParser.urlencoded({ + extended: false + }), + cookieParser() + ]; + }); + api.addBeforeMiddlewares(() => (req, res, next) => { + if (!mockFlag) return next(); + loadMock(req, res, next); + }); +}; diff --git a/packages/fes-template/.fes.js b/packages/fes-template/.fes.js index db77aa6f..869280bb 100644 --- a/packages/fes-template/.fes.js +++ b/packages/fes-template/.fes.js @@ -12,6 +12,15 @@ export default { admin: ["/", "/onepiece"] } }, + mock: { + prefix: '/v2' + }, + proxy: { + '/v2': { + 'target': 'https://api.douban.com/', + 'changeOrigin': true, + }, + }, layout: { title: "Fes.js", footer: 'Created by MumbelFe', diff --git a/packages/fes-template/mock.js b/packages/fes-template/mock.js new file mode 100644 index 00000000..b48cd9dc --- /dev/null +++ b/packages/fes-template/mock.js @@ -0,0 +1,130 @@ +module.exports = (cgiMock, Mock) => { + const { Random } = Mock; + + // 测试 proxy 与 mock 用例集合 + cgiMock('/movie/in_theaters_mock', (req, res) => { + res.send(JSON.stringify({ + code: '0', + msg: '', + result: { + text: 'movie: movie/in_theaters_mock ~~~~~' + } + })); + }); + cgiMock('/movie/test_mock', (req, res) => { + res.send(JSON.stringify({ + code: '0', + msg: '', + result: { + text: 'mock: movie/test_mock' + } + })); + }); + + // 测试用例: mock.js change，重现请求，需要能拉最新的数据 + cgiMock('/watchtest', (req, res) => { + res.send(JSON.stringify({ + code: '0', + msg: '', + result: { + text: '通过 register 测试 mock watch: 初始状态' + } + })); + }); + + // 返回一个数字 + // cgiMock('/number', 666); + cgiMock('/number', 999); + + // 返回一个json + cgiMock({ + url: '/json', + result: { + code: '400101', msg: "不合法的请求:Missing cookie 'wb_app_id' for method parameter of type String", transactionTime: '20170309171146', success: false + } + }); + + // 利用 mock.js 产生随机文本 + cgiMock('/text', Random.cparagraph()); + + // 返回一个字符串 利用 mock.js 产生随机字符 + cgiMock('/random', Mock.mock({ + 'string|1-10': '★' + })); + + // 正则匹配url, 返回一个字符串 + cgiMock(/\/abc|\/xyz/, 'regexp test!'); + + // option.result 参数如果是一个函数, 可以实现自定义返回内容, 接收的参数是是经过 express 封装的 req 和 res 对象. + cgiMock(/\/function$/, (req, res) => { + res.send('function test'); + }); + + // 返回文本 readFileSync + cgiMock('/file', cgiMock.file('./package.json')); + + // 更复杂的规则配置 + cgiMock({ + url: /\/who/, + method: 'GET', + result(req, res) { + if (req.query.name === 'kwan') { + res.json({ kwan: '孤独患者' }); + } else { + res.send('Nooooooooooo'); + } + }, + headers: { + 'Content-Type': 'text/plain', + 'Content-Length': '123', + ETag: '12345' + }, + cookies: [ + { + name: 'myname', value: 'kwan', maxAge: 900000, httpOnly: true + } + ] + }); + + // 携带参数的请求 + cgiMock('/v2/audit/list', (req, res) => { + const { + currentPage, pageSize, isAudited + } = req.body; + res.send({ + code: '0', + msg: '', + data: { + currentPage, + pageSize, + totalPage: 2, + totalCount: 12, + pageData: Array.from({ length: pageSize }, () => ({ + title: Random.title(), + authorName: Random.cname(), + authorId: Random.name(), + createTime: Date.now(), + updateTime: Date.now(), + readCount: Random.integer(60, 1000), + favoriteCount: Random.integer(1, 50), + postId: '12323', + serviceTag: '业务类型', + productTag: '产品类型', + requestTag: '需求类型', + handleTag: '已采纳', + postType: 'voice', + postStatus: isAudited ? 'pass' : 'auditing', + auditStatus: 'audit1' + })) + } + }); + }); + + // multipart/form-data 类型 + cgiMock('/v2/upload', (req, res) => { + res.send({ + code: '0', + msg: '文件上传成功' + }); + }); +}; diff --git a/packages/fes-template/package.json b/packages/fes-template/package.json index d5e5c1de..1cc9e9bf 100644 --- a/packages/fes-template/package.json +++ b/packages/fes-template/package.json @@ -54,6 +54,7 @@ "@webank/fes-plugin-enums": "^2.0.0-alpha.0", "@webank/fes-plugin-jest": "^2.0.0-alpha.0", "@webank/fes-plugin-vuex": "^2.0.0-alpha.0", + "@webank/fes-plugin-request": "2.0.0-alpha.1", "ant-design-vue": "2.0.0-rc.3", "vue": "3.0.5", "vuex": "^4.0.0-rc.2" diff --git a/packages/fes-template/src/pages/index.vue b/packages/fes-template/src/pages/index.vue index 1ba658b3..c7e30af0 100644 --- a/packages/fes-template/src/pages/index.vue +++ b/packages/fes-template/src/pages/index.vue @@ -22,11 +22,9 @@ import { ref, onMounted, computed } from 'vue'; import { useStore } from 'vuex'; import { - access, useAccess, useRouter, useI18n, locale, enums + access, useAccess, useRouter, useI18n, locale, enums, request } from '@webank/fes'; -console.log(__DEV__); - export default { setup() { const fes = ref('fes upgrade to vue3'); @@ -81,6 +79,25 @@ export default { accessId.value = '11'; }, 4000); // router.push('/onepiece'); + + console.log('测试 mock!!'); + request('/v2/file').then((data) => { + console.log(data); + }).catch((err) => { + console.log(err); + }); + request('/v2/movie/in_theaters_mock').then((data) => { + console.log(data); + }).catch((err) => { + console.log(err); + }); + + console.log('测试 proxy!!'); + request('/v2/movie/in_theaters_proxy').then((resp) => { + console.log(resp); + }).catch((err) => { + console.log(err); + }); }); return { accessId, From 0cccac38f70837cb1c676b76d6eb2399a055d7f3 Mon Sep 17 00:00:00 2001 From: tianxuan Date: Fri, 5 Feb 2021 15:03:13 +0800 Subject: [PATCH 29/31] =?UTF-8?q?fix:=20mock=E6=8F=92=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9pr=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/plugins/commands/mock/index.js | 131 +++++++++--------- packages/fes-template/mock.js | 2 +- 2 files changed, 67 insertions(+), 66 deletions(-) diff --git a/packages/fes-preset-built-in/src/plugins/commands/mock/index.js b/packages/fes-preset-built-in/src/plugins/commands/mock/index.js index c76ab0af..753931c2 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/mock/index.js +++ b/packages/fes-preset-built-in/src/plugins/commands/mock/index.js @@ -5,7 +5,6 @@ import bodyParser from 'body-parser'; import cookieParser from 'cookie-parser'; import Mock from 'mockjs'; - export default (api) => { let mockFlag = false; // mock 开关flag let mockPrefix = '/'; // mock 过滤前缀 @@ -21,58 +20,56 @@ export default (api) => { } }); - const createMock = () => { - // 判断是否为 Object，仅 {} - function isObject(value) { - return Object.prototype.toString.call(value) === '[object Object]'; + // 对 array、object 遍历处理 + function traversalHandler(val, callback) { + if (lodash.isArray(val)) { + val.forEach(callback); } - // 对 array、object 遍历处理 - function traversalHandler(val, callback) { - if (lodash.isArray(val)) { - val.forEach(callback); - } - if (isObject(val)) { - Object.keys(val).forEach((key) => { callback(val[key], key); }); - } - } - // 根据参数个数获取配置 - function getOption(arg) { - const len = arg.length; - // 默认配置 - const option = { - headers: { - 'Cache-Control': 'no-cache' - }, - statusCode: 200, - cookies: [], - timeout: 0 - }; - if (len === 0) return option; - if (len === 1) { - const newOption = arg[0]; - if (isObject(newOption)) { - traversalHandler(newOption, (value, key) => { - if (key === 'headers') { - traversalHandler(newOption.headers, (headervalue, headerkey) => { - option.headers[headerkey] = newOption.headers[headerkey]; - }); - } else { - option[key] = newOption[key]; - } - }); - } - } else { - option.url = arg[0]; - option.result = arg[1]; - } - return option; - } - // 把基于 cgiMockfile 的相对绝对转成绝对路径 - function parsePath(value) { - const PROJECT_DIR = process.env.PWD || process.cwd(); - return resolve(PROJECT_DIR, value); + if (lodash.isPlainObject(val)) { + Object.keys(val).forEach((key) => { callback(val[key], key); }); } + } + // 根据参数个数获取配置 + function getOption(arg) { + const len = arg.length; + // 默认配置 + const option = { + headers: { + 'Cache-Control': 'no-cache' + }, + statusCode: 200, + cookies: [], + timeout: 0 + }; + if (len === 0) return option; + if (len === 1) { + const newOption = arg[0]; + if (lodash.isPlainObject(newOption)) { + traversalHandler(newOption, (value, key) => { + if (key === 'headers') { + traversalHandler(newOption.headers, (headervalue, headerkey) => { + option.headers[headerkey] = newOption.headers[headerkey]; + }); + } else { + option[key] = newOption[key]; + } + }); + } + } else { + option.url = arg[0]; + option.result = arg[1]; + } + return option; + } + + // 把基于 cgiMockfile 的相对绝对转成绝对路径 + function parsePath(value) { + const PROJECT_DIR = process.env.PWD || api.cwd; + return resolve(PROJECT_DIR, value); + } + + const createMock = () => { const requestList = []; const cgiMock = (...arg) => { const option = getOption(arg); @@ -83,11 +80,9 @@ export default (api) => { return readFileSync(parsePath(file)); }; - // mock是否打开 - mockFlag = isObject(api.config.mock) ? true : api.config.mock; - if (!mockFlag) return; // mock打开情况下，配置的过滤前缀 - mockPrefix = api.config.mock.prefix || mockPrefix; + const mockPrefixTemp = api.config.mock.prefix || mockPrefix; + mockPrefix = mockPrefixTemp === mockPrefix ? mockPrefixTemp : `${mockPrefixTemp}/`; // mock文件处理 mockFile = parsePath('./mock.js'); if (!existsSync(mockFile)) { @@ -97,21 +92,24 @@ export default (api) => { if (require.cache[mockFile]) { delete require.cache[mockFile]; } - const projectMock = require(mockFile); - if (!lodash.isFunction(projectMock)) { - api.logger.info('mock.js should export Function'); return; + // require最新的 mock.js 文件 + try { + const projectMock = require(mockFile); + if (!lodash.isFunction(projectMock)) { + api.logger.info('mock.js should export Function'); return; + } + projectMock({ cgiMock, Mock }); + } catch (err) { + api.logger.info('mock.js run fail!'); } - // mock对象与 mock.js 结合 - projectMock(cgiMock, Mock); return (req, res, next) => { - // 如果请求不是以 cgiMock.prefix 开头，直接 next `${mockPrefix}/` - if (!req.path.startsWith(`${mockPrefix}/`)) { + // 如果请求不是以 cgiMock.prefix 开头，直接 next + if (!req.path.startsWith(mockPrefix)) { return next(); } - // 请求以 cgiMock.prefix 开头，匹配处理 - const matchRequet = requestList.filter(item => req.path.search(item.url) !== -1)[0]; + const matchRequet = requestList.find(item => req.path.search(item.url) !== -1); if (!matchRequet) { return next(); } @@ -135,7 +133,7 @@ export default (api) => { if (lodash.isFunction(matchRequet.result)) { matchRequet.result(req, res); } else if ( - lodash.isArray(matchRequet.result) || isObject(matchRequet.result) + lodash.isArray(matchRequet.result) || lodash.isPlainObject(matchRequet.result) ) { !matchRequet.type && res.type('json'); res.json(matchRequet.result); @@ -147,9 +145,11 @@ export default (api) => { }; api.onStart(() => { - loadMock = createMock(); + // 获取mock配置: 是否打开 + mockFlag = lodash.isPlainObject(api.config.mock) ? true : api.config.mock; if (!mockFlag) return; + loadMock = createMock(); chokidar.watch(mockFile, { ignoreInitial: true }).on('change', () => { @@ -157,6 +157,7 @@ export default (api) => { loadMock = createMock(); }); }); + api.addBeforeMiddlewares(() => { if (!mockFlag) return []; return [ diff --git a/packages/fes-template/mock.js b/packages/fes-template/mock.js index b48cd9dc..31323115 100644 --- a/packages/fes-template/mock.js +++ b/packages/fes-template/mock.js @@ -1,4 +1,4 @@ -module.exports = (cgiMock, Mock) => { +module.exports = ({ cgiMock, Mock }) => { const { Random } = Mock; // 测试 proxy 与 mock 用例集合 From 6e1ffb2525ca5aaaa36fc19f677af8f1c1f9339c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Fri, 5 Feb 2021 16:47:44 +0800 Subject: [PATCH 30/31] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0yarn.lock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yarn.lock | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index c1d2842e..6e5dd111 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4656,6 +4656,13 @@ eslint-plugin-vue "^7.5.0" vue-eslint-parser "^7.4.1" +"@webank/fes-plugin-request@2.0.0-alpha.1": + version "2.0.0-alpha.1" + resolved "https://registry.yarnpkg.com/@webank/fes-plugin-request/-/fes-plugin-request-2.0.0-alpha.1.tgz#3e61bfabb961df1f3e7732ff160d1d3e9f5d0be7" + integrity sha512-3ME9ciTBz3tzNwF8VxNocRScOu5yF/jSuu9VEtoE0YP2LsMZ5Tzw2xxrLxguPfdmdsUTkv1Ci7czx2QRo9M0/g== + dependencies: + axios "0.21.1" + "@webassemblyjs/ast@1.11.0": version "1.11.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.0.tgz#a5aa679efdc9e51707a4207139da57920555961f" @@ -5861,7 +5868,7 @@ bn.js@^5.0.0, bn.js@^5.1.1: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b" integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ== -body-parser@1.19.0: +body-parser@1.19.0, body-parser@^1.19.0: version "1.19.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== @@ -6779,6 +6786,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" +commander@*, commander@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2" + integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA== + commander@2.17.x: version "2.17.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" @@ -6799,11 +6811,6 @@ commander@^6.2.0: resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== -commander@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2" - integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA== - commander@~2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" @@ -7113,6 +7120,14 @@ convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, dependencies: safe-buffer "~5.1.1" +cookie-parser@^1.4.5: + version "1.4.5" + resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.5.tgz#3e572d4b7c0c80f9c61daf604e4336831b5d1d49" + integrity sha512-f13bPUj/gG/5mDr+xLmSxxDsB9DQiTIfhJS/sqjrmfAWiAN+x2O4i/XguTL9yDZ+/IFDanJ+5x7hC4CXT9Tdzw== + dependencies: + cookie "0.4.0" + cookie-signature "1.0.6" + cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" @@ -12891,6 +12906,13 @@ mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: dependencies: minimist "^1.2.5" +mockjs@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/mockjs/-/mockjs-1.1.0.tgz#e6a0c378e91906dbaff20911cc0273b3c7d75b06" + integrity sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ== + dependencies: + commander "*" + modify-values@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" From 7330b12a26dbd6f039a041ce3a9a804250f38b04 Mon Sep 17 00:00:00 2001 From: tianxuan Date: Fri, 5 Feb 2021 16:53:29 +0800 Subject: [PATCH 31/31] =?UTF-8?q?fix:=20=E5=8F=98=E6=9B=B4mock=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-preset-built-in/src/index.js | 6 ++---- .../plugins/{commands/mock/index.js => features/mock.js} | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) rename packages/fes-preset-built-in/src/plugins/{commands/mock/index.js => features/mock.js} (98%) diff --git a/packages/fes-preset-built-in/src/index.js b/packages/fes-preset-built-in/src/index.js index a9fd1dff..9e92a99a 100644 --- a/packages/fes-preset-built-in/src/index.js +++ b/packages/fes-preset-built-in/src/index.js @@ -47,6 +47,7 @@ export default function () { require.resolve('./plugins/features/terserOptions'), require.resolve('./plugins/features/vueLoader'), require.resolve('./plugins/features/hardSource'), + require.resolve('./plugins/features/mock'), // misc require.resolve('./plugins/misc/route'), @@ -56,10 +57,7 @@ export default function () { require.resolve('./plugins/commands/dev'), require.resolve('./plugins/commands/help'), require.resolve('./plugins/commands/info'), - require.resolve('./plugins/commands/webpack'), - - // mock - require.resolve('./plugins/commands/mock') + require.resolve('./plugins/commands/webpack') ] }; } diff --git a/packages/fes-preset-built-in/src/plugins/commands/mock/index.js b/packages/fes-preset-built-in/src/plugins/features/mock.js similarity index 98% rename from packages/fes-preset-built-in/src/plugins/commands/mock/index.js rename to packages/fes-preset-built-in/src/plugins/features/mock.js index 753931c2..9471b293 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/mock/index.js +++ b/packages/fes-preset-built-in/src/plugins/features/mock.js @@ -65,8 +65,7 @@ export default (api) => { // 把基于 cgiMockfile 的相对绝对转成绝对路径 function parsePath(value) { - const PROJECT_DIR = process.env.PWD || api.cwd; - return resolve(PROJECT_DIR, value); + return resolve(api.cwd, value); } const createMock = () => {