From e2093030dba6363527287cf973a3900cf6f25c76 Mon Sep 17 00:00:00 2001 From: riahk Date: Fri, 10 Dec 2021 14:42:37 -0800 Subject: [PATCH 1/9] add contributing section with CONTRIBUTING.MD sections to docs page --- CONTRIBUTING.md | 11 - docs/doczrc.js | 2 +- docs/gatsby-node.js | 2 +- .../{ => Contributing}/contributing-page.mdx | 10 +- .../Contributing/conventions-and-typing.mdx | 58 ++++ .../docs/Contributing/hooks-and-linting.mdx | 62 ++++ .../pages/docs/Contributing/local-backend.mdx | 107 +++++++ .../Contributing/pull-request-guidelines.mdx | 97 ++++++ .../pages/docs/Contributing/style-guide.mdx | 55 ++++ .../docs/Contributing/testing-locally.mdx | 276 ++++++++++++++++++ .../pages/docs/Contributing/translations.mdx | 104 +++++++ .../Contributing/types-of-contributions.mdx | 61 ++++ .../docs/installation/alerts_reports.mdx | 2 +- .../installation/async_queries_celery.mdx | 2 +- .../installation/building-viz-plugins.mdx | 2 +- docs/src/pages/docs/installation/caching.mdx | 2 +- .../pages/docs/installation/configuring.mdx | 2 +- .../docs/installation/event-logging-page.mdx | 2 +- .../docs/installation/frontend-assets.mdx | 92 ++++++ .../docs/installation/installing_scratch.mdx | 2 +- .../pages/docs/installation/kubernetes.mdx | 2 +- .../docs/installation/networking_settings.mdx | 2 +- .../docs/installation/sql_templating.mdx | 2 +- .../docs/installation/upgrading_superset.mdx | 2 +- 24 files changed, 930 insertions(+), 29 deletions(-) rename docs/src/pages/docs/{ => Contributing}/contributing-page.mdx (76%) create mode 100644 docs/src/pages/docs/Contributing/conventions-and-typing.mdx create mode 100644 docs/src/pages/docs/Contributing/hooks-and-linting.mdx create mode 100644 docs/src/pages/docs/Contributing/local-backend.mdx create mode 100644 docs/src/pages/docs/Contributing/pull-request-guidelines.mdx create mode 100644 docs/src/pages/docs/Contributing/style-guide.mdx create mode 100644 docs/src/pages/docs/Contributing/testing-locally.mdx create mode 100644 docs/src/pages/docs/Contributing/translations.mdx create mode 100644 docs/src/pages/docs/Contributing/types-of-contributions.mdx create mode 100644 docs/src/pages/docs/installation/frontend-assets.mdx diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3312c51273430..f799fb90eccaf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -117,17 +117,6 @@ Here's a list of repositories that contain Superset-related packages: also includes Superset's main TypeScript/JavaScript bundles and react apps under the [superset-frontend](https://github.com/apache/superset/tree/master/superset-frontend) folder. -- [apache-superset/superset-ui](https://github.com/apache-superset/superset-ui) - contains core Superset's - [npm packages](https://github.com/apache-superset/superset-ui/tree/master/packages). - These packages are shared across the React apps in the main repository, - and in visualization plugins. -- [apache-superset/superset-ui-plugins](https://github.com/apache-superset/superset-ui-plugins) - contains the code for the default visualizations that ship with Superset - and are maintained by the core community. -- [apache-superset/superset-ui-plugins-deckgl](https://github.com/apache-superset/superset-ui-plugins-deckgl) - contains the code for the geospatial visualizations that ship with Superset - and are maintained by the core community. - [github.com/apache-superset](https://github.com/apache-superset) is the Github organization under which we manage Superset-related small tools, forks and Superset-related experimental ideas. diff --git a/docs/doczrc.js b/docs/doczrc.js index 87d4b409e8770..1335d772ced0b 100644 --- a/docs/doczrc.js +++ b/docs/doczrc.js @@ -27,8 +27,8 @@ export default { 'Connecting to Databases', 'Creating Charts and Dashboards', 'Miscellaneous', + 'Contributing', 'Frequently Asked Questions', - 'Contribution Guide', 'Roadmap', 'API', 'Security', diff --git a/docs/gatsby-node.js b/docs/gatsby-node.js index 0ffff7fc36eac..8e54017e115fb 100644 --- a/docs/gatsby-node.js +++ b/docs/gatsby-node.js @@ -206,7 +206,7 @@ exports.createPages = ({ actions }) => { }); createRedirect({ fromPath: '/installation.html#building-from-source', - toPath: '/docs/contribution', + toPath: '/docs/contributing/contribution-guidelines', isPermanent: true, }); createRedirect({ diff --git a/docs/src/pages/docs/contributing-page.mdx b/docs/src/pages/docs/Contributing/contributing-page.mdx similarity index 76% rename from docs/src/pages/docs/contributing-page.mdx rename to docs/src/pages/docs/Contributing/contributing-page.mdx index dc8f53f5f1c07..41d912db1661c 100644 --- a/docs/src/pages/docs/contributing-page.mdx +++ b/docs/src/pages/docs/Contributing/contributing-page.mdx @@ -1,7 +1,9 @@ --- -name: Contribution Guide -title: Contribution Guide -route: /docs/contribution +name: General Resources +menu: Contributing +route: /docs/contributing/contribution-guidelines +index: 1 +version: 1 --- ## Contributing to Superset @@ -18,7 +20,5 @@ If you're interested in contributing, we recommend reading the Community Contrib [described in CONTRIBUTING.MD](https://github.com/apache/superset/blob/master/CONTRIBUTING.md) to get started. Here are some helpful links from that page: -- [Overview of types of contributions](https://github.com/apache/superset/blob/master/CONTRIBUTING.md#types-of-contributions) -- [Pull request guidelines](https://github.com/apache/superset/blob/master/CONTRIBUTING.md#pull-request-guidelines) - [Managing Issues and PR's](https://github.com/apache/superset/blob/master/CONTRIBUTING.md#managing-issues-and-prs) - [Setting up local environment for development](https://github.com/apache/superset/blob/master/CONTRIBUTING.md#setup-local-environment-for-development) diff --git a/docs/src/pages/docs/Contributing/conventions-and-typing.mdx b/docs/src/pages/docs/Contributing/conventions-and-typing.mdx new file mode 100644 index 0000000000000..acaca1ba88ce5 --- /dev/null +++ b/docs/src/pages/docs/Contributing/conventions-and-typing.mdx @@ -0,0 +1,58 @@ +--- +name: Conventions and Typing +menu: Contributing +route: /docs/contributing/conventions-typing +index: 7 +version: 1 +--- + +## Conventions + +### Python + +Parameters in the `config.py` (which are accessible via the Flask app.config dictionary) are assumed to always be defined and thus should be accessed directly via, + +```python +blueprints = app.config["BLUEPRINTS"] +``` + +rather than, + +```python +blueprints = app.config.get("BLUEPRINTS") +``` + +or similar as the later will cause typing issues. The former is of type `List[Callable]` whereas the later is of type `Optional[List[Callable]]`. + +## Typing + +### Python + +To ensure clarity, consistency, all readability, _all_ new functions should use +[type hints](https://docs.python.org/3/library/typing.html) and include a +docstring. + +Note per [PEP-484](https://www.python.org/dev/peps/pep-0484/#exceptions) no +syntax for listing explicitly raised exceptions is proposed and thus the +recommendation is to put this information in a docstring, i.e., + +```python +import math +from typing import Union + + +def sqrt(x: Union[float, int]) -> Union[float, int]: + """ + Return the square root of x. + + :param x: A number + :returns: The square root of the given number + :raises ValueError: If the number is negative + """ + + return math.sqrt(x) +``` + +### TypeScript + +TypeScript is fully supported and is the recommended language for writing all new frontend components. When modifying existing functions/components, migrating to TypeScript is appreciated, but not required. Examples of migrating functions/components to TypeScript can be found in [#9162](https://github.com/apache/superset/pull/9162) and [#9180](https://github.com/apache/superset/pull/9180). diff --git a/docs/src/pages/docs/Contributing/hooks-and-linting.mdx b/docs/src/pages/docs/Contributing/hooks-and-linting.mdx new file mode 100644 index 0000000000000..18b44ff3ad436 --- /dev/null +++ b/docs/src/pages/docs/Contributing/hooks-and-linting.mdx @@ -0,0 +1,62 @@ +--- +name: Pre-commit Hooks and Linting +menu: Contributing +route: /docs/contributing/hooks-linting +index: 6 +version: 1 +--- + +## Git Hooks + +Superset uses Git pre-commit hooks courtesy of [pre-commit](https://pre-commit.com/). To install run the following: + +```bash +pip3 install -r requirements/integration.txt +pre-commit install +``` + +A series of checks will now run when you make a git commit. + +Alternatively it is possible to run pre-commit via tox: + +```bash +tox -e pre-commit +``` + +Or by running pre-commit manually: + +```bash +pre-commit run --all-files +``` + +## Linting + +### Python + +We use [Pylint](https://pylint.org/) for linting which can be invoked via: + +```bash +# for python +tox -e pylint +``` + +In terms of best practices please advoid blanket disablement of Pylint messages globally (via `.pylintrc`) or top-level within the file header, albeit there being a few exceptions. Disablement should occur inline as it prevents masking issues and provides context as to why said message is disabled. + +Additionally the Python code is auto-formatted using [Black](https://github.com/python/black) which +is configured as a pre-commit hook. There are also numerous [editor integrations](https://black.readthedocs.io/en/stable/editor_integration.html) + +### TypeScript + +```bash +cd superset-frontend +npm ci +npm run lint +``` + +If using the eslint extension with vscode, put the following in your workspace `settings.json` file: + +```json +"eslint.workingDirectories": [ + "superset-frontend" +] +``` diff --git a/docs/src/pages/docs/Contributing/local-backend.mdx b/docs/src/pages/docs/Contributing/local-backend.mdx new file mode 100644 index 0000000000000..d34338fa4ee86 --- /dev/null +++ b/docs/src/pages/docs/Contributing/local-backend.mdx @@ -0,0 +1,107 @@ +--- +name: Running a Local Flask Backend +menu: Contributing +route: /docs/contributing/local-dev-backend +index: 5 +version: 1 +--- + +### Flask server + +#### OS Dependencies + +Make sure your machine meets the [OS dependencies](https://superset.apache.org/docs/installation/installing-superset-from-scratch#os-dependencies) before following these steps. +You also need to install MySQL or [MariaDB](https://mariadb.com/downloads). + +Ensure that you are using Python version 3.7 or 3.8, then proceed with: + +````bash +# Create a virtual environment and activate it (recommended) +python3 -m venv venv # setup a python3 virtualenv +source venv/bin/activate + +# Install external dependencies +pip install -r requirements/testing.txt + +# Install Superset in editable (development) mode +pip install -e . + +# Initialize the database +superset db upgrade + +# Create an admin user in your metadata database (use `admin` as username to be able to load the examples) +superset fab create-admin + +# Create default roles and permissions +superset init + +# Load some data to play with. +# Note: you MUST have previously created an admin user with the username `admin` for this command to work. +superset load-examples + +# Start the Flask dev web server from inside your virtualenv. +# Note that your page may not have CSS at this point. +FLASK_ENV=development superset run -p 8088 --with-threads --reload --debugger +``` + +Or you can install via our Makefile + +```bash +# Create a virtual environment and activate it (recommended) +$ python3 -m venv venv # setup a python3 virtualenv +$ source venv/bin/activate + +# install pip packages + pre-commit +$ make install + +# Install superset pip packages and setup env only +$ make superset + +# Setup pre-commit only +$ make pre-commit +```` + +**Note: the FLASK_APP env var should not need to be set, as it's currently controlled +via `.flaskenv`, however if needed, it should be set to `superset.app:create_app()`** + +If you have made changes to the FAB-managed templates, which are not built the same way as the newer, React-powered front-end assets, you need to start the app without the `--with-threads` argument like so: +`FLASK_ENV=development superset run -p 8088 --reload --debugger` + +#### Dependencies + +If you add a new requirement or update an existing requirement (per the `install_requires` section in `setup.py`) you must recompile (freeze) the Python dependencies to ensure that for CI, testing, etc. the build is deterministic. This can be achieved via, + +```bash +$ python3 -m venv venv +$ source venv/bin/activate +$ python3 -m pip install -r requirements/integration.txt +$ pip-compile-multi --no-upgrade +``` + +#### Logging to the browser console + +This feature is only available on Python 3. When debugging your application, you can have the server logs sent directly to the browser console using the [ConsoleLog](https://github.com/betodealmeida/consolelog) package. You need to mutate the app, by adding the following to your `config.py` or `superset_config.py`: + +```python +from console_log import ConsoleLog + +def FLASK_APP_MUTATOR(app): + app.wsgi_app = ConsoleLog(app.wsgi_app, app.logger) +``` + +Then make sure you run your WSGI server using the right worker type: + +```bash +FLASK_ENV=development gunicorn "superset.app:create_app()" -k "geventwebsocket.gunicorn.workers.GeventWebSocketWorker" -b 127.0.0.1:8088 --reload +``` + +You can log anything to the browser console, including objects: + +```python +from superset import app +app.logger.error('An exception occurred!') +app.logger.info(form_data) +``` + +### Frontend Assets +See [Running Frontend Assets Locally](https://superset.apache.org/docs/installation/installing-superset-from-scratch#os-dependencies) diff --git a/docs/src/pages/docs/Contributing/pull-request-guidelines.mdx b/docs/src/pages/docs/Contributing/pull-request-guidelines.mdx new file mode 100644 index 0000000000000..40456de9c8db6 --- /dev/null +++ b/docs/src/pages/docs/Contributing/pull-request-guidelines.mdx @@ -0,0 +1,97 @@ +--- +name: Pull Request Guidelines +menu: Contributing +route: /docs/contributing/pr-guidelines +index: 3 +version: 1 +--- + +## Pull Request Guidelines + +A philosophy we would like to strongly encourage is + +> Before creating a PR, create an issue. + +The purpose is to separate problem from possible solutions. + +**Bug fixes:** If you’re only fixing a small bug, it’s fine to submit a pull request right away but we highly recommend to file an issue detailing what you’re fixing. This is helpful in case we don’t accept that specific fix but want to keep track of the issue. Please keep in mind that the project maintainers reserve the rights to accept or reject incoming PRs, so it is better to separate the issue and the code to fix it from each other. In some cases, project maintainers may request you to create a separate issue from PR before proceeding. + +**Refactor:** For small refactors, it can be a standalone PR itself detailing what you are refactoring and why. If there are concerns, project maintainers may request you to create a `#SIP` for the PR before proceeding. + +**Feature/Large changes:** If you intend to change the public API, or make any non-trivial changes to the implementation, we require you to file a new issue as `#SIP` (Superset Improvement Proposal). This lets us reach an agreement on your proposal before you put significant effort into it. You are welcome to submit a PR along with the SIP (sometimes necessary for demonstration), but we will not review/merge the code until the SIP is approved. + +In general, small PRs are always easier to review than large PRs. The best practice is to break your work into smaller independent PRs and refer to the same issue. This will greatly reduce turnaround time. + +If you wish to share your work which is not ready to merge yet, create a [Draft PR](https://github.blog/2019-02-14-introducing-draft-pull-requests/). This will enable maintainers and the CI runner to prioritize mature PR's. + +Finally, never submit a PR that will put master branch in broken state. If the PR is part of multiple PRs to complete a large feature and cannot work on its own, you can create a feature branch and merge all related PRs into the feature branch before creating a PR from feature branch to master. + +### Protocol + +#### Authoring + +- Fill in all sections of the PR template. +- Title the PR with one of the following semantic prefixes (inspired by [Karma](http://karma-runner.github.io/0.10/dev/git-commit-msg.html])): + + - `feat` (new feature) + - `fix` (bug fix) + - `docs` (changes to the documentation) + - `style` (formatting, missing semi colons, etc; no application logic change) + - `refactor` (refactoring code) + - `test` (adding missing tests, refactoring tests; no application logic change) + - `chore` (updating tasks etc; no application logic change) + - `perf` (performance-related change) + - `build` (build tooling, Docker configuration change) + - `ci` (test runner, Github Actions workflow changes) + - `other` (changes that don't correspond to the above -- should be rare!) + - Examples: + - `feat: export charts as ZIP files` + - `perf(api): improve API info performance` + - `fix(chart-api): cached-indicator always shows value is cached` + +- Add prefix `[WIP]` to title if not ready for review (WIP = work-in-progress). We recommend creating a PR with `[WIP]` first and remove it once you have passed CI test and read through your code changes at least once. +- If you believe your PR contributes a potentially breaking change, put a `!` after the semantic prefix but before the colon in the PR title, like so: `feat!: Added foo functionality to bar` +- **Screenshots/GIFs:** Changes to user interface require before/after screenshots, or GIF for interactions + - Recommended capture tools ([Kap](https://getkap.co/), [LICEcap](https://www.cockos.com/licecap/), [Skitch](https://download.cnet.com/Skitch/3000-13455_4-189876.html)) + - If no screenshot is provided, the committers will mark the PR with `need:screenshot` label and will not review until screenshot is provided. +- **Dependencies:** Be careful about adding new dependency and avoid unnecessary dependencies. + - For Python, include it in `setup.py` denoting any specific restrictions and in `requirements.txt` pinned to a specific version which ensures that the application build is deterministic. + - For TypeScript/JavaScript, include new libraries in `package.json` +- **Tests:** The pull request should include tests, either as doctests, unit tests, or both. Make sure to resolve all errors and test failures. See [Testing](#testing) for how to run tests. +- **Documentation:** If the pull request adds functionality, the docs should be updated as part of the same PR. +- **CI:** Reviewers will not review the code until all CI tests are passed. Sometimes there can be flaky tests. You can close and open PR to re-run CI test. Please report if the issue persists. After the CI fix has been deployed to `master`, please rebase your PR. +- **Code coverage:** Please ensure that code coverage does not decrease. +- Remove `[WIP]` when ready for review. Please note that it may be merged soon after approved so please make sure the PR is ready to merge and do not expect more time for post-approval edits. +- If the PR was not ready for review and inactive for > 30 days, we will close it due to inactivity. The author is welcome to re-open and update. + +#### Reviewing + +- Use constructive tone when writing reviews. +- If there are changes required, state clearly what needs to be done before the PR can be approved. +- If you are asked to update your pull request with some changes there's no need to create a new one. Push your changes to the same branch. +- The committers reserve the right to reject any PR and in some cases may request the author to file an issue. + +#### Test Environments + +- Members of the Apache GitHub org can launch an ephemeral test environment directly on a pull request by creating a comment containing (only) the command `/testenv up`. + - Note that org membership must be public in order for this validation to function properly. +- Feature flags may be set for a test environment by specifying the flag name (prefixed with `FEATURE_`) and value after the command. + - Format: `/testenv up FEATURE_=true|false` + - Example: `/testenv up FEATURE_DASHBOARD_NATIVE_FILTERS=true` + - Multiple feature flags may be set in single command, separated by whitespace +- A comment will be created by the workflow script with the address and login information for the ephemeral environment. +- Test environments may be created once the Docker build CI workflow for the PR has completed successfully. +- Test environments do not currently update automatically when new commits are added to a pull request. +- Test environments do not currently support async workers, though this is planned. +- Running test environments will be shutdown upon closing the pull request. + +#### Merging + +- At least one approval is required for merging a PR. +- PR is usually left open for at least 24 hours before merging. +- After the PR is merged, [close the corresponding issue(s)](https://help.github.com/articles/closing-issues-using-keywords/). + +#### Post-merge Responsibility + +- Project maintainers may contact the PR author if new issues are introduced by the PR. +- Project maintainers may revert your changes if a critical issue is found, such as breaking master branch CI. diff --git a/docs/src/pages/docs/Contributing/style-guide.mdx b/docs/src/pages/docs/Contributing/style-guide.mdx new file mode 100644 index 0000000000000..ffda24550d9c0 --- /dev/null +++ b/docs/src/pages/docs/Contributing/style-guide.mdx @@ -0,0 +1,55 @@ +--- +name: Style Guide +menu: Contributing +route: /docs/contributing/style-guidelines +index: 4 +version: 1 +--- + +## Design Guidelines + +### Capitalization guidelines + +#### Sentence case + +Use sentence-case capitalization for everything in the UI (except these \*\*). + +Sentence case is predominantly lowercase. Capitalize only the initial character of the first word, and other words that require capitalization, like: + +- **Proper nouns.** Objects in the product _are not_ considered proper nouns e.g. dashboards, charts, saved queries etc. Proprietary feature names eg. SQL Lab, Preset Manager _are_ considered proper nouns +- **Acronyms** (e.g. CSS, HTML) +- When referring to **UI labels that are themselves capitalized** from sentence case (e.g. page titles - Dashboards page, Charts page, Saved queries page, etc.) +- User input that is reflected in the UI. E.g. a user-named a dashboard tab + +**Sentence case vs. Title case:** +Title case: "A Dog Takes a Walk in Paris" +Sentence case: "A dog takes a walk in Paris" + +**Why sentence case?** + +- It’s generally accepted as the quickest to read +- It’s the easiest form to distinguish between common and proper nouns + +#### How to refer to UI elements + +When writing about a UI element, use the same capitalization as used in the UI. + +For example, if an input field is labeled “Name” then you refer to this as the “Name input field”. Similarly, if a button has the label “Save” in it, then it is correct to refer to the “Save button”. + +Where a product page is titled “Settings”, you refer to this in writing as follows: +“Edit your personal information on the Settings page”. + +Often a product page will have the same title as the objects it contains. In this case, refer to the page as it appears in the UI, and the objects as common nouns: + +- Upload a dashboard on the Dashboards page +- Go to Dashboards +- View dashboard +- View all dashboards +- Upload CSS templates on the CSS templates page +- Queries that you save will appear on the Saved queries page +- Create custom queries in SQL Lab then create dashboards + +#### \*\*Exceptions to sentence case: + +- Input labels, buttons and UI tabs are all caps +- User input values (e.g. column names, SQL Lab tab names) should be in their original case diff --git a/docs/src/pages/docs/Contributing/testing-locally.mdx b/docs/src/pages/docs/Contributing/testing-locally.mdx new file mode 100644 index 0000000000000..7fce08775b04d --- /dev/null +++ b/docs/src/pages/docs/Contributing/testing-locally.mdx @@ -0,0 +1,276 @@ +--- +name: Testing +menu: Contributing +route: /docs/contributing/local-testing +index: 7 +version: 1 +--- + +## Testing + +### Python Testing + +All python tests are carried out in [tox](https://tox.readthedocs.io/en/latest/index.html) +a standardized testing framework. +All python tests can be run with any of the tox [environments](https://tox.readthedocs.io/en/latest/example/basic.html#a-simple-tox-ini-default-environments), via, + +```bash +tox -e +``` + +For example, + +```bash +tox -e py38 +``` + +Alternatively, you can run all tests in a single file via, + +```bash +tox -e -- tests/test_file.py +``` + +or for a specific test via, + +```bash +tox -e -- tests/test_file.py::TestClassName::test_method_name +``` + +Note that the test environment uses a temporary directory for defining the +SQLite databases which will be cleared each time before the group of test +commands are invoked. + +There is also a utility script included in the Superset codebase to run python integration tests. The [readme can be +found here](https://github.com/apache/superset/tree/master/scripts/tests) + +To run all integration tests for example, run this script from the root directory: + +```bash +scripts/tests/run.sh +``` + +You can run unit tests found in './tests/unit_tests' for example with pytest. It is a simple way to run an isolated test that doesn't need any database setup + +```bash +pytest ./link_to_test.py +``` + +### Frontend Testing + +We use [Jest](https://jestjs.io/) and [Enzyme](https://airbnb.io/enzyme/) to test TypeScript/JavaScript. Tests can be run with: + +```bash +cd superset-frontend +npm run test +``` + +To run a single test file: + +```bash +npm run test -- path/to/file.js +``` + +### Integration Testing + +We use [Cypress](https://www.cypress.io/) for integration tests. Tests can be run by `tox -e cypress`. To open Cypress and explore tests first setup and run test server: + +```bash +export SUPERSET_CONFIG=tests.integration_tests.superset_test_config +export SUPERSET_TESTENV=true +export ENABLE_REACT_CRUD_VIEWS=true +export CYPRESS_BASE_URL="http://localhost:8081" +superset db upgrade +superset load_test_users +superset load-examples --load-test-data +superset init +superset run --port 8081 +``` + +Run Cypress tests: + +```bash +cd superset-frontend +npm run build-instrumented + +cd cypress-base +npm install + +# run tests via headless Chrome browser (requires Chrome 64+) +npm run cypress-run-chrome + +# run tests from a specific file +npm run cypress-run-chrome -- --spec cypress/integration/explore/link.test.ts + +# run specific file with video capture +npm run cypress-run-chrome -- --spec cypress/integration/dashboard/index.test.js --config video=true + +# to open the cypress ui +npm run cypress-debug + +# to point cypress to a url other than the default (http://localhost:8088) set the environment variable before running the script +# e.g., CYPRESS_BASE_URL="http://localhost:9000" +CYPRESS_BASE_URL= npm run cypress open +``` + +See [`superset-frontend/cypress_build.sh`](https://github.com/apache/superset/blob/master/superset-frontend/cypress_build.sh). + +As an alternative you can use docker-compose environment for testing: + +Make sure you have added below line to your /etc/hosts file: +`127.0.0.1 db` + +If you already have launched Docker environment please use the following command to assure a fresh database instance: +`docker-compose down -v` + +Launch environment: + +`CYPRESS_CONFIG=true docker-compose up` + +It will serve backend and frontend on port 8088. + +Run Cypress tests: + +```bash +cd cypress-base +npm install +npm run cypress open +``` + +### Debugging Server App + +Follow these instructions to debug the Flask app running inside a docker container. + +First add the following to the ./docker-compose.yaml file + +```diff +superset: + env_file: docker/.env + image: *superset-image + container_name: superset_app + command: ["/app/docker/docker-bootstrap.sh", "app"] + restart: unless-stopped ++ cap_add: ++ - SYS_PTRACE + ports: + - 8088:8088 ++ - 5678:5678 + user: "root" + depends_on: *superset-depends-on + volumes: *superset-volumes + environment: + CYPRESS_CONFIG: "${CYPRESS_CONFIG}" +``` + +Start Superset as usual + +```bash +docker-compose up +``` + +Install the required libraries and packages to the docker container + +Enter the superset_app container + +```bash +docker exec -it superset_app /bin/bash +root@39ce8cf9d6ab:/app# +``` + +Run the following commands inside the container + +```bash +apt update +apt install -y gdb +apt install -y net-tools +pip install debugpy +``` + +Find the PID for the Flask process. Make sure to use the first PID. The Flask app will re-spawn a sub-process every time you change any of the python code. So it's important to use the first PID. + +```bash +ps -ef + +UID PID PPID C STIME TTY TIME CMD +root 1 0 0 14:09 ? 00:00:00 bash /app/docker/docker-bootstrap.sh app +root 6 1 4 14:09 ? 00:00:04 /usr/local/bin/python /usr/bin/flask run -p 8088 --with-threads --reload --debugger --host=0.0.0.0 +root 10 6 7 14:09 ? 00:00:07 /usr/local/bin/python /usr/bin/flask run -p 8088 --with-threads --reload --debugger --host=0.0.0.0 +``` + +Inject debugpy into the running Flask process. In this case PID 6. + +```bash +python3 -m debugpy --listen 0.0.0.0:5678 --pid 6 +``` + +Verify that debugpy is listening on port 5678 + +```bash +netstat -tunap + +Active Internet connections (servers and established) +Proto Recv-Q Send-Q Local Address Foreign Address State PID/Program name +tcp 0 0 0.0.0.0:5678 0.0.0.0:* LISTEN 462/python +tcp 0 0 0.0.0.0:8088 0.0.0.0:* LISTEN 6/python +``` + +You are now ready to attach a debugger to the process. Using VSCode you can configure a launch configuration file .vscode/launch.json like so. + +``` +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Attach to Superset App in Docker Container", + "type": "python", + "request": "attach", + "connect": { + "host": "127.0.0.1", + "port": 5678 + }, + "pathMappings": [ + { + "localRoot": "${workspaceFolder}", + "remoteRoot": "/app" + } + ] + }, + ] +} +``` + +VSCode will not stop on breakpoints right away. We've attached to PID 6 however it does not yet know of any sub-processes. In order to "wakeup" the debugger you need to modify a python file. This will trigger Flask to reload the code and create a new sub-process. This new sub-process will be detected by VSCode and breakpoints will be activated. + +### Debugging Server App in Kubernetes Environment + +To debug Flask running in POD inside kubernetes cluster. You'll need to make sure the pod runs as root and is granted the SYS_TRACE capability.These settings should not be used in production environments. + +``` + securityContext: + capabilities: + add: ["SYS_PTRACE"] +``` + +See (set capabilities for a container)[https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-capabilities-for-a-container] for more details. + +Once the pod is running as root and has the SYS_PTRACE capability it will be able to debug the Flask app. + +You can follow the same instructions as in the docker-compose. Enter the pod and install the required library and packages; gdb, netstat and debugpy. + +Often in a Kubernetes environment nodes are not addressable from outside the cluster. VSCode will thus be unable to remotely connect to port 5678 on a Kubernetes node. In order to do this you need to create a tunnel that port forwards 5678 to your local machine. + +``` +kubectl port-forward pod/superset- 5678:5678 +``` + +You can now launch your VSCode debugger with the same config as above. VSCode will connect to to 127.0.0.1:5678 which is forwarded by kubectl to your remote kubernetes POD. + +### Storybook + +Superset includes a [Storybook](https://storybook.js.org/) to preview the layout/styling of various Superset components, and variations thereof. To open and view the Storybook: + +```bash +cd superset-frontend +npm run storybook +``` + +When contributing new React components to Superset, please try to add a Story alongside the component's `jsx/tsx` file. diff --git a/docs/src/pages/docs/Contributing/translations.mdx b/docs/src/pages/docs/Contributing/translations.mdx new file mode 100644 index 0000000000000..293262ea5c681 --- /dev/null +++ b/docs/src/pages/docs/Contributing/translations.mdx @@ -0,0 +1,104 @@ +--- +name: Translating +menu: Contributing +route: /docs/contributing/translating +index: 8 +version: 1 +--- + +## Translating + +We use [Babel](http://babel.pocoo.org/en/latest/) to translate Superset. +In Python files, we import the magic `_` function using: + +```python +from flask_babel import lazy_gettext as _ +``` + +then wrap our translatable strings with it, e.g. `_('Translate me')`. +During extraction, string literals passed to `_` will be added to the +generated `.po` file for each language for later translation. + +At runtime, the `_` function will return the translation of the given +string for the current language, or the given string itself +if no translation is available. + +In TypeScript/JavaScript, the technique is similar: +we import `t` (simple translation), `tn` (translation containing a number). + +```javascript +import { t, tn } from "@superset-ui/translation"; +``` + +### Enabling language selection + +Add the `LANGUAGES` variable to your `superset_config.py`. Having more than one +option inside will add a language selection dropdown to the UI on the right side +of the navigation bar. + +```python +LANGUAGES = { + 'en': {'flag': 'us', 'name': 'English'}, + 'fr': {'flag': 'fr', 'name': 'French'}, + 'zh': {'flag': 'cn', 'name': 'Chinese'}, +} +``` + +### Extracting new strings for translation + +```bash +pybabel extract -F superset/translations/babel.cfg -o superset/translations/messages.pot -k _ -k __ -k t -k tn -k tct . +``` + +This will update the template file `superset/translations/messages.pot` with current application strings. Do not forget to update +this file with the appropriate license information. + +### Updating language files + +```bash + pybabel update -i superset/translations/messages.pot -d superset/translations --ignore-obsolete +``` + +This will update language files with the new extracted strings. + +You can then translate the strings gathered in files located under +`superset/translation`, where there's one per language. You can use [Poedit](https://poedit.net/features) +to translate the `po` file more conveniently. +There are some [tutorials in the wiki](https://wiki.lxde.org/en/Translate_*.po_files_with_Poedit). + +In the case of JS translation, we need to convert the PO file into a JSON file, and we need the global download of the npm package po2json. + +```bash +npm install -g po2json +``` + +To convert all PO files to formatted JSON files you can use the `po2json.sh` script. + +```bash +./scripts/po2json.sh +``` + +If you get errors running `po2json`, you might be running the Ubuntu package with the same +name, rather than the Node.js package (they have a different format for the arguments). If +there is a conflict, you may need to update your `PATH` environment variable or fully qualify +the executable path (e.g. `/usr/local/bin/po2json` instead of `po2json`). +If you get a lot of `[null,***]` in `messages.json`, just delete all the `null,`. +For example, `"year":["年"]` is correct while `"year":[null,"年"]`is incorrect. + +For the translations to take effect we need to compile translation catalogs into binary MO files. + +```bash +pybabel compile -d superset/translations +``` + +### Creating a new language dictionary + +To create a dictionary for a new language, run the following, where `LANGUAGE_CODE` is replaced with +the language code for your target language, e.g. `es` (see [Flask AppBuilder i18n documentation](https://flask-appbuilder.readthedocs.io/en/latest/i18n.html) for more details): + +```bash +pip install -r superset/translations/requirements.txt +pybabel init -i superset/translations/messages.pot -d superset/translations -l LANGUAGE_CODE +``` + +Then, [extract strings for the new language](#extracting-new-strings-for-translation). diff --git a/docs/src/pages/docs/Contributing/types-of-contributions.mdx b/docs/src/pages/docs/Contributing/types-of-contributions.mdx new file mode 100644 index 0000000000000..ff44ac951d896 --- /dev/null +++ b/docs/src/pages/docs/Contributing/types-of-contributions.mdx @@ -0,0 +1,61 @@ +--- +name: Types of Contributions +menu: Contributing +route: /docs/contributing/contribution-types +index: 2 +version: 1 +--- + +## Types of Contributions + +### Report Bug + +The best way to report a bug is to file an issue on GitHub. Please include: + +- Your operating system name and version. +- Superset version. +- Detailed steps to reproduce the bug. +- Any details about your local setup that might be helpful in troubleshooting. + +When posting Python stack traces, please quote them using +[Markdown blocks](https://help.github.com/articles/creating-and-highlighting-code-blocks/). + +### Submit Ideas or Feature Requests + +The best way is to file an issue on GitHub: + +- Explain in detail how it would work. +- Keep the scope as narrow as possible, to make it easier to implement. +- Remember that this is a volunteer-driven project, and that contributions are welcome :) + +For large features or major changes to codebase, please create **Superset Improvement Proposal (SIP)**. See template from [SIP-0](https://github.com/apache/superset/issues/5602) + +### Fix Bugs + +Look through the GitHub issues. Issues tagged with `#bug` are +open to whoever wants to implement them. + +### Implement Features + +Look through the GitHub issues. Issues tagged with +`#feature` is open to whoever wants to implement it. + +### Improve Documentation + +Superset could always use better documentation, +whether as part of the official Superset docs, +in docstrings, `docs/*.rst` or even on the web as blog posts or +articles. See [Documentation](#documentation) for more details. + +### Add Translations + +If you are proficient in a non-English language, you can help translate +text strings from Superset's UI. You can jump in to the existing +language dictionaries at +`superset/translations//LC_MESSAGES/messages.po`, or +even create a dictionary for a new language altogether. +See [Translating](#translating) for more details. + +### Ask Questions + +There is a dedicated [`apache-superset` tag](https://stackoverflow.com/questions/tagged/apache-superset) on [StackOverflow](https://stackoverflow.com/). Please use it when asking questions. diff --git a/docs/src/pages/docs/installation/alerts_reports.mdx b/docs/src/pages/docs/installation/alerts_reports.mdx index f81cf7e43de46..e794d251504c0 100644 --- a/docs/src/pages/docs/installation/alerts_reports.mdx +++ b/docs/src/pages/docs/installation/alerts_reports.mdx @@ -2,7 +2,7 @@ name: Alerts and Reports menu: Installation and Configuration route: /docs/installation/alerts-reports -index: 10 +index: 11 version: 2 --- diff --git a/docs/src/pages/docs/installation/async_queries_celery.mdx b/docs/src/pages/docs/installation/async_queries_celery.mdx index e97acc6a23cd2..0c170efadf734 100644 --- a/docs/src/pages/docs/installation/async_queries_celery.mdx +++ b/docs/src/pages/docs/installation/async_queries_celery.mdx @@ -2,7 +2,7 @@ name: Async Queries via Celery menu: Installation and Configuration route: /docs/installation/async-queries-celery -index: 9 +index: 10 version: 1 --- diff --git a/docs/src/pages/docs/installation/building-viz-plugins.mdx b/docs/src/pages/docs/installation/building-viz-plugins.mdx index 30ec75c6e5766..c0a4efd93d36f 100644 --- a/docs/src/pages/docs/installation/building-viz-plugins.mdx +++ b/docs/src/pages/docs/installation/building-viz-plugins.mdx @@ -2,7 +2,7 @@ name: Building Custom Viz Plugins menu: Installation and Configuration route: /docs/installation/building-custom-viz-plugins -index: 11 +index: 12 version: 1 --- diff --git a/docs/src/pages/docs/installation/caching.mdx b/docs/src/pages/docs/installation/caching.mdx index e599553dde741..26c57535e361e 100644 --- a/docs/src/pages/docs/installation/caching.mdx +++ b/docs/src/pages/docs/installation/caching.mdx @@ -2,7 +2,7 @@ name: Caching menu: Installation and Configuration route: /docs/installation/cache -index: 5 +index: 6 version: 1 --- diff --git a/docs/src/pages/docs/installation/configuring.mdx b/docs/src/pages/docs/installation/configuring.mdx index 922f97d7a2d4b..02592513bde37 100644 --- a/docs/src/pages/docs/installation/configuring.mdx +++ b/docs/src/pages/docs/installation/configuring.mdx @@ -2,7 +2,7 @@ name: Configuring Superset menu: Installation and Configuration route: /docs/installation/configuring-superset -index: 3 +index: 4 version: 1 --- diff --git a/docs/src/pages/docs/installation/event-logging-page.mdx b/docs/src/pages/docs/installation/event-logging-page.mdx index 8d09325d48c7c..dbbf87e1b65d5 100644 --- a/docs/src/pages/docs/installation/event-logging-page.mdx +++ b/docs/src/pages/docs/installation/event-logging-page.mdx @@ -2,7 +2,7 @@ name: Event Logging menu: Installation and Configuration route: /docs/installation/event-logging -index: 6 +index: 7 version: 1 --- diff --git a/docs/src/pages/docs/installation/frontend-assets.mdx b/docs/src/pages/docs/installation/frontend-assets.mdx new file mode 100644 index 0000000000000..f7434b4583054 --- /dev/null +++ b/docs/src/pages/docs/installation/frontend-assets.mdx @@ -0,0 +1,92 @@ +--- +name: Running Frontend Assets Locally +menu: Installation and Configuration +route: /docs/installation/local-frontend +index: 3 +version: 1 +--- + +### Frontend + +If you plan to make contributions to the superset frontend (contained within the `superset-frontend` folder in the main repo), +frontend assets (TypeScript, JavaScript, CSS, and images) must be compiled in order to properly display the web UI. +The `superset-frontend` directory contains all NPM-managed frontend assets. +Note that for some legacy pages there are additional frontend assets bundled with Flask-Appbuilder (e.g. jQuery and bootstrap). +These are not managed by NPM and may be phased out in the future. + +#### Prerequisite + +##### nvm and node + +First, be sure you are using the following versions of Node.js and npm: + +- `Node.js`: Version 16 +- `npm`: Version 7 + +We recommend using [nvm](https://github.com/nvm-sh/nvm) to manage your node environment: + +```bash +curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.0/install.sh | bash + +cd superset-frontend +nvm install --lts +nvm use --lts +``` + +Or if you use the default macOS starting with Catalina shell `zsh`, try: + +```zsh +sh -c "$(curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.0/install.sh)" +``` + +For those interested, you may also try out [avn](https://github.com/nvm-sh/nvm#deeper-shell-integration) to automatically +switch to the node version that is required to run Superset frontend. + +#### Install dependencies + +Install third-party dependencies listed in `package.json` via: + +```bash +# From the root of the repository +cd superset-frontend + +# Install dependencies from `package-lock.json` +npm ci +``` + +#### Build assets + +There are three types of assets you can build: + +1. `npm run build`: the production assets, CSS/JSS minified and optimized +2. `npm run dev-server`: local development assets, with sourcemaps and hot refresh support +3. `npm run build-instrumented`: instrumented application code for collecting code coverage from Cypress tests + +#### Webpack dev server + +The dev server by default starts at `http://localhost:9000` and proxies the backend requests to `http://localhost:8088`. +It's possible to change these settings: + +```bash +# Start the dev server at http://localhost:9000 +npm run dev-server + +# Run the dev server on a non-default port +npm run dev-server -- --devserverPort=9001 + +# Proxy backend requests to a Flask server running on a non-default port +npm run dev-server -- --supersetPort=8081 + +# Proxy to a remote backend but serve local assets +npm run dev-server -- --superset=https://superset-dev.example.com +``` + +The `--superset=` option is useful in case you want to debug a production issue or have to setup Superset behind a firewall. +It allows you to run Flask server in another environment while keep assets building locally for the best developer experience. + +#### Other npm commands + +Alternatively, there are other NPM commands you may find useful: + +1. `npm run build-dev`: build assets in development mode. +2. `npm run dev`: built dev assets in watch mode, will automatically rebuild when a file changes diff --git a/docs/src/pages/docs/installation/installing_scratch.mdx b/docs/src/pages/docs/installation/installing_scratch.mdx index bc5a85a69f1fe..8f923bbde453c 100644 --- a/docs/src/pages/docs/installation/installing_scratch.mdx +++ b/docs/src/pages/docs/installation/installing_scratch.mdx @@ -134,7 +134,7 @@ $ export FLASK_APP=superset superset fab create-admin # Load some data to play with -superset load_examples +superset load-examples # Create default roles and permissions superset init diff --git a/docs/src/pages/docs/installation/kubernetes.mdx b/docs/src/pages/docs/installation/kubernetes.mdx index 2697e05ececd4..95b6aa7e9dc2e 100644 --- a/docs/src/pages/docs/installation/kubernetes.mdx +++ b/docs/src/pages/docs/installation/kubernetes.mdx @@ -2,7 +2,7 @@ name: Running on Kubernetes menu: Installation and Configuration route: /docs/installation/running-on-kubernetes -index: 12 +index: 13 version: 1 --- diff --git a/docs/src/pages/docs/installation/networking_settings.mdx b/docs/src/pages/docs/installation/networking_settings.mdx index dc0c49c09fd0f..530ed43d665c8 100644 --- a/docs/src/pages/docs/installation/networking_settings.mdx +++ b/docs/src/pages/docs/installation/networking_settings.mdx @@ -2,7 +2,7 @@ name: Additional Networking Settings menu: Installation and Configuration route: /docs/installation/networking-settings -index: 4 +index: 5 version: 1 --- diff --git a/docs/src/pages/docs/installation/sql_templating.mdx b/docs/src/pages/docs/installation/sql_templating.mdx index 97564b0726d61..5bc46a953ebca 100644 --- a/docs/src/pages/docs/installation/sql_templating.mdx +++ b/docs/src/pages/docs/installation/sql_templating.mdx @@ -2,7 +2,7 @@ name: SQL Templating menu: Installation and Configuration route: /docs/installation/sql-templating -index: 10 +index: 11 version: 1 --- diff --git a/docs/src/pages/docs/installation/upgrading_superset.mdx b/docs/src/pages/docs/installation/upgrading_superset.mdx index 60e988ba86435..0799becaad5b3 100644 --- a/docs/src/pages/docs/installation/upgrading_superset.mdx +++ b/docs/src/pages/docs/installation/upgrading_superset.mdx @@ -2,7 +2,7 @@ name: Upgrading Superset menu: Installation and Configuration route: /docs/installation/upgrading-superset -index: 6 +index: 7 version: 1 --- From 2b32474db494839d55a0678098e575e5550971cd Mon Sep 17 00:00:00 2001 From: riahk Date: Fri, 10 Dec 2021 15:02:22 -0800 Subject: [PATCH 2/9] rm extraneous links --- docs/src/pages/docs/Contributing/contributing-page.mdx | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docs/src/pages/docs/Contributing/contributing-page.mdx b/docs/src/pages/docs/Contributing/contributing-page.mdx index 41d912db1661c..039e465edb98e 100644 --- a/docs/src/pages/docs/Contributing/contributing-page.mdx +++ b/docs/src/pages/docs/Contributing/contributing-page.mdx @@ -15,10 +15,3 @@ which you can join): - [Mailing list](https://lists.apache.org/list.html?dev@superset.apache.org) - [Apache Superset Slack community](https://join.slack.com/t/apache-superset/shared_invite/zt-uxbh5g36-AISUtHbzOXcu0BIj7kgUaw) - [Github issues and PR's](https://github.com/apache/superset/issues) - -If you're interested in contributing, we recommend reading the Community Contribution Guide -[described in CONTRIBUTING.MD](https://github.com/apache/superset/blob/master/CONTRIBUTING.md) -to get started. Here are some helpful links from that page: - -- [Managing Issues and PR's](https://github.com/apache/superset/blob/master/CONTRIBUTING.md#managing-issues-and-prs) -- [Setting up local environment for development](https://github.com/apache/superset/blob/master/CONTRIBUTING.md#setup-local-environment-for-development) From 96c039d801190c2201011d7a2e18b48dde5b9dfd Mon Sep 17 00:00:00 2001 From: riahk Date: Mon, 13 Dec 2021 12:17:41 -0800 Subject: [PATCH 3/9] add chart param reference, update section titles --- .../pages/docs/Miscellaneous/chart-params.mdx | 148 ++++++++++++++++++ .../pages/docs/installation/kubernetes.mdx | 2 +- .../docs/installation/sql_templating.mdx | 2 +- 3 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 docs/src/pages/docs/Miscellaneous/chart-params.mdx diff --git a/docs/src/pages/docs/Miscellaneous/chart-params.mdx b/docs/src/pages/docs/Miscellaneous/chart-params.mdx new file mode 100644 index 0000000000000..656b13a37745b --- /dev/null +++ b/docs/src/pages/docs/Miscellaneous/chart-params.mdx @@ -0,0 +1,148 @@ +--- +name: Chart Parameters Reference +menu: Miscellaneous +route: /docs/miscellaneous/chart-params +index: 4 +version: 1 +--- + +## Chart Parameters + +Chart parameters are stored as a JSON encoded string the `slices.params` column and are often referenced throughout the code as form-data. Currently the form-data is neither versioned nor typed as thus is somewhat free-formed. Note in the future there may be merit in using something like [JSON Schema](https://json-schema.org/) to both annotate and validate the JSON object in addition to using a Mypy `TypedDict` (introduced in Python 3.8) for typing the form-data in the backend. This section serves as a potential primer for that work. + +The following tables provide a non-exhausive list of the various fields which can be present in the JSON object grouped by the Explorer pane sections. These values were obtained by extracting the distinct fields from a legacy deployment consisting of tens of thousands of charts and thus some fields may be missing whilst others may be deprecated. + +Note not all fields are correctly categorized. The fields vary based on visualization type and may appear in different sections depending on the type. Verified deprecated columns may indicate a missing migration and/or prior migrations which were unsuccessful and thus future work may be required to clean up the form-data. + +### Datasource & Chart Type + +| Field | Type | Notes | +| ----------------- | -------- | ----------------------------------- | +| `database_name` | _string_ | _Deprecated?_ | +| `datasource` | _string_ | `__` | +| `datasource_id` | _string_ | _Deprecated?_ See `datasource` | +| `datasource_name` | _string_ | _Deprecated?_ | +| `datasource_type` | _string_ | _Deprecated?_ See `datasource` | +| `viz_type` | _string_ | The **Visualization Type** widget | + +### Time + +| Field | Type | Notes | +| ------------------- | -------- | ------------------------------------- | +| `druid_time_origin` | _string_ | The Druid **Origin** widget | +| `granularity` | _string_ | The Druid **Time Granularity** widget | +| `granularity_sqla` | _string_ | The SQLA **Time Column** widget | +| `time_grain_sqla` | _string_ | The SQLA **Time Grain** widget | +| `time_range` | _string_ | The **Time range** widget | + +### GROUP BY + +| Field | Type | Notes | +| ------------------------- | --------------- | ----------------- | +| `metrics` | _array(string)_ | See Query section | +| `order_asc` | - | See Query section | +| `row_limit` | - | See Query section | +| `timeseries_limit_metric` | - | See Query section | + +### NOT GROUPED BY + +| Field | Type | Notes | +| --------------- | --------------- | ----------------------- | +| `order_by_cols` | _array(string)_ | The **Ordering** widget | +| `row_limit` | - | See Query section | + +### Y Axis 1 + +| Field | Type | Notes | +| --------------- | ---- | -------------------------------------------------- | +| `metric` | - | The **Left Axis Metric** widget. See Query section | +| `y_axis_format` | - | See Y Axis section | + +### Y Axis 2 + +| Field | Type | Notes | +| ---------- | ---- | --------------------------------------------------- | +| `metric_2` | - | The **Right Axis Metric** widget. See Query section | + +### Query + +| Field | Type | Notes | +| ------------------------------------------------------------------------------------------------------ | ------------------------------------------------- | ------------------------------------------------- | +| `adhoc_filters` | _array(object)_ | The **Filters** widget | +| `extra_filters` | _array(object)_ | Another pathway to the **Filters** widget.
It is generally used to pass dashboard filter parameters to a chart.
It can be used for appending additional filters to a chart that has been saved with its own filters on an ad-hoc basis if the chart is being used as a standalone widget.

For implementation examples see : [utils test.py](https://github.com/apache/superset/blob/66a4c94a1ed542e69fe6399bab4c01d4540486cf/tests/utils_tests.py#L181)
For insight into how superset processes the contents of this parameter see: [exploreUtils/index.js](https://github.com/apache/superset/blob/93c7f5bb446ec6895d7702835f3157426955d5a9/superset-frontend/src/explore/exploreUtils/index.js#L159) | +| `columns` | _array(string)_ | The **Breakdowns** widget | +| `groupby` | _array(string)_ | The **Group by** or **Series** widget | +| `limit` | _number_ | The **Series Limit** widget | +| `metric`
`metric_2`
`metrics`
`percent_mertics`
`secondary_metric`
`size`
`x`
`y` | _string_,_object_,_array(string)_,_array(object)_ | The metric(s) depending on the visualization type | +| `order_asc` | _boolean_ | The **Sort Descending** widget | +| `row_limit` | _number_ | The **Row limit** widget | +| `timeseries_limit_metric` | _object_ | The **Sort By** widget | + +The `metric` (or equivalent) and `timeseries_limit_metric` fields are all composed of either metric names or the JSON representation of the `AdhocMetric` TypeScript type. The `adhoc_filters` is composed of the JSON represent of the `AdhocFilter` TypeScript type (which can comprise of columns or metrics depending on whether it is a WHERE or HAVING clause). The `all_columns`, `all_columns_x`, `columns`, `groupby`, and `order_by_cols` fields all represent column names. + +### Chart Options + +| Field | Type | Notes | +| -------------- | --------- | --------------------------- | +| `color_picker` | _object_ | The **Fixed Color** widget | +| `label_colors` | _object_ | The **Color Scheme** widget | +| `normalized` | _boolean_ | The **Normalized** widget | + +### Y Axis + +| Field | Type | Notes | +| ---------------- | -------- | ---------------------------- | +| `y_axis_2_label` | _N/A_ | _Deprecated?_ | +| `y_axis_format` | _string_ | The **Y Axis Format** widget | +| `y_axis_zero` | _N/A_ | _Deprecated?_ | + +Note the `y_axis_format` is defined under various section for some charts. + +### Other + +| Field | Type | Notes | +| -------------- | -------- | ----- | +| `color_scheme` | _string_ | | + +### Unclassified + +| Field | Type | Notes | +| ----------------------------- | ----- | ----- | +| `add_to_dash` | _N/A_ | | +| `code` | _N/A_ | | +| `collapsed_fieldsets` | _N/A_ | | +| `comparison type` | _N/A_ | | +| `country_fieldtype` | _N/A_ | | +| `default_filters` | _N/A_ | | +| `entity` | _N/A_ | | +| `expanded_slices` | _N/A_ | | +| `filter_immune_slice_fields` | _N/A_ | | +| `filter_immune_slices` | _N/A_ | | +| `flt_col_0` | _N/A_ | | +| `flt_col_1` | _N/A_ | | +| `flt_eq_0` | _N/A_ | | +| `flt_eq_1` | _N/A_ | | +| `flt_op_0` | _N/A_ | | +| `flt_op_1` | _N/A_ | | +| `goto_dash` | _N/A_ | | +| `import_time` | _N/A_ | | +| `label` | _N/A_ | | +| `linear_color_scheme` | _N/A_ | | +| `new_dashboard_name` | _N/A_ | | +| `new_slice_name` | _N/A_ | | +| `num_period_compare` | _N/A_ | | +| `period_ratio_type` | _N/A_ | | +| `perm` | _N/A_ | | +| `rdo_save` | _N/A_ | | +| `refresh_frequency` | _N/A_ | | +| `remote_id` | _N/A_ | | +| `resample_fillmethod` | _N/A_ | | +| `resample_how` | _N/A_ | | +| `rose_area_proportion` | _N/A_ | | +| `save_to_dashboard_id` | _N/A_ | | +| `schema` | _N/A_ | | +| `series` | _N/A_ | | +| `show_bubbles` | _N/A_ | | +| `slice_name` | _N/A_ | | +| `timed_refresh_immune_slices` | _N/A_ | | +| `userid` | _N/A_ | | diff --git a/docs/src/pages/docs/installation/kubernetes.mdx b/docs/src/pages/docs/installation/kubernetes.mdx index 95b6aa7e9dc2e..ce35d25ebccff 100644 --- a/docs/src/pages/docs/installation/kubernetes.mdx +++ b/docs/src/pages/docs/installation/kubernetes.mdx @@ -1,5 +1,5 @@ --- -name: Running on Kubernetes +name: Running on Kubernetes (Helm) menu: Installation and Configuration route: /docs/installation/running-on-kubernetes index: 13 diff --git a/docs/src/pages/docs/installation/sql_templating.mdx b/docs/src/pages/docs/installation/sql_templating.mdx index 5bc46a953ebca..a8e51857052ca 100644 --- a/docs/src/pages/docs/installation/sql_templating.mdx +++ b/docs/src/pages/docs/installation/sql_templating.mdx @@ -1,5 +1,5 @@ --- -name: SQL Templating +name: SQL Templating (Jinja) menu: Installation and Configuration route: /docs/installation/sql-templating index: 11 From 6ff93475c38c2e0e249586c442080eba6b1f7a4a Mon Sep 17 00:00:00 2001 From: riahk Date: Tue, 14 Dec 2021 12:41:02 -0800 Subject: [PATCH 4/9] useful links --- docs/src/pages/docs/Contributing/contributing-page.mdx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/src/pages/docs/Contributing/contributing-page.mdx b/docs/src/pages/docs/Contributing/contributing-page.mdx index 039e465edb98e..70323de1836c1 100644 --- a/docs/src/pages/docs/Contributing/contributing-page.mdx +++ b/docs/src/pages/docs/Contributing/contributing-page.mdx @@ -15,3 +15,7 @@ which you can join): - [Mailing list](https://lists.apache.org/list.html?dev@superset.apache.org) - [Apache Superset Slack community](https://join.slack.com/t/apache-superset/shared_invite/zt-uxbh5g36-AISUtHbzOXcu0BIj7kgUaw) - [Github issues and PR's](https://github.com/apache/superset/issues) + +More references: +- [Comprehensive Tutorial for Contributing Code to Apache Superset](https://preset.io/blog/tutorial-contributing-code-to-apache-superset/) +- [CONTRIBUTING Guide on Github](https://github.com/apache/superset/blob/master/CONTRIBUTING.md) From f25c1fc24bbdb884eb0273008e40d92cc89e3832 Mon Sep 17 00:00:00 2001 From: riahk Date: Thu, 16 Dec 2021 12:14:01 -0800 Subject: [PATCH 5/9] test openapi --- docs/src/resources/openapi.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/src/resources/openapi.json b/docs/src/resources/openapi.json index 7913a24f6a8b9..cdd51639054a4 100644 --- a/docs/src/resources/openapi.json +++ b/docs/src/resources/openapi.json @@ -154,10 +154,6 @@ "description": "Should the layer be shown", "type": "boolean" }, - "showLabel": { - "description": "Should the label always be shown", - "type": "boolean" - }, "showMarkers": { "description": "Should markers be shown. Only applies to line annotations.", "type": "boolean" @@ -205,7 +201,6 @@ "required": [ "name", "show", - "showLabel", "showMarkers", "value" ], From 7f5898d2f8ac978b531cbaa17a39fbdf6c2334b2 Mon Sep 17 00:00:00 2001 From: riahk Date: Thu, 16 Dec 2021 12:47:53 -0800 Subject: [PATCH 6/9] revert test code --- docs/src/resources/openapi.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/src/resources/openapi.json b/docs/src/resources/openapi.json index cdd51639054a4..7913a24f6a8b9 100644 --- a/docs/src/resources/openapi.json +++ b/docs/src/resources/openapi.json @@ -154,6 +154,10 @@ "description": "Should the layer be shown", "type": "boolean" }, + "showLabel": { + "description": "Should the label always be shown", + "type": "boolean" + }, "showMarkers": { "description": "Should markers be shown. Only applies to line annotations.", "type": "boolean" @@ -201,6 +205,7 @@ "required": [ "name", "show", + "showLabel", "showMarkers", "value" ], From 369660cd919705622a712889b93bfa460aaeb393 Mon Sep 17 00:00:00 2001 From: riahk Date: Thu, 16 Dec 2021 13:04:51 -0800 Subject: [PATCH 7/9] bump swagger-react-ui version --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index 91ce0c89f4fff..dac8135d92295 100644 --- a/docs/package.json +++ b/docs/package.json @@ -37,7 +37,7 @@ "react-github-btn": "^1.2.0", "react-grid-gallery": "^0.5.5", "react-helmet": "^6.1.0", - "swagger-ui-react": "^3.36.2", + "swagger-ui-react": "^3.52.5", "theme-ui": "^0.3.1", "three": "^0.125.0" }, From f9f527276f00cb4c20f14be294ca419f7b2b4b43 Mon Sep 17 00:00:00 2001 From: riahk Date: Thu, 16 Dec 2021 13:12:12 -0800 Subject: [PATCH 8/9] update package lock --- docs/package-lock.json | 1129 ++++++++++++++++++++++++++++++++-------- 1 file changed, 902 insertions(+), 227 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 2d64ba2e81e72..6a34ee33ade9d 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -1569,9 +1569,15 @@ } }, "node_modules/@braintree/sanitize-url": { +<<<<<<< HEAD "version": "5.0.0", "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-5.0.0.tgz", "integrity": "sha512-WmKrB/575EJCzbeSJR3YQ5sET5FaizeljLRw1382qVUeGqzuWBgIS+AF5a0FO51uQTrDpoRgvuHC2IWVsgwkkA==" +======= + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-5.0.2.tgz", + "integrity": "sha512-NBEJlHWrhQucLhZGHtSxM2loSaNUMajC7KOYJLyfcdW/6goVoff2HoYI3bz8YCDN0wKGbxtUL0gx2dvHpvnWlw==" +>>>>>>> update package lock }, "node_modules/@emotion/babel-plugin-jsx-pragmatic": { "version": "0.1.5", @@ -3758,9 +3764,15 @@ } }, "node_modules/@types/json-schema": { +<<<<<<< HEAD "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==" +======= + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz", + "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==" +>>>>>>> update package lock }, "node_modules/@types/json5": { "version": "0.0.29", @@ -4305,9 +4317,15 @@ } }, "node_modules/ajv": { +<<<<<<< HEAD "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", +======= + "version": "6.12.3", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", + "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", +>>>>>>> update package lock "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -6372,9 +6390,29 @@ } }, "node_modules/base64-js": { +<<<<<<< HEAD "version": "1.3.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" +======= + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] +>>>>>>> update package lock }, "node_modules/base64id": { "version": "2.0.0", @@ -6755,6 +6793,20 @@ "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==" }, +<<<<<<< HEAD +======= + "node_modules/block-stream": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "dependencies": { + "inherits": "~2.0.0" + }, + "engines": { + "node": "0.4 || >=0.5.8" + } + }, +>>>>>>> update package lock "node_modules/bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -7859,9 +7911,15 @@ } }, "node_modules/classnames": { +<<<<<<< HEAD "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==" +>>>>>>> update package lock }, "node_modules/clean-css": { "version": "4.2.3", @@ -7935,6 +7993,7 @@ "node": ">= 10" } }, +<<<<<<< HEAD "node_modules/clipboard": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz", @@ -7946,6 +8005,8 @@ "tiny-emitter": "^2.0.0" } }, +======= +>>>>>>> update package lock "node_modules/clipboardy": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz", @@ -8034,6 +8095,22 @@ "node": ">=0.8" } }, +<<<<<<< HEAD +======= + "node_modules/clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "dependencies": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, +>>>>>>> update package lock "node_modules/clone-response": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", @@ -8621,9 +8698,15 @@ } }, "node_modules/core-js-pure": { +<<<<<<< HEAD "version": "3.6.5", "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz", "integrity": "sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==", +======= + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.20.0.tgz", + "integrity": "sha512-qsrbIwWSEEYOM7z616jAVgwhuDDtPLwZSpUsU3vyUkHYqKTf/uwOJBZg2V7lMurYWkpVlaVOxBrfX0Q3ppvjfg==", +>>>>>>> update package lock "hasInstallScript": true, "funding": { "type": "opencollective", @@ -9586,12 +9669,15 @@ "node": ">=0.4.0" } }, +<<<<<<< HEAD "node_modules/delegate": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==", "optional": true }, +======= +>>>>>>> update package lock "node_modules/delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", @@ -10354,9 +10440,15 @@ } }, "node_modules/dompurify": { +<<<<<<< HEAD "version": "2.2.2", "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.2.tgz", "integrity": "sha512-BsGR4nDLaC5CNBnyT5I+d5pOeaoWvgVeg6Gq/aqmKYWMPR07131u60I80BvExLAJ0FQEIBQ1BTicw+C5+jOyrg==" +======= + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.4.tgz", + "integrity": "sha512-6BVcgOAVFXjI0JTjEvZy901Rghm+7fDQOrNIcxB4+gdhj6Kwp6T9VBhBY/AbagKHJocRkDYGd6wvI+p4/10xtQ==" +>>>>>>> update package lock }, "node_modules/domutils": { "version": "1.5.1", @@ -10781,6 +10873,7 @@ "node": ">=0.10.0" } }, +<<<<<<< HEAD "node_modules/env-paths": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", @@ -10789,6 +10882,8 @@ "node": ">=6" } }, +======= +>>>>>>> update package lock "node_modules/envinfo": { "version": "7.7.3", "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.7.3.tgz", @@ -12344,9 +12439,15 @@ } }, "node_modules/fast-json-patch": { +<<<<<<< HEAD "version": "3.0.0-1", "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.0.0-1.tgz", "integrity": "sha512-6pdFb07cknxvPzCeLsFHStEy+MysPJPgZQ9LbQ/2O67unQF93SNqfdSqnPPl71YMHX+AD8gbl7iuoGFzHEdDuw==" +======= + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.0.tgz", + "integrity": "sha512-IhpytlsVTRndz0hU5t0/MGzS/etxLlfrpG5V5M9mVbuj9TrJLWaMfsox9REM5rkuGX0T+5qjpe8XA1o0gZ42nA==" +>>>>>>> update package lock }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", @@ -12771,6 +12872,14 @@ "node": ">= 6" } }, +<<<<<<< HEAD +======= + "node_modules/form-data-encoder": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.1.tgz", + "integrity": "sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg==" + }, +>>>>>>> update package lock "node_modules/format": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", @@ -12779,6 +12888,21 @@ "node": ">=0.4.x" } }, +<<<<<<< HEAD +======= + "node_modules/formdata-node": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-4.3.1.tgz", + "integrity": "sha512-8xKSa9et4zb+yziWsD/bI+EYjdg1z2p9EpKr+o+Yk12F/wP66bmDdvjj2ZXd2K/MJlR3HBzWnuV7f82jzHRqCA==", + "dependencies": { + "node-domexception": "1.0.0", + "web-streams-polyfill": "4.0.0-beta.1" + }, + "engines": { + "node": ">= 12.20" + } + }, +>>>>>>> update package lock "node_modules/forwarded": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", @@ -12888,6 +13012,34 @@ "node": ">= 4.0" } }, +<<<<<<< HEAD +======= + "node_modules/fstream": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", + "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", + "dependencies": { + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" + }, + "engines": { + "node": ">=0.6" + } + }, + "node_modules/fstream/node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, +>>>>>>> update package lock "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -14058,19 +14210,32 @@ } }, "node_modules/gatsby-plugin-sass": { +<<<<<<< HEAD "version": "3.2.0", "resolved": "https://registry.npmjs.org/gatsby-plugin-sass/-/gatsby-plugin-sass-3.2.0.tgz", "integrity": "sha512-YlQX1Kn1wGcKCgyS8OfD0/W16XIRKvE/5wg6HRnUhJV03MNTB/41eRDsgGe0zLb3jb/aw1bH7leWcBVy0RoClA==", "dependencies": { "@babel/runtime": "^7.12.5", "sass-loader": "^10.1.0" +======= + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/gatsby-plugin-sass/-/gatsby-plugin-sass-2.4.2.tgz", + "integrity": "sha512-6DnB+sRoSTS/dpsk/r2rTEA40XanDhmHvk4Esv+flgS6zcZro4U6cc5ibR6tum/fdfdu8/T/RoPZgGLCm4e4sQ==", + "dependencies": { + "@babel/runtime": "^7.11.2", + "sass-loader": "^7.3.1" +>>>>>>> update package lock }, "engines": { "node": ">=10.13.0" }, "peerDependencies": { "gatsby": "^2.0.0", +<<<<<<< HEAD "sass": "^1.30.0" +======= + "node-sass": "^4.9.0" +>>>>>>> update package lock } }, "node_modules/gatsby-plugin-sass/node_modules/@babel/runtime": { @@ -16455,9 +16620,15 @@ } }, "node_modules/get-intrinsic": { +<<<<<<< HEAD "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz", "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==", +======= + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", +>>>>>>> update package lock "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -16881,9 +17052,15 @@ } }, "node_modules/globule": { +<<<<<<< HEAD "version": "1.3.3", "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.3.tgz", "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==", +======= + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz", + "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==", +>>>>>>> update package lock "dependencies": { "glob": "~7.1.1", "lodash": "~4.17.10", @@ -16893,6 +17070,7 @@ "node": ">= 0.10" } }, +<<<<<<< HEAD "node_modules/good-listener": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", @@ -16902,6 +17080,8 @@ "delegate": "^3.1.2" } }, +======= +>>>>>>> update package lock "node_modules/got": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz", @@ -17924,9 +18104,29 @@ } }, "node_modules/ieee754": { +<<<<<<< HEAD "version": "1.1.13", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" +======= + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] +>>>>>>> update package lock }, "node_modules/iferr": { "version": "0.1.5", @@ -18143,6 +18343,20 @@ "node": ">=0.8.19" } }, +<<<<<<< HEAD +======= + "node_modules/in-publish": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz", + "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==", + "bin": { + "in-install": "in-install.js", + "in-publish": "in-publish.js", + "not-in-install": "not-in-install.js", + "not-in-publish": "not-in-publish.js" + } + }, +>>>>>>> update package lock "node_modules/indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", @@ -18569,9 +18783,15 @@ } }, "node_modules/is-core-module": { +<<<<<<< HEAD "version": "2.8.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", +======= + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz", + "integrity": "sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==", +>>>>>>> update package lock "dependencies": { "has": "^1.0.3" }, @@ -19152,6 +19372,7 @@ "node": ">=0.10.0" } }, +<<<<<<< HEAD "node_modules/isomorphic-form-data": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isomorphic-form-data/-/isomorphic-form-data-2.0.0.tgz", @@ -19173,6 +19394,8 @@ "node": ">= 0.12" } }, +======= +>>>>>>> update package lock "node_modules/isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", @@ -19535,6 +19758,7 @@ "node": ">=6" } }, +<<<<<<< HEAD "node_modules/klona": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", @@ -19543,6 +19767,8 @@ "node": ">= 8" } }, +======= +>>>>>>> update package lock "node_modules/language-subtag-registry": { "version": "0.3.21", "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz", @@ -20096,12 +20322,21 @@ } }, "node_modules/lowlight": { +<<<<<<< HEAD "version": "1.16.0", "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.16.0.tgz", "integrity": "sha512-ECLdzIJvBEjK4ef51sWiGZyz21yx4IEPaF/62DRxLehoOHkWqN3OsLB1GUMfc6Mcf87rR5eW7z6lI9cNEXZDsQ==", "dependencies": { "fault": "^1.0.0", "highlight.js": "~10.3.0" +======= + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz", + "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==", + "dependencies": { + "fault": "^1.0.0", + "highlight.js": "~10.7.0" +>>>>>>> update package lock }, "funding": { "type": "github", @@ -20109,10 +20344,16 @@ } }, "node_modules/lowlight/node_modules/highlight.js": { +<<<<<<< HEAD "version": "10.3.2", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.2.tgz", "integrity": "sha512-3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw==", "deprecated": "Potential vulnerability. Please upgrade to @latest", +======= + "version": "10.7.3", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", + "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==", +>>>>>>> update package lock "engines": { "node": "*" } @@ -20446,6 +20687,7 @@ } }, "node_modules/memoizee": { +<<<<<<< HEAD "version": "0.4.14", "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz", "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==", @@ -20458,6 +20700,20 @@ "lru-queue": "0.1", "next-tick": "1", "timers-ext": "^0.1.5" +======= + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz", + "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==", + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.53", + "es6-weak-map": "^2.0.3", + "event-emitter": "^0.3.5", + "is-promise": "^2.2.2", + "lru-queue": "^0.1.0", + "next-tick": "^1.1.0", + "timers-ext": "^0.1.7" +>>>>>>> update package lock } }, "node_modules/memory-fs": { @@ -21239,6 +21495,27 @@ "node": ">= 0.10.5" } }, +<<<<<<< HEAD +======= + "node_modules/node-domexception": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", + "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/jimmywarting" + }, + { + "type": "github", + "url": "https://paypal.me/jimmywarting" + } + ], + "engines": { + "node": ">=10.5.0" + } + }, +>>>>>>> update package lock "node_modules/node-emoji": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz", @@ -21269,6 +21546,7 @@ } }, "node_modules/node-gyp": { +<<<<<<< HEAD "version": "7.1.2", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz", "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==", @@ -21283,12 +21561,34 @@ "semver": "^7.3.2", "tar": "^6.0.2", "which": "^2.0.2" +======= + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", + "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", + "dependencies": { + "fstream": "^1.0.0", + "glob": "^7.0.3", + "graceful-fs": "^4.1.2", + "mkdirp": "^0.5.0", + "nopt": "2 || 3", + "npmlog": "0 || 1 || 2 || 3 || 4", + "osenv": "0", + "request": "^2.87.0", + "rimraf": "2", + "semver": "~5.3.0", + "tar": "^2.0.0", + "which": "1" +>>>>>>> update package lock }, "bin": { "node-gyp": "bin/node-gyp.js" }, "engines": { +<<<<<<< HEAD "node": ">= 10.12.0" +======= + "node": ">= 0.8.0" +>>>>>>> update package lock } }, "node_modules/node-gyp-build": { @@ -21301,6 +21601,7 @@ "node-gyp-build-test": "build-test.js" } }, +<<<<<<< HEAD "node_modules/node-gyp/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -21345,6 +21646,38 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, +======= + "node_modules/node-gyp/node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/node-gyp/node_modules/semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/node-gyp/node_modules/tar": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", + "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", + "deprecated": "This version of tar is no longer supported, and will not receive security updates. Please upgrade asap.", + "dependencies": { + "block-stream": "*", + "fstream": "^1.0.12", + "inherits": "2" + } + }, +>>>>>>> update package lock "node_modules/node-libs-browser": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz", @@ -21412,13 +21745,20 @@ "integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==" }, "node_modules/node-sass": { +<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-6.0.1.tgz", "integrity": "sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==", +======= + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", + "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", +>>>>>>> update package lock "hasInstallScript": true, "dependencies": { "async-foreach": "^0.1.3", "chalk": "^1.1.1", +<<<<<<< HEAD "cross-spawn": "^7.0.3", "gaze": "^1.0.0", "get-stdin": "^4.0.1", @@ -21427,6 +21767,18 @@ "meow": "^9.0.0", "nan": "^2.13.2", "node-gyp": "^7.1.0", +======= + "cross-spawn": "^3.0.0", + "gaze": "^1.0.0", + "get-stdin": "^4.0.1", + "glob": "^7.0.3", + "in-publish": "^2.0.0", + "lodash": "^4.17.15", + "meow": "^3.7.0", + "mkdirp": "^0.5.1", + "nan": "^2.13.2", + "node-gyp": "^3.8.0", +>>>>>>> update package lock "npmlog": "^4.0.0", "request": "^2.88.0", "sass-graph": "2.2.5", @@ -21437,7 +21789,11 @@ "node-sass": "bin/node-sass" }, "engines": { +<<<<<<< HEAD "node": ">=12" +======= + "node": ">=0.10.0" +>>>>>>> update package lock } }, "node_modules/node-sass/node_modules/ansi-styles": { @@ -21448,6 +21804,7 @@ "node": ">=0.10.0" } }, +<<<<<<< HEAD "node_modules/node-sass/node_modules/camelcase-keys": { "version": "6.2.2", "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", @@ -21464,6 +21821,8 @@ "url": "https://github.com/sponsors/sindresorhus" } }, +======= +>>>>>>> update package lock "node_modules/node-sass/node_modules/chalk": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", @@ -21480,6 +21839,7 @@ } }, "node_modules/node-sass/node_modules/cross-spawn": { +<<<<<<< HEAD "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", @@ -21752,10 +22112,42 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", +======= + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", + "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", + "dependencies": { + "lru-cache": "^4.0.1", + "which": "^1.2.9" + } + }, + "node_modules/node-sass/node_modules/lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dependencies": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "node_modules/node-sass/node_modules/supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/node-sass/node_modules/true-case-path": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", + "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", +>>>>>>> update package lock "dependencies": { "glob": "^7.1.2" } }, +<<<<<<< HEAD "node_modules/node-sass/node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -21783,6 +22175,8 @@ "node": ">=10" } }, +======= +>>>>>>> update package lock "node_modules/noms": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/noms/-/noms-0.0.0.tgz", @@ -21819,17 +22213,26 @@ "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=" }, "node_modules/nopt": { +<<<<<<< HEAD "version": "5.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", +======= + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", +>>>>>>> update package lock "dependencies": { "abbrev": "1" }, "bin": { "nopt": "bin/nopt.js" +<<<<<<< HEAD }, "engines": { "node": ">=6" +======= +>>>>>>> update package lock } }, "node_modules/normalize-package-data": { @@ -22031,9 +22434,15 @@ } }, "node_modules/object-inspect": { +<<<<<<< HEAD "version": "1.8.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", +======= + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz", + "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==", +>>>>>>> update package lock "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -22488,6 +22897,18 @@ "node": ">=0.10.0" } }, +<<<<<<< HEAD +======= + "node_modules/osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "dependencies": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, +>>>>>>> update package lock "node_modules/ow": { "version": "0.17.0", "resolved": "https://registry.npmjs.org/ow/-/ow-0.17.0.tgz", @@ -24196,12 +24617,18 @@ } }, "node_modules/prismjs": { +<<<<<<< HEAD "version": "1.22.0", "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.22.0.tgz", "integrity": "sha512-lLJ/Wt9yy0AiSYBf212kK3mM5L8ycwlyTlSxHBAneXLR0nzFMlZ5y7riFPF3E33zXOF2IH95xdY5jIyZbM9z/w==", "optionalDependencies": { "clipboard": "^2.0.0" } +======= + "version": "1.25.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.25.0.tgz", + "integrity": "sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg==" +>>>>>>> update package lock }, "node_modules/private": { "version": "0.1.8", @@ -24445,11 +24872,14 @@ "node": ">=0.4.x" } }, +<<<<<<< HEAD "node_modules/querystring-browser": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/querystring-browser/-/querystring-browser-1.0.4.tgz", "integrity": "sha1-8uNYgYQKgZvHsb9Zf68JeeZiLcY=" }, +======= +>>>>>>> update package lock "node_modules/querystring-es3": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", @@ -25248,15 +25678,25 @@ } }, "node_modules/react-copy-to-clipboard": { +<<<<<<< HEAD "version": "5.0.1", "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.1.tgz", "integrity": "sha512-ELKq31/E3zjFs5rDWNCfFL4NvNFQvGRoJdAKReD/rUPA+xxiLPQmZBZBvy2vgH7V0GE9isIQpT9WXbwIVErYdA==", +======= + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.3.tgz", + "integrity": "sha512-9S3j+m+UxDZOM0Qb8mhnT/rMR0NGSrj9A/073yz2DSxPMYhmYFBMYIdI2X4o8AjOjyFsSNxDRnCX6s/gRxpriw==", +>>>>>>> update package lock "dependencies": { "copy-to-clipboard": "^3", "prop-types": "^15.5.8" }, "peerDependencies": { +<<<<<<< HEAD "react": "^15.3.0 || ^16.0.0" +======= + "react": "^15.3.0 || ^16.0.0 || ^17.0.0" +>>>>>>> update package lock } }, "node_modules/react-debounce-input": { @@ -25772,9 +26212,18 @@ } }, "node_modules/react-immutable-proptypes": { +<<<<<<< HEAD "version": "2.1.0", "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz", "integrity": "sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ=", +======= + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.2.0.tgz", + "integrity": "sha512-Vf4gBsePlwdGvSZoLSBfd4HAP93HDauMY4fDjXhreg/vg6F3Fj/MXDNyTbltPC/xZKmZc+cjLu3598DdYK6sgQ==", + "dependencies": { + "invariant": "^2.2.2" + }, +>>>>>>> update package lock "peerDependencies": { "immutable": ">=3.6.2" } @@ -25944,6 +26393,7 @@ } }, "node_modules/react-syntax-highlighter": { +<<<<<<< HEAD "version": "13.5.0", "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-13.5.0.tgz", "integrity": "sha512-2nKo8spFxe9shcjbdUiqxkrf/IMDqKUZLx7JVIxEJ17P+fYFGL4CRsZZC66UPeQ2o/f29eKu31CrkKGCK1RHuA==", @@ -25953,16 +26403,33 @@ "lowlight": "^1.14.0", "prismjs": "^1.21.0", "refractor": "^3.1.0" +======= + "version": "15.4.5", + "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.4.5.tgz", + "integrity": "sha512-RC90KQTxZ/b7+9iE6s9nmiFLFjWswUcfULi4GwVzdFVKVMQySkJWBuOmJFfjwjMVCo0IUUuJrWebNKyviKpwLQ==", + "dependencies": { + "@babel/runtime": "^7.3.1", + "highlight.js": "^10.4.1", + "lowlight": "^1.17.0", + "prismjs": "^1.25.0", + "refractor": "^3.2.0" +>>>>>>> update package lock }, "peerDependencies": { "react": ">= 0.14.0" } }, "node_modules/react-syntax-highlighter/node_modules/highlight.js": { +<<<<<<< HEAD "version": "10.3.2", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.2.tgz", "integrity": "sha512-3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw==", "deprecated": "Potential vulnerability. Please upgrade to @latest", +======= + "version": "10.7.3", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", + "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==", +>>>>>>> update package lock "engines": { "node": "*" } @@ -26252,6 +26719,7 @@ "integrity": "sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==" }, "node_modules/refractor": { +<<<<<<< HEAD "version": "3.2.0", "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.2.0.tgz", "integrity": "sha512-hSo+EyMIZTLBvNNgIU5lW4yjCzNYMZ4dcEhBq/3nReGfqzd2JfVhdlPDfU9rEsgcAyWx+OimIIUoL4ZU7NtYHQ==", @@ -26259,6 +26727,15 @@ "hastscript": "^6.0.0", "parse-entities": "^2.0.0", "prismjs": "~1.22.0" +======= + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.5.0.tgz", + "integrity": "sha512-QwPJd3ferTZ4cSPPjdP5bsYHMytwWYnAN5EEnLtGvkqp/FCCnGsBgxrm9EuIDnjUC3Uc/kETtvVi7fSIVC74Dg==", + "dependencies": { + "hastscript": "^6.0.0", + "parse-entities": "^2.0.0", + "prismjs": "~1.25.0" +>>>>>>> update package lock }, "funding": { "type": "github", @@ -27316,6 +27793,7 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, +<<<<<<< HEAD "node_modules/sass": { "version": "1.45.0", "resolved": "https://registry.npmjs.org/sass/-/sass-1.45.0.tgz", @@ -27333,6 +27811,8 @@ "node": ">=8.9.0" } }, +======= +>>>>>>> update package lock "node_modules/sass-graph": { "version": "2.2.5", "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz", @@ -27434,6 +27914,7 @@ } }, "node_modules/sass-loader": { +<<<<<<< HEAD "version": "10.2.0", "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.2.0.tgz", "integrity": "sha512-kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw==", @@ -27535,6 +28016,33 @@ "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==", "peer": true }, +======= + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz", + "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==", + "dependencies": { + "clone-deep": "^4.0.1", + "loader-utils": "^1.0.1", + "neo-async": "^2.5.0", + "pify": "^4.0.1", + "semver": "^6.3.0" + }, + "engines": { + "node": ">= 6.9.0" + }, + "peerDependencies": { + "webpack": "^3.0.0 || ^4.0.0" + } + }, + "node_modules/sass-loader/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "bin": { + "semver": "bin/semver.js" + } + }, +>>>>>>> update package lock "node_modules/sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", @@ -27566,6 +28074,24 @@ "url": "https://opencollective.com/webpack" } }, +<<<<<<< HEAD +======= + "node_modules/schema-utils/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, +>>>>>>> update package lock "node_modules/scroll-into-view-if-needed": { "version": "2.2.26", "resolved": "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.26.tgz", @@ -27629,12 +28155,15 @@ "seek-table": "bin/seek-bzip-table" } }, +<<<<<<< HEAD "node_modules/select": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=", "optional": true }, +======= +>>>>>>> update package lock "node_modules/select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", @@ -27769,11 +28298,36 @@ } }, "node_modules/serialize-error": { +<<<<<<< HEAD "version": "2.1.0", "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz", "integrity": "sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=", "engines": { "node": ">=0.10.0" +======= + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-8.1.0.tgz", + "integrity": "sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/serialize-error/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" +>>>>>>> update package lock } }, "node_modules/serialize-javascript": { @@ -27904,6 +28458,20 @@ "sha.js": "bin.js" } }, +<<<<<<< HEAD +======= + "node_modules/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==", + "dependencies": { + "kind-of": "^6.0.2" + }, + "engines": { + "node": ">=8" + } + }, +>>>>>>> update package lock "node_modules/shallow-compare": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/shallow-compare/-/shallow-compare-1.2.2.tgz", @@ -27995,6 +28563,7 @@ } }, "node_modules/side-channel": { +<<<<<<< HEAD "version": "1.0.3", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.3.tgz", "integrity": "sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g==", @@ -28068,6 +28637,15 @@ }, "engines": { "node": ">= 0.4" +======= + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dependencies": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" +>>>>>>> update package lock }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -28763,6 +29341,7 @@ "node": ">=0.10.0" } }, +<<<<<<< HEAD "node_modules/source-map-js": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz", @@ -28772,6 +29351,8 @@ "node": ">=0.10.0" } }, +======= +>>>>>>> update package lock "node_modules/source-map-resolve": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", @@ -29619,6 +30200,7 @@ } }, "node_modules/swagger-client": { +<<<<<<< HEAD "version": "3.12.0", "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.12.0.tgz", "integrity": "sha512-u8IAf+xWYvUY4H23gIgpN77I6BnJngAoZ80pnKB/Qex/nNxf99MvnpzatU0Wj4L5vz/Qa145PIj/ACbcMKK/MQ==", @@ -29635,10 +30217,35 @@ "lodash": "^4.17.19", "qs": "^6.9.4", "querystring-browser": "^1.0.4", +======= + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.17.0.tgz", + "integrity": "sha512-d8DOEME49wTXm+uT+lBAjJ5D6IDjEHdbkqa7MbcslR2c+oHIhi13ObwleVWGfr89MPkWgBl6RBq9VUHmrBJRbg==", + "dependencies": { + "@babel/runtime-corejs3": "^7.11.2", + "btoa": "^1.2.1", + "cookie": "~0.4.1", + "cross-fetch": "^3.1.4", + "deep-extend": "~0.6.0", + "fast-json-patch": "^3.0.0-1", + "form-data-encoder": "^1.4.3", + "formdata-node": "^4.0.0", + "js-yaml": "^4.1.0", + "lodash": "^4.17.21", + "qs": "^6.9.4", +>>>>>>> update package lock "traverse": "~0.6.6", "url": "~0.11.0" } }, +<<<<<<< HEAD +======= + "node_modules/swagger-client/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + }, +>>>>>>> update package lock "node_modules/swagger-client/node_modules/cookie": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", @@ -29647,10 +30254,39 @@ "node": ">= 0.6" } }, +<<<<<<< HEAD "node_modules/swagger-client/node_modules/qs": { "version": "6.9.4", "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz", "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==", +======= + "node_modules/swagger-client/node_modules/cross-fetch": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz", + "integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==", + "dependencies": { + "node-fetch": "2.6.1" + } + }, + "node_modules/swagger-client/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/swagger-client/node_modules/qs": { + "version": "6.10.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.2.tgz", + "integrity": "sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==", + "dependencies": { + "side-channel": "^1.0.4" + }, +>>>>>>> update package lock "engines": { "node": ">=0.6" }, @@ -29659,6 +30295,7 @@ } }, "node_modules/swagger-ui-react": { +<<<<<<< HEAD "version": "3.36.2", "resolved": "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-3.36.2.tgz", "integrity": "sha512-bsFaGvljCQ/7uEkffooskOQjNSNbDxi5ITmUgNQRTnGtm1KGtR2gx1OxuUQVeCTiOxag402xaXfg1Oxr8Qj4GA==", @@ -29684,19 +30321,56 @@ "react-copy-to-clipboard": "5.0.1", "react-debounce-input": "^3.2.0", "react-immutable-proptypes": "2.1.0", +======= + "version": "3.52.5", + "resolved": "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-3.52.5.tgz", + "integrity": "sha512-V2fidbSGCb6SmC1AyTXv6T8znWcLAjfVBs2CPTXUS7m7s//SqiRx3hXXPUNvGxKTEK76h+yvcBZf2GLD7kr63w==", + "dependencies": { + "@babel/runtime-corejs3": "^7.14.7", + "@braintree/sanitize-url": "^5.0.2", + "@kyleshockey/object-assign-deep": "^0.4.2", + "@kyleshockey/xml": "^1.0.2", + "base64-js": "^1.5.1", + "classnames": "^2.3.1", + "css.escape": "1.5.1", + "deep-extend": "0.6.0", + "dompurify": "^2.2.9", + "ieee754": "^1.2.1", + "immutable": "^3.x.x", + "js-file-download": "^0.4.12", + "js-yaml": "=4.1.0", + "lodash": "^4.17.21", + "memoizee": "^0.4.15", + "prop-types": "^15.7.2", + "randombytes": "^2.1.0", + "react-copy-to-clipboard": "5.0.3", + "react-debounce-input": "^3.2.3", + "react-immutable-proptypes": "2.2.0", +>>>>>>> update package lock "react-immutable-pure-component": "^1.1.1", "react-inspector": "^2.3.0", "react-motion": "^0.5.2", "react-redux": "=4.4.10", +<<<<<<< HEAD "react-syntax-highlighter": "=13.5.0", +======= + "react-syntax-highlighter": "^15.4.4", +>>>>>>> update package lock "redux": "=3.7.2", "redux-immutable": "3.1.0", "remarkable": "^2.0.1", "reselect": "^4.0.0", +<<<<<<< HEAD "serialize-error": "^2.1.0", "sha.js": "^2.4.11", "swagger-client": "=3.12.0", "url-parse": "^1.4.7", +======= + "serialize-error": "^8.1.0", + "sha.js": "^2.4.11", + "swagger-client": "^3.17.0", + "url-parse": "^1.5.2", +>>>>>>> update package lock "xml-but-prettier": "^1.0.1", "zenscroll": "^4.0.2" }, @@ -29705,12 +30379,30 @@ "react-dom": ">=15.6.2" } }, +<<<<<<< HEAD "node_modules/swagger-ui-react/node_modules/core-js": { "version": "2.6.11", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==", "deprecated": "core-js@<3.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.", "hasInstallScript": true +======= + "node_modules/swagger-ui-react/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + }, + "node_modules/swagger-ui-react/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } +>>>>>>> update package lock }, "node_modules/swagger-ui-react/node_modules/redux": { "version": "3.7.2", @@ -30118,12 +30810,15 @@ "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" }, +<<<<<<< HEAD "node_modules/tiny-emitter": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==", "optional": true }, +======= +>>>>>>> update package lock "node_modules/tinycolor2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz", @@ -31155,9 +31850,15 @@ } }, "node_modules/url-parse": { +<<<<<<< HEAD "version": "1.4.7", "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", +======= + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz", + "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==", +>>>>>>> update package lock "dependencies": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" @@ -31633,6 +32334,17 @@ "url": "https://github.com/sponsors/wooorm" } }, +<<<<<<< HEAD +======= + "node_modules/web-streams-polyfill": { + "version": "4.0.0-beta.1", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.1.tgz", + "integrity": "sha512-3ux37gEX670UUphBF9AMCq8XM6iQ8Ac6A+DSRRjDoRBm1ufCkaCDdNVbaqq60PsEkdNlLKrGtv/YBP4EJXqNtQ==", + "engines": { + "node": ">= 12" + } + }, +>>>>>>> update package lock "node_modules/webpack": { "version": "4.44.2", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz", @@ -34143,11 +34855,11 @@ } }, "@babel/runtime-corejs3": { - "version": "7.11.2", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz", - "integrity": "sha512-qh5IR+8VgFz83VBa6OkaET6uN/mJOhHONuy3m1sgF0CV6mXdPSEBdA7e1eUbVvyNtANjMbg22JUv71BaDXLY6A==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.5.tgz", + "integrity": "sha512-F1pMwvTiUNSAM8mc45kccMQxj31x3y3P+tA/X8hKNWp3/hUsxdGxZ3D3H8JIkxtfA8qGkaBTKvcmvStaYseAFw==", "requires": { - "core-js-pure": "^3.0.0", + "core-js-pure": "^3.19.0", "regenerator-runtime": "^0.13.4" } }, @@ -34203,9 +34915,9 @@ } }, "@braintree/sanitize-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-5.0.0.tgz", - "integrity": "sha512-WmKrB/575EJCzbeSJR3YQ5sET5FaizeljLRw1382qVUeGqzuWBgIS+AF5a0FO51uQTrDpoRgvuHC2IWVsgwkkA==" + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-5.0.2.tgz", + "integrity": "sha512-NBEJlHWrhQucLhZGHtSxM2loSaNUMajC7KOYJLyfcdW/6goVoff2HoYI3bz8YCDN0wKGbxtUL0gx2dvHpvnWlw==" }, "@emotion/babel-plugin-jsx-pragmatic": { "version": "0.1.5", @@ -38091,9 +38803,9 @@ "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=" }, "base64-js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, "base64id": { "version": "2.0.0", @@ -39316,9 +40028,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", @@ -39368,17 +40080,6 @@ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==" }, - "clipboard": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz", - "integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==", - "optional": true, - "requires": { - "good-listener": "^1.2.2", - "select": "^1.1.2", - "tiny-emitter": "^2.0.0" - } - }, "clipboardy": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz", @@ -39931,9 +40632,9 @@ } }, "core-js-pure": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz", - "integrity": "sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==" + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.20.0.tgz", + "integrity": "sha512-qsrbIwWSEEYOM7z616jAVgwhuDDtPLwZSpUsU3vyUkHYqKTf/uwOJBZg2V7lMurYWkpVlaVOxBrfX0Q3ppvjfg==" }, "core-util-is": { "version": "1.0.2", @@ -40715,12 +41416,6 @@ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, - "delegate": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", - "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==", - "optional": true - }, "delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", @@ -41371,9 +42066,9 @@ } }, "dompurify": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.2.tgz", - "integrity": "sha512-BsGR4nDLaC5CNBnyT5I+d5pOeaoWvgVeg6Gq/aqmKYWMPR07131u60I80BvExLAJ0FQEIBQ1BTicw+C5+jOyrg==" + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.4.tgz", + "integrity": "sha512-6BVcgOAVFXjI0JTjEvZy901Rghm+7fDQOrNIcxB4+gdhj6Kwp6T9VBhBY/AbagKHJocRkDYGd6wvI+p4/10xtQ==" }, "domutils": { "version": "1.5.1", @@ -42955,9 +43650,9 @@ } }, "fast-json-patch": { - "version": "3.0.0-1", - "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.0.0-1.tgz", - "integrity": "sha512-6pdFb07cknxvPzCeLsFHStEy+MysPJPgZQ9LbQ/2O67unQF93SNqfdSqnPPl71YMHX+AD8gbl7iuoGFzHEdDuw==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.0.tgz", + "integrity": "sha512-IhpytlsVTRndz0hU5t0/MGzS/etxLlfrpG5V5M9mVbuj9TrJLWaMfsox9REM5rkuGX0T+5qjpe8XA1o0gZ42nA==" }, "fast-json-stable-stringify": { "version": "2.1.0", @@ -43286,11 +43981,25 @@ "mime-types": "^2.1.12" } }, + "form-data-encoder": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.1.tgz", + "integrity": "sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg==" + }, "format": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", "integrity": "sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=" }, + "formdata-node": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-4.3.1.tgz", + "integrity": "sha512-8xKSa9et4zb+yziWsD/bI+EYjdg1z2p9EpKr+o+Yk12F/wP66bmDdvjj2ZXd2K/MJlR3HBzWnuV7f82jzHRqCA==", + "requires": { + "node-domexception": "1.0.0", + "web-streams-polyfill": "4.0.0-beta.1" + } + }, "forwarded": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", @@ -46157,9 +46866,9 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "get-intrinsic": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz", - "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -46493,15 +47202,6 @@ "minimatch": "~3.0.2" } }, - "good-listener": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", - "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=", - "optional": true, - "requires": { - "delegate": "^3.1.2" - } - }, "got": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz", @@ -47332,9 +48032,9 @@ } }, "ieee754": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, "iferr": { "version": "0.1.5", @@ -48235,26 +48935,6 @@ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, - "isomorphic-form-data": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isomorphic-form-data/-/isomorphic-form-data-2.0.0.tgz", - "integrity": "sha512-TYgVnXWeESVmQSg4GLVbalmQ+B4NPi/H4eWxqALKj63KsUrcu301YDjBqaOw3h+cbak7Na4Xyps3BiptHtxTfg==", - "requires": { - "form-data": "^2.3.2" - }, - "dependencies": { - "form-data": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", - "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } - } - } - }, "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", @@ -49031,18 +49711,18 @@ "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" }, "lowlight": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.16.0.tgz", - "integrity": "sha512-ECLdzIJvBEjK4ef51sWiGZyz21yx4IEPaF/62DRxLehoOHkWqN3OsLB1GUMfc6Mcf87rR5eW7z6lI9cNEXZDsQ==", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz", + "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==", "requires": { "fault": "^1.0.0", - "highlight.js": "~10.3.0" + "highlight.js": "~10.7.0" }, "dependencies": { "highlight.js": { - "version": "10.3.2", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.2.tgz", - "integrity": "sha512-3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw==" + "version": "10.7.3", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", + "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==" } } }, @@ -49313,18 +49993,18 @@ "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, "memoizee": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz", - "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==", + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz", + "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==", "requires": { - "d": "1", - "es5-ext": "^0.10.45", - "es6-weak-map": "^2.0.2", + "d": "^1.0.1", + "es5-ext": "^0.10.53", + "es6-weak-map": "^2.0.3", "event-emitter": "^0.3.5", - "is-promise": "^2.1", - "lru-queue": "0.1", - "next-tick": "1", - "timers-ext": "^0.1.5" + "is-promise": "^2.2.2", + "lru-queue": "^0.1.0", + "next-tick": "^1.1.0", + "timers-ext": "^0.1.7" } }, "memory-fs": { @@ -49955,6 +50635,11 @@ "minimatch": "^3.0.2" } }, + "node-domexception": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", + "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==" + }, "node-emoji": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz", @@ -50564,9 +51249,9 @@ "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==" }, "object-inspect": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", - "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==" + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz", + "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==" }, "object-is": { "version": "1.1.3", @@ -52279,12 +52964,9 @@ "requires": {} }, "prismjs": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.22.0.tgz", - "integrity": "sha512-lLJ/Wt9yy0AiSYBf212kK3mM5L8ycwlyTlSxHBAneXLR0nzFMlZ5y7riFPF3E33zXOF2IH95xdY5jIyZbM9z/w==", - "requires": { - "clipboard": "^2.0.0" - } + "version": "1.25.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.25.0.tgz", + "integrity": "sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg==" }, "private": { "version": "0.1.8", @@ -52489,11 +53171,6 @@ "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" }, - "querystring-browser": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/querystring-browser/-/querystring-browser-1.0.4.tgz", - "integrity": "sha1-8uNYgYQKgZvHsb9Zf68JeeZiLcY=" - }, "querystring-es3": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", @@ -53136,9 +53813,9 @@ } }, "react-copy-to-clipboard": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.1.tgz", - "integrity": "sha512-ELKq31/E3zjFs5rDWNCfFL4NvNFQvGRoJdAKReD/rUPA+xxiLPQmZBZBvy2vgH7V0GE9isIQpT9WXbwIVErYdA==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.3.tgz", + "integrity": "sha512-9S3j+m+UxDZOM0Qb8mhnT/rMR0NGSrj9A/073yz2DSxPMYhmYFBMYIdI2X4o8AjOjyFsSNxDRnCX6s/gRxpriw==", "requires": { "copy-to-clipboard": "^3", "prop-types": "^15.5.8" @@ -53559,10 +54236,19 @@ } }, "react-immutable-proptypes": { +<<<<<<< HEAD "version": "2.1.0", "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz", "integrity": "sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ=", "requires": {} +======= + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.2.0.tgz", + "integrity": "sha512-Vf4gBsePlwdGvSZoLSBfd4HAP93HDauMY4fDjXhreg/vg6F3Fj/MXDNyTbltPC/xZKmZc+cjLu3598DdYK6sgQ==", + "requires": { + "invariant": "^2.2.2" + } +>>>>>>> update package lock }, "react-immutable-pure-component": { "version": "1.2.3", @@ -53699,21 +54385,21 @@ "requires": {} }, "react-syntax-highlighter": { - "version": "13.5.0", - "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-13.5.0.tgz", - "integrity": "sha512-2nKo8spFxe9shcjbdUiqxkrf/IMDqKUZLx7JVIxEJ17P+fYFGL4CRsZZC66UPeQ2o/f29eKu31CrkKGCK1RHuA==", + "version": "15.4.5", + "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.4.5.tgz", + "integrity": "sha512-RC90KQTxZ/b7+9iE6s9nmiFLFjWswUcfULi4GwVzdFVKVMQySkJWBuOmJFfjwjMVCo0IUUuJrWebNKyviKpwLQ==", "requires": { "@babel/runtime": "^7.3.1", - "highlight.js": "^10.1.1", - "lowlight": "^1.14.0", - "prismjs": "^1.21.0", - "refractor": "^3.1.0" + "highlight.js": "^10.4.1", + "lowlight": "^1.17.0", + "prismjs": "^1.25.0", + "refractor": "^3.2.0" }, "dependencies": { "highlight.js": { - "version": "10.3.2", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.2.tgz", - "integrity": "sha512-3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw==" + "version": "10.7.3", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", + "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==" } } }, @@ -53942,13 +54628,13 @@ "integrity": "sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==" }, "refractor": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.2.0.tgz", - "integrity": "sha512-hSo+EyMIZTLBvNNgIU5lW4yjCzNYMZ4dcEhBq/3nReGfqzd2JfVhdlPDfU9rEsgcAyWx+OimIIUoL4ZU7NtYHQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.5.0.tgz", + "integrity": "sha512-QwPJd3ferTZ4cSPPjdP5bsYHMytwWYnAN5EEnLtGvkqp/FCCnGsBgxrm9EuIDnjUC3Uc/kETtvVi7fSIVC74Dg==", "requires": { "hastscript": "^6.0.0", "parse-entities": "^2.0.0", - "prismjs": "~1.22.0" + "prismjs": "~1.25.0" }, "dependencies": { "hastscript": { @@ -55070,12 +55756,6 @@ "commander": "^2.8.1" } }, - "select": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", - "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=", - "optional": true - }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", @@ -55194,9 +55874,19 @@ } }, "serialize-error": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz", - "integrity": "sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=" + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-8.1.0.tgz", + "integrity": "sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==", + "requires": { + "type-fest": "^0.20.2" + }, + "dependencies": { + "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==" + } + } }, "serialize-javascript": { "version": "4.0.0", @@ -55380,57 +56070,13 @@ } }, "side-channel": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.3.tgz", - "integrity": "sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", "requires": { - "es-abstract": "^1.18.0-next.0", - "object-inspect": "^1.8.0" - }, - "dependencies": { - "es-abstract": { - "version": "1.18.0-next.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", - "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-negative-zero": "^2.0.0", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - } - }, - "is-callable": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", - "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==" - }, - "is-regex": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", - "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", - "requires": { - "has-symbols": "^1.0.1" - } - }, - "object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - } - } + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" } }, "signal-exit": { @@ -56735,85 +57381,115 @@ } }, "swagger-client": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.12.0.tgz", - "integrity": "sha512-u8IAf+xWYvUY4H23gIgpN77I6BnJngAoZ80pnKB/Qex/nNxf99MvnpzatU0Wj4L5vz/Qa145PIj/ACbcMKK/MQ==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.17.0.tgz", + "integrity": "sha512-d8DOEME49wTXm+uT+lBAjJ5D6IDjEHdbkqa7MbcslR2c+oHIhi13ObwleVWGfr89MPkWgBl6RBq9VUHmrBJRbg==", "requires": { "@babel/runtime-corejs3": "^7.11.2", "btoa": "^1.2.1", - "buffer": "^5.6.0", "cookie": "~0.4.1", - "cross-fetch": "^3.0.6", + "cross-fetch": "^3.1.4", "deep-extend": "~0.6.0", "fast-json-patch": "^3.0.0-1", - "isomorphic-form-data": "~2.0.0", - "js-yaml": "^3.14.0", - "lodash": "^4.17.19", + "form-data-encoder": "^1.4.3", + "formdata-node": "^4.0.0", + "js-yaml": "^4.1.0", + "lodash": "^4.17.21", "qs": "^6.9.4", - "querystring-browser": "^1.0.4", "traverse": "~0.6.6", "url": "~0.11.0" }, "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + }, "cookie": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==" }, + "cross-fetch": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz", + "integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==", + "requires": { + "node-fetch": "2.6.1" + } + }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "requires": { + "argparse": "^2.0.1" + } + }, "qs": { - "version": "6.9.4", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz", - "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==" + "version": "6.10.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.2.tgz", + "integrity": "sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==", + "requires": { + "side-channel": "^1.0.4" + } } } }, "swagger-ui-react": { - "version": "3.36.2", - "resolved": "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-3.36.2.tgz", - "integrity": "sha512-bsFaGvljCQ/7uEkffooskOQjNSNbDxi5ITmUgNQRTnGtm1KGtR2gx1OxuUQVeCTiOxag402xaXfg1Oxr8Qj4GA==", + "version": "3.52.5", + "resolved": "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-3.52.5.tgz", + "integrity": "sha512-V2fidbSGCb6SmC1AyTXv6T8znWcLAjfVBs2CPTXUS7m7s//SqiRx3hXXPUNvGxKTEK76h+yvcBZf2GLD7kr63w==", "requires": { - "@babel/runtime-corejs3": "^7.11.2", - "@braintree/sanitize-url": "^5.0.0", + "@babel/runtime-corejs3": "^7.14.7", + "@braintree/sanitize-url": "^5.0.2", "@kyleshockey/object-assign-deep": "^0.4.2", "@kyleshockey/xml": "^1.0.2", - "base64-js": "^1.2.0", - "classnames": "^2.2.6", - "core-js": "^2.6.11", + "base64-js": "^1.5.1", + "classnames": "^2.3.1", "css.escape": "1.5.1", "deep-extend": "0.6.0", - "dompurify": "^2.0.7", - "ieee754": "^1.1.13", + "dompurify": "^2.2.9", + "ieee754": "^1.2.1", "immutable": "^3.x.x", - "js-file-download": "^0.4.1", - "js-yaml": "^3.13.1", - "lodash": "^4.17.19", - "memoizee": "^0.4.12", + "js-file-download": "^0.4.12", + "js-yaml": "=4.1.0", + "lodash": "^4.17.21", + "memoizee": "^0.4.15", "prop-types": "^15.7.2", "randombytes": "^2.1.0", - "react-copy-to-clipboard": "5.0.1", - "react-debounce-input": "^3.2.0", - "react-immutable-proptypes": "2.1.0", + "react-copy-to-clipboard": "5.0.3", + "react-debounce-input": "^3.2.3", + "react-immutable-proptypes": "2.2.0", "react-immutable-pure-component": "^1.1.1", "react-inspector": "^2.3.0", "react-motion": "^0.5.2", "react-redux": "=4.4.10", - "react-syntax-highlighter": "=13.5.0", + "react-syntax-highlighter": "^15.4.4", "redux": "=3.7.2", "redux-immutable": "3.1.0", "remarkable": "^2.0.1", "reselect": "^4.0.0", - "serialize-error": "^2.1.0", + "serialize-error": "^8.1.0", "sha.js": "^2.4.11", - "swagger-client": "=3.12.0", - "url-parse": "^1.4.7", + "swagger-client": "^3.17.0", + "url-parse": "^1.5.2", "xml-but-prettier": "^1.0.1", "zenscroll": "^4.0.2" }, "dependencies": { - "core-js": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", - "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "requires": { + "argparse": "^2.0.1" + } }, "redux": { "version": "3.7.2", @@ -57135,12 +57811,6 @@ "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" }, - "tiny-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", - "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==", - "optional": true - }, "tinycolor2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz", @@ -57939,9 +58609,9 @@ } }, "url-parse": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", - "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz", + "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==", "requires": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" @@ -58311,6 +58981,11 @@ "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz", "integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==" }, + "web-streams-polyfill": { + "version": "4.0.0-beta.1", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.1.tgz", + "integrity": "sha512-3ux37gEX670UUphBF9AMCq8XM6iQ8Ac6A+DSRRjDoRBm1ufCkaCDdNVbaqq60PsEkdNlLKrGtv/YBP4EJXqNtQ==" + }, "webpack": { "version": "4.44.2", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz", From eb24576ab6ca570804d43aefa40594e4fceb4742 Mon Sep 17 00:00:00 2001 From: riahk Date: Fri, 17 Dec 2021 11:41:55 -0800 Subject: [PATCH 9/9] fix lock --- docs/package-lock.json | 823 +---------------------------------------- 1 file changed, 8 insertions(+), 815 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 6a34ee33ade9d..6ecce8e330a72 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -41,7 +41,7 @@ "react-github-btn": "^1.2.0", "react-grid-gallery": "^0.5.5", "react-helmet": "^6.1.0", - "swagger-ui-react": "^3.36.2", + "swagger-ui-react": "^3.52.5", "theme-ui": "^0.3.1", "three": "^0.125.0" }, @@ -1510,12 +1510,15 @@ } }, "node_modules/@babel/runtime-corejs3": { - "version": "7.11.2", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz", - "integrity": "sha512-qh5IR+8VgFz83VBa6OkaET6uN/mJOhHONuy3m1sgF0CV6mXdPSEBdA7e1eUbVvyNtANjMbg22JUv71BaDXLY6A==", + "version": "7.16.5", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.5.tgz", + "integrity": "sha512-F1pMwvTiUNSAM8mc45kccMQxj31x3y3P+tA/X8hKNWp3/hUsxdGxZ3D3H8JIkxtfA8qGkaBTKvcmvStaYseAFw==", "dependencies": { - "core-js-pure": "^3.0.0", + "core-js-pure": "^3.19.0", "regenerator-runtime": "^0.13.4" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/standalone": { @@ -1569,15 +1572,9 @@ } }, "node_modules/@braintree/sanitize-url": { -<<<<<<< HEAD - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-5.0.0.tgz", - "integrity": "sha512-WmKrB/575EJCzbeSJR3YQ5sET5FaizeljLRw1382qVUeGqzuWBgIS+AF5a0FO51uQTrDpoRgvuHC2IWVsgwkkA==" -======= "version": "5.0.2", "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-5.0.2.tgz", "integrity": "sha512-NBEJlHWrhQucLhZGHtSxM2loSaNUMajC7KOYJLyfcdW/6goVoff2HoYI3bz8YCDN0wKGbxtUL0gx2dvHpvnWlw==" ->>>>>>> update package lock }, "node_modules/@emotion/babel-plugin-jsx-pragmatic": { "version": "0.1.5", @@ -3764,15 +3761,9 @@ } }, "node_modules/@types/json-schema": { -<<<<<<< HEAD "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==" -======= - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz", - "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==" ->>>>>>> update package lock }, "node_modules/@types/json5": { "version": "0.0.29", @@ -4317,15 +4308,9 @@ } }, "node_modules/ajv": { -<<<<<<< HEAD "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", -======= - "version": "6.12.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", - "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", ->>>>>>> update package lock "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -6390,11 +6375,6 @@ } }, "node_modules/base64-js": { -<<<<<<< HEAD - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" -======= "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", @@ -6412,7 +6392,6 @@ "url": "https://feross.org/support" } ] ->>>>>>> update package lock }, "node_modules/base64id": { "version": "2.0.0", @@ -6793,20 +6772,6 @@ "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==" }, -<<<<<<< HEAD -======= - "node_modules/block-stream": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "dependencies": { - "inherits": "~2.0.0" - }, - "engines": { - "node": "0.4 || >=0.5.8" - } - }, ->>>>>>> update package lock "node_modules/bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -7911,15 +7876,9 @@ } }, "node_modules/classnames": { -<<<<<<< HEAD - "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==" ->>>>>>> update package lock }, "node_modules/clean-css": { "version": "4.2.3", @@ -7993,20 +7952,6 @@ "node": ">= 10" } }, -<<<<<<< HEAD - "node_modules/clipboard": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz", - "integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==", - "optional": true, - "dependencies": { - "good-listener": "^1.2.2", - "select": "^1.1.2", - "tiny-emitter": "^2.0.0" - } - }, -======= ->>>>>>> update package lock "node_modules/clipboardy": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz", @@ -8095,22 +8040,6 @@ "node": ">=0.8" } }, -<<<<<<< HEAD -======= - "node_modules/clone-deep": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", - "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", - "dependencies": { - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.2", - "shallow-clone": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, ->>>>>>> update package lock "node_modules/clone-response": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", @@ -8698,15 +8627,9 @@ } }, "node_modules/core-js-pure": { -<<<<<<< HEAD - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz", - "integrity": "sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==", -======= "version": "3.20.0", "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.20.0.tgz", "integrity": "sha512-qsrbIwWSEEYOM7z616jAVgwhuDDtPLwZSpUsU3vyUkHYqKTf/uwOJBZg2V7lMurYWkpVlaVOxBrfX0Q3ppvjfg==", ->>>>>>> update package lock "hasInstallScript": true, "funding": { "type": "opencollective", @@ -9669,15 +9592,6 @@ "node": ">=0.4.0" } }, -<<<<<<< HEAD - "node_modules/delegate": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", - "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==", - "optional": true - }, -======= ->>>>>>> update package lock "node_modules/delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", @@ -10440,15 +10354,9 @@ } }, "node_modules/dompurify": { -<<<<<<< HEAD - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.2.tgz", - "integrity": "sha512-BsGR4nDLaC5CNBnyT5I+d5pOeaoWvgVeg6Gq/aqmKYWMPR07131u60I80BvExLAJ0FQEIBQ1BTicw+C5+jOyrg==" -======= "version": "2.3.4", "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.4.tgz", "integrity": "sha512-6BVcgOAVFXjI0JTjEvZy901Rghm+7fDQOrNIcxB4+gdhj6Kwp6T9VBhBY/AbagKHJocRkDYGd6wvI+p4/10xtQ==" ->>>>>>> update package lock }, "node_modules/domutils": { "version": "1.5.1", @@ -10873,7 +10781,6 @@ "node": ">=0.10.0" } }, -<<<<<<< HEAD "node_modules/env-paths": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", @@ -10882,8 +10789,6 @@ "node": ">=6" } }, -======= ->>>>>>> update package lock "node_modules/envinfo": { "version": "7.7.3", "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.7.3.tgz", @@ -12439,15 +12344,9 @@ } }, "node_modules/fast-json-patch": { -<<<<<<< HEAD - "version": "3.0.0-1", - "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.0.0-1.tgz", - "integrity": "sha512-6pdFb07cknxvPzCeLsFHStEy+MysPJPgZQ9LbQ/2O67unQF93SNqfdSqnPPl71YMHX+AD8gbl7iuoGFzHEdDuw==" -======= "version": "3.1.0", "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.0.tgz", "integrity": "sha512-IhpytlsVTRndz0hU5t0/MGzS/etxLlfrpG5V5M9mVbuj9TrJLWaMfsox9REM5rkuGX0T+5qjpe8XA1o0gZ42nA==" ->>>>>>> update package lock }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", @@ -12872,14 +12771,11 @@ "node": ">= 6" } }, -<<<<<<< HEAD -======= "node_modules/form-data-encoder": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.1.tgz", "integrity": "sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg==" }, ->>>>>>> update package lock "node_modules/format": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", @@ -12888,8 +12784,6 @@ "node": ">=0.4.x" } }, -<<<<<<< HEAD -======= "node_modules/formdata-node": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-4.3.1.tgz", @@ -12902,7 +12796,6 @@ "node": ">= 12.20" } }, ->>>>>>> update package lock "node_modules/forwarded": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", @@ -13012,34 +12905,6 @@ "node": ">= 4.0" } }, -<<<<<<< HEAD -======= - "node_modules/fstream": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", - "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", - "dependencies": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" - }, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/fstream/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, ->>>>>>> update package lock "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -14210,32 +14075,19 @@ } }, "node_modules/gatsby-plugin-sass": { -<<<<<<< HEAD "version": "3.2.0", "resolved": "https://registry.npmjs.org/gatsby-plugin-sass/-/gatsby-plugin-sass-3.2.0.tgz", "integrity": "sha512-YlQX1Kn1wGcKCgyS8OfD0/W16XIRKvE/5wg6HRnUhJV03MNTB/41eRDsgGe0zLb3jb/aw1bH7leWcBVy0RoClA==", "dependencies": { "@babel/runtime": "^7.12.5", "sass-loader": "^10.1.0" -======= - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/gatsby-plugin-sass/-/gatsby-plugin-sass-2.4.2.tgz", - "integrity": "sha512-6DnB+sRoSTS/dpsk/r2rTEA40XanDhmHvk4Esv+flgS6zcZro4U6cc5ibR6tum/fdfdu8/T/RoPZgGLCm4e4sQ==", - "dependencies": { - "@babel/runtime": "^7.11.2", - "sass-loader": "^7.3.1" ->>>>>>> update package lock }, "engines": { "node": ">=10.13.0" }, "peerDependencies": { "gatsby": "^2.0.0", -<<<<<<< HEAD "sass": "^1.30.0" -======= - "node-sass": "^4.9.0" ->>>>>>> update package lock } }, "node_modules/gatsby-plugin-sass/node_modules/@babel/runtime": { @@ -16620,15 +16472,9 @@ } }, "node_modules/get-intrinsic": { -<<<<<<< HEAD - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz", - "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==", -======= "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", ->>>>>>> update package lock "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -17052,15 +16898,9 @@ } }, "node_modules/globule": { -<<<<<<< HEAD "version": "1.3.3", "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.3.tgz", "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==", -======= - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz", - "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==", ->>>>>>> update package lock "dependencies": { "glob": "~7.1.1", "lodash": "~4.17.10", @@ -17070,18 +16910,6 @@ "node": ">= 0.10" } }, -<<<<<<< HEAD - "node_modules/good-listener": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", - "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=", - "optional": true, - "dependencies": { - "delegate": "^3.1.2" - } - }, -======= ->>>>>>> update package lock "node_modules/got": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz", @@ -18104,11 +17932,6 @@ } }, "node_modules/ieee754": { -<<<<<<< HEAD - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" -======= "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", @@ -18126,7 +17949,6 @@ "url": "https://feross.org/support" } ] ->>>>>>> update package lock }, "node_modules/iferr": { "version": "0.1.5", @@ -18343,20 +18165,6 @@ "node": ">=0.8.19" } }, -<<<<<<< HEAD -======= - "node_modules/in-publish": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz", - "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==", - "bin": { - "in-install": "in-install.js", - "in-publish": "in-publish.js", - "not-in-install": "not-in-install.js", - "not-in-publish": "not-in-publish.js" - } - }, ->>>>>>> update package lock "node_modules/indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", @@ -18783,15 +18591,9 @@ } }, "node_modules/is-core-module": { -<<<<<<< HEAD "version": "2.8.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", -======= - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz", - "integrity": "sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==", ->>>>>>> update package lock "dependencies": { "has": "^1.0.3" }, @@ -19372,30 +19174,6 @@ "node": ">=0.10.0" } }, -<<<<<<< HEAD - "node_modules/isomorphic-form-data": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isomorphic-form-data/-/isomorphic-form-data-2.0.0.tgz", - "integrity": "sha512-TYgVnXWeESVmQSg4GLVbalmQ+B4NPi/H4eWxqALKj63KsUrcu301YDjBqaOw3h+cbak7Na4Xyps3BiptHtxTfg==", - "dependencies": { - "form-data": "^2.3.2" - } - }, - "node_modules/isomorphic-form-data/node_modules/form-data": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", - "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 0.12" - } - }, -======= ->>>>>>> update package lock "node_modules/isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", @@ -19758,7 +19536,6 @@ "node": ">=6" } }, -<<<<<<< HEAD "node_modules/klona": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", @@ -19767,8 +19544,6 @@ "node": ">= 8" } }, -======= ->>>>>>> update package lock "node_modules/language-subtag-registry": { "version": "0.3.21", "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz", @@ -20322,21 +20097,12 @@ } }, "node_modules/lowlight": { -<<<<<<< HEAD - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.16.0.tgz", - "integrity": "sha512-ECLdzIJvBEjK4ef51sWiGZyz21yx4IEPaF/62DRxLehoOHkWqN3OsLB1GUMfc6Mcf87rR5eW7z6lI9cNEXZDsQ==", - "dependencies": { - "fault": "^1.0.0", - "highlight.js": "~10.3.0" -======= "version": "1.20.0", "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz", "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==", "dependencies": { "fault": "^1.0.0", "highlight.js": "~10.7.0" ->>>>>>> update package lock }, "funding": { "type": "github", @@ -20344,16 +20110,9 @@ } }, "node_modules/lowlight/node_modules/highlight.js": { -<<<<<<< HEAD - "version": "10.3.2", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.2.tgz", - "integrity": "sha512-3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw==", - "deprecated": "Potential vulnerability. Please upgrade to @latest", -======= "version": "10.7.3", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==", ->>>>>>> update package lock "engines": { "node": "*" } @@ -20687,20 +20446,6 @@ } }, "node_modules/memoizee": { -<<<<<<< HEAD - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz", - "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==", - "dependencies": { - "d": "1", - "es5-ext": "^0.10.45", - "es6-weak-map": "^2.0.2", - "event-emitter": "^0.3.5", - "is-promise": "^2.1", - "lru-queue": "0.1", - "next-tick": "1", - "timers-ext": "^0.1.5" -======= "version": "0.4.15", "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz", "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==", @@ -20713,7 +20458,6 @@ "lru-queue": "^0.1.0", "next-tick": "^1.1.0", "timers-ext": "^0.1.7" ->>>>>>> update package lock } }, "node_modules/memory-fs": { @@ -21495,8 +21239,6 @@ "node": ">= 0.10.5" } }, -<<<<<<< HEAD -======= "node_modules/node-domexception": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", @@ -21515,7 +21257,6 @@ "node": ">=10.5.0" } }, ->>>>>>> update package lock "node_modules/node-emoji": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz", @@ -21546,7 +21287,6 @@ } }, "node_modules/node-gyp": { -<<<<<<< HEAD "version": "7.1.2", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz", "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==", @@ -21561,34 +21301,12 @@ "semver": "^7.3.2", "tar": "^6.0.2", "which": "^2.0.2" -======= - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", - "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", - "dependencies": { - "fstream": "^1.0.0", - "glob": "^7.0.3", - "graceful-fs": "^4.1.2", - "mkdirp": "^0.5.0", - "nopt": "2 || 3", - "npmlog": "0 || 1 || 2 || 3 || 4", - "osenv": "0", - "request": "^2.87.0", - "rimraf": "2", - "semver": "~5.3.0", - "tar": "^2.0.0", - "which": "1" ->>>>>>> update package lock }, "bin": { "node-gyp": "bin/node-gyp.js" }, "engines": { -<<<<<<< HEAD "node": ">= 10.12.0" -======= - "node": ">= 0.8.0" ->>>>>>> update package lock } }, "node_modules/node-gyp-build": { @@ -21601,7 +21319,6 @@ "node-gyp-build-test": "build-test.js" } }, -<<<<<<< HEAD "node_modules/node-gyp/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -21646,38 +21363,6 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, -======= - "node_modules/node-gyp/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/node-gyp/node_modules/semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/node-gyp/node_modules/tar": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", - "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", - "deprecated": "This version of tar is no longer supported, and will not receive security updates. Please upgrade asap.", - "dependencies": { - "block-stream": "*", - "fstream": "^1.0.12", - "inherits": "2" - } - }, ->>>>>>> update package lock "node_modules/node-libs-browser": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz", @@ -21745,20 +21430,13 @@ "integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==" }, "node_modules/node-sass": { -<<<<<<< HEAD "version": "6.0.1", "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-6.0.1.tgz", "integrity": "sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==", -======= - "version": "4.14.1", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", - "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", ->>>>>>> update package lock "hasInstallScript": true, "dependencies": { "async-foreach": "^0.1.3", "chalk": "^1.1.1", -<<<<<<< HEAD "cross-spawn": "^7.0.3", "gaze": "^1.0.0", "get-stdin": "^4.0.1", @@ -21767,18 +21445,6 @@ "meow": "^9.0.0", "nan": "^2.13.2", "node-gyp": "^7.1.0", -======= - "cross-spawn": "^3.0.0", - "gaze": "^1.0.0", - "get-stdin": "^4.0.1", - "glob": "^7.0.3", - "in-publish": "^2.0.0", - "lodash": "^4.17.15", - "meow": "^3.7.0", - "mkdirp": "^0.5.1", - "nan": "^2.13.2", - "node-gyp": "^3.8.0", ->>>>>>> update package lock "npmlog": "^4.0.0", "request": "^2.88.0", "sass-graph": "2.2.5", @@ -21789,11 +21455,7 @@ "node-sass": "bin/node-sass" }, "engines": { -<<<<<<< HEAD "node": ">=12" -======= - "node": ">=0.10.0" ->>>>>>> update package lock } }, "node_modules/node-sass/node_modules/ansi-styles": { @@ -21804,7 +21466,6 @@ "node": ">=0.10.0" } }, -<<<<<<< HEAD "node_modules/node-sass/node_modules/camelcase-keys": { "version": "6.2.2", "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", @@ -21821,8 +21482,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, -======= ->>>>>>> update package lock "node_modules/node-sass/node_modules/chalk": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", @@ -21839,7 +21498,6 @@ } }, "node_modules/node-sass/node_modules/cross-spawn": { -<<<<<<< HEAD "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", @@ -22112,42 +21770,10 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", -======= - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", - "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", - "dependencies": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" - } - }, - "node_modules/node-sass/node_modules/lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dependencies": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "node_modules/node-sass/node_modules/supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/node-sass/node_modules/true-case-path": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", - "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", ->>>>>>> update package lock "dependencies": { "glob": "^7.1.2" } }, -<<<<<<< HEAD "node_modules/node-sass/node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -22175,8 +21801,6 @@ "node": ">=10" } }, -======= ->>>>>>> update package lock "node_modules/noms": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/noms/-/noms-0.0.0.tgz", @@ -22213,26 +21837,17 @@ "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=" }, "node_modules/nopt": { -<<<<<<< HEAD "version": "5.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", -======= - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", ->>>>>>> update package lock "dependencies": { "abbrev": "1" }, "bin": { "nopt": "bin/nopt.js" -<<<<<<< HEAD }, "engines": { "node": ">=6" -======= ->>>>>>> update package lock } }, "node_modules/normalize-package-data": { @@ -22434,15 +22049,9 @@ } }, "node_modules/object-inspect": { -<<<<<<< HEAD - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", - "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", -======= "version": "1.11.1", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz", "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==", ->>>>>>> update package lock "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -22897,18 +22506,6 @@ "node": ">=0.10.0" } }, -<<<<<<< HEAD -======= - "node_modules/osenv": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "dependencies": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, ->>>>>>> update package lock "node_modules/ow": { "version": "0.17.0", "resolved": "https://registry.npmjs.org/ow/-/ow-0.17.0.tgz", @@ -24617,18 +24214,9 @@ } }, "node_modules/prismjs": { -<<<<<<< HEAD - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.22.0.tgz", - "integrity": "sha512-lLJ/Wt9yy0AiSYBf212kK3mM5L8ycwlyTlSxHBAneXLR0nzFMlZ5y7riFPF3E33zXOF2IH95xdY5jIyZbM9z/w==", - "optionalDependencies": { - "clipboard": "^2.0.0" - } -======= "version": "1.25.0", "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.25.0.tgz", "integrity": "sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg==" ->>>>>>> update package lock }, "node_modules/private": { "version": "0.1.8", @@ -24872,14 +24460,6 @@ "node": ">=0.4.x" } }, -<<<<<<< HEAD - "node_modules/querystring-browser": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/querystring-browser/-/querystring-browser-1.0.4.tgz", - "integrity": "sha1-8uNYgYQKgZvHsb9Zf68JeeZiLcY=" - }, -======= ->>>>>>> update package lock "node_modules/querystring-es3": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", @@ -25678,25 +25258,15 @@ } }, "node_modules/react-copy-to-clipboard": { -<<<<<<< HEAD - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.1.tgz", - "integrity": "sha512-ELKq31/E3zjFs5rDWNCfFL4NvNFQvGRoJdAKReD/rUPA+xxiLPQmZBZBvy2vgH7V0GE9isIQpT9WXbwIVErYdA==", -======= "version": "5.0.3", "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.3.tgz", "integrity": "sha512-9S3j+m+UxDZOM0Qb8mhnT/rMR0NGSrj9A/073yz2DSxPMYhmYFBMYIdI2X4o8AjOjyFsSNxDRnCX6s/gRxpriw==", ->>>>>>> update package lock "dependencies": { "copy-to-clipboard": "^3", "prop-types": "^15.5.8" }, "peerDependencies": { -<<<<<<< HEAD - "react": "^15.3.0 || ^16.0.0" -======= "react": "^15.3.0 || ^16.0.0 || ^17.0.0" ->>>>>>> update package lock } }, "node_modules/react-debounce-input": { @@ -26212,18 +25782,12 @@ } }, "node_modules/react-immutable-proptypes": { -<<<<<<< HEAD - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz", - "integrity": "sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ=", -======= "version": "2.2.0", "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.2.0.tgz", "integrity": "sha512-Vf4gBsePlwdGvSZoLSBfd4HAP93HDauMY4fDjXhreg/vg6F3Fj/MXDNyTbltPC/xZKmZc+cjLu3598DdYK6sgQ==", "dependencies": { "invariant": "^2.2.2" }, ->>>>>>> update package lock "peerDependencies": { "immutable": ">=3.6.2" } @@ -26393,17 +25957,6 @@ } }, "node_modules/react-syntax-highlighter": { -<<<<<<< HEAD - "version": "13.5.0", - "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-13.5.0.tgz", - "integrity": "sha512-2nKo8spFxe9shcjbdUiqxkrf/IMDqKUZLx7JVIxEJ17P+fYFGL4CRsZZC66UPeQ2o/f29eKu31CrkKGCK1RHuA==", - "dependencies": { - "@babel/runtime": "^7.3.1", - "highlight.js": "^10.1.1", - "lowlight": "^1.14.0", - "prismjs": "^1.21.0", - "refractor": "^3.1.0" -======= "version": "15.4.5", "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.4.5.tgz", "integrity": "sha512-RC90KQTxZ/b7+9iE6s9nmiFLFjWswUcfULi4GwVzdFVKVMQySkJWBuOmJFfjwjMVCo0IUUuJrWebNKyviKpwLQ==", @@ -26413,23 +25966,15 @@ "lowlight": "^1.17.0", "prismjs": "^1.25.0", "refractor": "^3.2.0" ->>>>>>> update package lock }, "peerDependencies": { "react": ">= 0.14.0" } }, "node_modules/react-syntax-highlighter/node_modules/highlight.js": { -<<<<<<< HEAD - "version": "10.3.2", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.2.tgz", - "integrity": "sha512-3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw==", - "deprecated": "Potential vulnerability. Please upgrade to @latest", -======= "version": "10.7.3", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==", ->>>>>>> update package lock "engines": { "node": "*" } @@ -26719,15 +26264,6 @@ "integrity": "sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==" }, "node_modules/refractor": { -<<<<<<< HEAD - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.2.0.tgz", - "integrity": "sha512-hSo+EyMIZTLBvNNgIU5lW4yjCzNYMZ4dcEhBq/3nReGfqzd2JfVhdlPDfU9rEsgcAyWx+OimIIUoL4ZU7NtYHQ==", - "dependencies": { - "hastscript": "^6.0.0", - "parse-entities": "^2.0.0", - "prismjs": "~1.22.0" -======= "version": "3.5.0", "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.5.0.tgz", "integrity": "sha512-QwPJd3ferTZ4cSPPjdP5bsYHMytwWYnAN5EEnLtGvkqp/FCCnGsBgxrm9EuIDnjUC3Uc/kETtvVi7fSIVC74Dg==", @@ -26735,7 +26271,6 @@ "hastscript": "^6.0.0", "parse-entities": "^2.0.0", "prismjs": "~1.25.0" ->>>>>>> update package lock }, "funding": { "type": "github", @@ -27793,7 +27328,6 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, -<<<<<<< HEAD "node_modules/sass": { "version": "1.45.0", "resolved": "https://registry.npmjs.org/sass/-/sass-1.45.0.tgz", @@ -27811,8 +27345,6 @@ "node": ">=8.9.0" } }, -======= ->>>>>>> update package lock "node_modules/sass-graph": { "version": "2.2.5", "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz", @@ -27914,7 +27446,6 @@ } }, "node_modules/sass-loader": { -<<<<<<< HEAD "version": "10.2.0", "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.2.0.tgz", "integrity": "sha512-kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw==", @@ -28016,33 +27547,6 @@ "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==", "peer": true }, -======= - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz", - "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==", - "dependencies": { - "clone-deep": "^4.0.1", - "loader-utils": "^1.0.1", - "neo-async": "^2.5.0", - "pify": "^4.0.1", - "semver": "^6.3.0" - }, - "engines": { - "node": ">= 6.9.0" - }, - "peerDependencies": { - "webpack": "^3.0.0 || ^4.0.0" - } - }, - "node_modules/sass-loader/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "bin": { - "semver": "bin/semver.js" - } - }, ->>>>>>> update package lock "node_modules/sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", @@ -28074,24 +27578,6 @@ "url": "https://opencollective.com/webpack" } }, -<<<<<<< HEAD -======= - "node_modules/schema-utils/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, ->>>>>>> update package lock "node_modules/scroll-into-view-if-needed": { "version": "2.2.26", "resolved": "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.26.tgz", @@ -28155,15 +27641,6 @@ "seek-table": "bin/seek-bzip-table" } }, -<<<<<<< HEAD - "node_modules/select": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", - "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=", - "optional": true - }, -======= ->>>>>>> update package lock "node_modules/select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", @@ -28298,13 +27775,6 @@ } }, "node_modules/serialize-error": { -<<<<<<< HEAD - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz", - "integrity": "sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=", - "engines": { - "node": ">=0.10.0" -======= "version": "8.1.0", "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-8.1.0.tgz", "integrity": "sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==", @@ -28327,7 +27797,6 @@ }, "funding": { "url": "https://github.com/sponsors/sindresorhus" ->>>>>>> update package lock } }, "node_modules/serialize-javascript": { @@ -28458,20 +27927,6 @@ "sha.js": "bin.js" } }, -<<<<<<< HEAD -======= - "node_modules/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==", - "dependencies": { - "kind-of": "^6.0.2" - }, - "engines": { - "node": ">=8" - } - }, ->>>>>>> update package lock "node_modules/shallow-compare": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/shallow-compare/-/shallow-compare-1.2.2.tgz", @@ -28563,81 +28018,6 @@ } }, "node_modules/side-channel": { -<<<<<<< HEAD - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.3.tgz", - "integrity": "sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g==", - "dependencies": { - "es-abstract": "^1.18.0-next.0", - "object-inspect": "^1.8.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel/node_modules/es-abstract": { - "version": "1.18.0-next.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", - "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", - "dependencies": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-negative-zero": "^2.0.0", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel/node_modules/is-callable": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", - "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel/node_modules/is-regex": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", - "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", - "dependencies": { - "has-symbols": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel/node_modules/object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "dependencies": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" -======= "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", @@ -28645,7 +28025,6 @@ "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", "object-inspect": "^1.9.0" ->>>>>>> update package lock }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -29341,7 +28720,6 @@ "node": ">=0.10.0" } }, -<<<<<<< HEAD "node_modules/source-map-js": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz", @@ -29351,8 +28729,6 @@ "node": ">=0.10.0" } }, -======= ->>>>>>> update package lock "node_modules/source-map-resolve": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", @@ -30200,24 +29576,6 @@ } }, "node_modules/swagger-client": { -<<<<<<< HEAD - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.12.0.tgz", - "integrity": "sha512-u8IAf+xWYvUY4H23gIgpN77I6BnJngAoZ80pnKB/Qex/nNxf99MvnpzatU0Wj4L5vz/Qa145PIj/ACbcMKK/MQ==", - "dependencies": { - "@babel/runtime-corejs3": "^7.11.2", - "btoa": "^1.2.1", - "buffer": "^5.6.0", - "cookie": "~0.4.1", - "cross-fetch": "^3.0.6", - "deep-extend": "~0.6.0", - "fast-json-patch": "^3.0.0-1", - "isomorphic-form-data": "~2.0.0", - "js-yaml": "^3.14.0", - "lodash": "^4.17.19", - "qs": "^6.9.4", - "querystring-browser": "^1.0.4", -======= "version": "3.17.0", "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.17.0.tgz", "integrity": "sha512-d8DOEME49wTXm+uT+lBAjJ5D6IDjEHdbkqa7MbcslR2c+oHIhi13ObwleVWGfr89MPkWgBl6RBq9VUHmrBJRbg==", @@ -30233,19 +29591,15 @@ "js-yaml": "^4.1.0", "lodash": "^4.17.21", "qs": "^6.9.4", ->>>>>>> update package lock "traverse": "~0.6.6", "url": "~0.11.0" } }, -<<<<<<< HEAD -======= "node_modules/swagger-client/node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, ->>>>>>> update package lock "node_modules/swagger-client/node_modules/cookie": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", @@ -30254,12 +29608,6 @@ "node": ">= 0.6" } }, -<<<<<<< HEAD - "node_modules/swagger-client/node_modules/qs": { - "version": "6.9.4", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz", - "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==", -======= "node_modules/swagger-client/node_modules/cross-fetch": { "version": "3.1.4", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz", @@ -30286,7 +29634,6 @@ "dependencies": { "side-channel": "^1.0.4" }, ->>>>>>> update package lock "engines": { "node": ">=0.6" }, @@ -30295,33 +29642,6 @@ } }, "node_modules/swagger-ui-react": { -<<<<<<< HEAD - "version": "3.36.2", - "resolved": "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-3.36.2.tgz", - "integrity": "sha512-bsFaGvljCQ/7uEkffooskOQjNSNbDxi5ITmUgNQRTnGtm1KGtR2gx1OxuUQVeCTiOxag402xaXfg1Oxr8Qj4GA==", - "dependencies": { - "@babel/runtime-corejs3": "^7.11.2", - "@braintree/sanitize-url": "^5.0.0", - "@kyleshockey/object-assign-deep": "^0.4.2", - "@kyleshockey/xml": "^1.0.2", - "base64-js": "^1.2.0", - "classnames": "^2.2.6", - "core-js": "^2.6.11", - "css.escape": "1.5.1", - "deep-extend": "0.6.0", - "dompurify": "^2.0.7", - "ieee754": "^1.1.13", - "immutable": "^3.x.x", - "js-file-download": "^0.4.1", - "js-yaml": "^3.13.1", - "lodash": "^4.17.19", - "memoizee": "^0.4.12", - "prop-types": "^15.7.2", - "randombytes": "^2.1.0", - "react-copy-to-clipboard": "5.0.1", - "react-debounce-input": "^3.2.0", - "react-immutable-proptypes": "2.1.0", -======= "version": "3.52.5", "resolved": "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-3.52.5.tgz", "integrity": "sha512-V2fidbSGCb6SmC1AyTXv6T8znWcLAjfVBs2CPTXUS7m7s//SqiRx3hXXPUNvGxKTEK76h+yvcBZf2GLD7kr63w==", @@ -30346,31 +29666,19 @@ "react-copy-to-clipboard": "5.0.3", "react-debounce-input": "^3.2.3", "react-immutable-proptypes": "2.2.0", ->>>>>>> update package lock "react-immutable-pure-component": "^1.1.1", "react-inspector": "^2.3.0", "react-motion": "^0.5.2", "react-redux": "=4.4.10", -<<<<<<< HEAD - "react-syntax-highlighter": "=13.5.0", -======= "react-syntax-highlighter": "^15.4.4", ->>>>>>> update package lock "redux": "=3.7.2", "redux-immutable": "3.1.0", "remarkable": "^2.0.1", "reselect": "^4.0.0", -<<<<<<< HEAD - "serialize-error": "^2.1.0", - "sha.js": "^2.4.11", - "swagger-client": "=3.12.0", - "url-parse": "^1.4.7", -======= "serialize-error": "^8.1.0", "sha.js": "^2.4.11", "swagger-client": "^3.17.0", "url-parse": "^1.5.2", ->>>>>>> update package lock "xml-but-prettier": "^1.0.1", "zenscroll": "^4.0.2" }, @@ -30379,14 +29687,6 @@ "react-dom": ">=15.6.2" } }, -<<<<<<< HEAD - "node_modules/swagger-ui-react/node_modules/core-js": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", - "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==", - "deprecated": "core-js@<3.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.", - "hasInstallScript": true -======= "node_modules/swagger-ui-react/node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -30402,7 +29702,6 @@ "bin": { "js-yaml": "bin/js-yaml.js" } ->>>>>>> update package lock }, "node_modules/swagger-ui-react/node_modules/redux": { "version": "3.7.2", @@ -30810,15 +30109,6 @@ "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" }, -<<<<<<< HEAD - "node_modules/tiny-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", - "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==", - "optional": true - }, -======= ->>>>>>> update package lock "node_modules/tinycolor2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz", @@ -31850,15 +31140,9 @@ } }, "node_modules/url-parse": { -<<<<<<< HEAD - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", - "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", -======= "version": "1.5.3", "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz", "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==", ->>>>>>> update package lock "dependencies": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" @@ -32118,50 +31402,6 @@ "watchpack-chokidar2": "^2.0.0" } }, - "node_modules/watchpack-chokidar2": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz", - "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==", - "optional": true, - "dependencies": { - "chokidar": "^2.1.8" - }, - "engines": { - "node": "<8.10.0" - } - }, - "node_modules/watchpack-chokidar2/node_modules/chokidar": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", - "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", - "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.", - "optional": true, - "dependencies": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" - }, - "optionalDependencies": { - "fsevents": "^1.2.7" - } - }, - "node_modules/watchpack-chokidar2/node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/watchpack/node_modules/anymatch": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", @@ -32334,8 +31574,6 @@ "url": "https://github.com/sponsors/wooorm" } }, -<<<<<<< HEAD -======= "node_modules/web-streams-polyfill": { "version": "4.0.0-beta.1", "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.1.tgz", @@ -32344,7 +31582,6 @@ "node": ">= 12" } }, ->>>>>>> update package lock "node_modules/webpack": { "version": "4.44.2", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz", @@ -54236,19 +53473,12 @@ } }, "react-immutable-proptypes": { -<<<<<<< HEAD - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz", - "integrity": "sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ=", - "requires": {} -======= "version": "2.2.0", "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.2.0.tgz", "integrity": "sha512-Vf4gBsePlwdGvSZoLSBfd4HAP93HDauMY4fDjXhreg/vg6F3Fj/MXDNyTbltPC/xZKmZc+cjLu3598DdYK6sgQ==", "requires": { "invariant": "^2.2.2" } ->>>>>>> update package lock }, "react-immutable-pure-component": { "version": "1.2.3", @@ -58923,43 +58153,6 @@ } } }, - "watchpack-chokidar2": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz", - "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==", - "optional": true, - "requires": { - "chokidar": "^2.1.8" - }, - "dependencies": { - "chokidar": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", - "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", - "optional": true, - "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "optional": true - } - } - }, "wbuf": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",