aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.eslintrc.json4
-rw-r--r--.github/dependabot.yml11
-rw-r--r--.github/workflows/create_sentry_release.yml23
-rw-r--r--.github/workflows/test_and_lint.yml16
-rw-r--r--CONTRIBUTING.md4
-rw-r--r--README.md53
-rw-r--r--annotations_formatter.js14
-rw-r--r--package.json56
-rw-r--r--public/apple-touch-icon-precomposed.pngbin0 -> 2217 bytes
-rw-r--r--public/apple-touch-icon.pngbin0 -> 2344 bytes
-rw-r--r--public/branding/browserconfig.xml9
-rw-r--r--public/branding/logo192.pngbin0 -> 2434 bytes
-rw-r--r--public/branding/logo256.png (renamed from public/logo256.png)bin8770 -> 8770 bytes
-rw-r--r--public/branding/logo512.png (renamed from public/logo512.png)bin18382 -> 18382 bytes
-rw-r--r--public/branding/mstile-144x144.pngbin0 -> 1503 bytes
-rw-r--r--public/branding/mstile-150x150.pngbin0 -> 1346 bytes
-rw-r--r--public/branding/mstile-310x150.pngbin0 -> 1370 bytes
-rw-r--r--public/branding/mstile-310x310.pngbin0 -> 2341 bytes
-rw-r--r--public/branding/mstile-70x70.pngbin0 -> 1099 bytes
-rw-r--r--public/branding/safari-pinned-tab.svg1
-rw-r--r--public/index.html10
-rw-r--r--public/manifest.json12
-rw-r--r--renovate.json5
-rw-r--r--src/index.tsx11
-rw-r--r--src/logo.svg7
-rw-r--r--src/pages/LandingPage.tsx2
-rw-r--r--src/setupTests.ts1
-rw-r--r--src/tests/components/FormListing.test.tsx16
-rw-r--r--webpack.config.js19
-rw-r--r--yarn.lock1218
30 files changed, 710 insertions, 782 deletions
diff --git a/.eslintrc.json b/.eslintrc.json
index 7785702..82497c2 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -39,7 +39,9 @@
"semi": [
"error",
"always"
- ]
+ ],
+ "no-trailing-spaces": "error",
+ "eol-last": "error"
},
"settings": {
"react": {
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..c5b6b65
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+ - package-ecosystem: "npm"
+ directory: "/"
+ schedule:
+ interval: "daily"
diff --git a/.github/workflows/create_sentry_release.yml b/.github/workflows/create_sentry_release.yml
index 4ae20bb..4c522e9 100644
--- a/.github/workflows/create_sentry_release.yml
+++ b/.github/workflows/create_sentry_release.yml
@@ -13,16 +13,23 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: EgorDm/gha-yarn-node-cache@v1
-
+
- name: Install dependencies
- run: yarn install
-
+ run: yarn install --prod
+
+ - name: Set SHA
+ id: commit-sha
+ run: |
+ if ${{ github.ref == 'refs/heads/main' }};
+ then echo "::set-output name=sha::${{ github.sha }}";
+ else echo "::set-output name=sha::${{ github.event.pull_request.head.sha }}";
+ fi;
+
- name: Build application
run: yarn build
env:
REACT_APP_SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
- REACT_APP_SHA: ${{ github.sha }}
- REACT_APP_BRANCH: main
+ COMMIT_REF: ${{ steps.commit-sha.outputs.sha }}
REACT_APP_OAUTH2_CLIENT_ID: ${{ secrets.CLIENT_ID }}
- name: Create Sentry release (production)
@@ -34,7 +41,8 @@ jobs:
SENTRY_PROJECT: forms-frontend
with:
environment: production
- sourcemaps: ./build/static/js/
+ sourcemaps: ./build/
+ version: ${{ steps.commit-sha.outputs.sha }}
version_prefix: forms-frontend@
- name: Create Sentry release (deploy preview)
@@ -46,5 +54,6 @@ jobs:
SENTRY_PROJECT: forms-frontend
with:
environment: deploy-preview
- sourcemaps: ./build/static/js/
+ sourcemaps: ./build/
+ version: ${{ steps.commit-sha.outputs.sha }}
version_prefix: forms-frontend@
diff --git a/.github/workflows/test_and_lint.yml b/.github/workflows/test_and_lint.yml
index 636e181..4767b3e 100644
--- a/.github/workflows/test_and_lint.yml
+++ b/.github/workflows/test_and_lint.yml
@@ -13,11 +13,11 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: EgorDm/gha-yarn-node-cache@v1
-
- - name: Install dependencies
- run: yarn install
-
+
- name: Install dependencies
+ run: yarn install --prod
+
+ - name: Build
run: yarn build
test:
@@ -26,9 +26,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: EgorDm/gha-yarn-node-cache@v1
-
+
- name: Install dependencies
- run: yarn install --dev
+ run: yarn install
- name: Run tests
run: yarn test
@@ -41,7 +41,7 @@ jobs:
- uses: EgorDm/gha-yarn-node-cache@v1
- name: Install dependencies
- run: yarn install --dev
+ run: yarn install
- name: Lint
- run: yarn run eslint --ext .ts,.tsx --quiet src/
+ run: yarn run eslint --ext .ts,.tsx --format ./annotations_formatter.js src/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..0e15eea
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,4 @@
+# Contributing to one of Our Projects
+
+The project is not currently accepting public contributions.
+Please contact `joe#6000` on Discord if you are interested in helping.
diff --git a/README.md b/README.md
index 64e343e..b19152f 100644
--- a/README.md
+++ b/README.md
@@ -1,43 +1,54 @@
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+# Python Discord Forms Frontend
+The frontend component of the [Python Discord Forms](https://github.com/python-discord/forms-backend/) project.
+Backend available at: [python-discord/forms-backend](https://github.com/python-discord/forms-backend/).
+
+Our frontend is written in React.js and TypeScript.
+It's a fairly simple application to get your head around,
+with the whole thing broken down into smallish TypeScript components.
+
+## Setup & Troubleshooting
+The project uses [yarn](https://yarnpkg.com/) for dependency and script management,
+and [webpack](https://webpack.js.org/) for building and development.
-## Available Scripts
+A full setup guide is available on [Notion](https://www.notion.so/pythondiscord/Forms-6312360495ff45f487da5b1924184a2d),
+along with a troubleshooting guide.
+## React & Dependency Info
+### Project Info
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+### Available Scripts
In the project directory, you can run:
-### `yarn start`
+`yarn start`
-Runs the app in the development mode.<br />
+Runs the app in the development mode.<br/>
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-The page will reload if you make edits.<br />
+The page will reload if you make edits.<br/>
You will also see any lint errors in the console.
-### `yarn test`
+`yarn test`
-Launches the test runner in the interactive watch mode.<br />
+Launches the test runner in the interactive watch mode.<br/>
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-### `yarn build`
+`yarn lint`
+
+Runs eslint on the src directory of the project.<br/>
+Code style can be found under [.eslintrc.json](.eslintrc.json).
-Builds the app for production to the `build` folder.<br />
+`yarn build`
+
+Builds the app for production to the `build` folder.<br/>
It correctly bundles React in production mode and optimizes the build for the best performance.
-The build is minified and the filenames include the hashes.<br />
+The build is minified and the filenames include the hashes.<br/>
Your app is ready to be deployed!
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-### `yarn eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
+### Learn More
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
diff --git a/annotations_formatter.js b/annotations_formatter.js
new file mode 100644
index 0000000..b3a421d
--- /dev/null
+++ b/annotations_formatter.js
@@ -0,0 +1,14 @@
+module.exports = function (results) {
+ let output = "";
+
+ for (const file of results.filter(r => r.messages.length > 0)) {
+ for (const message of file.messages) {
+ const path = file.filePath.substr(process.cwd().length + 1);
+ const severity = message.fatal || message.severity === 2 ? "error" : "warning";
+ const text = `[ESLint] ${message.ruleId}: ${message.message}`;
+ output += `::${severity} file=${path},line=${message.line},col=${message.column}::${text}\n`;
+ }
+ }
+
+ return output;
+};
diff --git a/package.json b/package.json
index 5504b2c..a36627c 100644
--- a/package.json
+++ b/package.json
@@ -1,27 +1,21 @@
{
- "name": "pydis_insights_frontend",
+ "name": "pydis-forms-frontend",
"version": "0.1.0",
- "private": true,
+ "private": false,
+ "license": "MIT",
"dependencies": {
- "@emotion/react": "11.1.4",
+ "@emotion/react": "11.1.5",
"@fortawesome/fontawesome-svg-core": "1.2.34",
"@fortawesome/free-brands-svg-icons": "5.15.2",
"@fortawesome/free-solid-svg-icons": "5.15.2",
"@fortawesome/react-fontawesome": "0.1.14",
- "@sentry/react": "5.30.0",
+ "@sentry/react": "6.1.0",
"@svgr/webpack": "5.5.0",
- "@swc/core": "1.2.45",
- "@types/node": "14.14.21",
- "@types/react": "17.0.0",
- "@types/react-dom": "17.0.0",
- "@types/react-router-dom": "5.1.7",
- "@types/react-transition-group": "4.4.0",
- "@types/smoothscroll-polyfill": "0.3.1",
+ "@swc/core": "1.2.47",
"axios": "0.21.1",
"copy-webpack-plugin": "7.0.0",
- "cross-env": "7.0.3",
- "fs-extra": "9.0.1",
- "html-webpack-plugin": "4.5.1",
+ "fs-extra": "9.1.0",
+ "html-webpack-plugin": "5.0.0",
"identity-obj-proxy": "3.0.0",
"react": "17.0.1",
"react-app-polyfill": "2.0.0",
@@ -31,17 +25,17 @@
"react-transition-group": "4.4.1",
"smoothscroll-polyfill": "0.4.4",
"swc-loader": "0.1.12",
- "typescript": "4.1.3",
- "webpack": "5.15.0",
- "webpack-cli": "4.3.1",
+ "typescript": "4.1.5",
+ "webpack": "5.21.2",
+ "webpack-cli": "4.5.0",
"webpack-manifest-plugin": "3.0.0",
- "workbox-webpack-plugin": "6.0.2"
+ "workbox-webpack-plugin": "6.1.0"
},
"scripts": {
- "start": "cross-env NODE_ENV=development webpack serve",
- "build": "cross-env REACT_APP_SHA=$COMMIT_REF REACT_APP_BRANCH=$BRANCH webpack",
- "test": "cross-env jest",
- "lint": "cross-env eslint --cache src/"
+ "start": "webpack serve --node-env=development",
+ "build": "webpack",
+ "test": "jest",
+ "lint": "eslint --cache src/"
},
"eslintConfig": {
"extends": "react-app"
@@ -61,13 +55,19 @@
"devDependencies": {
"@swc/jest": "0.1.2",
"@testing-library/jest-dom": "5.11.9",
- "@testing-library/react": "11.2.3",
- "@testing-library/user-event": "12.6.0",
+ "@testing-library/react": "11.2.5",
+ "@testing-library/user-event": "12.6.3",
"@types/jest": "26.0.20",
- "@typescript-eslint/eslint-plugin": "4.13.0",
- "@typescript-eslint/parser": "4.13.0",
+ "@types/node": "14.14.25",
+ "@types/react": "17.0.1",
+ "@types/react-dom": "17.0.0",
+ "@types/react-router-dom": "5.1.7",
+ "@types/react-transition-group": "4.4.0",
+ "@types/smoothscroll-polyfill": "0.3.1",
+ "@typescript-eslint/eslint-plugin": "4.15.0",
+ "@typescript-eslint/parser": "4.15.0",
"dotenv": "8.2.0",
- "eslint": "7.18.0",
+ "eslint": "7.19.0",
"eslint-plugin-react": "7.22.0",
"husky": "4.3.8",
"jest": "26.6.3",
@@ -79,7 +79,7 @@
},
"husky": {
"hooks": {
- "pre-commit": "yarn lint --quiet && yarn test -o --silent"
+ "pre-commit": "yarn lint"
}
}
}
diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png
new file mode 100644
index 0000000..62c8d09
--- /dev/null
+++ b/public/apple-touch-icon-precomposed.png
Binary files differ
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
new file mode 100644
index 0000000..e9a26ef
--- /dev/null
+++ b/public/apple-touch-icon.png
Binary files differ
diff --git a/public/branding/browserconfig.xml b/public/branding/browserconfig.xml
new file mode 100644
index 0000000..0dd2cec
--- /dev/null
+++ b/public/branding/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+ <msapplication>
+ <tile>
+ <square150x150logo src="branding/mstile-150x150.png"/>
+ <TileColor>#2d89ef</TileColor>
+ </tile>
+ </msapplication>
+</browserconfig>
diff --git a/public/branding/logo192.png b/public/branding/logo192.png
new file mode 100644
index 0000000..eb6a99e
--- /dev/null
+++ b/public/branding/logo192.png
Binary files differ
diff --git a/public/logo256.png b/public/branding/logo256.png
index dcebb19..dcebb19 100644
--- a/public/logo256.png
+++ b/public/branding/logo256.png
Binary files differ
diff --git a/public/logo512.png b/public/branding/logo512.png
index 69bcf29..69bcf29 100644
--- a/public/logo512.png
+++ b/public/branding/logo512.png
Binary files differ
diff --git a/public/branding/mstile-144x144.png b/public/branding/mstile-144x144.png
new file mode 100644
index 0000000..6917335
--- /dev/null
+++ b/public/branding/mstile-144x144.png
Binary files differ
diff --git a/public/branding/mstile-150x150.png b/public/branding/mstile-150x150.png
new file mode 100644
index 0000000..2a2a7e0
--- /dev/null
+++ b/public/branding/mstile-150x150.png
Binary files differ
diff --git a/public/branding/mstile-310x150.png b/public/branding/mstile-310x150.png
new file mode 100644
index 0000000..0a5c9c2
--- /dev/null
+++ b/public/branding/mstile-310x150.png
Binary files differ
diff --git a/public/branding/mstile-310x310.png b/public/branding/mstile-310x310.png
new file mode 100644
index 0000000..b4e3f38
--- /dev/null
+++ b/public/branding/mstile-310x310.png
Binary files differ
diff --git a/public/branding/mstile-70x70.png b/public/branding/mstile-70x70.png
new file mode 100644
index 0000000..4221b97
--- /dev/null
+++ b/public/branding/mstile-70x70.png
Binary files differ
diff --git a/public/branding/safari-pinned-tab.svg b/public/branding/safari-pinned-tab.svg
new file mode 100644
index 0000000..06505f5
--- /dev/null
+++ b/public/branding/safari-pinned-tab.svg
@@ -0,0 +1 @@
+<svg version="1" xmlns="http://www.w3.org/2000/svg" width="933.333" height="933.333" viewBox="0 0 700.000000 700.000000"><path d="M322.9 86.4c-.2.2-4 .7-8.4 1-7.4.6-9.8.9-18 2-38.7 5.3-58.9 15.2-67.5 33.1-5 10.2-5.7 16.8-5.9 51.2-.2 32-.2 32.1 3.4 31.3 2.6-.6 56.3-.2 57.3.4.7.4 1.2.4 1.2-.1 0-.6 58.1-.9 64.4-.4.5.1.2.9-.5 1.8-.8.9-.9 1.4-.4 1.1.9-.5 1.1 5.5.6 12.4-.1.9-3.1.6-4.8-.5-.8-.5-1.3-.3-1.3.4 0 .9-.4.9-1.5-.1-.8-.6-2-.8-2.7-.4-1.9 1.2-15.8 1.1-15.8-.1 0-.6-.3-.7-.8 0-.9 1.3-4.2 1.6-4.2.3 0-.5-.6-.6-1.2-.1-1.9 1.1-17.2 1-18-.2-.5-.6-.8-.5-.8.4 0 1.1-.3 1.1-1.5.1-1.1-.9-1.5-.9-1.5-.1 0 .7-.5.9-1.1.6-1.6-1.1-5.9-1.3-5.3-.4.3.5 0 .9-.5.9-.6 0-1.1-.6-1.1-1.3 0-.8-.3-.8-.8-.2-.4.6-2 1.1-3.7 1.1-1.6 0-3.3-.5-3.7-1.1-.5-.6-.8-.5-.8.4 0 1.1-.3 1.1-1.7 0-1.4-1.2-1.5-1.2-.9-.1.7 1.2.4 1.2-1.4.2-1.5-.8-2-.8-1.6-.1.4.6.2 1.1-.3 1.1-.6 0-1.1-.6-1.1-1.3 0-.7-.3-.8-.8-.2-.9 1.3-7.2 1.5-7.2.2 0-.5-.6-.5-1.3.2-1 .8-1.7.7-2.7-.2-.7-.6-1-.8-.7-.2.6 1.2-8.2 1.4-10 .2-.8-.5-1.3-.4-1.3.3s-.6.8-1.9.1c-1-.6-2.2-.7-2.6-.3-.3.4-17.2.7-37.3.8-41.7.1-45.4.4-57.6 4.6-10.8 3.7-20 9.5-28.8 18.1-13.5 13.3-21.7 31.6-26.3 58.9-.3 1.8-.8 4-1 4.8-.2.8-.7 3.7-1.1 6.5-.3 2.7-.8 5.3-1 5.6-.6 1.1-1.8 20.5-1.7 30.4 0 17.9 2.5 36.6 7.9 59.5 5.5 23.4 14.6 41.2 26.3 51.8 7.1 6.4 18.5 12.7 25.1 13.8 1.4.3 3.2.8 4 1.1.8.4 13.8.8 28.7.9 23.8.1 27.4 0 28.5-1.4 1-1.2 1-1.4 0-.8-1.7 1-1.7-5.5.1-7.3 1-1.1 1-1.3 0-.7-.8.4-1.3.2-1.3-.6s.6-2 1.3-2.7c1-1.1 1-1.3 0-.7-.9.5-1.3 0-1.3-1.6 0-1.3.6-3 1.3-3.7.6-.8.7-1.1.1-.8-1.5.9-1.6-5.5-.1-6.5.9-.6.9-.8 0-.8-.7 0-1.3-.7-1.3-1.6 0-.9.5-1.2 1.3-.8.7.5.7.1-.2-1-1.3-1.5-1.3-1.9 0-2.7.9-.6 1-.9.2-.9-1.6 0-1.4-7.2.1-8.2.8-.5.7-.8-.1-.8-.7 0-1.3-1.2-1.3-2.6 0-1.4.4-2.3 1-1.9.6.3 1 .2 1-.4 0-.5-.6-1.1-1.2-1.4-1-.3-1-.9 0-2.7.8-1.2.9-1.9.3-1.5-.7.4-1.1-.4-1.1-2 0-1.8.4-2.4 1.3-1.9.9.6.9.4.1-.7-1.2-1.6-1.2-2.9-.1-4.7.5-.7.4-1.2-.3-1.2-.6 0-.8-.5-.5-1.1.4-.5.9-2.9 1.2-5.2.2-2.2.7-4.6 1.1-5.2.4-.5.7-1.8.8-2.8.3-3 .4-3.2 1.4-1.7.8 1.2 1 1.1.8-.5-.3-4.4.3-6.5 2.5-8.6 1.2-1.2 1.7-1.9 1-1.5-.7.4-.6-.5.3-2.4.9-1.6 2-3 2.5-3 .6 0 .7-.5.4-1-.3-.6-.1-1 .5-1s.8-.5.4-1.2c-.5-.7-.2-.9.9-.5s1.4.2 1.1-.8c-.3-.8.6-2.6 2.2-4 1.5-1.4 2.4-2.5 2.1-2.5-.4 0 .7-1.3 2.3-3 3-3 4.7-4 3.4-1.8-.4.7-.3.8.4.4.6-.4.9-1.2.7-1.9-1-2.7 23.2-17.4 29.7-18.1 1.3-.1 2.8-.5 3.4-.8 1.5-1 9.3-2 16.1-2.2 3.5 0 6.3-.3 6.3-.6s1.4-.5 3-.5c1.7 0 3 .3 3 .6s1.4.3 3.1.1c2-.3 3.4 0 4 .9.7 1.1.9 1.1.9-.3 0-1.4.5-1.5 3-.8 1.7.5 3 .6 3 .2 0-.6 8.8-.7 19.5-.2 2.2.1 4.5.1 5 0 2.6-.5 8.1.3 8.7 1.3.5.8.8.7.8-.4 0-1.3.9-1.4 5-.9 2.8.4 5 .4 5 .1 0-.3 1.4-.6 3-.6 1.7 0 3 .3 3 .6s1.4.3 3.1.1c2-.3 3.4 0 4 .9.7 1.1.9 1.1.9-.3 0-1.4.5-1.5 3-.8 1.7.5 3 .6 3 .2 0-1.2 16.4-.2 17.2 1.1.5.9.8.8.8-.3 0-1.3 1.8-1.4 11.2-1.2 7.3.2 11.5.8 12 1.5.5.8.8.7.8-.3 0-1.1 1.1-1.6 3.3-1.7 7.8-.4 11.5-.8 11.1-1.4-.2-.4 1-.9 2.6-1.3 1.6-.3 4.9-1.4 7.1-2.5 2.3-1.1 4.6-1.8 5.1-1.5.4.3.7.1.6-.6-.2-.6 1-1.8 2.7-2.8 1.6-.9 3.5-2.3 4.1-3.1.6-.8 1.6-1.1 2.1-.8.6.4 1.4-.4 1.7-1.8.4-1.4 1.1-2.3 1.6-2 .5.3 1.4-.4 2-1.5.6-1.1 1.6-1.7 2.2-1.4.7.4.8.3.4-.5-.4-.6.6-2.8 2.2-4.9 1.7-2.1 4.1-6.1 5.4-9 1.3-2.9 2.7-5 3.1-4.6.3.3.6-.2.5-1.2 0-1.1.7-4.8 1.5-8.3.9-3.6 1.4-6.8 1.1-7.3-.3-.4-.2-.8.3-.8.9 0 .9-131.5 0-134-.6-1.7-1.8-8.6-2-11.2-.1-.9-.6-1.4-1.1-1.1-.5.4-.7-.3-.4-1.5.4-1.2.2-2-.3-1.6-.9.5-1.1 0-1.3-2.9-.1-.6-.5-1.5-1-1.9-.6-.4-.4-1.4.5-2.5 1.3-1.6 1.2-1.7-.2-.5-1.3 1-1.9 1-2.9-.2-.6-.9-.8-2.1-.4-2.7.4-.8.3-.9-.4-.5s-1.2.2-1.2-.3c0-.6-2.8-3.9-6.2-7.4-15.9-16-33.3-23.1-64.3-26.2-3.3-.4-7.1-.9-8.5-1.2-2.8-.6-62.5-1.4-63.1-.9zM285 125.9c0 .4 1 .8 2.2.8 1.3.1 2.8 1 3.5 1.9.7 1 1.3 1.4 1.3.9 0-1.2 5.4 4.5 6.9 7.3.7 1.2.9 2.8.5 3.4-.4.6-.3.8.3.5 2.1-1.3 3 10.5 1.1 15-.6 1.5-1.1 3.1-1 3.4.2 1.2-8 9.9-8.8 9.4-.5-.3-1 0-1.2.5-.2.6-1 1.2-1.8 1.4-.8.2-2.4.7-3.4 1.1-5.3 2.3-15.6.1-20.4-4.3-.7-.6-1.8-1.2-2.3-1.2-.5 0-.9-.7-.9-1.5s-.4-1.5-.9-1.5c-1.3 0-4.3-6.9-3.5-8.2.4-.7.3-.8-.4-.4-.9.5-1.2-1-1.2-5.4 0-3.4.4-5.9.9-5.6.4.3.6-.5.4-1.8-.3-1.3.2-3 1.1-3.9.9-.8 1.6-1.9 1.6-2.3 0-1.3 5.3-6.4 6.6-6.4.7 0 1.4-.5 1.6-1 .8-2.5 17.8-4.5 17.8-2.1z"/><path d="M285.5 134c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM281.5 138c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM285.5 138c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM289 138.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM293 138.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM263.6 139.3c.3 1 .9 1.5 1.2 1.2.3-.3 0-1.1-.7-1.8-1-.9-1.1-.8-.5.6zM267.5 140c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM274.6 140.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM281.5 142c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM289 142c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM293 142c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM263.6 143.3c.3 1 .9 1.5 1.2 1.2.3-.3 0-1.1-.7-1.8-1-.9-1.1-.8-.5.6zM271.6 143.8c-.3.5.1.9.9.9s1.2-.4.9-.9c-.3-.4-.7-.8-.9-.8-.2 0-.6.4-.9.8zM259 148.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM263.5 147.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM266.6 147.8c-.3.5.1.9.9.9s1.2-.4.9-.9c-.3-.4-.7-.8-.9-.8-.2 0-.6.4-.9.8zM279.6 152.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM279.3 155.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM271.6 156.7c-.6 1.4-.5 1.5.5.6.7-.7 1-1.5.7-1.8-.3-.3-.9.2-1.2 1.2zM275.5 156c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM281 162.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM285 162.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM281 166c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM285 166c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM473 130c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM481 142.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM485 142.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM483.5 148c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM491.3 151.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM483.6 152.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM487.5 152c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM482.6 155.8c-.3.5.1.9.9.9s1.2-.4.9-.9c-.3-.4-.7-.8-.9-.8-.2 0-.6.4-.9.8zM486 155.4c0 .2.8 1 1.8 1.7 1.5 1.3 1.6 1.2.3-.4s-2.1-2.1-2.1-1.3zM495.6 158.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM499.3 163.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM485.5 170c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM489 170.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM497.5 170c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM489.5 174c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM493.5 174c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM497 174c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM497 178c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM491 180c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM487.3 184.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM490.6 184.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM477.5 186c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM485.5 202c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM489 202.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM489.5 206c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM493.5 206c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM259.5 206.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM307.5 207.1c-.4.6-.5 1.2-.2 1.5.2.3.7-.2 1-1.1.7-1.7.1-2-.8-.4zM235.6 208.7c-.6 1.4-.5 1.5.5.6.7-.7 1-1.5.7-1.8-.3-.3-.9.2-1.2 1.2zM291.3 208.7c0 .9.4 1 1.4.2.7-.6 1.3-1.2 1.3-1.4 0-.1-.6-.2-1.3-.2-.8 0-1.4.6-1.4 1.4zM325 207.4c0 .2.7.7 1.6 1 .8.3 1.2.2.9-.4-.6-1-2.5-1.4-2.5-.6zM331.3 211.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM233.5 212.1c-.3.4.2.6 1 .5 2.1-.3 2.8-1.3 1-1.3-.9 0-1.8.4-2 .8zM291.5 211.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM478.5 212c-.3.6.1.7.9.4 1.8-.7 2.1-1.4.7-1.4-.6 0-1.3.4-1.6 1zM483.5 211.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM253.5 214c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM291.6 216.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM483.6 216.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM249.5 218c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM253.5 218c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM305 218c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM309.5 218c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM329 218c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM333.5 218c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM345.5 218c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM483 220c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM487 219.9c0 .6.4 1.3 1 1.6.6.3.7-.1.4-.9-.7-1.8-1.4-2.1-1.4-.7zM497.9 219.4c-.2.3-1.8.6-3.4.9l-2.9.4.1 7.6c0 4.2-.3 7.4-.8 7.2-.4-.3-1.1-.1-1.4.5-.4.6-.1.9.7.8 1-.2 1.3 2.1 1.5 10.5.1 5.9-.2 10.5-.7 10.2-.5-.3-1.2-.1-1.5.5-.4.6-.1.9.7.8.9-.2 1.3 1.1 1.4 4.4.1 2.7-.2 4.6-.6 4.3-.5-.3-1.2-.1-1.5.5-.4.6-.1.9.7.8 1-.2 1.3 1.6 1.1 8.2-.2 10.8-.5 13-1.8 13-.5 0-.5.4.2.8 1 .6.9 1.3-.1 3.3-.7 1.3-1.1 3-.8 3.7.2.6-.1 1.2-.8 1.2-.6 0-.8.5-.5 1 .4.6.1 1.7-.5 2.5-.7.8-1 1.5-.6 1.5.8 0-4.4 10.3-5.6 11.1-.5.3-.9 1-.9 1.5.1.5-.3.9-.8.9s-1.3.4-1.8.9-.3.6.5.2c.6-.4 1.2-.2 1.2.3 0 .6-.4 1.1-1 1.1-.5 0-.9.6-.7 1.2.1.7-.4 1.2-1.1 1-.8-.1-1.1.2-.7.8.3.5-1.8 3.3-4.7 6.2-2.9 2.9-5.2 5.5-5.1 5.9.1.3-1.6 1.6-3.8 2.9-2.1 1.4-3.9 2.8-3.9 3.2 0 .5-.7.8-1.5.8s-1.5.5-1.5 1.1c0 .6-.7.8-1.6.5-1-.4-1.3-.2-.8.6s.2.9-.9.5c-1-.4-1.6-.2-1.4.6.1.7-.6 1.1-1.5 1.1-1-.1-1.6.1-1.3.5.5 1-9.4 5.3-10.5 4.6-.4-.3-1-.1-1.2.4-.1.6-1.6 1.2-3.3 1.5-1.6.2-3 .5-3 .6 0 .3-2 .6-8.5 1.5-2.4.4-4.7.8-5.1 1.1-.4.2-1 0-1.4-.5-.3-.6-1.6-.7-2.8-.3-2 .6-5.7.7-8.2.2-2.6-.6-4.1-.5-5.2.4-.9.5-1.3.4-1.3-.4 0-.9-.3-1-1.3-.1-1 .8-1.7.7-2.5-.1-.7-.7-1.2-.8-1.2-.2 0 .7-11.1 1.1-13 .4-1.5-.6-3.6-.4-4.7.4-.9.5-1.3.4-1.3-.4 0-.9-.3-1-1.3-.1-1 .8-1.7.7-2.5-.1-.9-.9-1.2-.9-1.2.1s-.3 1.1-1.3.2c-.8-.6-1.6-.8-1.9-.5-.9.8-8.7 1-10 .3-.6-.4-2.4-.3-3.9.1-1.6.5-3.1.5-3.3.1-.6-.9-3.7-.8-5.4.3-.7.4-1.2.2-1.2-.5 0-.8-.4-.9-1.3 0-1 .8-1.7.7-2.5-.1-.9-.9-1.2-.9-1.2.1s-.3 1.1-1.3.2c-.8-.6-1.6-.8-1.9-.5-.3.3-2.4.6-4.7.7-3.2.2-4-.1-3.6-1.2.4-1 .2-1.1-.7-.3-1.2 1-6.1 1.7-8.3 1.2-2.5-.6-4.1-.5-5.2.4-.9.5-1.3.4-1.3-.4 0-.9-.3-1-1.3-.1-1 .8-1.7.7-2.5-.1-.9-.9-1.2-.9-1.2.1s-.3 1.1-1.3.2c-.8-.6-1.7-.8-2-.5-.5.5-4.2.6-10.7.3-4.2-.2-15.1 1.3-19.8 2.6-2.9.9-5.8 1.3-6.5.9-.7-.4-.9-.4-.5 0 .3.4-1.8 2.1-4.9 3.7-6.1 3.2-6.7 3.4-5.7 1.7.4-.7.3-.8-.4-.4-.6.4-.8 1.4-.5 2.3.4 1.1.3 1.4-.5.9-.7-.4-1.2-.2-1.2.5s-.3.9-.7.6c-.3-.4-1.3.2-2 1.3-.8 1.1-2 1.7-2.6 1.4-.7-.4-.9-.4-.5.1.4.4-.8 2.2-2.7 4-1.8 1.8-4.9 5.7-6.9 8.6-2 3-3.9 5.8-4.3 6.4-1.9 2.5-6.3 16.5-6.9 22-.5 4.7-.4 130.6.1 134.5 2.7 19.3 14.9 35.1 36 46.6 3.9 2.1 7.3 4.3 7.7 4.8.4.6.8.8.8.4 0-.3 2.6.4 5.8 1.6 3.1 1.3 5.6 2.8 5.5 3.3-.1.5.4 1 1.2 1 .8 0 1.2-.4.9-.9-.6-1 1-1.1 2-.1.3.4 1.2.8 1.9.9.7.2 2.1.5 3.2.8 13.2 3.2 23.6 5.6 26 6 1.7.2 3.2.5 3.5.6 1 .4 3.6.7 8.5.8 3.6.2 4.6.5 3.5 1.2-.8.5-1 1-.5 1 .6 0 1.7-.4 2.5-.9.8-.6 1.9-.7 2.4-.3 1.2.7 29.5.4 30.7-.4.5-.3.9 0 .9.6s.5.8 1.3.3c.6-.4 1.7-.8 2.4-.9.6-.1 3.1-.5 5.5-.8 2.4-.3 5.7-.8 7.3-1.1 1.7-.2 4.4-.7 6.2-.9 1.7-.2 3.7-.7 4.4-1.2.7-.4 1-.3.5.4-.3.6.7.4 2.4-.5 1.7-.8 3.7-1.2 4.5-.9.7.2 1.6 0 1.9-.7.3-.9.7-.9 1.4.1.7 1.1 1.1 1 1.6-.4.3-.9.9-1.4 1.2-1.1.3.3 2.1-.1 4.1-.9 2.7-1.2 3.8-1.2 4.9-.3 1.2 1 1.4 1 1.2 0-.2-.7 2.3-2.2 5.7-3.5 3.4-1.3 8.7-3.5 11.8-5 3.2-1.4 6-2.6 6.2-2.6.3 0 2.8-1.6 5.5-3.5s5.4-3.5 5.9-3.5 1.1-.7 1.5-1.5c.3-.8 1.1-1.5 1.8-1.5s1.9-.9 2.6-2c.7-1.2 1.8-1.8 2.4-1.4.6.4.8.3.5-.2-.3-.6.9-2.6 2.6-4.6 5.3-5.8 8.9-12.7 10.9-20.5.6-2.4 1.5-4.3 2-4.3.7 0 .6-.5-.1-1.3-.6-.8-.8-1.6-.6-1.9.3-.3.6-2.6.7-5.1 0-2.6.4-4.4.9-4.2.4.3 1.1.1 1.4-.5.4-.6.1-.9-.6-.8-.7.2-1.4-.9-1.5-2.5-.2-1.5.1-2.5.6-2.2.5.3 1.2.1 1.5-.5.4-.6.1-.9-.6-.8-.7.2-1.4-.9-1.5-2.5-.2-1.5.1-2.5.6-2.2.5.3 1.2.1 1.5-.5.4-.6.1-.9-.6-.8-.7.2-1.4-.9-1.5-2.5-.2-1.5.1-2.5.6-2.2.5.3 1.2.1 1.5-.5.4-.6.1-.9-.6-.8-.7.2-1.4-.9-1.5-2.5-.2-1.5.1-2.5.6-2.2.5.3 1.2.1 1.5-.5.4-.6.1-.9-.5-.8-1.7.4-2.2-3.3-.7-5.1.9-1.1.9-1.3 0-.8-.8.5-1.1-.2-1.1-2.2.1-1.7.5-2.8.9-2.5.4.2 1.1 0 1.4-.6.4-.6.1-.9-.6-.8-.7.2-1.4-.9-1.5-2.5-.2-1.5.1-2.5.6-2.2.5.3 1.2.1 1.5-.5.4-.6.1-.9-.7-.8-.8.2-1.3-.6-1.2-2 .1-1.7-.2-2-.9-1.3s-1.4.7-2.4 0c-.7-.7-1.3-.8-1.3-.3s-2.5.9-5.5.9-5.5-.4-5.5-.9-.6-.4-1.3.3c-1 .8-1.7.7-2.5-.1-.7-.7-1.2-.8-1.2-.2 0 .5-2.3.9-5 .9-2.8 0-5-.4-5-.8 0-.5-.5-.5-1.2-.1-1.6 1-5.8 1.2-5.8.2 0-.4-.8-.4-1.7-.1-2.1.8-6.4.9-8.4.1-.7-.3-2.3-.2-3.4.2s-2.8.4-3.7-.1c-1-.6-1.9-.5-2.3.1-.5.8-1.1.7-2.1-.1-1.1-.9-1.4-.9-1.4.1 0 .9-.3 1-1.3.1-.8-.6-1.6-.9-1.9-.6-.9.9-6.6 1.2-7.9.5-.6-.4-2.5-.4-4 0-1.8.5-2.9.5-2.9-.1s-.5-.7-1.1-.4c-1.7 1.1-5.9 1.3-5.9.3 0-.5-.7-.5-1.6 0-2.2 1.2-5.6.3-4.7-1.2.3-.6-.3-.2-1.5.8-1.5 1.3-2.2 1.5-2.2.6s-.3-1-1.3-.1c-1 .8-1.7.7-2.5-.1-.9-.9-1.2-.9-1.2.1s-.3 1.1-1.3.2c-.8-.6-1.6-.8-1.9-.6-1 1-7.8 1.1-7.8.2 0-.5-.6-.5-1.3.2-1 .8-1.7.7-2.5-.1-.7-.7-1.2-.8-1.2-.2 0 .9-8.8 1-9.7.1-.9-1-.8-10.7.2-11.1.6-.3.4-.5-.3-.5-.9-.1-1-.6-.3-1.9.8-1.4 2.1-1.8 6.3-1.7 3.6.1 5.2.6 5 1.4-.1.7.2 1 .8.6.6-.3.8-1 .6-1.3-.2-.4 3-.7 7.2-.6 5.6 0 7.6.4 7.4 1.3-.1.7.2 1 .8.6.6-.3.8-1 .6-1.3-.2-.4 1.3-.7 3.5-.7 3.1 0 3.8.3 3.4 1.5-.4 1.3-.4 1.3.7 0 .9-1 3.1-1.5 6.6-1.5 4.2 0 5.1.3 4.7 1.5-.4 1.3-.4 1.3.7 0 1.9-2.2 20.1-2.2 19.3 0-.4 1.3-.4 1.3.7 0 .9-1 3.1-1.5 6.6-1.5 4.2 0 5.1.3 4.7 1.5-.4 1.3-.4 1.3.7 0 .9-1 3.1-1.5 6.6-1.5 4.2 0 5.1.3 4.7 1.5-.4 1.3-.4 1.3.7 0 1.7-2 15.5-2.1 15-.1-.1.7.2 1 .8.6.6-.3.8-1 .6-1.3-.2-.4 3-.7 7.2-.6 5.6 0 7.6.4 7.4 1.3-.1.7.2 1 .8.6.6-.3.8-.9.6-1.3-.2-.4 2.2-.7 5.5-.7 4.8 0 5.8.3 5.4 1.5-.4 1.3-.4 1.3.7 0 .9-1 3.1-1.5 6.6-1.5 4.2 0 5.1.3 4.7 1.5-.4 1.3-.4 1.3.7 0 .9-1 3.1-1.5 6.6-1.5 4.2 0 5.1.3 4.7 1.5-.4 1.3-.4 1.3.7 0 .9-1 3.1-1.5 6.6-1.5 4.2 0 5.1.3 4.7 1.5-.4 1.3-.4 1.3.7 0 .9-1 3.1-1.5 6.6-1.5 4.2 0 5.1.3 4.7 1.5-.3 1 0 .9.9-.3s1.6-1.4 2.1-.7c.3.5 1.1.8 1.6.4.6-.3 3.2-.8 5.7-1.1 2.6-.2 5.6-.6 6.7-.7 1.1-.2 2.6.1 3.3.7 1 .7 1.2.7 1-.2-.2-.8 1.4-1.8 3.7-2.5 2.2-.7 5.5-2 7.2-3 1.8-.9 3.6-1.7 4-1.9 1.3-.4 14-13.2 13.7-13.8-.2-.3.5-1.5 1.4-2.5 3.7-4 17.2-33.9 17.2-38.1 0-.8.5-1.1 1.2-.7.7.5.8.3.3-.6-.4-.7-.2-1.6.6-2.1.9-.6 1-.9.2-.9-.9 0-.8-1 .4-3.7.8-2.1 1.7-5.2 2-6.8.2-1.7.8-4.4 1.3-6 .5-1.7 1.2-4.4 1.5-6 .2-1.7.7-4 .9-5.1.8-3.9 1.9-19.8 2-28.2.1-6.8.4-8.1 1.6-7.7 1.3.4 1.3.3-.1-.7-.8-.7-1.6-2.9-1.7-4.8 0-1.9-.5-6.7-1-10.7-.7-6.5-.6-7.1.7-6 1.3 1 1.3.8 0-.8-2-2.4-3.2-7.8-1.5-6.8.6.4.5 0-.2-.9-.7-.8-1.4-3.1-1.6-4.9-.2-1.9-.7-4.2-1.1-5.2-.4-1-.8-3.8-.9-6.2 0-2.4-.3-4.2-.7-3.9-.4.2-1.1-2-1.7-4.9-.7-3.3-.7-5.3-.1-5.6.6-.1.3-.8-.6-1.5-.9-.6-1.7-2.3-1.9-3.7-.1-1.3-.6-3-1-3.7-.4-.7-.4-1.7-.1-2.2.3-.6.2-1-.3-1-.9 0-3.9-8.8-3.4-10.3.1-.4-.3-.7-.9-.7-.6 0-.8-.7-.5-1.6.3-.8.2-1.3-.3-1-.5.3-1.2-.1-1.5-1-.9-2.3-.8-2.6.7-1.9.6.4.2-.2-.9-1.2-2.7-2.3-5.6-7.8-4.6-8.8.4-.5.2-.5-.5-.1-.7.3-1.4-.2-1.7-1.2-.6-1.9-9.9-11.4-14.8-15.2-4.3-3.3-12.8-6.8-19.8-8.3-4.4-.9-14.1-1.3-29.5-1.2-12.6 0-23.3-.3-23.6-.8-.3-.4-.7-.5-1-.3zM423 525.7c0-1.4.4-1.6 1.8-.8.9.5 1.9.9 2.2.9 1.8-.2 4.9 1.5 4.4 2.4-.4.7-.2.8.4.4 1.4-.9 5.2 1.5 5.2 3.2 0 .7.5 1 1 .7.6-.3 1 .1 1 .9 0 .9.4 1.6.9 1.6 1.1 0 3.6 5.8 3.6 8.5.1 1.1.3 2.4.6 3 .3.5.4 2 .3 3.2-.1 1.3-.2 3-.3 3.9-.1 1.4-.3 1.5-1.8.3-1.6-1.3-1.7-1.2-.4.3 3.3 4.3-6.3 15.4-15.2 17.5-6.9 1.5-17.7-.4-17.7-3.2 0-.8-.6-1.2-1.4-.9-2.5 1-10.6-11.2-9-13.7.3-.5 0-.9-.6-.9-1.7 0-.8-8.3 1.4-14.2 1-2.6 2.2-4.5 2.7-4.2.5.3.9 0 .9-.7 0-3.1 8.3-8.2 13.5-8.3 1.9-.1 3.5-.6 3.5-1.1 0-.6.7-.1 1.5.9 1.3 1.8 1.5 1.8 1.5.3z"/><path d="M405 534c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM401 538.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM405.5 538c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM427.5 540c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM401 542.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM405.5 542c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM417.5 542c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM421 542.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM401.5 546c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM405.5 546c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM417.5 546c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM421 546c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM427.5 548c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM401 550c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM441 550c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM401.5 554c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM417 562c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM421.5 562c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM407 564.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM411.5 564c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM417 566c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM421.5 566c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM410.6 567.8c-.2.4.4.8 1.4.8 1 0 1.6-.4 1.4-.8-.3-.4-.9-.8-1.4-.8-.5 0-1.1.4-1.4.8zM481 250.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM485 250.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM481 254c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM485 254c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM597.5 254c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM604 262c-1.2.7-1 .9.7.7 1.2 0 1.9-.5 1.7-.9-.6-1-.6-1-2.4.2zM485.5 266c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM605 274c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM478.9 275.7c-1.3 1.6-1.2 1.7.4.4.9-.7 1.7-1.5 1.7-1.7 0-.8-.8-.3-2.1 1.3zM617.3 276.9c0 1.1.5 1.8.9 1.5.4-.3.5-1.1.1-1.9-.7-2.1-1.2-1.9-1 .4zM607.5 283.1c-.4.6-.5 1.2-.2 1.5.2.3.7-.2 1-1.1.7-1.7.1-2-.8-.4zM619 283.9c0 .6.4 1.3 1 1.6.6.3.7-.1.4-.9-.7-1.8-1.4-2.1-1.4-.7zM481.5 286c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM481 290.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM485 290c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM605.5 290.1c-.4.6-.5 1.2-.2 1.5.2.3.7-.2 1-1.1.7-1.7.1-2-.8-.4zM609 290.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM485 294c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM609.5 294c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM613.5 294c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM623.6 299.3c.3 1 .9 1.5 1.2 1.2.3-.3 0-1.1-.7-1.8-1-.9-1.1-.8-.5.6zM611.5 300c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM623.6 303.3c.3 1 .9 1.5 1.2 1.2.3-.3 0-1.1-.7-1.8-1-.9-1.1-.8-.5.6zM611.6 304.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM615.6 303.8c-.3.5.1.9.9.9s1.2-.4.9-.9c-.3-.4-.7-.8-.9-.8-.2 0-.6.4-.9.8zM481.5 306c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM615.6 308.7c-.6 1.4-.5 1.5.5.6.7-.7 1-1.5.7-1.8-.3-.3-.9.2-1.2 1.2zM619.5 308c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM614.6 312.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM618.6 311.8c-.3.5.1.9.9.9s1.2-.4.9-.9c-.3-.4-.7-.8-.9-.8-.2 0-.6.4-.9.8zM473 314c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM477.5 314c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM619.3 315.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM473 318c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM463 323.9c0 .6.4 1.3 1 1.6.6.3.7-.1.4-.9-.7-1.8-1.4-2.1-1.4-.7zM625 326.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM463 328c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM613 330.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM625 330.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM629 330c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM449 332.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM613 334c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM629 334c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM435.5 340c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM439 340c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM443.5 340c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM425.5 342c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM281.5 342.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM305 346.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM309 346c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM337 346c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM341.5 346c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM369 346.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM373 346c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM385 346c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM389.5 346c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM425 346.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM429 346c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM633 346c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM275.5 348c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM322.6 348.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM403.5 348c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM435.5 348c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM309 350c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM337 350c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM341.5 350c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM373 350c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM385 350c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM389.5 350c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM429 350c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM617.5 350c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM621 350.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM633 350c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM263.3 351.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM275.6 352.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM421.5 351.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM633.5 354c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM259.3 355.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM263.5 355.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM267 356c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM271 356c0 .5.5 1 1 1 .6 0 1-.5 1-1 0-.6-.4-1-1-1-.5 0-1 .4-1 1zM633.5 358c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM637.9 357.2c-.5 1.8-.6 3.8-.1 3.4.7-.8 1.2-3.6.6-3.6-.2 0-.4.1-.5.2zM237.5 362c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM617.5 362c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM621.5 362c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM627 364.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM613 366c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM617 366c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM627 368c0 .5.5 1 1 1 .6 0 1-.5 1-1 0-.6-.4-1-1-1-.5 0-1 .4-1 1zM631 368c0 .5.5 1 1 1 .6 0 1-.5 1-1 0-.6-.4-1-1-1-.5 0-1 .4-1 1zM239 370.4c0 .2.8 1 1.8 1.7 1.5 1.3 1.6 1.2.3-.4s-2.1-2.1-2.1-1.3zM627 372c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM621.5 386c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM625.5 386c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM613.5 390c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM617 390.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM621 390.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM633.5 390c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM637.5 390c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM609.5 392.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM225.5 394c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM637.5 394c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM609.5 398c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM613.5 398c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM625.5 402c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM629.5 402c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM607.6 404.7c-.6 1.4-.5 1.5.5.6.7-.7 1-1.5.7-1.8-.3-.3-.9.2-1.2 1.2zM611.5 404c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM625 406c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM625.5 410c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM211.5 412c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM611.6 411.8c-.3.5.1.9.9.9s1.2-.4.9-.9c-.3-.4-.7-.8-.9-.8-.2 0-.6.4-.9.8zM613.5 418c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM617.5 418c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM609 422.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM613 422.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM215.3 427.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM211.5 428c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM219.6 427.8c-.3.5.1.9.9.9s1.2-.4.9-.9c-.3-.4-.7-.8-.9-.8-.2 0-.6.4-.9.8zM611.5 427.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM219.5 431.1c-.4.6-.5 1.2-.2 1.5.2.3.7-.2 1-1.1.7-1.7.1-2-.8-.4zM611.6 432.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM617.5 434c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM621.5 434c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM607.4 435.4c.1.8.5 1.8.8 2.2.4.3.5-.1.4-1-.1-.8-.5-1.8-.8-2.2-.4-.3-.5.1-.4 1zM219.5 436c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM603.5 436c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM611 436c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM617.5 438c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM621.5 438c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM219.5 443.1c-.4.6-.5 1.2-.2 1.5.2.3.7-.2 1-1.1.7-1.7.1-2-.8-.4zM210.7 448.1c.7.7 1.5 1 1.8.7.3-.3-.2-.9-1.2-1.2-1.4-.6-1.5-.5-.6.5zM214.6 448.2c.3.4.9.8 1.5.8.5 0 .9-.4.9-.8 0-.5-.7-.9-1.5-.9s-1.2.4-.9.9zM219.3 448.5c0 .8.4 1.2.9.9.4-.3.8-.9.8-1.5 0-.5-.4-.9-.8-.9-.5 0-.9.7-.9 1.5zM594.7 448.1c.7.7 1.5 1 1.8.7.3-.3-.2-.9-1.2-1.2-1.4-.6-1.5-.5-.6.5zM598.7 448.1c.7.7 1.5 1 1.8.7.3-.3-.2-.9-1.2-1.2-1.4-.6-1.5-.5-.6.5zM589.5 450c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM211 452c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM219.6 451.8c-.3.5.1.9.9.9s1.2-.4.9-.9c-.3-.4-.7-.8-.9-.8-.2 0-.6.4-.9.8zM595 452c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM603.5 451.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM589.5 454c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM219.5 454.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM215.6 456.7c-.6 1.4-.5 1.5.5.6.7-.7 1-1.5.7-1.8-.3-.3-.9.2-1.2 1.2zM215.6 460.7c-.6 1.4-.5 1.5.5.6.7-.7 1-1.5.7-1.8-.3-.3-.9.2-1.2 1.2zM219.5 460c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM609.5 462c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM613 462.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM593.5 466c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM597.5 466c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM601 466c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM609 466c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM586.6 468.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM593.5 470c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM609.5 470c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM587 476c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM145 478c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM149 478c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM545.5 478c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM549.5 478c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM207.3 479.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM219.5 478.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM151.6 480.7c-.6 1.4-.5 1.5.5.6.7-.7 1-1.5.7-1.8-.3-.3-.9.2-1.2 1.2zM570.7 480.1c.7.7 1.5 1 1.8.7.3-.3-.2-.9-1.2-1.2-1.4-.6-1.5-.5-.6.5zM161.5 482c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM385 482.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM389 482c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM151.6 484.7c-.6 1.4-.5 1.5.5.6.7-.7 1-1.5.7-1.8-.3-.3-.9.2-1.2 1.2zM211.5 484c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM395.5 484c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM399.3 484.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM503.5 483.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM507 484c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM511 484.2c0 .4.4.8.9.8.6 0 1.2-.4 1.5-.8.3-.5-.1-.9-.9-.9s-1.5.4-1.5.9zM515.6 483.8c-.3.5.1.9.9.9s1.2-.4.9-.9c-.3-.4-.7-.8-.9-.8-.2 0-.6.4-.9.8zM519.3 484.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM523.5 484c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM571 484c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM595.5 484c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM161 486.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM193.5 486c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM197 486.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM389 486c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM433.5 486c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM437 486.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM557.5 486c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM577.5 486c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM601.5 486c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM211 487.4c0 .2.7.7 1.6 1 .8.3 1.2.2.9-.4-.6-1-2.5-1.4-2.5-.6zM399.5 488c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM404 488c-.9.6-1 1-.3 1 .6 0 1.5-.5 1.8-1 .8-1.2.4-1.2-1.5 0zM423.6 488.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM428 488c-.9.6-1 1-.3 1 .6 0 1.5-.5 1.8-1 .8-1.2.4-1.2-1.5 0zM502.6 487.8c-.3.5.1.9.9.9s1.2-.4.9-.9c-.3-.4-.7-.8-.9-.8-.2 0-.6.4-.9.8zM567.3 488.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM570.6 488.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM591.6 488.7c-.6 1.4-.5 1.5.5.6.7-.7 1-1.5.7-1.8-.3-.3-.9.2-1.2 1.2zM595.3 488.5c0 .8.4 1.2.9.9.4-.3.8-.9.8-1.5 0-.5-.4-.9-.8-.9-.5 0-.9.7-.9 1.5zM161.5 490c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM165 490c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM185.5 490c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM193 490c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM357 490.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM433 490c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM453 490.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM469 490.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM485.5 490c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM489 490.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM537 490.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM541.5 490c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM553.5 490c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM557.5 490c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM577 490.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM179 492.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM546.6 492.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM185.5 494c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM189.5 494c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM193.5 494c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM489.5 494c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM493.5 494c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM525.5 494c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM537 494.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM541.5 494c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM553.5 494c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM577.5 494c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM581.5 494c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM181.5 498c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM185 498c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM189.5 498c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM201.5 498c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM213.5 498c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM217 498.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM489 498c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM493 498c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM513.5 498c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM517.5 498c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM525.5 498c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM529 498c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM533.5 498c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM537 498c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM541 498c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM561.5 498c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM565.5 498c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM479.5 507.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM482.6 507.8c-.3.5.1.9.9.9s1.2-.4.9-.9c-.3-.4-.7-.8-.9-.8-.2 0-.6.4-.9.8zM489.5 510c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM493.9 509.2c-.5 1.8-.6 3.8-.1 3.4.7-.8 1.2-3.6.6-3.6-.2 0-.4.1-.5.2zM481 514c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM495.6 515.3c.3 1 .9 1.5 1.2 1.2.3-.3 0-1.1-.7-1.8-1-.9-1.1-.8-.5.6zM481.5 518c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM483 524c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM493 534c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM493.5 538c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM499.3 539.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM489 542.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM493 542.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM481 554.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM485 554.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM491.5 556c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM498.6 556.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM481 558c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM485 558c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM501 562.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM487.5 570.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM495.5 571.1c-.4.6-.5 1.2-.2 1.5.2.3.7-.2 1-1.1.7-1.7.1-2-.8-.4zM491 572.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM465 576.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM493.5 578c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM497.5 578c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM489 582.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM493 582.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM479.5 583.1c-.4.6-.5 1.2-.2 1.5.2.3.7-.2 1-1.1.7-1.7.1-2-.8-.4zM455 585.9c0 .6.4 1.3 1 1.6.6.3.7-.1.4-.9-.7-1.8-1.4-2.1-1.4-.7zM497 586.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM479.5 587.1c-.4.6-.5 1.2-.2 1.5.2.3.7-.2 1-1.1.7-1.7.1-2-.8-.4zM475 588c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM491 588c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM479.5 590.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM458.7 592.1c.7.7 1.5 1 1.8.7.3-.3-.2-.9-1.2-1.2-1.4-.6-1.5-.5-.6.5zM463 591.9c0 .6.4 1.3 1 1.6.6.3.7-.1.4-.9-.7-1.8-1.4-2.1-1.4-.7zM490.6 592.2c.3.4.9.8 1.5.8.5 0 .9-.4.9-.8 0-.5-.7-.9-1.5-.9s-1.2.4-.9.9zM477 594.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM459 596c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM483.5 596c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM487.3 596.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM441 598c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM473 598c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM477 598.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM458.6 600.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM487.5 599.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM269.5 602c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM425.5 602c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM429.5 602c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM473.5 602c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM274.6 604.2c.3.5 1 .6 1.5.3 1.3-.9 1.1-1.2-.6-1.2-.8 0-1.2.4-.9.9zM443.5 604c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM459.6 603.8c-.3.5.1.9.9.9s1.2-.4.9-.9c-.3-.4-.7-.8-.9-.8-.2 0-.6.4-.9.8zM429.5 606c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM442.6 607.8c-.3.5.1.9.9.9s1.2-.4.9-.9c-.3-.4-.7-.8-.9-.8-.2 0-.6.4-.9.8zM281.5 610c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM285 610.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM289.5 610c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM293.5 610c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM421.5 610c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM425.5 610c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM429 610c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM449 610.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM453.5 610c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM443.3 611.5c0 .8.4 1.2.9.9.5-.3.6-1 .3-1.5-.9-1.3-1.2-1.1-1.2.6zM305 612.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM473 611.9c0 .6.4 1.3 1 1.6.6.3.7-.1.4-.9-.7-1.8-1.4-2.1-1.4-.7zM289 614c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM379 614.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM385 614.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM389 614.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM393 614c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM397 614c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM421 614.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM449 614.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM453.5 614c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM375.5 614.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM351 615.9c0 .6.4 1.3 1 1.6.6.3.7-.1.4-.9-.7-1.8-1.4-2.1-1.4-.7zM329 618.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM333.5 618c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM361 618c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM365 618c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM441.5 618c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM445.5 618c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM449 618c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM453.5 618c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM295.5 620c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM299 619.4c0 .2.7.7 1.6 1 .8.3 1.2.2.9-.4-.6-1-2.5-1.4-2.5-.6zM347 620c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM371 620.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM403.5 620c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM329 622.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM333.5 622c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM365.5 622c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM437 622c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM441 622c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM449 622c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM453.5 622c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM371 624c0 .5.5 1 1 1 .6 0 1-.5 1-1 0-.6-.4-1-1-1-.5 0-1 .4-1 1zM375 624c0 .5.5 1 1 1 .6 0 1-.5 1-1 0-.6-.4-1-1-1-.5 0-1 .4-1 1zM379.9 624.7c-1.3 1.6-1.2 1.7.4.4.9-.7 1.7-1.5 1.7-1.7 0-.8-.8-.3-2.1 1.3zM329 626c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM333 626c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM349 626.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM365.5 626c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM393.5 626c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM423.5 627.1c-.4.6-.5 1.2-.2 1.5.2.3.7-.2 1-1.1.7-1.7.1-2-.8-.4zM323.5 628c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM371 628c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM379.5 627.9c-.3.5-.2 1.2.3 1.5.5.3.9-.1.9-.9 0-1.7-.3-1.9-1.2-.6zM387 628.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM419 628c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM333.5 630c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM345 630c0 .5.5 1 1.1 1 .5 0 .7-.5.4-1-.3-.6-.8-1-1.1-1-.2 0-.4.4-.4 1zM349 630.1c0 .5.5.7 1 .4.6-.3 1-.8 1-1.1 0-.2-.4-.4-1-.4-.5 0-1 .5-1 1.1zM393.5 630c.3.5.8 1 1.1 1 .2 0 .4-.5.4-1 0-.6-.5-1-1.1-1-.5 0-.7.4-.4 1zM397.5 630c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM423.5 631.1c-.4.6-.5 1.2-.2 1.5.2.3.7-.2 1-1.1.7-1.7.1-2-.8-.4zM387.6 631.8c-.3.5.1.9.9.9s1.2-.4.9-.9c-.3-.4-.7-.8-.9-.8-.2 0-.6.4-.9.8zM397.5 634c-.3.5-.1 1 .4 1 .6 0 1.1-.5 1.1-1 0-.6-.2-1-.4-1-.3 0-.8.4-1.1 1zM386.9 635.7c-1.3 1.6-1.2 1.7.4.4 1.6-1.3 2.1-2.1 1.3-2.1-.2 0-1 .8-1.7 1.7z"/></svg> \ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 499ba4e..4bf02d0 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,15 +2,19 @@
<html lang="en">
<head>
<meta charset="utf-8" />
- <link rel="icon" href="favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#7289DA" />
<meta
name="description"
content="Python Discord Forms is the surveying system for the Python Discord server."
/>
- <link rel="apple-touch-icon" href="/logo192.png" />
- <link rel="manifest" href="/manifest.json" />
+
+ <link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png" />
+ <link rel="mask-icon" href="branding/safari-pinned-tab.svg" color="#5bbad5" />
+ <meta name="msapplication-TileColor" content="#2d89ef" />
+ <meta name="msapplication-config" content="branding/browserconfig.xml">
+
+ <link rel="manifest" href="manifest.json" />
<title>Python Discord Forms</title>
</head>
<body>
diff --git a/public/manifest.json b/public/manifest.json
index f374168..a36c2b7 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,19 +1,19 @@
{
- "short_name": "Python Discord Forms",
+ "short_name": "PyDis Forms",
"name": "Python Discord Forms",
"icons": [
{
- "src": "favicon.ico",
- "sizes": "48x48 32x32",
- "type": "image/x-icon"
+ "src": "branding/logo192.png",
+ "type": "image/png",
+ "sizes": "192x192"
},
{
- "src": "logo256.png",
+ "src": "branding/logo256.png",
"type": "image/png",
"sizes": "256x256"
},
{
- "src": "logo512.png",
+ "src": "branding/logo512.png",
"type": "image/png",
"sizes": "512x512"
}
diff --git a/renovate.json b/renovate.json
deleted file mode 100644
index f45d8f1..0000000
--- a/renovate.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "extends": [
- "config:base"
- ]
-}
diff --git a/src/index.tsx b/src/index.tsx
index 871eb40..4bce5a4 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -11,9 +11,14 @@ if (process.env.NODE_ENV === "production") {
Sentry.init({
dsn: process.env.REACT_APP_SENTRY_DSN,
tracesSampleRate: 0.25,
- release: `forms-frontend@${process.env.REACT_APP_SHA}`,
+ release: `forms-frontend@${process.env.COMMIT_REF}`,
environment: process.env.CONTEXT
});
+
+ // Set tag as PR number, "main", or if unavailable, "unknown"
+ const branch = process.env.BRANCH ?? "unknown";
+ const branch_name = branch.replace(RegExp("pull/|/head", "g"), "");
+ Sentry.setTag(branch_name === "main" ? "branch" : "pull_request", branch_name);
}
console.log("%c Python Discord Forms ", `font-size: 6em; font-family: "Hind", "Arial"; font-weight: 900; background-color: ${colors.blurple}; border-radius: 10px;`);
@@ -23,8 +28,8 @@ console.log(` Environment: %c ${process.env.NODE_ENV} `, `padding: 2px; border
console.log(` Context: %c ${process.env.CONTEXT} `, `padding: 2px; border-radius: 5px; background-color: ${process.env.CONTEXT === "production" ? colors.success : colors.error}`);
console.log(` Location: %c ${document.location.pathname + document.location.search + document.location.hash} `, `padding: 2px; border-radius: 5px; background-color: ${colors.success}`);
console.log(` User Agent: %c ${navigator.userAgent} `, `padding: 2px; border-radius: 5px; background-color: ${colors.success}`);
-console.log(` Branch: %c ${process.env.REACT_APP_BRANCH} `, `padding: 2px; border-radius: 5px; background-color: ${process.env.REACT_APP_BRANCH === "main" ? colors.success : colors.error}`);
-console.log(` SHA: %c ${process.env.REACT_APP_SHA} `, `padding: 2px; border-radius: 5px; background-color: ${colors.success}`);
+console.log(` Branch: %c ${process.env.BRANCH} `, `padding: 2px; border-radius: 5px; background-color: ${process.env.BRANCH === "main" ? colors.success : colors.error}`);
+console.log(` SHA: %c ${process.env.COMMIT_REF} `, `padding: 2px; border-radius: 5px; background-color: ${colors.success}`);
console.log("%cCome join us on Discord! https://discord.gg/python", `font-size: 1.5em; font-family: "Hind", "Arial"; color: ${colors.blurple}`);
diff --git a/src/logo.svg b/src/logo.svg
deleted file mode 100644
index 6b60c10..0000000
--- a/src/logo.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
- <g fill="#61DAFB">
- <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
- <circle cx="420.9" cy="296.5" r="45.7"/>
- <path d="M520.5 78.1z"/>
- </g>
-</svg>
diff --git a/src/pages/LandingPage.tsx b/src/pages/LandingPage.tsx
index af968ad..06fef46 100644
--- a/src/pages/LandingPage.tsx
+++ b/src/pages/LandingPage.tsx
@@ -17,7 +17,7 @@ function LandingPage(): JSX.Element {
const fetchForms = async () => {
setForms(await getForms());
};
- fetchForms();
+ fetchForms().then();
}, []);
if (!forms) {
diff --git a/src/setupTests.ts b/src/setupTests.ts
index 5018a42..6a69409 100644
--- a/src/setupTests.ts
+++ b/src/setupTests.ts
@@ -1,2 +1 @@
-
import "@testing-library/jest-dom/extend-expect";
diff --git a/src/tests/components/FormListing.test.tsx b/src/tests/components/FormListing.test.tsx
index f071c33..f269dbf 100644
--- a/src/tests/components/FormListing.test.tsx
+++ b/src/tests/components/FormListing.test.tsx
@@ -56,13 +56,21 @@ test("renders form listing with specified description", () => {
test("renders form listing with background green colour for open", () => {
const { container } = render(<Router><FormListing form={openFormListing} /></Router>);
const elem = container.querySelector("a");
- const style = window.getComputedStyle(elem);
- expect(style.backgroundColor).toBe("rgb(67, 181, 129)");
+ expect(elem).not.toBeNull();
+
+ if (elem) {
+ const style = window.getComputedStyle(elem);
+ expect(style.backgroundColor).toBe("rgb(67, 181, 129)");
+ }
});
test("renders form listing with background dark colour for closed", () => {
const { container } = render(<Router><FormListing form={closedFormListing} /></Router>);
const elem = container.querySelector("a");
- const style = window.getComputedStyle(elem);
- expect(style.backgroundColor).toBe("rgb(44, 47, 51)");
+ expect(elem).not.toBeNull();
+
+ if (elem) {
+ const style = window.getComputedStyle(elem);
+ expect(style.backgroundColor).toBe("rgb(44, 47, 51)");
+ }
});
diff --git a/webpack.config.js b/webpack.config.js
index 93e7e9d..35c90a7 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -6,13 +6,15 @@ if (process.env.NODE_ENV === "development") { require("dotenv").config(); }
module.exports = {
entry: "./src/index.tsx",
- mode: process.env.NODE_ENV,
+ mode: process.env.NODE_ENV || "production",
output: {
path: path.resolve(__dirname, "build"),
- filename: "[name].[contenthash].bundle.js",
+ filename: "[name].bundle.js",
+ sourceMapFilename: "[name].bundle.js.map",
publicPath: "/",
- devtoolModuleFilenameTemplate: "file:///" + path.resolve(__dirname, "[resource-path]?[loaders]")
+ devtoolModuleFilenameTemplate: "[resource-path]"
},
+ devtool: "source-map",
optimization: {
splitChunks: {
chunks: 'all',
@@ -77,13 +79,18 @@ module.exports = {
new CopyPlugin({
patterns: [{
from: 'public',
- to: '.'
+ to: '.',
+ globOptions: {
+ ignore: [
+ '**/index.html'
+ ]
+ }
}, ],
}), new webpack.EnvironmentPlugin({
NODE_ENV: "production",
- REACT_APP_SHA: "development",
+ BRANCH: "development",
+ COMMIT_REF: "development",
REACT_APP_SENTRY_DSN: "https://[email protected]/1234",
- REACT_APP_BRANCH: "development",
REACT_APP_OAUTH2_CLIENT_ID: "0",
BACKEND_URL: "https://forms-api.pythondiscord.com/",
CONTEXT: "development"
diff --git a/yarn.lock b/yarn.lock
index 38c85bb..63e5b83 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,14 +2,7 @@
# yarn lockfile v1
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4":
- version "7.10.4"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
- integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
- dependencies:
- "@babel/highlight" "^7.10.4"
-
-"@babel/code-frame@^7.12.11":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11":
version "7.12.11"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
@@ -974,14 +967,7 @@
core-js-pure "^3.0.0"
regenerator-runtime "^0.13.4"
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
- version "7.11.2"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
- integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
- dependencies:
- regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
version "7.12.5"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
@@ -1153,10 +1139,10 @@
resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
-"@emotion/[email protected]":
- version "11.1.4"
- resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.1.4.tgz#ddee4247627ff7dd7d0c6ae52f1cfd6b420357d2"
- integrity sha512-9gkhrW8UjV4IGRnEe4/aGPkUxoGS23aD9Vu6JCGfEDyBYL+nGkkRBoMFGAzCT9qFdyUvQp4UUtErbKWxq/JS4A==
+"@emotion/[email protected]":
+ version "11.1.5"
+ resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.1.5.tgz#15e78f9822894cdc296e6f4e0688bac8120dfe66"
+ integrity sha512-xfnZ9NJEv9SU9K2sxXM06lzjK245xSeHRpUh67eARBm3PBHjjKIZlfWZ7UQvD0Obvw6ZKjlC79uHrlzFYpOB/Q==
dependencies:
"@babel/runtime" "^7.7.2"
"@emotion/cache" "^11.1.3"
@@ -1579,13 +1565,6 @@
resolved "https://registry.yarnpkg.com/@napi-rs/triples/-/triples-1.0.2.tgz#2ce4c6a78568358772008f564ee5009093d20a19"
integrity sha512-EL3SiX43m9poFSnhDx4d4fn9SSaqyO2rHsCNhETi9bWPmjXK3uPJ0QpPFtx39FEdHcz1vJmsiW41kqc0AgvtzQ==
-"@node-rs/helper@^0.4.0":
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/@node-rs/helper/-/helper-0.4.0.tgz#deec7d95aafa90535980a51cbd5336b8bbefe93a"
- integrity sha512-fSyHEXmlt/FueKqAYiGFCnkohnQBMQwUr6VYPeZEeVBAzQzhioS1WaRe2fSpOuRKIimCQEvxhQ6fwsYxYakfGA==
- dependencies:
- tslib "^2.0.1"
-
"@node-rs/helper@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@node-rs/helper/-/helper-1.0.0.tgz#9fcd3f38b84af599e42c0aec272b308da55583e9"
@@ -1652,74 +1631,74 @@
estree-walker "^1.0.1"
picomatch "^2.2.2"
-"@sentry/[email protected]":
- version "5.30.0"
- resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.30.0.tgz#c28f49d551db3172080caef9f18791a7fd39e3b3"
- integrity sha512-rOb58ZNVJWh1VuMuBG1mL9r54nZqKeaIlwSlvzJfc89vyfd7n6tQ1UXMN383QBz/MS5H5z44Hy5eE+7pCrYAfw==
+"@sentry/[email protected]":
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.1.0.tgz#0e18a07b44bebed729bcf842af33203e388e2053"
+ integrity sha512-t3y2TLXDWgvfknyH8eKj/9mghJfSEqItFyp74zPu1Src6kOPjkd4Sa7o4+bdkNgA8dIIOrDAhRUbB2sq4sWMCA==
dependencies:
- "@sentry/core" "5.30.0"
- "@sentry/types" "5.30.0"
- "@sentry/utils" "5.30.0"
+ "@sentry/core" "6.1.0"
+ "@sentry/types" "6.1.0"
+ "@sentry/utils" "6.1.0"
tslib "^1.9.3"
-"@sentry/[email protected]":
- version "5.30.0"
- resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.30.0.tgz#6b203664f69e75106ee8b5a2fe1d717379b331f3"
- integrity sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg==
+"@sentry/[email protected]":
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.1.0.tgz#7dd4584dcaf2188a78b94b766068342e6ee65229"
+ integrity sha512-57mXkp3NoyxRycXrL+Ec6bYS6UYJZp9tYX0lUp5Ry2M0FxDZ3Q4drkjr8MIQOhBaQXP2ukSX4QTVLGMPm60zMw==
dependencies:
- "@sentry/hub" "5.30.0"
- "@sentry/minimal" "5.30.0"
- "@sentry/types" "5.30.0"
- "@sentry/utils" "5.30.0"
+ "@sentry/hub" "6.1.0"
+ "@sentry/minimal" "6.1.0"
+ "@sentry/types" "6.1.0"
+ "@sentry/utils" "6.1.0"
tslib "^1.9.3"
-"@sentry/[email protected]":
- version "5.30.0"
- resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.30.0.tgz#2453be9b9cb903404366e198bd30c7ca74cdc100"
- integrity sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ==
+"@sentry/[email protected]":
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.1.0.tgz#fb22734c91c9d68564737996bf28b7e032e3d8ee"
+ integrity sha512-JnBSCgNg3VHiMojUl5tCHU8iWPVuE+qqENIzG9A722oJms1kKWBvWl+yQzhWBNdgk5qeAY3F5UzKWJZkbJ6xow==
dependencies:
- "@sentry/types" "5.30.0"
- "@sentry/utils" "5.30.0"
+ "@sentry/types" "6.1.0"
+ "@sentry/utils" "6.1.0"
tslib "^1.9.3"
-"@sentry/[email protected]":
- version "5.30.0"
- resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.30.0.tgz#ce3d3a6a273428e0084adcb800bc12e72d34637b"
- integrity sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw==
+"@sentry/[email protected]":
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.1.0.tgz#b3abf76d93b95477a3c1029db810818bdc56845f"
+ integrity sha512-g6sfNKenL7wnsr/tibp8nFiMv/XRH0s0Pt4p151npmNI+SmjuUz3GGYEXk8ChCyaKldYKilkNOFdVXJxUf5gZw==
dependencies:
- "@sentry/hub" "5.30.0"
- "@sentry/types" "5.30.0"
+ "@sentry/hub" "6.1.0"
+ "@sentry/types" "6.1.0"
tslib "^1.9.3"
-"@sentry/[email protected]":
- version "5.30.0"
- resolved "https://registry.yarnpkg.com/@sentry/react/-/react-5.30.0.tgz#320e05f766b6a26faefa8d76d1101fd50c69f541"
- integrity sha512-dvn4mqCgbeEuUXEGp5P9PaW5j4GWTFUSdx/yG8f9IxNZv5zM+7otjog9ukrubFZvlxVxD/PrIxK0MhadfFY/Dw==
+"@sentry/[email protected]":
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/@sentry/react/-/react-6.1.0.tgz#f01a5f330ee339743420056872d0ae606a85381d"
+ integrity sha512-X1Jp1ueHsmHQXBcNWshA43MTdn0B3B06A36yv6mzAznmanpf+7+f7SHrnRFIwuBpTdPsHzolTmSE9VlkZPBgBg==
dependencies:
- "@sentry/browser" "5.30.0"
- "@sentry/minimal" "5.30.0"
- "@sentry/types" "5.30.0"
- "@sentry/utils" "5.30.0"
+ "@sentry/browser" "6.1.0"
+ "@sentry/minimal" "6.1.0"
+ "@sentry/types" "6.1.0"
+ "@sentry/utils" "6.1.0"
hoist-non-react-statics "^3.3.2"
tslib "^1.9.3"
-"@sentry/[email protected]":
- version "5.30.0"
- resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.30.0.tgz#19709bbe12a1a0115bc790b8942917da5636f402"
- integrity sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==
+"@sentry/[email protected]":
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.1.0.tgz#5f9379229423ca1325acf6709e95687180f67132"
+ integrity sha512-kIaN52Fw5K+2mKRaHE2YluJ+F/qMGSUzZXIFDNdC6OUMXQ4TM8gZTrITXs8CLDm7cK8iCqFCtzKOjKK6KyOKAg==
-"@sentry/[email protected]":
- version "5.30.0"
- resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.30.0.tgz#9a5bd7ccff85ccfe7856d493bffa64cabc41e980"
- integrity sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==
+"@sentry/[email protected]":
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.1.0.tgz#52e3d7050983e685d3a48f9d2efa1e6eb4ae3e6d"
+ integrity sha512-6JAplzUOS6bEwfX0PDRZBbYRvn9EN22kZfcL0qGHtM9L0QQ5ybjbbVwOpbXgRkiZx++dQbzLFtelxnDhsbFG+Q==
dependencies:
- "@sentry/types" "5.30.0"
+ "@sentry/types" "6.1.0"
tslib "^1.9.3"
"@sinonjs/commons@^1.7.0":
- version "1.8.1"
- resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217"
- integrity sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==
+ version "1.8.2"
+ resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b"
+ integrity sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==
dependencies:
type-detect "4.0.8"
@@ -1841,143 +1820,67 @@
"@svgr/plugin-svgo" "^5.5.0"
loader-utils "^2.0.0"
-"@swc/core-android-arm64@^1.2.43":
- version "1.2.43"
- resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.43.tgz#b05460b9632c13eaffc88f5027275e56fb342bca"
- integrity sha512-54xXwBqWHjr54sk78MWbg+g11zla2JybCdItaafQdMzRLJZZFIy20NIK3QOLpJ7QhZgu8fhmxnBR3p8GFhcPZA==
-
-"@swc/core-android-arm64@^1.2.45":
- version "1.2.45"
- resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.45.tgz#37222a5a66e9b8ca3898c9dbdbf0f87705643fdf"
- integrity sha512-/ObJF6gpnqNvaEDWTkaq5SQtsg4b7MixgJghkP/z26S1lVILyDJTfZn8qW80XdfBF5Xz0Z9OG0fjZDkENAKLLg==
-
-"@swc/core-darwin-arm64@^1.2.43":
- version "1.2.43"
- resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.43.tgz#33ff900f309e9889ceb1cb91a695c55c58e65e33"
- integrity sha512-zHNKHYdIhsvI1Q5vXJeWu6p0ugCVVYOm3sd78u9ptDlbGKfFYf5tPUucctwWUJ1qzR7mP2PH1Q/LuteJaOk8dA==
-
-"@swc/core-darwin-arm64@^1.2.45":
- version "1.2.45"
- resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.45.tgz#54657f320fe6ebc1e4dac5455d828c831286f64a"
- integrity sha512-ZWiVfiNNZdZBQRBfMZ1O0J4LrvHWegISnPXW8GGrNQqvlfgOJowRVHWu4XEanxdBD5XURW9XUW0IAKJwwJrvXg==
-
-"@swc/core-darwin-x64@^1.2.43":
- version "1.2.43"
- resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.43.tgz#7db06c2294921005c56f4afced0a7dde999c57ec"
- integrity sha512-ugWefKRKYehfvk7OZrM6bIPZOUIeau3DG0ophlGBniCar5WfCutldMoppA51QIVztQFPBXZRsPEoKX8L9D5BeQ==
-
-"@swc/core-darwin-x64@^1.2.45":
- version "1.2.45"
- resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.45.tgz#55624367c0b793e96835d3a361f29d180f502ccb"
- integrity sha512-G5yKhN7QkKnr5L6r2bK3wpBRJd1Cete6tDDgj5mdERdQCMvkB+JfBkDFGLJdqj1uskAtgkbTksvjTQQhZNJ/bA==
-
-"@swc/core-darwin@^1.2.36":
- version "1.2.36"
- resolved "https://registry.yarnpkg.com/@swc/core-darwin/-/core-darwin-1.2.36.tgz#8715c7ca6ec352424ae1fc3ad1bff19f1f03a97e"
- integrity sha512-2BvqKmdkPwS41QTZ0bkj2emdY8xsscMaUY3CtllQJOhY0oIw6kycNNfreAumVUU93eAXdympBj7yBTNkRil0gQ==
-
-"@swc/core-linux-arm-gnueabihf@^1.2.43":
- version "1.2.43"
- resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.43.tgz#d207a4293f52103a6cb39c2f797a19108f19af99"
- integrity sha512-SwcW2O8D04ma+NJor0oUpqtrjLKhXMvBY6yeWlDvHvzhStFy/xvQUdxvhlO7W/twa02SPNnLeozpwxqFZfgJGw==
-
-"@swc/core-linux-arm-gnueabihf@^1.2.45":
- version "1.2.45"
- resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.45.tgz#a70ce7c3ae865508ef3550f30f8668f0f9c05cb8"
- integrity sha512-rhwR+sleyr+/U+STJXQpBHbP/tLAEQZDMItSopwKVu9Xt9jy36mvLC8GuHij2nudVcugDlmyr5u/OvH3D+vLjw==
-
-"@swc/core-linux-arm64-gnu@^1.2.43":
- version "1.2.43"
- resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.43.tgz#8d7ca9a083b45197b7fb3c206d8491efcee53e9a"
- integrity sha512-a3MTL4xE8Ht09AEUmDmBtXRq8oScVc9/sItqhT8iurm1/mEP/FO/w6vuQ53kurdw2WDuta57XZXjnRAMSUpoIw==
-
-"@swc/core-linux-arm64-gnu@^1.2.45":
- version "1.2.45"
- resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.45.tgz#e8b8444a0b1c79e1003ec02f9c59191da04004e9"
- integrity sha512-msljjODecBr3Gy7D5+pWFLTtydGNboVIDvuzZryN+YhHdWXiZUTyUvWx1oUdk57AAUr2WId7chWppj1/Ffbokw==
-
-"@swc/core-linux-x64-gnu@^1.2.43":
- version "1.2.43"
- resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.43.tgz#f5645b67c544785f1513334f6241adbefce707da"
- integrity sha512-C0yce5RENZPZblaQAJ+B/WxxmKoiz+wH+0ubg83xMOrRoaZA9v85Ewoczr81sQABMmW5OL6n61mVApLR0Ya5tQ==
-
-"@swc/core-linux-x64-gnu@^1.2.45":
- version "1.2.45"
- resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.45.tgz#1fe8046e9a43f69e2b87606f16514a89df848efc"
- integrity sha512-JanmdgQXasdO0k1RsrCpZLuVyfMy7M+LhdOE+3y1YUSoqRzw4VAImA/qNIi+y70AdwlSrOmdPbyz834oJxB/pQ==
-
-"@swc/core-linux-x64-musl@^1.2.43":
- version "1.2.43"
- resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.43.tgz#5dd2d57943046a2856a41276fa76434d0e56298e"
- integrity sha512-3djVh5BY1DQ+/jOuWBS6Gl1h5Cx4bq9tl7XrGKTCV67vJltsXpxsh5v3zv1RgVjCKXTcsytNr8R8l/IJZdrYcw==
-
-"@swc/core-linux-x64-musl@^1.2.45":
- version "1.2.45"
- resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.45.tgz#1d886bbe1d28ee19b3f25feb7f5342d207d41e13"
- integrity sha512-p9UuVK57O1N6s4rkecjGSe8qofR+xzYiUOttvUUi5tq2ylRTCGeEe5XaigxLSZBSx39u3QAwYNSc7A7miLjP9Q==
-
-"@swc/core-linux@^1.2.36":
- version "1.2.36"
- resolved "https://registry.yarnpkg.com/@swc/core-linux/-/core-linux-1.2.36.tgz#cac9db6ab811be9e5deca0fb55bc2125dbc14842"
- integrity sha512-xUnn1rj7QYypaol5pjGgiGBHi/YsV55OpGLQDDM5FMxjwY6QLw9zJAHFprZpMbjOIKplKOujUyOwbpkhPzUdzA==
-
-"@swc/core-win32-x64-msvc@^1.2.43":
- version "1.2.43"
- resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.43.tgz#23c53f84233467261657275400b4761cd6f11c7f"
- integrity sha512-sZKmLDGxlKSrGLCY8hKjfDMvvKAsq0QA39A2z1s+ohsSRnXK8q6suVgqXGx3HdE/z6cTiq52faPjdd18Z3gxUQ==
-
-"@swc/core-win32-x64-msvc@^1.2.45":
- version "1.2.45"
- resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.45.tgz#e0982b81f7467e82a47cfdba426105a16b8ac42c"
- integrity sha512-DpapCufNXmErmlinyq5RK2BXjIZM65Y6SGUjS9v5WDDven4vpN8IbzkcfJMVNDAvlnx5KO/PHDAaoFptLdHq4Q==
-
-"@swc/core-win32@^1.2.36":
- version "1.2.36"
- resolved "https://registry.yarnpkg.com/@swc/core-win32/-/core-win32-1.2.36.tgz#13fb85ae579a3d0d73defe11239cb566110315c9"
- integrity sha512-O3HJ+Gd1RRsjdTPsvrjLw/ZTRo5N/V4u9+UFNgU9A5jUnhmAuyoUGSa+AHOOGQfSmLkrE6WF3+iz4apAYmnIOw==
-
- version "1.2.45"
- resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.45.tgz#e9a7e8162a3f19dccf1da89f07f4d931f6b6cdef"
- integrity sha512-1aQe4tMvF9CZvlPXScMJVl3iz/yvRiJwda0K1URIPKdMVvE6tGn81+ntM0yXCUBzX03c1M+0IEcWloc12/Ucjw==
- dependencies:
- "@node-rs/helper" "^1.0.0"
- optionalDependencies:
- "@swc/core-android-arm64" "^1.2.45"
- "@swc/core-darwin-arm64" "^1.2.45"
- "@swc/core-darwin-x64" "^1.2.45"
- "@swc/core-linux-arm-gnueabihf" "^1.2.45"
- "@swc/core-linux-arm64-gnu" "^1.2.45"
- "@swc/core-linux-x64-gnu" "^1.2.45"
- "@swc/core-linux-x64-musl" "^1.2.45"
- "@swc/core-win32-x64-msvc" "^1.2.45"
-
-"@swc/core@^1.1.48":
- version "1.2.36"
- resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.36.tgz#ce32c6553438e1980113d66f7d7a7b52b2a810b6"
- integrity sha512-hi/LRHkTS3ICjhm1sl2/AM3hv8OClqdp9jFZt/sKAxVgj61xS9kD9uYiDE0MKZiwMlcTNE5bH8kY1XhqCL25rg==
- dependencies:
- "@node-rs/helper" "^0.4.0"
- optionalDependencies:
- "@swc/core-darwin" "^1.2.36"
- "@swc/core-linux" "^1.2.36"
- "@swc/core-win32" "^1.2.36"
-
-"@swc/core@^1.2.30":
- version "1.2.43"
- resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.43.tgz#54c8ecedb691d7223c3a1d32d3a06d519385155a"
- integrity sha512-VFV9xbjpi9EQ2fuuGU2vyECMnPXFxoW1E63luI4jeZCaNnj0NOfQUzAl+KB1lKIckZ13lR5KI/NbfHmdFhFLIQ==
+"@swc/core-android-arm64@^1.2.47":
+ version "1.2.47"
+ resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.47.tgz#554106c849eaa28904f7f98e4cec0413d72642a1"
+ integrity sha512-N11TLGtK+pKPFCcimg07CnJCj8qKqPbyAx8a5z2CW2+qtAB1a8XpK9njl5ExA3mxrur9qa9ITb0OPNBjojb7nw==
+
+"@swc/core-darwin-arm64@^1.2.47":
+ version "1.2.47"
+ resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.47.tgz#b2e3e5297b295091798a3d224687faa877fd251c"
+ integrity sha512-HRdUR6wd2w3mky8j6tOpL4j2MMsAFWSe7KfgPOCwlIWPlprlK1ACB0r+BmqpwC+REYnWoUG+dtPmpX1UdqGShQ==
+
+"@swc/core-darwin-x64@^1.2.47":
+ version "1.2.47"
+ resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.47.tgz#0e8f39e99ada7dde6ecfba7417805743d3ba987c"
+ integrity sha512-Sp6D+Nyw6n4tDl4SxcGpK/FxoX/GDSMhvNunmoTL0KJjRCNe8SJO83jsv6YLJSCV+q6hl+x6XeiZ0JzKGzFjfQ==
+
+"@swc/core-linux-arm-gnueabihf@^1.2.47":
+ version "1.2.47"
+ resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.47.tgz#85dfe68f350ab7ac3f36bb344513db9ae3715858"
+ integrity sha512-U6ZfRloE1UFjhmyFptlAk5HACAzSTEeQLZmxqzhN6w1l7tsHDG4oLJuBPkZivL7cgwbiyO6RbaCu3mBG426+uA==
+
+"@swc/core-linux-arm64-gnu@^1.2.47":
+ version "1.2.47"
+ resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.47.tgz#82ee3a4feaa5e3feb4e806537fc1784bb01e973c"
+ integrity sha512-D1+/veC1EdkuIYmwLK/ka22L4HOX4rejmwhBATrfQX6XfewmLe1+y2LxBhkLd0CG1+N5L2/Eoq3ohLjdtoKnwg==
+
+"@swc/core-linux-x64-gnu@^1.2.47":
+ version "1.2.47"
+ resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.47.tgz#7a6cebd85f1abd0258343899fed71cfb32e0bf48"
+ integrity sha512-x9PJcnlVj4bARNB2t7oBn84T+80wItHm2YSWj4L47Us0/oNRB1IYe2icsaAUlgZMviIJTSgS5j8UQCLmg3kiGg==
+
+"@swc/core-linux-x64-musl@^1.2.47":
+ version "1.2.47"
+ resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.47.tgz#58ed13d4f1d583856d1fa3bf3dc3281fb90c614a"
+ integrity sha512-cTUTxQCejdkBHnzWBiAzy0oMy3gM3MTmwPmHX4hDmM6TO8+MG4D2qlDJEe2cM45R66GdUsl01hXJtcd46MIs6Q==
+
+"@swc/core-win32-ia32-msvc@^1.2.47":
+ version "1.2.47"
+ resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.47.tgz#8b8fdebb91bab24a1231583d11a6297f942771da"
+ integrity sha512-bysp0kLK8hzqDktDr3N8NHG9bmF+aGO7FSjixLRFeiXhKwVgGoMMMv0S0myHoPUIEo4K3TU7QnGqhpkvohmNaQ==
+
+"@swc/core-win32-x64-msvc@^1.2.47":
+ version "1.2.47"
+ resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.47.tgz#c144be04102e4e0575a0e7189b27718a660ee0c5"
+ integrity sha512-rG9S6LRKFrlE/HEZqQRBJ/X9tG9vy/6TdupXpUSNrDUidHJdULsGwqjeXlY4kXhNP/SqpqoFC8l8DwmlEbkQtQ==
+
+"@swc/[email protected]", "@swc/core@^1.1.48", "@swc/core@^1.2.30":
+ version "1.2.47"
+ resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.47.tgz#a2fda021d24d80214168faf2e1b985329a4c877a"
+ integrity sha512-y1Xfp/8K9jLg1QRBkV7XDpI9wz8yvVjBw60DhtAIzpRnmfv2uDK+y5p0OY+5zC7/OTmUB9DWtyM5YX6snkHqag==
dependencies:
"@node-rs/helper" "^1.0.0"
optionalDependencies:
- "@swc/core-android-arm64" "^1.2.43"
- "@swc/core-darwin-arm64" "^1.2.43"
- "@swc/core-darwin-x64" "^1.2.43"
- "@swc/core-linux-arm-gnueabihf" "^1.2.43"
- "@swc/core-linux-arm64-gnu" "^1.2.43"
- "@swc/core-linux-x64-gnu" "^1.2.43"
- "@swc/core-linux-x64-musl" "^1.2.43"
- "@swc/core-win32-x64-msvc" "^1.2.43"
+ "@swc/core-android-arm64" "^1.2.47"
+ "@swc/core-darwin-arm64" "^1.2.47"
+ "@swc/core-darwin-x64" "^1.2.47"
+ "@swc/core-linux-arm-gnueabihf" "^1.2.47"
+ "@swc/core-linux-arm64-gnu" "^1.2.47"
+ "@swc/core-linux-x64-gnu" "^1.2.47"
+ "@swc/core-linux-x64-musl" "^1.2.47"
+ "@swc/core-win32-ia32-msvc" "^1.2.47"
+ "@swc/core-win32-x64-msvc" "^1.2.47"
version "0.1.2"
@@ -1987,9 +1890,9 @@
"@swc/core" "^1.2.30"
"@testing-library/dom@^7.28.1":
- version "7.29.0"
- resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.29.0.tgz#60b18065bab50a5cde21fe80275a47a43024d9cc"
- integrity sha512-0hhuJSmw/zLc6ewR9cVm84TehuTd7tbqBX9pRNSp8znJ9gTmSgesdbiGZtt8R6dL+2rgaPFp9Yjr7IU1HWm49w==
+ version "7.29.4"
+ resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.29.4.tgz#1647c2b478789621ead7a50614ad81ab5ae5b86c"
+ integrity sha512-CtrJRiSYEfbtNGtEsd78mk1n1v2TUbeABlNIcOCJdDfkN5/JTOwQEbbQpoSRxGqzcWPgStMvJ4mNolSuBRv1NA==
dependencies:
"@babel/code-frame" "^7.10.4"
"@babel/runtime" "^7.12.5"
@@ -2014,30 +1917,25 @@
lodash "^4.17.15"
redent "^3.0.0"
-"@testing-library/[email protected]":
- version "11.2.3"
- resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.3.tgz#9971ede1c8465a231d7982eeca3c39fc362d5443"
- integrity sha512-BirBUGPkTW28ULuCwIbYo0y2+0aavHczBT6N9r3LrsswEW3pg25l1wgoE7I8QBIy1upXWkwKpYdWY7NYYP0Bxw==
+"@testing-library/[email protected]":
+ version "11.2.5"
+ resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.5.tgz#ae1c36a66c7790ddb6662c416c27863d87818eb9"
+ integrity sha512-yEx7oIa/UWLe2F2dqK0FtMF9sJWNXD+2PPtp39BvE0Kh9MJ9Kl0HrZAgEuhUJR+Lx8Di6Xz+rKwSdEPY2UV8ZQ==
dependencies:
"@babel/runtime" "^7.12.5"
"@testing-library/dom" "^7.28.1"
-"@testing-library/[email protected]":
- version "12.6.0"
- resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-12.6.0.tgz#2d0229e399eb5a0c6c112e848611432356cac886"
- integrity sha512-FNEH/HLmOk5GO70I52tKjs7WvGYckeE/SrnLX/ip7z2IGbffyd5zOUM1tZ10vsTphqm+VbDFI0oaXu0wcfQsAQ==
+"@testing-library/[email protected]":
+ version "12.6.3"
+ resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-12.6.3.tgz#4a77c56a48823cf8adebd0f57670e4a89c24d058"
+ integrity sha512-PCmbUKofE4SXA7l8jphZAbvv5H3c4ix34xPZ/GNe99fASX//msJRgiMbHIBP+GwRfgVG9c7zmkODSPu2X2vNRw==
dependencies:
"@babel/runtime" "^7.12.5"
-"@types/anymatch@*":
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
- integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==
-
"@types/aria-query@^4.2.0":
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz#14264692a9d6e2fa4db3df5e56e94b5e25647ac0"
- integrity sha512-iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A==
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.1.tgz#78b5433344e2f92e8b306c06a5622c50c245bf6b"
+ integrity sha512-S6oPal772qJZHoRZLFc/XoZW2gFvwXusYUmXPXkgxJLuEk2vOt7jc4Yo6z/vtI0EBkbPBVrJJ0B+prLIKiWqHg==
"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
version "7.1.12"
@@ -2088,10 +1986,10 @@
"@types/estree" "*"
"@types/json-schema" "*"
-"@types/estree@*", "@types/estree@^0.0.45":
- version "0.0.45"
- resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz#e9387572998e5ecdac221950dab3e8c3b16af884"
- integrity sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==
+"@types/estree@*", "@types/estree@^0.0.46":
+ version "0.0.46"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe"
+ integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==
version "0.0.39"
@@ -2150,15 +2048,7 @@
dependencies:
"@types/istanbul-lib-report" "*"
-"@types/jest@*":
- version "26.0.19"
- resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.19.tgz#e6fa1e3def5842ec85045bd5210e9bb8289de790"
- integrity sha512-jqHoirTG61fee6v6rwbnEuKhpSKih0tuhqeFbCmMmErhtu3BYlOZaXWjffgOstMM4S/3iQD31lI5bGLTrs97yQ==
- dependencies:
- jest-diff "^26.0.0"
- pretty-format "^26.0.0"
-
+"@types/jest@*", "@types/[email protected]":
version "26.0.20"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.20.tgz#cd2f2702ecf69e86b586e1f5223a60e454056307"
integrity sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA==
@@ -2166,25 +2056,25 @@
jest-diff "^26.0.0"
pretty-format "^26.0.0"
-"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.6":
+"@types/json-schema@*", "@types/json-schema@^7.0.6":
version "7.0.6"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
+"@types/json-schema@^7.0.3":
+ version "7.0.7"
+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
+ integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
+
"@types/minimatch@*":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
-"@types/node@*":
- version "14.11.2"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.2.tgz#2de1ed6670439387da1c9f549a2ade2b0a799256"
- integrity sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==
-
- version "14.14.21"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.21.tgz#d934aacc22424fe9622ebf6857370c052eae464e"
- integrity sha512-cHYfKsnwllYhjOzuC5q1VpguABBeecUp24yFluHpn/BQaVxB1CuQ1FSRZCzrPxrkIfWISXV2LbeoBthLWg0+0A==
+"@types/node@*", "@types/[email protected]":
+ version "14.14.25"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.25.tgz#15967a7b577ff81383f9b888aa6705d43fbbae93"
+ integrity sha512-EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ==
"@types/normalize-package-data@^2.4.0":
version "2.4.0"
@@ -2228,9 +2118,9 @@
"@types/react-router" "*"
"@types/react-router@*":
- version "5.1.8"
- resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.8.tgz#4614e5ba7559657438e17766bb95ef6ed6acc3fa"
- integrity sha512-HzOyJb+wFmyEhyfp4D4NYrumi+LQgQL/68HvJO+q6XtuHSDvw6Aqov7sCAhjbNq3bUPgPqbdvjXC5HeB2oEAPg==
+ version "5.1.11"
+ resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.11.tgz#b01ce4cb21bf7d6b32edc862fc1e2c0088044b5b"
+ integrity sha512-ofHbZMlp0Y2baOHgsWBQ4K3AttxY61bDMkwTiBOkPg7U6C/3UwwB5WaIx28JmSVi/eX3uFEMRo61BV22fDQIvg==
dependencies:
"@types/history" "*"
"@types/react" "*"
@@ -2242,18 +2132,10 @@
dependencies:
"@types/react" "*"
-"@types/react@*":
- version "16.9.49"
- resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.49.tgz#09db021cf8089aba0cdb12a49f8021a69cce4872"
- integrity sha512-DtLFjSj0OYAdVLBbyjhuV9CdGVHCkHn2R+xr3XkBvK2rS1Y1tkc14XSGjYgm5Fjjr90AxH9tiSzc1pCFMGO06g==
- dependencies:
- "@types/prop-types" "*"
- csstype "^3.0.2"
-
- version "17.0.0"
- resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.0.tgz#5af3eb7fad2807092f0046a1302b7823e27919b8"
- integrity sha512-aj/L7RIMsRlWML3YB6KZiXB3fV2t41+5RBGYF8z+tAKU43Px8C3cYUZsDvf1/+Bm4FK21QWBrDutu8ZJ/70qOw==
+"@types/react@*", "@types/[email protected]":
+ version "17.0.1"
+ resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.1.tgz#eb1f1407dea8da3bc741879c1192aa703ab9975b"
+ integrity sha512-w8t9f53B2ei4jeOqf/gxtc2Sswnc3LBK5s0DyJcg5xd10tMHXts2N31cKjWfH9IC/JvEPa/YF1U4YeP1t4R6HQ==
dependencies:
"@types/prop-types" "*"
csstype "^3.0.2"
@@ -2270,11 +2152,6 @@
resolved "https://registry.yarnpkg.com/@types/smoothscroll-polyfill/-/smoothscroll-polyfill-0.3.1.tgz#77fb3a6e116bdab4a5959122e3b8e201224dcd49"
integrity sha512-+KkHw4y+EyeCtVXET7woHUhIbfWFCflc0E0mZnSV+ZdjPQeHt/9KPEuT7gSW/kFQ8O3EG30PLO++YhChDt8+Ag==
-"@types/source-list-map@*":
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
- integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
-
"@types/stack-utils@^1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -2285,11 +2162,6 @@
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
-"@types/tapable@*", "@types/tapable@^1.0.5":
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74"
- integrity sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==
-
"@types/testing-library__jest-dom@^5.9.1":
version "5.9.5"
resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.5.tgz#5bf25c91ad2d7b38f264b12275e5c92a66d849b0"
@@ -2297,34 +2169,6 @@
dependencies:
"@types/jest" "*"
-"@types/uglify-js@*":
- version "3.11.0"
- resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.11.0.tgz#2868d405cc45cd9dc3069179052103032c33afbc"
- integrity sha512-I0Yd8TUELTbgRHq2K65j8rnDPAzAP+DiaF/syLem7yXwYLsHZhPd+AM2iXsWmf9P2F2NlFCgl5erZPQx9IbM9Q==
- dependencies:
- source-map "^0.6.1"
-
-"@types/webpack-sources@*":
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.0.0.tgz#08216ab9be2be2e1499beaebc4d469cec81e82a7"
- integrity sha512-a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg==
- dependencies:
- "@types/node" "*"
- "@types/source-list-map" "*"
- source-map "^0.7.3"
-
-"@types/webpack@^4.41.8":
- version "4.41.22"
- resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.22.tgz#ff9758a17c6bd499e459b91e78539848c32d0731"
- integrity sha512-JQDJK6pj8OMV9gWOnN1dcLCyU9Hzs6lux0wBO4lr1+gyEhIBR9U3FMrz12t2GPkg110XAxEAw2WHF6g7nZIbRQ==
- dependencies:
- "@types/anymatch" "*"
- "@types/node" "*"
- "@types/tapable" "*"
- "@types/uglify-js" "*"
- "@types/webpack-sources" "*"
- source-map "^0.6.0"
-
"@types/yargs-parser@*":
version "20.2.0"
resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9"
@@ -2338,19 +2182,19 @@
"@types/yargs-parser" "*"
"@types/yargs@^15.0.0":
- version "15.0.12"
- resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.12.tgz#6234ce3e3e3fa32c5db301a170f96a599c960d74"
- integrity sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw==
+ version "15.0.13"
+ resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc"
+ integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==
dependencies:
"@types/yargs-parser" "*"
-"@typescript-eslint/[email protected]":
- version "4.13.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.13.0.tgz#5f580ea520fa46442deb82c038460c3dd3524bb6"
- integrity sha512-ygqDUm+BUPvrr0jrXqoteMqmIaZ/bixYOc3A4BRwzEPTZPi6E+n44rzNZWaB0YvtukgP+aoj0i/fyx7FkM2p1w==
+"@typescript-eslint/[email protected]":
+ version "4.15.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.0.tgz#13a5a07cf30d0d5781e43480aa2a8d38d308b084"
+ integrity sha512-DJgdGZW+8CFUTz5C/dnn4ONcUm2h2T0itWD85Ob5/V27Ndie8hUoX5HKyGssvR8sUMkAIlUc/AMK67Lqa3kBIQ==
dependencies:
- "@typescript-eslint/experimental-utils" "4.13.0"
- "@typescript-eslint/scope-manager" "4.13.0"
+ "@typescript-eslint/experimental-utils" "4.15.0"
+ "@typescript-eslint/scope-manager" "4.15.0"
debug "^4.1.1"
functional-red-black-tree "^1.0.1"
lodash "^4.17.15"
@@ -2358,61 +2202,60 @@
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/[email protected]":
- version "4.13.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.13.0.tgz#9dc9ab375d65603b43d938a0786190a0c72be44e"
- integrity sha512-/ZsuWmqagOzNkx30VWYV3MNB/Re/CGv/7EzlqZo5RegBN8tMuPaBgNK6vPBCQA8tcYrbsrTdbx3ixMRRKEEGVw==
+"@typescript-eslint/[email protected]":
+ version "4.15.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.15.0.tgz#b87c36410a9b23f637689427be85007a2ec1a9c6"
+ integrity sha512-V4vaDWvxA2zgesg4KPgEGiomWEBpJXvY4ZX34Y3qxK8LUm5I87L+qGIOTd9tHZOARXNRt9pLbblSKiYBlGMawg==
dependencies:
"@types/json-schema" "^7.0.3"
- "@typescript-eslint/scope-manager" "4.13.0"
- "@typescript-eslint/types" "4.13.0"
- "@typescript-eslint/typescript-estree" "4.13.0"
+ "@typescript-eslint/scope-manager" "4.15.0"
+ "@typescript-eslint/types" "4.15.0"
+ "@typescript-eslint/typescript-estree" "4.15.0"
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"
-"@typescript-eslint/[email protected]":
- version "4.13.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.13.0.tgz#c413d640ea66120cfcc37f891e8cb3fd1c9d247d"
- integrity sha512-KO0J5SRF08pMXzq9+abyHnaGQgUJZ3Z3ax+pmqz9vl81JxmTTOUfQmq7/4awVfq09b6C4owNlOgOwp61pYRBSg==
+"@typescript-eslint/[email protected]":
+ version "4.15.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.15.0.tgz#8df94365b4b7161f9e8514fe28aef19954810b6b"
+ integrity sha512-L6Dtbq8Bc7g2aZwnIBETpmUa9XDKCMzKVwAArnGp5Mn7PRNFjf3mUzq8UeBjL3K8t311hvevnyqXAMSmxO8Gpg==
dependencies:
- "@typescript-eslint/scope-manager" "4.13.0"
- "@typescript-eslint/types" "4.13.0"
- "@typescript-eslint/typescript-estree" "4.13.0"
+ "@typescript-eslint/scope-manager" "4.15.0"
+ "@typescript-eslint/types" "4.15.0"
+ "@typescript-eslint/typescript-estree" "4.15.0"
debug "^4.1.1"
-"@typescript-eslint/[email protected]":
- version "4.13.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.13.0.tgz#5b45912a9aa26b29603d8fa28f5e09088b947141"
- integrity sha512-UpK7YLG2JlTp/9G4CHe7GxOwd93RBf3aHO5L+pfjIrhtBvZjHKbMhBXTIQNkbz7HZ9XOe++yKrXutYm5KmjWgQ==
+"@typescript-eslint/[email protected]":
+ version "4.15.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.15.0.tgz#c42703558ea6daaaba51a9c3a86f2902dbab9432"
+ integrity sha512-CSNBZnCC2jEA/a+pR9Ljh8Y+5TY5qgbPz7ICEk9WCpSEgT6Pi7H2RIjxfrrbUXvotd6ta+i27sssKEH8Azm75g==
dependencies:
- "@typescript-eslint/types" "4.13.0"
- "@typescript-eslint/visitor-keys" "4.13.0"
+ "@typescript-eslint/types" "4.15.0"
+ "@typescript-eslint/visitor-keys" "4.15.0"
-"@typescript-eslint/[email protected]":
- version "4.13.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.13.0.tgz#6a7c6015a59a08fbd70daa8c83dfff86250502f8"
- integrity sha512-/+aPaq163oX+ObOG00M0t9tKkOgdv9lq0IQv/y4SqGkAXmhFmCfgsELV7kOCTb2vVU5VOmVwXBXJTDr353C1rQ==
+"@typescript-eslint/[email protected]":
+ version "4.15.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.15.0.tgz#3011ae1ac3299bb9a5ac56bdd297cccf679d3662"
+ integrity sha512-su4RHkJhS+iFwyqyXHcS8EGPlUVoC+XREfy5daivjLur9JP8GhvTmDipuRpcujtGC4M+GYhUOJCPDE3rC5NJrg==
-"@typescript-eslint/[email protected]":
- version "4.13.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.13.0.tgz#cf6e2207c7d760f5dfd8d18051428fadfc37b45e"
- integrity sha512-9A0/DFZZLlGXn5XA349dWQFwPZxcyYyCFX5X88nWs2uachRDwGeyPz46oTsm9ZJE66EALvEns1lvBwa4d9QxMg==
+"@typescript-eslint/[email protected]":
+ version "4.15.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.0.tgz#402c86a7d2111c1f7a2513022f22a38a395b7f93"
+ integrity sha512-jG6xTmcNbi6xzZq0SdWh7wQ9cMb2pqXaUp6bUZOMsIlu5aOlxGxgE/t6L/gPybybQGvdguajXGkZKSndZJpksA==
dependencies:
- "@typescript-eslint/types" "4.13.0"
- "@typescript-eslint/visitor-keys" "4.13.0"
+ "@typescript-eslint/types" "4.15.0"
+ "@typescript-eslint/visitor-keys" "4.15.0"
debug "^4.1.1"
globby "^11.0.1"
is-glob "^4.0.1"
- lodash "^4.17.15"
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/[email protected]":
- version "4.13.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.13.0.tgz#9acb1772d3b3183182b6540d3734143dce9476fe"
- integrity sha512-6RoxWK05PAibukE7jElqAtNMq+RWZyqJ6Q/GdIxaiUj2Ept8jh8+FUVlbq9WxMYxkmEOPvCE5cRSyupMpwW31g==
+"@typescript-eslint/[email protected]":
+ version "4.15.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.15.0.tgz#2a07768df30c8a5673f1bce406338a07fdec38ca"
+ integrity sha512-RnDtJwOwFucWFAMjG3ghCG/ikImFJFEg20DI7mn4pHEx3vC48lIAoyjhffvfHmErRDboUPC7p9Z2il4CLb7qxA==
dependencies:
- "@typescript-eslint/types" "4.13.0"
+ "@typescript-eslint/types" "4.15.0"
eslint-visitor-keys "^2.0.0"
"@webassemblyjs/[email protected]":
@@ -2536,17 +2379,22 @@
"@webassemblyjs/ast" "1.11.0"
"@xtuc/long" "4.2.2"
-"@webpack-cli/info@^1.2.1":
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.1.tgz#af98311f983d0b9fce7284cfcf1acaf1e9f4879c"
- integrity sha512-fLnDML5HZ5AEKzHul8xLAksoKN2cibu6MgonkUj8R9V7bbeVRkd1XbGEGWrAUNYHbX1jcqCsDEpBviE5StPMzQ==
+"@webpack-cli/configtest@^1.0.1":
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.1.tgz#241aecfbdc715eee96bed447ed402e12ec171935"
+ integrity sha512-B+4uBUYhpzDXmwuo3V9yBH6cISwxEI4J+NO5ggDaGEEHb0osY/R7MzeKc0bHURXQuZjMM4qD+bSJCKIuI3eNBQ==
+
+"@webpack-cli/info@^1.2.2":
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.2.tgz#ef3c0cd947a1fa083e174a59cb74e0b6195c236c"
+ integrity sha512-5U9kUJHnwU+FhKH4PWGZuBC1hTEPYyxGSL5jjoBI96Gx8qcYJGOikpiIpFoTq8mmgX3im2zAo2wanv/alD74KQ==
dependencies:
envinfo "^7.7.3"
-"@webpack-cli/serve@^1.2.1":
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.2.1.tgz#7513d7a769e3f97958de799b5b49874425ae3396"
- integrity sha512-Zj1z6AyS+vqV6Hfi7ngCjFGdHV5EwZNIHo6QfFTNe9PyW+zBU1zJ9BiOW1pmUEq950RC4+Dym6flyA/61/vhyw==
+"@webpack-cli/serve@^1.3.0":
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.0.tgz#2730c770f5f1f132767c63dcaaa4ec28f8c56a6c"
+ integrity sha512-k2p2VrONcYVX1wRRrf0f3X2VGltLWcv+JzXRBDmvCxGlCeESx4OXw91TsWeKOkp784uNoVQo313vxJFHXPPwfw==
"@xtuc/ieee754@^1.2.0":
version "1.2.0"
@@ -2638,9 +2486,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
uri-js "^4.2.2"
ajv@^7.0.2:
- version "7.0.3"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz#13ae747eff125cafb230ac504b2406cf371eece2"
- integrity sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ==
+ version "7.0.4"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.4.tgz#827e5f5ae32f5e5c1637db61f253a112229b5e2f"
+ integrity sha512-xzzzaqgEQfmuhbhAoqjJ8T/1okb6gAzXn/eQRNpAN1AEUoHJTNF9xCDRTtf/s3SKldtZfa+RJeTs+BQq+eZ/sw==
dependencies:
fast-deep-equal "^3.1.1"
json-schema-traverse "^1.0.0"
@@ -3160,13 +3008,13 @@ cache-base@^1.0.1:
union-value "^1.0.0"
unset-value "^1.0.0"
-call-bind@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce"
- integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==
+call-bind@^1.0.0, call-bind@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+ integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
dependencies:
function-bind "^1.1.1"
- get-intrinsic "^1.0.0"
+ get-intrinsic "^1.0.2"
callsites@^3.0.0:
version "3.1.0"
@@ -3309,6 +3157,15 @@ cliui@^6.0.0:
strip-ansi "^6.0.0"
wrap-ansi "^6.2.0"
+clone-deep@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+ integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
+ dependencies:
+ is-plain-object "^2.0.4"
+ kind-of "^6.0.2"
+ shallow-clone "^3.0.0"
+
co@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -3382,10 +3239,10 @@ commander@^4.1.1:
resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
-commander@^6.2.0:
- version "6.2.1"
- resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
- integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
+commander@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2"
+ integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==
common-tags@^1.8.0:
version "1.8.0"
@@ -3489,9 +3346,9 @@ core-js-compat@^3.8.0:
semver "7.0.0"
core-js-pure@^3.0.0:
- version "3.8.1"
- resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.8.1.tgz#23f84048f366fdfcf52d3fd1c68fec349177d119"
- integrity sha512-Se+LaxqXlVXGvmexKGPvnUIYC1jwXu1H6Pkyb3uBM5d8/NELMYCHs/4/roD7721NxrTLyv7e5nXd5/QLBO+10g==
+ version "3.8.3"
+ resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.8.3.tgz#10e9e3b2592ecaede4283e8f3ad7020811587c02"
+ integrity sha512-V5qQZVAr9K0xu7jXg1M7qTEwuxUgqr7dUOezGaNa7i+Xn9oXAU/d1fzqD9ObuwpVQOaorO5s70ckyi1woP9lVA==
core-js@^3.6.5:
version "3.8.1"
@@ -3525,13 +3382,6 @@ cosmiconfig@^7.0.0:
path-type "^4.0.0"
yaml "^1.10.0"
- version "7.0.3"
- resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
- integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
- dependencies:
- cross-spawn "^7.0.1"
-
cross-spawn@^6.0.0:
version "6.0.5"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -3543,7 +3393,7 @@ cross-spawn@^6.0.0:
shebang-command "^1.2.0"
which "^1.2.9"
-cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -3702,20 +3552,13 @@ debug@^3.1.1, debug@^3.2.6:
dependencies:
ms "^2.1.1"
-debug@^4.0.1, debug@^4.1.1:
+debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
version "4.3.1"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
dependencies:
ms "2.1.2"
-debug@^4.1.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
- integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
- dependencies:
- ms "2.1.2"
-
decamelize@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -3761,7 +3604,7 @@ default-gateway@^4.2.0:
execa "^1.0.0"
ip-regex "^2.1.0"
-define-properties@^1.1.2, define-properties@^1.1.3:
+define-properties@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -4097,22 +3940,24 @@ es-abstract@^1.18.0-next.0:
string.prototype.trimstart "^1.0.1"
es-abstract@^1.18.0-next.1:
- version "1.18.0-next.1"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
- integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
+ version "1.18.0-next.2"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.2.tgz#088101a55f0541f595e7e057199e27ddc8f3a5c2"
+ integrity sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==
dependencies:
+ call-bind "^1.0.2"
es-to-primitive "^1.2.1"
function-bind "^1.1.1"
+ get-intrinsic "^1.0.2"
has "^1.0.3"
has-symbols "^1.0.1"
is-callable "^1.2.2"
- is-negative-zero "^2.0.0"
+ is-negative-zero "^2.0.1"
is-regex "^1.1.1"
- object-inspect "^1.8.0"
+ object-inspect "^1.9.0"
object-keys "^1.1.1"
- object.assign "^4.1.1"
- string.prototype.trimend "^1.0.1"
- string.prototype.trimstart "^1.0.1"
+ object.assign "^4.1.2"
+ string.prototype.trimend "^1.0.3"
+ string.prototype.trimstart "^1.0.3"
es-module-lexer@^0.3.26:
version "0.3.26"
@@ -4202,10 +4047,10 @@ eslint-visitor-keys@^2.0.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
- version "7.18.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz#7fdcd2f3715a41fe6295a16234bd69aed2c75e67"
- integrity sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==
+ version "7.19.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.19.0.tgz#6719621b196b5fad72e43387981314e5d0dc3f41"
+ integrity sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg==
dependencies:
"@babel/code-frame" "^7.0.0"
"@eslint/eslintrc" "^0.3.0"
@@ -4612,15 +4457,27 @@ flat-cache@^3.0.4:
rimraf "^3.0.2"
flatted@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"
- integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
+ integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==
+
+follow-redirects@^1.0.0:
+ version "1.13.2"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147"
+ integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==
-follow-redirects@^1.0.0, follow-redirects@^1.10.0:
+follow-redirects@^1.10.0:
version "1.13.1"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
+for-each@^0.3.3:
+ version "0.3.3"
+ resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+ integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+ dependencies:
+ is-callable "^1.1.3"
+
for-in@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -4657,15 +4514,15 @@ [email protected]:
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
[email protected], fs-extra@^9.0.1:
- version "9.0.1"
- resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
- integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
[email protected], fs-extra@^9.0.1:
+ version "9.1.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+ integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
dependencies:
at-least-node "^1.0.0"
graceful-fs "^4.2.0"
jsonfile "^6.0.1"
- universalify "^1.0.0"
+ universalify "^2.0.0"
fs.realpath@^1.0.0:
version "1.0.0"
@@ -4681,9 +4538,9 @@ fsevents@^1.2.7:
nan "^2.12.1"
fsevents@^2.1.2:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.2.1.tgz#1fb02ded2036a8ac288d507a65962bd87b97628d"
- integrity sha512-bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA==
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
+ integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
fsevents@~2.1.2:
version "2.1.3"
@@ -4710,10 +4567,10 @@ get-caller-file@^2.0.1:
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-get-intrinsic@^1.0.0, get-intrinsic@^1.0.1, get-intrinsic@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.2.tgz#6820da226e50b24894e08859469dc68361545d49"
- integrity sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==
+get-intrinsic@^1.0.1, get-intrinsic@^1.0.2, get-intrinsic@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.0.tgz#892e62931e6938c8a23ea5aaebcfb67bd97da97e"
+ integrity sha512-M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg==
dependencies:
function-bind "^1.1.1"
has "^1.0.3"
@@ -4989,20 +4846,17 @@ html-minifier-terser@^5.0.1:
relateurl "^0.2.7"
terser "^4.6.3"
- version "4.5.1"
- resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.1.tgz#40aaf1b5cb78f2f23a83333999625c20929cda65"
- integrity sha512-yzK7RQZwv9xB+pcdHNTjcqbaaDZ+5L0zJHXfi89iWIZmb/FtzxhLk0635rmJihcQbs3ZUF27Xp4oWGx6EK56zg==
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.0.0.tgz#457a9defb33ce368135078b4e0387a27f3fe244d"
+ integrity sha512-kxTyb8cyZwEyUqXTgdHRUOF4C7uCrquzw2T+YTudehm/yspodgCkREjdmc4dXI8k2P4NEjqOVbnOOlPZg4TKJA==
dependencies:
"@types/html-minifier-terser" "^5.0.0"
- "@types/tapable" "^1.0.5"
- "@types/webpack" "^4.41.8"
html-minifier-terser "^5.0.1"
- loader-utils "^1.2.3"
+ loader-utils "^2.0.0"
lodash "^4.17.20"
pretty-error "^2.1.1"
- tapable "^1.1.3"
- util.promisify "1.0.0"
+ tapable "^2.0.0"
htmlparser2@^3.3.0:
version "3.10.1"
@@ -5136,7 +4990,7 @@ ignore@^5.1.4:
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
-import-fresh@^3.0.0:
+import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
version "3.3.0"
resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -5144,22 +4998,6 @@ import-fresh@^3.0.0:
parent-module "^1.0.0"
resolve-from "^4.0.0"
-import-fresh@^3.1.0:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
- integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
- dependencies:
- parent-module "^1.0.0"
- resolve-from "^4.0.0"
-
-import-fresh@^3.2.1:
- version "3.2.2"
- resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e"
- integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==
- dependencies:
- parent-module "^1.0.0"
- resolve-from "^4.0.0"
-
import-local@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
@@ -5213,13 +5051,13 @@ internal-ip@^4.3.0:
ipaddr.js "^1.9.0"
internal-slot@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"
- integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
+ integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
dependencies:
- es-abstract "^1.17.0-next.1"
+ get-intrinsic "^1.1.0"
has "^1.0.3"
- side-channel "^1.0.2"
+ side-channel "^1.0.4"
interpret@^2.2.0:
version "2.2.0"
@@ -5291,7 +5129,12 @@ is-buffer@^1.1.5:
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-is-callable@^1.1.4, is-callable@^1.2.0, is-callable@^1.2.2:
+is-callable@^1.1.3, is-callable@^1.2.2:
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
+ integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
+
+is-callable@^1.1.4, is-callable@^1.2.0:
version "1.2.2"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
@@ -5408,6 +5251,11 @@ is-negative-zero@^2.0.0:
resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
+is-negative-zero@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+ integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+
is-number@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -5456,7 +5304,15 @@ is-potential-custom-element-name@^1.0.0:
resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
-is-regex@^1.0.4, is-regex@^1.1.0, is-regex@^1.1.1:
+is-regex@^1.0.4:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
+ integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
+ dependencies:
+ call-bind "^1.0.2"
+ has-symbols "^1.0.1"
+
+is-regex@^1.1.0, is-regex@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
@@ -6214,13 +6070,6 @@ json3@^3.3.3:
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
-json5@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
- integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
- dependencies:
- minimist "^1.2.0"
-
json5@^2.1.2:
version "2.1.3"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
@@ -6330,15 +6179,6 @@ loader-runner@^4.2.0:
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
-loader-utils@^1.2.3:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
- integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
- dependencies:
- big.js "^5.2.2"
- emojis-list "^3.0.0"
- json5 "^1.0.1"
-
loader-utils@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
@@ -6514,39 +6354,27 @@ micromatch@^4.0.2:
braces "^3.0.1"
picomatch "^2.0.5"
- version "1.44.0"
- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
- integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
-
[email protected], "mime-db@>= 1.43.0 < 2":
version "1.45.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
+mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
version "2.1.28"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
dependencies:
mime-db "1.45.0"
-mime-types@^2.1.27:
- version "2.1.27"
- resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
- integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
- dependencies:
- mime-db "1.44.0"
-
version "1.6.0"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
mime@^2.4.4:
- version "2.4.7"
- resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74"
- integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz#2b4af934401779806ee98026bb42e8c1ae1876b1"
+ integrity sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==
mimic-fn@^2.1.0:
version "2.1.0"
@@ -6820,7 +6648,7 @@ object.assign@^4.1.0:
has-symbols "^1.0.1"
object-keys "^1.1.1"
-object.assign@^4.1.1, object.assign@^4.1.2:
+object.assign@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
@@ -6850,7 +6678,7 @@ object.fromentries@^2.0.2:
es-abstract "^1.18.0-next.1"
has "^1.0.3"
-object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
+object.getownpropertydescriptors@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
@@ -6858,6 +6686,15 @@ object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0
define-properties "^1.1.3"
es-abstract "^1.17.0-next.1"
+object.getownpropertydescriptors@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544"
+ integrity sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==
+ dependencies:
+ call-bind "^1.0.0"
+ define-properties "^1.1.3"
+ es-abstract "^1.18.0-next.1"
+
object.pick@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -7608,12 +7445,12 @@ regex-not@^1.0.0, regex-not@^1.0.2:
safe-regex "^1.1.0"
regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
- integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
+ integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
dependencies:
+ call-bind "^1.0.2"
define-properties "^1.1.3"
- es-abstract "^1.17.0-next.1"
regexpp@^3.0.0, regexpp@^3.1.0:
version "3.1.0"
@@ -8054,6 +7891,13 @@ [email protected]:
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+shallow-clone@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+ integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
+ dependencies:
+ kind-of "^6.0.2"
+
shebang-command@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -8083,7 +7927,7 @@ shellwords@^0.1.1:
resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
-side-channel@^1.0.2, side-channel@^1.0.3:
+side-channel@^1.0.3, side-channel@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
@@ -8229,6 +8073,13 @@ source-map@^0.7.3, source-map@~0.7.2:
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+source-map@^0.8.0-beta.0:
+ version "0.8.0-beta.0"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11"
+ integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==
+ dependencies:
+ whatwg-url "^7.0.0"
+
sourcemap-codec@^1.4.4:
version "1.4.8"
resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
@@ -8394,6 +8245,14 @@ string.prototype.trimend@^1.0.1:
define-properties "^1.1.3"
es-abstract "^1.17.5"
+string.prototype.trimend@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
+ integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==
+ dependencies:
+ call-bind "^1.0.0"
+ define-properties "^1.1.3"
+
string.prototype.trimstart@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
@@ -8402,6 +8261,14 @@ string.prototype.trimstart@^1.0.1:
define-properties "^1.1.3"
es-abstract "^1.17.5"
+string.prototype.trimstart@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
+ integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==
+ dependencies:
+ call-bind "^1.0.0"
+ define-properties "^1.1.3"
+
string_decoder@^1.1.1:
version "1.3.0"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -8555,20 +8422,15 @@ symbol-tree@^3.2.2, symbol-tree@^3.2.4:
integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
table@^6.0.4:
- version "6.0.6"
- resolved "https://registry.yarnpkg.com/table/-/table-6.0.6.tgz#e9223f1e851213e2e43ab584b0fec33fb09a8e7a"
- integrity sha512-OInCtPmDNieVBkVFi6C8RwU2S2H0h8mF3e3TQK4nreaUNCpooQUkI+A/KuEkm5FawfhWIfNqG+qfelVVR+V00g==
+ version "6.0.7"
+ resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"
+ integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==
dependencies:
ajv "^7.0.2"
lodash "^4.17.20"
slice-ansi "^4.0.0"
string-width "^4.2.0"
-tapable@^1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
- integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-
tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b"
@@ -8749,30 +8611,20 @@ tr46@^2.0.2:
dependencies:
punycode "^2.1.1"
-tslib@^1.10.0, tslib@^1.9.0:
- version "1.13.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
- integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
-
-tslib@^1.8.1:
+tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
version "1.14.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-tslib@^1.9.3:
- version "1.14.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.0.tgz#d624983f3e2c5e0b55307c3dd6c86acd737622c6"
- integrity sha512-+Zw5lu0D9tvBMjGP8LpvMb0u2WW2QV3y+D8mO6J+cNzCYIN4sVy43Bf9vl92nqFahutN0I8zHa7cc4vihIshnw==
-
-tslib@^2.0.1, tslib@^2.0.3:
+tslib@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
tsutils@^3.17.1:
- version "3.17.1"
- resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
- integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==
+ version "3.20.0"
+ resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.20.0.tgz#ea03ea45462e146b53d70ce0893de453ff24f698"
+ integrity sha512-RYbuQuvkhuqVeXweWT3tJLKOEJ/UUw9GjNEZGWdrLLlM+611o1gwLHBpxoFJKKl25fLprp2eVthtKs5JOrNeXg==
dependencies:
tslib "^1.8.1"
@@ -8842,10 +8694,10 @@ typedarray-to-buffer@^3.1.5:
dependencies:
is-typedarray "^1.0.0"
- version "4.1.3"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
- integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
+ version "4.1.5"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72"
+ integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==
unicode-canonical-property-names-ecmascript@^1.0.4:
version "1.0.4"
@@ -8887,11 +8739,6 @@ unique-string@^2.0.0:
dependencies:
crypto-random-string "^2.0.0"
-universalify@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
- integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
-
universalify@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
@@ -8958,15 +8805,18 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
- integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
+util.promisify@^1.0.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz#77832f57ced2c9478174149cae9b96e9918cd54b"
+ integrity sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==
dependencies:
- define-properties "^1.1.2"
- object.getownpropertydescriptors "^2.0.3"
+ call-bind "^1.0.0"
+ define-properties "^1.1.3"
+ for-each "^0.3.3"
+ has-symbols "^1.0.1"
+ object.getownpropertydescriptors "^2.1.1"
-util.promisify@^1.0.0, util.promisify@~1.0.0:
+util.promisify@~1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==
@@ -9097,16 +8947,17 @@ webidl-conversions@^6.1.0:
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
- version "4.3.1"
- resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.3.1.tgz#87a7873bc9c6a4708aa657759274b691e72a04a8"
- integrity sha512-/F4+9QNZM/qKzzL9/06Am8NXIkGV+/NqQ62Dx7DSqudxxpAgBqYn6V7+zp+0Y7JuWksKUbczRY3wMTd+7Uj6OA==
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.5.0.tgz#b5213b84adf6e1f5de6391334c9fa53a48850466"
+ integrity sha512-wXg/ef6Ibstl2f50mnkcHblRPN/P9J4Nlod5Hg9HGFgSeF8rsqDGHJeVe4aR26q9l62TUJi6vmvC2Qz96YJw1Q==
dependencies:
"@discoveryjs/json-ext" "^0.5.0"
- "@webpack-cli/info" "^1.2.1"
- "@webpack-cli/serve" "^1.2.1"
+ "@webpack-cli/configtest" "^1.0.1"
+ "@webpack-cli/info" "^1.2.2"
+ "@webpack-cli/serve" "^1.3.0"
colorette "^1.2.1"
- commander "^6.2.0"
+ commander "^7.0.0"
enquirer "^2.3.6"
execa "^5.0.0"
fastest-levenshtein "^1.0.12"
@@ -9114,7 +8965,7 @@ [email protected]:
interpret "^2.2.0"
rechoir "^0.7.0"
v8-compile-cache "^2.2.0"
- webpack-merge "^4.2.2"
+ webpack-merge "^5.7.3"
webpack-dev-middleware@^3.7.2:
version "3.7.3"
@@ -9182,12 +9033,13 @@ [email protected]:
tapable "^2.0.0"
webpack-sources "^2.2.0"
-webpack-merge@^4.2.2:
- version "4.2.2"
- resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
- integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
+webpack-merge@^5.7.3:
+ version "5.7.3"
+ resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213"
+ integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==
dependencies:
- lodash "^4.17.15"
+ clone-deep "^4.0.1"
+ wildcard "^2.0.0"
webpack-sources@^1.4.3:
version "1.4.3"
@@ -9205,13 +9057,13 @@ webpack-sources@^2.1.1, webpack-sources@^2.2.0:
source-list-map "^2.0.1"
source-map "^0.6.1"
- version "5.15.0"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.15.0.tgz#63d7b6228a4e15ee8c89899c2cfdd993e809bdd2"
- integrity sha512-y/xG+ONDz78yn3VvP6gAvGr1/gkxOgitvHSXBmquyN8KDtrGEyE3K9WkXOPB7QmfcOBCpO4ELXwNcCYQnEmexA==
+ version "5.21.2"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.21.2.tgz#647507e50d3637695be28af58a6a8246050394e7"
+ integrity sha512-xHflCenx+AM4uWKX71SWHhxml5aMXdy2tu/vdi4lClm7PADKxlyDAFFN1rEFzNV0MAoPpHtBeJnl/+K6F4QBPg==
dependencies:
"@types/eslint-scope" "^3.7.0"
- "@types/estree" "^0.0.45"
+ "@types/estree" "^0.0.46"
"@webassemblyjs/ast" "1.11.0"
"@webassemblyjs/wasm-edit" "1.11.0"
"@webassemblyjs/wasm-parser" "1.11.0"
@@ -9228,7 +9080,6 @@ [email protected]:
loader-runner "^4.2.0"
mime-types "^2.1.27"
neo-async "^2.6.2"
- pkg-dir "^5.0.0"
schema-utils "^3.0.0"
tapable "^2.1.1"
terser-webpack-plugin "^5.1.1"
@@ -9308,29 +9159,34 @@ which@^2.0.1, which@^2.0.2:
dependencies:
isexe "^2.0.0"
+wildcard@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
+ integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
+
word-wrap@^1.2.3, word-wrap@~1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-workbox-background-sync@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.0.2.tgz#9205f5ef7fbf68203b925bdc85bdaa31a34fbbe6"
- integrity sha512-KQU2ntvbvFoBvCRm+EDpWAaykt4u/oaF5j3C6io0dZVWhFc/ZwgYDii8fb34LTenug3VPWQELdw9dNBCoP4b0w==
+workbox-background-sync@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.1.0.tgz#817de1ac1546fb6035759f151b0b4c5f0d3d9506"
+ integrity sha512-A7YWWmAqzLkWYqqxzxoX4mciVjdSHpfX+JMADXoJ9SoLb6l/QReNJE+CNPew+gGPH6JLKNjZeecDmUpXFhzFPA==
dependencies:
- workbox-core "^6.0.2"
+ workbox-core "^6.1.0"
-workbox-broadcast-update@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.0.2.tgz#fc034277e631e4193dcee9f6b0a77e415b4ddefb"
- integrity sha512-yCXYEln7nU8FkMDysYQPirpgFXtsdBtxruHbvZzRsxMHvAELf3j/o6Ufae1zjl8XanLF696sqSNxehpCGSD6tw==
+workbox-broadcast-update@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.1.0.tgz#63c1dc2d519aa6a7b9ce1db2f8da3e1db45b3422"
+ integrity sha512-70G821I1Lb4Ex+rcjfKCbuFJ4WL4RSQsqvcByt/bLpPTTLoE6+VvLX3+1QtSK8P2+NmOsKkAqx9qiQkUdGbaYw==
dependencies:
- workbox-core "^6.0.2"
+ workbox-core "^6.1.0"
-workbox-build@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.0.2.tgz#a23eebd6556cf473fedda77c08421b2d093efc32"
- integrity sha512-Dukbt+p62Yzb12SXAmycTYvHngJ8aRtXy3hymsC8B6gxTCZmCZ0u5JuKhu7lNLbDwDkYE78lhFvT9SF+MXFz5A==
+workbox-build@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.1.0.tgz#e0ba4a0004da1079e934c7452c72c92ef7b52cba"
+ integrity sha512-xJPqTEf+Pg9KAoTrNeVWpMjqi4cJIRn14i02bZjjbHsLNN38qrqc8xwAW48TwoPCYLjp104ST164/3RDgrc7yw==
dependencies:
"@babel/core" "^7.11.1"
"@babel/preset-env" "^7.11.0"
@@ -9348,137 +9204,137 @@ workbox-build@^6.0.2:
pretty-bytes "^5.3.0"
rollup "^2.25.0"
rollup-plugin-terser "^7.0.0"
- source-map "^0.7.3"
+ source-map "^0.8.0-beta.0"
source-map-url "^0.4.0"
stringify-object "^3.3.0"
strip-comments "^2.0.1"
tempy "^0.6.0"
upath "^1.2.0"
- workbox-background-sync "^6.0.2"
- workbox-broadcast-update "^6.0.2"
- workbox-cacheable-response "^6.0.2"
- workbox-core "^6.0.2"
- workbox-expiration "^6.0.2"
- workbox-google-analytics "^6.0.2"
- workbox-navigation-preload "^6.0.2"
- workbox-precaching "^6.0.2"
- workbox-range-requests "^6.0.2"
- workbox-recipes "^6.0.2"
- workbox-routing "^6.0.2"
- workbox-strategies "^6.0.2"
- workbox-streams "^6.0.2"
- workbox-sw "^6.0.2"
- workbox-window "^6.0.2"
-
-workbox-cacheable-response@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.0.2.tgz#00b1133c4c846a2874f32ae14206c0636bacfd87"
- integrity sha512-OrgFiYWkmFXDIbNRYSu+fchcfoZqyJ4yZbdc8WKUjr9v/MghKHfR9u7UI077xBkjno5J3YNpbwx73/no3HkrzA==
- dependencies:
- workbox-core "^6.0.2"
-
-workbox-core@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.0.2.tgz#2f865cfe633890b4210fd6d6fdb049a6daed0914"
- integrity sha512-Ksl6qeikGb+BOCILoCUJGxwlEQOeeqdpOnpOr9UDt3NtacPYbfYBmpYpKArw5DFWK+5geBsFqgUUlXThlCYfKQ==
-
-workbox-expiration@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.0.2.tgz#ac01e8d17f48daa31dc0872c09ee6f4d2cf28ccb"
- integrity sha512-6+nbR18cklAdI3BPT675ytftXPwnVbXGR8mPWNWTJtl5y2urRYv56ZOJLD7FBFVkZ8EjWiRhNP/A0fkxgdKtWQ==
- dependencies:
- workbox-core "^6.0.2"
-
-workbox-google-analytics@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.0.2.tgz#7e3641adb30a3acb25006b244035631cf6f65019"
- integrity sha512-xmYJurR1M6Pzc2SBM/E7AgwmBszhu/YYDzBnU+HJPZFLbTG97ASIJyTXV1vcczA/dNaS0miIf0cFqneozVlDRw==
- dependencies:
- workbox-background-sync "^6.0.2"
- workbox-core "^6.0.2"
- workbox-routing "^6.0.2"
- workbox-strategies "^6.0.2"
-
-workbox-navigation-preload@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.0.2.tgz#bfd9c61096be921b830153a3004b7212220748dc"
- integrity sha512-7+ojLrjXmTFZBfGmUQIcBWB+xrFgXLMJGNQAtxT7Ta9A23rEWo8jqAgeuwAylebcORUlM+ztgYTV7eGp+AD+Yg==
- dependencies:
- workbox-core "^6.0.2"
-
-workbox-precaching@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.0.2.tgz#cb45f290b0604bef1d9fc96bf42df82385d54e54"
- integrity sha512-sqKWL2emzmGnfJpna+9RjUkUiqQO++AKfwljCbgkHg8wBbVLy/rnui3eelKgAI7D8R31LJFfiZkY/kXmwkjtlQ==
- dependencies:
- workbox-core "^6.0.2"
- workbox-routing "^6.0.2"
- workbox-strategies "^6.0.2"
-
-workbox-range-requests@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.0.2.tgz#3b50cbe8ddaaed7e3bfaa2dfdcd6a22e02fe7770"
- integrity sha512-qCrDbH9AzDbCErde71Nys2iNZO9I9M9Jgl/9/Q67dGQVwFsEq73SuIzS2DGIBKqtIdC5QUigC3d7XJONajclUQ==
- dependencies:
- workbox-core "^6.0.2"
-
-workbox-recipes@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.0.2.tgz#ad4b3f26a71a7396004c4f617af318f3fd072208"
- integrity sha512-ewZIHO4jYE6bnEeUIYS6joQy3l+MydpOsVr2F6EpE8ps++z1ScbSdLtJU+yu6WuO3lH44HFZLeFxYQqYm50QAA==
- dependencies:
- workbox-cacheable-response "^6.0.2"
- workbox-core "^6.0.2"
- workbox-expiration "^6.0.2"
- workbox-precaching "^6.0.2"
- workbox-routing "^6.0.2"
- workbox-strategies "^6.0.2"
-
-workbox-routing@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.0.2.tgz#8380bc322a2b1c44978df8ff6ae4e4d723f4e3f8"
- integrity sha512-iQ9ch3fL1YpztDLfHNURaHQ0ispgPCdzWmZZhtSHUyy/+YkTlIiDVTbOQCIpHIrWlKQiim6X3K2ItIy1FW9+wA==
- dependencies:
- workbox-core "^6.0.2"
-
-workbox-strategies@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.0.2.tgz#f4383e2e5d46c1546e6e08048c9f5c9a7beb5137"
- integrity sha512-HjLnYCVS60U7OKhl5NIq8NAQXrotJQRDakmIONnRlQIlP2If/kAiQSUP3QCHMq4EeXGiF+/CdlR1/bhYBHZzZg==
- dependencies:
- workbox-core "^6.0.2"
-
-workbox-streams@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.0.2.tgz#07c19025af309ad3475e737018a05ed538bffacd"
- integrity sha512-bckftu/iMlg5LFXPZ6NX/FUc/w4illgxSuwtsZkQAO6Uen1EeegjfLyenO01/dwoyc3D/AlZepMdhv87XhE7HQ==
- dependencies:
- workbox-core "^6.0.2"
- workbox-routing "^6.0.2"
-
-workbox-sw@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.0.2.tgz#cd1b8b02ceaaf1abe5804936158a87ec605d271e"
- integrity sha512-EoOjbyy5bpoBoSqt2PIeDOZ/JJ41f+WJjb979PkfIUWw4F+F/w2uKJJrMA5fk+nWnVge83Fwy8nF3dWNsqOrdg==
-
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.0.2.tgz#a7fc0499bc6b5cfa7ebf8d71d8da00be93c9a112"
- integrity sha512-HvzXLyaOD+6pEfNNKZYheRvHk9fVkIL9Rp6CHCd2LowF7M9YMEj8zh2Uuf5IEav6NZ02FR53zWnznO8Imv+fVQ==
+ workbox-background-sync "^6.1.0"
+ workbox-broadcast-update "^6.1.0"
+ workbox-cacheable-response "^6.1.0"
+ workbox-core "^6.1.0"
+ workbox-expiration "^6.1.0"
+ workbox-google-analytics "^6.1.0"
+ workbox-navigation-preload "^6.1.0"
+ workbox-precaching "^6.1.0"
+ workbox-range-requests "^6.1.0"
+ workbox-recipes "^6.1.0"
+ workbox-routing "^6.1.0"
+ workbox-strategies "^6.1.0"
+ workbox-streams "^6.1.0"
+ workbox-sw "^6.1.0"
+ workbox-window "^6.1.0"
+
+workbox-cacheable-response@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.1.0.tgz#a99fdfe1507848486579df7b204c30e4cd0a74f2"
+ integrity sha512-oDAi0vXHGaE5p9NOo4N180UTcEKm6t2JMgmlrq0PkEW2PZEu9YR/atSnCwzMW7xpDqpKWaQr/LGP4+eixS8gcA==
+ dependencies:
+ workbox-core "^6.1.0"
+
+workbox-core@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.1.0.tgz#2671b64f76550e83a4c2202676b67ce372e10881"
+ integrity sha512-s3KqTJfBreO4xCZpR2LB5p/EknAx8eg0QumKiIgxM4hRO0RtwS2pJvTieNEM23X3RqxRhqweriLD8To19KUvjg==
+
+workbox-expiration@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.1.0.tgz#cf6bb384e49d0c92b79233c46671d9c6d82478a2"
+ integrity sha512-jp2xGk+LC4AhCoOxO/bC06GQkq/oVp0ZIf1zXLQh6OD2fWZPkXNjLLSuDnjXoGGPibYrq7gEE/xjAdYGjNWl1A==
+ dependencies:
+ workbox-core "^6.1.0"
+
+workbox-google-analytics@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.1.0.tgz#cd34100536250abc54070bcc23603213eb8e47e4"
+ integrity sha512-BuUAJ747bMPC6IOKaQBXfotGybOfeHDRIC8ElF65ouB4O9kUJ3zh4EFxXmmJLgzTnji6265gXqNWcfuGiidk6A==
+ dependencies:
+ workbox-background-sync "^6.1.0"
+ workbox-core "^6.1.0"
+ workbox-routing "^6.1.0"
+ workbox-strategies "^6.1.0"
+
+workbox-navigation-preload@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.1.0.tgz#e36d19f0d49ab5277e6c4e13b92f40da8955d62f"
+ integrity sha512-N0c5Kmzu7lPKvirukbeZ3lN8KEAZU9xA4b1wmpV0VXUfRXVEk2ayXXqwHwMGFVi6FNCHiDLOcC8a2zW5kFLAeg==
+ dependencies:
+ workbox-core "^6.1.0"
+
+workbox-precaching@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.1.0.tgz#9ee3d28f27cd78daa62f5bd6a0d33f5682ac97a7"
+ integrity sha512-zjye8MVzieBVJ3sS0hFcbKLp7pTHMfJM17YqxCxB0KykXWnxLOpYnStQ9M+bjWJsKJOQvbkPqvq5u9+mtA923g==
+ dependencies:
+ workbox-core "^6.1.0"
+ workbox-routing "^6.1.0"
+ workbox-strategies "^6.1.0"
+
+workbox-range-requests@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.1.0.tgz#5fbe9edfbcdb97153ed5260575a54e53b0f85a2d"
+ integrity sha512-BO025BdAvc6vTBXJfkfibcikMFLmLRECt0FrVrTiiQafdO3jWH9qX9zTdrjYf6GkiIjvejvvmSYegwU1mL6N3Q==
+ dependencies:
+ workbox-core "^6.1.0"
+
+workbox-recipes@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.1.0.tgz#b925f2727ace05ce8762a1b6da6c0d749fd687ee"
+ integrity sha512-r8YLtMtQnvfkK1htnfrrX1CxKHglZJiVlqnct9rYIU17n2LCalHdI0zQrPqzYdLLHZxTX25UpBsdib0cAATy0A==
+ dependencies:
+ workbox-cacheable-response "^6.1.0"
+ workbox-core "^6.1.0"
+ workbox-expiration "^6.1.0"
+ workbox-precaching "^6.1.0"
+ workbox-routing "^6.1.0"
+ workbox-strategies "^6.1.0"
+
+workbox-routing@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.1.0.tgz#f885cb7801e2c9c5678f197656cf27a2b649c1d5"
+ integrity sha512-FXQ5cwb6Mk90fC0rfQLX0pN+r/N4eBafwkh/QanJUq0e6jMPdDFLrlsikZL/0LcXEx+yAkWLytoiS+d2HOEBOw==
+ dependencies:
+ workbox-core "^6.1.0"
+
+workbox-strategies@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.1.0.tgz#9ddcee44408d2fb403f22a7989803b5c58560590"
+ integrity sha512-HvUknzJdZWeV3x7Eq33a7TGAv9/r1TEiQK6kQ1QNzN+IKiqhIjnhKFHmMxb5hK1Gw9/aDSJTLNPDaLPfIJRQFQ==
+ dependencies:
+ workbox-core "^6.1.0"
+
+workbox-streams@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.1.0.tgz#2dbc78ddc863b47aa4fe399d9385d3ed8567e881"
+ integrity sha512-V80OIfoIXaDkjWIGFSae5sBJuaG2r4bXk6HKpntBYaVQ72LD1CgkXRmZKmLJQ9ltHCx9Vmq/7+q1OF5mTKb8Qw==
+ dependencies:
+ workbox-core "^6.1.0"
+ workbox-routing "^6.1.0"
+
+workbox-sw@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.1.0.tgz#dfaca1029264af71f13a90fdfb16cf8d64ed0537"
+ integrity sha512-e2jnIWSmNrpO9Psy4D6euDdRUW8FTXAdMxOj5O02gxa01fri1kfTSM9irDnTGKUiSGc+hlycsvzGdr8bnvzDiA==
+
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.1.0.tgz#7090533aed07d000181f5686b5cc5f8c5fe36e06"
+ integrity sha512-uRmImfQghNmNF/iyPJ+MS0o2Z9E6kExZRSZIDOhnf1v+Mw1ixxx3n9fuTvTuCDvrUksaXcVEkvhagr12kfkEYA==
dependencies:
fast-json-stable-stringify "^2.1.0"
pretty-bytes "^5.4.1"
source-map-url "^0.4.0"
upath "^1.2.0"
webpack-sources "^1.4.3"
- workbox-build "^6.0.2"
+ workbox-build "^6.1.0"
-workbox-window@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.0.2.tgz#9b47fdb7c088aa4e8b7d0c6cfda17c8bfca6bf7f"
- integrity sha512-I/X+qUh1AwN9x/MxFbXsPn7DA27BMtzkXo55w1tBD8V54fv8nUCeC5E4RpXt/mlgdSwBztnURCQTWsdhTrSUjg==
+workbox-window@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.1.0.tgz#5856127f183bcccfd93655b0e3cba5f2432b9156"
+ integrity sha512-sjnE+nTSnrBvYx5KmpESvsTC82P3yy8h5l4Ae4Q8uLqdH29UQ3bMd8puGVVhX1JZFCmV40cvrbZ1fUj+3/TQ9g==
dependencies:
- workbox-core "^6.0.2"
+ workbox-core "^6.1.0"
wrap-ansi@^5.1.0:
version "5.1.0"
@@ -9530,9 +9386,9 @@ ws@^6.1.2, ws@^6.2.1:
async-limiter "~1.0.0"
ws@^7.2.3:
- version "7.4.2"
- resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd"
- integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==
+ version "7.4.3"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd"
+ integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA==
xml-name-validator@^3.0.0:
version "3.0.0"