diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index 1658ad576a..0000000000 --- a/.prettierignore +++ /dev/null @@ -1,2 +0,0 @@ -frontend/node_modules/** -# **/*.js \ No newline at end of file diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index 28907f42d8..0000000000 --- a/.prettierrc +++ /dev/null @@ -1,8 +0,0 @@ -{ - "semi": true, - "trailingComma": "es5", - "printWidth": 120, - "singleQuote": true, - "arrowParens": "always", - "proseWrap": "preserve" -} \ No newline at end of file diff --git a/.version b/.version index b09a54cb9b..ef090a6c47 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -0.7.3 \ No newline at end of file +0.7.4 \ No newline at end of file diff --git a/.vscode/extension.json b/.vscode/extension.json new file mode 100644 index 0000000000..fbddc72229 --- /dev/null +++ b/.vscode/extension.json @@ -0,0 +1,11 @@ +{ + "recommendations": [ + "dbaeumer.vscode-eslint", + "CoenraadS.bracket-pair-colorizer", + "mgmcdermott.vscode-language-babel", + "formulahendry.auto-rename-tag", + "xabikos.javascriptsnippets", + "streetsidesoftware.code-spell-checker", + "esbenp.prettier-vscode" + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..8e9ce74d63 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,14 @@ +{ + "[javascript, typescript]": { + "editor.defaultFormatter": "dbaeumer.vscode-eslint", + }, + "eslint.validate": [ + "javascript", + "javascriptreact", + "typescript", + "typescriptreact" + ], + "eslint.format.enable": true, + "editor.formatOnSave": true, + +} \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8c234c4fcc..30d1914aed 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,8 +32,8 @@ Pull requests are the best way to propose changes to the codebase (we use [Git-F 5. Make sure your code lints. 6. Issue that pull request! -## Any contributions you make will be under the Apache-2.0 License -In short, when you submit code changes, your submissions are understood to be under the same [Apache-2.0 License](https://www.apache.org/licenses/LICENSE-2.0) that covers the project. +## Any contributions you make will be under the AGPL v3 License +In short, when you submit code changes, your submissions are understood to be under the same [AGPL v3 License](https://www.gnu.org/licenses/agpl-3.0.en.html) that covers the project. ## Report bugs using Github's [issues](https://github.com/ToolJet/ToolJet/issues) We use GitHub issues to track public bugs. Report a bug by [opening a new issue](); it's that easy! @@ -49,7 +49,7 @@ We use GitHub issues to track public bugs. Report a bug by [opening a new issue] - Notes (possibly including why you think this might be happening, or stuff you tried that didn't work) ## License -By contributing, you agree that your contributions will be licensed under its Apache-2.0 License. +By contributing, you agree that your contributions will be licensed under its AGPL v3 License. ## Questions? -Contact us on slack [Slack](https://join.slack.com/t/tooljet/shared_invite/zt-r2neyfcw-KD1COL6t2kgVTlTtAV5rtg) or mail us at [hello@tooljet.io](hello@tooljet) \ No newline at end of file +Contact us on slack [Slack](https://join.slack.com/t/tooljet/shared_invite/zt-r2neyfcw-KD1COL6t2kgVTlTtAV5rtg) or mail us at [hello@tooljet.io](hello@tooljet) diff --git a/LICENSE b/LICENSE index 61d18602bd..e20b431bcb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ -GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 +GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ GNU GENERAL PUBLIC LICENSE Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ modification follow. 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see +For more information on this, and how to apply and follow the GNU AGPL, see . - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. \ No newline at end of file diff --git a/README.md b/README.md index 736cb190f3..9664fd390f 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,21 @@ ToolJet is an **open-source no-code framework** to build and deploy internal tools quickly without much effort from the engineering teams. You can connect to your data sources such as databases ( like PostgreSQL, MongoDB, Elasticsearch, etc ), API endpoints ( ToolJet supports importing OpenAPI spec & OAuth2 authorization) and external services ( like Stripe, Slack, Google Sheets, Airtable ) and use our pre-built UI widgets to build internal tools. +![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/tooljet/tooljet-ce) +![GitHub contributors](https://img.shields.io/github/contributors/tooljet/tooljet) [![GitHub issues](https://img.shields.io/github/issues/ToolJet/ToolJet)](https://github.com/ToolJet/ToolJet/issues) [![GitHub stars](https://img.shields.io/github/stars/ToolJet/ToolJet)](https://github.com/ToolJet/ToolJet/stargazers) +![GitHub closed issues](https://img.shields.io/github/issues-closed/tooljet/tooljet) +![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/tooljet/tooljet) +![GitHub release (latest by date)](https://img.shields.io/github/v/release/tooljet/tooljet) +![GitHub commit activity](https://img.shields.io/github/commit-activity/m/tooljet/tooljet) [![GitHub license](https://img.shields.io/github/license/ToolJet/ToolJet)](https://github.com/ToolJet/ToolJet) +

- +

@@ -29,7 +36,6 @@ ToolJet is an **open-source no-code framework** to build and deploy internal too - Write JS code almost anywhere in the builder - Query editors for all supported data sources - Transform query results using JS code -- Import endpoints from OpenAPI specs - All the credentials are securely encrypted using `aes-256-gcm`. - ToolJet acts only as a proxy and doesn't store any data. - Support for OAuth @@ -44,8 +50,6 @@ You can deploy ToolJet on Heroku for free using the one-click-deployment button

- - ## Examples [Building a Github contributor leaderboard using ToolJet](https://blog.tooljet.io/building-a-github-contributor-leaderboard-using-tooljet/)
@@ -65,5 +69,10 @@ We use the git-flow branching model. The base branch is develop. If you are look Read our contributing guide (CONTRIBUTING.md) to learn about our development process, how to propose bugfixes and improvements, and how to build and test your changes to ToolJet.
[Contributing Guide](https://docs.tooljet.io/docs/contributing-guide/setup/docker) +## Contributors + + + + ## Licence -ToolJet © 2021, ToolJet Inc - Released under the GNU General Public License v3.0. +ToolJet © 2021, ToolJet Solutions Inc - Released under the GNU General Public License v3.0. diff --git a/deploy/kubernetes/GKE/certificate.yaml b/deploy/kubernetes/GKE/certificate.yaml new file mode 100644 index 0000000000..7643c214d8 --- /dev/null +++ b/deploy/kubernetes/GKE/certificate.yaml @@ -0,0 +1,7 @@ +apiVersion: networking.gke.io/v1beta1 +kind: ManagedCertificate +metadata: + name: tj +spec: + domains: + - tooljet.your-domain.com diff --git a/deploy/kubernetes/GKE/deployment.yaml b/deploy/kubernetes/GKE/deployment.yaml new file mode 100644 index 0000000000..764580dcb2 --- /dev/null +++ b/deploy/kubernetes/GKE/deployment.yaml @@ -0,0 +1,58 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: tooljet-deployment +spec: + replicas: 2 + strategy: + type: RollingUpdate + rollingUpdate: + maxUnavailable: 1 + maxSurge: 1 + selector: + matchLabels: + component: tooljet + template: + metadata: + labels: + component: tooljet + spec: + imagePullSecrets: + - name: docker-secret + containers: + - name: container + image: tooljet/tooljet-ce:latest + imagePullPolicy: Always + args: ["npm", "run", "start:prod"] + resources: + limits: + memory: "1000Mi" + cpu: "500m" + requests: + memory: "1000Mi" + cpu: "500m" + ports: + - containerPort: 3000 + readinessProbe: + httpGet: + port: 3000 + path: /api/health + successThreshold: 1 + initialDelaySeconds: 10 + periodSeconds: 5 + failureThreshold: 6 + env: + - name: PG_HOST + value: "" + - name: PG_USER + value: "postgres" + - name: PG_PASS + value: "" + - name: PG_DB + value: "" + - name: LOCKBOX_MASTER_KEY + value: "" + - name: SECRET_KEY_BASE + value: "" + - name: TOOLJET_HOST + value: "https://tooljet.your-domain.com" diff --git a/deploy/kubernetes/GKE/ingress.yaml b/deploy/kubernetes/GKE/ingress.yaml new file mode 100644 index 0000000000..82a0813b29 --- /dev/null +++ b/deploy/kubernetes/GKE/ingress.yaml @@ -0,0 +1,19 @@ +apiVersion: extensions/v1beta1 +kind: Ingress +metadata: + name: backend-ingress + annotations: + kubernetes.io/ingress.global-static-ip-name: "tj-static-ip" + networking.gke.io/managed-certificates: "tj" + nginx.ingress.kubernetes.io/ssl-redirect: 'true' + +spec: + rules: + - host: tooljet.your-domain.com + http: + paths: + - path: /* + backend: + serviceName: tj-service + servicePort: 8080 + diff --git a/deploy/kubernetes/GKE/service.yaml b/deploy/kubernetes/GKE/service.yaml new file mode 100644 index 0000000000..0e010e2eb4 --- /dev/null +++ b/deploy/kubernetes/GKE/service.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Service +metadata: + name: tj-service + namespace: default +spec: + ports: + - port: 8080 + protocol: TCP + targetPort: 3000 + selector: + component: tooljet + type: NodePort diff --git a/docker/client.Dockerfile.dev b/docker/client.Dockerfile.dev index d86a2f8895..e1c90d3efd 100644 --- a/docker/client.Dockerfile.dev +++ b/docker/client.Dockerfile.dev @@ -12,6 +12,7 @@ ENV PATH /app/node_modules/.bin:$PATH # Fix for heap limit allocation issue ENV NODE_OPTIONS="--max-old-space-size=2048" + # install app dependencies COPY package.json package-lock.json ./ RUN npm install diff --git a/docker/production.Dockerfile b/docker/production.Dockerfile index 55c1a93e41..f6fd8676cf 100644 --- a/docker/production.Dockerfile +++ b/docker/production.Dockerfile @@ -11,7 +11,7 @@ RUN apt update && apt install -y \ RUN mkdir -p /app WORKDIR /app ENV NODE_ENV=production -COPY ./package.json ./package-lock.json . +COPY ./package.json ./package-lock.json ./ # Building ToolJet client COPY ./frontend/package.json ./frontend/package-lock.json ./frontend/ diff --git a/docs/docs/data-sources/elasticsearch.md b/docs/docs/data-sources/elasticsearch.md index f9ba1cabc1..e91084a2dd 100644 --- a/docs/docs/data-sources/elasticsearch.md +++ b/docs/docs/data-sources/elasticsearch.md @@ -27,5 +27,5 @@ Click on `+` button of the query manager at the bottom panel of the editor and s Select the operation that you want to perform on Firestore and click 'Save' to save the query. :::tip -Query results can be transformed using transformations. Read our transformations documentation to see how: [link](/tutorial/transformations) +Query results can be transformed using transformations. Read our transformations documentation to see how: [link](/docs/tutorial/transformations) ::: \ No newline at end of file diff --git a/docs/docs/data-sources/firestore.md b/docs/docs/data-sources/firestore.md index 6708170c90..832600fa9d 100644 --- a/docs/docs/data-sources/firestore.md +++ b/docs/docs/data-sources/firestore.md @@ -23,5 +23,5 @@ Click on `+` button of the query manager at the bottom panel of the editor and s Select the operation that you want to perform on Firestore and click 'Save' to save the query. :::tip -Query results can be transformed using transformations. Read our transformations documentation to see how: [link](/tutorial/transformations) +Query results can be transformed using transformations. Read our transformations documentation to see how: [link](/docs/tutorial/transformations) ::: \ No newline at end of file diff --git a/docs/docs/data-sources/graphql.md b/docs/docs/data-sources/graphql.md index bf6cdd32e0..c47cd08dcd 100644 --- a/docs/docs/data-sources/graphql.md +++ b/docs/docs/data-sources/graphql.md @@ -36,5 +36,5 @@ Click on `+` button of the query manager at the bottom panel of the editor and s Click on the 'run' button to run the query. NOTE: Query should be saved before running. :::tip -Query results can be transformed using transformations. Read our transformations documentation to see how: [link](/tutorial/transformations) +Query results can be transformed using transformations. Read our transformations documentation to see how: [link](/docs/tutorial/transformations) ::: \ No newline at end of file diff --git a/docs/docs/data-sources/mssql.md b/docs/docs/data-sources/mssql.md index 4c6ced706a..7dda833608 100644 --- a/docs/docs/data-sources/mssql.md +++ b/docs/docs/data-sources/mssql.md @@ -37,5 +37,5 @@ Click on the 'run' button to run the query. NOTE: Query should be saved before r :::tip -Query results can be transformed using transformations. Read our transformations documentation to see how: [link](/tutorial/transformations) +Query results can be transformed using transformations. Read our transformations documentation to see how: [link](/docs/tutorial/transformations) ::: \ No newline at end of file diff --git a/docs/docs/data-sources/mysql.md b/docs/docs/data-sources/mysql.md index d8337af499..180dae0c4b 100644 --- a/docs/docs/data-sources/mysql.md +++ b/docs/docs/data-sources/mysql.md @@ -33,5 +33,5 @@ Click on `+` button of the query manager at the bottom panel of the editor. Click on the 'run' button to run the query. NOTE: Query should be saved before running. :::tip -Query results can be transformed using transformations. Read our transformations documentation to see how: [link](/tutorial/transformations) +Query results can be transformed using transformations. Read our transformations documentation to see how: [link](/docs/tutorial/transformations) ::: \ No newline at end of file diff --git a/docs/docs/data-sources/postgresql.md b/docs/docs/data-sources/postgresql.md index f341728bc2..1969f56c0a 100644 --- a/docs/docs/data-sources/postgresql.md +++ b/docs/docs/data-sources/postgresql.md @@ -34,5 +34,5 @@ Click on '+' button of the query manager at the bottom panel of the editor and s Click on the 'run' button to run the query. NOTE: Query should be saved before running. :::tip -Query results can be transformed using transformations. Read our transformations documentation to see how: [link](/tutorial/transformations) +Query results can be transformed using transformations. Read our transformations documentation to see how: [link](/docs/tutorial/transformations) ::: \ No newline at end of file diff --git a/docs/docs/data-sources/rest-api.md b/docs/docs/data-sources/rest-api.md index 5abf07eca1..1ede826626 100644 --- a/docs/docs/data-sources/rest-api.md +++ b/docs/docs/data-sources/rest-api.md @@ -41,5 +41,5 @@ NOTE: Query should be saved before running. ::: :::tip -Query results can be transformed using transformations. Read our transformations documentation to see how: [link](/tutorial/transformations) +Query results can be transformed using transformations. Read our transformations documentation to see how: [link](/docs/tutorial/transformations) ::: \ No newline at end of file diff --git a/docs/docs/deployment/kubernetes-gke.md b/docs/docs/deployment/kubernetes-gke.md new file mode 100644 index 0000000000..16651ca86b --- /dev/null +++ b/docs/docs/deployment/kubernetes-gke.md @@ -0,0 +1,62 @@ +--- +sidebar_position: 4 +sidebar_label: Kubernetes (GKE) +--- + +# Deploying ToolJet on Kubernetes (GKE) + +:::info +You should setup a PostgreSQL database manually to be used by ToolJet. We recommend using Cloud SQL since this guide is for deploying using GKE. +::: + +Follow the steps below to deploy ToolJet on a GKE Kubernetes cluster. + +1. Create an SSL certificate. +```bash +curl -LO https://raw.githubusercontent.com/ToolJet/ToolJet/main/deploy/kubernetes/GKE/certificate.yaml +``` + +Change the domain name to the domain/subdomain that you wish to use for ToolJet installation. + +2. Reserve a static IP address using `gcloud` cli +```bash +gcloud compute addresses create tj-static-ip --global +``` + +3. Create k8s deployment +```bash +curl -LO https://raw.githubusercontent.com/ToolJet/ToolJet/main/deploy/kubernetes/GKE/deployment.yaml +``` + +Make sure to edit the environment variables in the `deployment.yaml`. You can check out the available options [here](https://docs.tooljet.io/docs/deployment/env-vars). + +4. Create k8s service +```bash +curl -LO https://raw.githubusercontent.com/ToolJet/ToolJet/main/deploy/kubernetes/GKE/service.yaml +``` + +5. Create k8s ingress +```bash +curl -LO https://raw.githubusercontent.com/ToolJet/ToolJet/main/deploy/kubernetes/GKE/ingress.yaml +``` + +Change the domain name to the domain/subdomain that you wish to use for ToolJet installation. + +6. Apply YAML configs + +```bash +kubectl apply -f certificate.yaml, deployment.yaml, service.yaml, ingress.yaml +``` + +:::info +It might take a few minutes to provision the managed certificates. [Managed certificates documentation](https://cloud.google.com/kubernetes-engine/docs/how-to/managed-certs). +::: + +You will be able to access your ToolJet installation once the pods, service and the ingress is running. + +If you want to seed the database with a sample user, please SSH into a pod and run: +`npm run db:seed --prefix server`. +This seeds the database with a default user with the following credentials: + +email: `dev@tooljet.io` +password: `password` \ No newline at end of file diff --git a/docs/docs/deployment/kubernetes.md b/docs/docs/deployment/kubernetes.md index e615e01674..8a484af1ca 100644 --- a/docs/docs/deployment/kubernetes.md +++ b/docs/docs/deployment/kubernetes.md @@ -40,5 +40,5 @@ Application load balancing on Amazon EKS: https://docs.aws.amazon.com/eks/latest GKE Ingress for HTTP(S) Load Balancing: https://cloud.google.com/kubernetes-engine/docs/concepts/ingress :::tip -If you want to serve ToolJet client from services such as Firebase or Netlify, please read the client deployment documentation [here](/docs/setup/client). +If you want to serve ToolJet client from services such as Firebase or Netlify, please read the client deployment documentation [here](/docs/deployment/client). ::: diff --git a/docs/docs/intro.md b/docs/docs/intro.md index ded5539965..5d2de5540b 100644 --- a/docs/docs/intro.md +++ b/docs/docs/intro.md @@ -27,8 +27,8 @@ These resources will help you to quickly build and deploy apps using ToolJet: The references for datasources and widgets: -- [Datasource Reference](/docs/data-sources/redis) -- [Widget Reference](/docs/widgets/table) +- **[Datasource Reference](/docs/data-sources/redis)** +- **[Widget Reference](/docs/widgets/table)** ## Help and Support We have extensively documented the features of ToolJet, but in case you are stuck, please feel to mail us: hello@tooljet.io. diff --git a/docs/docs/sso/_category_.json b/docs/docs/sso/_category_.json new file mode 100644 index 0000000000..0ee03805bf --- /dev/null +++ b/docs/docs/sso/_category_.json @@ -0,0 +1,5 @@ +{ + "label": "Single Sign-on", + "position": 6, + "collapsed": true +} diff --git a/docs/docs/sso/google.md b/docs/docs/sso/google.md new file mode 100644 index 0000000000..6edf44e996 --- /dev/null +++ b/docs/docs/sso/google.md @@ -0,0 +1,51 @@ +--- +sidebar_position: 6 +sidebar_label: Google +--- + +# Google Single Sign-on + +:::info + This feature is available only on the enterprise edition for ToolJet +::: + +Goto [Google cloud console](https://console.cloud.google.com/) and create a project. + +ToolJet - Google create project +


+ +Goto [Google cloud console credentials page](https://console.cloud.google.com/apis/credentials), and create an OAuth client ID + +ToolJet - Google create client id +


+ +You'll be asked to select user type in consent screen. To allow only users within your organization, select 'Internal', otherwise, +select 'External'. + +ToolJet - OAuth user type +


+ +You'll be led to an app registration page where you can set OAuth scopes. Select 'Add or remove scopes' and add the scopes +userinfo.email and userinfo.profile as shown in the image. This will allow ToolJet to store the email and name of the +user who is signing in + +ToolJet - OAuth scope +


+ +Set the domain on which ToolJet is hosted as an authorized domain + +ToolJet - Google authorized domain +


+ +Lastly, supply the environment variable `SSO_GOOGLE_OAUTH2_CLIENT_ID` to your deployment. This value will be available from your [Google cloud console credentials page](https://console.cloud.google.com/apis/credentials) + +:::info + +### Restrict to your domain +Set the environment variable `RESTRICTED_DOMAIN` to ensure that ToolJet verifies the domain of the user who signs in via SSO, on the server side. +If you're setting this environment variable, please make sure that the value does not contain any protocols, sub domains or slashes. It should +simply be `yourdomain.com`. +::: + +
+The Google sign-in button will now be available in your ToolJet login screen. \ No newline at end of file diff --git a/docs/docs/tutorial/mobile-layout.md b/docs/docs/tutorial/mobile-layout.md index 0a355cc9f4..578ce26d10 100644 --- a/docs/docs/tutorial/mobile-layout.md +++ b/docs/docs/tutorial/mobile-layout.md @@ -4,7 +4,7 @@ sidebar_position: 8 # Mobile layout -Mobile layout is activated when the width of window is less than 600px. +Mobile layout is activated when the width of window is less than 600px. :::tip Widgets can be shown on desktop, mobile, or both. @@ -12,11 +12,11 @@ Widgets can be shown on desktop, mobile, or both. ToolJet - widgets list -## Adding existing widget to mobile layout -Click on the widget to open inspector. Scroll down to the `layout` section and enable mobile layout. The width of the widget will be adjusted to fit the mobile layout. +## Adding existing widget to mobile layout +Click on the widget to open inspector. Scroll down to the `layout` section and enable mobile layout. The width of the widget will be adjusted to fit the mobile layout. ## Adding a new widget to mobile layout -Switch the layout to mobile by clicking the button on the top navigation bar. Drag and drop a widget to the canvas. This widget will not be shown on desktop layout unless enabled from the widget inspector via the "Show on desktop?" button manually. +Switch the layout to mobile by clicking the button on the top navigation bar. Drag and drop a widget to the canvas. This widget will not be shown on desktop layout unless enabled from the widget inspector via the "Show on desktop" button manually. :::tip Width of the widgets will be automatically adjusted to fit the screen while viewing the application in app viewer. diff --git a/docs/docs/widgets/number-input.md b/docs/docs/widgets/number-input.md new file mode 100644 index 0000000000..308bbeb42c --- /dev/null +++ b/docs/docs/widgets/number-input.md @@ -0,0 +1,19 @@ +--- +sidebar_position: 16 +--- + +# Number Input + +Number Input widget lets users enter and change numbers. + +:::tip +Numbers can be changed by using the arrow keys. +::: + +ToolJet - Widget Reference - Number Input + +#### Properties + +| properties | description | +| ----------- | ----------- | +| Placeholder | It specifies a hint that describes the expected value.| \ No newline at end of file diff --git a/docs/docs/widgets/table.md b/docs/docs/widgets/table.md index 83b8dd854e..2d38e5a2b1 100644 --- a/docs/docs/widgets/table.md +++ b/docs/docs/widgets/table.md @@ -49,6 +49,14 @@ Client-side pagination is enabled by default. The number of records per page is Server-side pagination can be used to run a query whenever the page is changed. Go to events section of the inspector and change the action for `on page changed` event. Number of records per page needs to be handled in your query. If server-side pagination is enabled, `pageIndex` property will be exposed on the table object, this property will have the current page index. `pageIndex` can be used to query the next set of results when page is changed. +## Bulk selection + +To let the user select one or more rows from the current page of a table, enable 'Bulk selection' from the inspector. The values of selected rows will be exposed as `selectedRows`. + +## Highlight selected row + +Activate this option on the inspector to have the last selected(clicked on) row to be highlighted. + ## Search Client-side search is enabled by default and server-side search can be enabled from the events section of the inspector. Whenever the search text is changed, the `searchText` property of the table component is updated. If server-side search is enabled, `on search` event is fired after the content of `searchText` property is changed. `searchText` can be used to run a specific query to search for the records in your datasource. diff --git a/docs/static/img/sso/google/authorized-urls.png b/docs/static/img/sso/google/authorized-urls.png new file mode 100644 index 0000000000..3840e00ed9 Binary files /dev/null and b/docs/static/img/sso/google/authorized-urls.png differ diff --git a/docs/static/img/sso/google/create-oauth.png b/docs/static/img/sso/google/create-oauth.png new file mode 100644 index 0000000000..8f99187f1c Binary files /dev/null and b/docs/static/img/sso/google/create-oauth.png differ diff --git a/docs/static/img/sso/google/create-project.png b/docs/static/img/sso/google/create-project.png new file mode 100644 index 0000000000..86058ad141 Binary files /dev/null and b/docs/static/img/sso/google/create-project.png differ diff --git a/docs/static/img/sso/google/oauth-type.png b/docs/static/img/sso/google/oauth-type.png new file mode 100644 index 0000000000..d039233477 Binary files /dev/null and b/docs/static/img/sso/google/oauth-type.png differ diff --git a/docs/static/img/sso/google/scope.png b/docs/static/img/sso/google/scope.png new file mode 100644 index 0000000000..df0080ecba Binary files /dev/null and b/docs/static/img/sso/google/scope.png differ diff --git a/docs/static/img/widgets/number-input/number-input.gif b/docs/static/img/widgets/number-input/number-input.gif new file mode 100644 index 0000000000..7ce9cb8268 Binary files /dev/null and b/docs/static/img/widgets/number-input/number-input.gif differ diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js deleted file mode 100644 index 45c9767f46..0000000000 --- a/frontend/.eslintrc.js +++ /dev/null @@ -1,37 +0,0 @@ -module.exports = { - env: { - browser: true, - es2021: true - }, - - parser: 'babel-eslint', - - parserOptions: { - ecmaFeatures: { - jsx: true - }, - ecmaVersion: 12, - sourceType: 'module' - }, - extends: [ - 'plugin:react/recommended', - 'prettier', - 'airbnb-base/legacy' - ], - plugins: ['html', 'react', 'prettier', 'babel'], - rules: { - "react/prop-types": 0, - "no-underscore-dangle": ["error", { "allow": ["_self"] }], - "max-len": 0, - "no-bitwise": 0, - "no-use-before-define": ["error", { "variables": false, "functions": false }], - "no-nested-ternary": 0, - "no-loop-func": 0, - - }, - settings: { - react: { - version: "detect" - } - } -}; diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json new file mode 100644 index 0000000000..b705cb1a22 --- /dev/null +++ b/frontend/.eslintrc.json @@ -0,0 +1,56 @@ +{ + "env": { + "browser": true, + "amd": true, + "es2021": true + }, + "extends": [ + "eslint:recommended", + "plugin:react/recommended", + "plugin:react-hooks/recommended", + "plugin:import/errors", + "plugin:import/warnings", + "plugin:prettier/recommended", + "plugin:cypress/recommended" + ], + "parser": "babel-eslint", + "parserOptions": { + "ecmaFeatures": { + "jsx": true + }, + "ecmaVersion": 12, + "sourceType": "module" + }, + "plugins": ["react", "prettier"], + "rules": { + "prettier/prettier": [ + "error", + { + "semi": true, + "trailingComma": "es5", + "printWidth": 120, + "singleQuote": true, + "arrowParens": "always", + "proseWrap": "preserve" + } + ], + "react/prop-types": 0, + "react/display-name": "off", + "no-unused-vars": [2, { "args": "after-used", "argsIgnorePattern": "reject" }], + "react/no-deprecated": 0, + "no-prototype-builtins": 0 + }, + "settings": { + "react": { + "version": "detect" + }, + "import/resolver": "webpack" + }, + "globals": { + "fetch": true, + "process": true, + "module": true, + "__dirname": true + } +} + \ No newline at end of file diff --git a/frontend/cypress/plugins/index.js b/frontend/cypress/plugins/index.js index be566ad6d6..97409954b9 100644 --- a/frontend/cypress/plugins/index.js +++ b/frontend/cypress/plugins/index.js @@ -1,16 +1,12 @@ -const webpackPreprocessor = require('@cypress/webpack-preprocessor') - module.exports = (on, config) => { if (config.testingType === 'component') { - const { startDevServer } = require('@cypress/webpack-dev-server') + const { startDevServer } = require('@cypress/webpack-dev-server'); // Your project's Webpack configuration - const webpackConfig = require('../../webpack.config.js') + const webpackConfig = require('../../webpack.config.js'); - on('dev-server:start', (options) => - startDevServer({ options, webpackConfig }) - ) + on('dev-server:start', (options) => startDevServer({ options, webpackConfig })); } - return config -} \ No newline at end of file + return config; +}; diff --git a/frontend/cypress/support/index.js b/frontend/cypress/support/index.js index d68db96df2..37a498fb5b 100644 --- a/frontend/cypress/support/index.js +++ b/frontend/cypress/support/index.js @@ -14,7 +14,7 @@ // *********************************************************** // Import commands.js using ES2015 syntax: -import './commands' +import './commands'; // Alternatively you can use CommonJS syntax: // require('./commands') diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 851413fd15..e944c761e2 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -5,7 +5,6 @@ "requires": true, "packages": { "": { - "name": "frontend", "version": "0.1.0", "dependencies": { "@babel/core": "^7.4.3", @@ -22,13 +21,15 @@ "array-move": "^3.0.1", "babel-loader": "^8.0.5", "babel-plugin-console-source": "^2.0.5", + "babel-plugin-import": "^1.13.3", "bootstrap": "^4.6.0", + "classnames": "^2.3.1", "dompurify": "^2.2.7", "draft-js": "^0.11.7", "draft-js-export-html": "^1.4.1", "fuse.js": "^6.4.6", "history": "^4.9.0", - "html-webpack-plugin": "^3.2.0", + "html-webpack-plugin": "^5.3.2", "immutability-helper": "^3.1.1", "lodash": "^4.17.21", "moment": "^2.29.1", @@ -36,7 +37,6 @@ "papaparse": "^5.3.0", "plotly.js-basic-dist-min": "^1.58.4", "query-string": "^6.13.6", - "re-resizable": "^6.9.0", "react": "^16.14.0", "react-bootstrap": "^1.5.2", "react-color": "^2.19.3", @@ -52,7 +52,6 @@ "react-loading-skeleton": "^2.2.0", "react-plotly.js": "^2.5.1", "react-qr-reader": "^2.2.1", - "react-resizable": "^1.11.1", "react-rnd": "^10.3.0", "react-router-dom": "^5.0.0", "react-scripts": "3.4.3", @@ -66,7 +65,8 @@ "semver": "^5.7.1", "tinycolor2": "^1.4.2", "uuid": "8.3.2", - "webpack-cli": "^3.3.0", + "webpack": "^5.55.1", + "webpack-cli": "^4.8.0", "yup": "^0.27.0" }, "devDependencies": { @@ -74,10 +74,17 @@ "@cypress/webpack-dev-server": "^1.3.1", "@cypress/webpack-preprocessor": "^5.9.0", "@svgr/webpack": "^5.5.0", - "babel-plugin-import": "^1.13.3", "cypress": "^7.4.0", + "eslint": "^7.32.0", + "eslint-config-prettier": "^8.3.0", + "eslint-import-resolver-webpack": "^0.13.1", + "eslint-plugin-cypress": "^2.12.1", + "eslint-plugin-import": "^2.24.2", + "eslint-plugin-prettier": "^3.4.1", + "eslint-plugin-react": "^7.25.2", + "eslint-plugin-react-hooks": "^4.2.0", "path": "^0.12.7", - "webpack": "^4.29.6", + "prettier": "^2.3.2", "webpack-dev-server": "^3.11.2" } }, @@ -1879,6 +1886,14 @@ "ms": "^2.1.1" } }, + "node_modules/@discoveryjs/json-ext": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz", + "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==", + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/@emotion/cache": { "version": "10.0.29", "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz", @@ -1968,6 +1983,73 @@ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz", "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, + "node_modules/@eslint/eslintrc": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", + "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", + "globals": "^13.9.0", + "ignore": "^4.0.6", + "import-fresh": "^3.2.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", + "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/eslintrc/node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/eslintrc/node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "engines": { + "node": ">=4" + } + }, + "node_modules/@eslint/eslintrc/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@googlemaps/js-api-loader": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@googlemaps/js-api-loader/-/js-api-loader-1.11.1.tgz", @@ -2015,6 +2097,24 @@ "@hapi/hoek": "^8.3.0" } }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", + "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", + "dependencies": { + "@humanwhocodes/object-schema": "^1.2.0", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz", + "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==" + }, "node_modules/@icons/material": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz", @@ -3285,11 +3385,34 @@ "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.11.tgz", "integrity": "sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw==" }, + "node_modules/@types/eslint": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz", + "integrity": "sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==", + "dependencies": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "node_modules/@types/eslint-scope": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz", + "integrity": "sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==", + "dependencies": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, "node_modules/@types/eslint-visitor-keys": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==" }, + "node_modules/@types/estree": { + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", + "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==" + }, "node_modules/@types/glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", @@ -3299,6 +3422,11 @@ "@types/node": "*" } }, + "node_modules/@types/html-minifier-terser": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz", + "integrity": "sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==" + }, "node_modules/@types/invariant": { "version": "2.2.34", "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.34.tgz", @@ -3331,6 +3459,11 @@ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz", "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==" }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=" + }, "node_modules/@types/minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz", @@ -3701,6 +3834,38 @@ } }, "node_modules/@webassemblyjs/ast": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", + "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "dependencies": { + "@webassemblyjs/helper-numbers": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + } + }, + "node_modules/@webassemblyjs/floating-point-hex-parser": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", + "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==" + }, + "node_modules/@webassemblyjs/helper-api-error": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", + "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==" + }, + "node_modules/@webassemblyjs/helper-buffer": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", + "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==" + }, + "node_modules/@webassemblyjs/helper-code-frame": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz", + "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==", + "dependencies": { + "@webassemblyjs/wast-printer": "1.8.5" + } + }, + "node_modules/@webassemblyjs/helper-code-frame/node_modules/@webassemblyjs/ast": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", @@ -3710,27 +3875,19 @@ "@webassemblyjs/wast-parser": "1.8.5" } }, - "node_modules/@webassemblyjs/floating-point-hex-parser": { + "node_modules/@webassemblyjs/helper-code-frame/node_modules/@webassemblyjs/helper-wasm-bytecode": { "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz", - "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==" + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz", + "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==" }, - "node_modules/@webassemblyjs/helper-api-error": { + "node_modules/@webassemblyjs/helper-code-frame/node_modules/@webassemblyjs/wast-printer": { "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz", - "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==" - }, - "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz", - "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==" - }, - "node_modules/@webassemblyjs/helper-code-frame": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz", - "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz", + "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==", "dependencies": { - "@webassemblyjs/wast-printer": "1.8.5" + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5", + "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-fsm": { @@ -3747,92 +3904,117 @@ "mamacro": "^0.0.3" } }, - "node_modules/@webassemblyjs/helper-wasm-bytecode": { + "node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/ast": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", + "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", + "dependencies": { + "@webassemblyjs/helper-module-context": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5" + } + }, + "node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/helper-wasm-bytecode": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz", "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==" }, - "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz", - "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==", + "node_modules/@webassemblyjs/helper-numbers": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", + "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", "dependencies": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5" + "@webassemblyjs/floating-point-hex-parser": "1.11.1", + "@webassemblyjs/helper-api-error": "1.11.1", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/helper-wasm-bytecode": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", + "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==" + }, + "node_modules/@webassemblyjs/helper-wasm-section": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", + "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "dependencies": { + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz", - "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", + "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", "dependencies": { "@xtuc/ieee754": "^1.2.0" } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz", - "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", + "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", "dependencies": { "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz", - "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==" + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", + "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==" }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz", - "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", + "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", "dependencies": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/helper-wasm-section": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5", - "@webassemblyjs/wasm-opt": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5", - "@webassemblyjs/wast-printer": "1.8.5" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/helper-wasm-section": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1", + "@webassemblyjs/wasm-opt": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1", + "@webassemblyjs/wast-printer": "1.11.1" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz", - "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", + "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", "dependencies": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/ieee754": "1.8.5", - "@webassemblyjs/leb128": "1.8.5", - "@webassemblyjs/utf8": "1.8.5" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/ieee754": "1.11.1", + "@webassemblyjs/leb128": "1.11.1", + "@webassemblyjs/utf8": "1.11.1" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz", - "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", + "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", "dependencies": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz", - "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", + "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", "dependencies": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-api-error": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/ieee754": "1.8.5", - "@webassemblyjs/leb128": "1.8.5", - "@webassemblyjs/utf8": "1.8.5" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/ieee754": "1.11.1", + "@webassemblyjs/leb128": "1.11.1", + "@webassemblyjs/utf8": "1.11.1" } }, "node_modules/@webassemblyjs/wast-parser": { @@ -3848,16 +4030,73 @@ "@xtuc/long": "4.2.2" } }, - "node_modules/@webassemblyjs/wast-printer": { + "node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/ast": { "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz", - "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", + "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", "dependencies": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/wast-parser": "1.8.5", + "@webassemblyjs/helper-module-context": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5" + } + }, + "node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/floating-point-hex-parser": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz", + "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==" + }, + "node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/helper-api-error": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz", + "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==" + }, + "node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/helper-wasm-bytecode": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz", + "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==" + }, + "node_modules/@webassemblyjs/wast-printer": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", + "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "dependencies": { + "@webassemblyjs/ast": "1.11.1", "@xtuc/long": "4.2.2" } }, + "node_modules/@webpack-cli/configtest": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.4.tgz", + "integrity": "sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==", + "peerDependencies": { + "webpack": "4.x.x || 5.x.x", + "webpack-cli": "4.x.x" + } + }, + "node_modules/@webpack-cli/info": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.3.0.tgz", + "integrity": "sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w==", + "dependencies": { + "envinfo": "^7.7.3" + }, + "peerDependencies": { + "webpack-cli": "4.x.x" + } + }, + "node_modules/@webpack-cli/serve": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz", + "integrity": "sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw==", + "peerDependencies": { + "webpack-cli": "4.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -3921,6 +4160,14 @@ "node": ">=0.4.0" } }, + "node_modules/acorn-import-assertions": { + "version": "1.7.6", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz", + "integrity": "sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==", + "peerDependencies": { + "acorn": "^8" + } + }, "node_modules/acorn-jsx": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", @@ -4244,6 +4491,12 @@ "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=" }, + "node_modules/array-find": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz", + "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=", + "dev": true + }, "node_modules/array-find-index": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", @@ -4341,6 +4594,23 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/array.prototype.flatmap": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz", + "integrity": "sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==", + "dependencies": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1", + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/arrify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", @@ -4669,7 +4939,6 @@ "version": "1.13.3", "resolved": "https://registry.npmjs.org/babel-plugin-import/-/babel-plugin-import-1.13.3.tgz", "integrity": "sha512-1qCWdljJOrDRH/ybaCZuDgySii4yYrtQ8OJQwrcDqdt0y67N30ng3X3nABg6j7gR7qUJgcMa9OMhc4AGViDwWw==", - "dev": true, "dependencies": { "@babel/helper-module-imports": "^7.0.0", "@babel/runtime": "^7.0.0" @@ -5889,12 +6158,9 @@ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" }, "node_modules/chrome-trace-event": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", - "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", - "dependencies": { - "tslib": "^1.9.0" - }, + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", + "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", "engines": { "node": ">=6.0" } @@ -5939,9 +6205,9 @@ } }, "node_modules/classnames": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz", - "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==" + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz", + "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==" }, "node_modules/clean-css": { "version": "4.2.3", @@ -7590,14 +7856,6 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, - "node_modules/detect-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/detect-newline": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz", @@ -8059,6 +8317,25 @@ "node": ">=4.3.0 <5.0.0 || >=5.10" } }, + "node_modules/enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "dependencies": { + "ansi-colors": "^4.1.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/enquirer/node_modules/ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "engines": { + "node": ">=6" + } + }, "node_modules/entities": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", @@ -8067,6 +8344,17 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, + "node_modules/envinfo": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", + "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", + "bin": { + "envinfo": "dist/cli.js" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/enzyme-shallow-equal": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz", @@ -8099,26 +8387,28 @@ } }, "node_modules/es-abstract": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz", - "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==", + "version": "1.18.6", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.6.tgz", + "integrity": "sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==", "dependencies": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", - "is-callable": "^1.2.3", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.2", - "is-string": "^1.0.5", - "object-inspect": "^1.9.0", + "is-regex": "^1.1.4", + "is-string": "^1.0.7", + "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", "string.prototype.trimend": "^1.0.4", "string.prototype.trimstart": "^1.0.4", - "unbox-primitive": "^1.0.0" + "unbox-primitive": "^1.0.1" }, "engines": { "node": ">= 0.4" @@ -8127,6 +8417,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-module-lexer": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.1.tgz", + "integrity": "sha512-17Ed9misDnpyNBJh63g1OhW3qUFecDgGOivI85JeZY/LGhDum8e+cltukbkSK8pcJnXXEkya56sp4vSS1nzoUw==" + }, "node_modules/es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -8214,6 +8509,74 @@ "source-map": "~0.6.1" } }, + "node_modules/eslint": { + "version": "7.32.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", + "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", + "dependencies": { + "@babel/code-frame": "7.12.11", + "@eslint/eslintrc": "^0.4.3", + "@humanwhocodes/config-array": "^0.5.0", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "enquirer": "^2.3.5", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^2.1.0", + "eslint-visitor-keys": "^2.0.0", + "espree": "^7.3.1", + "esquery": "^1.4.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.1.2", + "globals": "^13.6.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.0.4", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "progress": "^2.0.0", + "regexpp": "^3.1.0", + "semver": "^7.2.1", + "strip-ansi": "^6.0.0", + "strip-json-comments": "^3.1.0", + "table": "^6.0.9", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-prettier": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz", + "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==", + "dev": true, + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, "node_modules/eslint-config-react-app": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz", @@ -8234,26 +8597,85 @@ } }, "node_modules/eslint-import-resolver-node": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz", - "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==", + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", + "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==", "dependencies": { - "debug": "^2.6.9", - "resolve": "^1.13.1" + "debug": "^3.2.7", + "resolve": "^1.20.0" } }, "node_modules/eslint-import-resolver-node/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dependencies": { - "ms": "2.0.0" + "ms": "^2.1.1" } }, - "node_modules/eslint-import-resolver-node/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "node_modules/eslint-import-resolver-webpack": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.1.tgz", + "integrity": "sha512-O/8mG6AHmaKYSMb4lWxiXPpaARxOJ4rMQEHJ8vTgjS1MXooJA3KPgBPPAdOPoV17v5ML5120qod5FBLM+DtgEw==", + "dev": true, + "dependencies": { + "array-find": "^1.0.0", + "debug": "^3.2.7", + "enhanced-resolve": "^0.9.1", + "find-root": "^1.1.0", + "has": "^1.0.3", + "interpret": "^1.4.0", + "is-core-module": "^2.4.0", + "is-regex": "^1.1.3", + "lodash": "^4.17.21", + "resolve": "^1.20.0", + "semver": "^5.7.1" + }, + "engines": { + "node": "^16 || ^15 || ^14 || ^13 || ^12 || ^11 || ^10 || ^9 || ^8 || ^7 || ^6" + }, + "peerDependencies": { + "eslint-plugin-import": ">=1.4.0", + "webpack": ">=1.11.0" + } + }, + "node_modules/eslint-import-resolver-webpack/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-import-resolver-webpack/node_modules/enhanced-resolve": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz", + "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.2", + "memory-fs": "^0.2.0", + "tapable": "^0.1.8" + }, + "engines": { + "node": ">=0.6" + } + }, + "node_modules/eslint-import-resolver-webpack/node_modules/memory-fs": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz", + "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=", + "dev": true + }, + "node_modules/eslint-import-resolver-webpack/node_modules/tapable": { + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz", + "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=", + "dev": true, + "engines": { + "node": ">=0.6" + } }, "node_modules/eslint-loader": { "version": "3.0.3", @@ -8276,11 +8698,11 @@ } }, "node_modules/eslint-module-utils": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz", - "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz", + "integrity": "sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q==", "dependencies": { - "debug": "^2.6.9", + "debug": "^3.2.7", "pkg-dir": "^2.0.0" }, "engines": { @@ -8288,11 +8710,11 @@ } }, "node_modules/eslint-module-utils/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dependencies": { - "ms": "2.0.0" + "ms": "^2.1.1" } }, "node_modules/eslint-module-utils/node_modules/find-up": { @@ -8318,11 +8740,6 @@ "node": ">=4" } }, - "node_modules/eslint-module-utils/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, "node_modules/eslint-module-utils/node_modules/p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -8372,6 +8789,18 @@ "node": ">=4" } }, + "node_modules/eslint-plugin-cypress": { + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.12.1.tgz", + "integrity": "sha512-c2W/uPADl5kospNDihgiLc7n87t5XhUbFDoTl6CfVkmG+kDAb5Ux10V9PoLPu9N+r7znpc+iQlcmAqT1A/89HA==", + "dev": true, + "dependencies": { + "globals": "^11.12.0" + }, + "peerDependencies": { + "eslint": ">= 3.2.1" + } + }, "node_modules/eslint-plugin-flowtype": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.6.0.tgz", @@ -8386,6 +8815,297 @@ "eslint": ">=6.1.0" } }, + "node_modules/eslint-plugin-import": { + "version": "2.24.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz", + "integrity": "sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==", + "dependencies": { + "array-includes": "^3.1.3", + "array.prototype.flat": "^1.2.4", + "debug": "^2.6.9", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.6", + "eslint-module-utils": "^2.6.2", + "find-up": "^2.0.0", + "has": "^1.0.3", + "is-core-module": "^2.6.0", + "minimatch": "^3.0.4", + "object.values": "^1.1.4", + "pkg-up": "^2.0.0", + "read-pkg-up": "^3.0.0", + "resolve": "^1.20.0", + "tsconfig-paths": "^3.11.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-import/node_modules/find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dependencies": { + "locate-path": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import/node_modules/load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", + "dependencies": { + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import/node_modules/locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dependencies": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "node_modules/eslint-plugin-import/node_modules/p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dependencies": { + "p-try": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import/node_modules/p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dependencies": { + "p-limit": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import/node_modules/p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import/node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import/node_modules/path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "dependencies": { + "pify": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import/node_modules/pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import/node_modules/pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", + "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=", + "dependencies": { + "find-up": "^2.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import/node_modules/read-pkg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", + "dependencies": { + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import/node_modules/read-pkg-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", + "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", + "dependencies": { + "find-up": "^2.0.0", + "read-pkg": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-prettier": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz", + "integrity": "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==", + "dev": true, + "dependencies": { + "prettier-linter-helpers": "^1.0.0" + }, + "engines": { + "node": ">=6.0.0" + }, + "peerDependencies": { + "eslint": ">=5.0.0", + "prettier": ">=1.13.0" + }, + "peerDependenciesMeta": { + "eslint-config-prettier": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-react": { + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.25.2.tgz", + "integrity": "sha512-elx4585wgmryanJK4C5IoSKQyVZ+e7H0t2JOOtJNBql0cuercvSShvRReuLBbfx8687yW5yv+UL7pXwMsd6adQ==", + "dependencies": { + "array-includes": "^3.1.3", + "array.prototype.flatmap": "^1.2.4", + "doctrine": "^2.1.0", + "estraverse": "^5.2.0", + "has": "^1.0.3", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.0.4", + "object.entries": "^1.1.4", + "object.fromentries": "^2.0.4", + "object.values": "^1.1.4", + "prop-types": "^15.7.2", + "resolve": "^2.0.0-next.3", + "string.prototype.matchall": "^4.0.5" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7" + } + }, + "node_modules/eslint-plugin-react-hooks": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz", + "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==", + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.3", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz", + "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==", + "dependencies": { + "is-core-module": "^2.2.0", + "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -8420,6 +9140,308 @@ "node": ">=4" } }, + "node_modules/eslint/node_modules/@babel/code-frame": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", + "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", + "dependencies": { + "@babel/highlight": "^7.10.4" + } + }, + "node_modules/eslint/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/eslint/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/eslint/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/eslint/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/eslint/node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/eslint/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint/node_modules/globals": { + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", + "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/eslint/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint/node_modules/optionator": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", + "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/eslint/node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/eslint/node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint/node_modules/semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint/node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dependencies": { + "ansi-regex": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/eslint/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/eslint/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/espree": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", + "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "dependencies": { + "acorn": "^7.4.0", + "acorn-jsx": "^5.3.1", + "eslint-visitor-keys": "^1.3.0" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, "node_modules/esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", @@ -8651,17 +9673,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, - "node_modules/expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "dependencies": { - "homedir-polyfill": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/expect": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz", @@ -8934,6 +9945,12 @@ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, + "node_modules/fast-diff": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", + "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "dev": true + }, "node_modules/fast-glob": { "version": "2.2.7", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz", @@ -8985,6 +10002,11 @@ "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz", "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==" }, + "node_modules/fastest-levenshtein": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", + "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==" + }, "node_modules/faye-websocket": { "version": "0.11.4", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", @@ -9068,6 +10090,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, "node_modules/file-loader": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz", @@ -9311,20 +10344,37 @@ "node": ">=8.0" } }, - "node_modules/findup-sync": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz", - "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==", + "node_modules/flat-cache": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", + "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", "dependencies": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" + "flatted": "^3.1.0", + "rimraf": "^3.0.2" }, "engines": { - "node": ">= 0.10" + "node": "^10.12.0 || >=12.0.0" } }, + "node_modules/flat-cache/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/flatted": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", + "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==" + }, "node_modules/flatten": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz", @@ -9664,6 +10714,21 @@ "node": ">=6" } }, + "node_modules/get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", @@ -9969,6 +11034,20 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-tostringtag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", @@ -10108,17 +11187,6 @@ "react-is": "^16.7.0" } }, - "node_modules/homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "dependencies": { - "parse-passwd": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/hosted-git-info": { "version": "2.8.8", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", @@ -10168,26 +11236,6 @@ "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==" }, - "node_modules/html-minifier": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz", - "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==", - "dependencies": { - "camel-case": "3.0.x", - "clean-css": "4.2.x", - "commander": "2.17.x", - "he": "1.2.x", - "param-case": "2.1.x", - "relateurl": "0.2.x", - "uglify-js": "3.4.x" - }, - "bin": { - "html-minifier": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/html-minifier-terser": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz", @@ -10216,109 +11264,161 @@ "node": ">= 6" } }, - "node_modules/html-minifier/node_modules/camel-case": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", - "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", - "dependencies": { - "no-case": "^2.2.0", - "upper-case": "^1.1.1" - } - }, - "node_modules/html-minifier/node_modules/commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==" - }, - "node_modules/html-minifier/node_modules/lower-case": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=" - }, - "node_modules/html-minifier/node_modules/no-case": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", - "dependencies": { - "lower-case": "^1.1.1" - } - }, - "node_modules/html-minifier/node_modules/param-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", - "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", - "dependencies": { - "no-case": "^2.2.0" - } - }, "node_modules/html-webpack-plugin": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", - "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=", - "deprecated": "3.x is no longer supported", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.3.2.tgz", + "integrity": "sha512-HvB33boVNCz2lTyBsSiMffsJ+m0YLIQ+pskblXgN9fnjS1BgEcuAfdInfXfGrkdXV406k9FiDi86eVCDBgJOyQ==", "dependencies": { - "html-minifier": "^3.2.3", - "loader-utils": "^0.2.16", - "lodash": "^4.17.3", - "pretty-error": "^2.0.2", - "tapable": "^1.0.0", - "toposort": "^1.0.0", - "util.promisify": "1.0.0" + "@types/html-minifier-terser": "^5.0.0", + "html-minifier-terser": "^5.0.1", + "lodash": "^4.17.21", + "pretty-error": "^3.0.4", + "tapable": "^2.0.0" }, "engines": { - "node": ">=6.9" + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/html-webpack-plugin" }, "peerDependencies": { - "webpack": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0" + "webpack": "^5.20.0" } }, - "node_modules/html-webpack-plugin/node_modules/big.js": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz", - "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", - "engines": { - "node": "*" - } - }, - "node_modules/html-webpack-plugin/node_modules/emojis-list": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/html-webpack-plugin/node_modules/json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", - "bin": { - "json5": "lib/cli.js" - } - }, - "node_modules/html-webpack-plugin/node_modules/loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", + "node_modules/html-webpack-plugin/node_modules/css-select": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz", + "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==", "dependencies": { - "big.js": "^3.1.3", - "emojis-list": "^2.0.0", - "json5": "^0.5.0", - "object-assign": "^4.0.1" + "boolbase": "^1.0.0", + "css-what": "^5.0.0", + "domhandler": "^4.2.0", + "domutils": "^2.6.0", + "nth-check": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" } }, - "node_modules/html-webpack-plugin/node_modules/toposort": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz", - "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=" + "node_modules/html-webpack-plugin/node_modules/css-what": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz", + "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==", + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } }, - "node_modules/html-webpack-plugin/node_modules/util.promisify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", - "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", + "node_modules/html-webpack-plugin/node_modules/dom-serializer": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", + "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", "dependencies": { - "define-properties": "^1.1.2", - "object.getownpropertydescriptors": "^2.0.3" + "domelementtype": "^2.0.1", + "domhandler": "^4.2.0", + "entities": "^2.0.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/html-webpack-plugin/node_modules/domelementtype": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", + "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ] + }, + "node_modules/html-webpack-plugin/node_modules/domhandler": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz", + "integrity": "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==", + "dependencies": { + "domelementtype": "^2.2.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/html-webpack-plugin/node_modules/domutils": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", + "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "dependencies": { + "dom-serializer": "^1.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, + "node_modules/html-webpack-plugin/node_modules/htmlparser2": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", + "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.5.2", + "entities": "^2.0.0" + } + }, + "node_modules/html-webpack-plugin/node_modules/nth-check": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", + "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==", + "dependencies": { + "boolbase": "^1.0.0" + }, + "funding": { + "url": "https://github.com/fb55/nth-check?sponsor=1" + } + }, + "node_modules/html-webpack-plugin/node_modules/pretty-error": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-3.0.4.tgz", + "integrity": "sha512-ytLFLfv1So4AO1UkoBF6GXQgJRaKbiSiGFICaOPNwQ3CMvBvXpLRubeQWyPGnsbV/t9ml9qto6IeCsho0aEvwQ==", + "dependencies": { + "lodash": "^4.17.20", + "renderkid": "^2.0.6" + } + }, + "node_modules/html-webpack-plugin/node_modules/renderkid": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz", + "integrity": "sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==", + "dependencies": { + "css-select": "^4.1.3", + "dom-converter": "^0.2.0", + "htmlparser2": "^6.1.0", + "lodash": "^4.17.21", + "strip-ansi": "^3.0.1" + } + }, + "node_modules/html-webpack-plugin/node_modules/tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "engines": { + "node": ">=6" } }, "node_modules/htmlparser2": { @@ -10787,6 +11887,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", + "dev": true, "engines": { "node": ">= 0.10" } @@ -10897,9 +11998,9 @@ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "node_modules/is-callable": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", - "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", "engines": { "node": ">= 0.4" }, @@ -10932,9 +12033,9 @@ } }, "node_modules/is-core-module": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", - "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz", + "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==", "dependencies": { "has": "^1.0.3" }, @@ -11198,12 +12299,12 @@ "dev": true }, "node_modules/is-regex": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz", - "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dependencies": { "call-bind": "^1.0.2", - "has-symbols": "^1.0.1" + "has-tostringtag": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -11242,9 +12343,12 @@ } }, "node_modules/is-string": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", - "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dependencies": { + "has-tostringtag": "^1.0.0" + }, "engines": { "node": ">= 0.4" }, @@ -12277,6 +13381,18 @@ "resolved": "https://registry.npmjs.org/jsqr/-/jsqr-1.4.0.tgz", "integrity": "sha512-dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A==" }, + "node_modules/jsx-ast-utils": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz", + "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==", + "dependencies": { + "array-includes": "^3.1.3", + "object.assign": "^4.1.2" + }, + "engines": { + "node": ">=4.0" + } + }, "node_modules/killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", @@ -12619,11 +13735,11 @@ } }, "node_modules/loader-runner": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz", - "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz", + "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==", "engines": { - "node": ">=4.3.0 <5.0.0 || >=5.10" + "node": ">=6.11.5" } }, "node_modules/loader-utils": { @@ -12685,6 +13801,11 @@ "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=" }, + "node_modules/lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" + }, "node_modules/lodash.curry": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz", @@ -12705,6 +13826,11 @@ "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=" }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + }, "node_modules/lodash.once": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", @@ -12733,6 +13859,11 @@ "lodash._reinterpolate": "^3.0.0" } }, + "node_modules/lodash.truncate": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", + "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=" + }, "node_modules/lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -14000,9 +15131,9 @@ } }, "node_modules/object-inspect": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz", - "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", + "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -14067,14 +15198,13 @@ } }, "node_modules/object.entries": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz", - "integrity": "sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz", + "integrity": "sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==", "dependencies": { - "call-bind": "^1.0.0", + "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1", - "has": "^1.0.3" + "es-abstract": "^1.18.2" }, "engines": { "node": ">= 0.4" @@ -14125,14 +15255,13 @@ } }, "node_modules/object.values": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz", - "integrity": "sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz", + "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", - "has": "^1.0.3" + "es-abstract": "^1.18.2" }, "engines": { "node": ">= 0.4" @@ -14454,14 +15583,6 @@ "node": ">=0.10.0" } }, - "node_modules/parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/parse5": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", @@ -14581,9 +15702,9 @@ } }, "node_modules/pbkdf2": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz", - "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", + "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", "dependencies": { "create-hash": "^1.1.2", "create-hmac": "^1.1.4", @@ -15879,6 +17000,30 @@ "node": ">=0.10.0" } }, + "node_modules/prettier": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", + "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/prettier-linter-helpers": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", + "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", + "dev": true, + "dependencies": { + "fast-diff": "^1.1.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/pretty-bytes": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", @@ -16849,19 +17994,6 @@ "react-dom": "~16" } }, - "node_modules/react-resizable": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/react-resizable/-/react-resizable-1.11.1.tgz", - "integrity": "sha512-S70gbLaAYqjuAd49utRHibtHLrHXInh7GuOR+6OO6RO6uleQfuBnWmZjRABfqNEx3C3Z6VPLg0/0uOYFrkfu9Q==", - "dependencies": { - "prop-types": "15.x", - "react-draggable": "^4.0.3" - }, - "peerDependencies": { - "react": "0.14.x || 15.x || 16.x || 17.x", - "react-dom": "0.14.x || 15.x || 16.x || 17.x" - } - }, "node_modules/react-rnd": { "version": "10.3.0", "resolved": "https://registry.npmjs.org/react-rnd/-/react-rnd-10.3.0.tgz", @@ -17141,6 +18273,124 @@ "node": ">=8" } }, + "node_modules/react-scripts/node_modules/@webassemblyjs/ast": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", + "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", + "dependencies": { + "@webassemblyjs/helper-module-context": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5" + } + }, + "node_modules/react-scripts/node_modules/@webassemblyjs/helper-api-error": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz", + "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==" + }, + "node_modules/react-scripts/node_modules/@webassemblyjs/helper-buffer": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz", + "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==" + }, + "node_modules/react-scripts/node_modules/@webassemblyjs/helper-wasm-bytecode": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz", + "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==" + }, + "node_modules/react-scripts/node_modules/@webassemblyjs/helper-wasm-section": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz", + "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==", + "dependencies": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-buffer": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/wasm-gen": "1.8.5" + } + }, + "node_modules/react-scripts/node_modules/@webassemblyjs/ieee754": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz", + "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==", + "dependencies": { + "@xtuc/ieee754": "^1.2.0" + } + }, + "node_modules/react-scripts/node_modules/@webassemblyjs/leb128": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz", + "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==", + "dependencies": { + "@xtuc/long": "4.2.2" + } + }, + "node_modules/react-scripts/node_modules/@webassemblyjs/utf8": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz", + "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==" + }, + "node_modules/react-scripts/node_modules/@webassemblyjs/wasm-edit": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz", + "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==", + "dependencies": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-buffer": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/helper-wasm-section": "1.8.5", + "@webassemblyjs/wasm-gen": "1.8.5", + "@webassemblyjs/wasm-opt": "1.8.5", + "@webassemblyjs/wasm-parser": "1.8.5", + "@webassemblyjs/wast-printer": "1.8.5" + } + }, + "node_modules/react-scripts/node_modules/@webassemblyjs/wasm-gen": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz", + "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==", + "dependencies": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/ieee754": "1.8.5", + "@webassemblyjs/leb128": "1.8.5", + "@webassemblyjs/utf8": "1.8.5" + } + }, + "node_modules/react-scripts/node_modules/@webassemblyjs/wasm-opt": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz", + "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==", + "dependencies": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-buffer": "1.8.5", + "@webassemblyjs/wasm-gen": "1.8.5", + "@webassemblyjs/wasm-parser": "1.8.5" + } + }, + "node_modules/react-scripts/node_modules/@webassemblyjs/wasm-parser": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz", + "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==", + "dependencies": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-api-error": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/ieee754": "1.8.5", + "@webassemblyjs/leb128": "1.8.5", + "@webassemblyjs/utf8": "1.8.5" + } + }, + "node_modules/react-scripts/node_modules/@webassemblyjs/wast-printer": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz", + "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==", + "dependencies": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5", + "@xtuc/long": "4.2.2" + } + }, "node_modules/react-scripts/node_modules/aria-query": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz", @@ -17158,6 +18408,28 @@ "node": ">=0.10.0" } }, + "node_modules/react-scripts/node_modules/cacache": { + "version": "12.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", + "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", + "dependencies": { + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" + } + }, "node_modules/react-scripts/node_modules/camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", @@ -17474,6 +18746,18 @@ "node": ">=4" } }, + "node_modules/react-scripts/node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "optional": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/react-scripts/node_modules/find-up": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", @@ -17579,6 +18863,15 @@ "node": ">=4" } }, + "node_modules/react-scripts/node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "optional": true, + "engines": { + "node": ">=0.12.0" + } + }, "node_modules/react-scripts/node_modules/jsx-ast-utils": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz", @@ -17605,6 +18898,14 @@ "node": ">=4" } }, + "node_modules/react-scripts/node_modules/loader-runner": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz", + "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==", + "engines": { + "node": ">=4.3.0 <5.0.0 || >=5.10" + } + }, "node_modules/react-scripts/node_modules/locate-path": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", @@ -17617,6 +18918,14 @@ "node": ">=4" } }, + "node_modules/react-scripts/node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dependencies": { + "yallist": "^3.0.2" + } + }, "node_modules/react-scripts/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -17836,6 +19145,14 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, + "node_modules/react-scripts/node_modules/ssri": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz", + "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==", + "dependencies": { + "figgy-pudding": "^3.5.1" + } + }, "node_modules/react-scripts/node_modules/string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", @@ -17893,6 +19210,18 @@ "node": ">=6.0.0" } }, + "node_modules/react-scripts/node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "optional": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, "node_modules/react-scripts/node_modules/util.promisify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", @@ -17911,6 +19240,151 @@ "uuid": "bin/uuid" } }, + "node_modules/react-scripts/node_modules/watchpack": { + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz", + "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==", + "dependencies": { + "graceful-fs": "^4.1.2", + "neo-async": "^2.5.0" + }, + "optionalDependencies": { + "chokidar": "^3.4.1", + "watchpack-chokidar2": "^2.0.1" + } + }, + "node_modules/react-scripts/node_modules/watchpack/node_modules/anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "optional": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/react-scripts/node_modules/watchpack/node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/react-scripts/node_modules/watchpack/node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "optional": true, + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/react-scripts/node_modules/watchpack/node_modules/chokidar": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", + "optional": true, + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/react-scripts/node_modules/watchpack/node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/react-scripts/node_modules/watchpack/node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "optional": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/react-scripts/node_modules/watchpack/node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "optional": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/react-scripts/node_modules/webpack": { + "version": "4.42.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz", + "integrity": "sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==", + "dependencies": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-module-context": "1.8.5", + "@webassemblyjs/wasm-edit": "1.8.5", + "@webassemblyjs/wasm-parser": "1.8.5", + "acorn": "^6.2.1", + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^4.1.0", + "eslint-scope": "^4.0.3", + "json-parse-better-errors": "^1.0.2", + "loader-runner": "^2.4.0", + "loader-utils": "^1.2.3", + "memory-fs": "^0.4.1", + "micromatch": "^3.1.10", + "mkdirp": "^0.5.1", + "neo-async": "^2.6.1", + "node-libs-browser": "^2.2.1", + "schema-utils": "^1.0.0", + "tapable": "^1.1.3", + "terser-webpack-plugin": "^1.4.3", + "watchpack": "^1.6.0", + "webpack-sources": "^1.4.1" + }, + "bin": { + "webpack": "bin/webpack.js" + }, + "engines": { + "node": ">=6.11.5" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, "node_modules/react-scripts/node_modules/webpack-dev-server": { "version": "3.11.0", "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz", @@ -17984,6 +19458,51 @@ "node": ">=0.10.0" } }, + "node_modules/react-scripts/node_modules/webpack/node_modules/acorn": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", + "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/react-scripts/node_modules/webpack/node_modules/eslint-scope": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", + "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", + "dependencies": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/react-scripts/node_modules/webpack/node_modules/terser-webpack-plugin": { + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", + "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", + "dependencies": { + "cacache": "^12.0.2", + "find-cache-dir": "^2.1.0", + "is-wsl": "^1.1.0", + "schema-utils": "^1.0.0", + "serialize-javascript": "^4.0.0", + "source-map": "^0.6.1", + "terser": "^4.1.2", + "webpack-sources": "^1.4.0", + "worker-farm": "^1.7.0" + }, + "engines": { + "node": ">= 6.9.0" + }, + "peerDependencies": { + "webpack": "^4.0.0" + } + }, "node_modules/react-scripts/node_modules/websocket-driver": { "version": "0.6.5", "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz", @@ -18003,6 +19522,11 @@ "async-limiter": "~1.0.0" } }, + "node_modules/react-scripts/node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + }, "node_modules/react-select-search": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/react-select-search/-/react-select-search-3.0.5.tgz", @@ -18244,6 +19768,17 @@ "node": ">=4" } }, + "node_modules/rechoir": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", + "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", + "dependencies": { + "resolve": "^1.9.0" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/recursive-readdir": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz", @@ -18533,6 +20068,14 @@ "node": ">=0.10.0" } }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", @@ -18566,46 +20109,6 @@ "node": ">=4" } }, - "node_modules/resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", - "dependencies": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/resolve-dir/node_modules/global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "dependencies": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/resolve-dir/node_modules/global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", - "dependencies": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/resolve-from": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", @@ -19881,14 +21384,15 @@ } }, "node_modules/string.prototype.matchall": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz", - "integrity": "sha512-pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz", + "integrity": "sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", - "has-symbols": "^1.0.1", + "es-abstract": "^1.18.2", + "get-intrinsic": "^1.1.1", + "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", "regexp.prototype.flags": "^1.3.1", "side-channel": "^1.0.4" @@ -19996,7 +21500,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true, "engines": { "node": ">=6" } @@ -20134,6 +21637,141 @@ "resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.15.tgz", "integrity": "sha512-k8uzYIkIVwmT+TcglpdN50pS2y1BDcUnBPK9iJeGu0Pl1lOI8pD6wtzgw91Pjpe+RxtTncw32tLxs/R0yNL2Mg==" }, + "node_modules/table": { + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz", + "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==", + "dependencies": { + "ajv": "^8.0.1", + "lodash.clonedeep": "^4.5.0", + "lodash.truncate": "^4.4.2", + "slice-ansi": "^4.0.0", + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/table/node_modules/ajv": { + "version": "8.6.3", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz", + "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/table/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/table/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/table/node_modules/astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/table/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/table/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/table/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/table/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/table/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + }, + "node_modules/table/node_modules/slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dependencies": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/table/node_modules/string-width": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/table/node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dependencies": { + "ansi-regex": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/tapable": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", @@ -20627,6 +22265,36 @@ } } }, + "node_modules/tsconfig-paths": { + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz", + "integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==", + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.0", + "strip-bom": "^3.0.0" + } + }, + "node_modules/tsconfig-paths/node_modules/json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/tsconfig-paths/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "engines": { + "node": ">=4" + } + }, "node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -20726,26 +22394,6 @@ "node": "*" } }, - "node_modules/uglify-js": { - "version": "3.4.10", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz", - "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==", - "dependencies": { - "commander": "~2.19.0", - "source-map": "~0.6.1" - }, - "bin": { - "uglifyjs": "bin/uglifyjs" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/uglify-js/node_modules/commander": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", - "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==" - }, "node_modules/unbox-primitive": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", @@ -20933,11 +22581,6 @@ "yarn": "*" } }, - "node_modules/upper-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=" - }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -21192,16 +22835,15 @@ } }, "node_modules/watchpack": { - "version": "1.7.5", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz", - "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz", + "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==", "dependencies": { - "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" }, - "optionalDependencies": { - "chokidar": "^3.4.1", - "watchpack-chokidar2": "^2.0.1" + "engines": { + "node": ">=10.13.0" } }, "node_modules/watchpack-chokidar2": { @@ -21320,6 +22962,11 @@ "node": ">=0.10" } }, + "node_modules/watchpack/node_modules/glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + }, "node_modules/wbuf": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", @@ -21334,96 +22981,312 @@ "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" }, "node_modules/webpack": { - "version": "4.42.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz", - "integrity": "sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==", + "version": "5.55.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.55.1.tgz", + "integrity": "sha512-EYp9lwaOOAs+AA/KviNZ7bQiITHm4bXQvyTPewD2+f5YGjv6sfiClm40yeX5FgBMxh5bxcB6LryiFoP09B97Ug==", "dependencies": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-module-context": "1.8.5", - "@webassemblyjs/wasm-edit": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5", - "acorn": "^6.2.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.0", + "@types/estree": "^0.0.50", + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/wasm-edit": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1", + "acorn": "^8.4.1", + "acorn-import-assertions": "^1.7.6", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.1.0", - "eslint-scope": "^4.0.3", + "enhanced-resolve": "^5.8.3", + "es-module-lexer": "^0.9.0", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.4", "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.1", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.6.0", - "webpack-sources": "^1.4.1" + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.1.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.1.3", + "watchpack": "^2.2.0", + "webpack-sources": "^3.2.0" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } } }, "node_modules/webpack-cli": { - "version": "3.3.12", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz", - "integrity": "sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz", + "integrity": "sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw==", "dependencies": { - "chalk": "^2.4.2", - "cross-spawn": "^6.0.5", - "enhanced-resolve": "^4.1.1", - "findup-sync": "^3.0.0", - "global-modules": "^2.0.0", - "import-local": "^2.0.0", - "interpret": "^1.4.0", - "loader-utils": "^1.4.0", - "supports-color": "^6.1.0", - "v8-compile-cache": "^2.1.1", - "yargs": "^13.3.2" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^1.0.4", + "@webpack-cli/info": "^1.3.0", + "@webpack-cli/serve": "^1.5.2", + "colorette": "^1.2.1", + "commander": "^7.0.0", + "execa": "^5.0.0", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^2.2.0", + "rechoir": "^0.7.0", + "v8-compile-cache": "^2.2.0", + "webpack-merge": "^5.7.3" }, "bin": { "webpack-cli": "bin/cli.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "peerDependencies": { - "webpack": "4.x.x" + "webpack": "4.x.x || 5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true + }, + "@webpack-cli/migrate": { + "optional": true + }, + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { + "optional": true + } + } + }, + "node_modules/webpack-cli/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "engines": { + "node": ">= 10" } }, "node_modules/webpack-cli/node_modules/cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dependencies": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" }, "engines": { - "node": ">=4.8" + "node": ">= 8" } }, - "node_modules/webpack-cli/node_modules/supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "node_modules/webpack-cli/node_modules/execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dependencies": { - "has-flag": "^3.0.0" + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" }, "engines": { - "node": ">=6" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/webpack-cli/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/webpack-cli/node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/webpack-cli/node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/webpack-cli/node_modules/import-local": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz", + "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==", + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/webpack-cli/node_modules/interpret": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", + "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/webpack-cli/node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/webpack-cli/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/webpack-cli/node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/webpack-cli/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/webpack-cli/node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "engines": { + "node": ">=8" + } + }, + "node_modules/webpack-cli/node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/webpack-cli/node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/webpack-cli/node_modules/resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/webpack-cli/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/webpack-cli/node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/webpack-cli/node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "engines": { + "node": ">=8" + } + }, + "node_modules/webpack-cli/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" } }, "node_modules/webpack-dev-middleware": { @@ -21715,7 +23578,6 @@ "version": "5.7.3", "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz", "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==", - "dev": true, "dependencies": { "clone-deep": "^4.0.1", "wildcard": "^2.0.0" @@ -21728,7 +23590,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", - "dev": true, "dependencies": { "is-plain-object": "^2.0.4", "kind-of": "^6.0.2", @@ -21742,7 +23603,6 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -21751,7 +23611,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", - "dev": true, "dependencies": { "kind-of": "^6.0.2" }, @@ -21768,10 +23627,15 @@ "source-map": "~0.6.1" } }, + "node_modules/webpack/node_modules/@types/json-schema": { + "version": "7.0.9", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", + "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==" + }, "node_modules/webpack/node_modules/acorn": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", - "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", + "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", "bin": { "acorn": "bin/acorn" }, @@ -21779,95 +23643,179 @@ "node": ">=0.4.0" } }, - "node_modules/webpack/node_modules/cacache": { - "version": "12.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", - "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", + "node_modules/webpack/node_modules/enhanced-resolve": { + "version": "5.8.3", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz", + "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==", "dependencies": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "infer-owner": "^1.0.3", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" - } - }, - "node_modules/webpack/node_modules/eslint-scope": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", - "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", - "dependencies": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" }, "engines": { - "node": ">=4.0.0" + "node": ">=10.13.0" } }, - "node_modules/webpack/node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "node_modules/webpack/node_modules/glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + }, + "node_modules/webpack/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/webpack/node_modules/jest-worker": { + "version": "27.2.4", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.4.tgz", + "integrity": "sha512-Zq9A2Pw59KkVjBBKD1i3iE2e22oSjXhUKKuAK1HGX8flGwkm6NMozyEYzKd41hXc64dbd/0eWFeEEuxqXyhM+g==", "dependencies": { - "yallist": "^3.0.2" + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/webpack/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/webpack/node_modules/schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dependencies": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" }, "engines": { - "node": ">= 4" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" } }, - "node_modules/webpack/node_modules/ssri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "node_modules/webpack/node_modules/serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", "dependencies": { - "figgy-pudding": "^3.5.1" + "randombytes": "^2.1.0" + } + }, + "node_modules/webpack/node_modules/source-map-support": { + "version": "0.5.20", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", + "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/webpack/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/webpack/node_modules/tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "engines": { + "node": ">=6" + } + }, + "node_modules/webpack/node_modules/terser": { + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz", + "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==", + "dependencies": { + "commander": "^2.20.0", + "source-map": "~0.7.2", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" } }, "node_modules/webpack/node_modules/terser-webpack-plugin": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", - "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz", + "integrity": "sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA==", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", + "jest-worker": "^27.0.6", + "p-limit": "^3.1.0", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.0", "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "terser": "^5.7.2" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, - "node_modules/webpack/node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + "node_modules/webpack/node_modules/terser/node_modules/source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/webpack/node_modules/webpack-sources": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.1.tgz", + "integrity": "sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA==", + "engines": { + "node": ">=10.13.0" + } }, "node_modules/webrtc-adapter": { "version": "7.7.1", @@ -21974,8 +23922,7 @@ "node_modules/wildcard": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", - "dev": true + "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==" }, "node_modules/word-wrap": { "version": "1.2.3", @@ -22379,6 +24326,17 @@ "fd-slicer": "~1.1.0" } }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/yup": { "version": "0.27.0", "resolved": "https://registry.npmjs.org/yup/-/yup-0.27.0.tgz", @@ -23758,6 +25716,11 @@ } } }, + "@discoveryjs/json-ext": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz", + "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==" + }, "@emotion/cache": { "version": "10.0.29", "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz", @@ -23846,6 +25809,51 @@ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz", "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, + "@eslint/eslintrc": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", + "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", + "requires": { + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", + "globals": "^13.9.0", + "ignore": "^4.0.6", + "import-fresh": "^3.2.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + }, + "dependencies": { + "globals": { + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", + "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", + "requires": { + "type-fest": "^0.20.2" + } + }, + "import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + } + }, + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + }, + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" + } + } + }, "@googlemaps/js-api-loader": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@googlemaps/js-api-loader/-/js-api-loader-1.11.1.tgz", @@ -23888,6 +25896,21 @@ "@hapi/hoek": "^8.3.0" } }, + "@humanwhocodes/config-array": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", + "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", + "requires": { + "@humanwhocodes/object-schema": "^1.2.0", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + } + }, + "@humanwhocodes/object-schema": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz", + "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==" + }, "@icons/material": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz", @@ -24819,11 +26842,34 @@ "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.11.tgz", "integrity": "sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw==" }, + "@types/eslint": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz", + "integrity": "sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==", + "requires": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "@types/eslint-scope": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz", + "integrity": "sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==", + "requires": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, "@types/eslint-visitor-keys": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==" }, + "@types/estree": { + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", + "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==" + }, "@types/glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", @@ -24833,6 +26879,11 @@ "@types/node": "*" } }, + "@types/html-minifier-terser": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz", + "integrity": "sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==" + }, "@types/invariant": { "version": "2.2.34", "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.34.tgz", @@ -24865,6 +26916,11 @@ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz", "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==" }, + "@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=" + }, "@types/minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz", @@ -25144,29 +27200,28 @@ } }, "@webassemblyjs/ast": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", - "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", + "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", "requires": { - "@webassemblyjs/helper-module-context": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/wast-parser": "1.8.5" + "@webassemblyjs/helper-numbers": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz", - "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==" + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", + "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==" }, "@webassemblyjs/helper-api-error": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz", - "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==" + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", + "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==" }, "@webassemblyjs/helper-buffer": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz", - "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==" + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", + "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==" }, "@webassemblyjs/helper-code-frame": { "version": "1.8.5", @@ -25174,6 +27229,33 @@ "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==", "requires": { "@webassemblyjs/wast-printer": "1.8.5" + }, + "dependencies": { + "@webassemblyjs/ast": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", + "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", + "requires": { + "@webassemblyjs/helper-module-context": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5" + } + }, + "@webassemblyjs/helper-wasm-bytecode": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz", + "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==" + }, + "@webassemblyjs/wast-printer": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz", + "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==", + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5", + "@xtuc/long": "4.2.2" + } + } } }, "@webassemblyjs/helper-fsm": { @@ -25188,94 +27270,121 @@ "requires": { "@webassemblyjs/ast": "1.8.5", "mamacro": "^0.0.3" + }, + "dependencies": { + "@webassemblyjs/ast": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", + "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", + "requires": { + "@webassemblyjs/helper-module-context": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5" + } + }, + "@webassemblyjs/helper-wasm-bytecode": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz", + "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==" + } + } + }, + "@webassemblyjs/helper-numbers": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", + "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "requires": { + "@webassemblyjs/floating-point-hex-parser": "1.11.1", + "@webassemblyjs/helper-api-error": "1.11.1", + "@xtuc/long": "4.2.2" } }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz", - "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==" + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", + "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==" }, "@webassemblyjs/helper-wasm-section": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz", - "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", + "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1" } }, "@webassemblyjs/ieee754": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz", - "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", + "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", "requires": { "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz", - "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", + "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", "requires": { "@xtuc/long": "4.2.2" } }, "@webassemblyjs/utf8": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz", - "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==" + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", + "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==" }, "@webassemblyjs/wasm-edit": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz", - "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", + "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/helper-wasm-section": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5", - "@webassemblyjs/wasm-opt": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5", - "@webassemblyjs/wast-printer": "1.8.5" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/helper-wasm-section": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1", + "@webassemblyjs/wasm-opt": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1", + "@webassemblyjs/wast-printer": "1.11.1" } }, "@webassemblyjs/wasm-gen": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz", - "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", + "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/ieee754": "1.8.5", - "@webassemblyjs/leb128": "1.8.5", - "@webassemblyjs/utf8": "1.8.5" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/ieee754": "1.11.1", + "@webassemblyjs/leb128": "1.11.1", + "@webassemblyjs/utf8": "1.11.1" } }, "@webassemblyjs/wasm-opt": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz", - "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", + "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1" } }, "@webassemblyjs/wasm-parser": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz", - "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", + "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-api-error": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/ieee754": "1.8.5", - "@webassemblyjs/leb128": "1.8.5", - "@webassemblyjs/utf8": "1.8.5" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/ieee754": "1.11.1", + "@webassemblyjs/leb128": "1.11.1", + "@webassemblyjs/utf8": "1.11.1" } }, "@webassemblyjs/wast-parser": { @@ -25289,18 +27398,64 @@ "@webassemblyjs/helper-code-frame": "1.8.5", "@webassemblyjs/helper-fsm": "1.8.5", "@xtuc/long": "4.2.2" + }, + "dependencies": { + "@webassemblyjs/ast": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", + "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", + "requires": { + "@webassemblyjs/helper-module-context": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5" + } + }, + "@webassemblyjs/floating-point-hex-parser": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz", + "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==" + }, + "@webassemblyjs/helper-api-error": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz", + "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==" + }, + "@webassemblyjs/helper-wasm-bytecode": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz", + "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==" + } } }, "@webassemblyjs/wast-printer": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz", - "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", + "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/wast-parser": "1.8.5", + "@webassemblyjs/ast": "1.11.1", "@xtuc/long": "4.2.2" } }, + "@webpack-cli/configtest": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.4.tgz", + "integrity": "sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==", + "requires": {} + }, + "@webpack-cli/info": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.3.0.tgz", + "integrity": "sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w==", + "requires": { + "envinfo": "^7.7.3" + } + }, + "@webpack-cli/serve": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz", + "integrity": "sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw==", + "requires": {} + }, "@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -25351,6 +27506,12 @@ } } }, + "acorn-import-assertions": { + "version": "1.7.6", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz", + "integrity": "sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==", + "requires": {} + }, "acorn-jsx": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", @@ -25582,6 +27743,12 @@ "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=" }, + "array-find": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz", + "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=", + "dev": true + }, "array-find-index": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", @@ -25646,6 +27813,17 @@ "es-abstract": "^1.18.0-next.1" } }, + "array.prototype.flatmap": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz", + "integrity": "sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==", + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1", + "function-bind": "^1.1.1" + } + }, "arrify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", @@ -25910,7 +28088,6 @@ "version": "1.13.3", "resolved": "https://registry.npmjs.org/babel-plugin-import/-/babel-plugin-import-1.13.3.tgz", "integrity": "sha512-1qCWdljJOrDRH/ybaCZuDgySii4yYrtQ8OJQwrcDqdt0y67N30ng3X3nABg6j7gR7qUJgcMa9OMhc4AGViDwWw==", - "dev": true, "requires": { "@babel/helper-module-imports": "^7.0.0", "@babel/runtime": "^7.0.0" @@ -26911,12 +29088,9 @@ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" }, "chrome-trace-event": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", - "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", - "requires": { - "tslib": "^1.9.0" - } + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", + "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==" }, "ci-info": { "version": "2.0.0", @@ -26954,9 +29128,9 @@ } }, "classnames": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz", - "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==" + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz", + "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==" }, "clean-css": { "version": "4.2.3", @@ -28256,11 +30430,6 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, - "detect-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=" - }, "detect-newline": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz", @@ -28661,11 +30830,31 @@ } } }, + "enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "requires": { + "ansi-colors": "^4.1.1" + }, + "dependencies": { + "ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==" + } + } + }, "entities": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" }, + "envinfo": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", + "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==" + }, "enzyme-shallow-equal": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz", @@ -28692,28 +30881,35 @@ } }, "es-abstract": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz", - "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==", + "version": "1.18.6", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.6.tgz", + "integrity": "sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==", "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", - "is-callable": "^1.2.3", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.2", - "is-string": "^1.0.5", - "object-inspect": "^1.9.0", + "is-regex": "^1.1.4", + "is-string": "^1.0.7", + "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", "string.prototype.trimend": "^1.0.4", "string.prototype.trimstart": "^1.0.4", - "unbox-primitive": "^1.0.0" + "unbox-primitive": "^1.0.1" } }, + "es-module-lexer": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.1.tgz", + "integrity": "sha512-17Ed9misDnpyNBJh63g1OhW3qUFecDgGOivI85JeZY/LGhDum8e+cltukbkSK8pcJnXXEkya56sp4vSS1nzoUw==" + }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -28780,6 +30976,255 @@ "source-map": "~0.6.1" } }, + "eslint": { + "version": "7.32.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", + "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", + "requires": { + "@babel/code-frame": "7.12.11", + "@eslint/eslintrc": "^0.4.3", + "@humanwhocodes/config-array": "^0.5.0", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "enquirer": "^2.3.5", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^2.1.0", + "eslint-visitor-keys": "^2.0.0", + "espree": "^7.3.1", + "esquery": "^1.4.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.1.2", + "globals": "^13.6.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.0.4", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "progress": "^2.0.0", + "regexpp": "^3.1.0", + "semver": "^7.2.1", + "strip-ansi": "^6.0.0", + "strip-json-comments": "^3.1.0", + "table": "^6.0.9", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", + "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", + "requires": { + "@babel/highlight": "^7.10.4" + } + }, + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + }, + "eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==" + }, + "globals": { + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", + "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", + "requires": { + "type-fest": "^0.20.2" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + } + }, + "levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "requires": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + } + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "optionator": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", + "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "requires": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" + } + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==" + }, + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + }, + "type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "requires": { + "prelude-ls": "^1.2.1" + } + }, + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, + "eslint-config-prettier": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz", + "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==", + "dev": true, + "requires": {} + }, "eslint-config-react-app": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz", @@ -28789,26 +31234,74 @@ } }, "eslint-import-resolver-node": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz", - "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==", + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", + "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==", "requires": { - "debug": "^2.6.9", - "resolve": "^1.13.1" + "debug": "^3.2.7", + "resolve": "^1.20.0" }, "dependencies": { "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" + } + } + } + }, + "eslint-import-resolver-webpack": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.1.tgz", + "integrity": "sha512-O/8mG6AHmaKYSMb4lWxiXPpaARxOJ4rMQEHJ8vTgjS1MXooJA3KPgBPPAdOPoV17v5ML5120qod5FBLM+DtgEw==", + "dev": true, + "requires": { + "array-find": "^1.0.0", + "debug": "^3.2.7", + "enhanced-resolve": "^0.9.1", + "find-root": "^1.1.0", + "has": "^1.0.3", + "interpret": "^1.4.0", + "is-core-module": "^2.4.0", + "is-regex": "^1.1.3", + "lodash": "^4.17.21", + "resolve": "^1.20.0", + "semver": "^5.7.1" + }, + "dependencies": { + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "enhanced-resolve": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz", + "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "memory-fs": "^0.2.0", + "tapable": "^0.1.8" + } + }, + "memory-fs": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz", + "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=", + "dev": true + }, + "tapable": { + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz", + "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=", + "dev": true } } }, @@ -28825,20 +31318,20 @@ } }, "eslint-module-utils": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz", - "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz", + "integrity": "sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q==", "requires": { - "debug": "^2.6.9", + "debug": "^3.2.7", "pkg-dir": "^2.0.0" }, "dependencies": { "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" } }, "find-up": { @@ -28858,11 +31351,6 @@ "path-exists": "^3.0.0" } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -28899,6 +31387,15 @@ } } }, + "eslint-plugin-cypress": { + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.12.1.tgz", + "integrity": "sha512-c2W/uPADl5kospNDihgiLc7n87t5XhUbFDoTl6CfVkmG+kDAb5Ux10V9PoLPu9N+r7znpc+iQlcmAqT1A/89HA==", + "dev": true, + "requires": { + "globals": "^11.12.0" + } + }, "eslint-plugin-flowtype": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.6.0.tgz", @@ -28907,6 +31404,218 @@ "lodash": "^4.17.15" } }, + "eslint-plugin-import": { + "version": "2.24.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz", + "integrity": "sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==", + "requires": { + "array-includes": "^3.1.3", + "array.prototype.flat": "^1.2.4", + "debug": "^2.6.9", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.6", + "eslint-module-utils": "^2.6.2", + "find-up": "^2.0.0", + "has": "^1.0.3", + "is-core-module": "^2.6.0", + "minimatch": "^3.0.4", + "object.values": "^1.1.4", + "pkg-up": "^2.0.0", + "read-pkg-up": "^3.0.0", + "resolve": "^1.20.0", + "tsconfig-paths": "^3.11.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "requires": { + "esutils": "^2.0.2" + } + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "requires": { + "locate-path": "^2.0.0" + } + }, + "load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" + }, + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "requires": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" + }, + "path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "requires": { + "pify": "^3.0.0" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + }, + "pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", + "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=", + "requires": { + "find-up": "^2.1.0" + } + }, + "read-pkg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", + "requires": { + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" + } + }, + "read-pkg-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", + "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", + "requires": { + "find-up": "^2.0.0", + "read-pkg": "^3.0.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" + } + } + }, + "eslint-plugin-prettier": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz", + "integrity": "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==", + "dev": true, + "requires": { + "prettier-linter-helpers": "^1.0.0" + } + }, + "eslint-plugin-react": { + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.25.2.tgz", + "integrity": "sha512-elx4585wgmryanJK4C5IoSKQyVZ+e7H0t2JOOtJNBql0cuercvSShvRReuLBbfx8687yW5yv+UL7pXwMsd6adQ==", + "requires": { + "array-includes": "^3.1.3", + "array.prototype.flatmap": "^1.2.4", + "doctrine": "^2.1.0", + "estraverse": "^5.2.0", + "has": "^1.0.3", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.0.4", + "object.entries": "^1.1.4", + "object.fromentries": "^2.0.4", + "object.values": "^1.1.4", + "prop-types": "^15.7.2", + "resolve": "^2.0.0-next.3", + "string.prototype.matchall": "^4.0.5" + }, + "dependencies": { + "doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "requires": { + "esutils": "^2.0.2" + } + }, + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==" + }, + "resolve": { + "version": "2.0.0-next.3", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz", + "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==", + "requires": { + "is-core-module": "^2.2.0", + "path-parse": "^1.0.6" + } + } + } + }, + "eslint-plugin-react-hooks": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz", + "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==", + "requires": {} + }, "eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -28929,6 +31638,16 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==" }, + "espree": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", + "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "requires": { + "acorn": "^7.4.0", + "acorn-jsx": "^5.3.1", + "eslint-visitor-keys": "^1.3.0" + } + }, "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", @@ -29110,14 +31829,6 @@ } } }, - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, "expect": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz", @@ -29344,6 +32055,12 @@ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, + "fast-diff": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", + "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "dev": true + }, "fast-glob": { "version": "2.2.7", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz", @@ -29393,6 +32110,11 @@ "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz", "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==" }, + "fastest-levenshtein": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", + "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==" + }, "faye-websocket": { "version": "0.11.4", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", @@ -29469,6 +32191,14 @@ "escape-string-regexp": "^1.0.5" } }, + "file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "requires": { + "flat-cache": "^3.0.4" + } + }, "file-loader": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz", @@ -29671,17 +32401,30 @@ } } }, - "findup-sync": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz", - "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==", + "flat-cache": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", + "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", "requires": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" + "flatted": "^3.1.0", + "rimraf": "^3.0.2" + }, + "dependencies": { + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + } } }, + "flatted": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", + "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==" + }, "flatten": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz", @@ -29928,6 +32671,15 @@ "pump": "^3.0.0" } }, + "get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + } + }, "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", @@ -30161,6 +32913,14 @@ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" }, + "has-tostringtag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "requires": { + "has-symbols": "^1.0.2" + } + }, "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", @@ -30272,14 +33032,6 @@ "react-is": "^16.7.0" } }, - "homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "requires": { - "parse-passwd": "^1.0.0" - } - }, "hosted-git-info": { "version": "2.8.8", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", @@ -30329,57 +33081,6 @@ "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==" }, - "html-minifier": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz", - "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==", - "requires": { - "camel-case": "3.0.x", - "clean-css": "4.2.x", - "commander": "2.17.x", - "he": "1.2.x", - "param-case": "2.1.x", - "relateurl": "0.2.x", - "uglify-js": "3.4.x" - }, - "dependencies": { - "camel-case": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", - "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", - "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.1.1" - } - }, - "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==" - }, - "lower-case": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=" - }, - "no-case": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", - "requires": { - "lower-case": "^1.1.1" - } - }, - "param-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", - "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", - "requires": { - "no-case": "^2.2.0" - } - } - } - }, "html-minifier-terser": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz", @@ -30402,58 +33103,111 @@ } }, "html-webpack-plugin": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", - "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.3.2.tgz", + "integrity": "sha512-HvB33boVNCz2lTyBsSiMffsJ+m0YLIQ+pskblXgN9fnjS1BgEcuAfdInfXfGrkdXV406k9FiDi86eVCDBgJOyQ==", "requires": { - "html-minifier": "^3.2.3", - "loader-utils": "^0.2.16", - "lodash": "^4.17.3", - "pretty-error": "^2.0.2", - "tapable": "^1.0.0", - "toposort": "^1.0.0", - "util.promisify": "1.0.0" + "@types/html-minifier-terser": "^5.0.0", + "html-minifier-terser": "^5.0.1", + "lodash": "^4.17.21", + "pretty-error": "^3.0.4", + "tapable": "^2.0.0" }, "dependencies": { - "big.js": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz", - "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==" - }, - "emojis-list": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=" - }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" - }, - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", + "css-select": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz", + "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==", "requires": { - "big.js": "^3.1.3", - "emojis-list": "^2.0.0", - "json5": "^0.5.0", - "object-assign": "^4.0.1" + "boolbase": "^1.0.0", + "css-what": "^5.0.0", + "domhandler": "^4.2.0", + "domutils": "^2.6.0", + "nth-check": "^2.0.0" } }, - "toposort": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz", - "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=" + "css-what": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz", + "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==" }, - "util.promisify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", - "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", + "dom-serializer": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", + "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", "requires": { - "define-properties": "^1.1.2", - "object.getownpropertydescriptors": "^2.0.3" + "domelementtype": "^2.0.1", + "domhandler": "^4.2.0", + "entities": "^2.0.0" } + }, + "domelementtype": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", + "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==" + }, + "domhandler": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz", + "integrity": "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==", + "requires": { + "domelementtype": "^2.2.0" + } + }, + "domutils": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", + "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "requires": { + "dom-serializer": "^1.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0" + } + }, + "htmlparser2": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", + "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.5.2", + "entities": "^2.0.0" + } + }, + "nth-check": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", + "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==", + "requires": { + "boolbase": "^1.0.0" + } + }, + "pretty-error": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-3.0.4.tgz", + "integrity": "sha512-ytLFLfv1So4AO1UkoBF6GXQgJRaKbiSiGFICaOPNwQ3CMvBvXpLRubeQWyPGnsbV/t9ml9qto6IeCsho0aEvwQ==", + "requires": { + "lodash": "^4.17.20", + "renderkid": "^2.0.6" + } + }, + "renderkid": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz", + "integrity": "sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==", + "requires": { + "css-select": "^4.1.3", + "dom-converter": "^0.2.0", + "htmlparser2": "^6.1.0", + "lodash": "^4.17.21", + "strip-ansi": "^3.0.1" + } + }, + "tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" } } }, @@ -30811,7 +33565,8 @@ "interpret": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", - "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==" + "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", + "dev": true }, "invariant": { "version": "2.2.4", @@ -30889,9 +33644,9 @@ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "is-callable": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", - "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==" + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==" }, "is-ci": { "version": "2.0.0", @@ -30915,9 +33670,9 @@ } }, "is-core-module": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", - "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz", + "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==", "requires": { "has": "^1.0.3" } @@ -31089,12 +33844,12 @@ "dev": true }, "is-regex": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz", - "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "requires": { "call-bind": "^1.0.2", - "has-symbols": "^1.0.1" + "has-tostringtag": "^1.0.0" } }, "is-regexp": { @@ -31118,9 +33873,12 @@ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, "is-string": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", - "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==" + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "requires": { + "has-tostringtag": "^1.0.0" + } }, "is-svg": { "version": "3.0.0", @@ -31955,6 +34713,15 @@ "resolved": "https://registry.npmjs.org/jsqr/-/jsqr-1.4.0.tgz", "integrity": "sha512-dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A==" }, + "jsx-ast-utils": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz", + "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==", + "requires": { + "array-includes": "^3.1.3", + "object.assign": "^4.1.2" + } + }, "killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", @@ -32223,9 +34990,9 @@ } }, "loader-runner": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz", - "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz", + "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==" }, "loader-utils": { "version": "1.4.0", @@ -32278,6 +35045,11 @@ "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=" }, + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" + }, "lodash.curry": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz", @@ -32298,6 +35070,11 @@ "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=" }, + "lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + }, "lodash.once": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", @@ -32326,6 +35103,11 @@ "lodash._reinterpolate": "^3.0.0" } }, + "lodash.truncate": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", + "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=" + }, "lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -33351,9 +36133,9 @@ "integrity": "sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==" }, "object-inspect": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz", - "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==" + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", + "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==" }, "object-is": { "version": "1.1.5", @@ -33394,14 +36176,13 @@ } }, "object.entries": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz", - "integrity": "sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz", + "integrity": "sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==", "requires": { - "call-bind": "^1.0.0", + "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1", - "has": "^1.0.3" + "es-abstract": "^1.18.2" } }, "object.fromentries": { @@ -33434,14 +36215,13 @@ } }, "object.values": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz", - "integrity": "sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz", + "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==", "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", - "has": "^1.0.3" + "es-abstract": "^1.18.2" } }, "obuf": { @@ -33691,11 +36471,6 @@ "error-ex": "^1.2.0" } }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=" - }, "parse5": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", @@ -33801,9 +36576,9 @@ } }, "pbkdf2": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz", - "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", + "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", "requires": { "create-hash": "^1.1.2", "create-hmac": "^1.1.4", @@ -34872,6 +37647,21 @@ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, + "prettier": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", + "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", + "dev": true + }, + "prettier-linter-helpers": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", + "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", + "dev": true, + "requires": { + "fast-diff": "^1.1.2" + } + }, "pretty-bytes": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", @@ -35638,15 +38428,6 @@ "webrtc-adapter": "^7.2.1" } }, - "react-resizable": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/react-resizable/-/react-resizable-1.11.1.tgz", - "integrity": "sha512-S70gbLaAYqjuAd49utRHibtHLrHXInh7GuOR+6OO6RO6uleQfuBnWmZjRABfqNEx3C3Z6VPLg0/0uOYFrkfu9Q==", - "requires": { - "prop-types": "15.x", - "react-draggable": "^4.0.3" - } - }, "react-rnd": { "version": "10.3.0", "resolved": "https://registry.npmjs.org/react-rnd/-/react-rnd-10.3.0.tgz", @@ -35864,6 +38645,124 @@ "loader-utils": "^1.2.3" } }, + "@webassemblyjs/ast": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", + "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", + "requires": { + "@webassemblyjs/helper-module-context": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5" + } + }, + "@webassemblyjs/helper-api-error": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz", + "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==" + }, + "@webassemblyjs/helper-buffer": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz", + "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==" + }, + "@webassemblyjs/helper-wasm-bytecode": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz", + "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==" + }, + "@webassemblyjs/helper-wasm-section": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz", + "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==", + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-buffer": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/wasm-gen": "1.8.5" + } + }, + "@webassemblyjs/ieee754": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz", + "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==", + "requires": { + "@xtuc/ieee754": "^1.2.0" + } + }, + "@webassemblyjs/leb128": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz", + "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==", + "requires": { + "@xtuc/long": "4.2.2" + } + }, + "@webassemblyjs/utf8": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz", + "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==" + }, + "@webassemblyjs/wasm-edit": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz", + "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==", + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-buffer": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/helper-wasm-section": "1.8.5", + "@webassemblyjs/wasm-gen": "1.8.5", + "@webassemblyjs/wasm-opt": "1.8.5", + "@webassemblyjs/wasm-parser": "1.8.5", + "@webassemblyjs/wast-printer": "1.8.5" + } + }, + "@webassemblyjs/wasm-gen": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz", + "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==", + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/ieee754": "1.8.5", + "@webassemblyjs/leb128": "1.8.5", + "@webassemblyjs/utf8": "1.8.5" + } + }, + "@webassemblyjs/wasm-opt": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz", + "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==", + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-buffer": "1.8.5", + "@webassemblyjs/wasm-gen": "1.8.5", + "@webassemblyjs/wasm-parser": "1.8.5" + } + }, + "@webassemblyjs/wasm-parser": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz", + "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==", + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-api-error": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/ieee754": "1.8.5", + "@webassemblyjs/leb128": "1.8.5", + "@webassemblyjs/utf8": "1.8.5" + } + }, + "@webassemblyjs/wast-printer": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz", + "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==", + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5", + "@xtuc/long": "4.2.2" + } + }, "aria-query": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz", @@ -35878,6 +38777,28 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==" }, + "cacache": { + "version": "12.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", + "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", + "requires": { + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" + } + }, "camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", @@ -36128,6 +39049,15 @@ "flat-cache": "^2.0.1" } }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "optional": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, "find-up": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", @@ -36199,6 +39129,12 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "optional": true + }, "jsx-ast-utils": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz", @@ -36219,6 +39155,11 @@ "strip-bom": "^3.0.0" } }, + "loader-runner": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz", + "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==" + }, "locate-path": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", @@ -36228,6 +39169,14 @@ "path-exists": "^3.0.0" } }, + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "requires": { + "yallist": "^3.0.2" + } + }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -36398,6 +39347,14 @@ } } }, + "ssri": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz", + "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==", + "requires": { + "figgy-pudding": "^3.5.1" + } + }, "string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", @@ -36440,6 +39397,15 @@ "string-width": "^3.0.0" } }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "optional": true, + "requires": { + "is-number": "^7.0.0" + } + }, "util.promisify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", @@ -36454,6 +39420,146 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" }, + "watchpack": { + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz", + "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==", + "requires": { + "chokidar": "^3.4.1", + "graceful-fs": "^4.1.2", + "neo-async": "^2.5.0", + "watchpack-chokidar2": "^2.0.1" + }, + "dependencies": { + "anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "optional": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "optional": true + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "optional": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "chokidar": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", + "optional": true, + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + } + }, + "fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "optional": true + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "optional": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "optional": true, + "requires": { + "picomatch": "^2.2.1" + } + } + } + }, + "webpack": { + "version": "4.42.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz", + "integrity": "sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==", + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-module-context": "1.8.5", + "@webassemblyjs/wasm-edit": "1.8.5", + "@webassemblyjs/wasm-parser": "1.8.5", + "acorn": "^6.2.1", + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^4.1.0", + "eslint-scope": "^4.0.3", + "json-parse-better-errors": "^1.0.2", + "loader-runner": "^2.4.0", + "loader-utils": "^1.2.3", + "memory-fs": "^0.4.1", + "micromatch": "^3.1.10", + "mkdirp": "^0.5.1", + "neo-async": "^2.6.1", + "node-libs-browser": "^2.2.1", + "schema-utils": "^1.0.0", + "tapable": "^1.1.3", + "terser-webpack-plugin": "^1.4.3", + "watchpack": "^1.6.0", + "webpack-sources": "^1.4.1" + }, + "dependencies": { + "acorn": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", + "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==" + }, + "eslint-scope": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", + "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + }, + "terser-webpack-plugin": { + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", + "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", + "requires": { + "cacache": "^12.0.2", + "find-cache-dir": "^2.1.0", + "is-wsl": "^1.1.0", + "schema-utils": "^1.0.0", + "serialize-javascript": "^4.0.0", + "source-map": "^0.6.1", + "terser": "^4.1.2", + "webpack-sources": "^1.4.0", + "worker-farm": "^1.7.0" + } + } + } + }, "webpack-dev-server": { "version": "3.11.0", "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz", @@ -36524,6 +39630,11 @@ "requires": { "async-limiter": "~1.0.0" } + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" } } }, @@ -36706,6 +39817,14 @@ "util.promisify": "^1.0.0" } }, + "rechoir": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", + "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", + "requires": { + "resolve": "^1.9.0" + } + }, "recursive-readdir": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz", @@ -36930,6 +40049,11 @@ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, + "require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" + }, "require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", @@ -36957,39 +40081,6 @@ "resolve-from": "^3.0.0" } }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - }, - "dependencies": { - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - } - } - } - }, "resolve-from": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", @@ -38039,14 +41130,15 @@ } }, "string.prototype.matchall": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz", - "integrity": "sha512-pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz", + "integrity": "sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==", "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", - "has-symbols": "^1.0.1", + "es-abstract": "^1.18.2", + "get-intrinsic": "^1.1.1", + "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", "regexp.prototype.flags": "^1.3.1", "side-channel": "^1.0.4" @@ -38127,8 +41219,7 @@ "strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" }, "strip-indent": { "version": "3.0.0", @@ -38234,6 +41325,106 @@ "resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.15.tgz", "integrity": "sha512-k8uzYIkIVwmT+TcglpdN50pS2y1BDcUnBPK9iJeGu0Pl1lOI8pD6wtzgw91Pjpe+RxtTncw32tLxs/R0yNL2Mg==" }, + "table": { + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz", + "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==", + "requires": { + "ajv": "^8.0.1", + "lodash.clonedeep": "^4.5.0", + "lodash.truncate": "^4.4.2", + "slice-ansi": "^4.0.0", + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ajv": { + "version": "8.6.3", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz", + "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==", + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==" + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + }, + "slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "requires": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + } + }, + "string-width": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, "tapable": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", @@ -38607,6 +41798,32 @@ "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.6.tgz", "integrity": "sha512-CrG5GqAAzMT7144Cl+UIFP7mz/iIhiy+xQ6GGcnjTezhALT02uPMRw7tgDSESgB5MsfKt55+GPWw4ir1kVtMIQ==" }, + "tsconfig-paths": { + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz", + "integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==", + "requires": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.0", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "requires": { + "minimist": "^1.2.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" + } + } + }, "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -38675,22 +41892,6 @@ "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.27.tgz", "integrity": "sha512-eXMaRYK2skomGocoX0x9sBXzx5A1ZVQgXfrW4mTc8dT0zS7olEcyfudAzRC5tIIRgLxQ69B6jut3DI+n5hslPA==" }, - "uglify-js": { - "version": "3.4.10", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz", - "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==", - "requires": { - "commander": "~2.19.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "commander": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", - "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==" - } - } - }, "unbox-primitive": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", @@ -38836,11 +42037,6 @@ "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==" }, - "upper-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=" - }, "uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -39046,14 +42242,19 @@ } }, "watchpack": { - "version": "1.7.5", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz", - "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz", + "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==", "requires": { - "chokidar": "^3.4.1", - "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0", - "watchpack-chokidar2": "^2.0.1" + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" + }, + "dependencies": { + "glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + } } }, "watchpack-chokidar2": { @@ -39164,156 +42365,323 @@ "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" }, "webpack": { - "version": "4.42.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz", - "integrity": "sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==", + "version": "5.55.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.55.1.tgz", + "integrity": "sha512-EYp9lwaOOAs+AA/KviNZ7bQiITHm4bXQvyTPewD2+f5YGjv6sfiClm40yeX5FgBMxh5bxcB6LryiFoP09B97Ug==", "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-module-context": "1.8.5", - "@webassemblyjs/wasm-edit": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5", - "acorn": "^6.2.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.0", + "@types/estree": "^0.0.50", + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/wasm-edit": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1", + "acorn": "^8.4.1", + "acorn-import-assertions": "^1.7.6", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.1.0", - "eslint-scope": "^4.0.3", + "enhanced-resolve": "^5.8.3", + "es-module-lexer": "^0.9.0", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.4", "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.1", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.6.0", - "webpack-sources": "^1.4.1" + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.1.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.1.3", + "watchpack": "^2.2.0", + "webpack-sources": "^3.2.0" }, "dependencies": { + "@types/json-schema": { + "version": "7.0.9", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", + "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==" + }, "acorn": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", - "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==" + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", + "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==" }, - "cacache": { - "version": "12.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", - "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", + "enhanced-resolve": { + "version": "5.8.3", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz", + "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==", "requires": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "infer-owner": "^1.0.3", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" } }, - "eslint-scope": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", - "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", + "glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "jest-worker": { + "version": "27.2.4", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.4.tgz", + "integrity": "sha512-Zq9A2Pw59KkVjBBKD1i3iE2e22oSjXhUKKuAK1HGX8flGwkm6NMozyEYzKd41hXc64dbd/0eWFeEEuxqXyhM+g==", "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" } }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "requires": { - "yallist": "^3.0.2" + "yocto-queue": "^0.1.0" } }, "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" } }, - "ssri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", "requires": { - "figgy-pudding": "^3.5.1" + "randombytes": "^2.1.0" + } + }, + "source-map-support": { + "version": "0.5.20", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", + "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "requires": { + "has-flag": "^4.0.0" + } + }, + "tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" + }, + "terser": { + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz", + "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==", + "requires": { + "commander": "^2.20.0", + "source-map": "~0.7.2", + "source-map-support": "~0.5.20" + }, + "dependencies": { + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" + } } }, "terser-webpack-plugin": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", - "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz", + "integrity": "sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA==", "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", + "jest-worker": "^27.0.6", + "p-limit": "^3.1.0", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.0", "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "terser": "^5.7.2" } }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + "webpack-sources": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.1.tgz", + "integrity": "sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA==" } } }, "webpack-cli": { - "version": "3.3.12", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz", - "integrity": "sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz", + "integrity": "sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw==", "requires": { - "chalk": "^2.4.2", - "cross-spawn": "^6.0.5", - "enhanced-resolve": "^4.1.1", - "findup-sync": "^3.0.0", - "global-modules": "^2.0.0", - "import-local": "^2.0.0", - "interpret": "^1.4.0", - "loader-utils": "^1.4.0", - "supports-color": "^6.1.0", - "v8-compile-cache": "^2.1.1", - "yargs": "^13.3.2" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^1.0.4", + "@webpack-cli/info": "^1.3.0", + "@webpack-cli/serve": "^1.5.2", + "colorette": "^1.2.1", + "commander": "^7.0.0", + "execa": "^5.0.0", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^2.2.0", + "rechoir": "^0.7.0", + "v8-compile-cache": "^2.2.0", + "webpack-merge": "^5.7.3" }, "dependencies": { + "commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==" + }, "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" } }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "requires": { - "has-flag": "^3.0.0" + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" + }, + "human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==" + }, + "import-local": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz", + "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==", + "requires": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + } + }, + "interpret": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", + "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==" + }, + "is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "requires": { + "path-key": "^3.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "requires": { + "find-up": "^4.0.0" + } + }, + "resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "requires": { + "resolve-from": "^5.0.0" + } + }, + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" } } } @@ -39541,7 +42909,6 @@ "version": "5.7.3", "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz", "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==", - "dev": true, "requires": { "clone-deep": "^4.0.1", "wildcard": "^2.0.0" @@ -39551,7 +42918,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", - "dev": true, "requires": { "is-plain-object": "^2.0.4", "kind-of": "^6.0.2", @@ -39561,14 +42927,12 @@ "kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, "shallow-clone": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", - "dev": true, "requires": { "kind-of": "^6.0.2" } @@ -39673,8 +43037,7 @@ "wildcard": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", - "dev": true + "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==" }, "word-wrap": { "version": "1.2.3", @@ -40038,6 +43401,11 @@ "fd-slicer": "~1.1.0" } }, + "yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" + }, "yup": { "version": "0.27.0", "resolved": "https://registry.npmjs.org/yup/-/yup-0.27.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index a38c8cda6d..83f8b1c30a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -3,7 +3,6 @@ "version": "0.1.0", "private": true, "dependencies": { - "babel-plugin-import": "^1.13.3", "@babel/core": "^7.4.3", "@babel/plugin-proposal-class-properties": "^7.10.4", "@babel/preset-env": "^7.4.3", @@ -18,13 +17,15 @@ "array-move": "^3.0.1", "babel-loader": "^8.0.5", "babel-plugin-console-source": "^2.0.5", + "babel-plugin-import": "^1.13.3", "bootstrap": "^4.6.0", + "classnames": "^2.3.1", "dompurify": "^2.2.7", "draft-js": "^0.11.7", + "html-webpack-plugin": "^5.3.2", "draft-js-export-html": "^1.4.1", "fuse.js": "^6.4.6", "history": "^4.9.0", - "html-webpack-plugin": "^3.2.0", "immutability-helper": "^3.1.1", "lodash": "^4.17.21", "moment": "^2.29.1", @@ -32,7 +33,6 @@ "papaparse": "^5.3.0", "plotly.js-basic-dist-min": "^1.58.4", "query-string": "^6.13.6", - "re-resizable": "^6.9.0", "react": "^16.14.0", "react-bootstrap": "^1.5.2", "react-color": "^2.19.3", @@ -48,7 +48,6 @@ "react-loading-skeleton": "^2.2.0", "react-plotly.js": "^2.5.1", "react-qr-reader": "^2.2.1", - "react-resizable": "^1.11.1", "react-rnd": "^10.3.0", "react-router-dom": "^5.0.0", "react-scripts": "3.4.3", @@ -62,8 +61,9 @@ "semver": "^5.7.1", "tinycolor2": "^1.4.2", "uuid": "8.3.2", - "webpack-cli": "^3.3.0", - "yup": "^0.27.0" + "yup": "^0.27.0", + "webpack": "^5.55.1", + "webpack-cli": "^4.8.0" }, "devDependencies": { "@cypress/react": "^5.9.0", @@ -71,13 +71,23 @@ "@cypress/webpack-preprocessor": "^5.9.0", "@svgr/webpack": "^5.5.0", "cypress": "^7.4.0", + "eslint": "^7.32.0", + "eslint-config-prettier": "^8.3.0", + "eslint-import-resolver-webpack": "^0.13.1", + "eslint-plugin-cypress": "^2.12.1", + "eslint-plugin-import": "^2.24.2", + "eslint-plugin-prettier": "^3.4.1", + "eslint-plugin-react": "^7.25.2", + "eslint-plugin-react-hooks": "^4.2.0", "path": "^0.12.7", - "webpack": "^4.29.6", + "prettier": "^2.3.2", "webpack-dev-server": "^3.11.2" }, "scripts": { - "start": "webpack-dev-server --open --port 8082 --host 0.0.0.0", - "build": "webpack -p && cp -a ./assets/. ./build/assets/", + "start": "webpack serve --port 8082 --host 0.0.0.0", + "build": "webpack --mode production && cp -a ./assets/. ./build/assets/", + "lint": "eslint . '**/*.{js,jsx}'", + "format": "eslint . --fix '**/*.{js,jsx}'", "test": "react-scripts test", "eject": "react-scripts eject" }, @@ -88,4 +98,4 @@ "production": [], "development": [] } -} +} \ No newline at end of file diff --git a/frontend/src/App/App.jsx b/frontend/src/App/App.jsx index 6ca33d99ab..9e38f1136c 100644 --- a/frontend/src/App/App.jsx +++ b/frontend/src/App/App.jsx @@ -15,7 +15,7 @@ import 'react-toastify/dist/ReactToastify.css'; import { ManageOrgUsers } from '@/ManageOrgUsers'; import { SettingsPage } from '../SettingsPage/SettingsPage'; import { OnboardingModal } from '@/Onboarding/OnboardingModal'; -import {ForgotPassword} from '@/ForgotPassword' +import { ForgotPassword } from '@/ForgotPassword'; import { ResetPassword } from '@/ResetPassword'; import { lt } from 'semver'; @@ -27,7 +27,7 @@ class App extends React.Component { currentUser: null, fetchedMetadata: false, onboarded: true, - darkMode: localStorage.getItem('darkMode') === 'true' + darkMode: localStorage.getItem('darkMode') === 'true', }; } @@ -40,56 +40,107 @@ class App extends React.Component { logout = () => { authenticationService.logout(); history.push('/login'); - } + }; switchDarkMode = (newMode) => { this.setState({ darkMode: newMode }); localStorage.setItem('darkMode', newMode); - } + }; render() { const { currentUser, fetchedMetadata, updateAvailable, onboarded, darkMode } = this.state; - if(currentUser && fetchedMetadata === false) { + if (currentUser && fetchedMetadata === false) { tooljetService.fetchMetaData().then((data) => { this.setState({ fetchedMetadata: true, onboarded: data.onboarded }); - if(lt(data.installed_version, data.latest_version) && data.version_ignored === false) { + if (lt(data.installed_version, data.latest_version) && data.version_ignored === false) { this.setState({ updateAvailable: true }); } - }) + }); } return (
- {updateAvailable &&
-

Update available

-

A new version of ToolJet has been released.

- } + )} - {!onboarded && - - } + {!onboarded && } - - + + - - + + - - - - - - + + + + + +
); diff --git a/frontend/src/Editor/ActionTypes.js b/frontend/src/Editor/ActionTypes.js index 0c8a7fa642..0111eb2619 100644 --- a/frontend/src/Editor/ActionTypes.js +++ b/frontend/src/Editor/ActionTypes.js @@ -2,51 +2,39 @@ export const ActionTypes = [ { name: 'Show Alert', id: 'show-alert', - options: [ - { name: 'message', type: 'text', default: 'Message !' } - ] + options: [{ name: 'message', type: 'text', default: 'Message !' }], }, { name: 'Run Query', id: 'run-query', - options: [ - { queryId: '' } - ] + options: [{ queryId: '' }], }, { name: 'Open Webpage', id: 'open-webpage', - options: [ - { name: 'url', type: 'text', default: 'https://example.com' } - ] + options: [{ name: 'url', type: 'text', default: 'https://example.com' }], }, { name: 'Go to app', id: 'go-to-app', options: [ { name: 'app', type: 'text', default: '' }, - { name: 'queryParams', type: 'code', default: '[]' } - ] + { name: 'queryParams', type: 'code', default: '[]' }, + ], }, { name: 'Show Modal', id: 'show-modal', - options: [ - { name: 'modal', type: 'text', default: '' } - ] + options: [{ name: 'modal', type: 'text', default: '' }], }, { name: 'Close Modal', id: 'close-modal', - options: [ - { name: 'modal', type: 'text', default: '' } - ] + options: [{ name: 'modal', type: 'text', default: '' }], }, { name: 'Copy to clipboard', id: 'copy-to-clipboard', - options: [ - { name: 'copy-to-clipboard', type: 'text', default: '' } - ] - } + options: [{ name: 'copy-to-clipboard', type: 'text', default: '' }], + }, ]; diff --git a/frontend/src/Editor/Box.jsx b/frontend/src/Editor/Box.jsx index 9ad04f3266..ea535ee60c 100644 --- a/frontend/src/Editor/Box.jsx +++ b/frontend/src/Editor/Box.jsx @@ -17,9 +17,9 @@ import { Modal } from './Components/Modal'; import { Chart } from './Components/Chart'; import { Map } from './Components/Map/Map'; import { QrScanner } from './Components/QrScanner/QrScanner'; -import { ToggleSwitch } from './Components/Toggle' -import { RadioButton } from './Components/RadioButton' -import { StarRating } from './Components/StarRating' +import { ToggleSwitch } from './Components/Toggle'; +import { RadioButton } from './Components/RadioButton'; +import { StarRating } from './Components/StarRating'; import { renderTooltip } from '../_helpers/appUtils'; import OverlayTrigger from 'react-bootstrap/OverlayTrigger'; import '@/_styles/custom.scss'; @@ -45,12 +45,11 @@ const AllComponents = { QrScanner, ToggleSwitch, RadioButton, - StarRating + StarRating, }; export const Box = function Box({ id, - mode, width, height, yellow, @@ -66,12 +65,13 @@ export const Box = function Box({ changeCanDrag, containerProps, darkMode, - removeComponent + removeComponent, }) { const backgroundColor = yellow ? 'yellow' : ''; let styles = { height: '100%', + padding: '1px', }; if (inCanvas) { @@ -86,49 +86,49 @@ export const Box = function Box({ renderTooltip({props, text: `${component.description}`})} + trigger={!inCanvas ? ['hover', 'focus'] : null} + overlay={(props) => renderTooltip({ props, text: `${component.description}` })} > -
- {inCanvas ? ( - - ) : ( -
-
-
-
-
- {component.displayName} +
+ {inCanvas ? ( + + ) : ( +
+
+
+
+
+ {component.displayName} +
-
- )} -
+ )} +
); }; diff --git a/frontend/src/Editor/BoxDragPreview.jsx b/frontend/src/Editor/BoxDragPreview.jsx index 1cfa332741..4a765fada3 100644 --- a/frontend/src/Editor/BoxDragPreview.jsx +++ b/frontend/src/Editor/BoxDragPreview.jsx @@ -11,7 +11,7 @@ export const BoxDragPreview = memo(function BoxDragPreview({ item, currentLayout [tickTock] ); - const layouts = item.layouts; + const layouts = item.layouts; let { width, height } = layouts ? item.layouts[currentLayout] : {}; if (item.id === undefined) { @@ -20,10 +20,18 @@ export const BoxDragPreview = memo(function BoxDragPreview({ item, currentLayout } return ( -
-
+
+
); }); diff --git a/frontend/src/Editor/CodeBuilder/CodeBuilder.jsx b/frontend/src/Editor/CodeBuilder/CodeBuilder.jsx index 3d1df1f657..ca9f2eb7c7 100644 --- a/frontend/src/Editor/CodeBuilder/CodeBuilder.jsx +++ b/frontend/src/Editor/CodeBuilder/CodeBuilder.jsx @@ -2,13 +2,11 @@ import React, { useState } from 'react'; import CodeMirror from '@uiw/react-codemirror'; import 'codemirror/theme/duotone-light.css'; import { componentTypes } from '../Components/components'; -import { DataSourceTypes } from '../DataSourceManager/DataSourceTypes'; +import { DataSourceTypes } from '../DataSourceManager/SourceComponents'; import { debounce } from 'lodash'; import Fuse from 'fuse.js'; -export function CodeBuilder({ - initialValue, onChange, components, dataQueries -}) { +export function CodeBuilder({ initialValue, onChange, components, dataQueries }) { const [showDropdown, setShowDropdown] = useState(false); const [cursorPosition, setCursorPosition] = useState(0); const [currentValue, setCurrentValue] = useState(initialValue); @@ -130,7 +128,7 @@ export function CodeBuilder({ mode: 'javascript', lineWrapping: true, scrollbarStyle: null, - lineNumbers: false + lineNumbers: false, }} /> {showDropdown && ( diff --git a/frontend/src/Editor/CodeBuilder/CodeHinter.jsx b/frontend/src/Editor/CodeBuilder/CodeHinter.jsx index 5b89433563..8e7c1d7201 100644 --- a/frontend/src/Editor/CodeBuilder/CodeHinter.jsx +++ b/frontend/src/Editor/CodeBuilder/CodeHinter.jsx @@ -57,10 +57,12 @@ export function CodeHinter({ }); useEffect(() => { setRealState(currentState); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [currentState.components]); let suggestions = useMemo(() => { return getSuggestionKeys(realState); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [realState.components, realState.queries]); function valueChanged(editor, onChange, suggestions, ignoreBraces) { diff --git a/frontend/src/Editor/CodeBuilder/CodeHinter.spec.jsx b/frontend/src/Editor/CodeBuilder/CodeHinter.spec.jsx index 666f297259..2cf3fc7173 100644 --- a/frontend/src/Editor/CodeBuilder/CodeHinter.spec.jsx +++ b/frontend/src/Editor/CodeBuilder/CodeHinter.spec.jsx @@ -1,33 +1,27 @@ -import * as React from 'react' -import { mount } from '@cypress/react' -import { CodeHinter } from './CodeHinter' +import * as React from 'react'; +import { mount } from '@cypress/react'; +import { CodeHinter } from './CodeHinter'; it('Codehinter', () => { - mount( console.log(value)} + /> + ); - }, - globals: { - - } - }} - initialValue={''} - theme="duotone-light" - mode="javascript" - lineNumbers={true} - className="query-hinter" - onChange={(value) => {}} - />) - - cy.get('.code-hinter') - .click() - .type('{{') - .contains('{{}}') // autocomplete for dynamic variables -}) - \ No newline at end of file + cy.get('.code-hinter').click().type('{{').contains('{{}}'); // autocomplete for dynamic variables +}); diff --git a/frontend/src/Editor/CodeBuilder/utils.js b/frontend/src/Editor/CodeBuilder/utils.js index 001557141e..2c16334789 100644 --- a/frontend/src/Editor/CodeBuilder/utils.js +++ b/frontend/src/Editor/CodeBuilder/utils.js @@ -6,16 +6,15 @@ export function getSuggestionKeys(currentState) { _.keys(currentState).forEach((key) => { _.keys(currentState[key]).forEach((key2) => { _.keys(currentState[key][key2]).forEach((key3) => { - suggestions.push(`${key}.${key2}.${key3}`) - }) - }) + suggestions.push(`${key}.${key2}.${key3}`); + }); + }); }); return suggestions; } export function generateHints(word, suggestions) { - - if(word === '') { + if (word === '') { return suggestions; } @@ -38,25 +37,25 @@ export function computeCurrentWord(editor, _cursorPosition, ignoreBraces = false export function makeOverlay(style) { return { + // eslint-disable-next-line no-unused-vars token: function (stream, state) { var ch; - if (stream.match("{{")) { + if (stream.match('{{')) { while ((ch = stream.next()) != null) - if (ch == "}" && stream.next() == "}") { - stream.eat("}"); + if (ch == '}' && stream.next() == '}') { + stream.eat('}'); return style; } } - while (stream.next() != null && !stream.match("{{", false)) { } + // eslint-disable-next-line no-empty + while (stream.next() != null && !stream.match('{{', false)) {} return null; - } - } + }, + }; } export function onBeforeChange(editor, change, ignoreBraces = false) { - - if(!ignoreBraces) { - + if (!ignoreBraces) { const cursor = editor.getCursor(); const line = cursor.line; const ch = cursor.ch; @@ -64,33 +63,30 @@ export function onBeforeChange(editor, change, ignoreBraces = false) { const isLastCharacterBrace = value.slice(ch - 1, value.length) === '{'; if (isLastCharacterBrace && change.origin === '+input' && change.text[0] === '{') { - change.text[0] = '{}}' + change.text[0] = '{}}'; // editor.setCursor({ line: 0, ch: ch }) } - } return change; } export function canShowHint(editor, ignoreBraces = false) { - - if(!editor.hasFocus()) return false; + if (!editor.hasFocus()) return false; const cursor = editor.getCursor(); const line = cursor.line; const ch = cursor.ch; const value = editor.getLine(line); - if(ignoreBraces && value.length > 0) return true; + if (ignoreBraces && value.length > 0) return true; return value.slice(ch, ch + 2) === '}}'; } export function handleChange(editor, onChange, suggestions, ignoreBraces = false) { - let state = editor.state.matchHighlighter; - editor.addOverlay(state.overlay = makeOverlay(state.options.style)); + editor.addOverlay((state.overlay = makeOverlay(state.options.style))); const cursor = editor.getCursor(); const currentWord = computeCurrentWord(editor, cursor.ch, ignoreBraces); @@ -103,11 +99,11 @@ export function handleChange(editor, onChange, suggestions, ignoreBraces = false return { from: { line: cursor.line, ch: cursor.ch - currentWord.length }, to: cursor, - list: hints - } - } + list: hints, + }; + }, }; if (canShowHint(editor, ignoreBraces)) { editor.showHint(options); } -}; +} diff --git a/frontend/src/Editor/Components/Button.jsx b/frontend/src/Editor/Components/Button.jsx index 1496faf59e..5ef061188d 100644 --- a/frontend/src/Editor/Components/Button.jsx +++ b/frontend/src/Editor/Components/Button.jsx @@ -1,10 +1,8 @@ import React, { useState, useEffect } from 'react'; import { resolveReferences, resolveWidgetFieldValue } from '@/_helpers/utils'; -var tinycolor = require("tinycolor2"); +var tinycolor = require('tinycolor2'); -export const Button = function Button({ - id, width, height, component, onComponentClick, currentState -}) { +export const Button = function Button({ id, width, height, component, onComponentClick, currentState }) { console.log('currentState', currentState); const [loadingState, setLoadingState] = useState(false); @@ -15,6 +13,7 @@ export const Button = function Button({ const newState = resolveReferences(loadingStateProperty.value, currentState, false); setLoadingState(newState); } + // eslint-disable-next-line react-hooks/exhaustive-deps }, [currentState]); const text = component.definition.properties.text.value; @@ -23,12 +22,15 @@ export const Button = function Button({ const widgetVisibility = component.definition.styles?.visibility?.value ?? true; const disabledState = component.definition.styles?.disabledState?.value ?? false; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; let parsedWidgetVisibility = widgetVisibility; - + try { parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } const computedStyles = { backgroundColor, @@ -36,7 +38,7 @@ export const Button = function Button({ width, height, display: parsedWidgetVisibility ? '' : 'none', - '--tblr-btn-color-darker': tinycolor(backgroundColor).darken(8).toString() + '--tblr-btn-color-darker': tinycolor(backgroundColor).darken(8).toString(), }; return ( @@ -44,7 +46,10 @@ export const Button = function Button({ disabled={parsedDisabledState} className={`jet-button btn btn-primary p-1 ${loadingState === true ? ' btn-loading' : ''}`} style={computedStyles} - onClick={(event) => {event.stopPropagation(); onComponentClick(id, component)}} + onClick={(event) => { + event.stopPropagation(); + onComponentClick(id, component); + }} > {text} diff --git a/frontend/src/Editor/Components/Chart.jsx b/frontend/src/Editor/Components/Chart.jsx index b3d6097804..b0920f3347 100644 --- a/frontend/src/Editor/Components/Chart.jsx +++ b/frontend/src/Editor/Components/Chart.jsx @@ -4,14 +4,9 @@ import { resolveReferences, resolveWidgetFieldValue } from '@/_helpers/utils'; // Use plotly basic bundle import Plotly from 'plotly.js-basic-dist-min'; import createPlotlyComponent from 'react-plotly.js/factory'; -const Plot = createPlotlyComponent(Plotly) - -import Skeleton from 'react-loading-skeleton'; - -export const Chart = function Chart({ - id, width, height, component, onComponentClick, currentState, darkMode -}) { +const Plot = createPlotlyComponent(Plotly); +export const Chart = function Chart({ id, width, height, component, onComponentClick, currentState, darkMode }) { const [loadingState, setLoadingState] = useState(false); const [chartData, setChartData] = useState([]); @@ -19,28 +14,31 @@ export const Chart = function Chart({ const disabledState = component.definition.styles?.disabledState?.value ?? false; let parsedWidgetVisibility = widgetVisibility; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; - + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; + try { parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } useEffect(() => { const loadingStateProperty = component.definition.properties.loadingState; if (loadingStateProperty && currentState) { const newState = resolveReferences(loadingStateProperty.value, currentState, false); - setLoadingState(newState); + setLoadingState(newState); } + // eslint-disable-next-line react-hooks/exhaustive-deps }, [currentState]); const computedStyles = { width, height, display: parsedWidgetVisibility ? '' : 'none', - background: darkMode ? '#1f2936' : 'white' + background: darkMode ? '#1f2936' : 'white', }; - // darkMode ? '#1f2936' : 'white' const dataProperty = component.definition.properties.data; const dataString = dataProperty ? dataProperty.value : []; @@ -66,73 +64,84 @@ export const Chart = function Chart({ title: { text: title, font: { - color: fontColor - } + color: fontColor, + }, }, legend: { text: title, font: { - color: fontColor - } + color: fontColor, + }, }, xaxis: { showgrid: showGridLines, showline: true, - color: fontColor + color: fontColor, }, yaxis: { - showgrid: showGridLines, - showline: true, - color: fontColor - } - } + showgrid: showGridLines, + showline: true, + color: fontColor, + }, + }; const data = resolveReferences(dataString, currentState, []); useEffect(() => { - let rawData = data || []; - if(typeof rawData === 'string') { + if (typeof rawData === 'string') { try { rawData = JSON.parse(dataString); - } catch (err) { rawData = []; } + } catch (err) { + rawData = []; + } } - if(!Array.isArray(rawData)) { rawData = []; } + if (!Array.isArray(rawData)) { + rawData = []; + } let newData = []; - if(chartType === 'pie') { - newData = [{ - type: chartType, - values: rawData.map((item) => item["value"]), - labels: rawData.map((item) => item["label"]), - }]; + if (chartType === 'pie') { + newData = [ + { + type: chartType, + values: rawData.map((item) => item['value']), + labels: rawData.map((item) => item['label']), + }, + ]; } else { - newData = [{ - type: chartType || 'line', - x: rawData.map((item) => item["x"]), - y: rawData.map((item) => item["y"]), - marker: { color: markerColor } - }]; + newData = [ + { + type: chartType || 'line', + x: rawData.map((item) => item['x']), + y: rawData.map((item) => item['y']), + marker: { color: markerColor }, + }, + ]; } setChartData(newData); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [data, chartType]); return (
{event.stopPropagation(); onComponentClick(id, component)}} + onClick={(event) => { + event.stopPropagation(); + onComponentClick(id, component); + }} > - {loadingState === true ? + {loadingState === true ? (
- : + ) : ( - } + )}
); }; diff --git a/frontend/src/Editor/Components/Checkbox.jsx b/frontend/src/Editor/Components/Checkbox.jsx index a06b4e9725..d6f44dc9eb 100644 --- a/frontend/src/Editor/Components/Checkbox.jsx +++ b/frontend/src/Editor/Components/Checkbox.jsx @@ -9,22 +9,24 @@ export const Checkbox = function Checkbox({ onComponentClick, currentState, onComponentOptionChanged, - onEvent + onEvent, }) { - const label = component.definition.properties.label.value; const textColorProperty = component.definition.styles.textColor; const textColor = textColorProperty ? textColorProperty.value : '#000'; const widgetVisibility = component.definition.styles?.visibility?.value ?? true; const disabledState = component.definition.styles?.disabledState?.value ?? false; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; let parsedWidgetVisibility = widgetVisibility; - + try { parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } function toggleValue(e) { const checked = e.target.checked; @@ -37,7 +39,15 @@ export const Checkbox = function Checkbox({ } return ( -
{event.stopPropagation(); onComponentClick(id, component)}}> +
{ + event.stopPropagation(); + onComponentClick(id, component); + }} + >
); diff --git a/frontend/src/Editor/Components/Container.jsx b/frontend/src/Editor/Components/Container.jsx index 849189bd1c..9eb8ae0a1b 100644 --- a/frontend/src/Editor/Components/Container.jsx +++ b/frontend/src/Editor/Components/Container.jsx @@ -10,43 +10,42 @@ export const Container = function Container({ containerProps, width, currentState, - removeComponent + removeComponent, }) { - const backgroundColor = component.definition.styles.backgroundColor.value; const widgetVisibility = component.definition.styles?.visibility?.value ?? true; const disabledState = component.definition.styles?.disabledState?.value ?? false; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; let parsedWidgetVisibility = widgetVisibility; - + try { parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } const computedStyles = { backgroundColor, width, height, - display: parsedWidgetVisibility ? 'flex' : 'none' + display: parsedWidgetVisibility ? 'flex' : 'none', }; const parentRef = useRef(null); return ( -
containerProps.onComponentClick(id, component)} style={computedStyles}> - - +
containerProps.onComponentClick(id, component)} + style={computedStyles} + > + +
); }; diff --git a/frontend/src/Editor/Components/Datepicker.jsx b/frontend/src/Editor/Components/Datepicker.jsx index 4175452ae1..f8073952d8 100644 --- a/frontend/src/Editor/Components/Datepicker.jsx +++ b/frontend/src/Editor/Components/Datepicker.jsx @@ -1,8 +1,7 @@ -import React from 'react'; +import React, { useEffect, useState } from 'react'; import Datetime from 'react-datetime'; import 'react-datetime/css/react-datetime.css'; import { resolveReferences, resolveWidgetFieldValue, validateWidget } from '@/_helpers/utils'; -import { useEffect, useState } from 'react'; export const Datepicker = function Datepicker({ id, @@ -11,7 +10,7 @@ export const Datepicker = function Datepicker({ component, onComponentClick, currentState, - onComponentOptionChanged + onComponentOptionChanged, }) { console.log('currentState', currentState); @@ -22,71 +21,87 @@ export const Datepicker = function Datepicker({ const disabledState = component.definition.styles?.disabledState?.value ?? false; const defaultValue = component.definition.properties?.defaultValue?.value ?? ''; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; let parsedWidgetVisibility = widgetVisibility; try { parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } const enableTime = resolveReferences(enableTimeProp.value, currentState, false); let enableDate = true; if (enableDateProp) { + // eslint-disable-next-line no-unused-vars enableDate = resolveReferences(enableDateProp.value, currentState, true); } - let dateFormat = formatProp + let dateFormat = formatProp; try { dateFormat = resolveReferences(formatProp, currentState); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } function onDateChange(event) { - const value = event._isAMomentObject? event.format(dateFormat.value) : event; + const value = event._isAMomentObject ? event.format(dateFormat.value) : event; setDateText(value); onComponentOptionChanged(component, 'value', value); } let value = defaultValue; - if (value && currentState) - value = resolveReferences(value, currentState, ''); + if (value && currentState) value = resolveReferences(value, currentState, ''); const [dateText, setDateText] = useState(value); useEffect(() => { setDateText(value); onComponentOptionChanged(component, 'value', value); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [value]); const validationData = validateWidget({ validationObject: component.definition.validation, widgetValue: value, - currentState - }) + currentState, + }); const { isValid, validationError } = validationData; const currentValidState = currentState?.components[component?.name]?.isValid; - if(currentValidState !== isValid) { + if (currentValidState !== isValid) { onComponentOptionChanged(component, 'isValid', isValid); } return ( -
{event.stopPropagation(); onComponentClick(id, component)}}> - { + event.stopPropagation(); + onComponentClick(id, component); + }} + > + { - return + return ( + + ); }} />
{validationError}
diff --git a/frontend/src/Editor/Components/DaterangePicker.jsx b/frontend/src/Editor/Components/DaterangePicker.jsx index b4459597bd..ebae9098f7 100644 --- a/frontend/src/Editor/Components/DaterangePicker.jsx +++ b/frontend/src/Editor/Components/DaterangePicker.jsx @@ -12,7 +12,7 @@ export const DaterangePicker = function DaterangePicker({ component, onComponentClick, currentState, - onComponentOptionChanged + onComponentOptionChanged, }) { console.log('currentState', currentState); @@ -21,18 +21,20 @@ export const DaterangePicker = function DaterangePicker({ const formatProp = component.definition.properties.format; const widgetVisibility = component.definition.styles?.visibility?.value ?? true; const disabledState = component.definition.styles?.disabledState?.value ?? false; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; - + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; const [focusedInput, setFocusedInput] = useState(null); const [startDate, setStartDate] = useState(startDateProp ? startDateProp.value : null); const [endDate, setEndDate] = useState(endDateProp ? endDateProp.value : null); let parsedWidgetVisibility = widgetVisibility; - + try { parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } function onDateChange(dates) { const start = dates.startDate; @@ -55,7 +57,14 @@ export const DaterangePicker = function DaterangePicker({ } return ( -
{event.stopPropagation(); onComponentClick(id, component)}}> +
{ + event.stopPropagation(); + onComponentClick(id, component); + }} + > { return { name: parsedDisplayValues[index], value: value }; - }) + }), ]; - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } const currentValueProperty = component.definition.properties.value; const value = currentValueProperty ? currentValueProperty.value : ''; const [currentValue, setCurrentValue] = useState(''); - let newValue = value; if (currentValueProperty && currentState) { @@ -63,14 +71,14 @@ export const DropDown = function DropDown({ const validationData = validateWidget({ validationObject: component.definition.validation, widgetValue: currentValue, - currentState - }) + currentState, + }); const { isValid, validationError } = validationData; const currentValidState = currentState?.components[component?.name]?.isValid; - if(currentValidState !== isValid) { + if (currentValidState !== isValid) { onComponentOptionChanged(component, 'isValid', isValid); } @@ -79,13 +87,23 @@ export const DropDown = function DropDown({ }, [newValue]); useEffect(() => { - onComponentOptionChanged(component, 'value', currentValue).then(() => onEvent('onSelect', { component }) ); + onComponentOptionChanged(component, 'value', currentValue).then(() => onEvent('onSelect', { component })); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [currentValue]); return ( -
{event.stopPropagation(); onComponentClick(id, component)}}> +
{ + event.stopPropagation(); + onComponentClick(id, component); + }} + >
- +
- ); + return
; } return ( -
{event.stopPropagation(); onComponentClick(id, component)}}> - } debounce={500}> +
{ + event.stopPropagation(); + onComponentClick(id, component); + }} + > + } debounce={500}>
diff --git a/frontend/src/Editor/Components/Map/Map.jsx b/frontend/src/Editor/Components/Map/Map.jsx index 9cd3866627..75be5ce4c0 100644 --- a/frontend/src/Editor/Components/Map/Map.jsx +++ b/frontend/src/Editor/Components/Map/Map.jsx @@ -1,8 +1,6 @@ -import React, { useEffect, useState, useCallback } from 'react'; -import { GoogleMap, LoadScript } from '@react-google-maps/api'; -import { Marker } from '@react-google-maps/api'; +import React, { useState, useCallback } from 'react'; +import { GoogleMap, LoadScript, Marker, Autocomplete } from '@react-google-maps/api'; import { resolveReferences, resolveWidgetFieldValue } from '@/_helpers/utils'; -import { Autocomplete } from '@react-google-maps/api'; import { darkModeStyles } from './styles'; export const Map = function Map({ @@ -88,6 +86,7 @@ export const Map = function Map({ ]).then(() => onEvent('onBoundsChange', { component })); } + // eslint-disable-next-line react-hooks/exhaustive-deps const onLoad = useCallback(function onLoad(mapInstance) { setGmap(mapInstance); onComponentOptionsChanged(component, [['center', mapInstance.center?.toJSON()]]); @@ -151,7 +150,7 @@ export const Map = function Map({ {Array.isArray(markers) && ( <> {markers.map((marker, index) => ( - handleMarkerClick(index)} /> + handleMarkerClick(index)} /> ))} )} diff --git a/frontend/src/Editor/Components/Map/styles.js b/frontend/src/Editor/Components/Map/styles.js index 352803840e..0378b259c1 100644 --- a/frontend/src/Editor/Components/Map/styles.js +++ b/frontend/src/Editor/Components/Map/styles.js @@ -1,137 +1,137 @@ export const darkModeStyles = [ - { - "featureType": "all", - "elementType": "labels.text.fill", - "stylers": [ - { - "color": "#ffffff" - } - ] - }, - { - "featureType": "all", - "elementType": "labels.text.stroke", - "stylers": [ - { - "color": "#000000" - }, - { - "lightness": 13 - } - ] - }, - { - "featureType": "administrative", - "elementType": "geometry.fill", - "stylers": [ - { - "color": "#000000" - } - ] - }, - { - "featureType": "administrative", - "elementType": "geometry.stroke", - "stylers": [ - { - "color": "#144b53" - }, - { - "lightness": 14 - }, - { - "weight": 1.4 - } - ] - }, - { - "featureType": "landscape", - "elementType": "all", - "stylers": [ - { - "color": "#08304b" - } - ] - }, - { - "featureType": "poi", - "elementType": "geometry", - "stylers": [ - { - "color": "#0c4152" - }, - { - "lightness": 5 - } - ] - }, - { - "featureType": "road.highway", - "elementType": "geometry.fill", - "stylers": [ - { - "color": "#000000" - } - ] - }, - { - "featureType": "road.highway", - "elementType": "geometry.stroke", - "stylers": [ - { - "color": "#0b434f" - }, - { - "lightness": 25 - } - ] - }, - { - "featureType": "road.arterial", - "elementType": "geometry.fill", - "stylers": [ - { - "color": "#000000" - } - ] - }, - { - "featureType": "road.arterial", - "elementType": "geometry.stroke", - "stylers": [ - { - "color": "#0b3d51" - }, - { - "lightness": 16 - } - ] - }, - { - "featureType": "road.local", - "elementType": "geometry", - "stylers": [ - { - "color": "#000000" - } - ] - }, - { - "featureType": "transit", - "elementType": "all", - "stylers": [ - { - "color": "#146474" - } - ] - }, - { - "featureType": "water", - "elementType": "all", - "stylers": [ - { - "color": "#021019" - } - ] - } - ]; + { + featureType: 'all', + elementType: 'labels.text.fill', + stylers: [ + { + color: '#ffffff', + }, + ], + }, + { + featureType: 'all', + elementType: 'labels.text.stroke', + stylers: [ + { + color: '#000000', + }, + { + lightness: 13, + }, + ], + }, + { + featureType: 'administrative', + elementType: 'geometry.fill', + stylers: [ + { + color: '#000000', + }, + ], + }, + { + featureType: 'administrative', + elementType: 'geometry.stroke', + stylers: [ + { + color: '#144b53', + }, + { + lightness: 14, + }, + { + weight: 1.4, + }, + ], + }, + { + featureType: 'landscape', + elementType: 'all', + stylers: [ + { + color: '#08304b', + }, + ], + }, + { + featureType: 'poi', + elementType: 'geometry', + stylers: [ + { + color: '#0c4152', + }, + { + lightness: 5, + }, + ], + }, + { + featureType: 'road.highway', + elementType: 'geometry.fill', + stylers: [ + { + color: '#000000', + }, + ], + }, + { + featureType: 'road.highway', + elementType: 'geometry.stroke', + stylers: [ + { + color: '#0b434f', + }, + { + lightness: 25, + }, + ], + }, + { + featureType: 'road.arterial', + elementType: 'geometry.fill', + stylers: [ + { + color: '#000000', + }, + ], + }, + { + featureType: 'road.arterial', + elementType: 'geometry.stroke', + stylers: [ + { + color: '#0b3d51', + }, + { + lightness: 16, + }, + ], + }, + { + featureType: 'road.local', + elementType: 'geometry', + stylers: [ + { + color: '#000000', + }, + ], + }, + { + featureType: 'transit', + elementType: 'all', + stylers: [ + { + color: '#146474', + }, + ], + }, + { + featureType: 'water', + elementType: 'all', + stylers: [ + { + color: '#021019', + }, + ], + }, +]; diff --git a/frontend/src/Editor/Components/Modal.jsx b/frontend/src/Editor/Components/Modal.jsx index b0cc403fcc..bca2245599 100644 --- a/frontend/src/Editor/Components/Modal.jsx +++ b/frontend/src/Editor/Components/Modal.jsx @@ -4,16 +4,9 @@ import Button from 'react-bootstrap/Button'; import { SubCustomDragLayer } from '../SubCustomDragLayer'; import { SubContainer } from '../SubContainer'; import { ConfigHandle } from '../ConfigHandle'; -import { resolveWidgetFieldValue, resolveReferences } from '../../_helpers/utils'; +import { resolveWidgetFieldValue } from '../../_helpers/utils'; -export const Modal = function Modal({ - id, - component, - height, - mode, - containerProps, - currentState -}) { +export const Modal = function Modal({ id, component, height, containerProps, currentState, darkMode }) { const [show, showModal] = useState(false); const parentRef = useRef(null); @@ -25,12 +18,14 @@ export const Modal = function Modal({ const disabledState = component.definition.styles?.disabledState?.value ?? false; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; useEffect(() => { const componentState = containerProps.currentState.components[component.name]; const canShowModel = componentState ? componentState.show : false; showModal(canShowModel); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [containerProps.currentState.components[component.name]]); function hideModal() { @@ -51,36 +46,26 @@ export const Modal = function Modal({ animation={false} onEscapeKeyDown={() => showModal(false)} > - {containerProps.mode === 'edit' && - - } + {containerProps.mode === 'edit' && ( + + )} - - {title} - + {title}
-
- - + +
diff --git a/frontend/src/Editor/Components/Multiselect.jsx b/frontend/src/Editor/Components/Multiselect.jsx index 3cfdc3550e..d2ca129e07 100644 --- a/frontend/src/Editor/Components/Multiselect.jsx +++ b/frontend/src/Editor/Components/Multiselect.jsx @@ -9,7 +9,7 @@ export const Multiselect = function Multiselect({ component, onComponentClick, currentState, - onComponentOptionChanged + onComponentOptionChanged, }) { console.log('currentState', currentState); @@ -19,7 +19,8 @@ export const Multiselect = function Multiselect({ const widgetVisibility = component.definition.styles?.visibility?.value ?? true; const disabledState = component.definition.styles?.disabledState?.value ?? false; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; const parsedValues = JSON.parse(values); const parsedDisplayValues = JSON.parse(displayValues); @@ -27,7 +28,7 @@ export const Multiselect = function Multiselect({ const selectOptions = [ ...parsedValues.map((value, index) => { return { name: parsedDisplayValues[index], value: value }; - }) + }), ]; const currentValueProperty = component.definition.properties.values; @@ -40,19 +41,30 @@ export const Multiselect = function Multiselect({ } let parsedWidgetVisibility = widgetVisibility; - + try { parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } useEffect(() => { setCurrentValue(newValue); }, [newValue]); return ( -
{event.stopPropagation(); onComponentClick(id, component)}}> +
{ + event.stopPropagation(); + onComponentClick(id, component); + }} + >
- +
{ setNumber(parseInt(newNumber)); onComponentOptionChanged(component, 'value', parseInt(newNumber)); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [newNumber]); const placeholder = component.definition.properties.placeholder.value; const widgetVisibility = component.definition.styles?.visibility?.value ?? true; const disabledState = component.definition.styles?.disabledState?.value ?? false; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; let parsedWidgetVisibility = widgetVisibility; - + try { parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } return ( {event.stopPropagation(); onComponentClick(id, component)}} + onClick={(event) => { + event.stopPropagation(); + onComponentClick(id, component); + }} onChange={(e) => { setNumber(parseInt(e.target.value)); onComponentOptionChanged(component, 'value', parseInt(e.target.value)); @@ -48,7 +54,7 @@ export const NumberInput = function NumberInput({ type="number" className="form-control" placeholder={placeholder} - style={{ width, height, display:parsedWidgetVisibility ? '' : 'none' }} + style={{ width, height, display: parsedWidgetVisibility ? '' : 'none' }} value={number} /> ); diff --git a/frontend/src/Editor/Components/QrScanner/ErrorModal.jsx b/frontend/src/Editor/Components/QrScanner/ErrorModal.jsx index 890f4e2648..409ae536ab 100644 --- a/frontend/src/Editor/Components/QrScanner/ErrorModal.jsx +++ b/frontend/src/Editor/Components/QrScanner/ErrorModal.jsx @@ -1,34 +1,41 @@ -import React, { useState } from 'react'; +import React from 'react'; export default function ErrorModal() { - - const [show, setShow] = React.useState(true) + const [show, setShow] = React.useState(true); const close = () => { - setShow(false) - } - - return( + setShow(false); + }; + + return (
- { - show ? -
-
-
-
QR Scanner is not working
- -
-
- Please make sure a camera is available on your device. Try closing your browser and opening it again, if it doesn't work, please contact support. -
-
- -
+ {show ? ( +
+
+
+
QR Scanner is not working
+ +
+
+ Please make sure a camera is available on your device. Try closing your browser and opening it again, if + it doesn't work, please contact support. +
+
+
- : - '' - } +
+ ) : ( + '' + )}
); -}; +} diff --git a/frontend/src/Editor/Components/QrScanner/QrScanner.jsx b/frontend/src/Editor/Components/QrScanner/QrScanner.jsx index b4b4fbfcad..85a1fb925e 100644 --- a/frontend/src/Editor/Components/QrScanner/QrScanner.jsx +++ b/frontend/src/Editor/Components/QrScanner/QrScanner.jsx @@ -3,10 +3,7 @@ import QrReader from 'react-qr-reader'; import ErrorModal from './ErrorModal'; import { resolveReferences, resolveWidgetFieldValue } from '@/_helpers/utils'; -export const QrScanner = function QrScanner({ - component, onEvent, onComponentOptionChanged, currentState -}) { - +export const QrScanner = function QrScanner({ component, onEvent, onComponentOptionChanged, currentState }) { const handleError = async (errorMessage) => { console.log(errorMessage); setErrorOccured(true); @@ -16,7 +13,7 @@ export const QrScanner = function QrScanner({ if (data != null) { onEvent('onDetect', { component, data: data }); onComponentOptionChanged(component, 'lastDetectedValue', data); - }; + } }; let [errorOccured, setErrorOccured] = useState(false); @@ -24,25 +21,20 @@ export const QrScanner = function QrScanner({ const widgetVisibility = component.definition.styles?.visibility?.value ?? true; const disabledState = component.definition.styles?.disabledState?.value ?? false; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; let parsedWidgetVisibility = widgetVisibility; - + try { parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } return ( -
- { - errorOccured ? - - : - - } +
+ {errorOccured ? : }
); }; diff --git a/frontend/src/Editor/Components/RadioButton.jsx b/frontend/src/Editor/Components/RadioButton.jsx index c50084425c..fe1ffac741 100644 --- a/frontend/src/Editor/Components/RadioButton.jsx +++ b/frontend/src/Editor/Components/RadioButton.jsx @@ -1,7 +1,6 @@ -import React from 'react'; +import React, { useEffect } from 'react'; import { resolveReferences, resolveWidgetFieldValue } from '@/_helpers/utils'; - export const RadioButton = function RadioButton({ id, width, @@ -10,9 +9,8 @@ export const RadioButton = function RadioButton({ onComponentClick, currentState, onComponentOptionChanged, - onEvent + onEvent, }) { - const label = component.definition.properties.label.value; const textColorProperty = component.definition.styles.textColor; const textColor = textColorProperty ? textColorProperty.value : '#000'; @@ -23,25 +21,34 @@ export const RadioButton = function RadioButton({ const widgetVisibility = component.definition.styles?.visibility?.value ?? true; const disabledState = component.definition.styles?.disabledState?.value ?? false; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; let parsedValues = values; try { parsedValues = resolveReferences(values, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } let parsedDisplayValues = displayValues; try { parsedDisplayValues = resolveReferences(displayValues, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } let parsedDefaultValue = defaultValue; try { parsedDefaultValue = resolveReferences(defaultValue, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } + + const value = currentState?.components[component?.name]?.value ?? parsedDefaultValue; let selectOptions = []; @@ -49,33 +56,59 @@ export const RadioButton = function RadioButton({ selectOptions = [ ...parsedValues.map((value, index) => { return { name: parsedDisplayValues[index], value: value }; - }) + }), ]; - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } let parsedWidgetVisibility = widgetVisibility; - + try { parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } - - function onSelect(event) { - const selection = event.target.value + function onSelect(selection) { onComponentOptionChanged(component, 'value', selection); if (selection) { onEvent('onSelectionChange', { component }); - } + } } + useEffect(() => { + onComponentOptionChanged(component, 'value', parsedDefaultValue); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [parsedDefaultValue]); + return ( -
{event.stopPropagation(); onComponentClick(id, component)}}> - {label} -
onSelect(e)}> +
{ + event.stopPropagation(); + onComponentClick(id, component); + }} + > + + {label} + +
{selectOptions.map((option, index) => ( -
diff --git a/frontend/src/Editor/Components/RichTextEditor.jsx b/frontend/src/Editor/Components/RichTextEditor.jsx index 4977a82ef1..8193fef0ad 100644 --- a/frontend/src/Editor/Components/RichTextEditor.jsx +++ b/frontend/src/Editor/Components/RichTextEditor.jsx @@ -1,6 +1,5 @@ import React from 'react'; -import { Editor, EditorState } from "draft-js"; -import "draft-js/dist/Draft.css"; +import 'draft-js/dist/Draft.css'; import { DraftEditor } from './DraftEditor'; import { resolveReferences, resolveWidgetFieldValue } from '@/_helpers/utils'; @@ -11,33 +10,37 @@ export const RichTextEditor = function RichTextEditor({ component, onComponentClick, currentState, - onComponentOptionChanged + onComponentOptionChanged, }) { - const placeholder = component.definition.properties.placeholder.value; const widgetVisibility = component.definition.styles?.visibility?.value ?? true; const disabledState = component.definition.styles?.disabledState?.value ?? false; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; let parsedWidgetVisibility = widgetVisibility; - + try { parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } function handleChange(html) { onComponentOptionChanged(component, 'value', html); } return ( -
{event.stopPropagation(); onComponentClick(id, component)}}> - +
{ + event.stopPropagation(); + onComponentClick(id, component); + }} + > +
); }; diff --git a/frontend/src/Editor/Components/StarRating/icons/half-star.js b/frontend/src/Editor/Components/StarRating/icons/half-star.js index dcb73d6209..9e2818aa8d 100644 --- a/frontend/src/Editor/Components/StarRating/icons/half-star.js +++ b/frontend/src/Editor/Components/StarRating/icons/half-star.js @@ -1,47 +1,44 @@ -import React from 'react' +import React from 'react'; -export default ({ fill = '#ffb400'}) => { +export default ({ fill = '#ffb400' }) => { return ( - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + l39.232,79.493c5.686,11.522,16.676,19.508,29.391,21.354l106.192,15.431L412.235,348.222z" + /> + + + + + + + + + + + + + + + - ) -} + ); +}; diff --git a/frontend/src/Editor/Components/StarRating/icons/star-outline.js b/frontend/src/Editor/Components/StarRating/icons/star-outline.js index 1d6843a0f7..39bba4eccd 100644 --- a/frontend/src/Editor/Components/StarRating/icons/star-outline.js +++ b/frontend/src/Editor/Components/StarRating/icons/star-outline.js @@ -1,44 +1,41 @@ -import React from 'react' +import React from 'react'; -export default ({ fill = '#ffb400'}) => { +export default ({ fill = '#ffb400' }) => { return ( - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + l52,105c3.1,5.2,8.3,9.4,14.6,10.4l116.2,16.6L342.663,288.078z" + /> + + + + + + + + + + + + + + + - ) -} + ); +}; diff --git a/frontend/src/Editor/Components/StarRating/icons/star.js b/frontend/src/Editor/Components/StarRating/icons/star.js index 3f9ec8b224..c076506ca6 100644 --- a/frontend/src/Editor/Components/StarRating/icons/star.js +++ b/frontend/src/Editor/Components/StarRating/icons/star.js @@ -1,44 +1,41 @@ -import React from 'react' +import React from 'react'; -export default ({ fill = '#ffb400'}) => { +export default ({ fill = '#ffb400' }) => { return ( - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + l13.091-12.761C55.838,22.336,55.936,21.939,55.818,21.578z" + /> + + + + + + + + + + + + + + + - ) -} \ No newline at end of file + ); +}; diff --git a/frontend/src/Editor/Components/StarRating/index.js b/frontend/src/Editor/Components/StarRating/index.js index d637270f98..fe16b5d3a5 100644 --- a/frontend/src/Editor/Components/StarRating/index.js +++ b/frontend/src/Editor/Components/StarRating/index.js @@ -20,16 +20,21 @@ export const StarRating = function StarRating({ const allowHalfStar = component.definition.properties.allowHalfStar.value ?? false; const textColorProperty = component.definition.styles.textColor; const color = textColorProperty ? textColorProperty.value : '#ffb400'; + const labelColorProperty = component.definition.styles.labelColor; + const labelColor = labelColorProperty ? labelColorProperty.value : '#333'; const widgetVisibility = component.definition.styles?.visibility?.value ?? true; const disabledState = component.definition.styles?.disabledState?.value ?? false; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; let parsedWidgetVisibility = widgetVisibility; - + try { parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } const tooltips = component.definition.properties.tooltips.value ?? []; const _tooltips = resolveReferences(tooltips, currentState, []) ?? []; @@ -54,12 +59,14 @@ export const StarRating = function StarRating({ React.useEffect(() => { setRatingIndex(defaultSelected - 1); onComponentOptionChanged(component, 'value', defaultSelected); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [defaultSelected]); React.useEffect(() => { setTimeout(() => { onComponentOptionChanged(component, 'value', defaultSelected); - }, 1000) + }, 1000); + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); function handleClick(idx) { @@ -84,9 +91,17 @@ export const StarRating = function StarRating({ }; return ( -
{event.stopPropagation(); onComponentClick(id, component)}} style={{display:parsedWidgetVisibility ? '' : 'none'}}> +
{ + event.stopPropagation(); + onComponentClick(id, component); + }} + style={{ display: parsedWidgetVisibility ? '' : 'none' }} + > {/* TODO: Add label color defination property instead of hardcoded color*/} - + {label} {animatedStars.map((props, index) => ( diff --git a/frontend/src/Editor/Components/StarRating/star.js b/frontend/src/Editor/Components/StarRating/star.js index 77c92d7160..d07fd17b98 100644 --- a/frontend/src/Editor/Components/StarRating/star.js +++ b/frontend/src/Editor/Components/StarRating/star.js @@ -37,6 +37,7 @@ const Star = ({ React.useEffect(() => { setIcon(isHalfStar ? halfStar : star); setOutlineIcon(isHalfStar ? halfStar : starOutline); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [color]); const ref = React.useRef(null); diff --git a/frontend/src/Editor/Components/Table/CustomSelect.jsx b/frontend/src/Editor/Components/Table/CustomSelect.jsx index 5825b9b3b3..752ccfd8d4 100644 --- a/frontend/src/Editor/Components/Table/CustomSelect.jsx +++ b/frontend/src/Editor/Components/Table/CustomSelect.jsx @@ -1,26 +1,29 @@ import React from 'react'; import SelectSearch from 'react-select-search'; -export const CustomSelect = ({ options, value, multiple, disabled, onChange }) => { - - function renderValue(valueProps) { - if(valueProps) { - return valueProps.value.split(', ').map((value) => {value}); - } +export const CustomSelect = ({ options, value, multiple, onChange }) => { + function renderValue(valueProps) { + if (valueProps) { + return valueProps.value.split(', ').map((value, index) => ( + + {value} + + )); } + } - return ( -
- -
- ); -}; \ No newline at end of file + return ( +
+ +
+ ); +}; diff --git a/frontend/src/Editor/Components/Table/Datepicker.jsx b/frontend/src/Editor/Components/Table/Datepicker.jsx index 6f6dd80da8..84c2903bf6 100644 --- a/frontend/src/Editor/Components/Table/Datepicker.jsx +++ b/frontend/src/Editor/Components/Table/Datepicker.jsx @@ -1,81 +1,51 @@ import React from 'react'; import Datetime from 'react-datetime'; +import moment from 'moment'; + import 'react-datetime/css/react-datetime.css'; import '@/_styles/custom.scss'; -import moment from 'moment' -export const Datepicker = function Datepicker({value, onChange, readOnly, isTimeChecked, dateFormat}) { - - const [date, setDate] = React.useState(value) +export const Datepicker = function Datepicker({ value, onChange, readOnly, isTimeChecked, dateFormat }) { + const [date, setDate] = React.useState(value); - const dateChange = (e) => { - if(isTimeChecked) { - setDate(e.format(`${dateFormat} LT`)) - } else { - setDate(e.format(dateFormat)) - } + const dateChange = (e) => { + if (isTimeChecked) { + setDate(e.format(`${dateFormat} LT`)); + } else { + setDate(e.format(dateFormat)); + } + }; + + React.useEffect(() => { + if (!isTimeChecked) { + setDate(moment(value, 'DD-MM-YYYY').format(dateFormat)); } - React.useEffect(() => { - const _date = isTimeChecked ? moment(value, `${dateFormat} LT`) : moment(value, dateFormat) - - if(!isTimeChecked) { - setDate(moment(value, 'DD-MM-YYYY').format(dateFormat)) - } - - if(isTimeChecked) { - setDate(moment(value, 'DD-MM-YYYY LT' ).format(`${dateFormat} LT`)) - } - - },[isTimeChecked, readOnly, dateFormat]) - - - let inputProps = { - disabled: !readOnly, - }; - - const [isDatepickerOpen, setIsDatepickerOpen] = React.useState(false) - - const onDatepickerClose = () => { - onChange(date) - setIsDatepickerOpen((prev) => !prev) + if (isTimeChecked) { + setDate(moment(value, 'DD-MM-YYYY LT').format(`${dateFormat} LT`)); } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [isTimeChecked, readOnly, dateFormat]); - React.useEffect(() => { - const myElement = document.querySelector('.cell-type-datepicker') + let inputProps = { + disabled: !readOnly, + }; - myElement.parentNode.style.position = 'absolute' - myElement.style.position = 'relative' - myElement.style.marginTop = '2px' - myElement.style.left = '50%' - myElement.style.width = '250px' - myElement.style.transform = 'translate(-50%, -25%)' - - - return () => { - myElement.parentNode.style.position = '' - myElement.style.position = '' - myElement.style.marginTop = '' - myElement.style.left = '' - myElement.style.width = '' - myElement.style.transform = '' - } - - },[isDatepickerOpen]) - - return ( - <> - - - ) + const onDatepickerClose = () => { + onChange(date); + }; + return ( + <> + + + ); }; - diff --git a/frontend/src/Editor/Components/Table/GlobalFilter.jsx b/frontend/src/Editor/Components/Table/GlobalFilter.jsx new file mode 100644 index 0000000000..015779b110 --- /dev/null +++ b/frontend/src/Editor/Components/Table/GlobalFilter.jsx @@ -0,0 +1,53 @@ +import React from 'react'; +// Table Search +export const GlobalFilter = ({ + preGlobalFilteredRows, + globalFilter, + useAsyncDebounce, + setGlobalFilter, + onComponentOptionChanged, + component, + serverSideSearch, + onEvent, +}) => { + const count = preGlobalFilteredRows.length; + const [value, setValue] = React.useState(globalFilter); + const onChange = useAsyncDebounce((filterValue) => { + setGlobalFilter(filterValue || undefined); + }, 200); + + const handleSearchTextChange = (text) => { + setValue(text); + onChange(text); + + onComponentOptionChanged(component, 'searchText', text).then(() => { + if (serverSideSearch === true) { + onEvent('onSearch', { component, data: {} }); + } + }); + }; + + return ( +
+ Search:{' '} + { + handleSearchTextChange(e.target.value); + }} + onKeyDown={(e) => { + if (e.key === 'Enter') { + handleSearchTextChange(e.target.value); + } + }} + onChange={(e) => onChange(e.target.value)} + placeholder={`${count} records`} + style={{ + border: '0', + }} + /> +
+ ); +}; diff --git a/frontend/src/Editor/Components/Table/Pagination.jsx b/frontend/src/Editor/Components/Table/Pagination.jsx index 60091289dc..bc701d116a 100644 --- a/frontend/src/Editor/Components/Table/Pagination.jsx +++ b/frontend/src/Editor/Components/Table/Pagination.jsx @@ -7,7 +7,7 @@ export const Pagination = function Pagination({ autoCanNextPage, autoPageCount, autoPageOptions, - lastActivePageIndex + lastActivePageIndex, }) { const [pageIndex, setPageIndex] = useState(lastActivePageIndex ?? 1); const [pageCount, setPageCount] = useState(autoPageCount); @@ -17,13 +17,12 @@ export const Pagination = function Pagination({ }, [autoPageCount]); useEffect(() => { - - if(serverSide && lastActivePageIndex > 0) { - setPageCount(lastActivePageIndex) - } else if(serverSide || lastActivePageIndex === 0) { - setPageIndex(1) + if (serverSide && lastActivePageIndex > 0) { + setPageCount(lastActivePageIndex); + } else if (serverSide || lastActivePageIndex === 0) { + setPageIndex(1); } - }, [serverSide, lastActivePageIndex ]) + }, [serverSide, lastActivePageIndex]); function gotoPage(page) { setPageIndex(page); @@ -42,48 +41,35 @@ export const Pagination = function Pagination({ } return ( -
- {!serverSide - && - } - {' '} - - - {serverSide && - - {pageIndex} - - } - {!serverSide && - - {pageIndex} of {autoPageOptions.length} - - } - - {' '} - - {!serverSide - && - } -
+
+ {!serverSide && ( + + )} + {' '} + + {serverSide && {pageIndex}} + {!serverSide && ( + + {pageIndex} of {autoPageOptions.length} + + )} + + {' '} + {!serverSide && ( + + )} +
); }; diff --git a/frontend/src/Editor/Components/Table/Radio.jsx b/frontend/src/Editor/Components/Table/Radio.jsx index 7786e7600d..747c54ff92 100644 --- a/frontend/src/Editor/Components/Table/Radio.jsx +++ b/frontend/src/Editor/Components/Table/Radio.jsx @@ -1,20 +1,30 @@ -import React, { useState } from 'react'; +import React from 'react'; export const Radio = ({ options, value, onChange, readOnly }) => { - value = value === undefined ? [] : value; options = Array.isArray(options) ? options : []; return (
- {options.map((option) => -
); -}; \ No newline at end of file +}; diff --git a/frontend/src/Editor/Components/Table/Table.jsx b/frontend/src/Editor/Components/Table/Table.jsx index 0ff84693ee..92156c9917 100644 --- a/frontend/src/Editor/Components/Table/Table.jsx +++ b/frontend/src/Editor/Components/Table/Table.jsx @@ -1,4 +1,6 @@ -import React, { useMemo, useState, useEffect } from 'react'; +/* eslint-disable no-unused-vars */ +/* eslint-disable react-hooks/exhaustive-deps */ +import React, { useMemo, useState, useEffect, useCallback } from 'react'; import { useTable, useFilters, @@ -7,8 +9,10 @@ import { useAsyncDebounce, usePagination, useBlockLayout, - useResizeColumns + useResizeColumns, + useRowSelect, } from 'react-table'; +import cx from 'classnames'; import { resolveReferences, resolveWidgetFieldValue, validateWidget } from '@/_helpers/utils'; import SelectSearch, { fuzzySearch } from 'react-select-search'; import { useExportData } from 'react-table-plugins'; @@ -17,11 +21,10 @@ import { Pagination } from './Pagination'; import { CustomSelect } from './CustomSelect'; import { Tags } from './Tags'; import { Radio } from './Radio'; -import { Toggle } from './Toggle' +import { Toggle } from './Toggle'; import { Datepicker } from './Datepicker'; - +import { GlobalFilter } from './GlobalFilter'; var _ = require('lodash'); - export function Table({ id, width, @@ -34,7 +37,7 @@ export function Table({ changeCanDrag, onComponentOptionChanged, onComponentOptionsChanged, - darkMode + darkMode, }) { const color = component.definition.styles.textColor.value; const actions = component.definition.properties.actions || { value: [] }; @@ -56,8 +59,15 @@ export function Table({ const showBulkUpdateActionsProperty = component.definition.properties.showBulkUpdateActions?.value; const showBulkUpdateActions = resolveWidgetFieldValue(showBulkUpdateActionsProperty, currentState) ?? true; // default is true for backward compatibility + const showBulkSelectorProperty = component.definition.properties.showBulkSelector?.value; + const showBulkSelector = resolveWidgetFieldValue(showBulkSelectorProperty, currentState) ?? false; // default is false for backward compatibility + + const highlightSelectedRowProperty = component.definition.properties.highlightSelectedRow?.value; + const highlightSelectedRow = resolveWidgetFieldValue(highlightSelectedRowProperty, currentState) ?? false; // default is false for backward compatibility + const clientSidePaginationProperty = component.definition.properties.clientSidePagination?.value; - const clientSidePagination = resolveWidgetFieldValue(clientSidePaginationProperty, currentState) ?? !serverSidePagination; // default is true for backward compatibility + const clientSidePagination = + resolveWidgetFieldValue(clientSidePaginationProperty, currentState) ?? !serverSidePagination; // default is true for backward compatibility const tableTypeProperty = component.definition.styles.tableType; let tableType = tableTypeProperty ? tableTypeProperty.value : 'table-bordered'; @@ -66,12 +76,15 @@ export function Table({ const widgetVisibility = component.definition.styles?.visibility?.value ?? true; const disabledState = component.definition.styles?.disabledState?.value ?? false; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; let parsedWidgetVisibility = widgetVisibility; - + try { parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } const [loadingState, setLoadingState] = useState(false); @@ -111,7 +124,7 @@ export function Table({ const newFilters = filters; newFilters[index].value = { ...newFilters[index].value, - operation: value + operation: value, }; setFilters(newFilters); setAllFilters(newFilters.filter((filter) => filter.id !== '')); @@ -121,7 +134,7 @@ export function Table({ const newFilters = filters; newFilters[index].value = { ...newFilters[index].value, - value: value + value: value, }; setFilters(newFilters); setAllFilters(newFilters.filter((filter) => filter.id !== '')); @@ -146,7 +159,7 @@ export function Table({ const defaultColumn = React.useMemo( () => ({ minWidth: 60, - width: 268 + width: 268, }), [] ); @@ -163,26 +176,24 @@ export function Table({ let newChangeset = { ...changeSet, [index]: { - ...obj - } + ...obj, + }, }; obj = _.set(rowData, key, value); let newDataUpdates = { - ...dataUpdates, - [index]: { ...obj } + ...dataUpdates, + [index]: { ...obj }, }; onComponentOptionsChanged(component, [ ['dataUpdates', newDataUpdates], - ['changeSet', newChangeset] + ['changeSet', newChangeset], ]); } - function getExportFileBlob({ - columns, data - }) { + function getExportFileBlob({ columns, data }) { const headerNames = columns.map((col) => col.exportValue); const csvString = Papa.unparse({ fields: headerNames, data }); return new Blob([csvString], { type: 'text/csv' }); @@ -190,14 +201,14 @@ export function Table({ function onPageIndexChanged(page) { onComponentOptionChanged(component, 'pageIndex', page).then(() => { - onEvent('onPageChanged', { component, data: {} }); + onEvent('onPageChanged', { component, data: {} }); }); } function handleChangesSaved() { Object.keys(changeSet).forEach((key) => { tableData[key] = { - ..._.merge(tableData[key], changeSet[key]) + ..._.merge(tableData[key], changeSet[key]), }; }); @@ -217,7 +228,9 @@ export function Table({ } if (filterValue.operation === 'matches') { - return rows.filter((row) => row.values[columnIds[0]].toString().toLowerCase().includes(filterValue.value.toLowerCase())); + return rows.filter((row) => + row.values[columnIds[0]].toString().toLowerCase().includes(filterValue.value.toLowerCase()) + ); } if (filterValue.operation === 'gt') { @@ -255,12 +268,26 @@ export function Table({ const changeSet = componentState ? componentState.changeSet : {}; + const computeFontColor = useCallback(() => { + if (color !== undefined) { + return color; + } else { + return darkMode ? '#ffffff' : '#000000'; + } + }, [color, darkMode]); + const columnData = component.definition.properties.columns.value.map((column) => { const columnSize = columnSizes[column.id] || columnSizes[column.name]; const columnType = column.columnType; const columnOptions = {}; - if (columnType === 'dropdown' || columnType === 'multiselect' || columnType === 'badge' || columnType === 'badges' || columnType === 'radio') { + if ( + columnType === 'dropdown' || + columnType === 'multiselect' || + columnType === 'badge' || + columnType === 'badges' || + columnType === 'radio' + ) { const values = resolveReferences(column.values, currentState) || []; const labels = resolveReferences(column.labels, currentState, []) || []; @@ -271,8 +298,8 @@ export function Table({ } } if (columnType === 'datepicker') { - column.isTimeChecked = column.isTimeChecked ? column.isTimeChecked : false - column.dateFormat = column.dateFormat ? column.dateFormat : 'DD/MM/YYYY' + column.isTimeChecked = column.isTimeChecked ? column.isTimeChecked : false; + column.dateFormat = column.dateFormat ? column.dateFormat : 'DD/MM/YYYY'; } const width = columnSize || defaultColumn.width; @@ -284,204 +311,227 @@ export function Table({ filter: customFilter, width: width, columnOptions, - + columnType, + isEditable: column.isEditable, Cell: function (cell) { const rowChangeSet = changeSet ? changeSet[cell.row.index] : null; const cellValue = rowChangeSet ? rowChangeSet[column.name] || cell.value : cell.value; - if (columnType === 'string' || columnType === undefined || columnType === 'default') { - - const textColor = resolveReferences(column.textColor, currentState, { cellValue }); + switch (columnType) { + case 'string': + case undefined: + case 'default': { + const textColor = resolveReferences(column.textColor, currentState, { cellValue }); - const cellStyles = { - color: textColor === undefined ? darkMode === true ? '#fff' : 'black' : textColor + const cellStyles = { + color: textColor ?? '', + }; + + if (column.isEditable) { + const validationData = validateWidget({ + validationObject: { + regex: { + value: column.regex, + }, + minLength: { + value: column.minLength, + }, + maxLength: { + value: column.maxLength, + }, + customRule: { + value: column.customRule, + }, + }, + widgetValue: cellValue, + currentState, + customResolveObjects: { cellValue }, + }); + + const { isValid, validationError } = validationData; + const cellStyles = { + color: textColor ?? '', + }; + + return ( +
+ { + if (e.key === 'Enter') { + if (e.target.defaultValue !== e.target.value) { + handleCellValueChange( + cell.row.index, + column.key || column.name, + e.target.value, + cell.row.original + ); + } + } + }} + onBlur={(e) => { + if (e.target.defaultValue !== e.target.value) { + handleCellValueChange( + cell.row.index, + column.key || column.name, + e.target.value, + cell.row.original + ); + } + }} + className={`form-control-plaintext form-control-plaintext-sm ${!isValid ? 'is-invalid' : ''}`} + defaultValue={cellValue} + /> +
{validationError}
+
+ ); + } + return {cellValue}; } - - if (column.isEditable) { + case 'text': { + return ( + + ); + } + case 'dropdown': { const validationData = validateWidget({ validationObject: { regex: { - value: column.regex + value: column.regex, }, minLength: { - value: column.minLength + value: column.minLength, }, maxLength: { - value: column.maxLength + value: column.maxLength, }, customRule: { - value: column.customRule - } + value: column.customRule, + }, }, widgetValue: cellValue, currentState, - customResolveObjects: { cellValue } - }) - + customResolveObjects: { cellValue }, + }); + const { isValid, validationError } = validationData; return (
- { - if (e.key === 'Enter') { - if(e.target.defaultValue !== e.target.value) { - handleCellValueChange(cell.row.index, column.key || column.name, e.target.value, cell.row.original); - } - } + { + handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original); }} - onBlur={(e) => { - if(e.target.defaultValue !== e.target.value) { - handleCellValueChange(cell.row.index, column.key || column.name, e.target.value, cell.row.original); - } - }} - className={`form-control-plaintext form-control-plaintext-sm ${!isValid ? 'is-invalid' : ''}`} - defaultValue={cellValue} + filterOptions={fuzzySearch} + placeholder="Select.." /> -
{validationError}
+
{validationError}
); } - return {cellValue}; - } if (columnType === 'text') { - return ; - } if (columnType === 'dropdown') { - - const validationData = validateWidget({ - validationObject: { - customRule: { - value: column.customRule - } - }, - widgetValue: cellValue, - currentState, - customResolveObjects: { cellValue } - }) - - const { isValid, validationError } = validationData; - - return ( -
- { - handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original); - }} - filterOptions={fuzzySearch} - placeholder="Select.." - /> -
{validationError}
-
- ); - } if (columnType === 'multiselect') { - return ( -
- { - handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original); - }} - /> -
- ); - } if (columnType === 'badge') { - return ( -
- { - handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original); - }} - /> -
- ); - } if (columnType === 'badges') { - return ( -
- { - handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original); - }} - /> -
- ); - } if (columnType === 'tags') { - return ( -
- { - handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original); - }} - /> -
- ); - } if (columnType === 'radio') { - return ( -
- { - handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original); - }} + case 'multiselect': { + return ( +
+ { + handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original); + }} /> -
- ); - } if (columnType === 'toggle') { - return ( -
- { - handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original); - }} - /> -
- ); - } if (columnType === 'datepicker') { - return ( -
- { - handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original); - }} - /> -
- ); +
+ ); + } + case 'badge': + case 'badges': { + return ( +
+ { + handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original); + }} + /> +
+ ); + } + case 'tags': { + return ( +
+ { + handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original); + }} + /> +
+ ); + } + case 'radio': { + return ( +
+ { + handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original); + }} + /> +
+ ); + } + case 'toggle': { + return ( +
+ { + handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original); + }} + /> +
+ ); + } + case 'datepicker': { + return ( +
+ { + handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original); + }} + /> +
+ ); + } } return cellValue || ''; - } + }, }; }); @@ -494,80 +544,117 @@ export function Table({ tableData = tableData || []; - const leftActions = () => actions.value.filter(action => action.position === 'left') - const rightActions = () => actions.value.filter(action => [undefined, 'right'].includes(action.position)) + const leftActions = () => actions.value.filter((action) => action.position === 'left'); + const rightActions = () => actions.value.filter((action) => [undefined, 'right'].includes(action.position)); - const leftActionsCellData = leftActions().length > 0 - ? [ - { - id: 'leftActions', - Header: 'Actions', - accessor: 'edit', - width: columnSizes.leftActions || defaultColumn.width, - Cell: (cell) => { - return leftActions().map((action) => ( + const leftActionsCellData = + leftActions().length > 0 + ? [ + { + id: 'leftActions', + Header: 'Actions', + accessor: 'edit', + width: columnSizes.leftActions || defaultColumn.width, + Cell: (cell) => { + return leftActions().map((action) => ( - )); - } - } - ] - : []; + )); + }, + }, + ] + : []; - const rightActionsCellData = rightActions().length > 0 - ? [ - { - id: 'rightActions', - Header: 'Actions', - accessor: 'edit', - width: columnSizes.rightActions || defaultColumn.width, - Cell: (cell) => { - return rightActions().map((action) => ( + const rightActionsCellData = + rightActions().length > 0 + ? [ + { + id: 'rightActions', + Header: 'Actions', + accessor: 'edit', + width: columnSizes.rightActions || defaultColumn.width, + Cell: (cell) => { + return rightActions().map((action) => ( - )); - } - } - ] - : []; + )); + }, + }, + ] + : []; + const IndeterminateCheckbox = React.forwardRef(({ indeterminate, ...rest }, ref) => { + const defaultRef = React.useRef(); + const resolvedRef = ref || defaultRef; - const optionsData = columnData.map(column => column.columnOptions?.selectOptions); + React.useEffect(() => { + resolvedRef.current.indeterminate = indeterminate; + }, [resolvedRef, indeterminate]); + + return ( + <> + + + ); + }); + + const optionsData = columnData.map((column) => column.columnOptions?.selectOptions); const columns = useMemo( () => [...leftActionsCellData, ...columnData, ...rightActionsCellData], - [JSON.stringify(columnData), + [ + JSON.stringify(columnData), leftActionsCellData.length, rightActionsCellData.length, componentState.changeSet, JSON.stringify(optionsData), - JSON.stringify(component.definition.properties.columns) + JSON.stringify(component.definition.properties.columns), + showBulkSelector, ] // Hack: need to fix ); const data = useMemo(() => tableData, [tableData.length, componentState.changeSet]); const computedStyles = { - color, - width: `${width}px` + width: `${width}px`, }; const { @@ -590,16 +677,18 @@ export function Table({ preGlobalFilteredRows, setGlobalFilter, state: { pageIndex, pageSize }, - exportData + exportData, + selectedFlatRows, } = useTable( { + autoResetPage: false, columns, data, defaultColumn, - initialState: { pageIndex: 0, pageSize: -1}, - pageCount: -1, - manualPagination: false, - getExportFileBlob + initialState: { pageIndex: 0, pageSize: -1 }, + pageCount: -1, + manualPagination: false, + getExportFileBlob, }, useFilters, useGlobalFilter, @@ -607,108 +696,100 @@ export function Table({ usePagination, useBlockLayout, useResizeColumns, - useExportData + useExportData, + useRowSelect, + (hooks) => { + showBulkSelector && + hooks.visibleColumns.push((columns) => [ + { + id: 'selection', + Header: ({ getToggleAllPageRowsSelectedProps }) => ( +
+ +
+ ), + Cell: ({ row }) => ( +
+ +
+ ), + width: 1, + columnType: 'selector', + }, + ...columns, + ]); + } ); - + useEffect(() => { + const selectedRowsOriginalData = selectedFlatRows.map((row) => row.original); + onComponentOptionChanged(component, 'selectedRows', selectedRowsOriginalData); + }, [selectedFlatRows.length]); React.useEffect(() => { - if(serverSidePagination || !clientSidePagination) { - setPageSize(-1) - } - if(!serverSidePagination && clientSidePagination) { - setPageSize(10) + if (serverSidePagination || !clientSidePagination) { + setPageSize(rows?.length || 10); } - - },[clientSidePagination, serverSidePagination]) + if (!serverSidePagination && clientSidePagination) { + setPageSize(10); + } + }, [clientSidePagination, serverSidePagination]); useEffect(() => { - const pageData = page.map(row => row.original); - const currentData = rows.map(row => row.original);; + const pageData = page.map((row) => row.original); + const currentData = rows.map((row) => row.original); onComponentOptionsChanged(component, [ ['currentPageData', pageData], - ['currentData', currentData] + ['currentData', currentData], ]); }, [tableData.length, componentState.changeSet]); - useEffect(() => { if (!state.columnResizing.isResizingColumn) { changeCanDrag(true); - paramUpdated(id, 'columnSizes', { ...columnSizes, ...state.columnResizing.columnWidths}); + paramUpdated(id, 'columnSizes', { ...columnSizes, ...state.columnResizing.columnWidths }); } else { changeCanDrag(false); } }, [state.columnResizing.isResizingColumn]); - function GlobalFilter() { - const count = preGlobalFilteredRows.length; - const [value, setValue] = React.useState(state.globalFilter); - const onChange = useAsyncDebounce((filterValue) => { - setGlobalFilter(filterValue || undefined); - }, 200); - - const handleSearchTextChange = (text) => { - - setValue(text); - onChange(text); - - onComponentOptionChanged(component, 'searchText', text).then(() => { - if(serverSideSearch === true ) { - onEvent('onSearch', { component, data: {} }); - } - }); - } - - return ( -
- Search:{' '} - { - handleSearchTextChange(e.target.value) - }} - onKeyDown={(e) => { - if(e.key === 'Enter') { - handleSearchTextChange(e.target.value) - } - } - - } - placeholder={`${count} records`} - style={{ - border: '0' - }} - /> -
- ); - } - return (
{event.stopPropagation(); onComponentClick(id, component)}} + style={{ width: `${width}px`, height: `${height}px`, display: parsedWidgetVisibility ? '' : 'none' }} + onClick={(event) => { + event.stopPropagation(); + onComponentClick(id, component); + }} > {/* Show top bar unless search box is disabled and server pagination is enabled */} - {displaySearchBox && + {displaySearchBox && (
- {displaySearchBox &&
- -
} +
+ +
- } + )}
- {headerGroups.map((headerGroup) => ( - - {headerGroup.headers.map((column) => ( + {headerGroups.map((headerGroup, index) => ( + + {headerGroup.headers.map((column, index) => ( - {!loadingState && page.length === 0 && -
no data
- } + {!loadingState && page.length === 0 && ( +
+
no data
+
+ )} {!loadingState && ( - + {console.log('page', page)} - {page.map((row) => { + {page.map((row, index) => { prepareRow(row); return ( { e.stopPropagation(); - onEvent('onRowClicked', { component, data: row.original }); + onEvent('onRowClicked', { component, data: row.original, rowId: row.id }); }} > - {row.cells.map((cell) => { + {row.cells.map((cell, index) => { let cellProps = cell.getCellProps(); if (componentState.changeSet) { if (componentState.changeSet[cell.row.index]) { + const currentColumn = columnData.find((column) => column.id === cell.column.id); - const currentColumn = columnData.find(column => column.id === cell.column.id); - - if (_.get(componentState.changeSet[cell.row.index], currentColumn?.accessor, undefined) !== undefined) { + if ( + _.get(componentState.changeSet[cell.row.index], currentColumn?.accessor, undefined) !== + undefined + ) { console.log('componentState.changeSet', componentState.changeSet); cellProps.style.backgroundColor = '#ffffde'; + cellProps.style['--tblr-table-accent-bg'] = '#ffffde'; } } } - return ; + + return ( + // Does not require key as its already being passed by react-table via cellProps + // eslint-disable-next-line react/jsx-key + + ); })} ); @@ -771,30 +877,35 @@ export function Table({ )} - {(clientSidePagination || serverSidePagination || Object.keys(componentState.changeSet || {}).length > 0 || showFilterButton || showDownloadButton) && + {(clientSidePagination || + serverSidePagination || + Object.keys(componentState.changeSet || {}).length > 0 || + showFilterButton || + showDownloadButton) && (
- {(clientSidePagination || serverSidePagination) && + {(clientSidePagination || serverSidePagination) && ( - } + )}
- {(showBulkUpdateActions && Object.keys(componentState.changeSet || {}).length > 0) && ( + {showBulkUpdateActions && Object.keys(componentState.changeSet || {}).length > 0 && (
- } + )} {isFiltersVisible && (
@@ -868,7 +979,7 @@ export function Table({ { name: 'greater than', value: 'gt' }, { name: 'less than', value: 'lt' }, { name: 'greater than or equals', value: 'gte' }, - { name: 'less than or equals', value: 'lte' } + { name: 'less than or equals', value: 'lte' }, ]} value={filter.value.operation} search={true} diff --git a/frontend/src/Editor/Components/Table/Tags.jsx b/frontend/src/Editor/Components/Table/Tags.jsx index ff99ca723b..50cd5dcb65 100644 --- a/frontend/src/Editor/Components/Table/Tags.jsx +++ b/frontend/src/Editor/Components/Table/Tags.jsx @@ -1,62 +1,69 @@ import React, { useState } from 'react'; -export const Tags = ({ value, onChange }) => { +export const Tags = ({ value, onChange, readOnly }) => { + const isValid = Array.isArray(value); + if (!isValid) console.warn('[Tags]: value provided is not an array'); + value = isValid ? value : []; - value = value || []; + const [showForm, setShowForm] = useState(false); - const [ showForm, setShowForm ] = useState(false); - - function addTag(text) { - if(text !== '') { - value.push(text); - onChange(value); - } else { - setShowForm(false); - } + function addTag(text) { + if (text !== '') { + value.push(text); + onChange(value); + } else { + setShowForm(false); } + } - function removeTag(text) { - const newValue = value.filter(tag => tag !== text); - onChange(newValue); - setShowForm(false); - } + function removeTag(text) { + const newValue = value.filter((tag) => tag !== text); + onChange(newValue); + setShowForm(false); + } - function handleFormKeyDown(e) { - if(e.key === 'Enter') { - addTag(e.target.value) - } - } - - function renderTag(text) { - return - {text} - removeTag(text)}> - x - - ; + function handleFormKeyDown(e) { + if (e.key === 'Enter') { + addTag(e.target.value); } + } + function renderTag(text) { return ( -
- {value.map((item) => { - return renderTag(item) - })} - - {!showForm && - setShowForm(true)}>{'+'} - } - - {showForm && - - addTag(e.target.value)} - onKeyDown={handleFormKeyDown} - /> - - } -
+ + {text} + {!readOnly && ( + removeTag(text)}> + x + + )} + ); -}; \ No newline at end of file + } + + return ( +
+ {value.map((item) => { + return renderTag(item); + })} + + {!showForm && !readOnly && ( + setShowForm(true)}> + {'+'} + + )} + + {showForm && ( + + addTag(e.target.value)} + onKeyDown={handleFormKeyDown} + /> + + )} +
+ ); +}; diff --git a/frontend/src/Editor/Components/Table/Toggle.jsx b/frontend/src/Editor/Components/Table/Toggle.jsx index 0c02eb5fef..68b743b4ef 100644 --- a/frontend/src/Editor/Components/Table/Toggle.jsx +++ b/frontend/src/Editor/Components/Table/Toggle.jsx @@ -1,24 +1,26 @@ import React, { useState } from 'react'; -export const Toggle = ({readOnly, value, onChange, activeColor, options }) => { - const [on, setOn] = useState(() => value) +export const Toggle = ({ readOnly, value, onChange, activeColor }) => { + const [on, setOn] = useState(() => value); const toggle = () => { - setOn((prev) => !prev) - onChange(!on) - } + setOn((prev) => !prev); + onChange(!on); + }; return (
- +
); -}; \ No newline at end of file +}; diff --git a/frontend/src/Editor/Components/Text.jsx b/frontend/src/Editor/Components/Text.jsx index 9167d671a0..33031a0ffd 100644 --- a/frontend/src/Editor/Components/Text.jsx +++ b/frontend/src/Editor/Components/Text.jsx @@ -1,17 +1,15 @@ import React, { useState, useEffect } from 'react'; import { resolveReferences, resolveWidgetFieldValue } from '@/_helpers/utils'; import DOMPurify from 'dompurify'; -import Skeleton from 'react-loading-skeleton'; -export const Text = function Text({ - id, width, height, component, onComponentClick, currentState -}) { +export const Text = function Text({ id, width, height, component, onComponentClick, currentState }) { const text = component.definition.properties.text.value; const color = component.definition.styles.textColor.value; const widgetVisibility = component.definition.styles?.visibility?.value ?? true; const disabledState = component.definition.styles?.disabledState?.value ?? false; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; const [loadingState, setLoadingState] = useState(false); @@ -21,6 +19,7 @@ export const Text = function Text({ const newState = resolveReferences(loadingStateProperty.value, currentState, false); setLoadingState(newState); } + // eslint-disable-next-line react-hooks/exhaustive-deps }, [currentState]); let data = text; @@ -37,21 +36,31 @@ export const Text = function Text({ } let parsedWidgetVisibility = widgetVisibility; - + try { parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } const computedStyles = { color, width, height, display: parsedWidgetVisibility ? 'flex' : 'none', - alignItems: 'center' + alignItems: 'center', }; return ( -
{event.stopPropagation(); onComponentClick(id, component)}}> +
{ + event.stopPropagation(); + onComponentClick(id, component); + }} + > {!loadingState &&
} {loadingState === true && (
diff --git a/frontend/src/Editor/Components/TextArea.jsx b/frontend/src/Editor/Components/TextArea.jsx index d418bb1f26..2d9acd1023 100644 --- a/frontend/src/Editor/Components/TextArea.jsx +++ b/frontend/src/Editor/Components/TextArea.jsx @@ -8,9 +8,8 @@ export const TextArea = function TextArea({ component, onComponentClick, currentState, - onComponentOptionChanged + onComponentOptionChanged, }) { - const value = component.definition.properties.value ? component.definition.properties.value.value : ''; const [text, setText] = useState(value); @@ -23,24 +22,31 @@ export const TextArea = function TextArea({ useEffect(() => { setText(newText); onComponentOptionChanged(component, 'value', newText); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [newText]); - + const placeholder = component.definition.properties.placeholder.value; const widgetVisibility = component.definition.styles?.visibility?.value ?? true; const disabledState = component.definition.styles?.disabledState?.value ?? false; - const parsedDisabledState = typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; + const parsedDisabledState = + typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; let parsedWidgetVisibility = widgetVisibility; - + try { parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { console.log(err); } + } catch (err) { + console.log(err); + } return ( ); diff --git a/frontend/src/Editor/Components/TextInput.jsx b/frontend/src/Editor/Components/TextInput.jsx index 9341645ee8..3632d78184 100644 --- a/frontend/src/Editor/Components/TextInput.jsx +++ b/frontend/src/Editor/Components/TextInput.jsx @@ -32,6 +32,7 @@ export const TextInput = function TextInput({ useEffect(() => { setText(newText); onComponentOptionChanged(component, 'value', newText); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [newText]); const validationData = validateWidget({ diff --git a/frontend/src/Editor/Components/Toggle.jsx b/frontend/src/Editor/Components/Toggle.jsx index 4845d9db1d..dff117127e 100644 --- a/frontend/src/Editor/Components/Toggle.jsx +++ b/frontend/src/Editor/Components/Toggle.jsx @@ -3,10 +3,12 @@ import { resolveReferences, resolveWidgetFieldValue } from '@/_helpers/utils'; class Switch extends React.Component { render() { - const { on, onClick, onChange, disabledState } = this.props; + const { on, onClick, onChange, disabledState, color } = this.props; + return ( -
@@ -724,38 +805,63 @@ export function Table({ ))}
{cell.render('Cell')} +
{cell.render('Cell')}
+
- } + )} - {componentMeta.component === 'Chart' && + {componentMeta.component === 'Chart' && ( - } - - {!['Table', 'Chart'].includes(componentMeta.component) && -
- {Object.keys(componentMeta.properties).map((property) => renderElement(component, componentMeta, paramUpdated, dataQueries, property, 'properties', currentState, components, darkMode))} - - {Object.keys(componentMeta.styles).length > 0 &&
Style
} - {Object.keys(componentMeta.styles).map((style) => renderElement(component, componentMeta, paramUpdated, dataQueries, style, 'styles', currentState, components))} + )} - {Object.keys(componentMeta.events).length > 0 && + {!['Table', 'Chart'].includes(componentMeta.component) && ( +
+ {Object.keys(componentMeta.properties).map((property) => + renderElement( + component, + componentMeta, + paramUpdated, + dataQueries, + property, + 'properties', + currentState, + components, + darkMode + ) + )} + + {Object.keys(componentMeta.styles).length > 0 &&
Style
} + {Object.keys(componentMeta.styles).map((style) => + renderElement( + component, + componentMeta, + paramUpdated, + dataQueries, + style, + 'styles', + currentState, + components + ) + )} + + {Object.keys(componentMeta.events).length > 0 && (
{Object.keys(componentMeta.events).length > 0 &&
Events
} @@ -246,33 +266,64 @@ export const Inspector = ({ components={components} eventsChanged={eventsChanged} apps={apps} + darkMode={darkMode} />
- } + )} - {Object.keys(componentMeta.validation || {}).length > 0 && + {Object.keys(componentMeta.validation || {}).length > 0 && (
Validation
- {Object.keys(componentMeta.validation).map((property) => renderElement(component, componentMeta, paramUpdated, dataQueries, property, 'validation', currentState, components, darkMode))} + {Object.keys(componentMeta.validation).map((property) => + renderElement( + component, + componentMeta, + paramUpdated, + dataQueries, + property, + 'validation', + currentState, + components, + darkMode + ) + )}
- } - - + )}
- } + )} {/* Show on desktop & show on mobile params */}
Layout
- {renderElement(component, componentMeta, layoutPropertyChanged, dataQueries, 'showOnDesktop', 'others', currentState, components)} - {renderElement(component, componentMeta, layoutPropertyChanged, dataQueries, 'showOnMobile', 'others', currentState, components)} + {renderElement( + component, + componentMeta, + layoutPropertyChanged, + dataQueries, + 'showOnDesktop', + 'others', + currentState, + components + )} + {renderElement( + component, + componentMeta, + layoutPropertyChanged, + dataQueries, + 'showOnMobile', + 'others', + currentState, + components + )}
diff --git a/frontend/src/Editor/Inspector/QuerySelector.jsx b/frontend/src/Editor/Inspector/QuerySelector.jsx index e70fecc46a..61853acc5f 100644 --- a/frontend/src/Editor/Inspector/QuerySelector.jsx +++ b/frontend/src/Editor/Inspector/QuerySelector.jsx @@ -1,19 +1,8 @@ import React, { useState } from 'react'; import SelectSearch, { fuzzySearch } from 'react-select-search'; -import Collapse from 'react-bootstrap/Collapse' - -export const QuerySelector = ({ - param, - definition, - eventUpdated, - eventOptionUpdated, - dataQueries, - extraData, - eventMeta, - currentState, - components -}) => { +import Collapse from 'react-bootstrap/Collapse'; +export const QuerySelector = ({ param, definition, eventOptionUpdated, dataQueries, extraData, eventMeta }) => { const [open, setOpen] = useState(false); function onChange(value) { @@ -34,9 +23,7 @@ export const QuerySelector = ({
{ - setText(100) - onZoomChanged(1) - setOpen(false) + setText(100); + onZoomChanged(1); + setOpen(false); }} > - + { - setText(90) - onZoomChanged(0.9) - setOpen(false) + setText(90); + onZoomChanged(0.9); + setOpen(false); }} > - + { - setText(80) - onZoomChanged(0.8) - setOpen(false) + setText(80); + onZoomChanged(0.8); + setOpen(false); }} > - + { - setText(70) - onZoomChanged(0.7) - setOpen(false) + setText(70); + onZoomChanged(0.7); + setOpen(false); }} > - + { - setText(60) - onZoomChanged(0.6) - setOpen(false) + setText(60); + onZoomChanged(0.6); + setOpen(false); }} > - +
- 100% - 100%
- 90% - 90%
- 80% - 80%
- 70% - 70%
- 60% - 60%
@@ -79,5 +74,5 @@ export const LeftSidebarZoom = ({ onZoomChanged }) => {
- ) -} + ); +}; diff --git a/frontend/src/Editor/ManageAppUsers.jsx b/frontend/src/Editor/ManageAppUsers.jsx index a4831f5f87..2c7308835b 100644 --- a/frontend/src/Editor/ManageAppUsers.jsx +++ b/frontend/src/Editor/ManageAppUsers.jsx @@ -6,7 +6,6 @@ import { toast } from 'react-toastify'; import { CopyToClipboard } from 'react-copy-to-clipboard'; import 'react-toastify/dist/ReactToastify.css'; import Skeleton from 'react-loading-skeleton'; -import SelectSearch, { fuzzySearch } from 'react-select-search'; import { debounce } from 'lodash'; class ManageAppUsers extends React.Component { @@ -21,7 +20,7 @@ class ManageAppUsers extends React.Component { isSlugVerificationInProgress: false, addingUser: false, organizationUsers: [], - newUser: {} + newUser: {}, }; } @@ -30,29 +29,33 @@ class ManageAppUsers extends React.Component { this.fetchAppUsers(); - organizationService.getUsers(null).then((data) => this.setState({ - organizationUsers: data.users - })); + organizationService.getUsers(null).then((data) => + this.setState({ + organizationUsers: data.users, + }) + ); this.setState({ appId }); } fetchAppUsers = () => { - appService.getAppUsers(this.props.app.id).then((data) => this.setState({ - users: data.users, - isLoading: false - })); + appService.getAppUsers(this.props.app.id).then((data) => + this.setState({ + users: data.users, + isLoading: false, + }) + ); }; hideModal = () => { this.setState({ - showModal: false + showModal: false, }); }; addUser = () => { this.setState({ - addingUser: true + addingUser: true, }); const { organizationUserId, role } = this.state.newUser; @@ -73,87 +76,79 @@ class ManageAppUsers extends React.Component { toggleAppVisibility = () => { const newState = !this.state.app.is_public; this.setState({ - ischangingVisibility: true + ischangingVisibility: true, }); - appService.setVisibility(this.state.app.id, newState).then(data => { + // eslint-disable-next-line no-unused-vars + appService.setVisibility(this.state.app.id, newState).then((data) => { this.setState({ ischangingVisibility: false, app: { ...this.state.app, - is_public: newState - } + is_public: newState, + }, }); if (newState) { toast.success('Application is now public.', { hideProgressBar: true, - position: 'top-center' + position: 'top-center', }); } else { toast.success('Application visibility set to private', { hideProgressBar: true, - position: 'top-center' + position: 'top-center', }); } }); - } + }; - handleSetSlug = (event) => { - const newSlug = event.target.value || this.props.app.id; - this.setState({ isSlugVerificationInProgress: true }); + handleSetSlug = (event) => { + const newSlug = event.target.value || this.props.app.id; + this.setState({ isSlugVerificationInProgress: true }); - appService - .setSlug(this.state.app.id, newSlug) - .then(() => { - this.setState({ - slugError: null, - isSlugVerificationInProgress: false - }); - this.props.handleSlugChange(newSlug); - }) - .catch(({ error }) => { - this.setState({ - slugError: error, - isSlugVerificationInProgress: false - }); + appService + .setSlug(this.state.app.id, newSlug) + .then(() => { + this.setState({ + slugError: null, + isSlugVerificationInProgress: false, }); - } + this.props.handleSlugChange(newSlug); + }) + .catch(({ error }) => { + this.setState({ + slugError: error, + isSlugVerificationInProgress: false, + }); + }); + }; - delayedSlugChange = debounce(e => { - this.handleSetSlug(e); - }, 500); + delayedSlugChange = debounce((e) => { + this.handleSetSlug(e); + }, 500); - render() { - const { - addingUser, - isLoading, - users, - organizationUsers, - newUser, - app, - slugError, - isSlugVerificationInProgress - } = this.state; - const appId = app.id; - const appLink = `${window.location.origin}/applications/`; - const shareableLink = appLink + (this.props.slug || appId); - const slugButtonClass = isSlugVerificationInProgress? '' : slugError !== null ? 'is-invalid' : 'is-valid'; + render() { + const { isLoading, app, slugError, isSlugVerificationInProgress } = this.state; + const appId = app.id; + const appLink = `${window.location.origin}/applications/`; + const shareableLink = appLink + (this.props.slug || appId); + const slugButtonClass = isSlugVerificationInProgress ? '' : slugError !== null ? 'is-invalid' : 'is-valid'; - return ( + return (
- @@ -192,24 +187,30 @@ class ManageAppUsers extends React.Component {
{appLink}
- { e.persist(); this.delayedSlugChange(e); }} - defaultValue={this.props.slug} /> - { isSlugVerificationInProgress && ( + { + e.persist(); + this.delayedSlugChange(e); + }} + defaultValue={this.props.slug} + /> + {isSlugVerificationInProgress && (
- )} + )}
toast.success('Link copied to clipboard', { - hideProgressBar: true, - position: 'bottom-center' - }) + onCopy={() => + toast.success('Link copied to clipboard', { + hideProgressBar: true, + position: 'bottom-center', + }) } > @@ -302,8 +303,8 @@ class ManageAppUsers extends React.Component {
- ); - } + ); + } } export { ManageAppUsers }; diff --git a/frontend/src/Editor/QueryManager/QueryEditors/Airtable.jsx b/frontend/src/Editor/QueryManager/QueryEditors/Airtable.jsx index 343714bc7d..752a67d3cf 100644 --- a/frontend/src/Editor/QueryManager/QueryEditors/Airtable.jsx +++ b/frontend/src/Editor/QueryManager/QueryEditors/Airtable.jsx @@ -9,13 +9,13 @@ class Airtable extends React.Component { super(props); this.state = { - options: this.props.options + options: this.props.options, }; } componentDidMount() { this.setState({ - options: this.props.options + options: this.props.options, }); } @@ -24,8 +24,8 @@ class Airtable extends React.Component { { options: { ...this.state.options, - operation - } + operation, + }, }, () => { this.props.optionsChanged(this.state.options); @@ -228,4 +228,4 @@ class Airtable extends React.Component { } } -export { Airtable }; \ No newline at end of file +export { Airtable }; diff --git a/frontend/src/Editor/QueryManager/QueryEditors/Dynamodb.jsx b/frontend/src/Editor/QueryManager/QueryEditors/Dynamodb.jsx index cf70f77f56..493d8a8a0d 100644 --- a/frontend/src/Editor/QueryManager/QueryEditors/Dynamodb.jsx +++ b/frontend/src/Editor/QueryManager/QueryEditors/Dynamodb.jsx @@ -9,13 +9,13 @@ class Dynamodb extends React.Component { super(props); this.state = { - options: this.props.options + options: this.props.options, }; } componentDidMount() { this.setState({ - options: this.props.options + options: this.props.options, }); } @@ -24,8 +24,8 @@ class Dynamodb extends React.Component { { options: { ...this.state.options, - operation - } + operation, + }, }, () => { this.props.optionsChanged(this.state.options); @@ -48,7 +48,7 @@ class Dynamodb extends React.Component { { value: 'get_item', name: 'Get Item' }, { value: 'query_table', name: 'Query Table' }, { value: 'scan_table', name: 'Scan Table' }, - { value: 'delete_item', name: 'Delete Item' } + { value: 'delete_item', name: 'Delete Item' }, ]} value={this.state.options.operation} search={true} @@ -60,13 +60,17 @@ class Dynamodb extends React.Component { />
- {(['query_table'].includes(this.state.options.operation)) && ( + {['query_table'].includes(this.state.options.operation) && (
)} - {(['scan_table'].includes(this.state.options.operation)) && ( + {['scan_table'].includes(this.state.options.operation) && (
)} - {(['get_item', 'delete_item'].includes(this.state.options.operation)) && ( + {['get_item', 'delete_item'].includes(this.state.options.operation) && (
@@ -110,7 +118,11 @@ class Dynamodb extends React.Component { { this.props.optionsChanged(this.state.options); @@ -46,9 +45,9 @@ class Elasticsearch extends React.Component { changeOption(this, 'index', value)} /> -
diff --git a/frontend/src/Editor/QueryManager/QueryEditors/Firestore.jsx b/frontend/src/Editor/QueryManager/QueryEditors/Firestore.jsx index e85d680d52..71d5224419 100644 --- a/frontend/src/Editor/QueryManager/QueryEditors/Firestore.jsx +++ b/frontend/src/Editor/QueryManager/QueryEditors/Firestore.jsx @@ -9,13 +9,13 @@ class Firestore extends React.Component { super(props); this.state = { - options: this.props.options + options: this.props.options, }; } componentDidMount() { this.setState({ - options: this.props.options + options: this.props.options, }); } @@ -24,8 +24,8 @@ class Firestore extends React.Component { { options: { ...this.state.options, - [option]: JSON.parse(value) - } + [option]: JSON.parse(value), + }, }, () => { this.props.optionsChanged(this.state.options); @@ -38,8 +38,8 @@ class Firestore extends React.Component { { options: { ...this.state.options, - operation - } + operation, + }, }, () => { this.props.optionsChanged(this.state.options); @@ -60,11 +60,11 @@ class Firestore extends React.Component { options={[ { value: 'get_document', name: 'Get Document' }, { value: 'query_collection', name: 'Query collection' }, - { value: 'add_document', name: 'Add Document to Collection'}, + { value: 'add_document', name: 'Add Document to Collection' }, { value: 'update_document', name: 'Update Document' }, { value: 'set_document', name: 'Set Document' }, { value: 'bulk_update', name: 'Bulk update using document id' }, - { value: 'delete_document', name: 'Delete Document'}, + { value: 'delete_document', name: 'Delete Document' }, ]} value={this.state.options.operation} search={true} @@ -75,45 +75,52 @@ class Firestore extends React.Component { placeholder="Select.." />
- {(this.state.options.operation === 'get_document' || this.state.options.operation === 'delete_document') && ( -
-
- - changeOption(this, 'path', value)} - /> + {(this.state.options.operation === 'get_document' || + this.state.options.operation === 'delete_document') && ( +
+
+ + changeOption(this, 'path', value)} + /> +
-
- )} - {(this.state.options.operation === 'set_document' - || this.state.options.operation === 'update_document' || this.state.options.operation === 'add_document') && ( -
-
- - changeOption(this, 'path', value)} - /> + )} + {(this.state.options.operation === 'set_document' || + this.state.options.operation === 'update_document' || + this.state.options.operation === 'add_document') && ( +
+
+ + changeOption(this, 'path', value)} + /> +
+
+ + changeOption(this, 'body', value)} + /> +
-
- - changeOption(this, 'body', value)} - /> -
-
- )} + )} {this.state.options.operation === 'bulk_update' && (
@@ -146,7 +153,7 @@ class Firestore extends React.Component { theme: this.props.darkMode ? 'monokai' : 'default', mode: 'javascript', lineWrapping: true, - scrollbarStyle: null + scrollbarStyle: null, }} />
@@ -166,13 +173,31 @@ class Firestore extends React.Component {
- changeOption(this, 'order', value)} - /> +
+
+ changeOption(this, 'order_field', value)} + /> +
+
+ { + changeOption(this, 'order_type', value); + }} + filterOptions={fuzzySearch} + /> +
+
@@ -202,12 +227,13 @@ class Firestore extends React.Component { options={[ { value: '==', name: '==' }, { value: '<', name: '<' }, - { value: '>', name: '>'}, + { value: '>', name: '>' }, { value: '<=', name: '<=' }, { value: '>=', name: '>=' }, { value: 'array-contains', name: 'array-contains' }, - { value: 'in', name: 'in'}, - { value: 'array-contains-any', name: 'array-contains-any'}, + { value: 'in', name: 'in' }, + { value: 'array-contains-any', name: 'array-contains-any' }, + { value: '', name: 'None' }, ]} value={this.state.options.where_operation} search={true} diff --git a/frontend/src/Editor/QueryManager/QueryEditors/Googlesheets.jsx b/frontend/src/Editor/QueryManager/QueryEditors/Googlesheets.jsx index a95fbd3d34..cbdd6ebd31 100644 --- a/frontend/src/Editor/QueryManager/QueryEditors/Googlesheets.jsx +++ b/frontend/src/Editor/QueryManager/QueryEditors/Googlesheets.jsx @@ -9,13 +9,13 @@ class Googlesheets extends React.Component { super(props); this.state = { - options: this.props.options + options: this.props.options, }; } componentDidMount() { this.setState({ - options: this.props.options + options: this.props.options, }); } @@ -24,8 +24,8 @@ class Googlesheets extends React.Component { { options: { ...this.state.options, - [option]: JSON.parse(value) - } + [option]: JSON.parse(value), + }, }, () => { this.props.optionsChanged(this.state.options); @@ -38,8 +38,8 @@ class Googlesheets extends React.Component { { options: { ...this.state.options, - operation - } + operation, + }, }, () => { this.props.optionsChanged(this.state.options); @@ -86,6 +86,20 @@ class Googlesheets extends React.Component { className="form-control" />
+ {['read'].includes(this.state.options.operation) && ( +
+ + { + changeOption(this, 'spreadsheet_range', e.target.value); + }} + className="form-control" + /> +
+ )}
)} - {this.state.options.operation === 'append' && ( + {this.state.options.operation === 'append' && (
changeOption(this, 'rows', value)} + currentState={this.props.currentState} + initialValue={options.rows} + theme={this.props.darkMode ? 'monokai' : 'duotone-light'} + lineNumbers={true} + className="query-hinter" + onChange={(value) => changeOption(this, 'rows', value)} />
- )} + )} - {this.state.options.operation === 'delete_row' && ( -
-
-
- - { - changeOption(this, 'row_index', e.target.value); - }} - className="form-control" - /> + {this.state.options.operation === 'delete_row' && ( +
+
+
+ + { + changeOption(this, 'row_index', e.target.value); + }} + className="form-control" + /> +
-
- )} + )} - {this.state.options.operation === 'info' && ( + {this.state.options.operation === 'info' && (
- )} + )}
); } diff --git a/frontend/src/Editor/QueryManager/QueryEditors/Graphql.jsx b/frontend/src/Editor/QueryManager/QueryEditors/Graphql.jsx index 97b628023f..897d75350d 100644 --- a/frontend/src/Editor/QueryManager/QueryEditors/Graphql.jsx +++ b/frontend/src/Editor/QueryManager/QueryEditors/Graphql.jsx @@ -11,7 +11,7 @@ class Graphql extends React.Component { componentDidMount() { this.setState({ - options: this.props.options + options: this.props.options, }); } diff --git a/frontend/src/Editor/QueryManager/QueryEditors/Mongodb.jsx b/frontend/src/Editor/QueryManager/QueryEditors/Mongodb.jsx index 66527267a5..0b6597cd7a 100644 --- a/frontend/src/Editor/QueryManager/QueryEditors/Mongodb.jsx +++ b/frontend/src/Editor/QueryManager/QueryEditors/Mongodb.jsx @@ -10,13 +10,13 @@ class Mongodb extends React.Component { super(props); this.state = { - options: this.props.options + options: this.props.options, }; } componentDidMount() { this.setState({ - options: this.props.options + options: this.props.options, }); } @@ -25,8 +25,8 @@ class Mongodb extends React.Component { { options: { ...this.state.options, - [option]: JSON.parse(value) - } + [option]: JSON.parse(value), + }, }, () => { this.props.optionsChanged(this.state.options); @@ -39,8 +39,8 @@ class Mongodb extends React.Component { { options: { ...this.state.options, - operation - } + operation, + }, }, () => { this.props.optionsChanged(this.state.options); diff --git a/frontend/src/Editor/QueryManager/QueryEditors/Mssql.jsx b/frontend/src/Editor/QueryManager/QueryEditors/Mssql.jsx index 08d9f85dd5..77e4a2b077 100644 --- a/frontend/src/Editor/QueryManager/QueryEditors/Mssql.jsx +++ b/frontend/src/Editor/QueryManager/QueryEditors/Mssql.jsx @@ -11,7 +11,7 @@ class Mssql extends React.Component { componentDidMount() { this.setState({ - options: this.props.options + options: this.props.options, }); } diff --git a/frontend/src/Editor/QueryManager/QueryEditors/Mysql.jsx b/frontend/src/Editor/QueryManager/QueryEditors/Mysql.jsx index 051d56ff61..09c3bae4be 100644 --- a/frontend/src/Editor/QueryManager/QueryEditors/Mysql.jsx +++ b/frontend/src/Editor/QueryManager/QueryEditors/Mysql.jsx @@ -10,13 +10,13 @@ class Mysql extends React.Component { super(props); this.state = { - options: this.props.options + options: this.props.options, }; } componentDidMount() { this.setState({ - options: this.props.options + options: this.props.options, }); } @@ -31,7 +31,7 @@ class Mysql extends React.Component { changeOption(this, 'table', value)} - /> + currentState={this.props.currentState} + initialValue={this.state.options.table} + onChange={(value) => changeOption(this, 'table', value)} + />
@@ -110,7 +110,7 @@ class Mysql extends React.Component { theme: 'duotone-light', mode: 'javascript', lineWrapping: true, - scrollbarStyle: null + scrollbarStyle: null, }} />
diff --git a/frontend/src/Editor/QueryManager/QueryEditors/Postgresql.jsx b/frontend/src/Editor/QueryManager/QueryEditors/Postgresql.jsx index cc67f1d449..552b626e91 100644 --- a/frontend/src/Editor/QueryManager/QueryEditors/Postgresql.jsx +++ b/frontend/src/Editor/QueryManager/QueryEditors/Postgresql.jsx @@ -10,13 +10,13 @@ class Postgresql extends React.Component { super(props); this.state = { - options: this.props.options + options: this.props.options, }; } componentDidMount() { this.setState({ - options: this.props.options + options: this.props.options, }); } @@ -31,7 +31,7 @@ class Postgresql extends React.Component { -
+
changeOption(this, 'table', value)} - /> + currentState={this.props.currentState} + initialValue={this.state.options.table} + onChange={(value) => changeOption(this, 'table', value)} + />
@@ -108,7 +108,7 @@ class Postgresql extends React.Component { theme: 'duotone-light', mode: 'javascript', lineWrapping: true, - scrollbarStyle: null + scrollbarStyle: null, }} />
diff --git a/frontend/src/Editor/QueryManager/QueryEditors/Redis.jsx b/frontend/src/Editor/QueryManager/QueryEditors/Redis.jsx index 3b752af747..9c0acbe6b3 100644 --- a/frontend/src/Editor/QueryManager/QueryEditors/Redis.jsx +++ b/frontend/src/Editor/QueryManager/QueryEditors/Redis.jsx @@ -8,13 +8,13 @@ class Redis extends React.Component { super(props); this.state = { - options: this.props.options + options: this.props.options, }; } componentDidMount() { this.setState({ - options: this.props.options + options: this.props.options, }); } @@ -36,7 +36,7 @@ class Redis extends React.Component { theme: this.props.darkMode ? 'monokai' : 'duotone-light', mode: 'sql', lineWrapping: true, - scrollbarStyle: null + scrollbarStyle: null, }} />
diff --git a/frontend/src/Editor/QueryManager/QueryEditors/Restapi/index.jsx b/frontend/src/Editor/QueryManager/QueryEditors/Restapi/index.jsx index c23223fd59..503cc6367e 100644 --- a/frontend/src/Editor/QueryManager/QueryEditors/Restapi/index.jsx +++ b/frontend/src/Editor/QueryManager/QueryEditors/Restapi/index.jsx @@ -2,7 +2,7 @@ import 'codemirror/theme/duotone-light.css'; import React from 'react'; import SelectSearch, { fuzzySearch } from 'react-select-search'; -import { isEmpty, defaults } from 'lodash' +import { isEmpty, defaults } from 'lodash'; import Tabs from './Tabs'; import { changeOption } from '../utils'; @@ -11,29 +11,29 @@ import { CodeHinter } from '../../../CodeBuilder/CodeHinter'; class Restapi extends React.Component { constructor(props) { super(props); - const options = defaults({...props.options}, {headers: [], url_params: [], body: []}) + const options = defaults({ ...props.options }, { headers: [], url_params: [], body: [] }); this.state = { - options + options, }; } componentDidMount() { try { - if(isEmpty(this.state.options['headers'])) { + if (isEmpty(this.state.options['headers'])) { this.addNewKeyValuePair('headers'); } setTimeout(() => { - if(isEmpty(this.state.options['url_params'])) { + if (isEmpty(this.state.options['url_params'])) { this.addNewKeyValuePair('url_params'); } }, 1000); setTimeout(() => { - if(isEmpty(this.state.options['body'])) { + if (isEmpty(this.state.options['body'])) { this.addNewKeyValuePair('body'); } }, 1000); } catch (error) { - console.log(error) + console.log(error); } } diff --git a/frontend/src/Editor/QueryManager/QueryEditors/Slack.jsx b/frontend/src/Editor/QueryManager/QueryEditors/Slack.jsx index f4fb62719b..61d01c2af5 100644 --- a/frontend/src/Editor/QueryManager/QueryEditors/Slack.jsx +++ b/frontend/src/Editor/QueryManager/QueryEditors/Slack.jsx @@ -9,13 +9,13 @@ class Slack extends React.Component { super(props); this.state = { - options: this.props.options + options: this.props.options, }; } componentDidMount() { this.setState({ - options: this.props.options + options: this.props.options, }); } @@ -24,8 +24,8 @@ class Slack extends React.Component { { options: { ...this.state.options, - [option]: JSON.parse(value) - } + [option]: JSON.parse(value), + }, }, () => { this.props.optionsChanged(this.state.options); @@ -38,8 +38,8 @@ class Slack extends React.Component { { options: { ...this.state.options, - operation - } + operation, + }, }, () => { this.props.optionsChanged(this.state.options); @@ -59,7 +59,7 @@ class Slack extends React.Component {
- {this.state.options.operation === 'send_message' - &&
+ {this.state.options.operation === 'send_message' && ( +
- changeOption(this, 'channel', value)} - /> + changeOption(this, 'channel', value)} + />
- changeOption(this, 'message', value)} - /> + changeOption(this, 'message', value)} + />
{/*
@@ -109,7 +109,7 @@ class Slack extends React.Component {
*/}
- } + )}
)}
diff --git a/frontend/src/Editor/QueryManager/QueryEditors/Stripe.jsx b/frontend/src/Editor/QueryManager/QueryEditors/Stripe.jsx index 2f8a6b82a8..963a70c96c 100644 --- a/frontend/src/Editor/QueryManager/QueryEditors/Stripe.jsx +++ b/frontend/src/Editor/QueryManager/QueryEditors/Stripe.jsx @@ -8,27 +8,27 @@ const operationColorMapping = { get: 'azure', post: 'green', delete: 'red', - put: 'yellow' + put: 'yellow', }; class Stripe extends React.Component { constructor(props) { super(props); this.state = { - loadingSpec: true + loadingSpec: true, }; } componentDidMount() { this.setState({ - loadingSpec: true, + loadingSpec: true, options: { params: { path: {}, query: {}, - request: {} - } - } + request: {}, + }, + }, }); this.fetchOpenApiSpec(); @@ -37,20 +37,22 @@ class Stripe extends React.Component { fetchOpenApiSpec = () => { this.setState({ loadingSpec: true }); - openapiService.fetchSpecFromUrl('https://raw.githubusercontent.com/stripe/openapi/master/openapi/spec3.json').then((response) => { - response.text().then(text => { - const data = JSON.parse(text); - this.setState({ specJson: data, loadingSpec: false}); + openapiService + .fetchSpecFromUrl('https://raw.githubusercontent.com/stripe/openapi/master/openapi/spec3.json') + .then((response) => { + response.text().then((text) => { + const data = JSON.parse(text); + this.setState({ specJson: data, loadingSpec: false }); + }); }); - }) - } + }; changeOption(option, value) { this.setState({ options: { ...this.state.options, - [option]: value - } + [option]: value, + }, }); } @@ -64,8 +66,8 @@ class Stripe extends React.Component { options: { ...this.state.options, path, - operation - } + operation, + }, }, () => { this.props.optionsChanged(this.state.options); @@ -81,13 +83,13 @@ class Stripe extends React.Component { ...options.params, [paramType]: { ...options.params[paramType], - [paramName]: value - } - } + [paramName]: value, + }, + }, }; this.setState({ - options: newOptions + options: newOptions, }); this.props.optionsChanged(newOptions); @@ -117,7 +119,7 @@ class Stripe extends React.Component { options.push({ value: `${operation},${path}`, name: path, - operation: operation + operation: operation, }); } } @@ -145,14 +147,14 @@ class Stripe extends React.Component { return (
- {loadingSpec && + {loadingSpec && (
Please wait whle we load the OpenAPI specification for Stripe.
- } + )} - {(options && !loadingSpec) && ( + {options && !loadingSpec && (
@@ -185,7 +187,12 @@ class Stripe extends React.Component {
PATH
{pathParams.map((param) => (
- + { _ref.props.optionsChanged(_ref.state.options); } ); -}; \ No newline at end of file +} diff --git a/frontend/src/Editor/QueryManager/QueryManager.jsx b/frontend/src/Editor/QueryManager/QueryManager.jsx index 1598dc61ac..78f5f502c8 100644 --- a/frontend/src/Editor/QueryManager/QueryManager.jsx +++ b/frontend/src/Editor/QueryManager/QueryManager.jsx @@ -1,7 +1,6 @@ import React from 'react'; import { dataqueryService } from '@/_services'; import { toast } from 'react-toastify'; -import { isEmpty } from 'lodash'; import 'react-toastify/dist/ReactToastify.css'; import SelectSearch, { fuzzySearch } from 'react-select-search'; import ReactTooltip from 'react-tooltip'; @@ -15,7 +14,7 @@ const queryNameRegex = new RegExp('^[A-Za-z0-9_-]*$'); const staticDataSources = [{ kind: 'restapi', id: 'null', name: 'REST API' }]; -class QueryManager extends React.Component { +let QueryManager = class QueryManager extends React.Component { constructor(props) { super(props); @@ -60,7 +59,6 @@ class QueryManager extends React.Component { } else { this.setState({ options: {}, - selectedDataSource: null, selectedQuery: null, selectedDataSource: paneHeightChanged ? this.state.selectedDataSource : props.selectedDataSource, }); @@ -304,7 +302,7 @@ class QueryManager extends React.Component { this.previewPanelRef.current.scrollIntoView(); }) .catch(({ error, data }) => { - console.log(error); + console.log(error, data); }); }} className={`btn btn-secondary m-1 float-right1 ${previewLoading ? ' btn-loading' : ''}`} @@ -505,6 +503,7 @@ class QueryManager extends React.Component {
); } -} +}; +QueryManager = React.memo(QueryManager); export { QueryManager }; diff --git a/frontend/src/Editor/QueryManager/Transformation.jsx b/frontend/src/Editor/QueryManager/Transformation.jsx index bff7c4e461..acdc93292b 100644 --- a/frontend/src/Editor/QueryManager/Transformation.jsx +++ b/frontend/src/Editor/QueryManager/Transformation.jsx @@ -1,31 +1,32 @@ -import React, { useState, useEffect, useMemo } from 'react'; -import CodeMirror from '@uiw/react-codemirror'; +import React, { useState } from 'react'; import 'codemirror/theme/base16-light.css'; -import { handleChange, onBeforeChange, getSuggestionKeys } from '../CodeBuilder/utils'; +// import { getSuggestionKeys } from '../CodeBuilder/utils'; import 'codemirror/mode/javascript/javascript'; import 'codemirror/addon/hint/show-hint'; import 'codemirror/addon/search/match-highlighter'; import 'codemirror/addon/hint/show-hint.css'; import { CodeHinter } from '../CodeBuilder/CodeHinter'; - -export const Transformation = ({ changeOption, options, currentState, darkMode }) => { - const defaultValue = options.transformation - || `// write your code here +export const Transformation = ({ changeOption, currentState, options, darkMode }) => { + const defaultValue = + options.transformation || + `// write your code here // return value will be set as data and the original data will be available as rawData return data.filter(row => row.amount > 1000);`; const [value, setValue] = useState(defaultValue); + const [enableTransformation, setEnableTransformation] = useState(() => options.enableTransformation); - useEffect(() => { - setValue(defaultValue); - }, [defaultValue]); - + // let suggestions = useMemo(() => getSuggestionKeys(currentState), [currentState.components, currentState.queries]); function codeChanged(value) { + setValue(() => value); changeOption('transformation', value); } - let suggestions = useMemo(() => getSuggestionKeys(currentState), [currentState.components, currentState.queries]); + function toggleEnableTransformation() { + setEnableTransformation((prev) => !prev); + changeOption('enableTransformation', !enableTransformation); + } return (
@@ -33,17 +34,17 @@ return data.filter(row => row.amount > 1000);`; changeOption('enableTransformation', !options.enableTransformation)} - checked={options.enableTransformation} + onClick={toggleEnableTransformation} + checked={enableTransformation} /> Transformations - {!options.enableTransformation && ( + {!enableTransformation && (
Transformations can be used to transform the results of queries. All the app variables are accessible from transformers and supports JS libraries such as Lodash & Moment.{' '} - + Read documentation . @@ -51,17 +52,17 @@ return data.filter(row => row.amount > 1000);`;
)}

- {options.enableTransformation && ( + {enableTransformation && (
changeOption('transformation', value)} + currentState={currentState} + initialValue={value} + mode="javascript" + theme={darkMode ? 'monokai' : 'base16-light'} + lineNumbers={true} + className="query-hinter" + ignoreBraces={true} + onChange={(value) => codeChanged(value)} />
)} diff --git a/frontend/src/Editor/QueryManager/constants.js b/frontend/src/Editor/QueryManager/constants.js index a945e4c7a1..5009e65adf 100644 --- a/frontend/src/Editor/QueryManager/constants.js +++ b/frontend/src/Editor/QueryManager/constants.js @@ -1,44 +1,37 @@ export const defaultOptions = { postgresql: { - mode: 'sql' + mode: 'sql', }, redis: { - query: 'PING' + query: 'PING', }, mysql: {}, graphql: {}, firestore: { path: '', - operation: 'get_document' + operation: 'get_document', + order_type: 'desc', }, elasticsearch: { query: '', - operation: 'search' + operation: 'search', }, restapi: { method: 'get', url: null, url_params: [], headers: [], - body: [] + body: [], }, stripe: {}, mongodb: { - document: '{ }' + document: '{ }', }, googlesheets: { - operation: 'read' + operation: 'read', }, - slack: { - - }, - dynamodb: { - - }, - airtable: { - - }, - mssql: { - - } + slack: {}, + dynamodb: {}, + airtable: {}, + mssql: {}, }; diff --git a/frontend/src/Editor/SaveAndPreview.jsx b/frontend/src/Editor/SaveAndPreview.jsx index 7e97d19b17..732cdf81b5 100644 --- a/frontend/src/Editor/SaveAndPreview.jsx +++ b/frontend/src/Editor/SaveAndPreview.jsx @@ -2,8 +2,7 @@ import React from 'react'; import { appService, appVersionService } from '@/_services'; import Modal from 'react-bootstrap/Modal'; import Button from 'react-bootstrap/Button'; -import { toast } from 'react-toastify'; -import { ToastContainer } from 'react-toastify'; +import { toast, ToastContainer } from 'react-toastify'; import 'react-toastify/dist/ReactToastify.css'; import Skeleton from 'react-loading-skeleton'; @@ -28,15 +27,17 @@ class SaveAndPreview extends React.Component { } fetchVersions = () => { - appVersionService.getAll(this.props.appId).then((data) => this.setState({ - versions: data.versions, - isLoading: false - })); + appVersionService.getAll(this.props.appId).then((data) => + this.setState({ + versions: data.versions, + isLoading: false, + }) + ); }; hideModal = () => { this.setState({ - showModal: false + showModal: false, }); }; @@ -53,7 +54,8 @@ class SaveAndPreview extends React.Component { containerId: this.state.appId, }); this.fetchVersions(); - this.props.setAppDefinitionFromVersion(version) + // eslint-disable-next-line no-undef + this.props.setAppDefinitionFromVersion(version); }); }; @@ -82,13 +84,11 @@ class SaveAndPreview extends React.Component { this.props.onVersionDeploy(versionId); }); - }; render() { - const { - showModal, isLoading, versions, showVersionForm, savingVersionId, deployingVersionId, creatingVersion, appId - } = this.state; + const { isLoading, versions, showVersionForm, savingVersionId, deployingVersionId, creatingVersion, appId } = + this.state; return (
@@ -112,12 +112,15 @@ class SaveAndPreview extends React.Component { Versions and deployments
{!showVersionForm && ( - )} -
@@ -155,16 +158,19 @@ class SaveAndPreview extends React.Component {
- {version.name} - {version.id === this.props.app.current_version_id && ( - (current) - )} + {version.name} + {version.id === this.props.app.current_version_id && ( + (current) + )}
diff --git a/frontend/src/Editor/SubContainer.jsx b/frontend/src/Editor/SubContainer.jsx index 05cdc8ef6f..77be83bfa8 100644 --- a/frontend/src/Editor/SubContainer.jsx +++ b/frontend/src/Editor/SubContainer.jsx @@ -10,11 +10,13 @@ import { computeComponentName } from '@/_helpers/utils'; const styles = { width: '100%', height: '100%', - position: 'absolute' + position: 'absolute', }; function uuidv4() { - return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (c) => (c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))).toString(16)); + return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (c) => + (c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))).toString(16) + ); } export const SubContainer = ({ @@ -36,20 +38,20 @@ export const SubContainer = ({ scaleValue, selectedComponent, currentLayout, - removeComponent + removeComponent, }) => { zoomLevel = zoomLevel || 1; + // eslint-disable-next-line react-hooks/exhaustive-deps const allComponents = appDefinition ? appDefinition.components : {}; - let childComponents = [] + let childComponents = []; Object.keys(allComponents).forEach((key) => { - if(allComponents[key].parent === parent) { - childComponents[key] = allComponents[key] - } + if (allComponents[key].parent === parent) { + childComponents[key] = allComponents[key]; } - ); + }); const [boxes, setBoxes] = useState(allComponents); const [isDragging, setIsDragging] = useState(false); @@ -64,8 +66,8 @@ export const SubContainer = ({ setBoxes( update(boxes, { [id]: { - $merge: { left, top } - } + $merge: { left, top }, + }, }) ); console.log('new boxes - 1', boxes); @@ -75,35 +77,41 @@ export const SubContainer = ({ useEffect(() => { console.log('new boxes - 2', boxes); - if(appDefinitionChanged) { + if (appDefinitionChanged) { appDefinitionChanged({ ...appDefinition, components: boxes }); } + // eslint-disable-next-line react-hooks/exhaustive-deps }, [boxes]); const { draggingState } = useDragLayer((monitor) => { // TODO: Need to move to a performant version of the block below - if(monitor.getItem()) { - if(monitor.getItem().id === undefined) { - if(parentRef.current) { + if (monitor.getItem()) { + if (monitor.getItem().id === undefined) { + if (parentRef.current) { const currentOffset = monitor.getSourceClientOffset(); - if(currentOffset) { - const canvasBoundingRect = parentRef.current.getElementsByClassName('real-canvas')[0].getBoundingClientRect(); - if(currentOffset.x > canvasBoundingRect.x && currentOffset.x < canvasBoundingRect.x + canvasBoundingRect.width) { - return { draggingState: true } + if (currentOffset) { + const canvasBoundingRect = parentRef.current + .getElementsByClassName('real-canvas')[0] + .getBoundingClientRect(); + if ( + currentOffset.x > canvasBoundingRect.x && + currentOffset.x < canvasBoundingRect.x + canvasBoundingRect.width + ) { + return { draggingState: true }; } } } } } - if(monitor.isDragging() && monitor.getItem().parent) { - if(monitor.getItem().parent === parent) { - return { draggingState: true } - } else { - return { draggingState: false } + if (monitor.isDragging() && monitor.getItem().parent) { + if (monitor.getItem().parent === parent) { + return { draggingState: true }; + } else { + return { draggingState: false }; } - } else { - return { draggingState: false } + } else { + return { draggingState: false }; } }); @@ -138,24 +146,23 @@ export const SubContainer = ({ [left, top] = doSnapToGrid(left, top); } - let newBoxes = { + let newBoxes = { ...boxes, [id]: { ...boxes[id], parent: parent, - layouts: { + layouts: { ...boxes[id]['layouts'], [item.currentLayout]: { ...boxes[id]['layouts'][item.currentLayout], top: top, left: left, - } - } - } + }, + }, + }, }; setBoxes(newBoxes); - } else { // This is a new component componentMeta = componentTypes.find((component) => component.component === item.component.component); @@ -167,8 +174,8 @@ export const SubContainer = ({ const offsetFromLeftOfWindow = canvasBoundingRect.left; const currentOffset = monitor.getSourceClientOffset(); - left = Math.round(currentOffset.x + (currentOffset.x * (1 - zoomLevel)) - offsetFromLeftOfWindow); - top = Math.round(currentOffset.y + (currentOffset.y * (1 - zoomLevel)) - offsetFromTopOfWindow); + left = Math.round(currentOffset.x + currentOffset.x * (1 - zoomLevel) - offsetFromLeftOfWindow); + top = Math.round(currentOffset.y + currentOffset.y * (1 - zoomLevel) - offsetFromTopOfWindow); id = uuidv4(); } @@ -177,7 +184,7 @@ export const SubContainer = ({ [left, top] = doSnapToGrid(left, top); } - if(item.currentLayout === 'mobile') { + if (item.currentLayout === 'mobile') { componentData.definition.others.showOnDesktop.value = false; componentData.definition.others.showOnMobile.value = true; } @@ -188,18 +195,18 @@ export const SubContainer = ({ component: componentData, parent: parent, layouts: { - [item.currentLayout]: { + [item.currentLayout]: { top: top, left: left, width: componentMeta.defaultSize.width, height: componentMeta.defaultSize.height, - } - } - } + }, + }, + }, }); return undefined; - } + }, }), [moveBox] ); @@ -214,29 +221,32 @@ export const SubContainer = ({ top: 100, left: 0, width: 445, - height: 500 + height: 500, }; - let { left, top, width, height } = boxes[id]['layouts'][currentLayout] || defaultData; - + let { left, top, width, height } = boxes[id]['layouts'][currentLayout] || defaultData; + top = y; left = x; width = width + deltaWidth; - height = height + deltaHeight + height = height + deltaHeight; - let newBoxes = { + let newBoxes = { ...boxes, [id]: { ...boxes[id], - layouts: { + layouts: { ...boxes[id]['layouts'], [currentLayout]: { ...boxes[id]['layouts'][currentLayout], - width, height, top, left - } - } - } + width, + height, + top, + left, + }, + }, + }, }; setBoxes(newBoxes); @@ -254,12 +264,12 @@ export const SubContainer = ({ ...boxes[id].component.definition, properties: { ...boxes[id].component.definition.properties, - [param]: value - } - } - } - } - } + [param]: value, + }, + }, + }, + }, + }, }) ); } @@ -288,7 +298,7 @@ export const SubContainer = ({ scaleValue={scaleValue} selectedComponent={selectedComponent} deviceWindowWidth={deviceWindowWidth} - isSelectedComponent={selectedComponent? selectedComponent.id === key : false} + isSelectedComponent={selectedComponent ? selectedComponent.id === key : false} removeComponent={removeComponent} /> ))} diff --git a/frontend/src/Editor/SubCustomDragLayer.jsx b/frontend/src/Editor/SubCustomDragLayer.jsx index a2916cae8a..74c2e4b523 100644 --- a/frontend/src/Editor/SubCustomDragLayer.jsx +++ b/frontend/src/Editor/SubCustomDragLayer.jsx @@ -9,19 +9,19 @@ const layerStyles = { left: 0, top: 0, width: '100%', - height: '100%' + height: '100%', }; function getItemStyles(delta, item, initialOffset, currentOffset, parentRef, parent, currentLayout) { if (!initialOffset || !currentOffset || !parentRef.current) { return { - display: 'none' + display: 'none', }; } - if ( parent !== item.parent ) { + if (parent !== item.parent) { return { - display: 'none' + display: 'none', }; } @@ -31,16 +31,18 @@ function getItemStyles(delta, item, initialOffset, currentOffset, parentRef, par const realCanvasBoundingRect = parentRef.current.getElementsByClassName('real-canvas')[0].getBoundingClientRect(); - if (id) { // Dragging within the canvas + if (id) { + // Dragging within the canvas x = Math.round(item.layouts[currentLayout].left + delta.x); y = Math.round(item.layouts[currentLayout].top + delta.y); - } else { // New component being dragged from components sidebar + } else { + // New component being dragged from components sidebar const offsetFromTopOfWindow = realCanvasBoundingRect.top; const offsetFromLeftOfWindow = realCanvasBoundingRect.left; const zoomLevel = item.zoomLevel; - x = Math.round(currentOffset.x + (currentOffset.x * (1 - zoomLevel)) - offsetFromLeftOfWindow); - y = Math.round(currentOffset.y + (currentOffset.y * (1 - zoomLevel)) - offsetFromTopOfWindow); + x = Math.round(currentOffset.x + currentOffset.x * (1 - zoomLevel) - offsetFromLeftOfWindow); + y = Math.round(currentOffset.y + currentOffset.y * (1 - zoomLevel) - offsetFromTopOfWindow); } [x, y] = snapToGrid(x, y); @@ -48,19 +50,17 @@ function getItemStyles(delta, item, initialOffset, currentOffset, parentRef, par const transform = `translate(${x}px, ${y}px)`; return { transform, - WebkitTransform: transform + WebkitTransform: transform, }; } -export const SubCustomDragLayer = ({parentRef, parent, currentLayout}) => { - const { - itemType, isDragging, item, initialOffset, currentOffset, delta - } = useDragLayer((monitor) => ({ +export const SubCustomDragLayer = ({ parentRef, parent, currentLayout }) => { + const { itemType, isDragging, item, initialOffset, currentOffset, delta } = useDragLayer((monitor) => ({ item: monitor.getItem(), itemType: monitor.getItemType(), initialOffset: monitor.getInitialSourceClientOffset(), currentOffset: monitor.getSourceClientOffset(), isDragging: monitor.isDragging(), - delta: monitor.getDifferenceFromInitialOffset() + delta: monitor.getDifferenceFromInitialOffset(), })); function renderItem() { switch (itemType) { diff --git a/frontend/src/Editor/Viewer.jsx b/frontend/src/Editor/Viewer.jsx index 397b6182e9..78b1594c0f 100644 --- a/frontend/src/Editor/Viewer.jsx +++ b/frontend/src/Editor/Viewer.jsx @@ -5,7 +5,6 @@ import { HTML5Backend } from 'react-dnd-html5-backend'; import { Container } from './Container'; import 'react-toastify/dist/ReactToastify.css'; import { Confirm } from './Viewer/Confirm'; -import { componentTypes } from './Components/components'; import { onComponentOptionChanged, onComponentOptionsChanged, @@ -14,7 +13,7 @@ import { onQueryCancel, onEvent, runQuery, - computeComponentState + computeComponentState, } from '@/_helpers/appUtils'; import queryString from 'query-string'; import { DarkModeToggle } from '@/_components/DarkModeToggle'; @@ -47,20 +46,11 @@ class Viewer extends React.Component { } setStateForApp = (data) => { - this.setState( - { - app: data, - isLoading: false, - appDefinition: data.definition || {components: {}}, - }, - () => { - data.data_queries.forEach((query) => { - if (query.options.runOnPageLoad) { - runQuery(this, query.id, query.name); - } - }); - } - ); + this.setState({ + app: data, + isLoading: false, + appDefinition: data.definition || { components: {} }, + }); }; setStateForContainer = (data) => { @@ -74,32 +64,46 @@ class Viewer extends React.Component { lastName: currentUser.last_name, }; } - this.setState({ - currentSidebarTab: 2, - selectedComponent: null, - currentState: { - queries: {}, - components: {}, - globals: { - current_user: userVars, - urlparams: JSON.parse(JSON.stringify(queryString.parse(this.props.location.search))), + this.setState( + { + currentSidebarTab: 2, + selectedComponent: null, + currentState: { + queries: {}, + components: {}, + globals: { + current_user: userVars, + urlparams: JSON.parse(JSON.stringify(queryString.parse(this.props.location.search))), + }, }, }, - }, () => { - computeComponentState(this, data?.definition?.components) + () => { + computeComponentState(this, data?.definition?.components).then(() => { + console.log('Default component state computed and set'); + this.runQueries(data.data_queries); + }); + } + ); + }; + + runQueries = (data_queries) => { + data_queries.forEach((query) => { + if (query.options.runOnPageLoad) { + runQuery(this, query.id, query.name); + } }); }; loadApplicationBySlug = (slug) => { - appService.getAppBySlug(slug).then((data) => { + appService.getAppBySlug(slug).then((data) => { this.setStateForApp(data); this.setStateForContainer(data); - this.setState({ isLoading: false }) - }) + this.setState({ isLoading: false }); + }); }; loadApplicationByVersion = (appId, versionId) => { - appService.getAppByVersion(appId, versionId).then((data) => { + appService.getAppByVersion(appId, versionId).then((data) => { this.setStateForApp(data); this.setStateForContainer(data); }); @@ -110,20 +114,27 @@ class Viewer extends React.Component { const appId = this.props.match.params.id; const versionId = this.props.match.params.versionId; - this.setState({ isLoading : false}); + this.setState({ isLoading: false }); slug ? this.loadApplicationBySlug(slug) : this.loadApplicationByVersion(appId, versionId); } componentDidUpdate(prevProps) { if (this.props.match.params.slug && this.props.match.params.slug !== prevProps.match.params.slug) { this.setState({ isLoading: true }); - this.loadApplicationBySlug(this.props.match.params.slug) + this.loadApplicationBySlug(this.props.match.params.slug); } } render() { - const { appDefinition, showQueryConfirmation, isLoading, currentLayout, deviceWindowWidth, scaleValue, defaultComponentStateComputed } = - this.state; + const { + appDefinition, + showQueryConfirmation, + isLoading, + currentLayout, + deviceWindowWidth, + scaleValue, + defaultComponentStateComputed, + } = this.state; return (
@@ -159,45 +170,42 @@ class Viewer extends React.Component { width: currentLayout === 'desktop' ? '1292px' : `${deviceWindowWidth}px`, }} > - - - {defaultComponentStateComputed && ( - <> - {isLoading ? ( -
-
-
-
-
- ) : ( - false} // function not relevant in viewer - snapToGrid={true} - appLoading={isLoading} - darkMode={this.props.darkMode} - onEvent={(eventName, options) => onEvent(this, eventName, options, 'view')} - mode="view" - scaleValue={scaleValue} - deviceWindowWidth={deviceWindowWidth} - currentLayout={currentLayout} - currentState={this.state.currentState} - selectedComponent={this.state.selectedComponent} - onComponentClick={(id, component) => { - this.setState({ selectedComponent: { id, component } }); - onComponentClick(this, id, component, 'view'); - }} - onComponentOptionChanged={(component, optionName, value) => - onComponentOptionChanged(this, component, optionName, value) - } - onComponentOptionsChanged={(component, options) => - onComponentOptionsChanged(this, component, options) - } - /> - )} - - )} - + {defaultComponentStateComputed && ( + <> + {isLoading ? ( +
+
+
+
+
+ ) : ( + false} // function not relevant in viewer + snapToGrid={true} + appLoading={isLoading} + darkMode={this.props.darkMode} + onEvent={(eventName, options) => onEvent(this, eventName, options, 'view')} + mode="view" + scaleValue={scaleValue} + deviceWindowWidth={deviceWindowWidth} + currentLayout={currentLayout} + currentState={this.state.currentState} + selectedComponent={this.state.selectedComponent} + onComponentClick={(id, component) => { + this.setState({ selectedComponent: { id, component } }); + onComponentClick(this, id, component, 'view'); + }} + onComponentOptionChanged={(component, optionName, value) => + onComponentOptionChanged(this, component, optionName, value) + } + onComponentOptionsChanged={(component, options) => + onComponentOptionsChanged(this, component, options) + } + /> + )} + + )}
@@ -209,5 +217,3 @@ class Viewer extends React.Component { } export { Viewer }; - - diff --git a/frontend/src/Editor/Viewer/Confirm.jsx b/frontend/src/Editor/Viewer/Confirm.jsx index 807872c0d3..b22aba26f5 100644 --- a/frontend/src/Editor/Viewer/Confirm.jsx +++ b/frontend/src/Editor/Viewer/Confirm.jsx @@ -2,9 +2,7 @@ import React, { useState, useEffect } from 'react'; import Modal from 'react-bootstrap/Modal'; import Button from 'react-bootstrap/Button'; -export function Confirm({ - show, message, onConfirm, onCancel, queryConfirmationData -}) { +export function Confirm({ show, message, onConfirm, onCancel, queryConfirmationData }) { const [showModal, setShow] = useState(show); useEffect(() => { diff --git a/frontend/src/Editor/WidgetManager.jsx b/frontend/src/Editor/WidgetManager.jsx index 1d3732e95a..af571ae4a6 100644 --- a/frontend/src/Editor/WidgetManager.jsx +++ b/frontend/src/Editor/WidgetManager.jsx @@ -41,12 +41,14 @@ export const WidgetManager = function WidgetManager({ componentTypes, zoomLevel, function segregateSections() { if (filteredComponents.length === 0) { return ( -
+
{/*
*/} -

No results found

-

Try adjusting your search or filter to find what you're looking for.

+

No results found

+

+ Try adjusting your search or filter to find what you're looking for. +

); } diff --git a/frontend/src/Editor/index.js b/frontend/src/Editor/index.js index d8a3538fb4..8e539b2b32 100644 --- a/frontend/src/Editor/index.js +++ b/frontend/src/Editor/index.js @@ -1,3 +1,4 @@ +/* eslint-disable import/export */ export * from './Editor'; export * from './Viewer'; export * from './DataSourceManager'; diff --git a/frontend/src/Editor/snapToGrid.js b/frontend/src/Editor/snapToGrid.js index face27139a..01ec0e75ed 100644 --- a/frontend/src/Editor/snapToGrid.js +++ b/frontend/src/Editor/snapToGrid.js @@ -1,5 +1,5 @@ export function snapToGrid(x, y) { const snappedX = Math.round(x / 30) * 30; - const snappedY = Math.round(y / 30) * 30; + const snappedY = Math.round(y / 10) * 10; return [snappedX, snappedY]; } diff --git a/frontend/src/HomePage/AppMenu.jsx b/frontend/src/HomePage/AppMenu.jsx index 63ca69b444..4f31fe61c2 100644 --- a/frontend/src/HomePage/AppMenu.jsx +++ b/frontend/src/HomePage/AppMenu.jsx @@ -5,7 +5,6 @@ import SelectSearch from 'react-select-search'; import Fuse from 'fuse.js'; import { folderService } from '@/_services'; import { toast } from 'react-toastify'; -import { lowerFirst } from 'lodash'; export const AppMenu = function AppMenu({ app, folders, foldersChanged, deleteApp, cloneApp }) { const [addToFolder, setAddToFolder] = useState(false); diff --git a/frontend/src/HomePage/BlankPage.jsx b/frontend/src/HomePage/BlankPage.jsx index 5afb414aac..c478a1f034 100644 --- a/frontend/src/HomePage/BlankPage.jsx +++ b/frontend/src/HomePage/BlankPage.jsx @@ -1,30 +1,50 @@ import React from 'react'; -export const BlankPage = function BlankPage({ - createApp -}) { - return (
-
-
-
-
-
-
-
-
-

You haven't created any apps yet.

-
- - - Create your first app - - - Read documentation - +export const BlankPage = function BlankPage({ createApp }) { + return ( +
+
+
+
+
+
+
+ +
+

You haven't created any apps yet.

+
-
) -} + ); +}; diff --git a/frontend/src/HomePage/Folders.jsx b/frontend/src/HomePage/Folders.jsx index c00054ec0a..c2f757a7e0 100644 --- a/frontend/src/HomePage/Folders.jsx +++ b/frontend/src/HomePage/Folders.jsx @@ -3,9 +3,13 @@ import { folderService } from '@/_services'; import { toast } from 'react-toastify'; export const Folders = function Folders({ - folders, foldersLoading, totalCount, currentFolder, folderChanged, foldersChanged + folders, + foldersLoading, + totalCount, + currentFolder, + folderChanged, + foldersChanged, }) { - const [isLoading, setLoadingStatus] = useState(foldersLoading); useEffect(() => { @@ -15,20 +19,20 @@ export const Folders = function Folders({ const [showForm, setShowForm] = useState(false); const [isCreating, setCreationStatus] = useState(false); const [newFolderName, setNewFolderName] = useState(''); - const [activeFolder, setActiveFolder] = useState(currentFolder || {}) + const [activeFolder, setActiveFolder] = useState(currentFolder || {}); function saveFolder() { setCreationStatus(true); folderService.create(newFolderName).then(() => { toast.info('folder created.', { hideProgressBar: true, - position: 'top-left' + position: 'top-left', }); setCreationStatus(false); setShowForm(false); setNewFolderName(''); foldersChanged(); - }) + }); } function handleFolderChange(folder) { @@ -36,73 +40,82 @@ export const Folders = function Folders({ folderChanged(folder); } - return (
- {isLoading && ( -
- {[1,2,3,4, 5].map(element => { - return (
-
-
-
-
-
-
-
) - })} -
- )} + return ( +
+ {isLoading && ( +
+ {[1, 2, 3, 4, 5].map((element, index) => { + return ( +
+
+
+
+
+
+
+
+ ); + })} +
+ )} - {!isLoading && ( -
- - handleFolderChange({})} - > - All applications - - {totalCount} - - - {folders.map((folder) => - handleFolderChange(folder)} + {!isLoading && ( +
+ handleFolderChange({})} > - {folder.name} + All applications - {folder.count} - - - )} -
- {!showForm && - setShowForm(true)}> - + Folder + + {totalCount} + + - } - {showForm && -
-
- onComponentClick(id, component)} - type="text" - type="text" - onChange={(e) => setNewFolderName(e.target.value)} - className="form-control" - placeholder="folder name" - disabled={isCreating} - /> + {folders.map((folder, index) => ( + handleFolderChange(folder)} + > + {folder.name} + + {folder.count} + + + ))} +
+ {!showForm && ( + setShowForm(true)}> + + Folder + + )} + {showForm && ( +
+
+ onComponentClick(id, component)} //onComponentClick, id and compoenent is not defined + type="text" + onChange={(e) => setNewFolderName(e.target.value)} + className="form-control" + placeholder="folder name" + disabled={isCreating} + /> +
+
+ +
-
- -
-
- } -
- )} -
) -} + )} +
+ )} +
+ ); +}; diff --git a/frontend/src/HomePage/HomePage.jsx b/frontend/src/HomePage/HomePage.jsx index 7514a993e9..4a5c230227 100644 --- a/frontend/src/HomePage/HomePage.jsx +++ b/frontend/src/HomePage/HomePage.jsx @@ -1,13 +1,12 @@ import React from 'react'; import { appService, folderService, authenticationService } from '@/_services'; import { Link } from 'react-router-dom'; -import { Pagination, Header } from '@/_components'; +import { Pagination, Header, ConfirmDialog } from '@/_components'; import { Folders } from './Folders'; import { AppMenu } from './AppMenu'; import { BlankPage } from './BlankPage'; import OverlayTrigger from 'react-bootstrap/OverlayTrigger'; import { renderTooltip } from '@/_helpers/appUtils'; -import { ConfirmDialog } from '@/_components'; import { toast } from 'react-toastify'; import moment from 'moment'; class HomePage extends React.Component { @@ -27,8 +26,8 @@ class HomePage extends React.Component { folders: [], meta: { count: 1, - folders: [] - } + folders: [], + }, }; } @@ -40,40 +39,44 @@ class HomePage extends React.Component { fetchApps = (page, folder) => { this.setState({ apps: [], - isLoading: true - }) + isLoading: true, + }); - appService.getAll(page, folder).then((data) => this.setState({ - apps: data.apps, - meta: {...this.state.meta, ...data.meta}, - isLoading: false - })); - } + appService.getAll(page, folder).then((data) => + this.setState({ + apps: data.apps, + meta: { ...this.state.meta, ...data.meta }, + isLoading: false, + }) + ); + }; fetchFolders = () => { this.setState({ - foldersLoading: true - }) + foldersLoading: true, + }); - folderService.getAll().then((data) => this.setState({ - folders: data.folders, - foldersLoading: false - })); - } + folderService.getAll().then((data) => + this.setState({ + folders: data.folders, + foldersLoading: false, + }) + ); + }; pageChanged = (page) => { this.setState({ currentPage: page }); this.fetchApps(page, this.state.currentFolder.id); - } + }; folderChanged = (folder) => { - this.setState({'currentFolder': folder}); + this.setState({ currentFolder: folder }); this.fetchApps(1, folder.id); - } + }; foldersChanged = () => { this.fetchFolders(); - } + }; createApp = () => { let _self = this; @@ -86,60 +89,73 @@ class HomePage extends React.Component { deleteApp = (app) => { this.setState({ showAppDeletionConfirmation: true, appToBeDeleted: app }); - } + }; cloneApp = (app) => { this.setState({ isCloningApp: true }); - appService.cloneApp(app.id).then((data) => { - toast.info('App cloned successfully.', { - hideProgressBar: true, - position: 'top-center' + appService + .cloneApp(app.id) + .then((data) => { + toast.info('App cloned successfully.', { + hideProgressBar: true, + position: 'top-center', + }); + this.setState({ isCloningApp: false }); + this.props.history.push(`/apps/${data.id}`); + }) + .catch(({ _error }) => { + toast.error('Could not clone the app.', { hideProgressBar: true, position: 'top-center' }); + this.setState({ isCloningApp: false }); + console.log(_error); }); - this.setState({ isCloningApp: false }); - this.props.history.push(`/apps/${data.id}`); - }).catch(({ _error }) => { - toast.error('Could not clone the app.', { hideProgressBar: true, position: 'top-center' }); - this.setState({ isCloningApp: false }); - }); - ; - } + }; executeAppDeletion = () => { this.setState({ isDeletingApp: true }); - appService.deleteApp(this.state.appToBeDeleted.id).then((data) => { - toast.info('App deleted successfully.', { - hideProgressBar: true, - position: 'top-center' + appService + .deleteApp(this.state.appToBeDeleted.id) + // eslint-disable-next-line no-unused-vars + .then((data) => { + toast.info('App deleted successfully.', { + hideProgressBar: true, + position: 'top-center', + }); + this.setState({ + isDeletingApp: false, + appToBeDeleted: null, + showAppDeletionConfirmation: false, + }); + this.fetchApps(this.state.currentPage || 1, this.state.currentFolder.id); + this.fetchFolders(); + }) + .catch(({ error }) => { + toast.error('Could not delete the app.', { hideProgressBar: true, position: 'top-center' }); + this.setState({ + isDeletingApp: false, + appToBeDeleted: null, + showAppDeletionConfirmation: false, + }); + console.log(error); }); - this.setState({ - isDeletingApp: false, - appToBeDeleted: null, - showAppDeletionConfirmation: false - }); - this.fetchApps(this.state.currentPage || 1, this.state.currentFolder.id); - this.fetchFolders(); - }).catch(({ error }) => { - toast.error('Could not delete the app.', { hideProgressBar: true, position: 'top-center' }); - this.setState({ - isDeletingApp: false, - appToBeDeleted: null, - showAppDeletionConfirmation: false - }); - }); - ; - } + }; pageCount = () => { return this.state.currentFolder.id ? this.state.meta.folder_count : this.state.meta.total_count; - } + }; render() { const { - apps, currentUser ,isLoading, creatingApp, meta, currentFolder, showAppDeletionConfirmation, isDeletingApp + apps, + currentUser, + isLoading, + creatingApp, + meta, + currentFolder, + showAppDeletionConfirmation, + isDeletingApp, } = this.state; return (
- {}} /> -
- {!isLoading && meta.total_count === 0 && !currentFolder.id && - - } +
+ {!isLoading && meta.total_count === 0 && !currentFolder.id && } - {(isLoading || meta.total_count > 0) && + {(isLoading || meta.total_count > 0) && ( +
+
+
+
+
+ +
-
-
-
-
-
- -
- -
- -
-
-
-

{currentFolder.id ? `Folder: ${currentFolder.name}` : 'All applications'}

-
+
+
+
+
+

+ {currentFolder.id ? `Folder: ${currentFolder.name}` : 'All applications'} +

+
- +
-
+
+ className={`table table-vcenter ${this.props.darkMode ? 'bg-dark' : 'bg-white'}`} + > {isLoading && ( <> - {Array.from(Array(10)).map(() => ( - - - - - - - ))} - + {Array.from(Array(10)).map((index) => ( + + + + + + + ))} )} {meta.total_count > 0 && ( <> + {apps.map((app, index) => ( + + + - - - )) - } - ) - } - {currentFolder.count == 0 && ( + this.deleteApp(app)} + cloneApp={() => this.cloneApp(app)} + /> + + + ))} + + )} + {currentFolder.count == 0 && (
- - This folder is empty -
+ + This folder is empty + )}
-
-
- 		- -
- 		-
-
+
+
+ 		+
+ 		+
+
+ {app.name}
+ + created {moment(app.created_at).fromNow()} ago by {app.user?.first_name}{' '} + {app.user?.last_name}{' '} + + 		+ {currentUser.role !== 'viewer' && ( + + renderTooltip({ props, text: 'Open in app builder' })} + > + Edit + + + )} + + {!this.props.darkMode && ( + + renderTooltip({ + props, + text: + app?.current_version_id == null + ? 'App does not have a deployed version' + : 'Open in app viewer', + }) + } + > + { + + launch{' '} + + } + + )} + {this.props.darkMode && ( + + renderTooltip({ + props, + text: + app?.current_version_id == null + ? 'App does not have a deployed version' + : 'Open in app viewer', + }) + } + > + { + + launch{' '} + + } + + )} + - {apps.map((app) => ( -
- {app.name}
- created {moment(app.created_at).fromNow()} ago by {app.user?.first_name} {app.user?.last_name} - 		- {currentUser.role !== 'viewer' && ( - - renderTooltip({props, text: 'Open in app builder'})} - > - - Edit - - - - )} - - {!this.props.darkMode && - renderTooltip({props, text: app?.current_version_id == null ? 'App does not have a deployed version' : 'Open in app viewer'})} - > - {launch } - - } - {this.props.darkMode && - renderTooltip({props, text: app?.current_version_id == null ? 'App does not have a deployed version' : 'Open in app viewer'})} - > - {launch } - - } - - - this.deleteApp(app)} - cloneApp={() => this.cloneApp(app)} - /> -
- {this.pageCount() > 10 && ( + {this.pageCount() > 10 && ( )}
+
-
-
- } + )}
); } diff --git a/frontend/src/InvitationPage/InvitationPage.jsx b/frontend/src/InvitationPage/InvitationPage.jsx index 0b4696bb5c..3298e40787 100644 --- a/frontend/src/InvitationPage/InvitationPage.jsx +++ b/frontend/src/InvitationPage/InvitationPage.jsx @@ -9,9 +9,8 @@ class InvitationPage extends React.Component { this.state = { isLoading: false, - newSignup: queryString.parse(props.location.search).signup + newSignup: queryString.parse(props.location.search).signup, }; - } handleChange = (event) => { @@ -33,7 +32,7 @@ class InvitationPage extends React.Component { toast.success('Password has been set successfully.', { hideProgressBar: true, position: 'top-center' }); this.props.history.push('/login'); }) - .catch(( { error }) => { + .catch(({ error }) => { this.setState({ isLoading: false }); toast.error(error, { hideProgressBar: true, position: 'top-center' }); }); @@ -53,8 +52,8 @@ class InvitationPage extends React.Component {

Set up your account

- {newSignup === "true" && - <> + {newSignup === 'true' && ( + <>
@@ -94,9 +93,9 @@ class InvitationPage extends React.Component {
- - } - + + )} +
@@ -125,7 +124,8 @@ class InvitationPage extends React.Component {

- By clicking the button below, you agree to our Terms and Conditions. + By clicking the button below, you agree to our{' '} + Terms and Conditions.

-
diff --git a/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx b/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx index f822a298f1..9eb28960bb 100644 --- a/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx +++ b/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx @@ -2,7 +2,6 @@ import React from 'react'; import { authenticationService, organizationService, organizationUserService } from '@/_services'; import 'react-toastify/dist/ReactToastify.css'; import { Header } from '@/_components'; -import Skeleton from 'react-loading-skeleton'; import SelectSearch, { fuzzySearch } from 'react-select-search'; import { toast } from 'react-toastify'; import { history } from '@/_helpers'; @@ -18,11 +17,52 @@ class ManageOrgUsers extends React.Component { showNewUserForm: false, creatingUser: false, newUser: {}, + role: '', idChangingRole: null, archivingUser: null, + fields: {}, + errors: {}, }; } + validateEmail(email) { + console.log(email); + const re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; + return re.test(String(email).toLowerCase()); + } + + handleValidation() { + let fields = this.state.fields; + let errors = {}; + //Name + if (!fields['firstName']) { + errors['firstName'] = 'This field is required'; + } else if (typeof fields['firstName'] !== 'undefined') { + if (!fields['firstName'].match(/^[a-zA-Z]+$/)) { + errors['firstName'] = 'Only letters are allowed'; + } + } + if (!fields['lastName']) { + errors['lastName'] = 'This field is required'; + } else if (typeof fields['lastName'] !== 'undefined') { + if (!fields['lastName'].match(/^[a-zA-Z]+$/)) { + errors['lastName'] = 'Only letters are allowed'; + } + } + //Email + if (!fields['email']) { + errors['email'] = 'This field is required'; + } else if (!this.validateEmail(fields['email'])) { + errors['email'] = 'Email is not valid'; + } + if (!fields['role']) { + errors['role'] = 'This field is required'; + } + + this.setState({ errors: errors }); + return Object.keys(errors).length === 0; + } + componentDidMount() { this.fetchUsers(); } @@ -40,18 +80,17 @@ class ManageOrgUsers extends React.Component { ); }; - changeNewUserOption = (option, value) => { + changeNewUserOption = (name, e) => { + let fields = this.state.fields; + fields[name] = e.target.value; + this.setState({ - newUser: { - ...this.state.newUser, - [option]: value, - }, + fields, }); }; changeNewUserRole = (id, role) => { this.setState({ idChangingRole: id }); - organizationUserService .changeRole(id, role) .then(() => { @@ -80,24 +119,42 @@ class ManageOrgUsers extends React.Component { }); }; - createUser = () => { - this.setState({ - creatingUser: true, - }); + createUser = (event) => { + event.preventDefault(); - const { firstName, lastName, email, role } = this.state.newUser; + if (this.handleValidation()) { + let fields = {}; + Object.keys(fields).map(key => { fields[key] = '' }) - organizationUserService - .create(firstName, lastName, email, role) - .then(() => { - this.setState({ creatingUser: false, showNewUserForm: false, newUser: {} }); - toast.success('User has been created', { hideProgressBar: true, position: 'top-center' }); - this.fetchUsers(); - }) - .catch(({ error }) => { - toast.error(error, { hideProgressBar: true, position: 'top-center' }); - this.setState({ creatingUser: false, showNewUserForm: true, newUser: {} }); + this.setState({ + creatingUser: true, + fields: fields, }); + + organizationUserService + .create( + this.state.fields.firstName, + this.state.fields.lastName, + this.state.fields.email, + this.state.fields.role + ) + .then(() => { + toast.success('User has been created', { hideProgressBar: true, position: 'top-center' }); + this.fetchUsers(); + this.setState({ creatingUser: false, showNewUserForm: false }); + }) + .catch(({ error }) => { + toast.error(error, { hideProgressBar: true, position: 'top-center' }); + }); + } else { + this.setState({ creatingUser: false, showNewUserForm: true }); + } + }; + + dropdownVal = (role) => { + this.setState({ + fields: { ...this.state.fields, role }, + }); }; logout = () => { @@ -112,7 +169,16 @@ class ManageOrgUsers extends React.Component { }; render() { - const { isLoading, showNewUserForm, creatingUser, users, newUser, idChangingRole, archivingUser } = this.state; + const { + isLoading, + role, + showNewUserForm, + creatingUser, + users, + errors, + idChangingRole, + archivingUser, + } = this.state; return (
@@ -152,20 +218,22 @@ class ManageOrgUsers extends React.Component { type="text" className="form-control" placeholder="Enter First Name" - onChange={(e) => { - this.changeNewUserOption('firstName', e.target.value); - }} + name="firstName" + onChange={this.changeNewUserOption.bind(this, 'firstName')} + value={this.state.fields['firstName']} /> + {this.state.errors['firstName']}
{ - this.changeNewUserOption('lastName', e.target.value); - }} + name="lastName" + onChange={this.changeNewUserOption.bind(this, 'lastName')} + value={this.state.fields['lastName']} /> + {this.state.errors['lastName']}
@@ -177,10 +245,11 @@ class ManageOrgUsers extends React.Component { className="form-control" aria-describedby="emailHelp" placeholder="Enter email" - onChange={(e) => { - this.changeNewUserOption('email', e.target.value); - }} + name="email" + onChange={this.changeNewUserOption.bind(this, 'email')} + value={this.state.fields['email']} /> + {this.state.errors['email']}
@@ -190,28 +259,26 @@ class ManageOrgUsers extends React.Component { options={['Admin', 'Developer', 'Viewer'].map((role) => { return { name: role, value: role.toLowerCase() }; })} - value={newUser.role} search={true} - onChange={(value) => { - this.changeNewUserOption('role', value); - }} + value={role} + name="role" + onChange={this.dropdownVal} filterOptions={fuzzySearch} placeholder="Select.." /> + {errors.role}
@@ -240,8 +307,8 @@ class ManageOrgUsers extends React.Component { {isLoading ? ( - {Array.from(Array(4)).map(() => ( - + {Array.from(Array(4)).map((index) => ( +
{ this.setState({ isLoading: false, - authSucess: true + authSucess: true, }); }) .catch(function (error) { diff --git a/frontend/src/Onboarding/OnboardingModal.jsx b/frontend/src/Onboarding/OnboardingModal.jsx index 8fb0874ee8..3b9189b1eb 100644 --- a/frontend/src/Onboarding/OnboardingModal.jsx +++ b/frontend/src/Onboarding/OnboardingModal.jsx @@ -8,52 +8,52 @@ class OnboardingModal extends React.Component { this.state = { showModal: true, - options: { - - } + options: {}, }; } - componentDidMount() { - } + componentDidMount() {} hideModal = () => { this.setState({ - showModal: false + showModal: false, }); }; finishOnboarding = () => { this.setState({ - showModal: false + showModal: false, }); tooljetService.finishOnboarding(this.state.options); - } + }; skipOnboard = () => { tooljetService.skipOnboarding(); - this.setState({showModal: false}); - } + this.setState({ showModal: false }); + }; changeOptions = (option, value) => { this.setState({ options: { ...this.state.options, - [option]: value - } + [option]: value, + }, }); }; - render() { - return ( - + - - Finish ToolJet installation - + Finish ToolJet installation @@ -61,7 +61,6 @@ class OnboardingModal extends React.Component { We hate spam and we will never spam onComponentOptionChanged(component, 'value', e.target.value)} type="text" className="form-control mt-3" placeholder={'Your name'} @@ -71,7 +70,6 @@ class OnboardingModal extends React.Component { /> onComponentOptionChanged(component, 'value', e.target.value)} type="text" className="form-control mt-3" placeholder={'Your email'} @@ -79,27 +77,21 @@ class OnboardingModal extends React.Component { this.changeOptions('email', e.target.value); }} /> -
- +
- - ); diff --git a/frontend/src/SettingsPage/SettingsPage.jsx b/frontend/src/SettingsPage/SettingsPage.jsx index 716c6bb265..8fbefba418 100644 --- a/frontend/src/SettingsPage/SettingsPage.jsx +++ b/frontend/src/SettingsPage/SettingsPage.jsx @@ -5,39 +5,44 @@ import { Header } from '@/_components'; import { toast } from 'react-toastify'; function SettingsPage(props) { - const [firstName, setFirstName] = React.useState(authenticationService.currentUserValue.first_name) - const [lastName, setLastName] = React.useState(authenticationService.currentUserValue.last_name) - const [currentpassword, setCurrentPassword] = React.useState('') - const [newPassword, setNewPassword] = React.useState('') - const [updateInProgress, setUpdateInProgress] = React.useState(false) - const [passwordChangeInProgress, setPasswordChangeInProgress] = React.useState(false) + const [firstName, setFirstName] = React.useState(authenticationService.currentUserValue.first_name); + const [lastName, setLastName] = React.useState(authenticationService.currentUserValue.last_name); + const [currentpassword, setCurrentPassword] = React.useState(''); + const [newPassword, setNewPassword] = React.useState(''); + const [updateInProgress, setUpdateInProgress] = React.useState(false); + const [passwordChangeInProgress, setPasswordChangeInProgress] = React.useState(false); const updateDetails = async () => { setUpdateInProgress(true); const updatedDetails = await userService.updateCurrentUser(firstName, lastName); - authenticationService.updateCurrentUserDetails(updatedDetails) + authenticationService.updateCurrentUserDetails(updatedDetails); toast.success('Details updated!', { hideProgressBar: true, autoClose: 3000 }); setUpdateInProgress(false); - } + }; const changePassword = async () => { - setPasswordChangeInProgress(true) - const response = userService.changePassword(currentpassword, newPassword) - response.then(() => { - toast.success('Password updated successfully', { hideProgressBar: true, autoClose: 3000 }); - setCurrentPassword('') - setNewPassword('') - }).catch(() => { - toast.error('Please verify that you have entered the correct password', { hideProgressBar: true, autoClose: 3000 }); - }) + setPasswordChangeInProgress(true); + const response = userService.changePassword(currentpassword, newPassword); + response + .then(() => { + toast.success('Password updated successfully', { hideProgressBar: true, autoClose: 3000 }); + setCurrentPassword(''); + setNewPassword(''); + }) + .catch(() => { + toast.error('Please verify that you have entered the correct password', { + hideProgressBar: true, + autoClose: 3000, + }); + }); setPasswordChangeInProgress(false); - } + }; - const newPasswordKeyPressHandler = async event => { + const newPasswordKeyPressHandler = async (event) => { if (event.key === 'Enter') { - changePassword() + changePassword(); } - } + }; return (
@@ -57,35 +62,35 @@ function SettingsPage(props) {
-
-
-

Profile

+
+
+

Profile

-
+
-
- +
+ setFirstName(event.target.value)} + onChange={(event) => setFirstName(event.target.value)} />
-
- +
+ setLastName(event.target.value)} + onChange={(event) => setLastName(event.target.value)} />
@@ -93,10 +98,10 @@ function SettingsPage(props) { - Update + > + Update {/* An !important style on theme.scss is making the last child of every .card-body color to #c3c3c3!. */} {/* The div below is a placeholder to prevent it from affecting the button above. */} @@ -104,51 +109,51 @@ function SettingsPage(props) {

-
-
-

Change password

+
+
+

Change password

-
+
-
-
- - setCurrentPassword(event.target.value)} - /> -
-
-
-
- - setNewPassword(event.target.value)} - onKeyPress={newPasswordKeyPressHandler} - /> -
+
+
+ + setCurrentPassword(event.target.value)} + /> +
+
+
+
+ + setNewPassword(event.target.value)} + onKeyPress={newPasswordKeyPressHandler} + />
- - Change password - - {/* An !important style on theme.scss is making the last child of every .card-body color to #c3c3c3!. */} - {/* The div below is a placeholder to prevent it from affecting the button above. */} -
+ + Change password + + {/* An !important style on theme.scss is making the last child of every .card-body color to #c3c3c3!. */} + {/* The div below is a placeholder to prevent it from affecting the button above. */} +
+
diff --git a/frontend/src/SignupPage/SignupPage.jsx b/frontend/src/SignupPage/SignupPage.jsx index bc72215006..e432398b95 100644 --- a/frontend/src/SignupPage/SignupPage.jsx +++ b/frontend/src/SignupPage/SignupPage.jsx @@ -8,7 +8,7 @@ class SignupPage extends React.Component { super(props); this.state = { - isLoading: false + isLoading: false, }; } @@ -25,8 +25,9 @@ class SignupPage extends React.Component { authenticationService.signup(email).then( () => { + // eslint-disable-next-line no-unused-vars const { from } = this.props.location.state || { from: { pathname: '/' } }; - this.setState({ isLoading: false, signupSuccess: true }); + this.setState({ isLoading: false, signupSuccess: true }); }, () => { toast.error('Invalid email', { hideProgressBar: true, position: 'top-center' }); @@ -47,7 +48,7 @@ class SignupPage extends React.Component {
- {!signupSuccess && + {!signupSuccess && (

Create a ToolJet account

@@ -66,19 +67,17 @@ class SignupPage extends React.Component {
- } - {signupSuccess && -
Please check your email for confirmation link
- } + )} + {signupSuccess &&
Please check your email for confirmation link
} - {!signupSuccess && + {!signupSuccess && (
Already have an account?   Sign in
- } + )}
); diff --git a/frontend/src/_components/ConfirmDialog.jsx b/frontend/src/_components/ConfirmDialog.jsx index e532ef87b6..841db68acb 100644 --- a/frontend/src/_components/ConfirmDialog.jsx +++ b/frontend/src/_components/ConfirmDialog.jsx @@ -2,9 +2,7 @@ import React, { useState, useEffect } from 'react'; import Modal from 'react-bootstrap/Modal'; import Button from 'react-bootstrap/Button'; -export function ConfirmDialog({ - show, message, onConfirm, onCancel, confirmButtonLoading -}) { +export function ConfirmDialog({ show, message, onConfirm, onCancel, confirmButtonLoading }) { const [showModal, setShow] = useState(show); useEffect(() => { @@ -33,7 +31,12 @@ export function ConfirmDialog({ - diff --git a/frontend/src/_components/DarkModeToggle.jsx b/frontend/src/_components/DarkModeToggle.jsx index d0afa589d1..03a3ae3033 100644 --- a/frontend/src/_components/DarkModeToggle.jsx +++ b/frontend/src/_components/DarkModeToggle.jsx @@ -69,7 +69,13 @@ export const DarkModeToggle = function DarkModeToggle({ darkMode = false, switch - + diff --git a/frontend/src/_components/DynamicForm.jsx b/frontend/src/_components/DynamicForm.jsx index 35a6aa6998..edc0b43d5a 100644 --- a/frontend/src/_components/DynamicForm.jsx +++ b/frontend/src/_components/DynamicForm.jsx @@ -101,7 +101,7 @@ const DynamicForm = ({ schema, optionchanged, createDataSource, options, isSavin const Element = getElement(type); return ( -
+
{$label && (
+ ); +}; diff --git a/frontend/src/_components/Pagination.jsx b/frontend/src/_components/Pagination.jsx index 6534c1a600..2ae3c10bd2 100644 --- a/frontend/src/_components/Pagination.jsx +++ b/frontend/src/_components/Pagination.jsx @@ -1,10 +1,12 @@ import React from 'react'; -export const Pagination = function Pagination({ - currentPage, count, totalPages, pageChanged -}) { +export const Pagination = function Pagination({ currentPage, count, totalPages, pageChanged }) { function renderPageItem(i) { - return
  • gotoPage(i + 1)} className={`page-item ${currentPage === i + 1 ? 'active' : ''}`}>{i + 1}
    • ; + return ( +
  • gotoPage(i + 1)} className={`page-item ${currentPage === i + 1 ? 'active' : ''}`}> + {i + 1} +
    • + ); } function gotoPage(page) { @@ -20,7 +22,7 @@ export const Pagination = function Pagination({ } function startingAppCount(currentPage) { - return ((currentPage - 1) * 10) + 1; + return (currentPage - 1) * 10 + 1; } function endingAppCount(currentPage, totalCount) { @@ -31,17 +33,48 @@ export const Pagination = function Pagination({ return (
    -

    Showing {startingAppCount(currentPage)} to {endingAppCount(currentPage, count)} of {count}

    +

    + Showing {startingAppCount(currentPage)} to {endingAppCount(currentPage, count)} of{' '} + {count} +

    • - + + + +
      • - {Array.from(Array(totalPages).keys()).map((i) => (renderPageItem(i)))} + {Array.from(Array(totalPages).keys()).map((i) => renderPageItem(i))}
    • - + + + +
    diff --git a/frontend/src/_components/PrivateRoute.jsx b/frontend/src/_components/PrivateRoute.jsx index e34fcf6d1d..3cbffe2b95 100644 --- a/frontend/src/_components/PrivateRoute.jsx +++ b/frontend/src/_components/PrivateRoute.jsx @@ -10,12 +10,19 @@ export const PrivateRoute = ({ component: Component, switchDarkMode, darkMode, . const currentUser = authenticationService.currentUserValue; if (!currentUser && !props.location.pathname.startsWith('/applications/')) { // not logged in so redirect to login page with the return url - return ; + return ( + + ); } // authorised so return component - return ; + return ; }} /> ); diff --git a/frontend/src/_components/Slack.jsx b/frontend/src/_components/Slack.jsx index 9bfd8ab0e6..467abd5295 100644 --- a/frontend/src/_components/Slack.jsx +++ b/frontend/src/_components/Slack.jsx @@ -3,18 +3,14 @@ import { datasourceService } from '@/_services'; import Button from '@/_ui/Button'; -const Slack = ({ - optionchanged, createDataSource, options, isSaving, selectedDataSource -}) => { +const Slack = ({ optionchanged, createDataSource, options, isSaving, selectedDataSource }) => { const [authStatus, setAuthStatus] = useState(null); function authGoogle() { const provider = 'slack'; setAuthStatus('waiting_for_url'); - const scope = options.access_type === 'chat:write' - ? 'chat:write,users:read' - : 'chat:write,users:read'; + const scope = options.access_type === 'chat:write' ? 'chat:write,users:read' : 'chat:write,users:read'; datasourceService.fetchOauth2BaseUrl(provider).then((data) => { const authUrl = `${data.url}&scope=${scope}&access_type=offline&prompt=select_account`; @@ -43,7 +39,10 @@ const Slack = ({
    Authorize
    -

    ToolJet can connect to Slack and list users, send messages, etc. Please select appropriate permission scopes.

    +

    + ToolJet can connect to Slack and list users, send messages, etc. Please select appropriate permission + scopes. +

    @@ -91,4 +92,4 @@ const Slack = ({ ); }; -export default Slack +export default Slack; diff --git a/frontend/src/_helpers/appUtils.js b/frontend/src/_helpers/appUtils.js index 4b7b5461e5..b2a86b028a 100644 --- a/frontend/src/_helpers/appUtils.js +++ b/frontend/src/_helpers/appUtils.js @@ -1,12 +1,10 @@ import React from 'react'; import { toast } from 'react-toastify'; -import { getDynamicVariables, resolveReferences } from '@/_helpers/utils'; +import { getDynamicVariables, resolveReferences, serializeNestedObjectToQueryParams } from '@/_helpers/utils'; import { dataqueryService } from '@/_services'; import _ from 'lodash'; import moment from 'moment'; import Tooltip from 'react-bootstrap/Tooltip'; -import { history } from '@/_helpers'; -import { serializeNestedObjectToQueryParams } from './utils'; import { componentTypes } from '../Editor/Components/components'; export function setStateAsync(_ref, state) { @@ -19,14 +17,14 @@ export function onComponentOptionsChanged(_ref, component, options) { const componentName = component.name; const components = _ref.state.currentState.components; let componentData = components[componentName]; - componentData = componentData || { }; + componentData = componentData || {}; for (const option of options) { componentData[option[0]] = option[1]; } return setStateAsync(_ref, { - currentState: { ..._ref.state.currentState, components: { ...components, [componentName]: componentData } } + currentState: { ..._ref.state.currentState, components: { ...components, [componentName]: componentData } }, }); } @@ -34,11 +32,11 @@ export function onComponentOptionChanged(_ref, component, option_name, value) { const componentName = component.name; const components = _ref.state.currentState.components; let componentData = components[componentName]; - componentData = componentData || { }; + componentData = componentData || {}; componentData[option_name] = value; return setStateAsync(_ref, { - currentState: { ..._ref.state.currentState, components: { ...components, [componentName]: componentData } } + currentState: { ..._ref.state.currentState, components: { ...components, [componentName]: componentData } }, }); } @@ -57,7 +55,7 @@ export function runTransformation(_ref, rawData, transformation, query) { try { result = evalFunction(data, moment, _, currentState.components, currentState.queries, currentState.globals); } catch (err) { - console.log('Transformation failed for query: ', query.name ,err); + console.log('Transformation failed for query: ', query.name, err); toast.error(err.message, { hideProgressBar: true }); } @@ -66,12 +64,11 @@ export function runTransformation(_ref, rawData, transformation, query) { export async function executeActionsForEventId(_ref, eventId, component, mode) { const events = component.definition.events || []; - const filteredEvents = events.filter(event => event.eventId === eventId); + const filteredEvents = events.filter((event) => event.eventId === eventId); - for(const event of filteredEvents) { + for (const event of filteredEvents) { await executeAction(_ref, event, mode); - }; - + } } export function onComponentClick(_ref, id, component, mode = 'edit') { @@ -80,14 +77,14 @@ export function onComponentClick(_ref, id, component, mode = 'edit') { export function onQueryConfirm(_ref, queryConfirmationData) { _ref.setState({ - showQueryConfirmation: false + showQueryConfirmation: false, }); runQuery(_ref, queryConfirmationData.queryId, queryConfirmationData.queryName, true); } export function onQueryCancel(_ref) { _ref.setState({ - showQueryConfirmation: false + showQueryConfirmation: false, }); } @@ -98,7 +95,7 @@ async function copyToClipboard(text) { } catch (err) { console.log('Failed to copy!', err); } -}; +} function showModal(_ref, modalId, show) { const modalMeta = _ref.state.appDefinition.components[modalId]; @@ -110,85 +107,92 @@ function showModal(_ref, modalId, show) { ..._ref.state.currentState.components, [modalMeta.component.name]: { ..._ref.state.currentState.components[modalMeta.component.name], - show: show - } - } - } - } + show: show, + }, + }, + }, + }; - _ref.setState(newState) + _ref.setState(newState); return new Promise(function (resolve, reject) { resolve(); - }) + }); } function executeAction(_ref, event, mode) { if (event) { - if (event.actionId === 'show-alert') { - const message = resolveReferences(event.message, _ref.state.currentState); - toast(message, { hideProgressBar: true }); - return new Promise(function (resolve, reject) { - resolve(); - }) - } - - if (event.actionId === 'run-query') { - const { queryId, queryName } = event; - return runQuery(_ref, queryId, queryName); - } - - if (event.actionId === 'open-webpage') { - const url = resolveReferences(event.url, _ref.state.currentState); - window.open(url, '_blank'); - return new Promise(function (resolve, reject) { - resolve(); - }) - } - - if (event.actionId === 'go-to-app') { - const slug = resolveReferences(event.slug, _ref.state.currentState); - const queryParams = event.queryParams?.reduce((result, queryParam) => ({ - ...result, - ...{ - [resolveReferences(queryParam[0], _ref.state.currentState)]: resolveReferences(queryParam[1], _ref.state.currentState) - } - }), {}) - - let url =`/applications/${slug}`; - - if (queryParams) { - const queryPart = serializeNestedObjectToQueryParams(queryParams) - - if (queryPart.length > 0) - url = url + `?${queryPart}` + switch (event.actionId) { + case 'show-alert': { + const message = resolveReferences(event.message, _ref.state.currentState); + toast(message, { hideProgressBar: true }); + return new Promise(function (resolve, reject) { + resolve(); + }); } - if(mode === 'view') { - _ref.props.history.push(url); - } else { - if(confirm("The app will be opened in a new tab as the action is triggered from the editor.")) { - window.open(url, '_blank'); - } + case 'run-query': { + const { queryId, queryName } = event; + return runQuery(_ref, queryId, queryName); } - return new Promise(function (resolve, reject) { - resolve(); - }) - } - if (event.actionId === 'show-modal') - return showModal(_ref, event.modal, true) + case 'open-webpage': { + const url = resolveReferences(event.url, _ref.state.currentState); + window.open(url, '_blank'); + return new Promise(function (resolve, reject) { + resolve(); + }); + } - if (event.actionId === 'close-modal') - return showModal(_ref, event.modal, false) + case 'go-to-app': { + const slug = resolveReferences(event.slug, _ref.state.currentState); + const queryParams = event.queryParams?.reduce( + (result, queryParam) => ({ + ...result, + ...{ + [resolveReferences(queryParam[0], _ref.state.currentState)]: resolveReferences( + queryParam[1], + _ref.state.currentState + ), + }, + }), + {} + ); - if (event.actionId === 'copy-to-clipboard') { - const contentToCopy = resolveReferences(event.contentToCopy, _ref.state.currentState); - copyToClipboard(contentToCopy); + let url = `/applications/${slug}`; - return new Promise(function (resolve, reject) { - resolve(); - }) + if (queryParams) { + const queryPart = serializeNestedObjectToQueryParams(queryParams); + + if (queryPart.length > 0) url = url + `?${queryPart}`; + } + + if (mode === 'view') { + _ref.props.history.push(url); + } else { + if (confirm('The app will be opened in a new tab as the action is triggered from the editor.')) { + window.open(url, '_blank'); + } + } + return new Promise(function (resolve, reject) { + resolve(); + }); + } + + case 'show-modal': + return showModal(_ref, event.modal, true); + + case 'close-modal': + return showModal(_ref, event.modal, false); + + case 'copy-to-clipboard': { + const contentToCopy = resolveReferences(event.contentToCopy, _ref.state.currentState); + copyToClipboard(contentToCopy); + + return new Promise(function (resolve, reject) { + resolve(); + }); + } } } } @@ -197,54 +201,74 @@ export async function onEvent(_ref, eventName, options, mode = 'edit') { let _self = _ref; console.log('Event: ', eventName); - if (eventName === 'onRowClicked') { - const { component, data } = options; - _self.setState({ - currentState: { - ..._self.state.currentState, - components: { - ..._self.state.currentState.components, - [component.name]: { - ..._self.state.currentState.components[component.name], - selectedRow: data - } - } + const { component, data, rowId } = options; + _self.setState( + { + currentState: { + ..._self.state.currentState, + components: { + ..._self.state.currentState.components, + [component.name]: { + ..._self.state.currentState.components[component.name], + selectedRow: data, + selectedRowId: rowId, + }, + }, + }, + }, + () => { + executeActionsForEventId(_ref, 'onRowClicked', component, mode); } - }, () => { - executeActionsForEventId(_ref, 'onRowClicked', component, mode); - }); + ); } if (eventName === 'onTableActionButtonClicked') { - const { component, data, action } = options; - - _self.setState({ - currentState: { - ..._self.state.currentState, - components: { - ..._self.state.currentState.components, - [component.name]: { - ..._self.state.currentState.components[component.name], - selectedRow: data - } + const { component, data, action, rowId } = options; + _self.setState( + { + currentState: { + ..._self.state.currentState, + components: { + ..._self.state.currentState.components, + [component.name]: { + ..._self.state.currentState.components[component.name], + selectedRow: data, + selectedRowId: rowId, + }, + }, + }, + }, + () => { + if (action) { + action.events?.forEach((event) => { + if (event.actionId) { + // the event param uses a hacky workaround for using same format used by event manager ( multiple handlers ) + executeAction(_self, { ...event, ...event.options }, mode); + } + }); + } else { + console.log('No action is associated with this event'); } } - }, () => { - if(action) { - action.events?.forEach((event => { - if (event.actionId) { - // the event param uses a hacky workaround for using same format used by event manager ( multiple handlers ) - executeAction(_self, { ...event, ...event.options } , mode); - } - }) ) - } else { - console.log('No action is associated with this event'); - } - }); + ); } - if (['onDetect', 'onCheck', 'onUnCheck', 'onBoundsChange', 'onCreateMarker', 'onMarkerClick', 'onPageChanged', 'onSearch', 'onChange', 'onSelectionChange', 'onSelect'].includes(eventName)) { + if ( + [ + 'onDetect', + 'onCheck', + 'onUnCheck', + 'onBoundsChange', + 'onCreateMarker', + 'onMarkerClick', + 'onPageChanged', + 'onSearch', + 'onChange', + 'onSelectionChange', + 'onSelect', + ].includes(eventName) + ) { const { component } = options; executeActionsForEventId(_ref, eventName, component, mode); } @@ -261,24 +285,33 @@ export async function onEvent(_ref, eventName, options, mode = 'edit') { } function getQueryVariables(options, state) { - let queryVariables = {}; + const optionsType = typeof options; + switch (optionsType) { + case 'string': { + const dynamicVariables = getDynamicVariables(options) || []; + dynamicVariables.forEach((variable) => { + queryVariables[variable] = resolveReferences(variable, state); + }); + break; + } - if( typeof options === 'string' ) { - const dynamicVariables = getDynamicVariables(options) || []; - dynamicVariables.forEach((variable) => { - queryVariables[variable] = resolveReferences(variable, state); - }); - } else if(Array.isArray(options)) { - options.forEach((element) => { - _.merge(queryVariables, getQueryVariables(element, state)) - }) - } else if(typeof options ==="object") { - Object.keys(options || {}).forEach((key) => { - _.merge(queryVariables, getQueryVariables(options[key], state)) - }) + case 'object': { + if (Array.isArray(options)) { + options.forEach((element) => { + _.merge(queryVariables, getQueryVariables(element, state)); + }); + } else { + Object.keys(options || {}).forEach((key) => { + _.merge(queryVariables, getQueryVariables(options[key], state)); + }); + } + break; + } + + default: + break; } - return queryVariables; } @@ -288,42 +321,51 @@ export function previewQuery(_ref, query) { _ref.setState({ previewLoading: true }); return new Promise(function (resolve, reject) { - dataqueryService.preview(query, options).then(data => { + dataqueryService + .preview(query, options) + .then((data) => { + let finalData = data.data; - let finalData = data.data; - - if (query.options.enableTransformation) { - finalData = runTransformation(_ref, finalData, query.options.transformation, query); - } - - _ref.setState({ previewLoading: false, queryPreviewData: finalData }); - - if(data.status === 'failed') { - toast.error(`${data.message}: ${data.description}`, { position: 'bottom-center', hideProgressBar: true, autoClose: 10000 }); - } else { - if (data.status === 'needs_oauth') { - const url = data.data.auth_url; // Backend generates and return sthe auth url - fetchOAuthToken(url, query.data_source_id); + if (query.options.enableTransformation) { + finalData = runTransformation(_ref, finalData, query.options.transformation, query); } - if(data.status === 'ok') { - toast.info(`Query completed.`, { - hideProgressBar: true, - position: 'bottom-center', - }); - } - } - resolve(); - }).catch(({ error, data } ) => { - _ref.setState({ previewLoading: false, queryPreviewData: data }); - toast.error(error, { hideProgressBar: true, autoClose: 3000 }); - reject( { error, data }); - });; + _ref.setState({ previewLoading: false, queryPreviewData: finalData }); + switch (data.status) { + case 'failed': { + toast.error(`${data.message}: ${data.description}`, { + position: 'bottom-center', + hideProgressBar: true, + autoClose: 10000, + }); + break; + } + case 'needs_oauth': { + const url = data.data.auth_url; // Backend generates and return sthe auth url + fetchOAuthToken(url, query.data_source_id); + break; + } + case 'ok': { + toast.info(`Query completed.`, { + hideProgressBar: true, + position: 'bottom-center', + }); + break; + } + } + + resolve(); + }) + .catch(({ error, data }) => { + _ref.setState({ previewLoading: false, queryPreviewData: data }); + toast.error(error, { hideProgressBar: true, autoClose: 3000 }); + reject({ error, data }); + }); }); } export function runQuery(_ref, queryId, queryName, confirmed = undefined) { - const query = _ref.state.app.data_queries.find(query => query.id === queryId); + const query = _ref.state.app.data_queries.find((query) => query.id === queryId); let dataQuery = {}; if (query) { @@ -335,13 +377,14 @@ export function runQuery(_ref, queryId, queryName, confirmed = undefined) { const options = getQueryVariables(dataQuery.options, _ref.state.currentState); - if (options.requestConfirmation) { + if (dataQuery.options.requestConfirmation) { if (confirmed === undefined) { _ref.setState({ showQueryConfirmation: true, queryConfirmationData: { - queryId, queryName - } + queryId, + queryName, + }, }); return; } @@ -354,115 +397,128 @@ export function runQuery(_ref, queryId, queryName, confirmed = undefined) { ..._ref.state.currentState.queries[queryName], isLoading: true, data: [], - rawData: [] - } + rawData: [], + }, }, - errors: {} + errors: {}, }; let _self = _ref; return new Promise(function (resolve, reject) { _self.setState({ currentState: newState }, () => { - dataqueryService.run(queryId, options).then(data => { + dataqueryService + .run(queryId, options) + .then((data) => { + if (data.status === 'needs_oauth') { + const url = data.data.auth_url; // Backend generates and return sthe auth url + fetchOAuthToken(url, dataQuery.data_source_id); + } - if (data.status === 'needs_oauth') { - const url = data.data.auth_url; // Backend generates and return sthe auth url - fetchOAuthToken(url, dataQuery.data_source_id); - } + if (data.status === 'failed') { + console.error(data.message); - if (data.status === 'failed') { - toast.error(data.message, { hideProgressBar: true, autoClose: 3000 }); + return _self.setState( + { + currentState: { + ..._self.state.currentState, + queries: { + ..._self.state.currentState.queries, + [queryName]: { + ..._self.state.currentState.queries[queryName], + isLoading: false, + }, + }, + errors: { + ..._self.state.currentState.errors, + [queryName]: { + type: 'query', + data: data, + options: options, + }, + }, + }, + }, + () => { + resolve(); + onEvent(_self, 'onDataQueryFailure', { definition: { events: dataQuery.options.events } }); + } + ); + } - return ( - _self.setState({ + let rawData = data.data; + let finalData = data.data; + + if (dataQuery.options.enableTransformation) { + finalData = runTransformation(_self, rawData, dataQuery.options.transformation, dataQuery); + } + + if (dataQuery.options.showSuccessNotification) { + const notificationDuration = dataQuery.options.notificationDuration || 5; + toast.success(dataQuery.options.successMessage, { + hideProgressBar: true, + autoClose: notificationDuration * 1000, + }); + } + + if (dataQuery.options.requestConfirmation) { + toast.info(`Query (${dataQuery.name}) completed.`, { + hideProgressBar: true, + position: 'bottom-center', + }); + } + + _self.setState( + { currentState: { ..._self.state.currentState, queries: { ..._self.state.currentState.queries, [queryName]: { ..._self.state.currentState.queries[queryName], - isLoading: false - } + data: finalData, + rawData, + isLoading: false, + }, }, - errors: { - ..._self.state.currentState.errors, - [queryName]: { - type: 'query', - data: data, - options: options - } - } - } - }, () => { + }, + }, + () => { resolve(); - onEvent( - _self, - 'onDataQueryFailure', - { definition: { events: dataQuery.options.events } } - ) - }) - ) - } - - let rawData = data.data; - let finalData = data.data; - - if (dataQuery.options.enableTransformation) { - finalData = runTransformation(_self, rawData, dataQuery.options.transformation, dataQuery); - } - - if (dataQuery.options.showSuccessNotification) { - const notificationDuration = dataQuery.options.notificationDuration || 5; - toast.success(dataQuery.options.successMessage, { hideProgressBar: true, autoClose: notificationDuration * 1000 }); - } - - _self.setState({ - currentState: { - ..._self.state.currentState, - queries: { - ..._self.state.currentState.queries, - [queryName]: { - ..._self.state.currentState.queries[queryName], - data: finalData, - rawData, - isLoading: false - } + onEvent(_self, 'onDataQuerySuccess', { definition: { events: dataQuery.options.events } }); } - } - }, () => { - resolve(); - onEvent( - _self, - 'onDataQuerySuccess', - { definition: { events: dataQuery.options.events } } - ) - }); - }).catch(( { error } ) => { - toast.error(error, { hideProgressBar: true, autoClose: 3000 }); - _self.setState({ - currentState: { - ..._self.state.currentState, - queries: { - ..._self.state.currentState.queries, - [queryName]: { - isLoading: false - } + ); + }) + .catch(({ error }) => { + toast.error(error, { hideProgressBar: true, autoClose: 3000 }); + _self.setState( + { + currentState: { + ..._self.state.currentState, + queries: { + ..._self.state.currentState.queries, + [queryName]: { + isLoading: false, + }, + }, + }, + }, + () => { + resolve(); } - } - }, () => { - resolve(); + ); }); - }); }); }); } -export function renderTooltip({props, text}) { - return - {text} - -}; +export function renderTooltip({ props, text }) { + return ( + + {text} + + ); +} export function computeComponentState(_ref, components) { let componentState = {}; @@ -475,19 +531,15 @@ export function computeComponentState(_ref, components) { const existingValues = currentComponents[existingComponentName]; componentState[component.component.name] = { ...componentMeta.exposedVariables, id: key, ...existingValues }; - }); - _ref.setState({ + return setStateAsync(_ref, { currentState: { ..._ref.state.currentState, components: { ...componentState, }, }, - defaultComponentStateComputed: true - }, () => { - console.log('Default component state computed and set') + defaultComponentStateComputed: true, }); - -} \ No newline at end of file +} diff --git a/frontend/src/_helpers/auth-header.js b/frontend/src/_helpers/auth-header.js index 2bbac18790..acb61f169a 100644 --- a/frontend/src/_helpers/auth-header.js +++ b/frontend/src/_helpers/auth-header.js @@ -6,10 +6,10 @@ export function authHeader() { if (currentUser && currentUser.auth_token) { return { Authorization: `Bearer ${currentUser.auth_token}`, - 'Content-Type': 'application/json' + 'Content-Type': 'application/json', }; } return { - 'Content-Type': 'application/json' + 'Content-Type': 'application/json', }; } diff --git a/frontend/src/_helpers/handle-response.js b/frontend/src/_helpers/handle-response.js index a77ce5ca5c..2170fef721 100644 --- a/frontend/src/_helpers/handle-response.js +++ b/frontend/src/_helpers/handle-response.js @@ -1,7 +1,7 @@ import { authenticationService } from '@/_services'; export function handleResponse(response) { - return response.text().then(text => { + return response.text().then((text) => { const data = text && JSON.parse(text); if (!response.ok) { if ([401].indexOf(response.status) !== -1) { @@ -11,7 +11,7 @@ export function handleResponse(response) { } const error = (data && data.message) || response.statusText; - return Promise.reject({ error, data } ); + return Promise.reject({ error, data }); } return data; diff --git a/frontend/src/_helpers/utils.js b/frontend/src/_helpers/utils.js index 1dceaa2d48..4a4febb9d3 100644 --- a/frontend/src/_helpers/utils.js +++ b/frontend/src/_helpers/utils.js @@ -100,6 +100,7 @@ export function resolveReferences(object, state, defaultValue, customObjects = { return object; } } + // eslint-disable-next-line no-fallthrough default: { if (withError) return [object, error]; return object; @@ -168,6 +169,7 @@ export const serializeNestedObjectToQueryParams = function (obj, prefix) { var k = prefix ? prefix + '[' + p + ']' : p, v = obj[p]; str.push( + // eslint-disable-next-line no-undef v !== null && typeof v === 'object' ? serialize(v, k) : encodeURIComponent(k) + '=' + encodeURIComponent(v) ); } diff --git a/frontend/src/_hooks/use-height-transition.jsx b/frontend/src/_hooks/use-height-transition.jsx index a83d09e3b3..582940a02b 100644 --- a/frontend/src/_hooks/use-height-transition.jsx +++ b/frontend/src/_hooks/use-height-transition.jsx @@ -19,6 +19,7 @@ function useHeight(on = true) { ro.observe(ref.current, {}); } return () => ro.disconnect(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [on, ref.current]); return [ref, height]; diff --git a/frontend/src/_hooks/use-popover.jsx b/frontend/src/_hooks/use-popover.jsx index 1e9f8389c1..530309d89a 100644 --- a/frontend/src/_hooks/use-popover.jsx +++ b/frontend/src/_hooks/use-popover.jsx @@ -1,3 +1,4 @@ +/* eslint-disable react-hooks/exhaustive-deps */ import { useRef, useState, useEffect, useCallback } from 'react'; const noop = () => {}; const useEscapeHandler = (handler = noop, dependencies = []) => { @@ -25,9 +26,13 @@ const useClickOutside = (handler = noop, dependencies) => { callbackRef.current = handler; }); useEffect(() => { - document === null || document === void 0 ? void 0 : document.addEventListener('click', outsideClickHandler, { capture: true }); + document === null || document === void 0 + ? void 0 + : document.addEventListener('click', outsideClickHandler, { capture: true }); return () => - document === null || document === void 0 ? void 0 : document.removeEventListener('click', outsideClickHandler, { capture: true }); + document === null || document === void 0 + ? void 0 + : document.removeEventListener('click', outsideClickHandler, { capture: true }); }, dependencies); return ref; }; diff --git a/frontend/src/_hooks/use-router.jsx b/frontend/src/_hooks/use-router.jsx index fdc159d82c..33b42f9b94 100644 --- a/frontend/src/_hooks/use-router.jsx +++ b/frontend/src/_hooks/use-router.jsx @@ -1,10 +1,5 @@ import { useMemo } from 'react'; -import { - useParams, - useLocation, - useHistory, - useRouteMatch, -} from 'react-router-dom'; +import { useParams, useLocation, useHistory, useRouteMatch } from 'react-router-dom'; import queryString from 'query-string'; export default function useRouter() { diff --git a/frontend/src/_hooks/usePinnedPopover.jsx b/frontend/src/_hooks/usePinnedPopover.jsx index 8505428f24..d321cc6bf9 100644 --- a/frontend/src/_hooks/usePinnedPopover.jsx +++ b/frontend/src/_hooks/usePinnedPopover.jsx @@ -2,20 +2,21 @@ import React from 'react'; import usePopover from './use-popover'; const usePinnedPopover = (defaultOption = false) => { - const [open, trigger, content, setOpen] = usePopover(defaultOption) - const [popoverPinned, setPopoverPinned] = React.useState(defaultOption) - - const updatePopoverPinnedState = () => { - setPopoverPinned((prev) => !prev) + const [open, trigger, content, setOpen] = usePopover(defaultOption); + const [popoverPinned, setPopoverPinned] = React.useState(defaultOption); + + const updatePopoverPinnedState = () => { + setPopoverPinned((prev) => !prev); + }; + + React.useEffect(() => { + if (popoverPinned) { + setOpen(true); } - - React.useEffect(() => { - if(popoverPinned) { - setOpen(true) - } - },[popoverPinned]) + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [popoverPinned]); - return [open, trigger, content, popoverPinned, updatePopoverPinnedState] -} + return [open, trigger, content, popoverPinned, updatePopoverPinnedState]; +}; -export default usePinnedPopover; \ No newline at end of file +export default usePinnedPopover; diff --git a/frontend/src/_services/app.service.js b/frontend/src/_services/app.service.js index 4dbe933d00..66a8caa513 100644 --- a/frontend/src/_services/app.service.js +++ b/frontend/src/_services/app.service.js @@ -14,7 +14,7 @@ export const appService = { getAppUsers, createAppUser, setVisibility, - setSlug + setSlug, }; function getConfig() { @@ -24,15 +24,12 @@ function getConfig() { function getAll(page, folder) { const requestOptions = { method: 'GET', headers: authHeader() }; - if (page === 0) - return fetch(`${config.apiUrl}/apps`, requestOptions).then(handleResponse); - else - return fetch(`${config.apiUrl}/apps?page=${page}&folder=${folder || ''}`, requestOptions).then(handleResponse); + if (page === 0) return fetch(`${config.apiUrl}/apps`, requestOptions).then(handleResponse); + else return fetch(`${config.apiUrl}/apps?page=${page}&folder=${folder || ''}`, requestOptions).then(handleResponse); } function createApp() { - const body = { - }; + const body = {}; const requestOptions = { method: 'POST', headers: authHeader(), body: JSON.stringify(body) }; return fetch(`${config.apiUrl}/apps`, requestOptions).then(handleResponse); @@ -77,7 +74,7 @@ function createAppUser(app_id, org_user_id, role) { const body = { app_id, org_user_id, - role + role, }; const requestOptions = { method: 'POST', headers: authHeader(), body: JSON.stringify(body) }; @@ -85,7 +82,11 @@ function createAppUser(app_id, org_user_id, role) { } function setVisibility(appId, visibility) { - const requestOptions = { method: 'PUT', headers: authHeader(), body: JSON.stringify({ app: { is_public: visibility } }) }; + const requestOptions = { + method: 'PUT', + headers: authHeader(), + body: JSON.stringify({ app: { is_public: visibility } }), + }; return fetch(`${config.apiUrl}/apps/${appId}`, requestOptions).then(handleResponse); } diff --git a/frontend/src/_services/appVersion.service.js b/frontend/src/_services/appVersion.service.js index 8e4731aa03..91bc7e096a 100644 --- a/frontend/src/_services/appVersion.service.js +++ b/frontend/src/_services/appVersion.service.js @@ -4,7 +4,7 @@ import { authHeader, handleResponse } from '@/_helpers'; export const appVersionService = { getAll, create, - save + save, }; function getAll(appId) { @@ -14,7 +14,7 @@ function getAll(appId) { function create(appId, versionName) { const body = { - versionName + versionName, }; const requestOptions = { method: 'POST', headers: authHeader(), body: JSON.stringify(body) }; @@ -23,7 +23,7 @@ function create(appId, versionName) { function save(appId, versionId, definition) { const body = { - definition + definition, }; const requestOptions = { method: 'PUT', headers: authHeader(), body: JSON.stringify(body) }; diff --git a/frontend/src/_services/authentication.service.js b/frontend/src/_services/authentication.service.js index 4d1c10c5b2..abc273d295 100644 --- a/frontend/src/_services/authentication.service.js +++ b/frontend/src/_services/authentication.service.js @@ -1,7 +1,6 @@ import { BehaviorSubject } from 'rxjs'; -import { history } from '@/_helpers'; +import { history, handleResponse } from '@/_helpers'; import config from 'config'; -import { handleResponse } from '@/_helpers'; const currentUserSubject = new BehaviorSubject(JSON.parse(localStorage.getItem('currentUser'))); @@ -11,19 +10,21 @@ export const authenticationService = { signup, updateCurrentUserDetails, currentUser: currentUserSubject.asObservable(), - get currentUserValue() { return currentUserSubject.value; } + get currentUserValue() { + return currentUserSubject.value; + }, }; function login(email, password) { const requestOptions = { method: 'POST', - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ email, password }) + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ email, password }), }; return fetch(`${config.apiUrl}/authenticate`, requestOptions) .then(handleResponse) - .then(user => { + .then((user) => { // store user details and jwt token in local storage to keep user logged in between page refreshes localStorage.setItem('currentUser', JSON.stringify(user)); currentUserSubject.next(user); @@ -34,7 +35,7 @@ function login(email, password) { function updateCurrentUserDetails(details) { const currentUserDetails = JSON.parse(localStorage.getItem('currentUser')); - const updatedUserDetails = Object.assign({}, currentUserDetails, details) + const updatedUserDetails = Object.assign({}, currentUserDetails, details); localStorage.setItem('currentUser', JSON.stringify(updatedUserDetails)); currentUserSubject.next(updatedUserDetails); } @@ -42,13 +43,13 @@ function updateCurrentUserDetails(details) { function signup(email) { const requestOptions = { method: 'POST', - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ email }) + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ email }), }; return fetch(`${config.apiUrl}/signup`, requestOptions) .then(handleResponse) - .then(user => { + .then((user) => { return user; }); } diff --git a/frontend/src/_services/dataquery.service.js b/frontend/src/_services/dataquery.service.js index 148bd0089b..8763ade8a9 100644 --- a/frontend/src/_services/dataquery.service.js +++ b/frontend/src/_services/dataquery.service.js @@ -7,7 +7,7 @@ export const dataqueryService = { run, update, del, - preview + preview, }; function getAll(appId) { @@ -21,7 +21,7 @@ function create(app_id, name, kind, options, data_source_id) { name, kind, options, - data_source_id + data_source_id, }; const requestOptions = { method: 'POST', headers: authHeader(), body: JSON.stringify(body) }; @@ -31,7 +31,7 @@ function create(app_id, name, kind, options, data_source_id) { function update(id, name, options) { const body = { options, - name + name, }; const requestOptions = { method: 'PATCH', headers: authHeader(), body: JSON.stringify(body) }; @@ -45,7 +45,7 @@ function del(id) { function run(queryId, options) { const body = { - options: options + options: options, }; const requestOptions = { method: 'POST', headers: authHeader(), body: JSON.stringify(body) }; @@ -55,7 +55,7 @@ function run(queryId, options) { function preview(query, options) { const body = { query, - options: options + options: options, }; const requestOptions = { method: 'POST', headers: authHeader(), body: JSON.stringify(body) }; diff --git a/frontend/src/_services/datasource.service.js b/frontend/src/_services/datasource.service.js index ada1715d91..1834bfbb1c 100644 --- a/frontend/src/_services/datasource.service.js +++ b/frontend/src/_services/datasource.service.js @@ -7,7 +7,7 @@ export const datasourceService = { test, setOauth2Token, save, - fetchOauth2BaseUrl + fetchOauth2BaseUrl, }; function getAll(appId) { @@ -20,7 +20,7 @@ function create(app_id, name, kind, options) { app_id, name, kind, - options + options, }; const requestOptions = { method: 'POST', headers: authHeader(), body: JSON.stringify(body) }; @@ -31,7 +31,7 @@ function save(id, app_id, name, options) { const body = { app_id, name, - options + options, }; const requestOptions = { method: 'PUT', headers: authHeader(), body: JSON.stringify(body) }; @@ -41,7 +41,7 @@ function save(id, app_id, name, options) { function test(kind, options) { const body = { kind, - options + options, }; const requestOptions = { method: 'POST', headers: authHeader(), body: JSON.stringify(body) }; diff --git a/frontend/src/_services/folder.service.js b/frontend/src/_services/folder.service.js index 5d8b816413..b76d4f32fc 100644 --- a/frontend/src/_services/folder.service.js +++ b/frontend/src/_services/folder.service.js @@ -4,7 +4,7 @@ import { authHeader, handleResponse } from '@/_helpers'; export const folderService = { create, getAll, - addToFolder + addToFolder, }; function getAll() { @@ -14,7 +14,7 @@ function getAll() { function create(name) { const body = { - name + name, }; const requestOptions = { method: 'POST', headers: authHeader(), body: JSON.stringify(body) }; @@ -24,7 +24,7 @@ function create(name) { function addToFolder(appId, folderId) { const body = { app_id: appId, - folder_id: folderId + folder_id: folderId, }; const requestOptions = { method: 'POST', headers: authHeader(), body: JSON.stringify(body) }; diff --git a/frontend/src/_services/index.js b/frontend/src/_services/index.js index ceddf201b0..ea84450dd5 100644 --- a/frontend/src/_services/index.js +++ b/frontend/src/_services/index.js @@ -9,4 +9,3 @@ export * from './organization_user.service'; export * from './openapi.service'; export * from './folder.service'; export * from './tooljet.service'; - diff --git a/frontend/src/_services/openapi.service.js b/frontend/src/_services/openapi.service.js index b4b492059e..4f7c9e8950 100644 --- a/frontend/src/_services/openapi.service.js +++ b/frontend/src/_services/openapi.service.js @@ -5,4 +5,4 @@ export const openapiService = { function fetchSpecFromUrl(url) { const requestOptions = { method: 'GET' }; return fetch(url, requestOptions); -} \ No newline at end of file +} diff --git a/frontend/src/_services/organization.service.js b/frontend/src/_services/organization.service.js index 51051293e6..5ea3820ba8 100644 --- a/frontend/src/_services/organization.service.js +++ b/frontend/src/_services/organization.service.js @@ -2,10 +2,10 @@ import config from 'config'; import { authHeader, handleResponse } from '@/_helpers'; export const organizationService = { - getUsers + getUsers, }; -function getUsers(id) { +function getUsers() { const requestOptions = { method: 'GET', headers: authHeader() }; return fetch(`${config.apiUrl}/organizations/users`, requestOptions).then(handleResponse); } diff --git a/frontend/src/_services/organization_user.service.js b/frontend/src/_services/organization_user.service.js index f55b1d36b7..d147461f61 100644 --- a/frontend/src/_services/organization_user.service.js +++ b/frontend/src/_services/organization_user.service.js @@ -4,7 +4,7 @@ import { authHeader, handleResponse } from '@/_helpers'; export const organizationUserService = { archive, create, - changeRole + changeRole, }; function create(first_name, last_name, email, role) { @@ -12,7 +12,7 @@ function create(first_name, last_name, email, role) { first_name, last_name, email, - role + role, }; const requestOptions = { method: 'POST', headers: authHeader(), body: JSON.stringify(body) }; @@ -21,7 +21,7 @@ function create(first_name, last_name, email, role) { function changeRole(id, role) { const body = { - role + role, }; const requestOptions = { method: 'POST', headers: authHeader(), body: JSON.stringify(body) }; diff --git a/frontend/src/_services/tooljet.service.js b/frontend/src/_services/tooljet.service.js index bc69d92031..8dbab462ba 100644 --- a/frontend/src/_services/tooljet.service.js +++ b/frontend/src/_services/tooljet.service.js @@ -5,13 +5,13 @@ export const tooljetService = { fetchMetaData, skipVersion, skipOnboarding, - finishOnboarding + finishOnboarding, }; function fetchMetaData() { const requestOptions = { method: 'GET', - headers: authHeader() + headers: authHeader(), }; return fetch(`${config.apiUrl}/metadata`, requestOptions).then(handleResponse); @@ -20,28 +20,28 @@ function fetchMetaData() { function skipVersion() { const requestOptions = { method: 'POST', - headers: authHeader() + headers: authHeader(), }; return fetch(`${config.apiUrl}/metadata/skip_version`, requestOptions).then(handleResponse); } -function skipOnboarding() { +function skipOnboarding() { const requestOptions = { method: 'POST', - headers: authHeader() + headers: authHeader(), }; return fetch(`${config.apiUrl}/metadata/skip_onboarding`, requestOptions).then(handleResponse); } -function finishOnboarding(options) { +function finishOnboarding(options) { const requestOptions = { method: 'POST', headers: authHeader(), - body: JSON.stringify({ - ...options - }) + body: JSON.stringify({ + ...options, + }), }; return fetch(`${config.apiUrl}/metadata/finish_installation`, requestOptions).then(handleResponse); diff --git a/frontend/src/_services/user.service.js b/frontend/src/_services/user.service.js index 11ac655c8a..055ed37e5c 100644 --- a/frontend/src/_services/user.service.js +++ b/frontend/src/_services/user.service.js @@ -20,7 +20,7 @@ function createUser(first_name, last_name, email, role) { first_name, last_name, email, - role + role, }; const requestOptions = { method: 'POST', headers: authHeader(), body: JSON.stringify(body) }; @@ -39,14 +39,14 @@ function setPasswordFromToken({ token, password, organization, newSignup, firstN organization, new_signup: newSignup, first_name: firstName, - last_name: lastName + last_name: lastName, }; const requestOptions = { method: 'POST', headers: authHeader(), body: JSON.stringify(body) }; return fetch(`${config.apiUrl}/users/set_password_from_token`, requestOptions).then(handleResponse); } -function updateCurrentUser(firstName , lastName) { +function updateCurrentUser(firstName, lastName) { const body = { firstName, lastName }; const requestOptions = { method: 'PATCH', headers: authHeader(), body: JSON.stringify(body) }; return fetch(`${config.apiUrl}/users/update`, requestOptions).then(handleResponse); diff --git a/frontend/src/_styles/custom.scss b/frontend/src/_styles/custom.scss index 7c76c8e4a4..93780ed242 100644 --- a/frontend/src/_styles/custom.scss +++ b/frontend/src/_styles/custom.scss @@ -1,29 +1,36 @@ - // overwrites the styles of datepicker [cell-type] .cell-type-datepicker { - z-index: 1; - - .rdtPicker { - thead { - display: table-header-group; - vertical-align: middle; - } - tbody { - display: table-row-group; - } - tr { - display: table-row; - } + z-index: 1; + margin-top: 2px; + margin-right: 5px; + + .rdtPicker { + position: relative; + + thead { + display: table-header-group; + vertical-align: middle; } + tbody { + display: table-row-group; + } + tr { + display: table-row; + } + } } -div[data-disabled=true] -{ +div[data-disabled='true'] { pointer-events: none; opacity: 0.6; filter: alpha(opacity=50); - zoom: 1; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; - -moz-opacity: 0.5; - -khtml-opacity: 0.5; -} \ No newline at end of file + zoom: 1; + -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)'; + -moz-opacity: 0.5; + -khtml-opacity: 0.5; +} + +.queries-container .btn-px-1 { + padding-left: .90rem; + padding-right: .90rem; +} diff --git a/frontend/src/_styles/theme.scss b/frontend/src/_styles/theme.scss index 013cca7e92..c47b7fa926 100644 --- a/frontend/src/_styles/theme.scss +++ b/frontend/src/_styles/theme.scss @@ -22,7 +22,7 @@ body { } .resizer-active { - border: solid 1px rgb(70, 165, 253)!important; + border: solid 1px rgb(70, 165, 253) !important; .top-right, .top-left, @@ -61,7 +61,7 @@ body { } .advanced-options-container { - margin-top: 42px!important; + margin-top: 42px !important; } } @@ -155,7 +155,7 @@ body { border-width: 0px 0px 0px 1px; .nav-tabs .nav-link { - color: #3e525b; + color: #3e525b; border-top-left-radius: 0px; border-top-right-radius: 0px; } @@ -225,7 +225,7 @@ body { .component-image-holder { background: rgb(244, 246, 250); border-radius: 0; - transition: all 0.3s cubic-bezier(.25,.8,.25,1); + transition: all 0.3s cubic-bezier(0.25, 0.8, 0.25, 1); img { margin: 0 auto; @@ -262,9 +262,9 @@ body { top: 0; .canvas-container::-webkit-scrollbar { - width: 0; - background: transparent; - height: 0; + width: 0; + background: transparent; + height: 0; } .canvas-container { @@ -289,7 +289,7 @@ body { align-items: center; .show-grid { - background-size: 30px 30px; + background-size: 30px 10px; background-image: linear-gradient(to right, rgba(194, 191, 191, 0.2) 1px, transparent 1px), linear-gradient(to bottom, rgba(194, 191, 191, 0.2) 1px, transparent 1px); } @@ -302,8 +302,6 @@ body { .resizer { border: solid 1px transparent; } - - } } @@ -349,7 +347,7 @@ body { } .query-row-selected { - background: rgba(66,153,225,.1)!important; + background: rgba(66, 153, 225, 0.1) !important; } .query-row:hover { @@ -368,9 +366,10 @@ body { overflow-y: scroll; height: 100%; scrollbar-width: none; /* Firefox */ - -ms-overflow-style: none; /* Internet Explorer 10+ */ + -ms-overflow-style: none; /* Internet Explorer 10+ */ - &::-webkit-scrollbar { /* WebKit */ + &::-webkit-scrollbar { + /* WebKit */ width: 0; height: 0; } @@ -405,9 +404,10 @@ body { overflow-y: scroll; height: 100%; scrollbar-width: none; /* Firefox */ - -ms-overflow-style: none; /* Internet Explorer 10+ */ + -ms-overflow-style: none; /* Internet Explorer 10+ */ - &::-webkit-scrollbar { /* WebKit */ + &::-webkit-scrollbar { + /* WebKit */ width: 0; height: 0; } @@ -661,7 +661,6 @@ body { height: 48px; } - .select-search__option.is-highlighted, .select-search__option:not(.is-selected):hover { background: rgba(47, 204, 139, 0.1); @@ -766,36 +765,68 @@ body { } .jet-data-table { - thead { z-index: 2; } - .markdown>table>:not(caption)>*>*, .table>:not(caption)>*>* { + .markdown > table > :not(caption) > * > *, + .table > :not(caption) > * > * { //padding-bottom: 0.1rem; } .table-row:hover, - .table-row:focus-within { + .table-row:focus { background: rgba(lightBlue, 0.25); } + .table-row.selected { + --tblr-table-accent-bg: rgba(lightBlue, 0.25); + background: rgba(lightBlue, 0.25); + font-weight: 500; + } + td { - min-height: 35px; + min-height: 40px; overflow-x: initial; margin: auto; .text-container { - padding: 0px; - margin-bottom: 3px; + padding: 0; + margin: 0; + border: 0; + height: 100%; + outline: none; } } + .has-dropdown, + .has-multiselect, + .has-text, + .has-datepicker, + .has-actions { + padding: 0 5px; + } + + .has-text, + .has-actions { + margin: 0; + } + td { - .text-container:focus-visible, .text-container:focus, .text-container:focus-within, .text-container:hover { + .text-container:focus-visible, + .text-container:focus, + .text-container:focus-within, + .text-container:hover { outline: none; height: 100%; } + + display: flex!important; + + .td-container { + margin-top: auto; + margin-bottom: auto; + } } td { @@ -807,11 +838,15 @@ body { padding: 10px; margin-left: -9px; background: white; - box-shadow: rgba(15,15,15,0/05) 0px 0px 0px 1px, rgba(15,15,15,0.1 ) 0px 3px 6px, rgba(15,15,15, 0.2) 0px 9px 24px; + box-shadow: rgba(15, 15, 15, 0/05) 0px 0px 0px 1px, rgba(15, 15, 15, 0.1) 0px 3px 6px, + rgba(15, 15, 15, 0.2) 0px 9px 24px; white-space: initial; } - .text-container:focus-visible, .text-container:focus, .text-container:focus-within, .text-container:hover { + .text-container:focus-visible, + .text-container:focus, + .text-container:focus-within, + .text-container:hover { outline: none; } } @@ -854,46 +889,44 @@ body { left: 6px; bottom: 8px; } - } .jet-data-table::-webkit-scrollbar { - background: transparent; - height: 0; - } + background: transparent; + height: 0; +} .jet-data-table:hover { - overflow-x: scroll; - overflow-y: scroll; + overflow-x: scroll; + overflow-y: scroll; } .jet-data-table { + overflow: hidden; + .form-check { + margin-bottom: 0; + } - overflow: hidden; - .form-check { - margin-bottom: 0; - } + .form-check-inline { + margin-right: 0; + } - .form-check-inline { - margin-right: 0; - } + .table-row { + cursor: pointer; + } - .table-row { - cursor: pointer; - } + thead { + position: sticky; + top: 0px; + display: inline-block; - thead { - position: sticky; - top: 0px; - display: inline-block; - - tr { - border-top: none; - } - } - tbody { - display: inline-block; + tr { + border-top: none; } + } + tbody { + display: inline-block; + } } .btn-primary { @@ -927,19 +960,19 @@ tr:focus { } .select-search__option.is-selected { - background: rgba(176,176,176, 0.07); + background: rgba(176, 176, 176, 0.07); color: #4d4d4d; } .select-search__option.is-highlighted.is-selected, .select-search__option.is-selected:hover { - background: rgba(66,153,225,.1); + background: rgba(66, 153, 225, 0.1); color: rgb(44, 43, 43); } .select-search__option.is-highlighted, .select-search__option:hover { - background: rgba(66,153,225,.1); + background: rgba(66, 153, 225, 0.1); } .select-search__options { @@ -948,11 +981,11 @@ tr:focus { .select-search__option.is-highlighted, .select-search__option:not(.is-selected):hover { - background: rgba(66,153,225,.1); + background: rgba(66, 153, 225, 0.1); } .select-search:not(.select-search--multiple) .select-search__input:hover { - border-color: rgba(66,153,225,.1); + border-color: rgba(66, 153, 225, 0.1); } .DateInput_input { @@ -960,7 +993,7 @@ tr:focus { font-size: 14px; padding: 4px 7px 2px; padding: 4px 7px 2px; - width: 100px!important; + width: 100px !important; margin-left: 10px; } @@ -992,10 +1025,9 @@ tr:focus { } .tag { - font-weight: 400; font-size: 0.85rem; - letter-spacing: .04em; + letter-spacing: 0.04em; text-transform: none; .remove-tag-button { @@ -1009,9 +1041,9 @@ tr:focus { font-size: 12px; } - .form-control-plaintext:hover, .form-control-plaintext:focus-visible { + .form-control-plaintext:hover, + .form-control-plaintext:focus-visible { outline: none; - } } @@ -1062,7 +1094,7 @@ tr:focus { outline: none; outline-width: thin; outline-style: solid; - outline-color: rgba(66,153,225,.8); + outline-color: rgba(66, 153, 225, 0.8); } .select-search__input:focus-visible { @@ -1115,7 +1147,7 @@ tr:focus { } .progress-bar { - background-color: rgba(66,153,225,.7); + background-color: rgba(66, 153, 225, 0.7); } .popover-header { @@ -1129,110 +1161,109 @@ tr:focus { } .input-icon { - .input-icon-addon { - display: none; - } + .input-icon-addon { + display: none; + } } -.input-icon:hover { - .input-icon-addon { - display: flex; - } +.input-icon:hover { + .input-icon-addon { + display: flex; + } } -.input-icon:focus { - .input-icon-addon { - display: flex; - } +.input-icon:focus { + .input-icon-addon { + display: flex; + } } .sub-section { - width: 100%; - display: block; + width: 100%; + display: block; } .text-muted { - color: #3e525b!important; + color: #3e525b !important; } body { - color: #3e525b + color: #3e525b; } .navbar-brand-image { - height: 1.6rem; + height: 1.6rem; } - .RichEditor-root { - background: #fff; - border: 1px solid #ddd; - font-family: 'Georgia', serif; - font-size: 14px; - padding: 15px; - height: 100%; - } + background: #fff; + border: 1px solid #ddd; + font-family: 'Georgia', serif; + font-size: 14px; + padding: 15px; + height: 100%; +} - .RichEditor-editor { - border-top: 1px solid #ddd; - cursor: text; - font-size: 16px; - margin-top: 10px; - } +.RichEditor-editor { + border-top: 1px solid #ddd; + cursor: text; + font-size: 16px; + margin-top: 10px; +} - .RichEditor-editor .public-DraftEditorPlaceholder-root, - .RichEditor-editor .public-DraftEditor-content { - margin: 0 -15px -15px; - padding: 15px; - } +.RichEditor-editor .public-DraftEditorPlaceholder-root, +.RichEditor-editor .public-DraftEditor-content { + margin: 0 -15px -15px; + padding: 15px; +} - .RichEditor-editor .public-DraftEditor-content { - min-height: 100px; - } +.RichEditor-editor .public-DraftEditor-content { + min-height: 100px; +} - .RichEditor-hidePlaceholder .public-DraftEditorPlaceholder-root { - display: none; - } +.RichEditor-hidePlaceholder .public-DraftEditorPlaceholder-root { + display: none; +} - .RichEditor-editor .RichEditor-blockquote { - border-left: 5px solid #eee; - color: #666; - font-family: 'Hoefler Text', 'Georgia', serif; - font-style: italic; - margin: 16px 0; - padding: 10px 20px; - } +.RichEditor-editor .RichEditor-blockquote { + border-left: 5px solid #eee; + color: #666; + font-family: 'Hoefler Text', 'Georgia', serif; + font-style: italic; + margin: 16px 0; + padding: 10px 20px; +} - .RichEditor-editor .public-DraftStyleDefault-pre { - background-color: rgba(0, 0, 0, 0.05); - font-family: 'Inconsolata', 'Menlo', 'Consolas', monospace; - font-size: 16px; - padding: 20px; - } +.RichEditor-editor .public-DraftStyleDefault-pre { + background-color: rgba(0, 0, 0, 0.05); + font-family: 'Inconsolata', 'Menlo', 'Consolas', monospace; + font-size: 16px; + padding: 20px; +} - .RichEditor-controls { - font-family: 'Helvetica', sans-serif; - font-size: 14px; - margin-bottom: 5px; - user-select: none; - } +.RichEditor-controls { + font-family: 'Helvetica', sans-serif; + font-size: 14px; + margin-bottom: 5px; + user-select: none; +} - .RichEditor-styleButton { - color: #999; - cursor: pointer; - margin-right: 16px; - padding: 2px 0; - display: inline-block; - } +.RichEditor-styleButton { + color: #999; + cursor: pointer; + margin-right: 16px; + padding: 2px 0; + display: inline-block; +} - .RichEditor-activeButton { - color: #5890ff; - } +.RichEditor-activeButton { + color: #5890ff; +} .transformation-editor { - .CodeMirror { - min-height: 70px; - } + .CodeMirror { + min-height: 70px; + } } .chart-data-input { @@ -1256,45 +1287,49 @@ body { } .rdt { - .form-control { - height: 100%; - } + .form-control { + height: 100%; + } } .DateInput_input__focused { - border-bottom: 2px solid #3c92dc; + border-bottom: 2px solid #3c92dc; } -.CalendarDay__selected, .CalendarDay__selected:active, .CalendarDay__selected:hover { - background: #3c92dc; - border: 1px double #3c92dc; +.CalendarDay__selected, +.CalendarDay__selected:active, +.CalendarDay__selected:hover { + background: #3c92dc; + border: 1px double #3c92dc; } .CalendarDay__selected_span { - background: #3c92dcc2; - border: #3c92dcc2; + background: #3c92dcc2; + border: #3c92dcc2; } -.CalendarDay__selected_span:active, .CalendarDay__selected_span:hover { - background: #3c92dc; - border: 1px double #3c92dc; - color: #fff; +.CalendarDay__selected_span:active, +.CalendarDay__selected_span:hover { + background: #3c92dc; + border: 1px double #3c92dc; + color: #fff; } -.CalendarDay__hovered_span:active, .CalendarDay__hovered_span:hover { - background: #3c92dc; - border: 1px double #3c92dc; - color: #fff; +.CalendarDay__hovered_span:active, +.CalendarDay__hovered_span:hover { + background: #3c92dc; + border: 1px double #3c92dc; + color: #fff; } .CalendarDay__hovered_span { - background: #83b8e7; - border: 1px double #83b8e7; - color: #fff; + background: #83b8e7; + border: 1px double #83b8e7; + color: #fff; } .table-responsive { - margin-bottom: 0rem; + margin-bottom: 0rem; } .code-hinter::-webkit-scrollbar { @@ -1308,7 +1343,7 @@ body { font-family: 'Roboto', sans-serif; color: #263136; overflow: hidden; - height: 50px!important; + height: 50px !important; } .CodeMirror-vscrollbar { @@ -1335,79 +1370,79 @@ body { } .code-hinter { + height: 36px; - height: 36px; - - .form-control { - .CodeMirror { - font-family: 'Roboto', sans-serif; - height: 50px!important; - max-height: 300px; - } + .form-control { + .CodeMirror { + font-family: 'Roboto', sans-serif; + height: 50px !important; + max-height: 300px; } + } - .CodeMirror-focused { - } + .CodeMirror-focused { + } - .CodeMirror-vscrollbar, .CodeMirror-hscrollbar { - background: transparent; - height: 0; - width: 0; - } + .CodeMirror-vscrollbar, + .CodeMirror-hscrollbar { + background: transparent; + height: 0; + width: 0; + } - .CodeMirror-scroll { - overflow:hidden !important; - } + .CodeMirror-scroll { + overflow: hidden !important; + } } .CodeMirror-hints { - font-family: 'Roboto', sans-serif; - font-size: 0.9rem; - padding: 0px; - z-index: 10000; + font-family: 'Roboto', sans-serif; + font-size: 0.9rem; + padding: 0px; + z-index: 10000; - li.CodeMirror-hint-active { - background: #3c92dc; - } + li.CodeMirror-hint-active { + background: #3c92dc; + } - .CodeMirror-hint { - padding: 4px; - padding-left: 10px; - padding-right: 10px; - } + .CodeMirror-hint { + padding: 4px; + padding-left: 10px; + padding-right: 10px; + } } .cm-matchhighlight { - color: #4299e1!important; - background: rgba(66,153,225,.1)!important; + color: #4299e1 !important; + background: rgba(66, 153, 225, 0.1) !important; } .nav-tabs .nav-link { - color: #3e525b; - border-top-left-radius: 0px; - border-top-right-radius: 0px; - } + color: #3e525b; + border-top-left-radius: 0px; + border-top-right-radius: 0px; +} - .transformation-editor { - .CodeMirror { - min-height: 220px; - } - } +.transformation-editor { + .CodeMirror { + min-height: 220px; + } +} - hr { +hr { margin: 1rem 0; - } +} - .query-hinter { - min-height: 150px; - } +.query-hinter { + min-height: 150px; +} - .codehinter-default-input { +.codehinter-default-input { font-family: 'Roboto', sans-serif; padding: 0.0475rem 0rem; display: block; width: 100%; - font-size: .875rem; + font-size: 0.875rem; font-weight: 400; color: #232e3c; background-color: #fff; @@ -1417,20 +1452,20 @@ body { -moz-appearance: none; appearance: none; border-radius: 4px; - transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out; + transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; height: 30px; .CodeMirror { font-family: 'Roboto', sans-serif; } - } +} - .codehinter-query-editor-input { +.codehinter-query-editor-input { font-family: 'Roboto', sans-serif; - padding: 0.1775rem .75rem; + padding: 0.1775rem 0.75rem; display: block; width: 100%; - font-size: .875rem; + font-size: 0.875rem; font-weight: 400; color: #232e3c; background-color: #fff; @@ -1438,18 +1473,18 @@ body { border: 1px solid #dadcde; appearance: none; border-radius: 0; - transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out; + transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; height: 36px !important; - } +} - .modal-component { - margin-top: 150px; +.modal-component { + margin-top: 150px; .modal-body { padding: 0; } - } +} - .draggable-box { +.draggable-box { .config-handle { top: -20px; position: fixed; @@ -1470,11 +1505,10 @@ body { } } - // .draggable-box:hover { - .config-handle { - display: block; - } +.config-handle { + display: block; +} // } .apps-table { @@ -1487,8 +1521,12 @@ body { } } -.home-page, .org-users-page { - .navbar .navbar-nav .active>.nav-link, .navbar .navbar-nav .nav-link.active, .navbar .navbar-nav .nav-link.show, .navbar .navbar-nav .show>.nav-link { +.home-page, +.org-users-page { + .navbar .navbar-nav .active > .nav-link, + .navbar .navbar-nav .nav-link.active, + .navbar .navbar-nav .nav-link.show, + .navbar .navbar-nav .show > .nav-link { color: rgba(35, 46, 60, 0.7); } @@ -1508,10 +1546,10 @@ body { } .CodeMirror-placeholder { - color: #9e9e9e!important; - font-size: 0.7rem!important; - margin-top: 2px!important; - font-size: 12px!important; + color: #9e9e9e !important; + font-size: 0.7rem !important; + margin-top: 2px !important; + font-size: 12px !important; } .CodeMirror-code { @@ -1569,19 +1607,19 @@ body { .toggle-icon { display: inline-block; margin-left: auto; - transition: .3s transform; + transition: 0.3s transform; } .toggle-icon:after { - content: ""; + content: ''; display: inline-block; - vertical-align: .306em; - width: .46em; - height: .46em; + vertical-align: 0.306em; + width: 0.46em; + height: 0.46em; border-bottom: 1px solid; border-left: 1px solid; - margin-right: .1em; - margin-left: .4em; + margin-right: 0.1em; + margin-left: 0.4em; transform: rotate(-45deg); } } @@ -1618,7 +1656,7 @@ input:focus-visible { } .org-users-page { - .select-search__input{ + .select-search__input { color: #617179; } .select-search-role { @@ -1675,20 +1713,20 @@ input:focus-visible { position: absolute; } - .color-picker-input { border: solid 1px rgb(223, 223, 223); cursor: pointer; } .app-sharing-modal { - .form-control.is-invalid, .was-validated .form-control:invalid { + .form-control.is-invalid, + .was-validated .form-control:invalid { border-color: #ffb0b0; } } .widgets-list { - --tblr-gutter-x: 0px!important; + --tblr-gutter-x: 0px !important; } .input-with-icon { @@ -1725,24 +1763,31 @@ input:focus-visible { } .theme-dark { - .navbar .navbar-nav .active > .nav-link, .theme-dark .navbar .navbar-nav .nav-link.active, .theme-dark .navbar .navbar-nav .nav-link.show, .theme-dark .navbar .navbar-nav .show > .nav-link { + .navbar .navbar-nav .active > .nav-link, + .theme-dark .navbar .navbar-nav .nav-link.active, + .theme-dark .navbar .navbar-nav .nav-link.show, + .theme-dark .navbar .navbar-nav .show > .nav-link { color: #fff; } + .left-sidebar .active { + background: #333c48; + } + .left-sidebar .left-sidebar-item { border-bottom: 1px solid #333c48; -} + } .nav-tabs .nav-link.active { - color: #fff!important; + color: #fff !important; } .nav-tabs .nav-link { - color: #c3c3c3!important; + color: #c3c3c3 !important; } .card-body > :last-child { - color: #fff!important; + color: #fff !important; } .form-control { @@ -1750,11 +1795,11 @@ input:focus-visible { } .card { - background-color: #324156!important; + background-color: #324156 !important; } .DateInput { - background: #1f2936 + background: #1f2936; } .DateInput_input { @@ -1762,7 +1807,7 @@ input:focus-visible { } .DateRangePickerInput { - background-color: #1f2936 + background-color: #1f2936; } .DateInput_input__focused { @@ -1782,27 +1827,30 @@ input:focus-visible { } .editor .editor-sidebar .components-container .component-image-holder { - background: #2f3c4c!important; - border: 1px solid #2f3c4c!important; + background: #2f3c4c !important; + border: 1px solid #2f3c4c !important; - center, .component-title { + center, + .component-title { filter: brightness(0) invert(1); } } - .nav-tabs .nav-link:focus, .nav-tabs .nav-link:hover { - border-color: transparent!important; -} + .nav-tabs .nav-link:focus, + .nav-tabs .nav-link:hover { + border-color: transparent !important; + } - .modal-content, .modal-header { - background-color: #1f2936!important; + .modal-content, + .modal-header { + background-color: #1f2936 !important; .text-muted { - color: #fff!important; + color: #fff !important; } } .modal-header { - border-bottom: 1px solid rgba(255, 255, 255, 0.09)!important; + border-bottom: 1px solid rgba(255, 255, 255, 0.09) !important; } .canvas-container { @@ -1810,12 +1858,12 @@ input:focus-visible { } .editor .main .query-pane { - border: solid rgba(255, 255, 255, 0.09)!important; - border-width: 1px 0px 0px 0px!important; + border: solid rgba(255, 255, 255, 0.09) !important; + border-width: 1px 0px 0px 0px !important; } .no-components-box { - background-color: #1f2936!important; + background-color: #1f2936 !important; center { filter: brightness(0) invert(1); @@ -1824,20 +1872,21 @@ input:focus-visible { .query-list { .text-muted { - color: #fff!important; + color: #fff !important; } } - .left-sidebar, .editor-sidebar { - background-color: #1f2936!important; + .left-sidebar, + .editor-sidebar { + background-color: #1f2936 !important; } .editor-sidebar { border: solid rgba(255, 255, 255, 0.09); - border-width: 0px 0px 0px 1px!important; + border-width: 0px 0px 0px 1px !important; .nav-tabs { - border-bottom: 1px solid rgba(255, 255, 255, 0.09)!important; + border-bottom: 1px solid rgba(255, 255, 255, 0.09) !important; } } @@ -1849,17 +1898,18 @@ input:focus-visible { } .jet-table { - background-color: #1f2936!important; + background-color: #1f2936 !important; } - .nav-tabs .nav-item.show .nav-link, .nav-tabs .nav-link.active { + .nav-tabs .nav-item.show .nav-link, + .nav-tabs .nav-link.active { background-color: #2f3c4c; - border-color: transparent!important; + border-color: transparent !important; } .editor .main .query-pane .query-definition-pane .header { border: solid rgba(255, 255, 255, 0.09); - border-width: 0px 0px 1px 0px!important; + border-width: 0px 0px 1px 0px !important; background: #1f2936; } @@ -1867,16 +1917,16 @@ input:focus-visible { border: solid rgba(255, 255, 255, 0.09); border-width: 0px 1px 3px 0px; .text-muted { - color: #fff!important; + color: #fff !important; } } .folder-list { - color: #fff!important; + color: #fff !important; } .app-title { - color: #fff!important; + color: #fff !important; } .RichEditor-root { @@ -1885,11 +1935,12 @@ input:focus-visible { } .app-description { - color: #fff!important; + color: #fff !important; } - .btn-light, .btn-outline-light { - background-color: #42546a!important; + .btn-light, + .btn-outline-light { + background-color: #42546a !important; img { filter: brightness(0) invert(1); @@ -1901,9 +1952,9 @@ input:focus-visible { } .editor .left-sidebar .datasources-container .datasources-header { - border: solid rgba(255, 255, 255, 0.09)!important; - border-width: 0px 0px 1px 0px!important; -} + border: solid rgba(255, 255, 255, 0.09) !important; + border-width: 0px 0px 1px 0px !important; + } .query-manager-header .nav-item { border-right: solid 1px rgba(255, 255, 255, 0.09); @@ -1913,31 +1964,31 @@ input:focus-visible { } .input-group-text { - border: solid 1px rgba(255, 255, 255, 0.09)!important; + border: solid 1px rgba(255, 255, 255, 0.09) !important; } .app-users-list { .text-muted { - color: #fff!important; + color: #fff !important; } } .data-pane { - border: solid rgba(255, 255, 255, 0.09)!important; - border-width: 0px 1px 0px 0px!important; + border: solid rgba(255, 255, 255, 0.09) !important; + border-width: 0px 1px 0px 0px !important; } .main .query-pane .data-pane .queries-container .queries-header { - border: solid rgba(255, 255, 255, 0.09)!important; - border-width: 0px 0px 1px 0px!important; + border: solid rgba(255, 255, 255, 0.09) !important; + border-width: 0px 0px 1px 0px !important; .text-muted { - color: #fff!important; + color: #fff !important; } } .query-pane { - background-color: #1f2936!important; + background-color: #1f2936 !important; } .svg-icon { @@ -1955,13 +2006,13 @@ input:focus-visible { .alert { background: transparent; .text-muted { - color: #fff!important; + color: #fff !important; } } .editor .editor-sidebar .inspector .header { - border: solid rgba(255, 255, 255, 0.09)!important; - border-width: 0px 0px 1px 0px!important; + border: solid rgba(255, 255, 255, 0.09) !important; + border-width: 0px 0px 1px 0px !important; } .skeleton-line::after { @@ -2005,13 +2056,14 @@ input:focus-visible { } .org-users-page { - .user-email, .user-status { + .user-email, + .user-status { filter: brightness(0) invert(1); } } .react-json-view { - background-color: transparent!important; + background-color: transparent !important; } .codehinter-default-input { @@ -2034,17 +2086,15 @@ input:focus-visible { } .codehinter-query-editor-input .CodeMirror { - color: #c3c3c3!important; + color: #c3c3c3 !important; } .select-search:not(.is-loading):not(.select-search--multiple) .select-search__value::after { - transform: rotate( - 45deg - ); - border-right: 1px solid #fff; - border-bottom: 1px solid #fff; - } + transform: rotate(45deg); + border-right: 1px solid #fff; + border-bottom: 1px solid #fff; } +} .main-wrapper { position: fixed; @@ -2062,14 +2112,15 @@ input:focus-visible { opacity: 0.74; } - .gui-select-wrappper .select-search__input { height: 30px; } - -.theme-dark .input-group-text, .theme-dark .markdown > table thead th, .theme-dark .table thead th { +.theme-dark .input-group-text, +.theme-dark .markdown > table thead th, +.theme-dark .table thead th { background: #1c252f; + color: #fff; } .sketch-picker { @@ -2111,44 +2162,79 @@ input:focus-visible { border-radius: 0 !important; } -input[type=text] { +input[type='text'] { border-radius: 0 !important; outline-color: #dadcde !important; } - .widget-header { - - text-transform: capitalize; - margin-top: 12px !important; - font-weight: 500; - font-size: 12px; - line-height: 12px; + text-transform: capitalize; + margin-top: 12px !important; + font-weight: 500; + font-size: 12px; + line-height: 12px; } -.query-manager-events{ +.query-manager-events { max-width: 400px; } .validation-without-icon { - background-image: none!important; + background-image: none !important; } -.dropdown-widget, .multiselect-widget { +.dropdown-widget, +.multiselect-widget { .select-search__input { - padding: 0.2375rem 0.75rem; + padding: 0.1375rem 0.75rem; } .select-search__options { - margin-bottom: 0!important; + margin-bottom: 0 !important; .select-search__option { height: auto; + min-height: 30px; } } } - .draggable-box:focus-within { - z-index: 2!important; -} \ No newline at end of file + z-index: 2 !important; +} + +.theme-dark .event-action { + filter: brightness(0) invert(1); +} + +.event-action{ + filter: brightness(0) invert(0); +} + +.DateRangePicker { + padding: 1.25px 5px; +} + +.datepicker-widget { + .input-field { + min-height: 26px; + padding: 0; + padding-left: 2px; + } +} + +.daterange-picker-widget { + .DateInput_input { + min-height: 24px; + line-height: normal; + border-bottom: 0px; + font-size: 0.85rem; + } + .DateRangePicker { + padding: 0; + } + + .DateRangePickerInput_arrow_svg { + height: 17px; + } +} diff --git a/frontend/src/_styles/widgets/star-rating.scss b/frontend/src/_styles/widgets/star-rating.scss index ec0b87fd7f..c8ecc66414 100644 --- a/frontend/src/_styles/widgets/star-rating.scss +++ b/frontend/src/_styles/widgets/star-rating.scss @@ -2,7 +2,7 @@ .star-rating { display: flex; - padding: 5px; + padding: 3px; .label { flex: 1; diff --git a/frontend/src/_ui/Button/index.js b/frontend/src/_ui/Button/index.js index e78361b6e9..415c141c0c 100644 --- a/frontend/src/_ui/Button/index.js +++ b/frontend/src/_ui/Button/index.js @@ -3,13 +3,7 @@ import Button from 'react-bootstrap/Button'; const Input = ({ disabled, className, onClick, children, ...props }) => { return ( - ); diff --git a/frontend/src/_ui/Input/index.js b/frontend/src/_ui/Input/index.js index 2f4e3e0a25..f210ddb3e4 100644 --- a/frontend/src/_ui/Input/index.js +++ b/frontend/src/_ui/Input/index.js @@ -3,7 +3,7 @@ import React from 'react'; const Input = ({ helpText, ...props }) => ( <> - {helpText && } + {helpText && } ); diff --git a/frontend/src/_ui/OAuth/Authentication.jsx b/frontend/src/_ui/OAuth/Authentication.jsx index 249b5d765f..a6283f8e0e 100644 --- a/frontend/src/_ui/OAuth/Authentication.jsx +++ b/frontend/src/_ui/OAuth/Authentication.jsx @@ -109,7 +109,7 @@ const Authentication = ({
    - +