From 96222fe5d35d3207e30dd5646ecaf9d4eab2f024 Mon Sep 17 00:00:00 2001 From: "n.davitkovski" Date: Tue, 6 Sep 2022 10:35:56 +0200 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 36eb2e54cc0f129574c22128cc090fcc6a54dd90 Merge: 6b8b1fb 364de37 Author: n.davitkovski Date: Mon Sep 5 18:55:52 2022 +0200 react front-end commit 6b8b1fb6d950cef9aa1d380b3568c20216fba669 Author: n.davitkovski Date: Mon Sep 5 16:00:48 2022 +0200 Update pre-commit commit 6fd620dac706e92e050684a7e7b86d42882eec6a Author: Frank Harrison Date: Thu Jun 9 11:02:41 2022 +0100 chore(docs): improves the documentation Clairifies: * install options * some differences between v4 and v8 * how to create and manage githooks * how husky relates to git * how husky relates to npm/yarn commit 33125bce69d2e89cca66a373277a414248217a86 Author: Dong-Young Kim <31337.persona@gmail.com> Date: Sun Jun 19 11:25:30 2022 +0900 docs: add double-hyphen flag between npx and the command to run (#1164) commit a2abf6c679aa2cada8754e49311f15d2e4e031d1 Author: typicode Date: Fri Jun 10 19:06:19 2022 +0200 docs: update deprecated npm command commit cf741703f46d77990cac225d7626d51a4778bc1f Author: Sgryts Date: Fri Jun 10 12:05:05 2022 -0500 docs: README update (#1154) * docs: README update - replacing depricated npm set-script with npm pkg set (#1150) * docs: README update - replacing depricated npm set-script with npm pkg set (#1150) commit ee47218d5ca1c4d9e5e088ec37b617050daf852d Author: Carlo Corradini Date: Sat May 21 03:22:48 2022 +0200 chore: npx option --no-install replaced with --no -- due to deprecation (#1149) commit 616ed9f7ad1845b1ffdce0ddd699db821fce0948 Author: typicode Date: Mon May 9 11:51:57 2022 +0200 8.0.1 commit 8d0499ad2c5ed97f992356a556a535c59432dd0c Author: typicode Date: Mon May 9 11:51:36 2022 +0200 fix: use POSIX equality operator commit 8e458188720028e27c33f5813277d06daf42649d Author: typicode Date: Mon May 9 00:05:42 2022 +0200 docs: v8 update commit b72af0fcd040668861aa35d6d208595e2f83f2e1 Author: typicode Date: Sun May 8 23:40:15 2022 +0200 chore: update version commit 0f9ebb4a4ad2c242dce0f0700b41b5a755351aec Author: typicode Date: Sun May 8 23:05:22 2022 +0200 feat: show PATH if command not found commit 6d4ad09e2b7da562ff89724fccd490d302ff4368 Author: typicode Date: Sun May 8 23:04:16 2022 +0200 test: command not found message commit 99169cbc69a93b07b4d344ab6d3ce30801461913 Author: typicode Date: Sun May 8 22:47:53 2022 +0200 feat: skip install if $HUSKY=0 commit 69afc14fe22b20606c732b389e8f4cd04a877569 Author: Mohamad Khajavi Date: Sun May 1 07:47:58 2022 +0430 docs: add pnpm installation (#1139) commit 25d0675037d93b7a87bc07145e11a333669e41d9 Author: Sibiraj <20282546+sibiraj-s@users.noreply.github.com> Date: Thu Apr 28 12:18:40 2022 +0530 docs: replace deprecated npx option (#1070) * docs: update deprecated npx option * docs: fix commitlint commands * Update docs/README.md * Update docs/README.md Co-authored-by: typicode commit 4661fd47ab1ab2dce2de4cd30249b129c8b9d74d Author: typicode Date: Thu Apr 28 08:17:10 2022 +0200 docs: fix windows workaround commit d6abbd890a434aea92342708d8da0b133ce6d6f8 Author: typicode Date: Thu Apr 28 08:13:58 2022 +0200 chore: skip windows npm 6 tests commit 46e68bb1afe687219a1f2f6b88734b738ebb931d Author: typicode Date: Thu Apr 28 07:58:54 2022 +0200 test: skip sub-dir commit 46dcde5a224639e811529bcc5901851b77acf4cb Author: typicode Date: Thu Apr 28 07:46:08 2022 +0200 test: skip sub-dir commit 61a79dbb58b7b3f4aceb1c297b2fdacdf5d9c3c0 Author: typicode Date: Thu Apr 28 07:25:33 2022 +0200 chore: update package.json node version to 14 commit e030250e166e3a6b5f4503def37b54e5d135b91a Author: typicode Date: Thu Apr 28 07:19:05 2022 +0200 chore: update workflow commit 1f8253cc7b5a4799c123e560bfacb3d7627b1814 Author: typicode Date: Thu Apr 28 07:09:31 2022 +0200 chore: update devDependencies fix related ts error commit ff1ec7921f8a3d5a14abb99de7dadc4c447201d6 Author: Josh Balfour Date: Thu Apr 28 06:02:10 2022 +0100 feat: add `husky -` prefix to logged global error messages (#1092) commit 3d06050d69a71ef6b1a937fd0cce2d4101adf55f Author: typicode Date: Thu Apr 28 06:52:11 2022 +0200 chore: update workflow commit 1ca4e378fc7b53c4f3e2bc0e8784f67d47f3bcbf Author: typicode Date: Thu Apr 28 06:44:46 2022 +0200 chore: update workflow commit 208bcc41d29a207db7c4921ed26ea0d0cf668c2d Author: typicode Date: Thu Apr 28 06:25:41 2022 +0200 chore: update workflow commit ceb3b5d2646121163f6a7325e2e0420b476ee0fb Author: typicode Date: Thu Apr 28 06:06:41 2022 +0200 chore: update workflow commit cc13539ff66444e0fbad17a3ec51e884885d8eca Author: Daniele Basso Date: Thu Apr 28 03:43:18 2022 +0000 chore: update Workflows (#1125) Remove nodejs 12 as it is EOL Updated workflows to use nodejs 16 commit 2b8c4df9f15a7bf2a2ede3aae1fa0c0f6a807590 Author: Baoshuo Ren Date: Wed Apr 27 11:44:49 2022 +0800 chore: remove git.io (#1136) All links on git.io will stop redirecting after April 29, 2022. - https://github.blog/changelog/2022-04-25-git-io-deprecation/ commit f925192f0605cd205f0bca0cf4a5de12bf21ad7f Author: mataha Date: Sat Apr 16 15:55:12 2022 +0200 fix: force `basename`/`dirname` to treat `$0` as an argument (#1132) * fix: basename: force $0 to be treated as argument * fix: dirname: force $0 to be treated as argument commit 2da12917abcfa3753bca4684a76913fc4d77214b Author: typicode Date: Mon Feb 21 01:34:12 2022 +0100 docs: update yarn 2+ install commit d27582fc45305957ab8dc25b8cf6087371cfed60 Author: Edwin Kofler <24364012+hyperupcall@users.noreply.github.com> Date: Sun Feb 20 09:14:19 2022 -0800 fix: actually set 'husky_skip_init' as readonly (#1104) Previously, the script would export the empty 'readonly' variable, along with 'husky_skip_init' which has a value of 1. Now, the script sets 'husky_skip_init' to 1, and properly gives is the readonly and exported attributes. commit 8e1ff764498f0a74fee76c97f15e60b110ae9aa6 Author: typicode Date: Sun Feb 20 17:43:31 2022 +0100 docs: add another way to disable husky in prod commit 0f3e012cae3b78ec25dd473926b652287a69c92c Author: typicode Date: Thu Feb 17 12:31:20 2022 +0100 docs: update windows npx usage commit 7818613ec8aaa529fb776d9e1f216c1d9e662dd5 Author: Rodrigo Delduca Date: Thu Feb 17 02:55:20 2022 -0300 feat: use /usr/bin/env sh instead of direct path of sh (#1051) commit de37f6d49784fcfaaa0013f33148d38d29022393 Author: Jamie Haywood Date: Tue Feb 1 22:42:26 2022 +0000 feat: add dog emoji as favicon (#1095) commit c4f65f1b4c25af1f57d5c2f7ed95ee83fd393001 Author: Dr. Derek Austin Date: Wed Oct 20 21:31:46 2021 -0500 docs: wording [all Git hooks] (#965) commit 607ebcc3f01b2c56fc0d7d2d5365295418d6a422 Author: pddpd Date: Thu Oct 21 10:28:49 2021 +0800 docs: fix uninstall via npm (#1033) commit b0f8db72b7c0fb9c5ddeb58954c8a6a6b2ee26ef Author: typicode Date: Thu Oct 21 04:24:02 2021 +0200 docs: improve uninstall instructions commit 1109e570505bfa09cc1f58af36824dc720211337 Author: typicode Date: Thu Oct 21 04:13:22 2021 +0200 7.0.4 commit 2087da0202b9e57861e3c3ee37c3d51e007c67b0 Author: typicode Date: Thu Oct 21 04:13:02 2021 +0200 revert: unsupported preuninstall commit e2e310181903607a80848b11385f270044a1b8b1 Author: typicode Date: Thu Oct 21 04:03:25 2021 +0200 7.0.3 commit 9917cca2652109328f739d0daf061f382ac9f771 Author: typicode Date: Thu Oct 21 03:59:29 2021 +0200 fix: on uninstall unset git core.hooksPath commit d3ec839bf0f687355ac54a8f0c43e92658807247 Author: Wyntau Lau Date: Tue Oct 19 02:54:00 2021 +0800 fix(actions): fix action name display (#1059) fix variable node_version to node-version commit e933f0c2ef4b564a4232f9ce35e3052992b57f65 Author: typicode Date: Sun Oct 10 16:23:38 2021 +0200 docs: update "hooks not running" section commit 7c36e31c5deeb6025e7baefecd6a66d2f383393a Author: TAKAHASHI Shuuji Date: Tue Sep 14 01:01:50 2021 +0000 fix: update npm parameters on `docs/README.md` (#1037) commit 26b6bf41c7d7d5592fcd0c2dc5c494eae7891992 Author: typicode Date: Mon Sep 13 23:51:30 2021 +0200 docs: add `npx husky add` workaround on Windows commit 79c5c8807bf23b251c95c0912d484f3f4f24d9ca Author: typicode Date: Sat Aug 28 08:34:25 2021 +0200 fix: docs link commit d78380b837226c0d3765dac674e95cb7b09aefa9 Author: typicode Date: Wed Aug 25 03:21:46 2021 +0200 7.0.2 commit d57a008807c1a2594a1fe0ecfc958a42e998c8e0 Author: Andrey Ivlev Date: Wed Aug 25 04:22:10 2021 +0300 Fix pre-commit hook in WebStorm (#1023) commit 42fe4b70df7491744c96a13e1bdf6183addb7a61 Author: typicode Date: Sat Jul 17 10:37:29 2021 +0200 docs: update commit 88fe7c3df67a86c0c90c1e1e754851af30b74211 Author: typicode Date: Sat Jul 17 10:36:27 2021 +0200 docs: update README.md commit 32e282925699b67ef0f650fc68bc12ea77c7b313 Author: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Tue Jul 13 02:08:10 2021 +0200 ci: update actions/setup-node to v2, enable cache (#1008) * ci: update actions/setup-node to v2 * ci: enable npm package cache * Fix YAML syntax error commit 5531c73fb81ffcd2ba60503722c7dc2cede83ad9 Author: Joël Galeran Date: Wed Jul 7 16:12:10 2021 +0200 fix: readme confusin condition to disable install in CI (#1005) commit e388495f11efd0ce91573a1783f2f83de7b91a39 Author: typicode Date: Tue Jul 6 13:02:12 2021 +0200 test: add test commit e08bab230deefc75330e9628c207b927c0a616ae Author: typicode Date: Tue Jul 6 12:24:38 2021 +0200 7.0.1 commit c19c2e2d458c1f6f14d35f27af0c83eb6fa96502 Author: typicode Date: Tue Jul 6 12:23:45 2021 +0200 style: comment commit e1efdf6324670b9875362903ec1aa0a6fdf73f9b Author: Marco Carini Date: Tue Jul 6 05:17:32 2021 -0500 fix: cover case where git rev-parse returns null (#1001) commit 80450dc5a7dfa93365f78b0f5882e30a676bc6a7 Author: typicode Date: Tue Jul 6 12:06:00 2021 +0200 docs: update Docker section commit a46ae0f0dc74762a8da8999d49542e4abe56678d Author: typicode Date: Fri Jul 2 03:26:35 2021 +0200 Create stale.yml commit b06dc95cc0824972e7929c5558e851d2d07a20ec Author: typicode Date: Fri Jul 2 02:33:01 2021 +0200 docs: update Docker section commit 7f062d69b0f1aeaf29b973f1c66d5becc8040598 Author: typicode Date: Thu Jul 1 07:53:08 2021 +0200 docs: update commit 42ddca2c0e6d7fa4855b95ff2e7722331e5048a0 Author: typicode Date: Thu Jul 1 07:35:37 2021 +0200 docs: typo commit 9eb76c6213f6b6cc98448a478d5260f718e671fb Author: typicode Date: Thu Jul 1 07:27:27 2021 +0200 chore: fix CI commit b693ffe2f3b8696f1ed915fc668effd4b1614e68 Author: typicode Date: Thu Jul 1 07:17:14 2021 +0200 chore: fix CI commit fd043f6c5b680db931d3e0b59fbda922367ec8d0 Author: typicode Date: Thu Jul 1 06:56:54 2021 +0200 chore: fix CI commit a60b377e1673e58890f34e52d4f9affef527311c Author: typicode Date: Thu Jul 1 06:34:51 2021 +0200 7.0.0 commit e49e5fb9ead6e574bce1e225d61b9277842dac2a Author: typicode Date: Thu Jul 1 06:23:58 2021 +0200 feat: husky 7 commit af038621425b73fb12cc8670d8885adc6f9211a0 Author: Stefano Magni Date: Wed Jun 23 00:48:16 2021 +0200 docs: align the examples (#992) The "Locally installed binaries" section was missing a `# or` comment between the `npx` and `yarn` example. I brought the comment directly from the "HUSKY_GIT_PARAMS" section. commit e79e0f7505de3a632790e4ac30ef61d9da848d1e Author: Phred Lane Date: Sun Jun 20 06:11:57 2021 -0500 refactor(husky-init): removed duplicated code (#989) commit e5fa9315e89bd8f3f4b26c990e296b62f31ecacb Author: typicode Date: Sun Jun 20 11:48:18 2021 +0200 Update README.md commit c7eab5241670f03f94213a1b95bb7fc277d6a25b Author: typicode Date: Sun Jun 20 11:47:07 2021 +0200 Update README.md commit 7526a01feef99602ced94955bf57cfb8d8fbc187 Author: typicode Date: Sun Jun 20 11:46:26 2021 +0200 Update README.md commit 614f77f3b5d201eb233362f05267eba32d00faf5 Author: typicode Date: Sun Jun 20 11:45:36 2021 +0200 Update README.md commit 7b7f509aac9dc18baa992defeef08f77470532cf Author: nbelakovski Date: Thu Jun 17 23:30:32 2021 -0700 docs: use --save-dev instead of -D Expanded -D into the long option, so that those who aren't as familiar with the ecosystem don't have to look it up. commit 7f8e8b8e18ae192c5a1d0e9c289a31592d301697 Author: Chuck Date: Fri Jun 4 10:38:18 2021 -0400 Update README.md (#984) Small typo commit 883f8c4d65e65cac335a3df535122c294c7245af Author: typicode Date: Wed May 26 09:53:13 2021 +0200 docs: update commit d12efa2d19dda94b507a4342ac433ae8047b0792 Author: typicode Date: Sat May 22 07:50:28 2021 +0200 docs: add sharing hooks recipe --- .github/workflows/node.js.yml | 4 + README.md | 69 + docs/README.md | 7 + package-lock.json | 3060 +++++++++++------------------- package.json | 16 + packages/husky-init/package.json | 13 - src/bin.ts | 12 + src/index.ts | 89 + test/all.sh | 3 + test/functions.sh | 4 + test/init.sh | 25 - 11 files changed, 1317 insertions(+), 1985 deletions(-) delete mode 100644 packages/husky-init/package.json delete mode 100644 test/init.sh diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index fd07e564f..d6c859c35 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -16,12 +16,16 @@ jobs: - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} +<<<<<<< HEAD + - run: npm --version +======= <<<<<<< HEAD - run: npm --version ======= - name: npm 7 run: npm i -g npm@7 >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 - run: npm ci --ignore-scripts - run: npm test diff --git a/README.md b/README.md index 626cd5bac..2168054bd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD +# husky +======= [![Financial Contributors on Open Collective](https://opencollective.com/husky/all/badge.svg?label=financial+contributors)](https://opencollective.com/husky) [![](https://img.shields.io/npm/dm/husky.svg?style=flat)](https://www.npmjs.org/package/husky) [![Node.js CI](https://github.com/typicode/husky/workflows/Node.js%20CI/badge.svg)](https://github.com/typicode/husky/actions) +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 > Modern native git hooks made easy @@ -6,6 +10,70 @@ Husky improves your commits and more 🐶 _woof!_ You can use it to **lint your commit messages**, **run tests**, **lint code**, etc... when you commit or push. Husky supports [all Git hooks](https://git-scm.com/docs/githooks). +<<<<<<< HEAD +## Easy install (reccomended) + +`husky-init` is a one-time command to configure a project with husky. + +It installs husky into your project and auto-configures your package.json, +ensuring that every time you run `yarn|npm install` git is then configured to +use your hooks (so you don't have to worry about it again). + +```shell +npx husky-init && npm install # npm +npx husky-init && yarn # Yarn 1 +yarn dlx husky-init --yarn2 && yarn # Yarn 2+ +pnpm dlx husky-init && pnpm install # pnpm +``` + +It will: +* install husky +* modify `package.json` (adding a +[`prepare`](https://docs.npmjs.com/cli/v8/using-npm/scripts#prepare-and-prepublish) +script) +* create a sample `pre-commit` hook that you can edit. By default this runs + `npm test` when you commit. + +## Manual Install + +1. Install `husky` + +```shell +npm install husky --save-dev +yarn add --dev husky +``` + +2. Enable Git hooks + +```shell +npx husky install # will configure git to use .husky/ by default +``` + +3. To automatically have Git hooks enabled after every npm/yarn install, edit +`package.json` to use one of the [npm/yarm lifecyle +hooks](https://docs.npmjs.com/cli/v8/using-npm/scripts#prepare-and-prepublish) +e.g. `prepare`. + + +```shell +npm pkg set scripts.prepare="husky install" +``` + +You should have: + +```js +// package.json +{ + "scripts": { + "prepare": "husky install" + } +} +``` + +# Documentation + +https://typicode.github.io/husky +======= IMPORTANT: Only supports [Git 2.9](https://github.com/git/git/blob/master/Documentation/RelNotes/2.9.0.txt#L127-L128) and above. # Migrate from 4 to 8 @@ -605,3 +673,4 @@ GitHub sponsors can be viewed on my [profile](https://github.com/typicode). All # License MIT +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 diff --git a/docs/README.md b/docs/README.md index 7e8173b42..57df9a37e 100644 --- a/docs/README.md +++ b/docs/README.md @@ -182,7 +182,11 @@ e.g. `prepare`. ```shell +<<<<<<< HEAD +npm pkg set scripts.prepare "husky install" +======= npm pkg set scripts.prepare="husky install" +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 ``` You should have: @@ -369,6 +373,8 @@ if (!isCi) { } ``` +<<<<<<< HEAD +======= You can also use your own logging functions if needed: ```js @@ -381,6 +387,7 @@ const husky = configure({ husky.install() ``` +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 Or make `prepare` script fail silently if husky is not installed: ```json diff --git a/package-lock.json b/package-lock.json index 18fe70428..6da9c00d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,9 @@ }, "devDependencies": { <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "@commitlint/cli": "^16.2.4", "@commitlint/config-conventional": "^16.2.4", "@tsconfig/node14": "^1.0.1", @@ -22,6 +25,12 @@ "typescript": "^4.6.3" }, "engines": { +<<<<<<< HEAD + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/typicode" +======= "node": ">=14" }, "funding": { @@ -44,6 +53,7 @@ "type-fest": "^0.20.2", "typescript": "^4.2.3" >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 } }, "node_modules/@babel/code-frame": { @@ -303,6 +313,8 @@ }, "engines": { "node": ">=v12" +<<<<<<< HEAD +======= } }, "node_modules/@commitlint/prompt": { @@ -336,6 +348,7 @@ }, "engines": { "node": ">=v10" +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 } }, "node_modules/@commitlint/read": { @@ -518,6 +531,8 @@ "node": ">= 8" } }, +<<<<<<< HEAD +======= "node_modules/@sindresorhus/is": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", @@ -633,6 +648,7 @@ "@octokit/openapi-types": "^7.0.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/@sindresorhus/is": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", @@ -642,24 +658,6 @@ "node": ">=6" } }, - "node_modules/@sinonjs/commons": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", - "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==", - "dev": true, - "dependencies": { - "type-detect": "4.0.8" - } - }, - "node_modules/@sinonjs/fake-timers": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz", - "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1.7.0" - } - }, "node_modules/@szmarczak/http-timer": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", @@ -672,14 +670,11 @@ "node": ">=6" } }, - "node_modules/@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", - "dev": true, - "engines": { - "node": ">= 6" - } + "node_modules/@tsconfig/node10": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", + "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", + "dev": true }, >>>>>>> upstream/fix-ci "node_modules/@tsconfig/node12": { @@ -1121,6 +1116,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/astral-regex": { "version": "2.0.0", @@ -1294,10 +1291,15 @@ "dev": true }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", +<<<<<<< HEAD + "dev": true, + "peer": true +======= "dev": true, "peer": true }, @@ -1361,6 +1363,7 @@ "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.1.tgz", "integrity": "sha512-/6FKxSTWoJdbsLDF8tdIjaRiFXiE6UHsEHE3OPI/cwPURCVi1ukP0gmLn7XWEiFk5TcwQjjY5PWsU+j+tgXgmw==", "dev": true +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 }, "node_modules/binary-extensions": { "version": "2.2.0", @@ -1439,6 +1442,8 @@ "node": ">=8" } }, +<<<<<<< HEAD +======= "node_modules/cacheable-request": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", @@ -1483,6 +1488,7 @@ }, <<<<<<< HEAD ======= +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/cacheable-request": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", @@ -1525,6 +1531,8 @@ "node": ">=8" } }, +<<<<<<< HEAD +======= "node_modules/cacheable-request/node_modules/normalize-url": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", @@ -1554,6 +1562,7 @@ "dev": true }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -1605,6 +1614,8 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, +<<<<<<< HEAD +======= "node_modules/chokidar": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", @@ -1635,24 +1646,28 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/chokidar": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", - "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", "dev": true, "dependencies": { - "anymatch": "~3.1.1", + "anymatch": "~3.1.2", "braces": "~3.0.2", - "glob-parent": "~5.1.0", + "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" + "readdirp": "~3.6.0" }, "engines": { "node": ">= 8.10.0" }, "optionalDependencies": { +<<<<<<< HEAD + "fsevents": "~2.3.2" +======= "fsevents": "~2.3.1" } }, @@ -1664,6 +1679,7 @@ "engines": { "node": ">=10" >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 } }, "node_modules/ci-info": { @@ -1672,6 +1688,8 @@ "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", "dev": true }, +<<<<<<< HEAD +======= "node_modules/cli-boxes": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", @@ -1683,6 +1701,7 @@ ======= } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/cli-boxes": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", @@ -1695,6 +1714,8 @@ "url": "https://github.com/sponsors/sindresorhus" } }, +<<<<<<< HEAD +======= "node_modules/cli-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", @@ -1720,6 +1741,7 @@ "tiny-emitter": "^2.0.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -1731,6 +1753,8 @@ "wrap-ansi": "^7.0.0" } }, +<<<<<<< HEAD +======= "node_modules/clone-response": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", @@ -1786,6 +1810,7 @@ "node": ">=0.10.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/clone-response": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", @@ -1795,6 +1820,8 @@ "mimic-response": "^1.0.0" } }, +<<<<<<< HEAD +======= "node_modules/cmd-shim": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-4.1.0.tgz", @@ -1846,6 +1873,7 @@ >>>>>>> upstream/fix-ci } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -1878,6 +1906,8 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", +<<<<<<< HEAD +======= "dev": true, "peer": true }, @@ -1948,26 +1978,9 @@ ======= "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "dev": true, - "engines": [ - "node >= 6.0" - ], - "dependencies": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.0.2", - "typedarray": "^0.0.6" - } - }, - "node_modules/config-chain": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", - "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", - "dev": true, - "dependencies": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } + "peer": true }, "node_modules/configstore": { "version": "5.0.1", @@ -2001,6 +2014,15 @@ "node": ">= 0.10.0" } }, + "node_modules/connect-history-api-fallback": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", + "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", + "dev": true, + "engines": { + "node": ">=0.8" + } + }, "node_modules/connect-livereload": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.6.1.tgz", @@ -2025,6 +2047,8 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, +<<<<<<< HEAD +======= "node_modules/console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", @@ -2032,6 +2056,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/conventional-changelog-angular": { "version": "5.0.13", "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz", @@ -2080,6 +2105,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/conventional-recommended-bump": { "version": "6.1.0", @@ -2136,6 +2163,7 @@ "dev": true }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/cosmiconfig": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", @@ -2217,6 +2245,8 @@ "node": ">=8" } }, +<<<<<<< HEAD +======= "node_modules/cssom": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", @@ -2233,6 +2263,7 @@ "node": ">=8" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/dargs": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", @@ -2290,6 +2321,8 @@ "node": ">=0.10.0" } }, +<<<<<<< HEAD +======= "node_modules/decompress-response": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", @@ -2312,6 +2345,7 @@ "node": ">=4.0.0" } ======= +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/decompress-response": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", @@ -2324,6 +2358,8 @@ "node": ">=4" } }, +<<<<<<< HEAD +======= "node_modules/dedent": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", @@ -2331,6 +2367,7 @@ "dev": true >>>>>>> upstream/fix-ci }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", @@ -2346,6 +2383,8 @@ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true, "peer": true +<<<<<<< HEAD +======= }, <<<<<<< HEAD "node_modules/defer-to-connect": { @@ -2361,6 +2400,7 @@ "dependencies": { "clone": "^1.0.2" } +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 }, "node_modules/defer-to-connect": { "version": "1.1.3", @@ -2368,6 +2408,8 @@ "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", "dev": true }, +<<<<<<< HEAD +======= "node_modules/define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -2554,6 +2596,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -2563,6 +2606,8 @@ "node": ">= 0.6" } }, +<<<<<<< HEAD +======= "node_modules/destroy": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", @@ -2575,17 +2620,25 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", ======= +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/destroy": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", "dev": true }, +<<<<<<< HEAD + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", +======= "node_modules/detect-indent": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz", "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==", >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "dev": true, "engines": { "node": ">=0.3.1" @@ -2604,6 +2657,15 @@ } }, "node_modules/docsify": { +<<<<<<< HEAD + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/docsify/-/docsify-4.12.2.tgz", + "integrity": "sha512-hpRez5upcvkYigT2zD8P5kH5t9HpSWL8yn/ZU/g04/WfAfxVNW6CPUVOOF1EsQUDxTRuyNTFOb6uUv+tPij3tg==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "dompurify": "^2.3.1", +======= <<<<<<< HEAD "version": "4.12.2", "resolved": "https://registry.npmjs.org/docsify/-/docsify-4.12.2.tgz", @@ -2621,6 +2683,7 @@ "dependencies": { "dompurify": "^2.2.6", >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "marked": "^1.2.9", "medium-zoom": "^1.0.6", "opencollective-postinstall": "^2.0.2", @@ -2631,6 +2694,11 @@ } }, "node_modules/docsify-cli": { +<<<<<<< HEAD + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/docsify-cli/-/docsify-cli-4.4.4.tgz", + "integrity": "sha512-NAZgg6b0BsDuq/Pe+P19Qb2J1d+ZVbS0eGkeCNxyu4F9/CQSsRqZqAvPJ9/0I+BCHn4sgftA2jluqhQVzKzrSA==", +======= <<<<<<< HEAD "version": "4.4.4", "resolved": "https://registry.npmjs.org/docsify-cli/-/docsify-cli-4.4.4.tgz", @@ -2640,10 +2708,17 @@ "resolved": "https://registry.npmjs.org/docsify-cli/-/docsify-cli-4.4.3.tgz", "integrity": "sha512-oI/cD04b+hklNd9yKiN9p9EqGx9UKL6p4D0J3fS9L5fpwOti1F8p2rshGJTyArxUlw6EeEBtaJd4rzPzBkK+Lw==", >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "dev": true, "dependencies": { "chalk": "^2.4.2", "connect": "^3.6.0", +<<<<<<< HEAD + "connect-history-api-fallback": "^1.6.0", + "connect-livereload": "^0.6.0", + "cp-file": "^7.0.0", + "docsify": "^4.12.2", +======= <<<<<<< HEAD "connect-history-api-fallback": "^1.6.0", "connect-livereload": "^0.6.0", @@ -2654,25 +2729,34 @@ "cp-file": "^7.0.0", "docsify": "^4.12.1", >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "docsify-server-renderer": ">=4.10.0", "enquirer": "^2.3.6", "fs-extra": "^8.1.0", "get-port": "^5.0.0", +<<<<<<< HEAD + "livereload": "^0.9.2", +======= <<<<<<< HEAD "livereload": "^0.9.2", ======= "livereload": "^0.9.1", >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "lru-cache": "^5.1.1", "open": "^6.4.0", "serve-static": "^1.12.1", "update-notifier": "^4.1.0", "yargonaut": "^1.1.2", +<<<<<<< HEAD + "yargs": "^15.3.0" +======= <<<<<<< HEAD "yargs": "^15.3.0" ======= "yargs": "^14.2.0" >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 }, "bin": { "docsify": "bin/docsify" @@ -2683,6 +2767,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/docsify-cli/node_modules/ansi-regex": { "version": "4.1.0", @@ -2694,6 +2780,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/docsify-cli/node_modules/ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -2721,6 +2808,16 @@ } }, "node_modules/docsify-cli/node_modules/cliui": { +<<<<<<< HEAD + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" +======= <<<<<<< HEAD "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", @@ -2740,6 +2837,7 @@ "strip-ansi": "^5.2.0", "wrap-ansi": "^5.1.0" >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 } }, "node_modules/docsify-cli/node_modules/color-convert": { @@ -2758,6 +2856,9 @@ "dev": true }, <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/docsify-cli/node_modules/escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -2766,6 +2867,8 @@ "engines": { "node": ">=0.8.0" } +<<<<<<< HEAD +======= }, "node_modules/docsify-cli/node_modules/find-up": { "version": "4.1.0", @@ -2784,18 +2887,24 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", "dev": true +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 }, "node_modules/docsify-cli/node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "dependencies": { - "locate-path": "^3.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" }, "engines": { +<<<<<<< HEAD + "node": ">=8" +======= "node": ">=6" >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 } }, "node_modules/docsify-cli/node_modules/fs-extra": { @@ -2822,6 +2931,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/docsify-cli/node_modules/is-fullwidth-code-point": { "version": "2.0.0", @@ -2833,6 +2944,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/docsify-cli/node_modules/jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", @@ -2843,6 +2955,11 @@ } }, "node_modules/docsify-cli/node_modules/locate-path": { +<<<<<<< HEAD + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", +======= <<<<<<< HEAD "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -2857,14 +2974,18 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "dev": true, "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "p-locate": "^4.1.0" }, "engines": { +<<<<<<< HEAD + "node": ">=8" +======= "node": ">=6" >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 } }, "node_modules/docsify-cli/node_modules/p-limit": { @@ -2883,6 +3004,11 @@ } }, "node_modules/docsify-cli/node_modules/p-locate": { +<<<<<<< HEAD + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", +======= <<<<<<< HEAD "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", @@ -2897,11 +3023,15 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "dev": true, "dependencies": { - "p-limit": "^2.0.0" + "p-limit": "^2.2.0" }, "engines": { +<<<<<<< HEAD + "node": ">=8" +======= "node": ">=6" } }, @@ -2939,6 +3069,7 @@ "engines": { "node": ">=6" >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 } }, "node_modules/docsify-cli/node_modules/supports-color": { @@ -2963,6 +3094,9 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/docsify-cli/node_modules/wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -3010,8 +3144,11 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, +<<<<<<< HEAD +======= ======= >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/docsify-cli/node_modules/y18n": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", @@ -3019,6 +3156,11 @@ "dev": true }, "node_modules/docsify-cli/node_modules/yargs": { +<<<<<<< HEAD + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", +======= <<<<<<< HEAD "version": "15.4.1", "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", @@ -3032,16 +3174,24 @@ "version": "14.2.3", "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz", "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==", +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "dev": true, "dependencies": { - "cliui": "^5.0.0", + "cliui": "^6.0.0", "decamelize": "^1.2.0", +<<<<<<< HEAD + "find-up": "^4.1.0", +======= "find-up": "^3.0.0", >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", +<<<<<<< HEAD + "string-width": "^4.2.0", +======= <<<<<<< HEAD "string-width": "^4.2.0", "which-module": "^2.0.0", @@ -3058,16 +3208,26 @@ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", ======= "string-width": "^3.0.0", +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^15.0.1" + "yargs-parser": "^18.1.2" + }, + "engines": { + "node": ">=8" } }, "node_modules/docsify-cli/node_modules/yargs-parser": { +<<<<<<< HEAD + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", +======= "version": "15.0.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz", "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==", >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "dev": true, "dependencies": { "camelcase": "^5.0.0", @@ -3077,7 +3237,13 @@ "engines": { "node": ">=6" ======= +<<<<<<< HEAD + }, + "engines": { + "node": ">=6" +======= >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 } }, "node_modules/docsify-server-renderer": { @@ -3094,6 +3260,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/docsify-server-renderer/node_modules/debug": { "version": "4.3.2", @@ -3113,6 +3281,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/doctrine": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", @@ -3126,16 +3295,19 @@ "node": ">=6.0.0" } }, +<<<<<<< HEAD +======= "node_modules/dompurify": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.6.tgz", "integrity": "sha512-OFP2u/3T1R5CEgWCEONuJ1a5+MFKnOYpkywpUSxv/dj1LeBT1erK+JwM7zK0ROy2BRhqVCf0LRw/kHqKuMkVGg==", "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/dompurify": { - "version": "2.2.8", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.8.tgz", - "integrity": "sha512-9H0UL59EkDLgY3dUFjLV6IEUaHm5qp3mxSqWw7Yyx4Zhk2Jn2cmLe+CNPP3xy13zl8Bqg+0NehQzkdMoVhGRww==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.6.tgz", + "integrity": "sha512-OFP2u/3T1R5CEgWCEONuJ1a5+MFKnOYpkywpUSxv/dj1LeBT1erK+JwM7zK0ROy2BRhqVCf0LRw/kHqKuMkVGg==", "dev": true }, "node_modules/dot-prop": { @@ -3150,6 +3322,8 @@ "node": ">=8" } }, +<<<<<<< HEAD +======= "node_modules/duplexer3": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", @@ -3158,12 +3332,15 @@ }, <<<<<<< HEAD ======= +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/duplexer3": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", "dev": true }, +<<<<<<< HEAD +======= "node_modules/ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", @@ -3175,6 +3352,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -3183,6 +3361,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "node_modules/electron-to-chromium": { "version": "1.3.734", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.734.tgz", @@ -3190,6 +3370,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -3207,6 +3388,8 @@ "node": ">= 0.8" } }, +<<<<<<< HEAD +======= "node_modules/encoding": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", @@ -3217,6 +3400,7 @@ "node": ">= 0.8" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -3554,6 +3738,8 @@ <<<<<<< HEAD ======= }, +<<<<<<< HEAD +======= "node_modules/eventemitter3": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", @@ -3567,6 +3753,7 @@ "dev": true >>>>>>> upstream/fix-ci }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", @@ -3596,6 +3783,9 @@ "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "dev": true, "engines": { +<<<<<<< HEAD + "node": ">=10" +======= <<<<<<< HEAD "node": ">=10" ======= @@ -3625,6 +3815,7 @@ "snapdragon": "^0.8.1", "to-regex": "^3.0.1" >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -3680,6 +3871,8 @@ "reusify": "^1.0.4" } }, +<<<<<<< HEAD +======= "node_modules/figlet": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.5.0.tgz", @@ -3691,6 +3884,7 @@ "bser": "2.1.1" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/figlet": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.5.0.tgz", @@ -3700,6 +3894,8 @@ "node": ">= 0.4.0" } }, +<<<<<<< HEAD +======= "node_modules/figures": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", @@ -3713,6 +3909,7 @@ "node": ">= 0.4.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/file-entry-cache": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", @@ -3829,6 +4026,8 @@ "dev": true, "peer": true }, +<<<<<<< HEAD +======= "node_modules/fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", @@ -3838,6 +4037,7 @@ "node": ">= 0.6" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", @@ -3867,6 +4067,8 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "peer": true +<<<<<<< HEAD +======= }, "node_modules/fsevents": { "version": "2.3.2", @@ -3881,6 +4083,7 @@ "engines": { "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 }, "node_modules/fsevents": { "version": "2.3.2", @@ -4041,6 +4244,8 @@ "url": "https://github.com/sponsors/sindresorhus" } }, +<<<<<<< HEAD +======= "node_modules/got": { "version": "9.6.0", "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", @@ -4073,6 +4278,7 @@ "delegate": "^3.1.2" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/got": { "version": "9.6.0", "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", @@ -4095,18 +4301,6 @@ "node": ">=8.6" } }, - "node_modules/got/node_modules/get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/graceful-fs": { "version": "4.2.6", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", @@ -4157,6 +4351,8 @@ "node": ">=0.10.0" } }, +<<<<<<< HEAD +======= "node_modules/has-bigints": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", @@ -4179,6 +4375,7 @@ "node": ">=0.10.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -4188,6 +4385,8 @@ "node": ">=8" } }, +<<<<<<< HEAD +======= "node_modules/has-yarn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", @@ -4197,6 +4396,7 @@ "node": ">=8" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/has-yarn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", @@ -4260,6 +4460,8 @@ "node": ">= 0.6" } }, +<<<<<<< HEAD +======= "node_modules/http-proxy-agent": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", @@ -4277,6 +4479,7 @@ "node": ">= 0.6" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", @@ -4331,6 +4534,8 @@ "node": ">=4" } }, +<<<<<<< HEAD +======= "node_modules/import-local": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz", @@ -4341,6 +4546,7 @@ "node": ">=4" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -4350,18 +4556,6 @@ "node": ">=0.8.19" } }, - "node_modules/in-publish": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz", - "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==", - "dev": true, - "bin": { - "in-install": "in-install.js", - "in-publish": "in-publish.js", - "not-in-install": "not-in-install.js", - "not-in-publish": "not-in-publish.js" - } - }, "node_modules/indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", @@ -4401,6 +4595,8 @@ "dev": true }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/is-bigint": { "version": "1.0.2", @@ -4412,6 +4608,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -4426,6 +4623,8 @@ "node": ">=8" } }, +<<<<<<< HEAD +======= "node_modules/is-boolean-object": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz", @@ -4439,6 +4638,7 @@ "node": ">=8" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/is-ci": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", @@ -4532,6 +4732,8 @@ "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==", "dev": true }, +<<<<<<< HEAD +======= "node_modules/is-lambda": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", @@ -4585,6 +4787,7 @@ "node": ">=8" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/is-npm": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz", @@ -4677,6 +4880,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "node_modules/isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -4684,6 +4889,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -4710,6 +4916,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/jsbn": { "version": "0.1.1", @@ -4787,6 +4995,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/json-buffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", @@ -4795,6 +5004,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "node_modules/json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -4802,6 +5013,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -4858,6 +5070,8 @@ "node": "*" } }, +<<<<<<< HEAD +======= "node_modules/keyv": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", @@ -4867,6 +5081,7 @@ "json-buffer": "3.0.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/keyv": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", @@ -4886,6 +5101,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/kleur": { "version": "3.0.3", @@ -4897,6 +5114,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/latest-version": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", @@ -4911,6 +5129,8 @@ "node": ">=8" } }, +<<<<<<< HEAD +======= "node_modules/lerna": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/lerna/-/lerna-4.0.0.tgz", @@ -4924,6 +5144,7 @@ "node": ">=8" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -4970,6 +5191,8 @@ "integrity": "sha512-w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA==", "dev": true }, +<<<<<<< HEAD +======= "node_modules/load-json-file": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz", @@ -4995,6 +5218,7 @@ "integrity": "sha512-w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA==", "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -5023,6 +5247,8 @@ "dev": true, "peer": true }, +<<<<<<< HEAD +======= "node_modules/lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", @@ -5123,6 +5349,7 @@ }, <<<<<<< HEAD ======= +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", @@ -5296,6 +5523,8 @@ "node": ">=4" } }, +<<<<<<< HEAD +======= "node_modules/mime-db": { "version": "1.47.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", @@ -5309,6 +5538,7 @@ "node": ">=4" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/mimic-fn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", @@ -5398,6 +5628,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/node-gyp": { "version": "5.1.1", @@ -5580,6 +5812,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/normalize-package-data": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz", @@ -5625,6 +5858,8 @@ "node": ">=8" } }, +<<<<<<< HEAD +======= "node_modules/on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -5637,6 +5872,7 @@ "node": ">= 0.8" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -5686,6 +5922,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/open/node_modules/is-wsl": { "version": "1.1.0", @@ -5697,6 +5935,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/opencollective-postinstall": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz", @@ -5732,6 +5971,8 @@ <<<<<<< HEAD ======= }, +<<<<<<< HEAD +======= "node_modules/os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", @@ -5753,6 +5994,7 @@ }, <<<<<<< HEAD ======= +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/p-cancelable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", @@ -5762,6 +6004,8 @@ "node": ">=6" } }, +<<<<<<< HEAD +======= "node_modules/p-each-series": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz", @@ -5775,6 +6019,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/p-event": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz", @@ -5894,6 +6139,8 @@ "semver": "bin/semver.js" } }, +<<<<<<< HEAD +======= "node_modules/pacote": { "version": "11.3.3", "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.3.tgz", @@ -5904,6 +6151,7 @@ "semver": "bin/semver.js" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -5927,6 +6175,8 @@ <<<<<<< HEAD ======= }, +<<<<<<< HEAD +======= "node_modules/parse-github-repo-url": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz", @@ -5934,6 +6184,7 @@ "dev": true >>>>>>> upstream/fix-ci }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/parse-json": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", @@ -5953,6 +6204,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/parse-path": { "version": "4.0.3", @@ -5985,6 +6238,7 @@ "dev": true }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -5996,6 +6250,8 @@ "node": ">= 0.8" } }, +<<<<<<< HEAD +======= "node_modules/pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", @@ -6006,6 +6262,7 @@ "node": ">= 0.8" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -6081,6 +6338,11 @@ } }, "node_modules/prettier": { +<<<<<<< HEAD + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz", + "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==", +======= <<<<<<< HEAD "version": "2.6.2", "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz", @@ -6090,6 +6352,7 @@ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz", "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==", >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -6113,6 +6376,12 @@ "node": ">=6.0.0" } }, +<<<<<<< HEAD + "node_modules/prismjs": { + "version": "1.24.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.24.0.tgz", + "integrity": "sha512-SqV5GRsNqnzCL8k5dfAjCNhUrF3pR0A9lTDSCUZeh/LIshheXJEaP0hwLz2t4XHivd2J/v2HR+gRnigzeKe3cQ==", +======= <<<<<<< HEAD "node_modules/prismjs": { "version": "1.24.0", @@ -6217,6 +6486,7 @@ "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "dev": true }, "node_modules/pump": { @@ -6324,6 +6594,8 @@ "node": ">=0.10.0" } }, +<<<<<<< HEAD +======= "node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", @@ -6364,6 +6636,7 @@ "node": ">=0.10.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/read-pkg": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", @@ -6507,6 +6780,8 @@ "node": ">= 6" } }, +<<<<<<< HEAD +======= "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -6522,10 +6797,11 @@ "once": "^1.3.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/readdirp": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", - "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, "dependencies": { "picomatch": "^2.2.1" @@ -6534,6 +6810,8 @@ "node": ">=8.10.0" } }, +<<<<<<< HEAD +======= "node_modules/readline2": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz", @@ -6576,6 +6854,7 @@ "node": ">=8.10.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/redent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", @@ -6590,6 +6869,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/regenerator-runtime": { "version": "0.10.5", @@ -6611,6 +6892,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/regexpp": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", @@ -6649,6 +6931,8 @@ "node": ">=8" } }, +<<<<<<< HEAD +======= "node_modules/remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", @@ -6698,6 +6982,7 @@ "node": ">=8" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -6755,6 +7040,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "node_modules/resolve-url": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", @@ -6763,6 +7050,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/responselike": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", @@ -6774,6 +7062,8 @@ "lowercase-keys": "^1.0.0" } }, +<<<<<<< HEAD +======= "node_modules/restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -6784,6 +7074,7 @@ "lowercase-keys": "^1.0.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -6834,6 +7125,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/rx-lite": { "version": "3.1.2", @@ -6854,6 +7147,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -6873,6 +7167,8 @@ "url": "https://feross.org/support" } ] +<<<<<<< HEAD +======= }, "node_modules/select": { "version": "1.1.2", @@ -6880,6 +7176,7 @@ "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=", "dev": true, "optional": true +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 }, "node_modules/semver": { "version": "7.3.7", @@ -7002,6 +7299,8 @@ "dev": true }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/set-value": { "version": "2.0.1", @@ -7052,6 +7351,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/setprototypeof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", @@ -7060,6 +7360,8 @@ <<<<<<< HEAD ======= }, +<<<<<<< HEAD +======= "node_modules/shallow-clone": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", @@ -7073,6 +7375,7 @@ } >>>>>>> upstream/fix-ci }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -7150,6 +7453,8 @@ "readable-stream": "^3.0.0" } }, +<<<<<<< HEAD +======= "node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -7258,6 +7563,7 @@ "node": ">=0.10.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -7267,6 +7573,8 @@ "node": ">= 0.6" } }, +<<<<<<< HEAD +======= "node_modules/stealthy-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", @@ -7286,6 +7594,7 @@ >>>>>>> upstream/fix-ci } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -7367,6 +7676,8 @@ "node": ">=8" } }, +<<<<<<< HEAD +======= "node_modules/term-size": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz", @@ -7487,6 +7798,7 @@ "uuid": "bin/uuid" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/term-size": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz", @@ -7499,6 +7811,8 @@ "url": "https://github.com/sponsors/sindresorhus" } }, +<<<<<<< HEAD +======= "node_modules/terminal-link": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", @@ -7516,6 +7830,7 @@ "url": "https://github.com/sponsors/sindresorhus" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/text-extensions": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz", @@ -7532,12 +7847,6 @@ "dev": true, "peer": true }, - "node_modules/throat": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz", - "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==", - "dev": true - }, "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -7554,6 +7863,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/tiny-emitter": { "version": "2.1.0", @@ -7563,6 +7874,7 @@ "optional": true }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/tinydate": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/tinydate/-/tinydate-1.3.0.tgz", @@ -7574,6 +7886,8 @@ "node": ">=4" } }, +<<<<<<< HEAD +======= "node_modules/tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -7626,6 +7940,7 @@ "node": ">=0.10.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/to-readable-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", @@ -7635,6 +7950,8 @@ "node": ">=6" } }, +<<<<<<< HEAD +======= "node_modules/to-regex": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", @@ -7651,6 +7968,7 @@ >>>>>>> upstream/fix-ci } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -7674,6 +7992,8 @@ "node": ">=0.6" } }, +<<<<<<< HEAD +======= "node_modules/tough-cookie": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz", @@ -7698,6 +8018,7 @@ "node": ">=0.6" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/trim-newlines": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", @@ -7771,12 +8092,15 @@ "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" } }, +<<<<<<< HEAD +======= "node_modules/tweezer.js": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/tweezer.js/-/tweezer.js-1.5.0.tgz", "integrity": "sha512-aSiJz7rGWNAQq7hjMK9ZYDuEawXupcCWgl3woQQSoDP2Oh8O4srWb/uO1PzzHIsrPEOqrjJ2sUb9FERfzuBabQ==", "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/tweezer.js": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/tweezer.js/-/tweezer.js-1.5.0.tgz", @@ -7801,6 +8125,7 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, + "peer": true, "engines": { "node": ">=10" }, @@ -7830,6 +8155,8 @@ "node": ">=4.2.0" } }, +<<<<<<< HEAD +======= "node_modules/unique-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", @@ -7916,6 +8243,7 @@ "imurmurhash": "^0.1.4" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/unique-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", @@ -7928,6 +8256,8 @@ "node": ">=8" } }, +<<<<<<< HEAD +======= "node_modules/universal-user-agent": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz", @@ -7935,6 +8265,7 @@ "dev": true }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", @@ -7955,6 +8286,8 @@ "node": ">= 0.8" } }, +<<<<<<< HEAD +======= "node_modules/unset-value": { >>>>>>> upstream/fix-ci "version": "1.0.0", @@ -8005,6 +8338,7 @@ "node": ">=8" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/update-notifier": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz", @@ -8055,6 +8389,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/urix": { "version": "0.1.0", @@ -8064,6 +8400,7 @@ "dev": true }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/url-parse-lax": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", @@ -8078,6 +8415,8 @@ "node": ">=4" } }, +<<<<<<< HEAD +======= "node_modules/use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", @@ -8091,12 +8430,15 @@ "node": ">=4" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, +<<<<<<< HEAD +======= "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -8110,6 +8452,7 @@ "object.getownpropertydescriptors": "^2.0.3" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -8119,6 +8462,8 @@ "node": ">= 0.4.0" } }, +<<<<<<< HEAD +======= "node_modules/uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", @@ -8130,6 +8475,7 @@ >>>>>>> upstream/fix-ci } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", @@ -8154,6 +8500,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node_modules/validate-npm-package-name": { "version": "3.0.0", @@ -8469,6 +8817,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -8490,6 +8839,8 @@ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, +<<<<<<< HEAD +======= "node_modules/widest-line": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", @@ -8502,6 +8853,7 @@ "node": ">=8" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/widest-line": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", @@ -8524,6 +8876,8 @@ "node": ">=0.10.0" } }, +<<<<<<< HEAD +======= "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -8541,95 +8895,22 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/wrap-ansi/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/wrap-ansi/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "node_modules/wrap-ansi/node_modules/emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" + "node": ">=10" }, - "engines": { - "node": ">=6" + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, "node_modules/wrappy": { @@ -8682,6 +8963,8 @@ "node": ">=8" } }, +<<<<<<< HEAD +======= "node_modules/xml-name-validator": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", @@ -8704,6 +8987,7 @@ "node": ">=8" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -8774,6 +9058,9 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/yargonaut/node_modules/escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -8783,8 +9070,11 @@ "node": ">=0.8.0" } }, +<<<<<<< HEAD +======= ======= >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "node_modules/yargonaut/node_modules/strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", @@ -9067,6 +9357,8 @@ "@commitlint/types": "^16.2.1", "conventional-changelog-angular": "^5.0.11", "conventional-commits-parser": "^3.2.2" +<<<<<<< HEAD +======= } }, "@commitlint/prompt": { @@ -9091,6 +9383,7 @@ "requires": { "@commitlint/prompt": "^12.1.4", "execa": "^5.0.0" +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 } }, "@commitlint/read": { @@ -9187,6 +9480,14 @@ "js-yaml": "^4.1.0", "minimatch": "^3.0.4", "strip-json-comments": "^3.1.1" +<<<<<<< HEAD + } + }, + "@humanwhocodes/config-array": { + "version": "0.9.5", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", + "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", +======= } }, "@humanwhocodes/config-array": { @@ -9670,38 +9971,78 @@ "version": "6.2.2", "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "dev": true, + "peer": true, "requires": { - "camelcase": "^5.3.1", - "map-obj": "^4.0.0", - "quick-lru": "^4.0.1" +<<<<<<< HEAD + "@humanwhocodes/object-schema": "^1.2.1", + "debug": "^4.1.1", + "minimatch": "^3.0.4" } }, - "chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "@humanwhocodes/object-schema": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } + "peer": true }, - "chokidar": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", - "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", + "@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, "requires": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "fsevents": "~2.3.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - } + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + } + }, + "@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true + }, + "@nodelib/fs.walk": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz", + "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==", + "dev": true, + "requires": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" +======= + "camelcase": "^5.3.1", + "map-obj": "^4.0.0", + "quick-lru": "^4.0.1" + } + }, + "chalk": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "chokidar": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", + "dev": true, + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + } }, "ci-info": { "version": "2.0.0", @@ -10321,6 +10662,7 @@ "dev": true, "requires": { "@octokit/openapi-types": "^7.0.0" +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 } }, "@sindresorhus/is": { @@ -10329,24 +10671,6 @@ "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", "dev": true }, - "@sinonjs/commons": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", - "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==", - "dev": true, - "requires": { - "type-detect": "4.0.8" - } - }, - "@sinonjs/fake-timers": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz", - "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.7.0" - } - }, "@szmarczak/http-timer": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", @@ -10356,123 +10680,34 @@ "defer-to-connect": "^1.0.1" } }, - "@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "@tsconfig/node10": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", + "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", "dev": true }, "@tsconfig/node12": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.7.tgz", - "integrity": "sha512-dgasobK/Y0wVMswcipr3k0HpevxFJLijN03A8mYfEPvWvOs14v0ZlYTR4kIgMx8g4+fTyTFv8/jLCIfRqLDJ4A==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", + "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", "dev": true }, - "@types/babel__core": { - "version": "7.1.14", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz", - "integrity": "sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==", - "dev": true, - "requires": { - "@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.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz", - "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==", - "dev": true, - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@types/babel__template": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz", - "integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==", - "dev": true, - "requires": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "@types/babel__traverse": { - "version": "7.11.1", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz", - "integrity": "sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==", - "dev": true, - "requires": { - "@babel/types": "^7.3.0" - } - }, - "@types/glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", - "dev": true, - "requires": { - "@types/minimatch": "*", - "@types/node": "*" - } - }, - "@types/graceful-fs": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz", - "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/istanbul-lib-coverage": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", - "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==", + "@tsconfig/node14": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", + "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", "dev": true }, - "@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", - "dev": true, - "requires": { - "@types/istanbul-lib-coverage": "*" - } - }, - "@types/istanbul-reports": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", - "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", - "dev": true, - "requires": { - "@types/istanbul-lib-report": "*" - } - }, - "@types/jest": { - "version": "26.0.23", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.23.tgz", - "integrity": "sha512-ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA==", - "dev": true, - "requires": { - "jest-diff": "^26.0.0", - "pretty-format": "^26.0.0" - } + "@tsconfig/node16": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", + "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", + "dev": true }, "@types/json-schema": { - "version": "7.0.7", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz", - "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==", - "dev": true, - "peer": true - }, - "@types/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==", + "version": "7.0.11", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", "dev": true }, "@types/minimist": { @@ -10482,9 +10717,9 @@ "dev": true }, "@types/node": { - "version": "15.3.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.3.1.tgz", - "integrity": "sha512-weaeiP4UF4XgF++3rpQhpIJWsCTS4QJw5gvBhQu6cFIxTwyxWIe3xbnrY/o2lTCQ0lsdb8YIUDUvLR4Vuz5rbw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", + "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==", "dev": true }, "@types/normalize-package-data": { @@ -10499,208 +10734,135 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, - "@types/prettier": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.2.3.tgz", - "integrity": "sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==", - "dev": true - }, - "@types/stack-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz", - "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==", - "dev": true - }, - "@types/yargs": { - "version": "15.0.13", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz", - "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==", - "dev": true, - "requires": { - "@types/yargs-parser": "*" - } - }, - "@types/yargs-parser": { - "version": "20.2.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz", - "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==", - "dev": true - }, "@typescript-eslint/eslint-plugin": { - "version": "4.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.24.0.tgz", - "integrity": "sha512-qbCgkPM7DWTsYQGjx9RTuQGswi+bEt0isqDBeo+CKV0953zqI0Tp7CZ7Fi9ipgFA6mcQqF4NOVNwS/f2r6xShw==", + "version": "5.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.21.0.tgz", + "integrity": "sha512-fTU85q8v5ZLpoZEyn/u1S2qrFOhi33Edo2CZ0+q1gDaWWm0JuPh3bgOyU8lM0edIEYgKLDkPFiZX2MOupgjlyg==", "dev": true, - "peer": true, "requires": { - "@typescript-eslint/experimental-utils": "4.24.0", - "@typescript-eslint/scope-manager": "4.24.0", - "debug": "^4.1.1", + "@typescript-eslint/scope-manager": "5.21.0", + "@typescript-eslint/type-utils": "5.21.0", + "@typescript-eslint/utils": "5.21.0", + "debug": "^4.3.2", "functional-red-black-tree": "^1.0.1", - "lodash": "^4.17.15", - "regexpp": "^3.0.0", - "semver": "^7.3.2", - "tsutils": "^3.17.1" + "ignore": "^5.1.8", + "regexpp": "^3.2.0", + "semver": "^7.3.5", + "tsutils": "^3.21.0" } }, - "@typescript-eslint/experimental-utils": { - "version": "4.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.24.0.tgz", - "integrity": "sha512-IwTT2VNDKH1h8RZseMH4CcYBz6lTvRoOLDuuqNZZoThvfHEhOiZPQCow+5El3PtyxJ1iDr6UXZwYtE3yZQjhcw==", + "@typescript-eslint/parser": { + "version": "5.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.21.0.tgz", + "integrity": "sha512-8RUwTO77hstXUr3pZoWZbRQUxXcSXafZ8/5gpnQCfXvgmP9gpNlRGlWzvfbEQ14TLjmtU8eGnONkff8U2ui2Eg==", "dev": true, - "peer": true, "requires": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.24.0", - "@typescript-eslint/types": "4.24.0", - "@typescript-eslint/typescript-estree": "4.24.0", - "eslint-scope": "^5.0.0", - "eslint-utils": "^2.0.0" + "@typescript-eslint/scope-manager": "5.21.0", + "@typescript-eslint/types": "5.21.0", + "@typescript-eslint/typescript-estree": "5.21.0", + "debug": "^4.3.2" } }, - "@typescript-eslint/parser": { - "version": "4.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.24.0.tgz", - "integrity": "sha512-dj1ZIh/4QKeECLb2f/QjRwMmDArcwc2WorWPRlB8UNTZlY1KpTVsbX7e3ZZdphfRw29aTFUSNuGB8w9X5sS97w==", + "@typescript-eslint/scope-manager": { + "version": "5.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.21.0.tgz", + "integrity": "sha512-XTX0g0IhvzcH/e3393SvjRCfYQxgxtYzL3UREteUneo72EFlt7UNoiYnikUtmGVobTbhUDByhJ4xRBNe+34kOQ==", "dev": true, - "peer": true, "requires": { - "@typescript-eslint/scope-manager": "4.24.0", - "@typescript-eslint/types": "4.24.0", - "@typescript-eslint/typescript-estree": "4.24.0", - "debug": "^4.1.1" + "@typescript-eslint/types": "5.21.0", + "@typescript-eslint/visitor-keys": "5.21.0" } }, - "@typescript-eslint/scope-manager": { - "version": "4.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.24.0.tgz", - "integrity": "sha512-9+WYJGDnuC9VtYLqBhcSuM7du75fyCS/ypC8c5g7Sdw7pGL4NDTbeH38eJPfzIydCHZDoOgjloxSAA3+4l/zsA==", + "@typescript-eslint/type-utils": { + "version": "5.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.21.0.tgz", + "integrity": "sha512-MxmLZj0tkGlkcZCSE17ORaHl8Th3JQwBzyXL/uvC6sNmu128LsgjTX0NIzy+wdH2J7Pd02GN8FaoudJntFvSOw==", "dev": true, - "peer": true, "requires": { - "@typescript-eslint/types": "4.24.0", - "@typescript-eslint/visitor-keys": "4.24.0" + "@typescript-eslint/utils": "5.21.0", + "debug": "^4.3.2", + "tsutils": "^3.21.0" } }, "@typescript-eslint/types": { - "version": "4.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.24.0.tgz", - "integrity": "sha512-tkZUBgDQKdvfs8L47LaqxojKDE+mIUmOzdz7r+u+U54l3GDkTpEbQ1Jp3cNqqAU9vMUCBA1fitsIhm7yN0vx9Q==", - "dev": true, - "peer": true + "version": "5.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.21.0.tgz", + "integrity": "sha512-XnOOo5Wc2cBlq8Lh5WNvAgHzpjnEzxn4CJBwGkcau7b/tZ556qrWXQz4DJyChYg8JZAD06kczrdgFPpEQZfDsA==", + "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.24.0.tgz", - "integrity": "sha512-kBDitL/by/HK7g8CYLT7aKpAwlR8doshfWz8d71j97n5kUa5caHWvY0RvEUEanL/EqBJoANev8Xc/mQ6LLwXGA==", + "version": "5.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.21.0.tgz", + "integrity": "sha512-Y8Y2T2FNvm08qlcoSMoNchh9y2Uj3QmjtwNMdRQkcFG7Muz//wfJBGBxh8R7HAGQFpgYpdHqUpEoPQk+q9Kjfg==", "dev": true, - "peer": true, "requires": { - "@typescript-eslint/types": "4.24.0", - "@typescript-eslint/visitor-keys": "4.24.0", - "debug": "^4.1.1", - "globby": "^11.0.1", - "is-glob": "^4.0.1", - "semver": "^7.3.2", - "tsutils": "^3.17.1" + "@typescript-eslint/types": "5.21.0", + "@typescript-eslint/visitor-keys": "5.21.0", + "debug": "^4.3.2", + "globby": "^11.0.4", + "is-glob": "^4.0.3", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + } + }, + "@typescript-eslint/utils": { + "version": "5.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.21.0.tgz", + "integrity": "sha512-q/emogbND9wry7zxy7VYri+7ydawo2HDZhRZ5k6yggIvXa7PvBbAAZ4PFH/oZLem72ezC4Pr63rJvDK/sTlL8Q==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.9", + "@typescript-eslint/scope-manager": "5.21.0", + "@typescript-eslint/types": "5.21.0", + "@typescript-eslint/typescript-estree": "5.21.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" } }, "@typescript-eslint/visitor-keys": { - "version": "4.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.24.0.tgz", - "integrity": "sha512-4ox1sjmGHIxjEDBnMCtWFFhErXtKA1Ec0sBpuz0fqf3P+g3JFGyTxxbF06byw0FRsPnnbq44cKivH7Ks1/0s6g==", + "version": "5.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.21.0.tgz", + "integrity": "sha512-SX8jNN+iHqAF0riZQMkm7e8+POXa/fXw5cxL+gjpyP+FI+JVNhii53EmQgDAfDcBpFekYSlO0fGytMQwRiMQCA==", "dev": true, - "peer": true, "requires": { - "@typescript-eslint/types": "4.24.0", - "eslint-visitor-keys": "^2.0.0" + "@typescript-eslint/types": "5.21.0", + "eslint-visitor-keys": "^3.0.0" } }, "@typicode/eslint-config": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@typicode/eslint-config/-/eslint-config-0.1.2.tgz", - "integrity": "sha512-FfSoqZW7izvnSlt/gWvyjv/7DlMtsLcC4ahIhGO6tUhqHuUk4/MiPlIYds1E0RjdLIfnHYfAghwtNMo6FDm52g==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@typicode/eslint-config/-/eslint-config-1.0.0.tgz", + "integrity": "sha512-a7mMcZWjX4isf91bhu6OwkgzJUYa/RxsOJNx3Tl59FEuyyaoUXKWG0l5YmjshUZXBlxE5SCjMQKcv/4Mu0h/pg==", "dev": true, - "requires": {} - }, - "abab": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", - "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==", - "dev": true - }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true + "requires": { + "@typescript-eslint/eslint-plugin": "^5.14.0", + "@typescript-eslint/parser": "^5.14.0", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-simple-import-sort": "^7.0.0", + "prettier": "^2.5.1" + } }, "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "version": "8.7.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", + "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", "dev": true }, - "acorn-globals": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", - "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", - "dev": true, - "requires": { - "acorn": "^7.1.1", - "acorn-walk": "^7.1.1" - } - }, "acorn-jsx": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", - "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, "peer": true, "requires": {} }, "acorn-walk": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", - "dev": true - }, - "add-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz", - "integrity": "sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", "dev": true }, - "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "requires": { - "debug": "4" - } - }, - "agentkeepalive": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz", - "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "depd": "^1.1.2", - "humanize-ms": "^1.2.1" - } - }, - "aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - } - }, "ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -10768,27 +10930,10 @@ "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", "dev": true }, - "ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "requires": { - "type-fest": "^0.21.3" - }, - "dependencies": { - "type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true - } - } - }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { @@ -10810,86 +10955,18 @@ "picomatch": "^2.0.4" } }, - "aproba": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", - "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", + "arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", "dev": true }, - "are-we-there-yet": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", - "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", - "dev": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true - }, - "arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", - "dev": true - }, - "array-differ": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", - "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==", - "dev": true - }, - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true + "peer": true }, "array-ify": { "version": "1.0.0", @@ -10903,234 +10980,18 @@ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true - }, "arrify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", - "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", - "dev": true - }, - "asap": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", - "dev": true - }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "dev": true, - "requires": { - "safer-buffer": "~2.1.0" - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - }, - "assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", - "dev": true - }, - "astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "dev": true, - "peer": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, - "at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true - }, - "atob": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", - "dev": true - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true - }, - "aws4": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", - "dev": true - }, - "babel-jest": { - "version": "26.6.3", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz", - "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==", - "dev": true, - "requires": { - "@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-plugin-istanbul": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz", - "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==", - "dev": true, - "requires": { - "@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": { - "version": "26.6.2", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz", - "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==", - "dev": true, - "requires": { - "@babel/template": "^7.3.3", - "@babel/types": "^7.3.3", - "@types/babel__core": "^7.0.0", - "@types/babel__traverse": "^7.0.6" - } - }, - "babel-polyfill": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz", - "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "core-js": "^2.5.0", - "regenerator-runtime": "^0.10.5" - } - }, - "babel-preset-current-node-syntax": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", - "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", - "dev": true, - "requires": { - "@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": { - "version": "26.6.2", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz", - "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==", - "dev": true, - "requires": { - "babel-plugin-jest-hoist": "^26.6.2", - "babel-preset-current-node-syntax": "^1.0.0" - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - }, - "dependencies": { - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - } - } + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "dev": true }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, - "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - } - } - }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "dev": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, - "before-after-hook": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.1.tgz", - "integrity": "sha512-/6FKxSTWoJdbsLDF8tdIjaRiFXiE6UHsEHE3OPI/cwPURCVi1ukP0gmLn7XWEiFk5TcwQjjY5PWsU+j+tgXgmw==", - "dev": true + "peer": true }, "binary-extensions": { "version": "2.2.0", @@ -11177,6 +11038,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "peer": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -11191,139 +11053,10 @@ "fill-range": "^7.0.1" } }, - "browser-process-hrtime": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", - "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", - "dev": true - }, - "browserslist": { - "version": "4.16.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", - "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30001219", - "colorette": "^1.2.2", - "electron-to-chromium": "^1.3.723", - "escalade": "^3.1.1", - "node-releases": "^1.1.71" - } - }, - "bs-logger": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", - "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", - "dev": true, - "requires": { - "fast-json-stable-stringify": "2.x" - } - }, - "bser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", - "dev": true, - "requires": { - "node-int64": "^0.4.0" - } - }, - "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", - "dev": true - }, - "builtins": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz", - "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=", - "dev": true - }, - "byline": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz", - "integrity": "sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=", - "dev": true - }, - "byte-size": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-7.0.1.tgz", - "integrity": "sha512-crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A==", - "dev": true - }, - "cacache": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.1.0.tgz", - "integrity": "sha512-mfx0C+mCfWjD1PnwQ9yaOrwG1ou9FkKnx0SvzUHWdFt7r7GaRtzT+9M8HAvLu62zIHtnpQ/1m93nWNDCckJGXQ==", - "dev": true, - "requires": { - "@npmcli/move-file": "^1.0.1", - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "glob": "^7.1.4", - "infer-owner": "^1.0.4", - "lru-cache": "^6.0.0", - "minipass": "^3.1.1", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^1.0.3", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.1", - "tar": "^6.0.2", - "unique-filename": "^1.1.1" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "requires": { - "aggregate-error": "^3.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } - } - }, - "cache-base": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "dev": true, - "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" - } - }, - "cacheable-request": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", - "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", + "cacheable-request": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", + "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", "dev": true, "requires": { "clone-response": "^1.0.2", @@ -11349,31 +11082,9 @@ "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", "dev": true - }, - "normalize-url": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", - "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==", - "dev": true } } }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "call-me-maybe": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", - "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=", - "dev": true - }, "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -11397,27 +11108,6 @@ "quick-lru": "^4.0.1" } }, - "caniuse-lite": { - "version": "1.0.30001228", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz", - "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==", - "dev": true - }, - "capture-exit": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz", - "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==", - "dev": true, - "requires": { - "rsvp": "^4.8.4" - } - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, "chalk": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", @@ -11428,171 +11118,34 @@ "supports-color": "^7.1.0" } }, - "char-regex": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", - "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", - "dev": true - }, - "chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true - }, "chokidar": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", - "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", "dev": true, "requires": { - "anymatch": "~3.1.1", + "anymatch": "~3.1.2", "braces": "~3.0.2", - "fsevents": "~2.3.1", - "glob-parent": "~5.1.0", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" + "readdirp": "~3.6.0" } }, - "chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true - }, "ci-info": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", "dev": true }, - "cjs-module-lexer": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz", - "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==", - "dev": true - }, - "class-utils": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "dev": true, - "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } - } - }, - "clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true - }, "cli-boxes": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==", "dev": true }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, - "requires": { - "restore-cursor": "^3.1.0" - } - }, - "cli-width": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", - "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", - "dev": true - }, - "clipboard": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz", - "integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==", - "dev": true, - "optional": true, - "requires": { - "good-listener": "^1.2.2", - "select": "^1.1.2", - "tiny-emitter": "^2.0.0" - } - }, "cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -11602,6 +11155,8 @@ "string-width": "^4.2.0", "strip-ansi": "^6.0.0", "wrap-ansi": "^7.0.0" +<<<<<<< HEAD +======= }, "dependencies": { >>>>>>> upstream/fix-ci @@ -11646,6 +11201,7 @@ "isobject": "^3.0.1" } } +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 } }, "clone-response": { @@ -11657,43 +11213,6 @@ "mimic-response": "^1.0.0" } }, - "cmd-shim": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-4.1.0.tgz", - "integrity": "sha512-lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw==", - "dev": true, - "requires": { - "mkdirp-infer-owner": "^2.0.0" - } - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", - "dev": true - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true - }, - "collect-v8-coverage": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", - "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", - "dev": true - }, - "collection-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "dev": true, - "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" - } - }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -11709,48 +11228,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "colorette": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", - "dev": true - }, - "columnify": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz", - "integrity": "sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs=", - "dev": true, - "requires": { - "strip-ansi": "^3.0.0", - "wcwidth": "^1.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } - } - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, "compare-func": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz", @@ -11761,39 +11238,12 @@ "dot-prop": "^5.1.0" } }, - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", - "dev": true - }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "concat-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", - "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.0.2", - "typedarray": "^0.0.6" - } - }, - "config-chain": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", - "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", "dev": true, - "requires": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } + "peer": true }, "configstore": { "version": "5.0.1", @@ -11809,198 +11259,72 @@ "xdg-basedir": "^4.0.0" } }, - "connect": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz", - "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==", - "dev": true, - "requires": { - "debug": "2.6.9", - "finalhandler": "1.1.2", - "parseurl": "~1.3.3", - "utils-merge": "1.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "connect-livereload": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.6.1.tgz", - "integrity": "sha512-3R0kMOdL7CjJpU66fzAkCe6HNtd3AavCS4m+uW4KtJjrdGPT0SQEZieAYd+cm+lJoBznNQ4lqipYWkhBMgk00g==", - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true - }, - "conventional-changelog-angular": { - "version": "5.0.12", - "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz", - "integrity": "sha512-5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw==", - "dev": true, - "requires": { - "compare-func": "^2.0.0", - "q": "^1.5.1" - } - }, - "conventional-changelog-conventionalcommits": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.0.tgz", - "integrity": "sha512-sj9tj3z5cnHaSJCYObA9nISf7eq/YjscLPoq6nmew4SiOjxqL2KRpK20fjnjVbpNDjJ2HR3MoVcWKXwbVvzS0A==", - "dev": true, - "requires": { - "compare-func": "^2.0.0", - "lodash": "^4.17.15", - "q": "^1.5.1" - } - }, - "conventional-changelog-core": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.2.tgz", - "integrity": "sha512-7pDpRUiobQDNkwHyJG7k9f6maPo9tfPzkSWbRq97GGiZqisElhnvUZSvyQH20ogfOjntB5aadvv6NNcKL1sReg==", - "dev": true, - "requires": { - "add-stream": "^1.0.0", - "conventional-changelog-writer": "^4.0.18", - "conventional-commits-parser": "^3.2.0", - "dateformat": "^3.0.0", - "get-pkg-repo": "^1.0.0", - "git-raw-commits": "^2.0.8", - "git-remote-origin-url": "^2.0.0", - "git-semver-tags": "^4.1.1", - "lodash": "^4.17.15", - "normalize-package-data": "^3.0.0", - "q": "^1.5.1", - "read-pkg": "^3.0.0", - "read-pkg-up": "^3.0.0", - "shelljs": "^0.8.3", - "through2": "^4.0.0" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "connect": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz", + "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==", + "dev": true, + "requires": { + "debug": "2.6.9", + "finalhandler": "1.1.2", + "parseurl": "~1.3.3", + "utils-merge": "1.0.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "requires": { - "p-try": "^1.0.0" + "ms": "2.0.0" } }, - "p-locate": { + "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true - }, - "read-pkg-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", - "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", - "dev": true, - "requires": { - "find-up": "^2.0.0", - "read-pkg": "^3.0.0" - } } } }, - "conventional-changelog-preset-loader": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz", - "integrity": "sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==", + "connect-history-api-fallback": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", + "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", "dev": true }, - "conventional-changelog-writer": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.1.0.tgz", - "integrity": "sha512-WwKcUp7WyXYGQmkLsX4QmU42AZ1lqlvRW9mqoyiQzdD+rJWbTepdWoKJuwXTS+yq79XKnQNa93/roViPQrAQgw==", + "connect-livereload": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.6.1.tgz", + "integrity": "sha512-3R0kMOdL7CjJpU66fzAkCe6HNtd3AavCS4m+uW4KtJjrdGPT0SQEZieAYd+cm+lJoBznNQ4lqipYWkhBMgk00g==", + "dev": true + }, + "conventional-changelog-angular": { + "version": "5.0.13", + "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz", + "integrity": "sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==", "dev": true, "requires": { "compare-func": "^2.0.0", - "conventional-commits-filter": "^2.0.7", - "dateformat": "^3.0.0", - "handlebars": "^4.7.6", - "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.15", - "meow": "^8.0.0", - "semver": "^6.0.0", - "split": "^1.0.0", - "through2": "^4.0.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } + "q": "^1.5.1" } }, - "conventional-commits-filter": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz", - "integrity": "sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==", + "conventional-changelog-conventionalcommits": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.0.tgz", + "integrity": "sha512-sj9tj3z5cnHaSJCYObA9nISf7eq/YjscLPoq6nmew4SiOjxqL2KRpK20fjnjVbpNDjJ2HR3MoVcWKXwbVvzS0A==", "dev": true, "requires": { - "lodash.ismatch": "^4.4.0", - "modify-values": "^1.0.0" + "compare-func": "^2.0.0", + "lodash": "^4.17.15", + "q": "^1.5.1" } }, "conventional-commits-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.1.tgz", - "integrity": "sha512-OG9kQtmMZBJD/32NEw5IhN5+HnBqVjy03eC+I71I0oQRFA5rOgA4OtPOYG7mz1GkCfCNxn3gKIX8EiHJYuf1cA==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz", + "integrity": "sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==", "dev": true, "requires": { "is-text-path": "^1.0.1", @@ -12008,57 +11332,13 @@ "lodash": "^4.17.15", "meow": "^8.0.0", "split2": "^3.0.0", - "through2": "^4.0.0", - "trim-off-newlines": "^1.0.0" - } - }, - "conventional-recommended-bump": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz", - "integrity": "sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw==", - "dev": true, - "requires": { - "concat-stream": "^2.0.0", - "conventional-changelog-preset-loader": "^2.3.4", - "conventional-commits-filter": "^2.0.7", - "conventional-commits-parser": "^3.2.0", - "git-raw-commits": "^2.0.8", - "git-semver-tags": "^4.1.1", - "meow": "^8.0.0", - "q": "^1.5.1" - } - }, - "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.1" + "through2": "^4.0.0" } }, - "copy-descriptor": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", - "dev": true - }, - "core-js": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", - "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, "cosmiconfig": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", - "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", + "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", "dev": true, "requires": { "@types/parse-json": "^4.0.0", @@ -12068,6 +11348,16 @@ "yaml": "^1.10.0" } }, + "cosmiconfig-typescript-loader": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.9.tgz", + "integrity": "sha512-tRuMRhxN4m1Y8hP9SNYfz7jRwt8lZdWxdjg/ohg5esKmsndJIn4yT96oJVcf5x0eA11taXl+sIp+ielu529k6g==", + "dev": true, + "requires": { + "cosmiconfig": "^7", + "ts-node": "^10.7.0" + } + }, "cp-file": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz", @@ -12080,6 +11370,13 @@ "p-event": "^4.1.0" } }, +<<<<<<< HEAD + "create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true +======= "cpy": { "version": "8.1.2", "resolved": "https://registry.npmjs.org/cpy/-/cpy-8.1.2.tgz", @@ -12193,6 +11490,7 @@ } } } +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 }, "docsify-server-renderer": { "version": "4.12.1", @@ -12218,85 +11516,21 @@ "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", "dev": true }, - "cssom": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", - "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", - "dev": true - }, - "cssstyle": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", - "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", - "dev": true, - "requires": { - "cssom": "~0.3.6" - }, - "dependencies": { - "cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", - "dev": true - } - } - }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, - "requires": { - "array-find-index": "^1.0.1" - } - }, "dargs": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==", "dev": true }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, - "data-urls": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", - "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", - "dev": true, - "requires": { - "abab": "^2.0.3", - "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^8.0.0" - } - }, - "dateformat": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", - "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", - "dev": true - }, "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { "ms": "2.1.2" } }, - "debuglog": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz", - "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=", - "dev": true - }, "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", @@ -12306,222 +11540,47 @@ "decamelize-keys": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz", - "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=", - "dev": true, - "requires": { - "decamelize": "^1.1.0", - "map-obj": "^1.0.0" - }, - "dependencies": { - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true - } - } - }, - "decimal.js": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz", - "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==", - "dev": true - }, - "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", - "dev": true - }, - "decompress-response": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "dev": true, - "requires": { - "mimic-response": "^1.0.0" - } - }, - "dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=", - "dev": true - }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true - }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", - "dev": true - }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "dev": true, - "requires": { - "clone": "^1.0.2" - } - }, - "defer-to-connect": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", - "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", - "dev": true - }, - "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, - "requires": { - "object-keys": "^1.0.12" - } - }, - "define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "dev": true, - "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - } - }, - "del": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/del/-/del-5.1.0.tgz", - "integrity": "sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==", + "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=", "dev": true, "requires": { - "globby": "^10.0.1", - "graceful-fs": "^4.2.2", - "is-glob": "^4.0.1", - "is-path-cwd": "^2.2.0", - "is-path-inside": "^3.0.1", - "p-map": "^3.0.0", - "rimraf": "^3.0.0", - "slash": "^3.0.0" + "decamelize": "^1.1.0", + "map-obj": "^1.0.0" }, "dependencies": { - "globby": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", - "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", - "dev": true, - "requires": { - "@types/glob": "^7.1.1", - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.0.3", - "glob": "^7.1.3", - "ignore": "^5.1.1", - "merge2": "^1.2.3", - "slash": "^3.0.0" - } - }, - "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", "dev": true } } }, - "del-cli": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/del-cli/-/del-cli-3.0.1.tgz", - "integrity": "sha512-BLHItGr82rUbHhjMu41d+vw9Md49i81jmZSV00HdTq4t+RTHywmEht/23mNFpUl2YeLYJZJyGz4rdlMAyOxNeg==", + "decompress-response": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "dev": true, "requires": { - "del": "^5.1.0", - "meow": "^6.1.1" - }, - "dependencies": { - "meow": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/meow/-/meow-6.1.1.tgz", - "integrity": "sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==", - "dev": true, - "requires": { - "@types/minimist": "^1.2.0", - "camelcase-keys": "^6.2.2", - "decamelize-keys": "^1.1.0", - "hard-rejection": "^2.1.0", - "minimist-options": "^4.0.2", - "normalize-package-data": "^2.5.0", - "read-pkg-up": "^7.0.1", - "redent": "^3.0.0", - "trim-newlines": "^3.0.0", - "type-fest": "^0.13.1", - "yargs-parser": "^18.1.3" - } - }, - "normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - }, - "type-fest": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", - "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", - "dev": true - }, - "yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } + "mimic-response": "^1.0.0" } }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true }, - "delegate": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", - "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==", + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true, - "optional": true + "peer": true }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "defer-to-connect": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", + "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", "dev": true }, "depd": { @@ -12530,44 +11589,16 @@ "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", "dev": true }, - "deprecation": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz", - "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==", - "dev": true - }, "destroy": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", "dev": true }, - "detect-indent": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz", - "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==", - "dev": true - }, - "detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", - "dev": true - }, - "dezalgo": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz", - "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=", - "dev": true, - "requires": { - "asap": "^2.0.0", - "wrappy": "1" - } - }, - "diff-sequences": { - "version": "26.6.2", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz", - "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==", + "diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true }, "dir-glob": { @@ -12581,12 +11612,12 @@ } }, "docsify": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/docsify/-/docsify-4.12.1.tgz", - "integrity": "sha512-7v4UlCYLTmb83leJLIlheQlQ8kDTbTxcpMttRg0Uf92Nl//m0AcKFHoLLo5HHS4UhnO0KhDV8SKCdTR279zI9A==", + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/docsify/-/docsify-4.12.2.tgz", + "integrity": "sha512-hpRez5upcvkYigT2zD8P5kH5t9HpSWL8yn/ZU/g04/WfAfxVNW6CPUVOOF1EsQUDxTRuyNTFOb6uUv+tPij3tg==", "dev": true, "requires": { - "dompurify": "^2.2.6", + "dompurify": "^2.3.1", "marked": "^1.2.9", "medium-zoom": "^1.0.6", "opencollective-postinstall": "^2.0.2", @@ -12597,35 +11628,30 @@ } }, "docsify-cli": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/docsify-cli/-/docsify-cli-4.4.3.tgz", - "integrity": "sha512-oI/cD04b+hklNd9yKiN9p9EqGx9UKL6p4D0J3fS9L5fpwOti1F8p2rshGJTyArxUlw6EeEBtaJd4rzPzBkK+Lw==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/docsify-cli/-/docsify-cli-4.4.4.tgz", + "integrity": "sha512-NAZgg6b0BsDuq/Pe+P19Qb2J1d+ZVbS0eGkeCNxyu4F9/CQSsRqZqAvPJ9/0I+BCHn4sgftA2jluqhQVzKzrSA==", "dev": true, "requires": { "chalk": "^2.4.2", "connect": "^3.6.0", + "connect-history-api-fallback": "^1.6.0", "connect-livereload": "^0.6.0", "cp-file": "^7.0.0", - "docsify": "^4.12.1", + "docsify": "^4.12.2", "docsify-server-renderer": ">=4.10.0", "enquirer": "^2.3.6", "fs-extra": "^8.1.0", "get-port": "^5.0.0", - "livereload": "^0.9.1", + "livereload": "^0.9.2", "lru-cache": "^5.1.1", "open": "^6.4.0", "serve-static": "^1.12.1", "update-notifier": "^4.1.0", "yargonaut": "^1.1.2", - "yargs": "^14.2.0" + "yargs": "^15.3.0" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -12647,14 +11673,14 @@ } }, "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "dev": true, "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" } }, "color-convert": { @@ -12672,19 +11698,20 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "locate-path": "^3.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, "fs-extra": { @@ -12704,12 +11731,6 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", @@ -12720,13 +11741,12 @@ } }, "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "p-locate": "^4.1.0" } }, "p-limit": { @@ -12739,38 +11759,12 @@ } }, "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "p-limit": "^2.2.0" } }, "supports-color": { @@ -12788,6 +11782,43 @@ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", "dev": true }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + } + } + }, "y18n": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", @@ -12795,28 +11826,28 @@ "dev": true }, "yargs": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz", - "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==", + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", "dev": true, "requires": { - "cliui": "^5.0.0", + "cliui": "^6.0.0", "decamelize": "^1.2.0", - "find-up": "^3.0.0", + "find-up": "^4.1.0", "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", - "string-width": "^3.0.0", + "string-width": "^4.2.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^15.0.1" + "yargs-parser": "^18.1.2" } }, "yargs-parser": { - "version": "15.0.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz", - "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==", + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, "requires": { "camelcase": "^5.0.0", @@ -12836,17 +11867,6 @@ "dompurify": "^2.2.6", "node-fetch": "^2.6.0", "resolve-pathname": "^3.0.0" - }, - "dependencies": { - "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - } } }, "doctrine": { @@ -12859,16 +11879,19 @@ "esutils": "^2.0.2" } }, +<<<<<<< HEAD +======= "dompurify": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.6.tgz", "integrity": "sha512-OFP2u/3T1R5CEgWCEONuJ1a5+MFKnOYpkywpUSxv/dj1LeBT1erK+JwM7zK0ROy2BRhqVCf0LRw/kHqKuMkVGg==", "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "dompurify": { - "version": "2.2.8", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.8.tgz", - "integrity": "sha512-9H0UL59EkDLgY3dUFjLV6IEUaHm5qp3mxSqWw7Yyx4Zhk2Jn2cmLe+CNPP3xy13zl8Bqg+0NehQzkdMoVhGRww==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.6.tgz", + "integrity": "sha512-OFP2u/3T1R5CEgWCEONuJ1a5+MFKnOYpkywpUSxv/dj1LeBT1erK+JwM7zK0ROy2BRhqVCf0LRw/kHqKuMkVGg==", "dev": true }, "dot-prop": { @@ -12880,6 +11903,8 @@ "is-obj": "^2.0.0" } }, +<<<<<<< HEAD +======= "duplexer3": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", @@ -12888,12 +11913,15 @@ }, <<<<<<< HEAD ======= +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "duplexer3": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", "dev": true }, +<<<<<<< HEAD +======= "ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", @@ -12905,6 +11933,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -12913,6 +11942,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "electron-to-chromium": { "version": "1.3.734", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.734.tgz", @@ -12926,6 +11957,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -12940,6 +11972,8 @@ <<<<<<< HEAD ======= }, +<<<<<<< HEAD +======= "encoding": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", @@ -12963,6 +11997,7 @@ } >>>>>>> upstream/fix-ci }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -13011,6 +12046,8 @@ "dev": true }, "escape-string-regexp": { +<<<<<<< HEAD +======= "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", @@ -13024,6 +12061,7 @@ "dev": true }, "escape-string-regexp": { +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", @@ -13229,6 +12267,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "eventemitter3": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", @@ -13242,6 +12282,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", @@ -13258,6 +12299,8 @@ "signal-exit": "^3.0.3", "strip-final-newline": "^2.0.0" <<<<<<< HEAD +======= +<<<<<<< HEAD ======= } }, @@ -13287,6 +12330,7 @@ "snapdragon": "^0.8.1", "to-regex": "^3.0.1" >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 }, "dependencies": { "get-stream": { @@ -13345,6 +12389,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "fb-watchman": { "version": "2.0.1", @@ -13356,6 +12402,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "figlet": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.5.0.tgz", @@ -13364,6 +12411,8 @@ <<<<<<< HEAD ======= }, +<<<<<<< HEAD +======= "figures": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", @@ -13374,6 +12423,7 @@ } >>>>>>> upstream/fix-ci }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "file-entry-cache": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", @@ -13393,6 +12443,8 @@ "to-regex-range": "^5.0.1" } }, +<<<<<<< HEAD +======= "finalhandler": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", @@ -13425,6 +12477,7 @@ } } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "finalhandler": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", @@ -13485,6 +12538,8 @@ "dev": true, "peer": true }, +<<<<<<< HEAD +======= "fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", @@ -13519,6 +12574,7 @@ "map-cache": "^0.2.2" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", @@ -13543,6 +12599,8 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "peer": true +<<<<<<< HEAD +======= }, "fsevents": { "version": "2.3.2", @@ -13550,6 +12608,7 @@ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "optional": true +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 }, "fsevents": { "version": "2.3.2", @@ -13659,6 +12718,8 @@ "ignore": "^5.1.4", "merge2": "^1.3.0", "slash": "^3.0.0" +<<<<<<< HEAD +======= } }, "got": { @@ -13688,6 +12749,7 @@ "optional": true, "requires": { "delegate": "^3.1.2" +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 } }, "got": { @@ -13707,17 +12769,6 @@ "p-cancelable": "^1.0.0", "to-readable-stream": "^1.0.0", "url-parse-lax": "^3.0.0" - }, - "dependencies": { - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - } } }, "graceful-fs": { @@ -13760,6 +12811,8 @@ <<<<<<< HEAD ======= }, +<<<<<<< HEAD +======= "has-bigints": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", @@ -13767,12 +12820,15 @@ "dev": true >>>>>>> upstream/fix-ci }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, +<<<<<<< HEAD +======= "has-yarn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", @@ -13839,6 +12895,7 @@ } } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "has-yarn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", @@ -13893,6 +12950,8 @@ "toidentifier": "1.0.0" } }, +<<<<<<< HEAD +======= "http-proxy-agent": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", @@ -13907,6 +12966,7 @@ "toidentifier": "1.0.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", @@ -13945,6 +13005,8 @@ <<<<<<< HEAD ======= }, +<<<<<<< HEAD +======= "import-local": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz", @@ -13956,18 +13018,13 @@ } >>>>>>> upstream/fix-ci }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, - "in-publish": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz", - "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==", - "dev": true - }, "indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", @@ -14004,6 +13061,8 @@ "dev": true }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "is-bigint": { "version": "1.0.2", @@ -14012,6 +13071,7 @@ "dev": true }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -14023,6 +13083,8 @@ "binary-extensions": "^2.0.0" } }, +<<<<<<< HEAD +======= "is-boolean-object": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz", @@ -14033,6 +13095,7 @@ "binary-extensions": "^2.0.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "is-ci": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", @@ -14101,6 +13164,8 @@ <<<<<<< HEAD ======= }, +<<<<<<< HEAD +======= "is-lambda": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", @@ -14114,6 +13179,7 @@ "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==", "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "is-npm": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz", @@ -14179,6 +13245,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -14186,6 +13254,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -14209,6 +13278,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "jsbn": { "version": "0.1.1", @@ -14265,6 +13336,7 @@ "dev": true }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "json-buffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", @@ -14273,6 +13345,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -14280,6 +13354,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -14325,6 +13400,8 @@ "through": ">=2.2.7 <3" } }, +<<<<<<< HEAD +======= "keyv": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", @@ -14342,6 +13419,7 @@ "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==", "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "keyv": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", @@ -14359,6 +13437,8 @@ "dev": true }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "kleur": { "version": "3.0.3", @@ -14367,6 +13447,7 @@ "dev": true }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "latest-version": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", @@ -14378,6 +13459,8 @@ "package-json": "^6.3.0" } }, +<<<<<<< HEAD +======= "lerna": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/lerna/-/lerna-4.0.0.tgz", @@ -14388,6 +13471,7 @@ "package-json": "^6.3.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -14425,6 +13509,8 @@ "integrity": "sha512-w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA==", "dev": true }, +<<<<<<< HEAD +======= "load-json-file": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz", @@ -14444,6 +13530,7 @@ "integrity": "sha512-w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA==", "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -14466,6 +13553,8 @@ "dev": true, "peer": true }, +<<<<<<< HEAD +======= "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", @@ -14555,6 +13644,7 @@ >>>>>>> upstream/fix-ci } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", @@ -14599,6 +13689,8 @@ "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==", "dev": true }, +<<<<<<< HEAD +======= "marked": { "version": "1.2.9", "resolved": "https://registry.npmjs.org/marked/-/marked-1.2.9.tgz", @@ -14611,6 +13703,7 @@ "integrity": "sha512-UdiUWfvz9fZMg1pzf4dcuqA0W079o0mpqbTnOz5ip4VGYX96QjmbM+OgOU/0uOzAytxC0Ny4z+VcYQnhdifimg==", "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "marked": { "version": "1.2.9", "resolved": "https://registry.npmjs.org/marked/-/marked-1.2.9.tgz", @@ -14680,6 +13773,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "mime-db": { "version": "1.47.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", @@ -14687,6 +13782,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "mimic-fn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", @@ -14758,6 +13854,8 @@ "dev": true }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "node-gyp": { "version": "5.1.1", @@ -14912,6 +14010,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "normalize-package-data": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz", @@ -14945,6 +14044,8 @@ "path-key": "^3.0.0" } }, +<<<<<<< HEAD +======= "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -14954,6 +14055,7 @@ "ee-first": "1.1.1" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -14989,6 +14091,8 @@ "requires": { "is-wsl": "^1.1.0" <<<<<<< HEAD +======= +<<<<<<< HEAD ======= }, "dependencies": { @@ -14999,6 +14103,7 @@ "dev": true } >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 } }, "opencollective-postinstall": { @@ -15032,6 +14137,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", @@ -15072,6 +14179,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "p-cancelable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", @@ -15080,6 +14188,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "p-each-series": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz", @@ -15087,6 +14197,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "p-event": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz", @@ -15135,6 +14246,8 @@ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, +<<<<<<< HEAD +======= "package-json": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", @@ -15146,6 +14259,7 @@ "p-reduce": "^2.0.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "package-json": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", @@ -15169,6 +14283,8 @@ } } }, +<<<<<<< HEAD +======= "pacote": { "version": "11.3.3", "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.3.tgz", @@ -15205,6 +14321,7 @@ } } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -15222,6 +14339,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "parse-github-repo-url": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz", @@ -15229,6 +14348,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "parse-json": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", @@ -15242,6 +14362,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "parse-path": { "version": "4.0.3", @@ -15274,6 +14396,7 @@ "dev": true }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -15282,6 +14405,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", @@ -15295,6 +14420,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -15360,6 +14486,12 @@ "fast-diff": "^1.1.2" } }, +<<<<<<< HEAD + "prismjs": { + "version": "1.24.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.24.0.tgz", + "integrity": "sha512-SqV5GRsNqnzCL8k5dfAjCNhUrF3pR0A9lTDSCUZeh/LIshheXJEaP0hwLz2t4XHivd2J/v2HR+gRnigzeKe3cQ==", +======= <<<<<<< HEAD "prismjs": { "version": "1.24.0", @@ -15452,6 +14584,7 @@ "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "dev": true }, "pump": { @@ -15525,6 +14658,8 @@ } } }, +<<<<<<< HEAD +======= "react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", @@ -15552,6 +14687,7 @@ } } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "read-pkg": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", @@ -15663,6 +14799,8 @@ "util-deprecate": "^1.0.1" } }, +<<<<<<< HEAD +======= "readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -15678,15 +14816,18 @@ "once": "^1.3.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "readdirp": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", - "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, "requires": { "picomatch": "^2.2.1" } }, +<<<<<<< HEAD +======= "readline2": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz", @@ -15725,6 +14866,7 @@ >>>>>>> upstream/fix-ci } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "redent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", @@ -15735,6 +14877,8 @@ "strip-indent": "^3.0.0" } }, +<<<<<<< HEAD +======= <<<<<<< HEAD "regexpp": { "version": "3.2.0", @@ -15757,12 +14901,12 @@ "safe-regex": "^1.1.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "regexpp": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", - "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", - "dev": true, - "peer": true + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true }, "registry-auth-token": { "version": "4.2.1", @@ -15782,6 +14926,8 @@ "rc": "^1.2.8" } }, +<<<<<<< HEAD +======= "remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", @@ -15807,6 +14953,7 @@ "rc": "^1.2.8" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -15852,6 +14999,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "resolve-url": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", @@ -15859,6 +15008,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "responselike": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", @@ -15870,6 +15020,8 @@ "lowercase-keys": "^1.0.0" } }, +<<<<<<< HEAD +======= "restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -15880,6 +15032,7 @@ "lowercase-keys": "^1.0.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -15906,6 +15059,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "rx-lite": { "version": "3.1.2", @@ -15923,6 +15078,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -15930,6 +15086,8 @@ "dev": true }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "safe-regex": { "version": "1.1.0", @@ -16198,6 +15356,7 @@ "optional": true }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "semver": { "version": "7.3.7", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", @@ -16306,6 +15465,8 @@ "dev": true }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "set-value": { "version": "2.0.1", @@ -16346,6 +15507,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "setprototypeof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", @@ -16354,6 +15516,8 @@ <<<<<<< HEAD ======= }, +<<<<<<< HEAD +======= "shallow-clone": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", @@ -16364,6 +15528,7 @@ } >>>>>>> upstream/fix-ci }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -16433,6 +15598,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "sprintf-js": { "version": "1.0.3", @@ -16562,6 +15729,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -16570,6 +15738,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "stealthy-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", @@ -16583,6 +15753,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -16643,6 +15814,8 @@ "has-flag": "^4.0.0" } }, +<<<<<<< HEAD +======= "term-size": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz", @@ -16737,12 +15910,15 @@ } } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "term-size": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz", "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==", "dev": true }, +<<<<<<< HEAD +======= "terminal-link": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", @@ -16765,6 +15941,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "text-extensions": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz", @@ -16778,12 +15955,6 @@ "dev": true, "peer": true }, - "throat": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz", - "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==", - "dev": true - }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -16800,6 +15971,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "tiny-emitter": { "version": "2.1.0", @@ -16809,6 +15982,7 @@ "optional": true }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "tinydate": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/tinydate/-/tinydate-1.3.0.tgz", @@ -16817,6 +15991,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -16861,12 +16037,15 @@ } } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "to-readable-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", "dev": true }, +<<<<<<< HEAD +======= "to-regex": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", @@ -16880,6 +16059,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -16897,6 +16077,8 @@ <<<<<<< HEAD ======= }, +<<<<<<< HEAD +======= "tough-cookie": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz", @@ -16926,6 +16108,7 @@ } >>>>>>> upstream/fix-ci }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "trim-newlines": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", @@ -16968,12 +16151,15 @@ "tslib": "^1.8.1" } }, +<<<<<<< HEAD +======= "tweezer.js": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/tweezer.js/-/tweezer.js-1.5.0.tgz", "integrity": "sha512-aSiJz7rGWNAQq7hjMK9ZYDuEawXupcCWgl3woQQSoDP2Oh8O4srWb/uO1PzzHIsrPEOqrjJ2sUb9FERfzuBabQ==", "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "tweezer.js": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/tweezer.js/-/tweezer.js-1.5.0.tgz", @@ -16994,7 +16180,12 @@ "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", +<<<<<<< HEAD + "dev": true, + "peer": true +======= "dev": true +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 }, "typedarray-to-buffer": { "version": "3.1.5", @@ -17011,6 +16202,8 @@ "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==", "dev": true }, +<<<<<<< HEAD +======= "unique-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", @@ -17060,6 +16253,7 @@ "imurmurhash": "^0.1.4" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "unique-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", @@ -17069,6 +16263,8 @@ "crypto-random-string": "^2.0.0" } }, +<<<<<<< HEAD +======= "universal-user-agent": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz", @@ -17076,6 +16272,7 @@ "dev": true }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", @@ -17090,6 +16287,8 @@ "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", "dev": true }, +<<<<<<< HEAD +======= "unset-value": { >>>>>>> upstream/fix-ci "version": "1.0.0", @@ -17138,6 +16337,7 @@ "integrity": "sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==", "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "update-notifier": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz", @@ -17182,6 +16382,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "urix": { "version": "0.1.0", @@ -17190,6 +16392,7 @@ "dev": true }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "url-parse-lax": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", @@ -17201,6 +16404,8 @@ <<<<<<< HEAD ======= }, +<<<<<<< HEAD +======= "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", @@ -17208,6 +16413,7 @@ "dev": true >>>>>>> upstream/fix-ci }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -17215,6 +16421,8 @@ "dev": true }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "util-promisify": { "version": "2.1.0", @@ -17226,6 +16434,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -17234,6 +16443,8 @@ <<<<<<< HEAD ======= }, +<<<<<<< HEAD +======= "uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", @@ -17242,6 +16453,7 @@ "optional": true >>>>>>> upstream/fix-ci }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", @@ -17266,6 +16478,8 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD ======= "validate-npm-package-name": { "version": "3.0.0", @@ -17530,6 +16744,7 @@ } }, >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -17545,6 +16760,8 @@ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, +<<<<<<< HEAD +======= "widest-line": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", @@ -17554,6 +16771,7 @@ "string-width": "^4.0.0" } }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "widest-line": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", @@ -17569,6 +16787,8 @@ "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", "dev": true, "peer": true +<<<<<<< HEAD +======= }, "wrap-ansi": { "version": "7.0.0", @@ -17580,80 +16800,17 @@ "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 }, "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" } }, "wrappy": { @@ -17689,6 +16846,8 @@ ======= "dev": true }, +<<<<<<< HEAD +======= "xml-name-validator": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", @@ -17708,6 +16867,7 @@ >>>>>>> upstream/fix-ci "dev": true }, +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -17763,14 +16923,20 @@ } }, <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, +<<<<<<< HEAD +======= ======= >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", diff --git a/package.json b/package.json index 98c3fe858..7e723cdef 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,8 @@ { <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "name": "husky", "version": "8.0.1", "description": "Modern native Git hooks made easy", @@ -11,6 +14,8 @@ "homepage": "https://typicode.github.io/husky", "repository": "typicode/husky", "funding": "https://github.com/sponsors/typicode", +<<<<<<< HEAD +======= ======= "private": true, "scripts": { @@ -23,6 +28,7 @@ }, "author": "Typicode ", >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "license": "MIT", "author": "Typicode ", "bin": "lib/bin.js", @@ -35,11 +41,18 @@ "build": "tsc", "test": "sh test/all.sh", "lint": "eslint src --ext .ts", +<<<<<<< HEAD + "serve": "docsify serve docs", + "prepare": "npm run build && node lib/bin install" + }, + "devDependencies": { +======= "serve": "cp README.md docs/ && docsify serve docs", "prepare": "npm run build && node lib/bin install" }, "devDependencies": { <<<<<<< HEAD +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 "@commitlint/cli": "^16.2.4", "@commitlint/config-conventional": "^16.2.4", "@tsconfig/node14": "^1.0.1", @@ -50,6 +63,8 @@ }, "engines": { "node": ">=14" +<<<<<<< HEAD +======= ======= "@commitlint/cli": "^12.0.1", "@commitlint/config-conventional": "^12.0.1", @@ -68,5 +83,6 @@ "type-fest": "^0.20.2", "typescript": "^4.2.3" >>>>>>> upstream/fix-ci +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 } } diff --git a/packages/husky-init/package.json b/packages/husky-init/package.json deleted file mode 100644 index 083c849fd..000000000 --- a/packages/husky-init/package.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "husky-init", - "version": "6.1.1", - "description": "", - "bin": "./lib/bin.js", - "type": "module", - "dependencies": { - "husky": "^6.0.0" - }, - "author": "Typicode ", - "license": "MIT", - "gitHead": "cb4e3b913e2d8963af3179650ed550d3a0e210f5" -} diff --git a/src/bin.ts b/src/bin.ts index c820f1f23..2b85bb7f7 100644 --- a/src/bin.ts +++ b/src/bin.ts @@ -5,7 +5,11 @@ import h = require('./') // Show usage and exit with code function help(code: number) { console.log(`Usage: +<<<<<<< HEAD + husky install [dir] (default: .husky) +======= husky install [dir] (default: .husky) [env] (default sh) +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 husky uninstall husky set|add [cmd]`) process.exit(code) @@ -18,12 +22,20 @@ const [x, y] = args // Set or add command in hook const hook = (fn: (a1: string, a2: string) => void) => (): void => +<<<<<<< HEAD + // Show usage if no arguments are provided or more than 2 +======= // Show usage if no arguments are provided or more than 3 +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 !ln || ln > 2 ? help(2) : fn(x, y) // CLI commands const cmds: { [key: string]: () => void } = { +<<<<<<< HEAD + install: (): void => (ln > 1 ? help(2) : h.install(x)), +======= install: (): void => (ln > 2 ? help(2) : h.install(x, y)), +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 uninstall: h.uninstall, set: hook(h.set), add: hook(h.add), diff --git a/src/index.ts b/src/index.ts index 7c2742877..04d8c8dca 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,6 +2,10 @@ import cp = require('child_process') import fs = require('fs') import p = require('path') +<<<<<<< HEAD +// Logger +const l = (msg: string): void => console.log(`husky - ${msg}`) +======= interface Logger { log: (msg: string) => void error: (msg: string) => void @@ -22,11 +26,74 @@ const defaultLogger: Logger = { log: (msg: string): void => console.log(`husky - ${msg}`), error: (msg: string): void => console.error(`husky - ${msg}`), } +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 // Git command const git = (args: string[]): cp.SpawnSyncReturns => cp.spawnSync('git', args, { stdio: 'inherit' }) +<<<<<<< HEAD +export function install(dir = '.husky'): void { + if (process.env.HUSKY === '0') { + l('HUSKY env variable is set to 0, skipping install') + return + } + + // Ensure that we're inside a git repository + // If git command is not found, status is null and we should return. + // That's why status value needs to be checked explicitly. + if (git(['rev-parse']).status !== 0) { + return + } + + // Custom dir help + const url = 'https://typicode.github.io/husky/#/?id=custom-directory' + + // Ensure that we're not trying to install outside of cwd + if (!p.resolve(process.cwd(), dir).startsWith(process.cwd())) { + throw new Error(`.. not allowed (see ${url})`) + } + + // Ensure that cwd is git top level + if (!fs.existsSync('.git')) { + throw new Error(`.git can't be found (see ${url})`) + } + + try { + // Create .husky/_ + fs.mkdirSync(p.join(dir, '_'), { recursive: true }) + + // Create .husky/_/.gitignore + fs.writeFileSync(p.join(dir, '_/.gitignore'), '*') + + // Copy husky.sh to .husky/_/husky.sh + fs.copyFileSync(p.join(__dirname, '../husky.sh'), p.join(dir, '_/husky.sh')) + + // Configure repo + const { error } = git(['config', 'core.hooksPath', dir]) + if (error) { + throw error + } + } catch (e) { + l('Git hooks failed to install') + throw e + } + + l('Git hooks installed') +} + +export function set(file: string, cmd: string): void { + const dir = p.dirname(file) + if (!fs.existsSync(dir)) { + throw new Error( + `can't create hook, ${dir} directory doesn't exist (try running husky install)`, + ) + } + + fs.writeFileSync( + file, + `#!/usr/bin/env sh +======= const defaultHusky = configure() export function configure(customOptions: Options = {}): Husky { @@ -99,10 +166,31 @@ export function configure(customOptions: Options = {}): Husky { fs.writeFileSync( file, `#!/usr/bin/env sh +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 . "$(dirname -- "$0")/_/husky.sh" ${cmd} `, +<<<<<<< HEAD + { mode: 0o0755 }, + ) + + l(`created ${file}`) +} + +export function add(file: string, cmd: string): void { + if (fs.existsSync(file)) { + fs.appendFileSync(file, `${cmd}\n`) + l(`updated ${file}`) + } else { + set(file, cmd) + } +} + +export function uninstall(): void { + git(['config', '--unset', 'core.hooksPath']) +} +======= { mode: 0o0755 }, ) @@ -128,3 +216,4 @@ export const install = defaultHusky.install.bind(defaultHusky) export const set = defaultHusky.set.bind(defaultHusky) export const add = defaultHusky.add.bind(defaultHusky) export const uninstall = defaultHusky.uninstall.bind(defaultHusky) +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 diff --git a/test/all.sh b/test/all.sh index b91361091..ecf4151a6 100644 --- a/test/all.sh +++ b/test/all.sh @@ -8,4 +8,7 @@ sh test/4_not-git-dir.sh sh test/5_set-add.sh sh test/6_git_command_not_found.sh sh test/7_command_not_found.sh +<<<<<<< HEAD +======= sh test/8_custom_logger.sh +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 diff --git a/test/functions.sh b/test/functions.sh index 8e4acf1fb..a24960b6d 100644 --- a/test/functions.sh +++ b/test/functions.sh @@ -2,11 +2,15 @@ set -eu setup() { +<<<<<<< HEAD + name="$(basename -- $0)" +======= <<<<<<< HEAD:test/functions.sh name="$(basename -- $0)" ======= name="$(basename $0)" >>>>>>> upstream/fix-ci:test/_functions.sh +>>>>>>> 364de37ca2f0a20a802c02caf4798e3f78487f31 testDir="/tmp/husky-test-$name" echo echo "-------------------" diff --git a/test/init.sh b/test/init.sh deleted file mode 100644 index 3fdb694cc..000000000 --- a/test/init.sh +++ /dev/null @@ -1,25 +0,0 @@ -. "$(dirname "$0")/_functions.sh" -setup - -cat > package.json << EOL -{ - "scripts": { - "test": "echo \"pre-commit hook\" && exit 1" - } -} -EOL - -npm link husky-init -npx --no-install husky-init - -# Test package.json scripts -# husky-init should create prepare script -expect 0 "grep '\"prepare\": \"husky install\"' package.json" - -# Test core.hooksPath -# husky-init should install husky -expect_hooksPath_to_be ".husky" - -# Test pre-commit -git add package.json -expect 1 "git commit -m foo"