diff --git a/.circleci/config.yml b/.circleci/config.yml index e9ffc5385a..78215fbba5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -55,7 +55,6 @@ linuxWorkflowExcludeFilters: &linux-x64-workflow-exclude-filters unless: or: - false - # - equal: [ 'tgriesser/chore/fix-windows-build', << pipeline.git.branch >> ] # windows is slow and expensive in CI, so it normally only runs on main branches # add your branch to this list to run the full Windows build on your PR @@ -902,7 +901,7 @@ commands: fi curl -L https://raw.githubusercontent.com/cypress-io/cypress/$branch/scripts/ensure-node.sh --output ci-ensure-node.sh - else + else # if no .node-version file exists, we no-op the node script and use the global yarn echo '' > ci-ensure-node.sh fi @@ -1031,7 +1030,7 @@ commands: # by default, electron-builder will NOT sign app built in a pull request # even our internal one (!) # Usually this is not a problem, since we only build and test binary - # built on "develop" and "master" branches + # built on the "develop" branch # but if you need to really build and sign a binary in a PR # set variable CSC_FOR_PULL_REQUEST=true command: | @@ -1874,6 +1873,20 @@ jobs: name: Build command: yarn workspace @cypress/mount-utils build - store-npm-logs + + npm-xpath: + <<: *defaults + resource_class: small + steps: + - restore_cached_workspace + - run: + name: Run tests + command: yarn workspace @cypress/xpath cy:run + - store_test_results: + path: npm/xpath/test_results + - store_artifacts: + path: npm/xpath/test_results + - store-npm-logs npm-create-cypress-tests: <<: *defaults diff --git a/.github/workflows/merge-master-into-develop.yml b/.github/workflows/merge-master-into-develop.yml deleted file mode 100644 index 2b15adabc1..0000000000 --- a/.github/workflows/merge-master-into-develop.yml +++ /dev/null @@ -1,79 +0,0 @@ -name: Merge master into develop -on: - push: - branches: - - master -jobs: - merge-master-into-develop: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - # the default `GITHUB_TOKEN` cannot push to protected branches, so use `cypress-app-bot`'s token instead - token: ${{ secrets.BOT_GITHUB_TOKEN }} - - name: Set committer info - run: | - git config --local user.email "$(git log --format='%ae' HEAD^!)" - git config --local user.name "$(git log --format='%an' HEAD^!)" - - name: Checkout develop branch - run: git checkout develop - - name: Check for merge conflict - id: check-conflict - run: echo "::set-output name=merge_conflict::$(git merge-tree $(git merge-base HEAD master) master HEAD | egrep '<<<<<<<')" - - name: Merge master into develop - id: merge-master - run: git merge master - if: ${{ !steps.check-conflict.outputs.merge_conflict }} - - name: Failed merge, set merged status as failed - run: echo "::set-output name=merge_conflict::'failed merge'" - if: ${{ steps.merge-master.outcome != 'success' }} - - name: Push - run: git push - if: ${{ !steps.check-conflict.outputs.merge_conflict }} - - name: Checkout master - run: git checkout master - if: ${{ steps.check-conflict.outputs.merge_conflict }} - - name: Determine name of new branch - id: gen-names - run: | - echo "::set-output name=sha::$(git rev-parse --short HEAD)" - echo "::set-output name=branch_name::$(git rev-parse --short HEAD)-master-into-develop" - if: ${{ steps.check-conflict.outputs.merge_conflict }} - - name: Create a copy of master on a new branch - run: git checkout -b ${{ steps.gen-names.outputs.branch_name }} master - if: ${{ steps.check-conflict.outputs.merge_conflict }} - - name: Push branch to remote - run: git push origin ${{ steps.gen-names.outputs.branch_name }} - if: ${{ steps.check-conflict.outputs.merge_conflict }} - - name: Create Pull Request - uses: actions/github-script@v3 - with: - script: | - const pull = await github.pulls.create({ - owner: context.repo.owner, - repo: context.repo.repo, - base: 'develop', - head: '${{ steps.gen-names.outputs.branch_name }}', - title: 'chore: merge master (${{ steps.gen-names.outputs.sha }}) into develop', - body: `There was a merge conflict when trying to automatically merge master into develop. Please resolve the conflict and complete the merge. - - DO NOT SQUASH AND MERGE - - @${context.actor}`, - maintainer_can_modify: true, - }) - await github.pulls.requestReviewers({ - owner: context.repo.owner, - repo: context.repo.repo, - pull_number: pull.data.number, - reviewers: [context.actor], - }) - await github.issues.addLabels({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: pull.data.number, - labels: ['auto-merge'], - }) - if: ${{ steps.check-conflict.outputs.merge_conflict }} diff --git a/.github/workflows/snyk_sca_scan.yaml b/.github/workflows/snyk_sca_scan.yaml index d9b21b0ab8..4fd117ba3c 100644 --- a/.github/workflows/snyk_sca_scan.yaml +++ b/.github/workflows/snyk_sca_scan.yaml @@ -1,14 +1,13 @@ name: Snyk Software Composition Analysis Scan # This git workflow leverages Snyk actions to perform a Software Composition -# Analysis scan on our Opensource libraries upon Pull Requests to Master & -# Develop branches. We use this as a control to prevent vulnerable packages +# Analysis scan on our Opensource libraries upon Pull Requests to the +# "develop" branch. We use this as a control to prevent vulnerable packages # from being introduced into the codebase. on: pull_request_target: types: - opened branches: - - master - develop jobs: Snyk_SCA_Scan: diff --git a/.github/workflows/snyk_static_analysis_scan.yaml b/.github/workflows/snyk_static_analysis_scan.yaml index f34b3de41e..50ce41e5f1 100644 --- a/.github/workflows/snyk_static_analysis_scan.yaml +++ b/.github/workflows/snyk_static_analysis_scan.yaml @@ -1,14 +1,13 @@ name: Snyk Static Analysis Scan # This git workflow leverages Snyk actions to perform a Static Application -# Testing scan (SAST) on our first-party code upon Pull Requests to Master & -# Develop branches. We use this as a control to prevent vulnerabilities +# Testing scan (SAST) on our first-party code upon Pull Requests to the +# "develop" branch. We use this as a control to prevent vulnerabilities # from being introduced into the codebase. on: pull_request_target: types: - opened branches: - - master - develop jobs: Snyk_SAST_Scan : diff --git a/.gitignore b/.gitignore index 5f8a277767..5f24cb5146 100644 --- a/.gitignore +++ b/.gitignore @@ -78,6 +78,9 @@ system-tests/lib/fixtureDirs.ts # from npm/webpack-dev-server /npm/webpack-dev-server/cypress/videos +# from npm/xpath +/npm/xpath/cypress/videos + # from errors /packages/errors/__snapshot-images__ /packages/errors/__snapshot-md__ diff --git a/.releaserc.base.js b/.releaserc.base.js index 95f6bbf940..e858fcbc41 100644 --- a/.releaserc.base.js +++ b/.releaserc.base.js @@ -15,6 +15,6 @@ module.exports = { ], extends: 'semantic-release-monorepo', branches: [ - 'master', + { name: 'develop', channel: 'latest' }, ], } diff --git a/.releaserc.js b/.releaserc.js index 4025bd1ff5..1800a9cf37 100644 --- a/.releaserc.js +++ b/.releaserc.js @@ -1,7 +1,3 @@ module.exports = { ...require('./.releaserc.base'), - branches: [ - 'master', - { name: 'chore/webpack-5', channel: 'channel-next' }, - ], } diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a007ead1b..0fe28547aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,17 @@ -https://on.cypress.io/changelog +# Changelogs + +- [Cypress App](https://on.cypress.io/changelog) +- [`@cypress/angular`](https://github.com/cypress-io/cypress/blob/develop/npm/angular/CHANGELOG.md) +- [`@cypress/create-cypress-tests`](https://github.com/cypress-io/cypress/blob/develop/npm/create-cypress-tests/CHANGELOG.md) +- [`@cypress/eslint-plugin-dev`](https://github.com/cypress-io/cypress/blob/develop/npm/eslint-plugin-dev/CHANGELOG.md) +- [`@cypress/mount-utils`](https://github.com/cypress-io/cypress/blob/develop/npm/mount-utils/CHANGELOG.md) +- [`@cypress/react`](https://github.com/cypress-io/cypress/blob/develop/npm/react/CHANGELOG.md) +- [`@cypress/react18`](https://github.com/cypress-io/cypress/blob/develop/npm/react18/CHANGELOG.md) +- [`@cypress/svelte`](https://github.com/cypress-io/cypress/blob/develop/npm/svelte/CHANGELOG.md) +- [`@cypress/vite-dev-server`](https://github.com/cypress-io/cypress/blob/develop/npm/vite-dev-server/CHANGELOG.md) +- [`@cypress/vue`](https://github.com/cypress-io/cypress/blob/develop/npm/vue/CHANGELOG.md) +- [`@cypress/vue2`](https://github.com/cypress-io/cypress/blob/develop/npm/vue2/CHANGELOG.md) +- [`@cypress/webpack-batteries-included-preprocessor`](https://github.com/cypress-io/cypress/blob/develop/npm/webpack-batteries-included-preprocessor/CHANGELOG.md) +- [`@cypress/webpack-dev-server`](https://github.com/cypress-io/cypress/blob/develop/npm/webpack-dev-server/CHANGELOG.md) +- [`@cypress/webpack-preprocessor`](https://github.com/cypress-io/cypress/blob/develop/npm/webpack-preprocessor/CHANGELOG.md) +- [`@cypress/xpath`](https://github.com/cypress-io/cypress/blob/develop/npm/xpath/CHANGELOG.md) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7e6ddbf461..57460ad081 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,8 +4,8 @@ Thanks for taking the time to contribute! :smile: **Once you learn how to use Cypress, you can contribute in many ways:** -- Join the [Cypress Discord](https://on.cypress.io/discord) and answer questions. Teaching others how to use Cypress is a great way to learn more about how it works. -- Blog about Cypress. We display blogs featuring Cypress on our [Examples](https://on.cypress.io/examples) page. If you'd like your blog featured, [open a PR to add it to our docs](https://github.com/cypress-io/cypress-documentation/blob/develop/CONTRIBUTING.md#adding-examples). +- Join the [Cypress Discord](https://on.cypress.io/chat) and answer questions. Teaching others how to use Cypress is a great way to learn more about how it works. +- Blog about Cypress. We display blogs featuring Cypress on our [Examples](https://on.cypress.io/examples) page. If you'd like your blog featured, [open a PR to add it to our docs](https://github.com/cypress-io/cypress-documentation/blob/master/CONTRIBUTING.md#adding-examples). - Write some documentation or improve our existing docs. See our [guide to contributing to our docs](https://github.com/cypress-io/cypress-documentation/blob/master/CONTRIBUTING.md). - Give a talk about Cypress. [Contact us](mailto:support@cypress.io) ahead of time and we'll send you some swag. :shirt: @@ -20,7 +20,6 @@ Thanks for taking the time to contribute! :smile: - [Code of Conduct](#code-of-conduct) - [Opening Issues](#opening-issues) -- [Triaging Issues](#triaging-issues) - [Writing Documentation](#writing-documentation) - [Writing Code](#writing-code) - [What you need to know before getting started](#what-you-need-to-know-before-getting-started) @@ -111,129 +110,6 @@ test execution | Running tests inside a single spec | [open](https://github.com/ typescript | Transpiling or bundling TypeScript | [open](https://github.com/cypress-io/cypress/labels/topic%3A%20typescript), [closed](https://github.com/cypress-io/cypress/issues?q=label%3A%22topic%3A+typescript%22+is%3Aclosed) video | Problems with video recordings | [open](https://github.com/cypress-io/cypress/labels/topic%3A%20video%20%F0%9F%93%B9), [closed](https://github.com/cypress-io/cypress/issues?q=label%3A%22topic%3A+video+%F0%9F%93%B9%22+is%3Aclosed) -## Triaging Issues - -When an issue is opened in [cypress](https://github.com/cypress-io/cypress), we need to evaluate the issue to determine what steps should be taken next. So, when approaching new issues, there are some steps that should be taken. - -### Is this a question? - -Some opened issues are questions, not bug reports or feature requests. Issues are reserved for potential bugs or feature requests *only*. If this is the case, you should: - -- Explain that issues in our GitHub repo are reserved for potential bugs or feature requests and that the issue will be closed since it appears to be neither a bug nor a feature request. -- Guide them to existing resources where their questions can be asked like our [Discussions](https://github.com/cypress-io/cypress/discussions), [community chat](https://on.cypress.io/chat), [Discord](https://on.cypress.io/discord), or [Stack Overflow](https://stackoverflow.com/questions/tagged/cypress). -- Cypress offers support via email when signing up for any of our [paid plans](https://www.cypress.io/pricing/), so remind them that this is an option if they already have a paid account. -- Move the issue to [Discussions](https://github.com/cypress-io/cypress/discussions). - -### Does this issue belong in this repository? - -#### Other open source repos - -Issues may be opened about wanting changes to our [documentation](https://github.com/cypress-io/cypress-documentation), our [example-kitchensink app](https://github.com/cypress-io/cypress-example-kitchensink), or [another repository](https://github.com/cypress-io). In this case you should: - -- Thank them for their contribution. -- Explain that this repo is only for bugs or feature requests of the Cypress App. -- If you have permission to 'Transfer the issue', do so. If not, explain that they can open an issue in our other repository and link to the repository. -- Close the issue (if not already transferred). - -#### Cypress Dashboard - -Issues may be opened about wanting features in our Dashboard Service. In this case you should: - -- Thank them for opening an issue. -- Add the `external: dashboard` label. - -#### Component Testing - -Issues may be opened about wanting features in Component Testing. In this case you should: - -- Thank them for opening an issue. -- Add the `component testing` label. - -### Is this already an open issue? - -Search [all issues](https://github.com/cypress-io/cypress/issues) for keywords from the issue to ensure there isn't already an issue open for this. GitHub has some [search tips](https://help.github.com/articles/searching-issues-and-pull-requests/) that may help you better find the relevant issue. - -If an issue already exists you should: - -- Thank them for their contribution. -- Explain that this issue is a duplicate of another issue, linking to the relevant issue (`#1234`). -- Add the `type: duplicate` label to the issue. -- Close the issue. - -### Does the issue provide all the information from our issue template? - -When opening an issue, there is a provided issue template based on the type of issue. If the opened issue does not provide enough information asked from the issue template you should: - -- Explain that we require new issues follow our provided issue template and that issues that are opened without this information are automatically closed per our [contributing guidelines](#fill-out-our-issue-template). -- Close the issue. - -### Are they running the current version of Cypress? - -If they listed an older version of Cypress in their issue. We don't want to spend the time to set up a reproducible project (which can be time consuming) only to find that bumping the Cypress version fixes it. You should: - -- Ask them to update to the newest version of Cypress and comment about the results. -- Add the `stage: awaiting response` label to the issue. - -### Is the fix or feature within our vision for Cypress? - -There will inevitably be suggestions that will not fit within the scope of Cypress's vision for our product. If an issue or pull request falls under this category you should: - -- Thank them for their contribution. -- Explain why it doesn't fit into the scope at Cypress, and offer clear suggestions for improvement, if you're able. Be kind, but firm. -- Link to relevant documentation, if there is any. If you notice repeated requests for things that are not within scope, add them into the [documentation](https://github.com/cypress-io/cypress-documentation) to avoid repeating yourself. -- Add the `stage: wontfix` label to the issue. -- Close the issue/pull request. - -### Is what they're describing actually happening? - -The best way to determine the validity of a bug is to recreate it yourself. Follow the directions or information provided to recreate the bug that is described. Did they provide a repository that demonstrates the bug? Great - fork it and run the project and steps required. If they didn't provide a repository, the best way to reproduce the issue is to have a 'sandbox' project up and running locally for Cypress. This is just a simple project with Cypress installed where you can freely edit the application under test and the tests themselves to recreate the problem. - -**Attempting to recreate the bug will lead to a few scenarios:** - -#### 1. You can't recreate the bug - - If you can't recreate the situation happening you should: - -- Thank them for their contribution. -- Explain that there isn't enough information to reproduce the bug. Provide information on how you went about recreating the scenario, if you're able. Note your OS, Browser, Cypress version and any other information. -- Note that if no reproducible example is provided, we will unfortunately have to close the issue. -- Add the `stage: needs information` label to the issue. - -#### 2. You can recreate the bug - -If you can recreate the bug you should: - -- Thank them for their contribution. -- Explain that you're able to recreate the bug. Provide the exact test code ran and the versions of Cypress, OS, and browser you used to recreate it. -- If you know where the code is that could possibly fix this issue - link to the file or line of code from the [cypress](https://github.com/cypress-io/cypress) repo and remind the user that we are open source and that we gladly accept PRs, even if they are a work in progress. -- Add the `stage: ready for work` label to the issue. - -#### 3. You can tell the problem is a user error - -In recreating the issue, you may realize that they had a typo or used the Cypress API incorrectly, etc. In this case you should: - -- Leave a comment informing the user of their error. -- Link to relevant documentation, if there is any. If you notice repeated user errors for the same situation, add them into the [documentation](https://github.com/cypress-io/cypress-documentation) to avoid repeating yourself. -- Close the issue. - -### Has the issue gone stale? - -Some issues are opened and sadly forgotten about by the person originally opening the issue. - -#### Not enough information ever provided - -Sometimes we request more information to be provided (label `stage: needs information`) for an open issue, but no one is able to provide a reproducible example or they simply never respond. **This does not mean that we don't believe that there is a bug!** We just, unfortunately, don't have a path forward to fix it without this information. In this case you should: - -- Add a comment reminding them or our request for more information and that the issue will be closed if it is not provided. Sometimes issues get forgotten about, and all the person needs is a gentle reminder. -- If there is still no response after a weeks time, explain that you are closing the issue due to not enough information or inactivity and that they can comment in the issue with a reproducible example and we will reopen the issue. -- Close the issue. - -#### They already solved their issue - -Some issues are resolved by the community, by giving some guidance or a workaround, but the original opener of the issue forgets to close the issue. In this case you should: - -- Explain that you are closing the issue as resolved and that they can comment if they are still having the issue and we will consider reopening it. -- Close the issue. ## Writing Documentation @@ -259,22 +135,33 @@ Here is a list of the core packages in this repository with a short description, | Folder Name | Package Name | Purpose | | :------------------------------------ | :---------------------- | :--------------------------------------------------------------------------- | | [cli](./cli) | `cypress` | The command-line tool that is packaged as an `npm` module. | + | [app](./packages/app) | `@packages/app` | The the front-end for the Cypress App that renders in the launched browser instance. | + | [config](./packages/config) | `@packages/config` | The Cypress configuration types and validation used in the server, data-context and driver. | + | [data-context](./packages/data-context) | `@packages/data-context` | Centralized data access for the Cypress application. | | [driver](./packages/driver) | `@packages/driver` | The code that is used to drive the behavior of the API commands. | | [electron](./packages/electron) | `@packages/electron` | The Cypress implementation of Electron. | | [example](./packages/example) | `@packages/example` | Our example kitchen-sink application. | | [extension](./packages/extension) | `@packages/extension` | The Cypress Chrome browser extension | + | [frontend-shared](./packages/frontend-shared) | `@packages/frontend-shared` | Shared components and styles used in the `app` and `launchpad`. | + | [graphql](./packages/graphql) | `@packages/graphql` | The GraphQL layer that the `launchpad` and `app` use to interact with the `server`. | | [https-proxy](./packages/https-proxy) | `@packages/https-proxy` | This does https proxy for handling http certs and traffic. | + | [icons](./packages/icons) | `@packages/icons` | The Cypress icons. | + | [launcher](./packages/launcher) | `@packages/launcher` | Finds and launches browsers installed on your system. | + | [launchpad](./packages/launchpad) | `@packages/launcher` | The portal to running Cypress that displays in `open` mode. | | [net-stubbing](./packages/net-stubbing) | `@packages/net-stubbing` | Contains server side code for Cypress' network stubbing features. | | [network](./packages/network) | `@packages/network` | Various utilities related to networking. | | [proxy](./packages/proxy) | `@packages/proxy` | Code for Cypress' network proxy layer. | - | [launcher](./packages/launcher) | `@packages/launcher` | Finds and launches browsers installed on your system. | | [reporter](./packages/reporter) | `@packages/reporter` | The reporter shows the running results of the tests (The Command Log UI). | + | [resolve-dist](./packages/resolve-dist) | `@packages/resolve-dist` | Centralizes the resolution of paths to compiled/static assets from server-side code.. | + | [rewriter](./packages/rewriter) | `@packages/rewriter` | The logic to rewrite JS and HTML that flows through the Cypress proxy. | [root](./packages/root) | `@packages/root` | Dummy package pointing at the root of the repository. | - | [runner](./packages/runner) | `@packages/runner` | The runner is the minimal "chrome" around the user's application under test. | + | [runner](./packages/runner) | `@packages/runner` | (deprecated) The runner is the minimal "chrome" around the user's application under test. | + | [scaffold-config](./packages/scaffold-config) | `@packages/scaffold-config` | The logic related to scaffolding new projects using launchpad. | | [server](./packages/server) | `@packages/server` | The <3 of Cypress. This orchestrates everything. The backend node process. | - | [server-ct](./packages/server-ct) | `@packages/server-ct` | Some Component Testing specific overrides. Mostly extends functionality from `@packages/server` | | [socket](./packages/socket) | `@packages/socket` | A wrapper around socket.io to provide common libraries. | | [ts](./packages/ts) | `@packages/ts` | A centralized version of typescript. | + | [types](./packages/types) | `@packages/types` | The shared internal Cypress types. | + | [web-config](./packages/web-config) | `@packages/ui-components` | The web-related configuration. | Public packages live within the [`npm`](./npm) folder and are standalone modules that get independently published to npm under the `@cypress/` namespace. These packages generally contain extensions, plugins, or other packages that are complementary to, yet independent of, the main Cypress app. @@ -288,11 +175,14 @@ Here is a list of the npm packages in this repository: | [mount-utils](./npm/mount-utils) | `@cypress/mount-utils` | Common functionality for Vue/React/Angular adapters. | | [react](./npm/react) | `@cypress/react` | Cypress component testing for React. | | [react18](./npm/react18) | `@cypress/react18` | Cypress component testing for React 18. | + | [svelte](./npm/svelte) | `@cypress/svelte` | Cypress component testing for Svelte. | | [vite-dev-server](./npm/vite-dev-server) | `@cypress/vite-dev-server` | Vite powered dev server for Component Testing. | - | [webpack-preprocessor](./npm/webpack-preprocessor) | `@cypress/webpack-preprocessor` | Cypress preprocessor for bundling JavaScript via webpack. | - | [webpack-dev-server](./npm/webpack-dev-server) | `@cypress/webpack-dev-server` | Webpack powered dev server for Component Testing. | | [vue](./npm/vue) | `@cypress/vue` | Cypress component testing for Vue 3. | | [vue2](./npm/vue2) | `@cypress/vue2` | Cypress component testing for Vue 2. | + | [webpack-batteries-included-preprocessor](./npm/webpack-batteries-included-preprocessor) | `@cypress/webpack-batteries-included-preprocessor` | Cypress preprocessor for bundling JavaScript via webpack with dependencies included and support for various ES features, TypeScript, and CoffeeScript. | + | [webpack-dev-server](./npm/webpack-dev-server) | `@cypress/webpack-dev-server` | Webpack powered dev server for Component Testing. | + | [webpack-preprocessor](./npm/webpack-preprocessor) | `@cypress/webpack-preprocessor` | Cypress preprocessor for bundling JavaScript via webpack. | + | [xpath](./npm/xpath) | `@cypress/xpath` | Adds XPath command to Cypress.io test runner. | We try to tag all issues with a `pkg/` or `npm/` tag describing the appropriate package the work is required in. For public packages, we use their qualified package name: For example, issues relating to the webpack preprocessor are tagged under [`npm: @cypress/webpack-preprocessor`](https://github.com/cypress-io/cypress/labels/npm%3A%20%40cypress%2Fwebpack-preprocessor) label and issues related to the `driver` package are tagged with the [`pkg/driver`](https://github.com/cypress-io/cypress/labels/pkg%2Fdriver) label. @@ -508,28 +398,13 @@ They will outline development and test procedures. When in doubt just look at th ### Branches -The repository is setup with two main (protected) branches. +The repository has one protected branch: -- `master` is the code already published, both for the main Cypress app and independent npm packages. -- `develop` is the current latest "pre-release" code. This branch is set as the default branch, and all pull requests that update the main Cypress binary should be made against this branch. +- `develop` contains the current latest "pre-release" code for the Cypress app and contains the already published code of all [standalone npm packages](./npm) Cypress maintains. This branch is set as the default branch, and all pull requests should be made against this branch. -In general, we want to publish our [standalone npm packages](./npm) continuously as new features are added. Therefore, any pull requests that only change independent `@cypress/` packages in the [`npm`](./npm) directory should be made directly off the `master` branch. We use [`semantic-release`](https://semantic-release.gitbook.io/semantic-release/) to automatically publish these packages to npm when a PR is merged directly into master. +We want to publish our [standalone npm packages](./npm) continuously as new features are added. Therefore, after any pull request that changes independent `@cypress/` packages in the [`npm`](./npm) directory will automatically publish when a PR is merged directly into `develop` and the entire build passes. We used [`semantic-release`](https://semantic-release.gitbook.io/semantic-release/) to automate the release of these packages to npm. -When updating the main Cypress app, pull requests should be made against the `develop` branch. We do not continuously deploy the Cypress binary, so `develop` contains all of the new features and fixes that are staged to go out in the next update of the main Cypress app. In addition, if you make changes to an npm package that can't be published until the binary is also updated, you should make a pull request against the `develop` branch. - -Essentially, if you only change files within the [`npm`](./npm) folder, then you should make a pull request against `master`. Otherwise, make it against `develop`. - -All updates to `master` are automatically merged into `develop`, so `develop` always has the latest version of every package. - -#### Workflow Diagrams - - - - - -### Independent Packages CI Workflow - -Independent packages are automatically released when code is merged into `master` and the entire build passes. +We do not continuously deploy the Cypress binary, so `develop` contains all of the new features and fixes that are staged to go out in the next update of the main Cypress app. If you make changes to an npm package that can't be published until the binary is also updated, you should make a pull request against specifying this is not be merged until the scheduled Cypress app release date. ### Pull Requests @@ -636,11 +511,13 @@ Below are some guidelines Cypress uses when reviewing dependency updates. - [ ] The PR been tagged with a release in ZenHub. - [ ] Appropriate labels have been added to the PR (for example: label `type: breaking change` if it is a breaking change) -## Deployment +## Releases -We will try to review and merge pull requests quickly. If you want to know our build process or build your own Cypress binary, read [the "Release Process" guide](./guides/release-process.md). +[Standalone npm packages](./npm) are deployed immediately when a PR is merged into `develop` and the entire build passes. -Independent packages are deployed immediately upon being merged into master. You can read more [above](#independent-packages-ci-workflow). +The Cypress app is typically released every two weeks. All PRs merged to `develop` will build a "pre-released" Cypress app which can be installed to verify or leverage your changes before the scheduled release. Read these instructions for [installing pre-release versions](https://docs.cypress.io/guides/references/advanced-installation#Install-pre-release-version). + +If you want to know our build process or build your own Cypress binary, read [the "Release Process" guide](./guides/release-process.md). ## Known problems diff --git a/README.md b/README.md index d10a708934..59de2bd82b 100644 --- a/README.md +++ b/README.md @@ -64,13 +64,16 @@ yarn add cypress --dev ## Contributing - [![CircleCI](https://circleci.com/gh/cypress-io/cypress/tree/develop.svg?style=svg)](https://circleci.com/gh/cypress-io/cypress/tree/develop) - `develop` branch -- [![CircleCI](https://circleci.com/gh/cypress-io/cypress/tree/master.svg?style=svg)](https://circleci.com/gh/cypress-io/cypress/tree/master) - `master` branch Please see our [Contributing Guideline](./CONTRIBUTING.md) which explains repo organization, linting, testing, and other steps. +## How we work + +At Cypress we value our community and strive to be as open and transparent with them as possible. Check out [our guide](./cypress-prioritization-and-triage.md) on how we prioritize community issues. + ## License -[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/master/LICENSE) +[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/develop/LICENSE) This project is licensed under the terms of the [MIT license](/LICENSE). diff --git a/assets/DIAGRAMS.md b/assets/DIAGRAMS.md deleted file mode 100644 index bf1145597d..0000000000 --- a/assets/DIAGRAMS.md +++ /dev/null @@ -1,16 +0,0 @@ -## Diagram assets in this repo - -> :warning: These will eventually move to the docs site, link with caution - -### Updating Diagrams - -1. Visit a diagram link -1. Make your changes -1. Go to Export -> URL... and paste the new URL in this document -1. Go to Export -> PNG and replace the asset - -### List of Diagrams - -**Branching and Contributing** -1. [Choosing a Branch - Develop or Master](https://viewer.diagrams.net/?highlight=0000ff&edit=_blank&layers=1&nav=1&title=git-2.drawio#RzVltc9o4EP41%2FtiO38EfgYS2c%2B1NrulMm4%2FCFrYutuXIcsD3629lS%2Fg9QBpCYQBrLa2l3WefXQnNWiX7Twxl0Tca4Fgz9WCvWTeaaRqW68KPkJS1xHOkIGQkkJ0awT35D0uhLqUFCXDe6cgpjTnJukKfpin2eUeGGKO7brctjbtPzVCIB4J7H8VD6U8S8KiWzh29kX%2FGJIzUkw1d3kmQ6iwFeYQCumuJrFvNWjFKeX2V7Fc4FsZTdqnHrSfuHibGcMpPGfDX0%2B33z%2Ff7X1m42j39mH%2F6JzazD1LLM4oLuWA5WV4qCzBapAEWSnTNWu4iwvF9hnxxdwc%2BB1nEkxhaBlxKdZhxvJ%2Bcp3FYPcAG0wRzVkIXNcCrR5TKonVz11jfsma1LGpZ3lbAQtLj4UFzYxS4kHY5w0ZDk%2BAAMCKblPGIhjRF8W0jXTbSr5Rm0jj%2FYs5LCXFUcNo13ZamfI0SEouF%2F0ARTRBI%2FYI9V8ZvrCuefq5tGY4RJ8%2FdcWOWkkPvKAGNjU%2Fm849O1y1zvauEIxZiLse1YXhcldNTldOC%2BXigasEYKlvdMtEhP2vSrn7u3Loj4KKeRYOmg5FfDzBrJAjdGBy6zDOUdqDnPhWCLyqwfMgrKC2gg2Fk%2B%2BYmXIXidxWhNATyFMFTzSKk8EULsWIi9FZxhfGj4M%2FSh0eYsABdPbxQejYMpX4khm631Td83eBnHAOyZV9Y96F7S1bPX4l7UXSESsbjYQsrWdGYskqHtd1uTd8XluKMPuLWncDduEAJ1rLhrzciKMvqgcRSnN%2FiKEPRfpuj3B7Q34yi7CsgaBdhofnuu5ic6JJgYIDgNAx9QznH7Prowe4EembeRtcvgR6Ayx8HH%2Bd9MhxYiJW%2FRCEBFpDNB1lXVI2bfadVytYJmRHvCa81z2eObD80T4JWo1s0ylbjDjMCdsRMyk7NsmCwKlG9YFhZytS58Vj8%2Fm7WPjc%2Fmvash0TTNl7Mj%2Ba8j93eiMvkR3eS3QQyquJfBW5DYBBV4jXktAfBZweOqTVMcIzAwFe0gS1NB8coJmEK1z7gQaBmKQiBwJ5hIW8kJAiqIGEYGBZtKn0CWtIloNxZas6NXEGLd5yVeL%2FENHKjI5Vqh%2B1FG57TQT5JS%2FpHw%2Fa6lbeihdfWjqoLMH6OudYnqTcAxuydeOtALobb5ZbzyeWCHHgF3rKuwVveERI6YYD3DlX9fMBaf9NrMcwQOSfWNa9mm9kRttFNddRQdh74mxtVdaChlJofHbur43Js5A0cvmBY1MVi4b6qpOvMs2Eq6eQ%2BzUTVrHNa2dV%2FRKP9SJqTAKvtF4%2FwsItfZgAHGLtOs0SrD7sEetZD2MUxyXKBnzxCmRD6MS2Cer%2FgkzQEiXn8tOe0ItsR77Ei261ewyRYvy5RfHuTxxjt2ns2UnsbxqWKb6W4hZufEa6QEwhIfIHPYfe0ZTQZcyiYhF%2BOQkRKrLeKL7kdpDKFGhfZdw9pfMR33ojvzIu5buT4dK1r3lpb2Jpnr2i6LXJhgvUwWL%2BIMC4hEbfJQfer3foOEcFpfEflAY24tUE5riM%2FmTiKOYqJbgSmNMW9cJWi07EzRhBXgoc72Fd7Q3yY9gg%2BZhfDhzmFD8%2FQFp52a2rAP%2FMbJTS15XAT8u6hLb3kTJedb%2B47w%2Bk7b4SXx2j5cq6bPpSVm87jR2r26JEadGJkA2Znp25Dr4UAw35HBNh9BMyGCHgjcodm87dbXf01f15at%2F8D) -1. [Sample Branching Workflow](https://viewer.diagrams.net/?highlight=0000ff&edit=_blank&layers=1&nav=1#R7Vzdc9o4EP9rPHP3QMff2I8JhLYzl7vO5W7S9k3YMrgxliuLEPrXV7Ilf4NNwJhJeAF7Ja3W%2B9tda1cCSZusXj5iEC3vkQsDSZXdF0mbSqqq6PaYfjHKNqXYspoSFth3U5KcEx78X5CPFNS178KY01ISQSggflQmOigMoUNKNIAx2pS7eShwS4QILGCN8OCAoE599F2yTKmWIef0T9BfLMXMisxbVkB05oR4CVy0KZC0O0mbYIRIerV6mcCAKa%2Bsl9mO1kwwDEPSZcBPH1kPNzb%2BNP%2F0%2FfN38v8%2F44%2FGSFE5Ps8gWPNH5uKSrdABRuvQhYyNLGm3m6VP4EMEHNa6oahT2pKsAnqn0Mu6WFzSZ4gJfCmQuJgfIVpBgre0i2i10xHcZHRLS%2B83OQC6wbkuC8rXNJMDz0FfZKxzvdALrpoD1GSoNS09gFVEFaTKjwg%2FeQFFllkXpp9%2Ff7lPNOA8UeOIa9qkSiBllYHAX4T02qEqg5gSmKp8aoM3vGHluy4bfoth7P8C84QVwyJCfkiShzVuJWPKeK0JilMvYqw9FJIZWPkB0%2BV%2FYIlWgFO5qykmY5sBfCIE7QqCtlJDUB3LdQSFr5weQL1u5jNZsmcSFe3Gku5UyZIlayqIqnR7ewByAfTIyXHjCBnyThxPjptmlXAzjDpuTbCNe4PNaIhOZkC4RkrwmD%2FXSDSMUlXe0A6KHr3kjfRqwb4ntBP251TpWDCkAqY80x4Xgr6iD4e%2BXkffPqfT2idAX6XoJ7BXDOARMAjYYiJ5Vz%2BxSA7YOmIJwiRqJy3pZHN81FSSLjvbiBoB5TrbwDl7M4zofYSRQ4kXb4HqYBZoqnULVJpMUOvLBJXsGeo2iILjzIKzCfyj2EyW0Hli9orWzCPuQczWELlFMfYnnfA%2Bd5Y5BqGzlFgAEL1mEJA1Zh2U0tDexJmixFtjCjgzFLoY63O2CabPl0zInv%2FLv0wJIKYuQPXvecnnWUB4XMJQCOAzcVYQL5gYEwENIonfJCaeNBbkkqn3s7g3hc8wQFGfgn5m%2BiBLmJiELxQnBKJZmxf4NG3L5M6fyElU7e4VjhKZF3aOlzHB6AlOUECDrjYNUciCo0eVVCF1jatNuVD7klvtZcldjpzjhhW32RA5s3y1h9BZT5pqEC2oHqIj1JEl%2FvzlJhVz6yY1qUZZUU2LHFUIWnrFGOO%2BFKVo7YqCoXvDyhm5jdbMWtQntE5GyNaVlOmMRYh0UQCDecJfWDsjuQv4wIVAmCzRAoUguMupt%2FDFJ18Zgw8Gv%2FvGhWLX0xfBm91s%2BU3R4SRV8zxPdZyad9IW15ybBktQnTV%2B3mMd%2B%2B2PPcReDypAbzS4iKBhGADiP5cLQ03WwGf4whZZhbWN%2FsEom17F82K0xg7ko4qFnDZGNU4E0PBKapwS68ye%2BxiDbcim35HBuga0XL3JYC11rplvxWAVc1wys2qW39VeKZ%2BKwSpKN4OlBgS2hW48bdkncWUmWz5QtPIAepHKcGL%2FaUoq3o%2F%2FeB40dwT8sT2X5WP9JzXMPT2t8WU5mlK1wte%2BGuwqo3O%2FGsQSsyFdpqx5gQXHkJSSiTXxRtbuDDmOQNiYhDip5bAEBC%2Fmf8hpGiG%2B%2FkxYyEmm4nHXYF2J8A7RWCkWFhrSGVlLiPAq8RDRtuF2wBr1xGbpRQAJTbBGVGDHDxf1kSwjGfl0pRvykbKYL2khNJ%2BOPdpfjEz8Pk1r3TLXbOAcOE%2BLZPk8qqhD1a1UE6pu8wtDKMX14ygAXCF%2BGPhiJi9AgFSmr1cAKultCtD%2BLKxl26hbyfOAnZKWhKIlZemcdpmq8LiWGnlvJSpzd4XqAMfJfSd3H1Xe4UGUEVhFSaOmMbS4S1XJZQ7Vmry819NKzVVnU9v9TXRpdLlSY5PXiQ7NjidaW3xPLrifXPBAMbzJCbPHrvhhve5Vq928Ry8cyunGHWoblI0fxbvKREWt78iHu63pamjsTqPPFRTV8iJEoFAssZxzH2ncJV29gsVfaEOD1bTpdwWrGSx7aLDMK1idwVLUgdGyri%2BtA9Ayhkary67AFS3e2Roaresaozta2enewdC6LjIOQEsfGq0OZ5RfjxavRZ8MLVHCPhdaVrXmO3S6ZVlXuA6Aa%2BiEy7KvcB0A19Apl6KYdXhad%2B1%2BrFeR6MHr%2BnnHvxCKuCJ%2FQEK2HBJ2JLSMLtUu3n4t3rC9P74TyG7z7b%2FkbpvdVfcyyxuRr93OvLR9RWEb6Sbbno4ib27dgOy8s3jcQeumXbtrCNgVAgZP5O0u5weueF1MKm%2F3Wnh5e3gNnczbvZZe3hxeg6fzdq%2FFl7eH19AJfXbo%2FHpm4V2dWSj%2FOOg9n1sQrdrgx4cU8YcMfQTP7KT0qYJndsD6bAgZl1avURSjjs%2FZCgD9JPKvLSyc%2BWB%2BawFAkfnKsbUCIFLu01UAOh%2B%2B73gk%2BPjD94p2jsP0co%2BL9bcYvwYvYMpdCs79%2FPqBR5lCYPlWiis7y5fH%2FmrizIGqNfxkb%2F1L%2BQmEXDVTvWJ%2FXX8CMdJeG%2FDaIxK9zf%2BvKe2e%2F%2BuVdvcb) diff --git a/assets/branching-diagram.png b/assets/branching-diagram.png deleted file mode 100644 index 3d404987d9..0000000000 Binary files a/assets/branching-diagram.png and /dev/null differ diff --git a/assets/sample-workflow.png b/assets/sample-workflow.png deleted file mode 100644 index bb9e567e7f..0000000000 Binary files a/assets/sample-workflow.png and /dev/null differ diff --git a/browser-versions.json b/browser-versions.json index 3152d13386..54fa8578db 100644 --- a/browser-versions.json +++ b/browser-versions.json @@ -1,5 +1,5 @@ { - "chrome:beta": "105.0.5195.28", - "chrome:stable": "104.0.5112.101", + "chrome:beta": "106.0.5249.30", + "chrome:stable": "105.0.5195.125", "chrome:minimum": "64.0.3282.0" } diff --git a/cli/types/cypress.d.ts b/cli/types/cypress.d.ts index d5bec83594..3087e4074e 100644 --- a/cli/types/cypress.d.ts +++ b/cli/types/cypress.d.ts @@ -641,6 +641,12 @@ declare namespace Cypress { */ off: Actions + /** + * Used to import dependencies within the cy.origin() callback + * @see https://on.cypress.io/origin + */ + require: (id: string) => any + /** * Trigger action * @private @@ -3008,6 +3014,7 @@ declare namespace Cypress { // Internal or Unlisted at server/lib/config_options namespace: string projectRoot: string + repoRoot: string | null devServerPublicPathRoute: string cypressBinaryRoot: string } @@ -3081,18 +3088,21 @@ declare namespace Cypress { type DevServerFn = (cypressDevServerConfig: DevServerConfig, devServerConfig: ComponentDevServerOpts) => ResolvedDevServerConfig | Promise + type ConfigHandler = T + | (() => T | Promise) + type DevServerConfigOptions = { bundler: 'webpack' framework: 'react' | 'vue' | 'vue-cli' | 'nuxt' | 'create-react-app' | 'next' | 'svelte' - webpackConfig?: PickConfigOpt<'webpackConfig'> + webpackConfig?: ConfigHandler> } | { bundler: 'vite' framework: 'react' | 'vue' | 'svelte' - viteConfig?: Omit, undefined>, 'base' | 'root'> + viteConfig?: ConfigHandler, undefined>, 'base' | 'root'>> } | { bundler: 'webpack', framework: 'angular', - webpackConfig?: PickConfigOpt<'webpackConfig'>, + webpackConfig?: ConfigHandler>, options?: { projectConfig: AngularDevServerProjectConfig } diff --git a/cypress-prioritization-and-triage.md b/cypress-prioritization-and-triage.md new file mode 100644 index 0000000000..43cd974135 --- /dev/null +++ b/cypress-prioritization-and-triage.md @@ -0,0 +1,139 @@ +# The Cypress App Prioritization and Triage Methodology + +At Cypress, we love our open source community. We work every day to grow our partnership with the community through open, honest, and straightforward communication about our processes and plans for the platform. The goal of this document is to provide resources that show our plans for the future and serve as a guide to our processes around handling issues that are raised by the open source community. + +## Table of Contents + +- [The Cypress App Priorities](#the-cypress-app-priorities) +- [The Cypress App Roadmap](#the-cypress-app-roadmap) +- [The Cypress App Issue Triage](#the-cypress-app-issue-triage) + - [The Cypress App Triage Process](#the-cypress-app-triage-process) + - [The Power of a Great Ticket](#the-power-of-a-great-ticket) +- [How We Prioritize Issues](#how-we-prioritize-issues) + - [Cypress Relative Priority Score](#cypress-relative-priority-score) + - [Cypress Relative Priority to Effort Score](#cypress-relative-priority-to-effort-score) +- [FAQs](#faqs) + - [Why Isn't Anyone Working on My Issue?](#why-isnt-anyone-working-on-my-issue) + - [Why Did You Close My Ticket?](#why-did-you-close-my-ticket) + - [Backpatching Strategy/Limitations](#backpatching-strategylimitations) +- [How You Can Help](#how-you-can-help) + + +## The Cypress App Priorities + +The Cypress app is constantly looking to improve and grow our testing platform to meet the ever-growing needs of the testing world. Like any software platform, we must balance research, development, and maintenance against real-world resource constraints. We feel that transparency about our future plans will help us grow a stronger relationship with end users who understand that all choices involve trade-offs. + +## The Cypress App Roadmap + +[The Cypress App Priorities](https://github.com/orgs/cypress-io/projects/13/views/1) board shows the high-level roadmap at Cypress. + +The board flows from left to right as a project moves from the ideation and feasibility phase all the way to General Availability (GA) release. + +Here is a guide to what each column on the board represents: + +| Column Name | Description | + | :------------------------------------ | :---------------------- | + | **Under Consideration** | These tickets are currently being discussed for future work. We are investigating the complexity of the change, the amount of resources necessary to complete it, and how it aligns with other goals for the platform. It is important to note that **not all** items in this column make their way into our scheduled work. It is possible that, upon investigation, a ticket falls in priority due to other goals or constraints. | +| **Planned** | These are the tickets we are planning to work on, but the work has not yet started. | +| **In Progress** | These tickets are actively being worked on. | +| **Experimental** | If a ticket involves a substantial refactoring of the codebase, is large in scope or is a complex feature, we often release them in a turned-off state. End users can opt in to experiment with these changes via feature flags. Work is still ongoing, but we feel it is important to get this feature in users' hands. Feedback is always welcome, but it is especially helpful during this phase of the development cycle. Not all issues are released under the experimental flag before GA. | +| **Released** | Once an issue has been fully implemented, tested, and bundled into an official release it moves to this column. Features in this column are no longer experimental, feature flags are removed and default behaviors are implemented. | + +## The Cypress App Issue Triage + +Whenever an issue is created in the [Cypress repo](https://github.com/cypress-io/cypress/) it is added to the [Cypress App Triage Board](https://github.com/orgs/cypress-io/projects/9/views/1). This board represents all issues we are actively working to investigate and reproduce before routing them to the appropriate team for [prioritization](#how-we-prioritize-issues). Prioritization does not necessarily mean that an issue will be worked on - priority scoring simply helps us create a relative ordering of potential work that is ranked according to standards we have defined as most important to Cypress and the community. + +### The Cypress App Triage Process + +At Cypress, we use two-week sprints. During each sprint, a rotating group of developers is assigned to the triage team. Their responsibilities are only to focus on triaging issues entered into the [Cypress repo](https://github.com/cypress-io/cypress/). Each issue is assigned to a team member for analysis and assessment and follows this general path: + +- **Assessment** - The goal of this step is to do a high-level analysis of the problem. If the issue is clear and the probable impact of the ticket is large in both scope and severity and affecting many users, we will internally escalate the issue and work to get it resolved as quickly as possible. During this phase we will often try and suggest workarounds that may help you get around the issue in the short term while we investigate further. This may not always be possible, but we will try our best to make sure you are not totally impeded. + +- **Reproduction** - The goal of this phase is to fully understand the issue described in the ticket and, most importantly, replicate the issue. The reason issue replication is so important to us at Cypress is that we believe our teams' development time is best spent on issues we can verify. In order to know if any solution solves a specific problem, we first need to be able to reliably reproduce it. A vast majority of our time in triage is spent trying to reproduce the issues our users are encountering. With a huge spectrum of users using countless permutations of hardware, operating systems, versions of Cypress, Node.js, CI configurations, unique web applications they are testing, and more, it can be very challenging to narrow down problems into something that is ready for prioritization by a team. This is where our end users can help us the most. The easier it is for us to recreate your issue, the sooner we can route it to our teams for prioritization. The best way to provide a reproducible example of your problem is to fork our [cypress-test-tiny repo](https://github.com/cypress-io/cypress-test-tiny) and replicate the issue there. At a minimum we will need a [short, self contained, correct example](http://sscce.org/) in order to assist in most cases. + +- **Routing** - Once we have clarified any questions we have on a submitted ticket and we are able to replicate the problem internally, the ticket is ready to be routed to the appropriate team at Cypress. + +- **Prioritization** - Teams meet regularly to review tickets that have been routed to them via triage. They evaluate each ticket based on a number of criteria outlined in our [prioritization rubric](#prioritization-rubric). Each dimension of our prioritization rubric carries a weight. The following equation is then used to give us a **relative priority**. The relative priority score is then divided by the estimated effort to address the ticket to give us a **priority-to-effort** score which we then use to determine which tickets are the highest priority. +**Important note - These priorities do not dictate when a team will be able to start work. This simply gives teams the data they need to make informed prioritization choices.** + +- **Resolution and Verification** - Once an issue has been picked up for work, it will have the label **Stage: Under Development** attached. Developers will then begin work on the issue. Sometimes the scope of the work will be greater than the ticket submitted, and a parent ticket will be created to encapsulate the entire scope of the work. A link to the original ticket will be created in the new ticket. + +- **Release** - Once work has been finished, the ticket will be scheduled for release. If the changes are non-breaking, we generally aim to include the work in the next minor release every-other Tuesday. If the changes made to address the issue require breaking changes, the issue will be scheduled for our next major release roughly every quarter. + +### The Power of a Great Ticket + +One of the best ways to help get your ticket validated, replicated, routed and prioritized is to include as much information as possible. Our issue template will walk you through the most common information that we will need to best troubleshoot the problem. **Please do not open issues from GitHub discussion comments.** + +Here are some tips for providing a [Short, Self Contained, Correct, Example](http://sscce.org/) and our own [Troubleshooting Cypress](https://on.cypress.io/troubleshooting) guide. Another great way to assist us in replicating your issue is to fork our [cypress-test-tiny repo](https://github.com/cypress-io/cypress-test-tiny) and recreate the issue there. + +We will always need replication steps, so please include them when submitting an issue. Going back and forth to gather the basic data is all time we could be using to investigate and address the issue, so please be considerate of our developers' time and include the requested details when submitting an issue. + +## How We Prioritize Issues + +At Cypress, we use the following guidelines to help us standardize the importance of every ticket submitted. Of course there are subjective interpretations for each of these fields, but the goal is that each ticket is considered and examined thoroughly in a standardized way. Once values have been determined for each field, a total priority is calculated. It is important to note that these values are **a guide** to make informed decisions around what issues bring the most value to the community and Cypress as an organization. They are relative and fuzzy and not to be treated as gospel. It is also important to understand that these values may change as future factors and circumstances change. + +### Prioritization Rubric + +Here are the criteria we use to gauge relative issue priority: + +| Criteria | Weight | Description | +|:---------------------|:---------:|:-----------------------------------------------------------------------------------| +| Scope | 0.7 | How many users does this affect? | +| Severity | 1.0 | What does the problem prevent users from doing? Is it an edge case? A primary test flow? A minor annoyance? | +| Visibility | 0.5 | Is this an important issue to our community? Is there a lot of discussion around it? | +| Does Workaround Exist | 0.4 | Does a work around exist that is reasonable? | +| Regression | 0.7 | Did this previously work? How long ago did it last work? Was this a regression within this last (current) major version? | +| Cypress Priority | 0.75 | Does Cypress have a vested interest in resolving this issue? For example, does it ease the support burden for our staff? Is this part of a corporate milestone or objective? | +| Effort | 0.75 | How much effort is needed to resolve the issue? Estimates are for a single developer being assigned to the issue. | + +### Cypress Relative Priority Score + +The formula for calculating the Cypress Relative Priority Score (CRPS) is the weighted sum of our priority criteria: + +$$ \text{Cypress Relative Priority Score} = {{(Scope \times 0.7) + (Severity \times 1.0) + (Visibility \times 0.5) + (WorkAround \times 0.4) + (Regression \times 0.7) + (CypressPriority \times 0.75)}} $$ + +### Cypress Relative Priority to Effort Score + +It is important to remember that just because an issue has a high CRPS, that doesn't mean it is necessarily the best way to allocate limited resources. To determine which gives us the greatest bang for the proverbial buck, we weigh CRPS versus the effort required to address the issue. + +$$ \text{Cypress Relative Priority to Effort Score} = {\text{Cypress Relative Priority Score} \over {Effort}} $$ + +**Cypress Relative Priority to Effort Score** gives us a metric that better represents the effort-to-reward ratio for any proposed work. + +## FAQs + +### Why isn't anyone working on my issue?! + +We understand that it can be frustrating to take time to submit an issue, only to see it sit in the backlog untouched for a long period of time. We truly wish we could take up every single issue that comes in, but given the relatively small size of our internal teams and the large and varied user base of Cypress it just isn't possible to solve every issue. Our prioritization process helps us float the most important issues to the top based on the impact vs effort ratio of any given issue. It is important to remember that, just because an issue is not being actively worked on, does not mean we are ignoring the issue; it means that we have other issues we feel are more impactful to the user base and are prioritizing those issues first. + +Even when our internal developers cannot work on your issue, that does not mean all hope is lost! Being an open source project means you can be part of the solution. We love when our community commits code and want to encourage everyone to feel empowered to contribute and make the product we all love and use even better. We have guides on [how to contribute](https://github.com/cypress-io/cypress/blob/develop/CONTRIBUTING.md) and a very active [Discord community](https://discord.gg/cypress) which can help if you are interested in opening a PR. + +### Why did you close my ticket? + +There are a number of reasons why a ticket may be closed without any change or PR being opened. + +- **No Response From Author** - The most common reason is lack of response from the author. Our issue creation template prompts the user for many details that are vital in debugging and replicating an issue. It is not uncommon for issues to be entered with insufficient information for our teams to properly investigate an issue. We will often reach out for more details, but we do not have the bandwidth to chase down users for information. **If we do not receive a response within 7 days, we will close your ticket.** The best way to help get your issue worked on by a Cypress team member is to provide the information requested and give as much detail as possible (or, even better, a reproducible example in our [cypress-tiny repo](https://github.com/cypress-io/cypress-test-tiny)) in a timely manner. + +- **Not a bug or feature request** - Issues entered into the [Cypress repo](https://github.com/cypress-io/cypress) are for bugs and feature requests for the Cypress App only. Updates to [documentation](https://github.com/cypress-io/cypress-documentation), our [example-kitchensink app](https://github.com/cypress-io/cypress-example-kitchensink), or [another repository](https://github.com/cypress-io) should be made in the appropriate repository. +The best place for asking questions is our [Discord server](https://discord.gg/cypress) which has a very active community of folks with a diverse set of knowledge. Other available channels to explore include [Cypress GitHub discussions](https://github.com/cypress-io/cypress/discussions), [community chat](https://on.cypress.io/chat), and [Stack Overflow](https://stackoverflow.com/questions/tagged/cypress). +We also offer support via email with our [paid plans](https://www.cypress.io/pricing/). + +- **Feature request for Cypress Dashboard** - Thank you for your support as a Cypress Dashboard user! These issues are routed to our Cypress Dashboard team's ticketing system. Your customer success representative is available for follow-up and will reach out you directly via email if more information is needed. + +- **The fix or feature is not within our vision for Cypress** - There will inevitably be suggestions that will not fit within the scope of Cypress' vision for our product. We will do our best to explain why we will not be addressing this issue. + +- **It's a dupe** - The issue you have entered has already been logged by another person. We will link the appropriate ticket and mark the issue as a duplicate. + +- **Cannot reproduce ecosystem** - Another common issue that can lead to a ticket being closed is that the setup involved in reproducing the problem is complex and specific to your implementation of Cypress. As any developer can imagine, the variety of ecosystems that run Cypress are as varied as the number of flowers in the world. And not surprisingly, we do not have infrastructure setup to mimic every possible scenario. It is possible, even likely, that we are not set up to investigate your specific use case of Cypress. This does not mean that the issue is not real and that it is not important. It simply means we are not equipped to investigate it any further. We are more than happy to point you in the direction of resources that may help you dive into your problem further on your own but we will not be able to replicate your entire stack internally to properly reproduce your problem. Without a consistent reproduction of the issue, it is highly unlikely an issue will be prioritized by a team for inclusion in their sprint work. These types of issues are a fantastic opportunity for our community to contribute. By opening a PR to address an issue you are encountering that is otherwise not being worked on, you are not only helping yourself and your organization but potentially anyone else who may be encountering your issue as well but has not spoken up about it. Cypress developers are always willing to help clean and prep a PR from the community to help you get it over the line and merged into the code base. Just open a PR and we will automatically see it on our triage board! If you have questions along the way, always remember we have a very active and helpful community in [Discord](https://discord.gg/cypress). + +- **Stumped, for now** - Sometimes an author provides all the details we could ask for, is very responsive, and uses a straightforward setup - and it still stumps the Cypress devs! The reality is that there are some issues we just can't figure out because of limited resources. We love our large and active community, but in order to support it, sometimes we must move on. We understand this is not something an active issue author wants to hear, but we do not have the resources to put infinite time and energy into every single issue until it is resolved. During the course of our investigation we will attempt to understand the scope of the users being affected by the problem in the issue. If we determine this is an edge case or of low impact to effected users, we will close the issue until such a time that more information comes to light that sheds new insight into the potential root of the problem. This is another example of a great opportunity for folks in the community to give back and open a PR. Nothing makes our day better than seeing a PR from the community! Opening a PR will automatically add that issue to our triage board where a Cypress dev will help you get the PR over the line and merged into the repo for release. And remember to drop into [Discord](https://discord.gg/cypress) if you have questions or need a helping hand. + +### Backpatching Strategy/Limitations + +At Cypress, we have a roll-forward approach to support. If you are encountering an issue while using an older version of Cypress, our first step will be to verify the problem is still happening on the latest version of the app. If you are unable to upgrade, we will want to understand what blockers are keeping you from upgrading. We want to understand friction points so that we can build a tool that is easy to stay current on. As such, we will only be backpatching fixes on an ad hoc basis. We will use the [prioritization rubric](#prioritization-rubric) to assess the issue's severity/impact and we will consider the reasons that users may be blocked from upgrading to a newer version of Cypress. + +## How You Can Help + +One of the pillars of Cypress' success is our community. Without your input and support we would not be the platform we are today. We wish we had the bandwidth to address every single issue that comes in, but the reality is that there simply isn't enough time in the day for our internal teams to give every single ticket the love and attention it deserves. + +This is where we hope the community can help us. As an open source project, our issue backlogs and source code are all out in the open. Please feel empowered to search those backlogs for issues important to you and add your input. Maybe you can add a reproducible example to a ticket that needs one, or can verify a problem is also happening for you with more detail, or even better - maybe you can [contribute a fix to the repo](https://github.com/cypress-io/cypress/blob/develop/CONTRIBUTING.md)! Your input and engagement is always appreciated. diff --git a/guides/release-process.md b/guides/release-process.md index 10f52f058f..dd309fea4c 100644 --- a/guides/release-process.md +++ b/guides/release-process.md @@ -2,7 +2,7 @@ These procedures concern the release process for the Cypress binary and `cypress` npm module. -The `@cypress/`-namespaced NPM packages that live inside the [`/npm`](../npm) directory are automatically published to npm (with [`semantic-release`](https://semantic-release.gitbook.io/semantic-release/)) upon being merged into `master`. You can read more about this in [CONTRIBUTING.md](../CONTRIBUTING.md#independent-packages-ci-workflow). +The `@cypress/`-namespaced NPM packages that live inside the [`/npm`](../npm) directory are automatically published to npm (with [`semantic-release`](https://semantic-release.gitbook.io/semantic-release/)) upon being merged into `develop`. You can read more about this in [CONTRIBUTING.md](../CONTRIBUTING.md#releases). [Anyone can build the binary and npm package locally](./building-release-artifacts.md), but you can only deploy the Cypress application and publish the npm module `cypress` if you are a member of the `cypress` npm organization. @@ -68,18 +68,13 @@ of Cypress. You can see the progress of the test projects by opening the status In the following instructions, "X.Y.Z" is used to denote the [next version of Cypress being published](./next-version.md). -1. `develop` should contain all of the changes made in `master`. However, this occasionally may not be the case. - - Ensure that `master` does not have any additional commits that are not on `develop`. - - Ensure all auto-generated pull requests designed to merge master into develop have been successfully merged. - - If there are additional commits necessary to merge `master` to `develop`, submit, get approvals on, and merge a new PR +1. Confirm that every issue labeled [stage: pending release](https://github.com/cypress-io/cypress/issues?q=label%3A%22stage%3A+pending+release%22+is%3Aclosed) has a ZenHub release set. **Tip:** there is a command in [`release-automations`](https://github.com/cypress-io/release-automations)'s `issues-in-release` tool to list and check such issues. Without a ZenHub release issues will not be included in the right changelog. Also ensure that every closed issue in any obsolete releases are moved to the appropriate release in ZehHub. For example, if the open releases are 9.5.5 and 9.6.0, the current release is 9.6.0, then all closed issues marked as 9.5.5 should be moved to 9.6.0. Ensure that there are no commits on `develop` since the last release that are user facing and aren't marked with the current release. -2. Confirm that every issue labeled [stage: pending release](https://github.com/cypress-io/cypress/issues?q=label%3A%22stage%3A+pending+release%22+is%3Aclosed) has a ZenHub release set. **Tip:** there is a command in [`release-automations`](https://github.com/cypress-io/release-automations)'s `issues-in-release` tool to list and check such issues. Without a ZenHub release issues will not be included in the right changelog. Also ensure that every closed issue in any obsolete releases are moved to the appropriate release in ZehHub. For example, if the open releases are 9.5.5 and 9.6.0, the current release is 9.6.0, then all closed issues marked as 9.5.5 should be moved to 9.6.0. Ensure that there are no commits on `develop` since the last release that are user facing and aren't marked with the current release. +2. If there is a new [`cypress-example-kitchensink`](https://github.com/cypress-io/cypress-example-kitchensink/releases) version, update the corresponding dependency in [`packages/example`](../packages/example) to that new version. -3. If there is a new [`cypress-example-kitchensink`](https://github.com/cypress-io/cypress-example-kitchensink/releases) version, update the corresponding dependency in [`packages/example`](../packages/example) to that new version. +3. Once the `develop` branch is passing for all test projects with the new changes and the `linux-x64` binary is present at `https://cdn.cypress.io/beta/binary/X.Y.Z/linux-x64/develop-/cypress.zip`, and the `linux-x64` cypress npm package is present at `https://cdn.cypress.io/beta/npm/X.Y.Z/linux-x64/develop-/cypress.tgz`, publishing can proceed. -4. Once the `develop` branch is passing for all test projects with the new changes and the `linux-x64` binary is present at `https://cdn.cypress.io/beta/binary/X.Y.Z/linux-x64/develop-/cypress.zip`, and the `linux-x64` cypress npm package is present at `https://cdn.cypress.io/beta/npm/X.Y.Z/linux-x64/develop-/cypress.tgz`, publishing can proceed. - -5. Install and test the pre-release version to make sure everything is working. +4. Install and test the pre-release version to make sure everything is working. - Get the pre-release version that matches your system from the latest develop commit. - Install the new version: `npm install -g ` - Run a quick, manual smoke test: @@ -89,9 +84,9 @@ In the following instructions, "X.Y.Z" is used to denote the [next version of Cy - [cypress-realworld-app](https://github.com/cypress-io/cypress-realworld-app) uses yarn and represents a typical consumer implementation. - Optionally, do more thorough tests, for example test the new version of Cypress against the Cypress dashboard repo. -6. Log into AWS SSO with `aws sso login --profile `. If you have setup your credentials under a different profile than `prod`, be sure to set the `AWS_PROFILE` environment variable to that profile name for the remaining steps. For example, if you are using `production` instead of `prod`, do `export AWS_PROFILE=production`. +5. Log into AWS SSO with `aws sso login --profile `. If you have setup your credentials under a different profile than `prod`, be sure to set the `AWS_PROFILE` environment variable to that profile name for the remaining steps. For example, if you are using `production` instead of `prod`, do `export AWS_PROFILE=production`. -7. Use the `prepare-release-artifacts` script (Mac/Linux only) to prepare the latest commit to a stable release. When you run this script, the following happens: +6. Use the `prepare-release-artifacts` script (Mac/Linux only) to prepare the latest commit to a stable release. When you run this script, the following happens: * the binaries for `` are moved from `beta` to the `desktop` folder for `` in S3 * the Cloudflare cache for this version is purged * the pre-prod `cypress.tgz` NPM package is converted to a stable NPM package ready for release @@ -102,22 +97,22 @@ In the following instructions, "X.Y.Z" is used to denote the [next version of Cy You can pass `--dry-run` to see the commands this would run under the hood. -8. Validate you are logged in to `npm` with `npm whoami`. Otherwise log in with `npm login`. +7. Validate you are logged in to `npm` with `npm whoami`. Otherwise log in with `npm login`. -9. Publish the generated npm package under the `dev` tag, using your personal npm account. +8. Publish the generated npm package under the `dev` tag, using your personal npm account. ```shell npm publish /tmp/cypress-prod.tgz --tag dev ``` -10. Double-check that the new version has been published under the `dev` tag using `npm info cypress` or [available-versions](https://github.com/bahmutov/available-versions). `latest` should still point to the previous version. Example output: +9. Double-check that the new version has been published under the `dev` tag using `npm info cypress` or [available-versions](https://github.com/bahmutov/available-versions). `latest` should still point to the previous version. Example output: ```shell dist-tags: dev: 3.4.0 latest: 3.3.2 ``` -11. Test `cypress@X.Y.Z` to make sure everything is working. +10. Test `cypress@X.Y.Z` to make sure everything is working. - Install the new version: `npm install -g cypress@X.Y.Z` - Run a quick, manual smoke test: - `cypress open` @@ -126,7 +121,7 @@ In the following instructions, "X.Y.Z" is used to denote the [next version of Cy - [cypress-realworld-app](https://github.com/cypress-io/cypress-realworld-app) uses yarn and represents a typical consumer implementation. - Optionally, do more thorough tests, for example test the new version of Cypress against the Cypress dashboard repo. -12. Create or review the release-specific documentation and changelog in [cypress-documentation](https://github.com/cypress-io/cypress-documentation). If there is not already a release-specific PR open, create one. This PR must be merged, built, and deployed before moving to the next step. +11. Create or review the release-specific documentation and changelog in [cypress-documentation](https://github.com/cypress-io/cypress-documentation). If there is not already a release-specific PR open, create one. This PR must be merged, built, and deployed before moving to the next step. - Use [`release-automations`](https://github.com/cypress-io/release-automations)'s `issues-in-release` tool to generate a starting point for the changelog, based off of ZenHub: ```shell cd packages/issues-in-release @@ -136,33 +131,35 @@ In the following instructions, "X.Y.Z" is used to denote the [next version of Cy - Merge any release-specific documentation changes into the main release PR. - You can view the doc's [branch deploy preview](https://github.com/cypress-io/cypress-documentation/blob/master/CONTRIBUTING.md#pull-requests) by clicking 'Details' on the PR's `netlify-cypress-docs/deploy-preview` GitHub status check. -13. Create a PR for a new docker image in [`cypress-docker-images`](https://github.com/cypress-io/cypress-docker-images) under `included` for the new cypress version. Note: we use the base image with the Node version matching the bundled Node version. Instructions for updating `cypress-docker-images` can be found [here](https://github.com/cypress-io/cypress-docker-images/blob/master/CONTRIBUTING.md#add-new-included-image). Ensure the docker image is reviewed and has passing tests before preceeding. +12. Create a PR for a new docker image in [`cypress-docker-images`](https://github.com/cypress-io/cypress-docker-images) under `included` for the new cypress version. Note: we use the base image with the Node version matching the bundled Node version. Instructions for updating `cypress-docker-images` can be found [here](https://github.com/cypress-io/cypress-docker-images/blob/master/CONTRIBUTING.md#add-new-included-image). Ensure the docker image is reviewed and has passing tests before preceeding. -14. Make the new npm version the "latest" version by updating the dist-tag `latest` to point to the new version: +13. Make the new npm version the "latest" version by updating the dist-tag `latest` to point to the new version: ```shell npm dist-tag add cypress@X.Y.Z ``` -15. Run `binary-release` to update the [download server's manifest](https://download.cypress.io/desktop.json). This will also ensure the binary for the version is downloadable for each system. +14. Run `binary-release` to update the [download server's manifest](https://download.cypress.io/desktop.json). This will also ensure the binary for the version is downloadable for each system. ```shell yarn binary-release --version X.Y.Z ``` -16. If needed, push out any updated changes to the links manifest to [`on.cypress.io`](https://github.com/cypress-io/cypress-services/tree/develop/packages/on). +15. If needed, push out any updated changes to the links manifest to [`on.cypress.io`](https://github.com/cypress-io/cypress-services/tree/develop/packages/on). -17. Merge the new docker image PR created in step 13 to release the image. +16. Merge the new docker image PR created in step 13 to release the image. -18. If needed, deploy the updated [`cypress-example-kitchensink`][cypress-example-kitchensink] to `example.cypress.io` by following [these instructions under "Deployment"](../packages/example/README.md). +17. If needed, deploy the updated [`cypress-example-kitchensink`][cypress-example-kitchensink] to `example.cypress.io` by following [these instructions under "Deployment"](../packages/example/README.md). -19. Update the releases in [ZenHub](https://app.zenhub.com/workspaces/test-runner-5c3ea3baeb1e75374f7b0708/reports/release): +18. Update the releases in [ZenHub](https://app.zenhub.com/workspaces/test-runner-5c3ea3baeb1e75374f7b0708/reports/release): - Close the current release in ZenHub. - Create a new patch release (and a new minor release, if this is a minor release) in ZenHub, and schedule them both to be completed 2 weeks from the current date. - Move all issues that are still open from the current release to the appropriate future release. -20. Bump `version` in [`package.json`](package.json), submit, get approvals on, and merge a new PR for the change. After it merges: +19. Bump `version` in [`package.json`](package.json), submit, get approvals on, and merge a new PR for the change. + +20. After the PR to bump the [`package.json`](package.json) version merges: ```shell git checkout develop @@ -173,19 +170,17 @@ In the following instructions, "X.Y.Z" is used to denote the [next version of Cy git push origin vX.Y.Z ``` -21. Submit, get approvals on, and merge a new PR that merges `develop` to `master`. **Important**: make sure to use a merge commit, not a squash merge. +21. Create a new [GitHub release](https://github.com/cypress-io/cypress/releases). Choose the tag you created previously and add contents to match previous releases. -22. Create a new [GitHub release](https://github.com/cypress-io/cypress/releases). Choose the tag you created previously and add contents to match previous releases. - -23. Inside of [cypress-io/release-automations][release-automations], run the following to add a comment to each GH issue that has been resolved with the new published version: +22. Inside of [cypress-io/release-automations][release-automations], run the following to add a comment to each GH issue that has been resolved with the new published version: ```shell cd packages/issues-in-release && npm run do:comment -- --release X.Y.Z ``` -24. Confirm there are no issues with the label [stage: pending release](https://github.com/cypress-io/cypress/issues?q=label%3A%22stage%3A+pending+release%22+is%3Aclosed) left +23. Confirm there are no issues with the label [stage: pending release](https://github.com/cypress-io/cypress/issues?q=label%3A%22stage%3A+pending+release%22+is%3Aclosed) left -25. Check all `cypress-test-*` and `cypress-example-*` repositories, and if there is a branch named `x.y.z` for testing the features or fixes from the newly published version `x.y.z`, update that branch to refer to the newly published NPM version in `package.json`. Then, get the changes approved and merged into that project's `master`. For projects without a `x.y.z` branch, you can go to the Renovate dependency issue and check the box next to `Update dependency cypress to X.Y.Z`. It will automatically create a PR. Once it passes, you can merge it. Try updating at least the following projects: +24. Check all `cypress-test-*` and `cypress-example-*` repositories, and if there is a branch named `x.y.z` for testing the features or fixes from the newly published version `x.y.z`, update that branch to refer to the newly published NPM version in `package.json`. Then, get the changes approved and merged into that project's main branch. For projects without a `x.y.z` branch, you can go to the Renovate dependency issue and check the box next to `Update dependency cypress to X.Y.Z`. It will automatically create a PR. Once it passes, you can merge it. Try updating at least the following projects: - [cypress-example-todomvc](https://github.com/cypress-io/cypress-example-todomvc/issues/99) - [cypress-example-todomvc-redux](https://github.com/cypress-io/cypress-example-todomvc-redux/issues/1) - [cypress-realworld-app](https://github.com/cypress-io/cypress-realworld-app/issues/41) diff --git a/guides/testing-other-projects.md b/guides/testing-other-projects.md index 43a3e5edd1..4864ecc0d0 100644 --- a/guides/testing-other-projects.md +++ b/guides/testing-other-projects.md @@ -1,6 +1,6 @@ # Testing other projects -In `develop`, `master`, and any other branch configured in [the CircleCI config](../.circleci/config.yml), the Cypress binary and npm package are built and uploaded to `cdn.cypress.io`. Then, tests are run, using a variety of real-world example repositories. +In `develop` and any other branch configured in [the CircleCI config](../.circleci/config.yml), the Cypress binary and npm package are built and uploaded to `cdn.cypress.io`. Then, tests are run, using a variety of real-world example repositories. Two main strategies are used to spawn these test projects: diff --git a/npm/README.md b/npm/README.md index 44d7a303b9..c9fdf73222 100644 --- a/npm/README.md +++ b/npm/README.md @@ -2,5 +2,5 @@ This directory contains packages that are both used internally inside the Cypress monorepo [`packages`](../packages) and also published independently on npm under the Cypress organization using the `@cypress` prefix. For example, `vite-dev-server` is published as `@cypress/vite-dev-server`. -These are automatically released based on [Semantic Version](https://semver.org) commit message prefixes (`feat`, `chore` etc). A package is automatically released when changes are merged into master. You can read more about this process in [`CONTRIBUTING`](../CONTRIBUTING.md#committing-code). +These are automatically released based on [Semantic Version](https://semver.org) commit message prefixes (`feat`, `chore` etc). A package is automatically released when changes are merged into `develop`. You can read more about this process in [`CONTRIBUTING`](../CONTRIBUTING.md#committing-code). diff --git a/npm/angular/.releaserc.js b/npm/angular/.releaserc.js index 7b15992ed7..0ee9f3f0b5 100644 --- a/npm/angular/.releaserc.js +++ b/npm/angular/.releaserc.js @@ -1,6 +1,3 @@ module.exports = { ...require('../../.releaserc.base'), - branches: [ - { name: 'master', channel: 'latest' }, - ], } diff --git a/npm/angular/README.md b/npm/angular/README.md index ef4d366a44..8537799fab 100644 --- a/npm/angular/README.md +++ b/npm/angular/README.md @@ -78,7 +78,7 @@ Run `yarn build` to compile and sync packages to the `cypress` cli package. ## License -[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/master/LICENSE) +[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/develop/LICENSE) This project is licensed under the terms of the [MIT license](/LICENSE). diff --git a/npm/angular/package.json b/npm/angular/package.json index 44d04e3989..72cc5afaec 100644 --- a/npm/angular/package.json +++ b/npm/angular/package.json @@ -34,7 +34,7 @@ "type": "git", "url": "https://github.com/cypress-io/cypress.git" }, - "homepage": "https://github.com/cypress-io/cypress/blob/master/npm/angular/#readme", + "homepage": "https://github.com/cypress-io/cypress/blob/develop/npm/angular/#readme", "author": "Jordan Powell", "bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A%20%40cypress%2Fangular&template=1-bug-report.md&title=", "keywords": [ diff --git a/npm/create-cypress-tests/package.json b/npm/create-cypress-tests/package.json index 7ecf5f176e..d6b0456c8f 100644 --- a/npm/create-cypress-tests/package.json +++ b/npm/create-cypress-tests/package.json @@ -52,5 +52,5 @@ }, "license": "MIT", "repository": "https://github.com/cypress-io/cypress.git", - "homepage": "https://github.com/cypress-io/cypress/blob/master/npm/create-cypress-tests/#readme" + "homepage": "https://github.com/cypress-io/cypress/blob/develop/npm/create-cypress-tests/#readme" } diff --git a/npm/cypress-schematic/.releaserc.js b/npm/cypress-schematic/.releaserc.js index 7b15992ed7..0ee9f3f0b5 100644 --- a/npm/cypress-schematic/.releaserc.js +++ b/npm/cypress-schematic/.releaserc.js @@ -1,6 +1,3 @@ module.exports = { ...require('../../.releaserc.base'), - branches: [ - { name: 'master', channel: 'latest' }, - ], } diff --git a/npm/cypress-schematic/package.json b/npm/cypress-schematic/package.json index 85b9e64250..e1e8341e5e 100644 --- a/npm/cypress-schematic/package.json +++ b/npm/cypress-schematic/package.json @@ -35,7 +35,7 @@ "type": "git", "url": "https://github.com/cypress-io/cypress.git" }, - "homepage": "https://github.com/cypress-io/cypress/tree/master/npm/cypress-schematic#readme", + "homepage": "https://github.com/cypress-io/cypress/tree/develop/npm/cypress-schematic#readme", "author": "Cypress DX Team", "bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A%20%40cypress%2Fcypress-schematics&template=1-bug-report.md&title=", "keywords": [ diff --git a/npm/eslint-plugin-dev/README.md b/npm/eslint-plugin-dev/README.md index 2672a9fe80..dec57fdfa7 100644 --- a/npm/eslint-plugin-dev/README.md +++ b/npm/eslint-plugin-dev/README.md @@ -3,7 +3,7 @@

[Internal] Cypress Developer ESLint Plugin

- +

Common ESLint rules shared by Cypress packages.

diff --git a/npm/eslint-plugin-dev/package.json b/npm/eslint-plugin-dev/package.json index f01cdbb88b..af268acbf7 100644 --- a/npm/eslint-plugin-dev/package.json +++ b/npm/eslint-plugin-dev/package.json @@ -44,7 +44,7 @@ "type": "git", "url": "https://github.com/cypress-io/cypress.git" }, - "homepage": "https://github.com/cypress-io/cypress/tree/master/npm/eslint-plugin-dev#readme", + "homepage": "https://github.com/cypress-io/cypress/tree/develop/npm/eslint-plugin-dev#readme", "bugs": { "url": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A%20%40cypress%2Feslint-plugin-dev&template=bug-report.md" }, diff --git a/npm/mount-utils/package.json b/npm/mount-utils/package.json index 04747ef6a3..b171f80da7 100644 --- a/npm/mount-utils/package.json +++ b/npm/mount-utils/package.json @@ -27,7 +27,7 @@ "type": "git", "url": "https://github.com/cypress-io/cypress.git" }, - "homepage": "https://github.com/cypress-io/cypress/tree/master/npm/mount-utils#readme", + "homepage": "https://github.com/cypress-io/cypress/tree/develop/npm/mount-utils#readme", "bugs": "https://github.com/cypress-io/cypress/issues/new?template=1-bug-report.md", "publishConfig": { "access": "public" diff --git a/npm/react/.releaserc.js b/npm/react/.releaserc.js index 7b15992ed7..0ee9f3f0b5 100644 --- a/npm/react/.releaserc.js +++ b/npm/react/.releaserc.js @@ -1,6 +1,3 @@ module.exports = { ...require('../../.releaserc.base'), - branches: [ - { name: 'master', channel: 'latest' }, - ], } diff --git a/npm/react/README.md b/npm/react/README.md index c99ab05b6f..23582443e4 100644 --- a/npm/react/README.md +++ b/npm/react/README.md @@ -112,7 +112,7 @@ Run `yarn test` to execute headless Cypress tests. ## License -[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/master/LICENSE) +[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/develop/LICENSE) This project is licensed under the terms of the [MIT license](/LICENSE). diff --git a/npm/react/package.json b/npm/react/package.json index 32ef2e880c..2447db256c 100644 --- a/npm/react/package.json +++ b/npm/react/package.json @@ -45,7 +45,7 @@ "type": "git", "url": "https://github.com/cypress-io/cypress.git" }, - "homepage": "https://github.com/cypress-io/cypress/blob/master/npm/react/#readme", + "homepage": "https://github.com/cypress-io/cypress/blob/develop/npm/react/#readme", "author": "Gleb Bahmutov ", "bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A%20%40cypress%2Freact&template=1-bug-report.md&title=", "keywords": [ diff --git a/npm/react18/.releaserc.js b/npm/react18/.releaserc.js index 7b15992ed7..0ee9f3f0b5 100644 --- a/npm/react18/.releaserc.js +++ b/npm/react18/.releaserc.js @@ -1,6 +1,3 @@ module.exports = { ...require('../../.releaserc.base'), - branches: [ - { name: 'master', channel: 'latest' }, - ], } diff --git a/npm/react18/package.json b/npm/react18/package.json index 88cda1925d..527c1dd278 100644 --- a/npm/react18/package.json +++ b/npm/react18/package.json @@ -38,7 +38,7 @@ "type": "git", "url": "https://github.com/cypress-io/cypress.git" }, - "homepage": "https://github.com/cypress-io/cypress/blob/master/npm/react18/#readme", + "homepage": "https://github.com/cypress-io/cypress/blob/develop/npm/react18/#readme", "bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A%20%40cypress%2Freact18&template=1-bug-report.md&title=", "keywords": [ "react", diff --git a/npm/svelte/README.md b/npm/svelte/README.md index 3f1e6be7b4..9c487846b8 100644 --- a/npm/svelte/README.md +++ b/npm/svelte/README.md @@ -76,7 +76,7 @@ Run `yarn test` to execute headless Cypress tests. ## License -[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/master/LICENSE) +[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/develop/LICENSE) This project is licensed under the terms of the [MIT license](/LICENSE). diff --git a/npm/svelte/package.json b/npm/svelte/package.json index 14ffdaf8dc..232eb02a95 100644 --- a/npm/svelte/package.json +++ b/npm/svelte/package.json @@ -28,7 +28,7 @@ "type": "git", "url": "https://github.com/cypress-io/cypress.git" }, - "homepage": "https://github.com/cypress-io/cypress/blob/master/npm/svelte/#readme", + "homepage": "https://github.com/cypress-io/cypress/blob/develop/npm/svelte/#readme", "bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A%20%40cypress%2Fsvelte&template=1-bug-report.md&title=", "keywords": [ "cypress", diff --git a/npm/vite-dev-server/README.md b/npm/vite-dev-server/README.md index 2c818dae12..967a18f6a7 100644 --- a/npm/vite-dev-server/README.md +++ b/npm/vite-dev-server/README.md @@ -58,7 +58,7 @@ We then merge the sourced config with the user's vite config, and layer on our o ## License -[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/master/LICENSE) +[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/develop/LICENSE) This project is licensed under the terms of the [MIT license](/LICENSE). diff --git a/npm/vite-dev-server/cypress/e2e/vite-dev-server.cy.ts b/npm/vite-dev-server/cypress/e2e/vite-dev-server.cy.ts index dcd43fb8fd..55a660e566 100644 --- a/npm/vite-dev-server/cypress/e2e/vite-dev-server.cy.ts +++ b/npm/vite-dev-server/cypress/e2e/vite-dev-server.cy.ts @@ -58,4 +58,20 @@ describe('Config options', () => { cy.waitForSpecToFinish() cy.get('.passed > .num').should('contain', 1) }) + + it('supports viteConfig as an async function', () => { + cy.scaffoldProject('vite2.9.1-react') + cy.openProject('vite2.9.1-react', ['--config-file', 'cypress-vite-async-function-config.config.ts']) + cy.startAppServer('component') + + cy.visitApp() + cy.contains('App.cy.jsx').click() + cy.waitForSpecToFinish() + cy.get('.passed > .num').should('contain', 1) + cy.withCtx(async (ctx) => { + const verifyFile = await ctx.file.readFileInProject('wrote-to-file') + + expect(verifyFile).to.eq('OK') + }) + }) }) diff --git a/npm/vite-dev-server/package.json b/npm/vite-dev-server/package.json index 51fbb3a171..cafa1ab593 100644 --- a/npm/vite-dev-server/package.json +++ b/npm/vite-dev-server/package.json @@ -41,7 +41,7 @@ "type": "git", "url": "https://github.com/cypress-io/cypress.git" }, - "homepage": "https://github.com/cypress-io/cypress/tree/master/npm/vite-dev-server#readme", + "homepage": "https://github.com/cypress-io/cypress/tree/develop/npm/vite-dev-server#readme", "bugs": "https://github.com/cypress-io/cypress/issues/new?template=1-bug-report.md", "module": "dist/index.js", "publishConfig": { diff --git a/npm/vite-dev-server/src/devServer.ts b/npm/vite-dev-server/src/devServer.ts index 287a94b1b8..ab47c05c28 100644 --- a/npm/vite-dev-server/src/devServer.ts +++ b/npm/vite-dev-server/src/devServer.ts @@ -1,4 +1,5 @@ import debugFn from 'debug' +import type { InlineConfig, UserConfig } from 'vite' import { getVite, Vite } from './getVite' import { createViteDevServerConfig } from './resolveConfig' @@ -6,6 +7,8 @@ const debug = debugFn('cypress:vite-dev-server:devServer') const ALL_FRAMEWORKS = ['react', 'vue'] as const +type ConfigHandler = UserConfig | (() => UserConfig | Promise) + export type ViteDevServerConfig = { specs: Cypress.Spec[] cypressConfig: Cypress.PluginConfigOptions @@ -13,7 +16,7 @@ export type ViteDevServerConfig = { onConfigNotFound?: (devServer: 'vite', cwd: string, lookedIn: string[]) => void } & { framework?: typeof ALL_FRAMEWORKS[number] // Add frameworks here as we implement - viteConfig?: unknown // Derived from the user's webpack + viteConfig?: ConfigHandler // Derived from the user's vite config } export async function devServer (config: ViteDevServerConfig): Promise { diff --git a/npm/vite-dev-server/src/resolveConfig.ts b/npm/vite-dev-server/src/resolveConfig.ts index 2b798bb150..ecc56c8a4c 100644 --- a/npm/vite-dev-server/src/resolveConfig.ts +++ b/npm/vite-dev-server/src/resolveConfig.ts @@ -6,7 +6,7 @@ import debugFn from 'debug' import { importModule } from 'local-pkg' import { relative, resolve } from 'pathe' -import type { InlineConfig } from 'vite' +import type { InlineConfig, UserConfig } from 'vite' import path from 'path' import { configFiles } from './constants' @@ -90,7 +90,15 @@ export const createViteDevServerConfig = async (config: ViteDevServerConfig, vit ].filter((p) => p != null), } - const finalConfig = vite.mergeConfig(viteBaseConfig, viteOverrides as Record) + let resolvedOverrides: UserConfig = {} + + if (typeof viteOverrides === 'function') { + resolvedOverrides = await viteOverrides() + } else if (typeof viteOverrides === 'object') { + resolvedOverrides = viteOverrides + } + + const finalConfig = vite.mergeConfig(viteBaseConfig, resolvedOverrides) debug('The resolved server config is', JSON.stringify(finalConfig, null, 2)) diff --git a/npm/vite-dev-server/test/resolveConfig.spec.ts b/npm/vite-dev-server/test/resolveConfig.spec.ts index 53f932a7ee..c4182607e5 100644 --- a/npm/vite-dev-server/test/resolveConfig.spec.ts +++ b/npm/vite-dev-server/test/resolveConfig.spec.ts @@ -1,10 +1,14 @@ -import { expect } from 'chai' +import Chai, { expect } from 'chai' import { EventEmitter } from 'events' import * as vite from 'vite' import { scaffoldSystemTestProject } from './test-helpers/scaffoldProject' import { createViteDevServerConfig } from '../src/resolveConfig' +import sinon from 'sinon' +import SinonChai from 'sinon-chai' import type { ViteDevServerConfig } from '../src/devServer' +Chai.use(SinonChai) + const getViteDevServerConfig = (projectRoot: string) => { return { specs: [], @@ -21,6 +25,29 @@ const getViteDevServerConfig = (projectRoot: string) => { describe('resolveConfig', function () { this.timeout(1000 * 60) + it('calls viteConfig if it is a function, passing in the base config', async () => { + const viteConfigFn = sinon.spy(async () => { + return { + server: { + fs: { + allow: ['some/other/file'], + }, + }, + } + }) + + const projectRoot = await scaffoldSystemTestProject('vite-inspect') + const viteDevServerConfig = { + ...getViteDevServerConfig(projectRoot), + viteConfig: viteConfigFn, + } + + const viteConfig = await createViteDevServerConfig(viteDevServerConfig, vite) + + expect(viteConfigFn).to.be.called + expect(viteConfig.server.fs.allow).to.include('some/other/file') + }) + context('inspect plugin', () => { it('should not include inspect plugin by default', async () => { const projectRoot = await scaffoldSystemTestProject('vite-inspect') diff --git a/npm/vue/.releaserc.js b/npm/vue/.releaserc.js index 4cb1091bc4..0ee9f3f0b5 100644 --- a/npm/vue/.releaserc.js +++ b/npm/vue/.releaserc.js @@ -1,7 +1,3 @@ module.exports = { ...require('../../.releaserc.base'), - branches: [ - // this one releases v3 on master on the latest channel - 'master', - ], } diff --git a/npm/vue/README.md b/npm/vue/README.md index 378c7ef0d7..2ac9c98ba1 100644 --- a/npm/vue/README.md +++ b/npm/vue/README.md @@ -81,7 +81,7 @@ Run `yarn test` to execute headless Cypress tests. ## License -[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/master/LICENSE) +[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/develop/LICENSE) This project is licensed under the terms of the [MIT license](/LICENSE). diff --git a/npm/vue/package.json b/npm/vue/package.json index ade741d517..67ce209c99 100644 --- a/npm/vue/package.json +++ b/npm/vue/package.json @@ -50,7 +50,7 @@ "type": "git", "url": "https://github.com/cypress-io/cypress.git" }, - "homepage": "https://github.com/cypress-io/cypress/blob/master/npm/vue/#readme", + "homepage": "https://github.com/cypress-io/cypress/blob/develop/npm/vue/#readme", "author": "Gleb Bahmutov ", "bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A%20%40cypress%2Fvue&template=1-bug-report.md&title=", "keywords": [ diff --git a/npm/vue/src/index.ts b/npm/vue/src/index.ts index e00871f668..9a5778c574 100644 --- a/npm/vue/src/index.ts +++ b/npm/vue/src/index.ts @@ -17,8 +17,9 @@ import type { ComponentPropsOptions, ComponentOptionsWithArrayProps, ComponentOptionsWithoutProps, + Prop, } from 'vue' -import type { MountingOptions, VueWrapper } from '@vue/test-utils' +import type { MountingOptions as VTUMountingOptions, VueWrapper } from '@vue/test-utils' import { injectStylesBeforeElement, StyleOptions, @@ -44,7 +45,7 @@ export { VueTestUtils } const DEFAULT_COMP_NAME = 'unknown' -type GlobalMountOptions = Required>['global'] +type GlobalMountOptions = Required>['global'] // when we mount a Vue component, we add it to the global Cypress object // so here we extend the global Cypress namespace and its Cypress interface @@ -58,7 +59,7 @@ declare global { } } -export type CyMountOptions = Omit, 'attachTo'> & { +type MountingOptions = Omit, 'attachTo'> & { log?: boolean /** * @deprecated use vue-test-utils `global` instead @@ -69,6 +70,8 @@ export type CyMountOptions = Omit, } } & Partial +export type CyMountOptions = MountingOptions + Cypress.on('run:start', () => { // `mount` is designed to work with component testing only. // it assumes ROOT_SELECTOR exists, which is not the case in e2e. @@ -89,38 +92,79 @@ Cypress.on('run:start', () => { }) /** - * the types for mount have been copied directly from the VTU mount - * https://github.com/vuejs/vue-test-utils-next/blob/master/src/mount.ts + * The types for mount have been copied directly from the VTU mount + * https://github.com/vuejs/vue-test-utils-next/blob/master/src/mount.ts. * - * If they are updated please copy and pase them again here. + * There isn't a good way to make them generic enough that we can extend them. + * + * In addition, we modify the types slightly. + * + * `MountOptions` are modifying, including some Cypress specific options like `styles`. + * The return type is different. Instead of VueWrapper, it's Cypress.Chainable>. */ +type PublicProps = VNodeProps & AllowedComponentProps & ComponentCustomProps -type PublicProps = VNodeProps & AllowedComponentProps & ComponentCustomProps; +type ComponentMountingOptions = T extends DefineComponent< + infer PropsOrPropOptions, + any, + infer D, + any, + any +> + ? MountingOptions< + Partial> & + Omit< + Readonly> & PublicProps, + keyof ExtractDefaultPropTypes + >, + D + > & + Record + : MountingOptions + +// Class component (without vue-class-component) - no props +export function mount( + originalComponent: { + new (...args: any[]): V + __vccOpts: any + }, + options?: MountingOptions & Record +): Cypress.Chainable>> + +// Class component (without vue-class-component) - props +export function mount( + originalComponent: { + new (...args: any[]): V + __vccOpts: any + defaultProps?: Record> | string[] + }, + options?: MountingOptions

& Record +): Cypress.Chainable>> // Class component - no props -export function mount( +export function mount( originalComponent: { new (...args: any[]): V registerHooks(keys: string[]): void }, - options?: MountingOptions -): Cypress.Chainable + options?: MountingOptions & Record +): Cypress.Chainable>> // Class component - props -export function mount( +export function mount( originalComponent: { new (...args: any[]): V props(Props: P): any registerHooks(keys: string[]): void }, - options?: CyMountOptions

-): Cypress.Chainable + options?: MountingOptions

& Record +): Cypress.Chainable>> // Functional component with emits -export function mount( +export function mount( originalComponent: FunctionalComponent, - options?: CyMountOptions -): Cypress.Chainable + options?: MountingOptions & Record +): Cypress.Chainable>> // Component declared with defineComponent export function mount< @@ -135,7 +179,7 @@ export function mount< EE extends string = string, PP = PublicProps, Props = Readonly>, - Defaults = ExtractDefaultPropTypes + Defaults extends {} = ExtractDefaultPropTypes >( component: DefineComponent< PropsOrPropOptions, @@ -151,17 +195,43 @@ export function mount< Props, Defaults >, - options?: CyMountOptions< + options?: MountingOptions< Partial & Omit, D + > & + Record +): Cypress.Chainable< + VueWrapper< + InstanceType< + DefineComponent< + PropsOrPropOptions, + RawBindings, + D, + C, + M, + Mixin, + Extends, + E, + EE, + PP, + Props, + Defaults + > + > > -): Cypress.Chainable +> + +// component declared by vue-tsc ScriptSetup +export function mount>( + component: T, + options?: ComponentMountingOptions +): Cypress.Chainable>> // Component declared with no props export function mount< Props = {}, RawBindings = {}, - D = {}, + D extends {} = {}, C extends ComputedOptions = {}, M extends Record = {}, E extends EmitsOptions = Record, @@ -172,25 +242,31 @@ export function mount< componentOptions: ComponentOptionsWithoutProps< Props, RawBindings, - D + D, + C, + M, + E, + Mixin, + Extends, + EE >, - options?: CyMountOptions -): Cypress.Chainable + options?: MountingOptions +): Cypress.Chainable>> & Record // Component declared with { props: [] } export function mount< PropNames extends string, RawBindings, - D, + D extends {}, C extends ComputedOptions = {}, M extends Record = {}, E extends EmitsOptions = Record, Mixin extends ComponentOptionsMixin = ComponentOptionsMixin, Extends extends ComponentOptionsMixin = ComponentOptionsMixin, EE extends string = string, - Props extends Readonly<{ [key in PropNames]?: any }> = Readonly< - { [key in PropNames]?: any } - > + Props extends Readonly<{ [key in PropNames]?: any }> = Readonly<{ + [key in PropNames]?: any + }> >( componentOptions: ComponentOptionsWithArrayProps< PropNames, @@ -204,8 +280,8 @@ export function mount< EE, Props >, - options?: CyMountOptions -): Cypress.Chainable + options?: MountingOptions +): Cypress.Chainable>> // Component declared with { props: { ... } } export function mount< @@ -213,7 +289,7 @@ export function mount< // as constant instead of boolean. PropsOptions extends Readonly, RawBindings, - D, + D extends {}, C extends ComputedOptions = {}, M extends Record = {}, E extends EmitsOptions = Record, @@ -232,14 +308,23 @@ export function mount< Extends, EE >, - options?: CyMountOptions & PublicProps, D> -): Cypress.Chainable + options?: MountingOptions & PublicProps, D> +): Cypress.Chainable< + VueWrapper< + ComponentPublicInstance< + ExtractPropTypes, + RawBindings, + D, + C, + M, + E, + VNodeProps & ExtractPropTypes + > + > +> // implementation -export function mount ( - componentOptions: any, - options: CyMountOptions = {}, -) { +export function mount (componentOptions: any, options: any) { // TODO: get the real displayName and props from VTU shallowMount const componentName = getComponentDisplayName(componentOptions) diff --git a/npm/vue/test-tsd/Slots.vue b/npm/vue/test-tsd/Slots.vue new file mode 100644 index 0000000000..e4c666f0a6 --- /dev/null +++ b/npm/vue/test-tsd/Slots.vue @@ -0,0 +1,15 @@ + + + diff --git a/npm/vue/test-tsd/mount-test.ts b/npm/vue/test-tsd/mount-test.ts index d787014f22..f4ddecfa0f 100644 --- a/npm/vue/test-tsd/mount-test.ts +++ b/npm/vue/test-tsd/mount-test.ts @@ -1,4 +1,4 @@ -import { expectError, expectType } from './index' +import { expectType } from './index' import { mount, VueTestUtils } from '../dist' import * as VTU from '@vue/test-utils' import { defineComponent } from 'vue' diff --git a/npm/vue/test-tsd/test.ts b/npm/vue/test-tsd/test.ts new file mode 100644 index 0000000000..bf7f9d8e93 --- /dev/null +++ b/npm/vue/test-tsd/test.ts @@ -0,0 +1,4 @@ +import { mount } from '../dist' +import Slots from './Slots.vue' + +mount(Slots) diff --git a/npm/vue2/.releaserc.js b/npm/vue2/.releaserc.js index 4cb1091bc4..0ee9f3f0b5 100644 --- a/npm/vue2/.releaserc.js +++ b/npm/vue2/.releaserc.js @@ -1,7 +1,3 @@ module.exports = { ...require('../../.releaserc.base'), - branches: [ - // this one releases v3 on master on the latest channel - 'master', - ], } diff --git a/npm/vue2/README.md b/npm/vue2/README.md index 7a527f2332..8b07e1a1c2 100644 --- a/npm/vue2/README.md +++ b/npm/vue2/README.md @@ -70,7 +70,7 @@ the `options`. ## License -[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/master/LICENSE) +[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/develop/LICENSE) This project is licensed under the terms of the [MIT license](/LICENSE). diff --git a/npm/vue2/package.json b/npm/vue2/package.json index 108650b579..1863c34e58 100644 --- a/npm/vue2/package.json +++ b/npm/vue2/package.json @@ -40,7 +40,7 @@ "type": "git", "url": "https://github.com/cypress-io/cypress.git" }, - "homepage": "https://github.com/cypress-io/cypress/blob/master/npm/vue/#readme", + "homepage": "https://github.com/cypress-io/cypress/blob/develop/npm/vue/#readme", "bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A%20%40cypress%2Fvue&template=1-bug-report.md&title=", "keywords": [ "cypress", diff --git a/npm/vue2/src/index.ts b/npm/vue2/src/index.ts index 4f8ea0d226..0966bdf0d7 100644 --- a/npm/vue2/src/index.ts +++ b/npm/vue2/src/index.ts @@ -142,14 +142,14 @@ type VuePlugins = VuePlugin[] * local components, plugins, etc. * * @interface MountOptionsExtensions - * @see https://github.com/cypress-io/cypress/tree/master/npm/vue#examples + * @see https://github.com/cypress-io/cypress/tree/develop/npm/vue#examples */ interface MountOptionsExtensions { /** * Extra local components * * @memberof MountOptionsExtensions - * @see https://github.com/cypress-io/cypress/tree/master/npm/vue#examples + * @see https://github.com/cypress-io/cypress/tree/develop/npm/vue#examples * @example * import Hello from './Hello.vue' * // imagine Hello needs AppComponent @@ -167,7 +167,7 @@ interface MountOptionsExtensions { * Optional Vue filters to install while mounting the component * * @memberof MountOptionsExtensions - * @see https://github.com/cypress-io/cypress/tree/master/npm/vue#examples + * @see https://github.com/cypress-io/cypress/tree/develop/npm/vue#examples * @example * const filters = { * reverse: (s) => s.split('').reverse().join(''), @@ -181,7 +181,7 @@ interface MountOptionsExtensions { * * @memberof MountOptionsExtensions * @alias mixins - * @see https://github.com/cypress-io/cypress/tree/master/npm/vue#examples + * @see https://github.com/cypress-io/cypress/tree/develop/npm/vue#examples */ mixin?: VueMixins @@ -190,14 +190,14 @@ interface MountOptionsExtensions { * * @memberof MountOptionsExtensions * @alias mixin - * @see https://github.com/cypress-io/cypress/tree/master/npm/vue#examples + * @see https://github.com/cypress-io/cypress/tree/develop/npm/vue#examples */ mixins?: VueMixins /** * A single plugin or multiple plugins. * - * @see https://github.com/cypress-io/cypress/tree/master/npm/vue#examples + * @see https://github.com/cypress-io/cypress/tree/develop/npm/vue#examples * @alias plugins * @memberof MountOptionsExtensions */ @@ -206,7 +206,7 @@ interface MountOptionsExtensions { /** * A single plugin or multiple plugins. * - * @see https://github.com/cypress-io/cypress/tree/master/npm/vue#examples + * @see https://github.com/cypress-io/cypress/tree/develop/npm/vue#examples * @alias use * @memberof MountOptionsExtensions */ @@ -233,7 +233,7 @@ interface MountOptions { * mounting this component * * @memberof MountOptions - * @see https://github.com/cypress-io/cypress/tree/master/npm/vue#examples + * @see https://github.com/cypress-io/cypress/tree/develop/npm/vue#examples */ extensions: MountOptionsExtensions } diff --git a/npm/webpack-batteries-included-preprocessor/README.md b/npm/webpack-batteries-included-preprocessor/README.md index 5603b1e686..0d34e70a9c 100644 --- a/npm/webpack-batteries-included-preprocessor/README.md +++ b/npm/webpack-batteries-included-preprocessor/README.md @@ -8,7 +8,7 @@ Cypress preprocessor for bundling JavaScript via webpack, with dependencies incl ## Why? -This preprocessor is a wrapper for [@cypress/webpack-preprocessor](https://github.com/cypress-io/cypress/tree/master/npm/webpack-preprocessor#readme). The webpack preprocessor does not include any extra dependencies (e.g. `babel-loader`, `ts-loader`), since most users will use their own `webpack.config.js` with it and already have the necessary dependencies installed. This preprocessor is for users who do not have those dependencies installed and would prefer not to configure the preprocessor to handle things like TypeScript and CoffeeScript. +This preprocessor is a wrapper for [@cypress/webpack-preprocessor](https://github.com/cypress-io/cypress/tree/develop/npm/webpack-preprocessor#readme). The webpack preprocessor does not include any extra dependencies (e.g. `babel-loader`, `ts-loader`), since most users will use their own `webpack.config.js` with it and already have the necessary dependencies installed. This preprocessor is for users who do not have those dependencies installed and would prefer not to configure the preprocessor to handle things like TypeScript and CoffeeScript. ## Installation @@ -42,7 +42,7 @@ module.exports = (on) => { } ``` -Other than the `typescript` option, this preprocessor supports the same options as [@cypress/webpack-preprocessor](https://github.com/cypress-io/cypress/tree/master/npm/webpack-preprocessor#readme), so see its README for more information. +Other than the `typescript` option, this preprocessor supports the same options as [@cypress/webpack-preprocessor](https://github.com/cypress-io/cypress/tree/develop/npm/webpack-preprocessor#readme), so see its README for more information. ## Contributing diff --git a/npm/webpack-batteries-included-preprocessor/package.json b/npm/webpack-batteries-included-preprocessor/package.json index d7837ea194..f6b1274840 100644 --- a/npm/webpack-batteries-included-preprocessor/package.json +++ b/npm/webpack-batteries-included-preprocessor/package.json @@ -55,7 +55,7 @@ "type": "git", "url": "https://github.com/cypress-io/cypress.git" }, - "homepage": "https://github.com/cypress-io/cypress/tree/master/npm/webpack-batteries-included-preprocessor#readme", + "homepage": "https://github.com/cypress-io/cypress/tree/develop/npm/webpack-batteries-included-preprocessor#readme", "bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A%20webpack-batteries-included-preprocessor&template=1-bug-report.md&title=", "keywords": [ "cypress", diff --git a/npm/webpack-dev-server/README.md b/npm/webpack-dev-server/README.md index ef3ca503b1..91a641e5be 100644 --- a/npm/webpack-dev-server/README.md +++ b/npm/webpack-dev-server/README.md @@ -71,7 +71,7 @@ We then merge the sourced config with the user's webpack config, and layer on ou ## License -[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/master/LICENSE) +[![license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cypress-io/cypress/blob/develop/LICENSE) This project is licensed under the terms of the [MIT license](/LICENSE). diff --git a/npm/webpack-dev-server/cypress/e2e/webpack-dev-server.cy.ts b/npm/webpack-dev-server/cypress/e2e/webpack-dev-server.cy.ts index 792b44b35e..af9bc5a095 100644 --- a/npm/webpack-dev-server/cypress/e2e/webpack-dev-server.cy.ts +++ b/npm/webpack-dev-server/cypress/e2e/webpack-dev-server.cy.ts @@ -22,4 +22,21 @@ describe('Config options', () => { cy.waitForSpecToFinish() cy.get('.passed > .num').should('contain', 1) }) + + it('supports webpackConfig as an async function', () => { + cy.scaffoldProject('webpack5_wds4-react') + cy.openProject('webpack5_wds4-react', ['--config-file', 'cypress-webpack-dev-server-async-config.config.ts']) + cy.startAppServer('component') + + cy.visitApp() + cy.contains('App.cy.jsx').click() + cy.waitForSpecToFinish() + cy.get('.passed > .num').should('contain', 1) + + cy.withCtx(async (ctx) => { + const verifyFile = await ctx.file.readFileInProject('wrote-to-file') + + expect(verifyFile).to.eq('OK') + }) + }) }) diff --git a/npm/webpack-dev-server/package.json b/npm/webpack-dev-server/package.json index 086e9880a0..810ddf973f 100644 --- a/npm/webpack-dev-server/package.json +++ b/npm/webpack-dev-server/package.json @@ -50,7 +50,7 @@ "type": "git", "url": "https://github.com/cypress-io/cypress.git" }, - "homepage": "https://github.com/cypress-io/cypress/tree/master/npm/webpack-dev-server#readme", + "homepage": "https://github.com/cypress-io/cypress/tree/develop/npm/webpack-dev-server#readme", "bugs": "https://github.com/cypress-io/cypress/issues/new?template=1-bug-report.md", "publishConfig": { "access": "public" diff --git a/npm/webpack-dev-server/src/devServer.ts b/npm/webpack-dev-server/src/devServer.ts index a3a9f0d368..9fcc9240e9 100644 --- a/npm/webpack-dev-server/src/devServer.ts +++ b/npm/webpack-dev-server/src/devServer.ts @@ -27,12 +27,16 @@ type FrameworkConfig = { } } +export type ConfigHandler = + Partial + | (() => Partial | Promise>) + export type WebpackDevServerConfig = { specs: Cypress.Spec[] cypressConfig: Cypress.PluginConfigOptions devServerEvents: NodeJS.EventEmitter onConfigNotFound?: (devServer: 'webpack', cwd: string, lookedIn: string[]) => void - webpackConfig?: unknown // Derived from the user's webpack + webpackConfig?: ConfigHandler // Derived from the user's webpack config } & FrameworkConfig /** diff --git a/npm/webpack-dev-server/src/makeWebpackConfig.ts b/npm/webpack-dev-server/src/makeWebpackConfig.ts index 2ca6c09549..7bdb954fdf 100644 --- a/npm/webpack-dev-server/src/makeWebpackConfig.ts +++ b/npm/webpack-dev-server/src/makeWebpackConfig.ts @@ -80,7 +80,7 @@ export async function makeWebpackConfig ( config: CreateFinalWebpackConfig, ) { const { module: webpack } = config.sourceWebpackModulesResult.webpack - let userWebpackConfig = config.devServerConfig.webpackConfig as Partial + let userWebpackConfig = config.devServerConfig.webpackConfig const frameworkWebpackConfig = config.frameworkConfig as Partial const { cypressConfig: { @@ -125,6 +125,10 @@ export async function makeWebpackConfig ( } } + userWebpackConfig = typeof userWebpackConfig === 'function' + ? await userWebpackConfig() + : userWebpackConfig + const userAndFrameworkWebpackConfig = modifyWebpackConfigForCypress( merge(frameworkWebpackConfig ?? {}, userWebpackConfig ?? {}), ) diff --git a/npm/webpack-dev-server/test/makeWebpackConfig.spec.ts b/npm/webpack-dev-server/test/makeWebpackConfig.spec.ts index a76e8182ec..0afab14ee8 100644 --- a/npm/webpack-dev-server/test/makeWebpackConfig.spec.ts +++ b/npm/webpack-dev-server/test/makeWebpackConfig.spec.ts @@ -1,9 +1,14 @@ -import { expect } from 'chai' +import Chai, { expect } from 'chai' import EventEmitter from 'events' import snapshot from 'snap-shot-it' +import { IgnorePlugin } from 'webpack' import { WebpackDevServerConfig } from '../src/devServer' import { CYPRESS_WEBPACK_ENTRYPOINT, makeWebpackConfig } from '../src/makeWebpackConfig' import { createModuleMatrixResult } from './test-helpers/createModuleMatrixResult' +import sinon from 'sinon' +import SinonChai from 'sinon-chai' + +Chai.use(SinonChai) describe('makeWebpackConfig', () => { it('ignores userland webpack `output.publicPath` and `devServer.overlay` with webpack-dev-server v3', async () => { @@ -144,4 +149,45 @@ describe('makeWebpackConfig', () => { 'cypress-entry': CYPRESS_WEBPACK_ENTRYPOINT, }) }) + + it('calls webpackConfig if it is a function, passing in the base config', async () => { + const testPlugin = new IgnorePlugin({ + contextRegExp: /aaa/, + resourceRegExp: /bbb/, + }) + + const modifyConfig = sinon.spy(async () => { + return { + plugins: [testPlugin], + } + }) + + const devServerConfig: WebpackDevServerConfig = { + specs: [], + cypressConfig: { + isTextTerminal: false, + projectRoot: '.', + supportFile: '/support.js', + devServerPublicPathRoute: '/test-public-path', // This will be overridden by makeWebpackConfig.ts + } as Cypress.PluginConfigOptions, + webpackConfig: modifyConfig, + devServerEvents: new EventEmitter(), + } + + const actual = await makeWebpackConfig({ + devServerConfig, + sourceWebpackModulesResult: createModuleMatrixResult({ + webpack: 4, + webpackDevServer: 4, + }), + }) + + expect(actual.plugins.length).to.eq(3) + expect(modifyConfig).to.have.been.called + // merged plugins get added at the top of the chain by default + // should be merged, not overriding existing plugins + expect(actual.plugins[0].constructor.name).to.eq('IgnorePlugin') + expect(actual.plugins[1].constructor.name).to.eq('HtmlWebpackPlugin') + expect(actual.plugins[2].constructor.name).to.eq('CypressCTWebpackPlugin') + }) }) diff --git a/npm/webpack-preprocessor/deferred.ts b/npm/webpack-preprocessor/deferred.ts deleted file mode 100644 index 86bda35d1f..0000000000 --- a/npm/webpack-preprocessor/deferred.ts +++ /dev/null @@ -1,17 +0,0 @@ -import * as Promise from 'bluebird' - -export function createDeferred () { - let resolve: (thenableOrResult?: T | PromiseLike | undefined) => void - let reject: any - const promise = new Promise(function (_resolve, _reject) { - resolve = _resolve - reject = _reject - }) - - return { - //@ts-ignore - resolve, - reject, - promise, - } -} diff --git a/npm/webpack-preprocessor/index.ts b/npm/webpack-preprocessor/index.ts index 7376f4f8db..c11d27f7c6 100644 --- a/npm/webpack-preprocessor/index.ts +++ b/npm/webpack-preprocessor/index.ts @@ -1,19 +1,29 @@ -import { overrideSourceMaps } from './lib/typescript-overrides' - -import * as Promise from 'bluebird' +import Bluebird from 'bluebird' +import Debug from 'debug' +import _ from 'lodash' import * as events from 'events' -import * as _ from 'lodash' -import * as webpack from 'webpack' -import { createDeferred } from './deferred' +import * as path from 'path' +import webpack from 'webpack' +import utils from './lib/utils' +import { crossOriginCallbackStore } from './lib/cross-origin-callback-store' +import { overrideSourceMaps } from './lib/typescript-overrides' +import { compileCrossOriginCallbackFiles } from './lib/cross-origin-callback-compile' -const path = require('path') -const debug = require('debug')('cypress:webpack') -const debugStats = require('debug')('cypress:webpack:stats') +const debug = Debug('cypress:webpack') +const debugStats = Debug('cypress:webpack:stats') + +declare global { + // this indicates which commands should be acted upon by the + // cross-origin-callback-loader. its absense means the loader should not + // be utilized at all + // eslint-disable-next-line no-var + var __cypressCallbackReplacementCommands: string[] | undefined +} type FilePath = string interface BundleObject { - promise: Promise - deferreds: Array<{ resolve: (filePath: string) => void, reject: (error: Error) => void, promise: Promise }> + promise: Bluebird + deferreds: Array<{ resolve: (filePath: string) => void, reject: (error: Error) => void, promise: Bluebird }> initial: boolean } @@ -114,7 +124,7 @@ interface FileEvent extends events.EventEmitter { * Cypress asks file preprocessor to bundle the given file * and return the full path to produced bundle. */ -type FilePreprocessor = (file: FileEvent) => Promise +type FilePreprocessor = (file: FileEvent) => Bluebird type WebpackPreprocessorFn = (options: PreprocessorOptions) => FilePreprocessor @@ -153,6 +163,8 @@ interface WebpackPreprocessor extends WebpackPreprocessorFn { const preprocessor: WebpackPreprocessor = (options: PreprocessorOptions = {}): FilePreprocessor => { debug('user options: %o', options) + let crossOriginCallbackLoaderAdded = false + // we return function that accepts the arguments provided by // the event 'file:preprocessor' // @@ -229,6 +241,24 @@ const preprocessor: WebpackPreprocessor = (options: PreprocessorOptions = {}): F }) .value() as any + const callbackReplacementCommands = global.__cypressCallbackReplacementCommands + + if (!crossOriginCallbackLoaderAdded && !!callbackReplacementCommands) { + // webpack runs loaders last-to-first and we want ours to run last + // so that it's working with plain javascript + webpackOptions.module.rules.unshift({ + test: /\.(js|ts|jsx|tsx)$/, + use: [{ + loader: path.join(__dirname, 'lib/cross-origin-callback-loader'), + options: { + commands: callbackReplacementCommands, + }, + }], + }) + + crossOriginCallbackLoaderAdded = true + } + debug('webpackOptions: %o', webpackOptions) debug('watchOptions: %o', watchOptions) if (options.typescript) debug('typescript: %s', options.typescript) @@ -238,7 +268,7 @@ const preprocessor: WebpackPreprocessor = (options: PreprocessorOptions = {}): F const compiler = webpack(webpackOptions) - let firstBundle = createDeferred() + let firstBundle = utils.createDeferred() // cache the bundle promise, so it can be returned if this function // is invoked again with the same filePath @@ -301,29 +331,78 @@ const preprocessor: WebpackPreprocessor = (options: PreprocessorOptions = {}): F console.error(stats.toString({ colors: true })) } - // resolve with the outputPath so Cypress knows where to serve - // the file from - // Seems to be a race condition where changing file before next tick - // does not cause build to rerun - Promise.delay(0).then(() => { - if (!bundles[filePath]) { - return - } - + const resolveAllBundles = () => { bundles[filePath].deferreds.forEach((deferred) => { + // resolve with the outputPath so Cypress knows where to serve + // the file from deferred.resolve(outputPath) }) bundles[filePath].deferreds.length = 0 + } + + // the cross-origin-callback-loader extracts any cy.origin() callback + // functions that contains Cypress.require() and stores their sources + // in the CrossOriginCallbackStore. it saves the callbacks per source + // files, since that's the context it has. here we need to unfurl + // what dependencies the input source file has so we can know which + // files stored in the CrossOriginCallbackStore to compile + const handleCrossOriginCallbackFiles = () => { + // get the source file and any of its dependencies + const sourceFiles = jsonStats.modules + .filter((module) => { + // entries have duplicate modules whose ids are numbers + return _.isString(module.id) + }) + .map((module) => { + // module id is the path relative to the cwd, + // e.g. ./cypress/support/e2e.js, but we need it absolute + return path.join(process.cwd(), module.id as string) + }) + + if (!crossOriginCallbackStore.hasFilesFor(sourceFiles)) { + debug('no cross-origin callback files') + + return resolveAllBundles() + } + + compileCrossOriginCallbackFiles(crossOriginCallbackStore.getFilesFor(sourceFiles), { + originalFilePath: filePath, + webpackOptions, + }) + .then(() => { + debug('resolve all after handling cross-origin callback files') + resolveAllBundles() + }) + .catch((err) => { + rejectWithErr(err) + }) + .finally(() => { + crossOriginCallbackStore.reset(filePath) + }) + } + + // seems to be a race condition where changing file before next tick + // does not cause build to rerun + Bluebird.delay(0).then(() => { + if (!bundles[filePath]) { + return + } + + if (!callbackReplacementCommands) { + return resolveAllBundles() + } + + handleCrossOriginCallbackFiles() }) } - // this event is triggered when watching and a file is saved const plugin = { name: 'CypressWebpackPreprocessor' } + // this event is triggered when watching and a file is saved const onCompile = () => { debug('compile', filePath) - const nextBundle = createDeferred() + const nextBundle = utils.createDeferred() bundles[filePath].promise = nextBundle.promise bundles[filePath].deferreds.push(nextBundle) @@ -374,6 +453,17 @@ const preprocessor: WebpackPreprocessor = (options: PreprocessorOptions = {}): F bundler.close(cb) } } + + // clean up temp dir where cross-origin callback files are output + const tmpdir = utils.tmpdir(utils.hash(filePath)) + + debug('remove temp directory:', tmpdir) + + utils.rmdir(tmpdir).catch((err) => { + // not the end of the world if removing the tmpdir fails, but we + // don't want it to crash the whole process by going uncaught + debug('failed removing temp directory: %s', err.stack) + }) }) // return the promise, which will resolve with the outputPath or reject diff --git a/npm/webpack-preprocessor/lib/cross-origin-callback-compile.ts b/npm/webpack-preprocessor/lib/cross-origin-callback-compile.ts new file mode 100644 index 0000000000..293b9538d4 --- /dev/null +++ b/npm/webpack-preprocessor/lib/cross-origin-callback-compile.ts @@ -0,0 +1,104 @@ +import _ from 'lodash' +import Debug from 'debug' +import * as path from 'path' +import webpack from 'webpack' +import { CrossOriginCallbackStoreFile } from './cross-origin-callback-store' + +const VirtualModulesPlugin = require('webpack-virtual-modules') + +const debug = Debug('cypress:webpack') + +interface Entry { + [key: string]: string +} + +interface VirtualConfig { + [key: string]: string +} + +interface EntryConfig { + entry: Entry + virtualConfig: VirtualConfig +} + +// takes the files stored by the cross-origin-callback-loader and turns +// them into config we can pass to webpack to compile all the files. the +// virtual config allows us to just use the source we have in memory without +// needing to write it to file +const getConfig = ({ files, originalFilePath }): EntryConfig => { + const dir = path.dirname(originalFilePath) + + return files.reduce((memo, file) => { + const { inputFileName, source } = file + const inputPath = path.join(dir, inputFileName) + + memo.entry[inputFileName] = inputPath + memo.virtualConfig[inputPath] = source + + return memo + }, { entry: {}, virtualConfig: {} }) +} + +interface ConfigProperties { + webpackOptions: webpack.Configuration + entry: Entry + virtualConfig: VirtualConfig + outputDir: string +} + +const getWebpackOptions = ({ webpackOptions, entry, virtualConfig, outputDir }: ConfigProperties): webpack.Configuration => { + const modifiedWebpackOptions = _.extend({}, webpackOptions, { + entry, + output: { + path: outputDir, + }, + }) + const plugins = modifiedWebpackOptions.plugins || [] + + modifiedWebpackOptions.plugins = plugins.concat( + new VirtualModulesPlugin(virtualConfig), + ) + + return modifiedWebpackOptions +} + +interface CompileOptions { + originalFilePath: string + webpackOptions: webpack.Configuration +} + +// the cross-origin-callback-loader extracts any cy.origin() callback functions +// that contains Cypress.require() and stores their sources in the +// CrossOriginCallbackStore. this sends those sources through webpack again +// to process any dependencies and create bundles for each callback function +export const compileCrossOriginCallbackFiles = (files: CrossOriginCallbackStoreFile[], options: CompileOptions): Promise => { + debug('compile cross-origin callback files: %o', files) + + const { originalFilePath, webpackOptions } = options + const outputDir = path.dirname(files[0].outputFilePath) + const { entry, virtualConfig } = getConfig({ files, originalFilePath }) + const modifiedWebpackOptions = getWebpackOptions({ + webpackOptions, + entry, + virtualConfig, + outputDir, + }) + + return new Promise((resolve, reject) => { + const compiler = webpack(modifiedWebpackOptions) + + const handle = (err: Error) => { + if (err) { + debug('errored compiling cross-origin callback files with: %s', err.stack) + + return reject(err) + } + + debug('successfully compiled cross-origin callback files') + + resolve() + } + + compiler.run(handle) + }) +} diff --git a/npm/webpack-preprocessor/lib/cross-origin-callback-loader.ts b/npm/webpack-preprocessor/lib/cross-origin-callback-loader.ts new file mode 100644 index 0000000000..deddb99ae0 --- /dev/null +++ b/npm/webpack-preprocessor/lib/cross-origin-callback-loader.ts @@ -0,0 +1,188 @@ +import _ from 'lodash' +import { parse } from '@babel/parser' +import { default as traverse } from '@babel/traverse' +import { default as generate } from '@babel/generator' +import { NodePath, types as t } from '@babel/core' +import * as loaderUtils from 'loader-utils' +import * as pathUtil from 'path' +import Debug from 'debug' + +import { crossOriginCallbackStore } from './cross-origin-callback-store' +import utils from './utils' + +const debug = Debug('cypress:webpack') + +// this loader makes supporting dependencies within the cy.origin() callbacks +// possible. it does this by doing the following: +// - extracting callback(s) +// - the callback(s) is/are kept in memory and then run back through webpack +// once the initial file compilation is complete +// - users use Cypress.require() in their test code instead of require(). +// this is because we don't want require()s nested within the callback +// to be processed in the initial compilation. this both improves +// performance and prevents errors (when the dependency has ES import +// statements, babel will error because they're not top-level since +// the require is not top-level) +// - replacing Cypress.require() with require() +// - this allows the require()s to be processed normally during the +// compilation of the callback itself. +// - replacing the callback(s) with object(s) +// - this object references the file the callback will be output to by +// its own compilation. this allows the runtime to get the file and +// run it in its origin's context. +export default function (source: string, map, meta, store = crossOriginCallbackStore) { + const { resourcePath } = this + const options = typeof this.getOptions === 'function' + ? this.getOptions() // webpack 5 + : loaderUtils.getOptions(this) // webpack 4 + const commands = (options.commands || []) as string[] + + let ast: t.File + + try { + // purposefully lenient in allowing syntax since the user can't configure + // this, but probably has their own webpack or target configured to + // handle it + ast = parse(source, { + allowImportExportEverywhere: true, + allowAwaitOutsideFunction: true, + allowSuperOutsideMethod: true, + allowUndeclaredExports: true, + sourceType: 'unambiguous', + }) + } catch (err) { + // it's unlikely there will be a parsing error, since that should have + // already been caught by a previous loader, but if there is and it isn't + // possible to get the AST, there's nothing we can do, so just callback + // with the original source + debug('parsing error for file (%s): %s', resourcePath, err.stack) + + this.callback(null, source, map) + + return + } + + let hasDependencies = false + + traverse(ast, { + CallExpression (path) { + const callee = path.get('callee') as NodePath + + if (!callee.isMemberExpression()) return + + // bail if we're not inside a supported command + if (!commands.includes((callee.node.property as t.Identifier).name)) { + return + } + + const lastArg = _.last(path.get('arguments')) + + // the user could try an invalid signature for cy.origin() where the + // last argument is not a function. in this case, we'll return the + // unmodified code and it will be a runtime validation error + if ( + !lastArg || ( + !lastArg.isArrowFunctionExpression() + && !lastArg.isFunctionExpression() + ) + ) { + return + } + + // replace instances of Cypress.require('dep') with require('dep') + lastArg.traverse({ + CallExpression (path) { + const callee = path.get('callee') as NodePath + + // e.g. const dep = Cypress.require('../path/to/dep') + if (callee.matchesPattern('Cypress.require')) { + hasDependencies = true + + path.replaceWith( + t.callExpression( + callee.node.property as t.Expression, // 'require' + path.get('arguments').map((arg) => arg.node), // ['../path/to/dep'] + ), + ) + } + }, + }, this) + + if (!hasDependencies) return + + // generate the extracted callback function from an AST into a string + // and assign it to a variable. we wrap this generated code when we + // eval the code, so the variable is set up and then invoked. it ends up + // like this: + // + // let __cypressCrossOriginCallback 】added at runtime + // (function () { ┓ added by webpack + // // ... webpack stuff stuff ... ┛ + // __cypressCrossOriginCallback = (args) => { ┓ extracted callback + // const dep = require('../path/to/dep') ┃ + // // ... test stuff ... ┃ + // } ┛ + // // ... webpack stuff stuff ... ┓ added by webpack + // }()) ┛ + // __cypressCrossOriginCallback(args) 】added at runtime + // + const callbackName = '__cypressCrossOriginCallback' + const generatedCode = generate(lastArg.node, {}).code + const modifiedGeneratedCode = `${callbackName} = ${generatedCode}` + // the tmpdir path uses a hashed version of the source file path + // so that it can be cleaned up without removing other in-use tmpdirs + // (notably the support file persists between specs, so its cross-origin + // callback output files need to persist as well) + const sourcePathHash = utils.hash(resourcePath) + const outputDir = utils.tmpdir(sourcePathHash) + // use a hash of the contents in file name to ensure it's unique. if + // the contents happen to be the same, it's okay if they share a file + const codeHash = utils.hash(modifiedGeneratedCode) + const inputFileName = `cross-origin-cb-${codeHash}` + const outputFilePath = `${pathUtil.join(outputDir, inputFileName)}.js` + + store.addFile(resourcePath, { + inputFileName, + outputFilePath, + source: modifiedGeneratedCode, + }) + + // replaces callback function with object referencing the extracted + // function's callback name and output file path in the form + // { callbackName: , outputFilePath: } + // this is used at runtime when cy.origin() is run to execute the bundle + // generated for the extracted callback function + lastArg.replaceWith( + t.objectExpression([ + t.objectProperty( + t.stringLiteral('callbackName'), + t.stringLiteral(callbackName), + ), + t.objectProperty( + t.stringLiteral('outputFilePath'), + t.stringLiteral(outputFilePath), + ), + ]), + ) + }, + }) + + // if we found Cypress.require()s, re-generate the code from the AST + if (hasDependencies) { + debug('callback with modified source') + + // TODO: handle sourcemaps for this correctly + // https://github.com/cypress-io/cypress/issues/23365 + // the following causes error "Cannot read property 'replace' of undefined" + // return generate(ast, { sourceMaps: true }, source).code + // and can't pass in original map or the output ends up with + // `undefinedundefined` appended, which is a syntax error + this.callback(null, generate(ast, {}).code) + + return + } + + debug('callback with original source') + // if no Cypress.require()s were found, callback with the original source/map + this.callback(null, source, map) +} diff --git a/npm/webpack-preprocessor/lib/cross-origin-callback-store.ts b/npm/webpack-preprocessor/lib/cross-origin-callback-store.ts new file mode 100644 index 0000000000..1167f26ab3 --- /dev/null +++ b/npm/webpack-preprocessor/lib/cross-origin-callback-store.ts @@ -0,0 +1,29 @@ +export interface CrossOriginCallbackStoreFile { + inputFileName: string + outputFilePath: string + source: string +} + +export class CrossOriginCallbackStore { + private files: { [key: string]: CrossOriginCallbackStoreFile[] } = {} + + addFile (sourceFilePath: string, file: CrossOriginCallbackStoreFile) { + this.files[sourceFilePath] = (this.files[sourceFilePath] || []).concat(file) + } + + hasFilesFor (sourceFiles: string[]) { + return !!this.getFilesFor(sourceFiles)?.length + } + + getFilesFor (sourceFiles: string[]) { + return Object.keys(this.files).reduce((files, sourceFilePath) => { + return sourceFiles.includes(sourceFilePath) ? files.concat(this.files[sourceFilePath]) : files + }, [] as CrossOriginCallbackStoreFile[]) + } + + reset (sourceFilePath: string) { + this.files[sourceFilePath] = [] + } +} + +export const crossOriginCallbackStore = new CrossOriginCallbackStore() diff --git a/npm/webpack-preprocessor/lib/utils.ts b/npm/webpack-preprocessor/lib/utils.ts new file mode 100644 index 0000000000..e51a2e723d --- /dev/null +++ b/npm/webpack-preprocessor/lib/utils.ts @@ -0,0 +1,43 @@ +import _ from 'lodash' +import * as os from 'os' +import path from 'path' +import md5 from 'md5' +import Bluebird from 'bluebird' +import fs from 'fs-extra' + +function createDeferred () { + let resolve: (thenableOrResult?: T | PromiseLike | undefined) => void + let reject: any + const promise = new Bluebird(function (_resolve, _reject) { + resolve = _resolve + reject = _reject + }) + + return { + //@ts-ignore + resolve, + reject, + promise, + } +} + +function hash (contents: string) { + return md5(contents) +} + +function rmdir (dirPath: string) { + return fs.emptyDir(dirPath) +} + +function tmpdir (dirname?: string) { + const pathParts = _.compact([os.tmpdir(), 'cypress', 'webpack-preprocessor', dirname]) + + return path.join(...pathParts) +} + +export default { + createDeferred, + hash, + rmdir, + tmpdir, +} diff --git a/npm/webpack-preprocessor/package.json b/npm/webpack-preprocessor/package.json index 894b78f576..ff118d8142 100644 --- a/npm/webpack-preprocessor/package.json +++ b/npm/webpack-preprocessor/package.json @@ -17,12 +17,15 @@ "test-unit": "mocha test/unit/*.spec.*", "test-watch": "yarn test-unit & chokidar '**/*.(js|ts)' 'test/unit/*.(js|ts)' -c 'yarn test-unit'", "check-ts": "tsc --noEmit", - "watch": "yarn build --watch" + "watch": "rimraf dist && tsc --watch" }, "dependencies": { "bluebird": "3.7.1", "debug": "^4.3.2", - "lodash": "^4.17.20" + "fs-extra": "^10.1.0", + "loader-utils": "^2.0.0", + "lodash": "^4.17.20", + "webpack-virtual-modules": "^0.4.4" }, "devDependencies": { "@babel/core": "^7.0.1", @@ -37,6 +40,7 @@ "chai": "4.1.2", "chalk": "3.0.0", "chokidar-cli": "2.1.0", + "common-tags": "^1.8.2", "cypress": "0.0.0-development", "dependency-check": "2.9.1", "deps-ok": "1.2.1", @@ -46,7 +50,7 @@ "eslint-plugin-mocha": "8.1.0", "fast-glob": "3.1.1", "find-webpack": "1.5.0", - "fs-extra": "9.1.0", + "md5": "2.3.0", "mocha": "^7.1.0", "mockery": "2.1.0", "proxyquire": "2.1.3", @@ -76,7 +80,7 @@ "type": "git", "url": "https://github.com/cypress-io/cypress.git" }, - "homepage": "https://github.com/cypress-io/cypress/tree/master/npm/webpack-preprocessor#readme", + "homepage": "https://github.com/cypress-io/cypress/tree/develop/npm/webpack-preprocessor#readme", "bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A%20%40cypress%2Fwebpack-preprocessor&template=1-bug-report.md&title=", "keywords": [ "cypress", diff --git a/npm/webpack-preprocessor/test/unit/cross-origin-callback-loader.spec.ts b/npm/webpack-preprocessor/test/unit/cross-origin-callback-loader.spec.ts new file mode 100644 index 0000000000..8bf7ac4b2a --- /dev/null +++ b/npm/webpack-preprocessor/test/unit/cross-origin-callback-loader.spec.ts @@ -0,0 +1,275 @@ +'use strict' + +import chai, { expect } from 'chai' +import { stripIndent } from 'common-tags' +import * as sinon from 'sinon' +import sinonChai from 'sinon-chai' +import utils from '../../lib/utils' +import { CrossOriginCallbackStore } from '../../lib/cross-origin-callback-store' + +chai.use(sinonChai) + +import loader from '../../lib/cross-origin-callback-loader' + +const expectAddFileSource = (store) => { + return expect(store.addFile.lastCall.args[1].source) +} + +describe('./lib/cross-origin-callback-loader', () => { + const callLoader = (source, commands = ['origin']) => { + const store = new CrossOriginCallbackStore() + const callback = sinon.spy() + const context = { + callback, + resourcePath: '/path/to/file', + query: { commands }, + } + const originalMap = { sourcesContent: [] } + + store.addFile = sinon.stub() + loader.call(context, source, originalMap, null, store) + + return { + store, + originalMap, + resultingSource: callback.lastCall.args[1], + resultingMap: callback.lastCall.args[2], + } + } + + beforeEach(() => { + sinon.restore() + }) + + describe('noop scenarios', () => { + it('is a noop when parsing source fails', () => { + const { originalMap, resultingSource, resultingMap, store } = callLoader(undefined) + + expect(resultingSource).to.be.undefined + expect(resultingMap).to.be.equal(originalMap) + expect(store.addFile).not.to.be.called + }) + + it('is a noop when source does not contain cy.origin()', () => { + const source = `it('test', () => { + cy.get('h1') + })` + const { originalMap, resultingSource, resultingMap, store } = callLoader(source) + + expect(resultingSource).to.be.equal(source) + expect(resultingMap).to.be.equal(originalMap) + expect(store.addFile).not.to.be.called + }) + + it('is a noop when cy.origin() callback does not contain Cypress.require()', () => { + const source = `it('test', () => { + cy.origin('http://foobar.com:3500', () => {}) + })` + const { originalMap, resultingSource, resultingMap, store } = callLoader(source) + + expect(resultingSource).to.be.equal(source) + expect(resultingMap).to.be.equal(originalMap) + expect(store.addFile).not.to.be.called + }) + + it('is a noop when last argument to cy.origin() is not a callback', () => { + const source = `it('test', () => { + cy.origin('http://foobar.com:3500', {}) + })` + const { originalMap, resultingSource, resultingMap, store } = callLoader(source) + + expect(resultingSource).to.be.equal(source) + expect(resultingMap).to.be.equal(originalMap) + expect(store.addFile).not.to.be.called + }) + }) + + describe('replacement scenarios', () => { + beforeEach(() => { + sinon.stub(utils, 'hash').returns('abc123') + sinon.stub(utils, 'tmpdir').returns('/path/to/tmp') + }) + + it('replaces cy.origin() callback with an object', () => { + const { resultingSource, resultingMap } = callLoader(stripIndent` + it('test', () => { + cy.origin('http://foobar.com:3500', () => { + Cypress.require('../support/utils') + }) + })`) + + expect(resultingSource).to.equal(stripIndent` + it('test', () => { + cy.origin('http://foobar.com:3500', { + "callbackName": "__cypressCrossOriginCallback", + "outputFilePath": "/path/to/tmp/cross-origin-cb-abc123.js" + }); + });`) + + expect(resultingMap).to.be.undefined + }) + + it('replaces cy.other() when specified in commands', () => { + const { resultingSource, resultingMap } = callLoader(stripIndent` + it('test', () => { + cy.other('http://foobar.com:3500', () => { + Cypress.require('../support/utils') + }) + })`, + ['other']) + + expect(resultingSource).to.equal(stripIndent` + it('test', () => { + cy.other('http://foobar.com:3500', { + "callbackName": "__cypressCrossOriginCallback", + "outputFilePath": "/path/to/tmp/cross-origin-cb-abc123.js" + }); + });`) + + expect(resultingMap).to.be.undefined + }) + + it('adds the file to the store, replacing Cypress.require() with require()', () => { + const { store } = callLoader( + `it('test', () => { + cy.origin('http://foobar.com:3500', () => { + Cypress.require('../support/utils') + }) + })`, + ) + + expect(store.addFile).to.be.calledWithMatch('/path/to/file', { + inputFileName: 'cross-origin-cb-abc123', + outputFilePath: '/path/to/tmp/cross-origin-cb-abc123.js', + }) + }) + + // arrow expression is implicitly tested in other tests + it('works when callback is a function expression', () => { + const { store } = callLoader( + `it('test', () => { + cy.origin('http://foobar.com:3500', function () { + Cypress.require('../support/utils') + }) + })`, + ) + + expectAddFileSource(store).to.equal(stripIndent` + __cypressCrossOriginCallback = function () { + require('../support/utils'); + }`) + }) + + it('works when dep is not assigned to a variable', () => { + const { store } = callLoader( + `it('test', () => { + cy.origin('http://foobar.com:3500', () => { + Cypress.require('../support/utils') + }) + })`, + ) + + expectAddFileSource(store).to.equal(stripIndent` + __cypressCrossOriginCallback = () => { + require('../support/utils'); + }`) + }) + + it('works when dep is assigned to a variable', () => { + const { store } = callLoader( + `it('test', () => { + cy.origin('http://foobar.com:3500', () => { + const utils = Cypress.require('../support/utils') + utils.foo() + }) + })`, + ) + + expectAddFileSource(store).to.equal(stripIndent` + __cypressCrossOriginCallback = () => { + const utils = require('../support/utils'); + + utils.foo(); + }`) + }) + + it('works with multiple Cypress.require()s', () => { + const { store } = callLoader( + `it('test', () => { + cy.origin('http://foobar.com:3500', () => { + Cypress.require('../support/commands') + const utils = Cypress.require('../support/utils') + const _ = Cypress.require('lodash') + }) + })`, + ) + + expectAddFileSource(store).to.equal(stripIndent` + __cypressCrossOriginCallback = () => { + require('../support/commands'); + + const utils = require('../support/utils'); + + const _ = require('lodash'); + }`) + }) + + it('works when .origin() is chained off another command', () => { + const { store } = callLoader( + `it('test', () => { + cy + .wrap({}) + .origin('http://foobar.com:3500', () => { + Cypress.require('../support/commands') + }) + })`, + ) + + expectAddFileSource(store).to.equal(stripIndent` + __cypressCrossOriginCallback = () => { + require('../support/commands'); + }`) + }) + + it('works when result of require() is invoked', () => { + const { store } = callLoader( + `it('test', () => { + cy.origin('http://foobar.com:3500', () => { + const someVar = 'someValue' + const result = Cypress.require('./fn')(someVar) + expect(result).to.equal('mutated someVar') + }) + })`, + ) + + expectAddFileSource(store).to.equal(stripIndent` + __cypressCrossOriginCallback = () => { + const someVar = 'someValue'; + + const result = require('./fn')(someVar); + + expect(result).to.equal('mutated someVar'); + }`) + }) + + it('works when dependencies passed into called', () => { + const { store } = callLoader( + `it('test', () => { + cy.origin('http://foobar.com:3500', { args: { foo: 'foo'}}, ({ foo }) => { + const result = Cypress.require('./fn')(foo) + expect(result).to.equal('mutated someVar') + }) + })`, + ) + + expectAddFileSource(store).to.equal(stripIndent` + __cypressCrossOriginCallback = ({ + foo + }) => { + const result = require('./fn')(foo); + + expect(result).to.equal('mutated someVar'); + }`) + }) + }) +}) diff --git a/npm/webpack-preprocessor/test/unit/index.spec.js b/npm/webpack-preprocessor/test/unit/index.spec.js index 37d4247aae..b22f310026 100644 --- a/npm/webpack-preprocessor/test/unit/index.spec.js +++ b/npm/webpack-preprocessor/test/unit/index.spec.js @@ -23,7 +23,10 @@ mockery.enable({ mockery.registerMock('webpack', webpack) const preprocessor = require('../../index') +const utils = require('../../lib/utils').default const typescriptOverrides = require('../../lib/typescript-overrides') +const crossOriginCallbackStore = require('../../lib/cross-origin-callback-store').crossOriginCallbackStore +const crossOriginCallbackCompile = require('../../lib/cross-origin-callback-compile') describe('webpack preprocessor', function () { beforeEach(function () { @@ -65,6 +68,9 @@ describe('webpack preprocessor', function () { onClose: sinon.stub(), } + sinon.stub(utils, 'rmdir').resolves() + sinon.stub(utils, 'tmpdir').returns('/path/to/tmp/dir') + this.run = (options, file = this.file) => { return preprocessor(options)(file) } @@ -161,6 +167,79 @@ describe('webpack preprocessor', function () { }) }) + describe('cross-origin callback compilation', function () { + beforeEach(function () { + global.__cypressCallbackReplacementCommands = ['origin'] + + this.files = [] + + sinon.stub(crossOriginCallbackStore, 'hasFilesFor').returns(true) + sinon.stub(crossOriginCallbackStore, 'getFilesFor').returns(this.files) + sinon.stub(crossOriginCallbackCompile, 'compileCrossOriginCallbackFiles').resolves() + sinon.stub(crossOriginCallbackStore, 'reset') + + this.statsApi = { + hasErrors: () => false, + toJson () { + return { warnings: [], errors: [], modules: [] } + }, + } + + this.compilerApi.run.yields(null, this.statsApi) + }) + + afterEach(function () { + global.__cypressCallbackReplacementCommands = undefined + }) + + it('adds cross-origin callback loader when flag is on', function () { + const options = { webpackOptions: { devtool: false, module: { rules: [] } } } + + return this.run(options).then(() => { + expect(options.webpackOptions.module.rules[0].use[0].loader).to.include('cross-origin-callback-loader') + }) + }) + + it('runs additional compilation for cross-origin callback files', function () { + return this.run().then(() => { + expect(crossOriginCallbackCompile.compileCrossOriginCallbackFiles).to.be.calledWith(this.files) + expect(crossOriginCallbackStore.reset).to.be.called + }) + }) + + it('rejects the main bundle promise if callback file compilation errors', function () { + const err = new Error('compilation failed') + + crossOriginCallbackCompile.compileCrossOriginCallbackFiles.rejects(err) + + return this.run() + .then(() => { + throw new Error('should not resolve') + }) + .catch((_err) => { + expect(_err).to.equal(err) + expect(crossOriginCallbackStore.reset).to.be.called + }) + }) + + it('does not compile files when no commands are specified', function () { + global.__cypressCallbackReplacementCommands = undefined + + return this.run().then(() => { + expect(crossOriginCallbackStore.hasFilesFor).not.to.be.called + expect(crossOriginCallbackCompile.compileCrossOriginCallbackFiles).not.to.be.called + }) + }) + + it('does not compile files there are no files', function () { + crossOriginCallbackStore.hasFilesFor.returns(false) + + return this.run().then(() => { + expect(crossOriginCallbackCompile.compileCrossOriginCallbackFiles).not.to.be.called + }) + }) + }) + describe('devtool', function () { beforeEach((() => { sinon.stub(typescriptOverrides, 'overrideSourceMaps') @@ -177,7 +256,7 @@ describe('webpack preprocessor', function () { }) it('does not enable inline source maps when devtool is false', function () { - const options = { webpackOptions: { devtool: false } } + const options = { webpackOptions: { devtool: false, module: { rules: [] } } } return this.run(options).then(() => { expect(webpack).to.be.calledWithMatch({ @@ -189,7 +268,7 @@ describe('webpack preprocessor', function () { }) it('always sets devtool even when mode is "production"', function () { - const options = { webpackOptions: { mode: 'production' } } + const options = { webpackOptions: { mode: 'production', module: { rules: [] } } } return this.run(options).then(() => { expect(webpack).to.be.calledWithMatch({ @@ -211,7 +290,7 @@ describe('webpack preprocessor', function () { }) it('follows user mode if present', function () { - const options = { webpackOptions: { mode: 'production' } } + const options = { webpackOptions: { mode: 'production', module: { rules: [] } } } return this.run(options).then(() => { expect(webpack).to.be.calledWithMatch({ @@ -307,6 +386,15 @@ describe('webpack preprocessor', function () { }) }) + it('deletes temp dir when `close` is emitted', function () { + this.compilerApi.watch.yields(null, this.statsApi) + + return this.run().then(() => { + this.file.on.withArgs('close').yield() + expect(utils.rmdir).to.be.calledWith(utils.tmpdir()) + }) + }) + it('uses default webpack options when no user options', function () { return this.run().then(() => { expect(webpack.lastCall.args[0].module.rules[0].use).to.have.length(1) diff --git a/npm/webpack-preprocessor/tsconfig.json b/npm/webpack-preprocessor/tsconfig.json index 032ac5f098..8d5c7cc20d 100644 --- a/npm/webpack-preprocessor/tsconfig.json +++ b/npm/webpack-preprocessor/tsconfig.json @@ -45,7 +45,7 @@ // "typeRoots": [], /* List of folders to include type definitions from. */ // "types": [], /* Type declaration files to be included in compilation. */ // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ - // "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ + "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ @@ -62,5 +62,5 @@ /* Advanced Options */ "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ }, - "include": ["./*.ts"] + "include": ["./*.ts", "./lib/*.ts"] } diff --git a/npm/xpath/.eslintrc b/npm/xpath/.eslintrc new file mode 100644 index 0000000000..220212842e --- /dev/null +++ b/npm/xpath/.eslintrc @@ -0,0 +1,17 @@ +{ + "plugins": [ + "cypress" + ], + "extends": [ + "plugin:@cypress/dev/tests" + ], + "env": { + "cypress/globals": true + }, + "rules": { + "mocha/no-global-tests": "off", + "no-unused-vars": "off", + "no-console": "off", + "@typescript-eslint/no-unused-vars": "off" + } +} diff --git a/npm/xpath/.releaserc.js b/npm/xpath/.releaserc.js new file mode 100644 index 0000000000..03ddcf9ab4 --- /dev/null +++ b/npm/xpath/.releaserc.js @@ -0,0 +1,6 @@ +module.exports = { + ...require('../../.releaserc.base'), + branches: [ + { name: 'develop', channel: 'latest' }, + ], +} diff --git a/npm/xpath/README.md b/npm/xpath/README.md new file mode 100644 index 0000000000..339fce4e35 --- /dev/null +++ b/npm/xpath/README.md @@ -0,0 +1,82 @@ +# @cypress/xpath + +> Adds XPath command to [Cypress.io](https://www.cypress.io) test runner + +## Install with npm + +```shell +npm install -D @cypress/xpath +``` + +## Install with Yarn + +```shell +yarn add @cypress/xpath --dev +``` + +Then include in your project's [support file](https://on.cypress.io/support-file) + +```js +require('@cypress/xpath'); +``` + +## Use + +After installation your `cy` object will have `xpath` command. + +```js +it('finds list items', () => { + cy.xpath('//ul[@class="todo-list"]//li').should('have.length', 3); +}); +``` + +You can also chain `xpath` off of another command. + +```js +it('finds list items', () => { + cy.xpath('//ul[@class="todo-list"]').xpath('./li').should('have.length', 3); +}); +``` + +As with other cy commands, it is scoped by `cy.within()`. + +```js +it('finds list items', () => { + cy.xpath('//ul[@class="todo-list"]').within(() => { + cy.xpath('./li').should('have.length', 3); + }); +}); +``` + +**note:** you can test XPath expressions from DevTools console using `$x(...)` function, for example `$x('//div')` to find all divs. + +See [cypress/e2e/spec.cy.js](cypress/e2e/spec.cy.js) + +## Beware the XPath // trap + +In XPath the expression // means something very specific, and it might not be what you think. Contrary to common belief, // means "anywhere in the document" not "anywhere in the current context". As an example: + +```js +cy.xpath('//body').xpath('//script'); +``` + +You might expect this to find all script tags in the body, but actually, it finds all script tags in the entire document, not only those in the body! What you're looking for is the .// expression which means "any descendant of the current node": + +```js +cy.xpath('//body').xpath('.//script'); +``` + +The same thing goes for within: + +```js +cy.xpath('//body').within(() => { + cy.xpath('.//script'); +}); +``` + + +For more, see [Intelligent Code Completion](https://on.cypress.io/intellisense) + +## License + +This project is licensed under the terms of the [MIT license](/LICENSE.md). diff --git a/npm/xpath/cypress.config.js b/npm/xpath/cypress.config.js new file mode 100644 index 0000000000..e7a2ffb6dc --- /dev/null +++ b/npm/xpath/cypress.config.js @@ -0,0 +1,12 @@ +const { defineConfig } = require('cypress') + +module.exports = defineConfig({ + e2e: { + excludeSpecPattern: '*.html', + supportFile: 'cypress/support/e2e.js', + }, + component: { + excludeSpecPattern: '*.html', + supportFile: 'cypress/support/e2e.js', + }, +}) diff --git a/npm/xpath/cypress/e2e/index.html b/npm/xpath/cypress/e2e/index.html new file mode 100644 index 0000000000..ebe8a49935 --- /dev/null +++ b/npm/xpath/cypress/e2e/index.html @@ -0,0 +1,26 @@ + +

+

cypress-xpath

+ +
+ + +
+
+ + \ No newline at end of file diff --git a/npm/xpath/cypress/e2e/spec.cy.js b/npm/xpath/cypress/e2e/spec.cy.js new file mode 100644 index 0000000000..c88881f93a --- /dev/null +++ b/npm/xpath/cypress/e2e/spec.cy.js @@ -0,0 +1,183 @@ +/// +/// + +describe('cypress-xpath', () => { + it('adds xpath command', () => { + expect(cy).property('xpath').to.be.a('function') + }) + + context('elements', () => { + beforeEach(() => { + cy.visit('cypress/e2e/index.html') + }) + + it('finds h1', () => { + cy.xpath('//h1').should('have.length', 1) + }) + + it('returns jQuery wrapped elements', () => { + cy.xpath('//h1').then((el$) => { + expect(el$).to.have.property('jquery') + }) + }) + + it('returns primitives as is', () => { + cy.xpath('string(//h1)').then((el$) => { + expect(el$).to.not.have.property('jquery') + }) + }) + + it('provides jQuery wrapped elements to assertions', () => { + cy.xpath('//h1').should((el$) => { + expect(el$).to.have.property('jquery') + }) + }) + + it('gets h1 text', () => { + cy.xpath('//h1/text()') + .its('0.textContent') + .should('equal', 'cypress-xpath') + }) + + it('retries until element is inserted', () => { + // the element will be inserted after 1 second + cy.xpath('string(//*[@id="inserted"])').should('equal', 'inserted text') + }) + + describe('chaining', () => { + it('finds h1 within main', () => { + // first assert that h1 doesn't exist as a child of the implicit document subject + cy.xpath('./h1').should('not.exist') + + cy.xpath('//main').xpath('./h1').should('exist') + }) + + it('finds body outside of main when succumbing to // trap', () => { + // first assert that body doesn't actually exist within main + cy.xpath('//main').xpath('.//body').should('not.exist') + + cy.xpath('//main').xpath('//body').should('exist') + }) + + it('finds h1 within document', () => { + cy.document().xpath('//h1').should('exist') + }) + + it('throws when subject is more than a single element', (done) => { + cy.on('fail', (err) => { + expect(err.message).to.eq( + 'xpath() can only be called on a single element. Your subject contained 2 elements.', + ) + + done() + }) + + cy.get('main, div').xpath('foo') + }) + }) + + describe('within()', () => { + it('finds h1 within within-subject', () => { + // first assert that h1 doesn't exist as a child of the implicit document subject + cy.xpath('./h1').should('not.exist') + + cy.xpath('//main').within(() => { + cy.xpath('./h1').should('exist') + }) + }) + + it('finds body outside of within-subject when succumbing to // trap', () => { + // first assert that body doesn't actually exist within main + cy.xpath('//main').within(() => { + cy.xpath('.//body').should('not.exist') + }) + + cy.xpath('//main').within(() => { + cy.xpath('//body').should('exist') + }) + }) + }) + + describe('primitives', () => { + it('counts h1 elements', () => { + cy.xpath('count(//h1)').should('equal', 1) + }) + + it('returns h1 text content', () => { + cy.xpath('string(//h1)').should('equal', 'cypress-xpath') + }) + + it('returns boolean', () => { + cy.xpath('boolean(//h1)').should('be.true') + cy.xpath('boolean(//h2)').should('be.false') + }) + }) + + describe('typing', () => { + it('works on text input', () => { + cy.xpath('//*[@id="name"]').type('World') + cy.contains('span#greeting', 'Hello, World') + }) + }) + + describe('clicking', () => { + it('on button', () => { + // this button invokes window.alert when clicked + const alert = cy.stub() + + cy.on('window:alert', alert) + cy.xpath('//*[@id="first-button"]') + .click() + .then(() => { + expect(alert).to.have.been.calledOnce + }) + }) + }) + }) + + context('logging', () => { + beforeEach(() => { + cy.visit('cypress/e2e/index.html') + }) + + it('should log by default', () => { + cy.spy(Cypress, 'log').log(false) + + cy.xpath('//h1').then(() => { + expect(Cypress.log).to.be.calledWithMatch({ name: 'xpath' }) + }) + }) + + it('logs the selector when not found', (done) => { + cy.xpath('//h1') // does exist + cy.on('fail', (e) => { + const isExpectedErrorMessage = (message) => { + return message.includes('Timed out retrying') && + message.includes( + 'Expected to find element: `//h2`, but never found it.', + ) + } + + if (!isExpectedErrorMessage(e.message)) { + console.error('Cypress test failed with an unexpected error message') + console.error(e) + + return done(e) + } + + // no errors, the error message for not found selector is correct + done() + }) + + cy.xpath('//h2', { timeout: 100 }) // does not exist + }) + + it('should not log when provided log: false', () => { + cy.spy(Cypress, 'log').log(false) + + cy.xpath('//h1', { log: false }).then(() => { + expect(Cypress.log).to.not.be.calledWithMatch({ name: 'xpath' }) + }) + }) + }) +}) diff --git a/npm/xpath/cypress/fixtures/example.json b/npm/xpath/cypress/fixtures/example.json new file mode 100644 index 0000000000..da18d9352a --- /dev/null +++ b/npm/xpath/cypress/fixtures/example.json @@ -0,0 +1,5 @@ +{ + "name": "Using fixtures to represent data", + "email": "hello@cypress.io", + "body": "Fixtures are a great way to mock data for responses to routes" +} \ No newline at end of file diff --git a/npm/xpath/cypress/support/e2e.js b/npm/xpath/cypress/support/e2e.js new file mode 100644 index 0000000000..10ea61f87d --- /dev/null +++ b/npm/xpath/cypress/support/e2e.js @@ -0,0 +1,16 @@ +// *********************************************************** +// This example support/index.js is processed and +// loaded automatically before your test files. +// +// This is a great place to put global configuration and +// behavior that modifies Cypress. +// +// You can change the location of this file or turn off +// automatically serving support files with the +// 'supportFile' configuration option. +// +// You can read more here: +// https://on.cypress.io/configuration +// *********************************************************** + +import '../../src' diff --git a/npm/xpath/images/cypress-xpath-reference.gif b/npm/xpath/images/cypress-xpath-reference.gif new file mode 100644 index 0000000000..97ebfa8f41 Binary files /dev/null and b/npm/xpath/images/cypress-xpath-reference.gif differ diff --git a/npm/xpath/package.json b/npm/xpath/package.json new file mode 100644 index 0000000000..8d64100997 --- /dev/null +++ b/npm/xpath/package.json @@ -0,0 +1,32 @@ +{ + "name": "@cypress/xpath", + "version": "0.0.0-development", + "description": "Adds XPath command to Cypress.io test runner", + "main": "scripts", + "scripts": { + "cy:run": "node ../../scripts/cypress.js run --e2e", + "cy:open": "node ../../scripts/cypress.js open --e2e --project ${PWD}" + }, + "files": [ + "src" + ], + "types": "src", + "license": "MIT", + "repository": { + "type": "git", + "url": "git+https://github.com/cypress-io/cypress.git" + }, + "homepage": "https://github.com/cypress-io/cypress/tree/develop/npm/xpath#readme", + "author": "Cypress Tools Team", + "bugs": { + "url": "https://github.com/cypress-io/cypress/issues" + }, + "keywords": [ + "cypress", + "cypress-io", + "xpath" + ], + "publishConfig": { + "access": "public" + } +} diff --git a/npm/xpath/src/index.d.ts b/npm/xpath/src/index.d.ts new file mode 100644 index 0000000000..e93ada6e34 --- /dev/null +++ b/npm/xpath/src/index.d.ts @@ -0,0 +1,15 @@ +/// + +declare namespace Cypress { + interface Chainable { + /** + * Get one or more DOM elements by an XPath selector. + * **Note:** you can test XPath expressions from DevTools console using $x(...) function, for example $x('//div') to find all divs. + * @see https://github.com/cypress-io/cypress-xpath + * @example + * cy.xpath(`//ul[@class="todo-list"]//li`) + * .should('have.length', 3) + */ + xpath(selector: string, options?: Partial): Chainable> + } +} \ No newline at end of file diff --git a/npm/xpath/src/index.js b/npm/xpath/src/index.js new file mode 100644 index 0000000000..62001bebf9 --- /dev/null +++ b/npm/xpath/src/index.js @@ -0,0 +1,165 @@ +/* eslint-disable no-redeclare */ +/// + +/** + * Adds XPath support to Cypress using a custom command. + * + * @see https://devhints.io/xpath + * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Introduction_to_using_XPath_in_JavaScript + * @example + ```js + it('finds list items', () => { + cy.xpath('//ul[@class="todo-list"]//li') + .should('have.length', 3) + }) + ``` + */ +const xpath = (subject, selector, options = {}) => { + /* global XPathResult */ + const isNumber = (xpathResult) => { + return xpathResult.resultType === XPathResult.NUMBER_TYPE + } + const numberResult = (xpathResult) => xpathResult.numberValue + + const isString = (xpathResult) => { + return xpathResult.resultType === XPathResult.STRING_TYPE + } + const stringResult = (xpathResult) => xpathResult.stringValue + + const isBoolean = (xpathResult) => { + return xpathResult.resultType === XPathResult.BOOLEAN_TYPE + } + const booleanResult = (xpathResult) => xpathResult.booleanValue + + const isPrimitive = (x) => { + return Cypress._.isNumber(x) || Cypress._.isString(x) || Cypress._.isBoolean(x) + } + + // options to log later + const log = { + name: 'xpath', + message: selector, + } + + if (Cypress.dom.isElement(subject) && subject.length > 1) { + throw new Error( + `xpath() can only be called on a single element. Your subject contained ${ + subject.length + } elements.`, + ) + } + + const getValue = () => { + let nodes = [] + let contextNode + let withinSubject = cy.state('withinSubject') + + if (Cypress.dom.isElement(subject)) { + contextNode = subject[0] + } else if (Cypress.dom.isDocument(subject)) { + contextNode = subject + } else if (withinSubject) { + contextNode = withinSubject[0] + } else { + contextNode = cy.state('window').document + } + + let iterator = (contextNode.ownerDocument || contextNode).evaluate( + selector, + contextNode, + ) + + if (isNumber(iterator)) { + const result = numberResult(iterator) + + log.consoleProps = () => { + return { + XPath: selector, + type: 'number', + result, + } + } + + return result + } + + if (isString(iterator)) { + const result = stringResult(iterator) + + log.consoleProps = () => { + return { + XPath: selector, + type: 'string', + result, + } + } + + return result + } + + if (isBoolean(iterator)) { + const result = booleanResult(iterator) + + log.consoleProps = () => { + return { + XPath: selector, + type: 'boolean', + result, + } + } + + return result + } + + try { + let node = iterator.iterateNext() + + while (node) { + nodes.push(node) + node = iterator.iterateNext() + } + + log.consoleProps = () => { + return { + XPath: selector, + result: nodes.length === 1 ? nodes[0] : nodes, + } + } + + return nodes + } catch (e) { + console.error('Document tree modified during iteration', e) + + return null + } + } + + const resolveValue = () => { + return Cypress.Promise.try(getValue).then((value) => { + if (!isPrimitive(value)) { + value = Cypress.$(value) + // Add the ".selector" property because Cypress uses it for error messages + value.selector = selector + } + + return cy.verifyUpcomingAssertions(value, options, { + onRetry: resolveValue, + }) + }) + } + + return resolveValue().then((value) => { + if (options.log !== false) { + // TODO set found elements on the command log? + Cypress.log(log) + } + + return value + }) +} + +Cypress.Commands.add( + 'xpath', + { prevSubject: ['optional', 'element', 'document'] }, + xpath, +) diff --git a/packages/app/cypress/e2e/specs_list_latest_runs.cy.ts b/packages/app/cypress/e2e/specs_list_latest_runs.cy.ts index db4757616f..e8cef2166d 100644 --- a/packages/app/cypress/e2e/specs_list_latest_runs.cy.ts +++ b/packages/app/cypress/e2e/specs_list_latest_runs.cy.ts @@ -31,21 +31,17 @@ function assertCorrectRunsLink (specFileName: string, status: string) { } function validateTooltip (status: string) { - cy.validateExternalLink({ - // TODO: (#23778) This name is so long because the entire tooltip is wrapped in a link, - // we can make this more accessible by having the name of the link describe the destination - // (which is currently not described) and keeping the other content separate. - name: `accounts_new.spec.js ${status} 4 months ago 2:23 - 2:39 skipped pending passed failed`, - // the main thing about testing this link is that is gets composed with the expected UTM params - href: makeTestingCloudLink(status), - }) + cy.get(`a[href="${makeTestingCloudLink(status)}"]`) .should('contain.text', 'accounts_new.spec.js') - .and('contain.text', '4 months ago') .and('contain.text', '2:23 - 2:39') .and('contain.text', 'skipped 0') .and('contain.text', 'pending 1-2') .and('contain.text', `passed 22-23`) .and('contain.text', 'failed 1-2') + .invoke('text') + .should((text) => { + expect(text).to.match(/\d+ (day|week|month|year)s? ago/) + }) } function specShouldShow (specFileName: string, runDotsClasses: string[], latestRunStatus: CloudRunStatus|'PLACEHOLDER') { diff --git a/packages/config/README.md b/packages/config/README.md index 76a33c9c77..8e05385ad8 100644 --- a/packages/config/README.md +++ b/packages/config/README.md @@ -1,6 +1,6 @@ # Config -The `config` package contains the configuration types and validation used in both the `server` and the `driver` for setting the Cypress configuration values. +The `config` package contains the configuration types and validation used in both the `server`, the `data-context` and the `driver` for setting the Cypress configuration values. ## Testing diff --git a/packages/config/__snapshots__/index.spec.ts.js b/packages/config/__snapshots__/index.spec.ts.js index 0a367f0dbc..286c8a73ad 100644 --- a/packages/config/__snapshots__/index.spec.ts.js +++ b/packages/config/__snapshots__/index.spec.ts.js @@ -52,6 +52,7 @@ exports['config/src/index .getDefaultValues returns list of public config keys 1 "port": null, "projectId": null, "redirectionLimit": 20, + "repoRoot": null, "reporter": "spec", "reporterOptions": null, "requestTimeout": 5000, @@ -136,6 +137,7 @@ exports['config/src/index .getDefaultValues returns list of public config keys f "port": null, "projectId": null, "redirectionLimit": 20, + "repoRoot": null, "reporter": "spec", "reporterOptions": null, "requestTimeout": 5000, diff --git a/packages/config/src/options.ts b/packages/config/src/options.ts index dd39341ae1..8173d48d92 100644 --- a/packages/config/src/options.ts +++ b/packages/config/src/options.ts @@ -501,6 +501,11 @@ const runtimeOptions: Array = [ defaultValue: '__cypress', validation: validate.isString, isInternal: true, + }, { + name: 'repoRoot', + defaultValue: null, + validation: validate.isString, + isInternal: true, }, { name: 'reporterRoute', defaultValue: '/__cypress/reporter', diff --git a/packages/config/src/project/index.ts b/packages/config/src/project/index.ts index 9c68ce2f7c..d582ad856b 100644 --- a/packages/config/src/project/index.ts +++ b/packages/config/src/project/index.ts @@ -21,7 +21,7 @@ const debug = Debug('cypress:config:project') // TODO: any -> SetupFullConfigOptions in data-context/src/data/ProjectConfigManager.ts export function setupFullConfigWithDefaults (obj: any = {}, getFilesByGlob: any): Promise { debug('setting config object %o', obj) - let { projectRoot, projectName, config, envFile, options, cliConfig } = obj + let { projectRoot, projectName, config, envFile, options, cliConfig, repoRoot } = obj // just force config to be an object so we dont have to do as much // work in our tests @@ -35,6 +35,7 @@ export function setupFullConfigWithDefaults (obj: any = {}, getFilesByGlob: any) config.envFile = envFile config.projectRoot = projectRoot config.projectName = projectName + config.repoRoot = repoRoot // @ts-ignore return mergeDefaults(config, options, cliConfig, getFilesByGlob) diff --git a/packages/data-context/src/DataContext.ts b/packages/data-context/src/DataContext.ts index d89e31f617..0eb7304a0a 100644 --- a/packages/data-context/src/DataContext.ts +++ b/packages/data-context/src/DataContext.ts @@ -98,6 +98,10 @@ export class DataContext { this.lifecycleManager = new ProjectLifecycleManager(this) } + get git () { + return this.coreData.currentProjectGitInfo + } + get schema () { return this._config.schema } diff --git a/packages/data-context/src/data/ProjectConfigManager.ts b/packages/data-context/src/data/ProjectConfigManager.ts index b5d882920a..f9d16e47dd 100644 --- a/packages/data-context/src/data/ProjectConfigManager.ts +++ b/packages/data-context/src/data/ProjectConfigManager.ts @@ -461,6 +461,16 @@ export class ProjectConfigManager { ) } + get repoRoot () { + /* + Used to detect the correct file path when a test fails. + It is derived and assigned in the packages/driver in stack_utils. + It's needed to show the correct link to files in repo mgmt tools like GitHub in the dashboard. + Right now we assume the repoRoot is where the `.git` dir is located. + */ + return this.options.ctx.git?.gitBaseDir + } + private async buildBaseFullConfig (configFileContents: Cypress.ConfigOptions, envFile: Cypress.ConfigOptions, options: Partial, withBrowsers = true) { assert(this._testingType, 'Cannot build base full config without a testing type') this.validateConfigRoot(configFileContents, this._testingType) @@ -479,6 +489,7 @@ export class ProjectConfigManager { cliConfig: options.config ?? {}, projectName: path.basename(this.options.projectRoot), projectRoot: this.options.projectRoot, + repoRoot: this.repoRoot, config: _.cloneDeep(configFileContents), envFile: _.cloneDeep(envFile), options: { diff --git a/packages/data-context/src/data/ProjectLifecycleManager.ts b/packages/data-context/src/data/ProjectLifecycleManager.ts index 2dfdc3de73..00e2fc1eaf 100644 --- a/packages/data-context/src/data/ProjectLifecycleManager.ts +++ b/packages/data-context/src/data/ProjectLifecycleManager.ts @@ -395,19 +395,17 @@ export class ProjectLifecycleManager { this.ctx.update((s) => { s.currentProject = projectRoot s.currentProjectGitInfo?.destroy() - if (!this.ctx.isRunMode) { - s.currentProjectGitInfo = new GitDataSource({ - isRunMode: this.ctx.isRunMode, - projectRoot, - onError: this.ctx.onError, - onBranchChange: () => { - this.ctx.emitter.branchChange() - }, - onGitInfoChange: (specPaths) => { - this.ctx.emitter.gitInfoChange(specPaths) - }, - }) - } + s.currentProjectGitInfo = new GitDataSource({ + isRunMode: this.ctx.isRunMode, + projectRoot, + onError: this.ctx.onError, + onBranchChange: () => { + this.ctx.emitter.branchChange() + }, + onGitInfoChange: (specPaths) => { + this.ctx.emitter.gitInfoChange(specPaths) + }, + }) s.diagnostics = { error: null, warnings: [] } s.packageManager = packageManagerUsed diff --git a/packages/data-context/src/sources/GitDataSource.ts b/packages/data-context/src/sources/GitDataSource.ts index e39e985e8b..1750f4ad4f 100644 --- a/packages/data-context/src/sources/GitDataSource.ts +++ b/packages/data-context/src/sources/GitDataSource.ts @@ -93,7 +93,13 @@ export class GitDataSource { debug('exception caught when loading git client') } - if (!config.isRunMode) { + // don't watch/refresh git data in run mode since we only + // need it to detect the .git directory to set `repoRoot` + if (config.isRunMode) { + this.#verifyGitRepo().catch(() => { + // Empty catch for no-floating-promises rule + }) + } else { this.#refreshAllGitData() } } diff --git a/packages/driver/cross-origin-testing.md b/packages/driver/cross-origin-testing.md index d486edc26b..b88fa12be3 100644 --- a/packages/driver/cross-origin-testing.md +++ b/packages/driver/cross-origin-testing.md @@ -125,6 +125,10 @@ Having the **AUT** on a different origin than **top** causes issues with cookies In order to counteract this, we utilize the [proxy](../proxy) to capture cookies from cross-origin responses, store them in our own server-side cookie jar, set them in the browser with automation, and then attach them to cross-origin requests where appropriate. This simulates how cookies behave outside of Cypress. +## Dependencies + +Users can utilize `Cypress.require()` to include dependencies. It's functionally the same as the CommonJs `require()`. We handle the dependency resolution and bundling with the webpack preprocessor. We add a webpack loader that runs last. If we find a `Cypress.require()` call inside a `cy.origin()` callback, we extract that callback from the output code and replace references to `Cypress.require()` with `require()` calls. We then run that extracted callback through webpack again, so that it gets its own output bundle with all dependencies included. The original callback is replaced with an object that references the output bundle. At runtime, when executing `cy.origin()`, it loads and executes the callback bundle. + ## Unsupported APIs Certain APIs are currently not supported in the **cy.origin()** callback. Depending on the API, we may or may not implement support for them in the future. diff --git a/packages/driver/cypress/e2e/cypress/stack_utils.cy.js b/packages/driver/cypress/e2e/cypress/stack_utils.cy.js index 4b6e069c53..9bf68e3b97 100644 --- a/packages/driver/cypress/e2e/cypress/stack_utils.cy.js +++ b/packages/driver/cypress/e2e/cypress/stack_utils.cy.js @@ -23,6 +23,58 @@ describe('driver/src/cypress/stack_utils', () => { }) }) + context('getRelativePathFromRoot', () => { + const relativeFile = 'relative/path/to/file.js' + const absoluteFile = 'User/ruby/cypress/packages/driver/relative/path/to/file.js' + const repoRoot = 'User/ruby/cypress' + const relativePathFromRoot = 'packages/driver/relative/path/to/file.js' + + const actualPlatform = Cypress.config('platform') + const actualRepoRoot = Cypress.config('repoRoot') + + after(() => { + // restore config values to prevent bleeding into subsequent tests + Cypress.config('platform', actualPlatform) + Cypress.config('repoRoot', actualRepoRoot) + }) + + it('returns relativeFile if absoluteFile is empty', () => { + const result = $stackUtils.getRelativePathFromRoot(relativeFile, undefined) + + expect(result).to.equal(relativeFile) + }) + + it('returns relativeFile if `repoRoot` is not set in the config', () => { + const result = $stackUtils.getRelativePathFromRoot(relativeFile, absoluteFile) + + expect(result).to.equal(relativeFile) + }) + + it('returns relativeFile if absoluteFile does not start with `repoRoot`', () => { + Cypress.config('repoRoot', 'User/ruby/test-repo') + const result = $stackUtils.getRelativePathFromRoot(relativeFile, absoluteFile) + + expect(result).to.equal(relativeFile) + }) + + it('returns the relative path from root if the absoluteFile starts with `repoRoot`', () => { + Cypress.config('repoRoot', repoRoot) + const result = $stackUtils.getRelativePathFromRoot(relativeFile, absoluteFile) + + expect(result).to.equal(relativePathFromRoot) + }) + + it('uses posix on windows', () => { + Cypress.config('repoRoot', 'C:/Users/Administrator/Documents/GitHub/cypress') + Cypress.config('platform', 'win32') + const absoluteFile = 'C:\\Users\\Administrator\\Documents\\GitHub\\cypress\\packages\\app/cypress/e2e/reporter_header.cy.ts' + const relativeFile = 'cypress/e2e/reporter_header.cy.ts' + const result = $stackUtils.getRelativePathFromRoot(relativeFile, absoluteFile) + + expect(result).to.equal('packages/app/cypress/e2e/reporter_header.cy.ts') + }) + }) + context('.getCodeFrame', () => { let originalErr const sourceCode = `it('is a failing test', () => { @@ -93,6 +145,14 @@ describe('driver/src/cypress/stack_utils', () => { expect($stackUtils.getCodeFrame(originalErr)).to.be.undefined }) + + it('relativeFile is relative to the repo root when `absoluteFile` starts with `repoRoot`', () => { + Cypress.config('repoRoot', '/dev') + cy.stub($sourceMapUtils, 'getSourceContents').returns(sourceCode) + const codeFrame = $stackUtils.getCodeFrame(originalErr) + + expect(codeFrame.relativeFile).to.equal('app/cypress/integration/features/source_map_spec.js') + }) }) context('.getSourceStack when http links', () => { diff --git a/packages/driver/cypress/e2e/e2e/origin/commands/misc.cy.ts b/packages/driver/cypress/e2e/e2e/origin/commands/misc.cy.ts index 5aca750195..e929d07d61 100644 --- a/packages/driver/cypress/e2e/e2e/origin/commands/misc.cy.ts +++ b/packages/driver/cypress/e2e/e2e/origin/commands/misc.cy.ts @@ -195,9 +195,10 @@ context('cy.origin misc', () => { }) it('verifies number of cy commands', () => { + // remove custom commands we added for our own testing + const customCommands = ['getAll', 'shouldWithTimeout', 'originLoadUtils'] // @ts-ignore - // remove 'getAll' and 'shouldWithTimeout' commands since they are custom commands we added for our own testing and are not actual cy commands - const actualCommands = Cypress._.reject(Object.keys(cy.commandFns), (command) => command === 'getAll' || command === 'shouldWithTimeout') + const actualCommands = Cypress._.reject(Object.keys(cy.commandFns), (command) => customCommands.includes(command)) const expectedCommands = [ 'check', 'uncheck', 'click', 'dblclick', 'rightclick', 'focus', 'blur', 'hover', 'scrollIntoView', 'scrollTo', 'select', 'selectFile', 'submit', 'type', 'clear', 'trigger', 'as', 'ng', 'should', 'and', 'clock', 'tick', 'spread', 'each', 'then', diff --git a/packages/driver/cypress/e2e/e2e/origin/dependencies.cy.jsx b/packages/driver/cypress/e2e/e2e/origin/dependencies.cy.jsx new file mode 100644 index 0000000000..c542249196 --- /dev/null +++ b/packages/driver/cypress/e2e/e2e/origin/dependencies.cy.jsx @@ -0,0 +1,14 @@ +describe('cy.origin dependencies - jsx', () => { + beforeEach(() => { + cy.visit('/fixtures/primary-origin.html') + cy.get('a[data-cy="cross-origin-secondary-link"]').click() + }) + + it('works with a jsx file', () => { + cy.origin('http://foobar.com:3500', () => { + const lodash = Cypress.require('lodash') + + expect(lodash.get({ foo: 'foo' }, 'foo')).to.equal('foo') + }) + }) +}) diff --git a/packages/driver/cypress/e2e/e2e/origin/dependencies.cy.ts b/packages/driver/cypress/e2e/e2e/origin/dependencies.cy.ts new file mode 100644 index 0000000000..687a38e992 --- /dev/null +++ b/packages/driver/cypress/e2e/e2e/origin/dependencies.cy.ts @@ -0,0 +1,131 @@ +describe('cy.origin dependencies', () => { + beforeEach(() => { + cy.visit('/fixtures/primary-origin.html') + cy.get('a[data-cy="cross-origin-secondary-link"]').click() + }) + + it('works with an arrow function', () => { + cy.origin('http://foobar.com:3500', () => { + const lodash = Cypress.require('lodash') + const dayjs = Cypress.require('dayjs') + + expect(lodash.get({ foo: 'foo' }, 'foo')).to.equal('foo') + expect(dayjs('2022-07-29 12:00:00').format('MMMM D, YYYY')).to.equal('July 29, 2022') + + cy.log('command log') + }) + }) + + it('works with a function expression', () => { + cy.origin('http://foobar.com:3500', function () { + const lodash = Cypress.require('lodash') + + expect(lodash.get({ foo: 'foo' }, 'foo')).to.equal('foo') + }) + }) + + it('works with options object + args', () => { + cy.origin('http://foobar.com:3500', { args: ['arg1'] }, ([arg1]) => { + const lodash = Cypress.require('lodash') + + expect(lodash.get({ foo: 'foo' }, 'foo')).to.equal('foo') + expect(arg1).to.equal('arg1') + }) + }) + + it('works with a yielded value', () => { + cy.origin('http://foobar.com:3500', () => { + const lodash = Cypress.require('lodash') + + expect(lodash.get({ foo: 'foo' }, 'foo')).to.equal('foo') + + cy.wrap('yielded value') + }) + .should('equal', 'yielded value') + }) + + it('works with a returned value', () => { + cy.origin('http://foobar.com:3500', () => { + const lodash = Cypress.require('lodash') + + expect(lodash.get({ foo: 'foo' }, 'foo')).to.equal('foo') + + return 'returned value' + }) + .should('equal', 'returned value') + }) + + it('works with multiple cy.origin calls', () => { + cy.origin('http://foobar.com:3500', () => { + const lodash = Cypress.require('lodash') + + expect(lodash.get({ foo: 'foo' }, 'foo')).to.equal('foo') + + cy.get('[data-cy="cross-origin-tertiary-link"]').click() + }) + + cy.origin('http://idp.com:3500', () => { + const dayjs = Cypress.require('dayjs') + + expect(dayjs('2022-07-29 12:00:00').format('MMMM D, YYYY')).to.equal('July 29, 2022') + }) + }) + + it('works with a relative esm dependency', () => { + cy.origin('http://foobar.com:3500', () => { + const { add } = Cypress.require('./dependencies.support-esm') + + expect(add(1, 2)).to.equal(3) + }) + }) + + it('works with a relative commonjs dependency', () => { + cy.origin('http://foobar.com:3500', () => { + const { add } = Cypress.require('./dependencies.support-commonjs') + + expect(add(1, 2)).to.equal(3) + }) + }) + + it('works with args passed to require result', () => { + const args = ['some string'] + + cy.origin('http://foobar.com:3500', { args }, ([arg1]) => { + const result = Cypress.require('./dependencies.support-commonjs')(arg1) + + expect(result).to.equal('some_string') + }) + }) + + it('works in support file', () => { + cy.origin('http://foobar.com:3500', () => { + expect(cy.getAll).to.be.undefined + }) + + cy.originLoadUtils('http://foobar.com:3500') + + cy.origin('http://foobar.com:3500', () => { + expect(cy.getAll).to.be.a('function') + }) + }) + + describe('errors', () => { + it('when dependency does not exist', () => { + cy.on('fail', (err) => { + expect(err.message).to.include('Cannot find module') + }) + + cy.origin('http://foobar.com:3500', () => { + Cypress.require('./does-not-exist') + }) + }) + + it('when Cypress.require() is used outside cy.origin() callback', () => { + cy.on('fail', (err) => { + expect(err.message).to.equal('`Cypress.require()` can only be used inside the `cy.origin()` callback.') + }) + + Cypress.require('./does-not-exist') + }) + }) +}) diff --git a/packages/driver/cypress/e2e/e2e/origin/dependencies.support-commonjs.ts b/packages/driver/cypress/e2e/e2e/origin/dependencies.support-commonjs.ts new file mode 100644 index 0000000000..27c23b84be --- /dev/null +++ b/packages/driver/cypress/e2e/e2e/origin/dependencies.support-commonjs.ts @@ -0,0 +1,7 @@ +function snakeCase (string) { + return _.snakeCase(string) +} + +snakeCase.add = (a, b) => a + b + +module.exports = snakeCase diff --git a/packages/driver/cypress/e2e/e2e/origin/dependencies.support-esm.ts b/packages/driver/cypress/e2e/e2e/origin/dependencies.support-esm.ts new file mode 100644 index 0000000000..86d2d27fd8 --- /dev/null +++ b/packages/driver/cypress/e2e/e2e/origin/dependencies.support-esm.ts @@ -0,0 +1,7 @@ +import _ from 'lodash' + +export const add = (a, b) => a + b + +export default (string) => { + return _.snakeCase(string) +} diff --git a/packages/driver/cypress/fixtures/secondary-origin.html b/packages/driver/cypress/fixtures/secondary-origin.html index e8b77e5e2d..7342927fc3 100644 --- a/packages/driver/cypress/fixtures/secondary-origin.html +++ b/packages/driver/cypress/fixtures/secondary-origin.html @@ -14,8 +14,8 @@ hashChange - /fixtures/primary-origin.html + /fixtures/primary-origin.html + http://www.idp.com:3500/fixtures/generic.html @@ -279,6 +279,17 @@ const originalWithModifyObstructiveThirdPartyCode = `\ dynamicIntegrityScript.setAttribute('integrity', "sha384-XiV6bRRw9OEpsWSumtD1J7rElgTrNQro4MY/O4IYjhH+YGCf1dHaNGZ3A2kzYi/C") document.querySelector('head').appendChild(dynamicIntegrityScript) + \ ` @@ -380,7 +391,7 @@ const expectedWithModifyObstructiveThirdPartyCode = `\ dynamicIntegrityScript.src = 'integrity.js' dynamicIntegrityScript.setAttribute('crossorigin', "anonymous") dynamicIntegrityScript.setAttribute('data-script-type', 'dynamic') - dynamicIntegrityScript.setAttribute('integrity', "sha384-XiV6bRRw9OEpsWSumtD1J7rElgTrNQro4MY/O4IYjhH+YGCf1dHaNGZ3A2kzYi/C" + dynamicIntegrityScript.setAttribute('cypress-stripped-integrity', "sha384-XiV6bRRw9OEpsWSumtD1J7rElgTrNQro4MY/O4IYjhH+YGCf1dHaNGZ3A2kzYi/C") document.querySelector('head').appendChild(dynamicIntegrityScript) @@ -391,9 +402,20 @@ const expectedWithModifyObstructiveThirdPartyCode = `\ dynamicIntegrityScript.rel = "stylesheet" dynamicIntegrityScript.href = 'integrity.css' dynamicIntegrityScript.setAttribute('crossorigin', "anonymous") - dynamicIntegrityScript.setAttribute('integrity', "sha384-XiV6bRRw9OEpsWSumtD1J7rElgTrNQro4MY/O4IYjhH+YGCf1dHaNGZ3A2kzYi/C") + dynamicIntegrityScript.setAttribute('cypress-stripped-integrity', "sha384-XiV6bRRw9OEpsWSumtD1J7rElgTrNQro4MY/O4IYjhH+YGCf1dHaNGZ3A2kzYi/C") document.querySelector('head').appendChild(dynamicIntegrityScript) + \ ` diff --git a/packages/server/lib/plugins/child/run_plugins.js b/packages/server/lib/plugins/child/run_plugins.js index 0b6ac4af61..22fa245ba3 100644 --- a/packages/server/lib/plugins/child/run_plugins.js +++ b/packages/server/lib/plugins/child/run_plugins.js @@ -125,6 +125,15 @@ class RunPlugins { }) .then((modifiedCfg) => { debug('plugins file successfully loaded') + + // if the experimentalSessionAndOrigin flag is true, specify which + // commands should (potentially) have their callbacks replaced. this is + // currently used by the webpack preprocessor. see its implmentation for + // more details + if (this._getExperimentalSessionAndOriginValue(initialConfig, modifiedCfg)) { + global.__cypressCallbackReplacementCommands = ['origin'] + } + this.ipc.send('setupTestingType:reply', { setupConfig: modifiedCfg, registrations: this.registrations, @@ -142,6 +151,19 @@ class RunPlugins { }) } + _getExperimentalSessionAndOriginValue (initialConfig, modifiedConfig) { + // prefer the modified value if it's specified + if ( + typeof modifiedConfig === 'object' + && typeof modifiedConfig.experimentalSessionAndOrigin === 'boolean' + ) { + return modifiedConfig.experimentalSessionAndOrigin + } + + // otherwise, use the initial value + return initialConfig.experimentalSessionAndOrigin + } + execute (event, ids, args = []) { debug(`execute plugin event: ${event} (%o)`, ids) diff --git a/packages/server/lib/routes-e2e.ts b/packages/server/lib/routes-e2e.ts index 914f21d31c..fd31e0afd8 100644 --- a/packages/server/lib/routes-e2e.ts +++ b/packages/server/lib/routes-e2e.ts @@ -1,3 +1,4 @@ +import fs from 'fs-extra' import path from 'path' import Debug from 'debug' import { Router } from 'express' @@ -28,6 +29,26 @@ export const createRoutesE2E = ({ specController.handle(test, req, res, config, next, onError) }) + routesE2E.get(`/${config.namespace}/get-file/:filePath`, async (req, res) => { + const { filePath } = req.params + + debug('get file: %s', filePath) + + try { + const contents = await fs.readFile(filePath) + + res.json({ contents: contents.toString() }) + } catch (err) { + const errorMessage = `Getting the file at the following path errored:\nPath: ${filePath}\nError: ${err.stack}` + + debug(errorMessage) + + res.json({ + error: errorMessage, + }) + } + }) + routesE2E.get(`/${config.namespace}/socket.io.js`, (req, res) => { client.handle(req, res) }) diff --git a/packages/server/test/unit/plugins/child/run_plugins_spec.js b/packages/server/test/unit/plugins/child/run_plugins_spec.js index 7aacec5f98..78b4bcc367 100644 --- a/packages/server/test/unit/plugins/child/run_plugins_spec.js +++ b/packages/server/test/unit/plugins/child/run_plugins_spec.js @@ -267,6 +267,34 @@ describe.skip('lib/plugins/child/run_plugins', () => { return done() }) }) + + it('defines global __cypressCallbackReplacementCommands if experimentalSessionAndOrigin: true', function () { + const setupNodeEventsFn = sinon.spy() + + runPlugins.runSetupNodeEvents(setupNodeEventsFn) + + const config = { + experimentalSessionAndOrigin: true, + } + + this.ipc.on.withArgs('load:plugins').yield(config) + + expect(global.__cypressCallbackReplacementCommands).to.deep.equal(['origin']) + }) + + it('does not define global __cypressCallbackReplacementCommands if experimentalSessionAndOrigin: false', function () { + const setupNodeEventsFn = sinon.spy() + + runPlugins.runSetupNodeEvents(setupNodeEventsFn) + + const config = { + experimentalSessionAndOrigin: false, + } + + this.ipc.on.withArgs('load:plugins').yield(config) + + expect(global.__cypressCallbackReplacementCommands).to.be.undefined + }) }) describe('on \'execute\' message', () => { diff --git a/scripts/github-actions/update-browser-versions.js b/scripts/github-actions/update-browser-versions.js index 9c6af8c59b..bab59a581d 100644 --- a/scripts/github-actions/update-browser-versions.js +++ b/scripts/github-actions/update-browser-versions.js @@ -77,13 +77,14 @@ const checkNeedForBranchUpdate = ({ core, latestStableVersion, latestBetaVersion } const updateBrowserVersionsFile = ({ latestBetaVersion, latestStableVersion }) => { - const versions = { + const currentBrowserVersions = JSON.parse(fs.readFileSync('./browser-versions.json')) + const newVersions = Object.assign(currentBrowserVersions, { 'chrome:beta': latestBetaVersion, 'chrome:stable': latestStableVersion, - } + }) // file path is relative to repo root - fs.writeFileSync('./browser-versions.json', `${JSON.stringify(versions, null, 2) }\n`) + fs.writeFileSync('./browser-versions.json', `${JSON.stringify(newVersions, null, 2) }\n`) } const updatePRTitle = async ({ context, github, baseBranch, branchName, description }) => { diff --git a/scripts/import.js b/scripts/import.js index 0aeab54e6b..41cc2bfd01 100644 --- a/scripts/import.js +++ b/scripts/import.js @@ -18,7 +18,7 @@ const argv = require('minimist')(process.argv.slice(2)) const from = argv.from const repo = argv.repo const to = path.join(argv.to, '/') // ensure trailing slash -const branch = argv.branch || 'master' +const branch = argv.branch || 'develop' const remoteName = snakeCase(to) const temp = path.join(process.cwd(), `.temp-import`) diff --git a/scripts/unit/github-actions/update-browser-version-spec.js b/scripts/unit/github-actions/update-browser-version-spec.js index 59b5a6b5e7..6b433ec667 100644 --- a/scripts/unit/github-actions/update-browser-version-spec.js +++ b/scripts/unit/github-actions/update-browser-version-spec.js @@ -246,7 +246,13 @@ describe('update browser version github action', () => { }) context('.updateBrowserVersionsFile', () => { - it('updates browser-versions.json with specified versions', () => { + it('updates browser-versions.json with specified versions, leaving other entries in place', () => { + sinon.stub(fs, 'readFileSync').returns(`{ + "chrome:beta": "1.1", + "chrome:stable": "1.0", + "chrome:other": "0.4" + }`) + sinon.stub(fs, 'writeFileSync') updateBrowserVersionsFile({ @@ -256,7 +262,8 @@ describe('update browser version github action', () => { expect(fs.writeFileSync).to.be.calledWith('./browser-versions.json', `{ "chrome:beta": "2.1", - "chrome:stable": "2.0" + "chrome:stable": "2.0", + "chrome:other": "0.4" } `) }) diff --git a/scripts/unit/npm-release-spec.js b/scripts/unit/npm-release-spec.js index 83c347608b..765757c093 100644 --- a/scripts/unit/npm-release-spec.js +++ b/scripts/unit/npm-release-spec.js @@ -22,13 +22,13 @@ const semanticReleaseNoUpdate = (version) => { [semantic-release] › ✔ Loaded plugin "prepare" from "@semantic-release/npm" [semantic-release] › ✔ Loaded plugin "publish" from "@semantic-release/npm" [semantic-release] › ✔ Loaded plugin "addChannel" from "@semantic-release/npm" -[semantic-release] › ⚠ Run automated release from branch master on repository https://github.com/cypress-io/cypress.git in dry-run mode +[semantic-release] › ⚠ Run automated release from branch develop on repository https://github.com/cypress-io/cypress.git in dry-run mode [semantic-release] › ✔ Allowed to push to the Git repository [semantic-release] › ℹ Start step "verifyConditions" of plugin "@semantic-release/npm" [semantic-release] [@semantic-release/npm] › ℹ Verify authentication for registry https://registry.npmjs.org/ [semantic-release] [@semantic-release/npm] › ℹ Reading npm config from /cypress/npm/package/.npmrc [semantic-release] › ✔ Completed step "verifyConditions" of plugin "@semantic-release/npm" -[semantic-release] › ℹ Found git tag @cypress/package-v${version} associated with version ${version} on branch master +[semantic-release] › ℹ Found git tag @cypress/package-v${version} associated with version ${version} on branch develop [semantic-release] › ℹ Found 1 commits since last release [semantic-release] › ℹ Start step "analyzeCommits" of plugin "[Function: semantic-release-monorepo]" [semantic-release] [[Function: semantic-release-monorepo]] › ℹ Found 0 commits for package @cypress/package since last release @@ -63,13 +63,13 @@ const semanticReleaseUpdate = (oldVersion, newVersion) => { [semantic-release] › ✔ Loaded plugin "prepare" from "@semantic-release/npm" [semantic-release] › ✔ Loaded plugin "publish" from "@semantic-release/npm" [semantic-release] › ✔ Loaded plugin "addChannel" from "@semantic-release/npm" -[semantic-release] › ⚠ Run automated release from branch master on repository https://github.com/cypress-io/cypress.git in dry-run mode +[semantic-release] › ⚠ Run automated release from branch develop on repository https://github.com/cypress-io/cypress.git in dry-run mode [semantic-release] › ✔ Allowed to push to the Git repository [semantic-release] › ℹ Start step "verifyConditions" of plugin "@semantic-release/npm" [semantic-release] [@semantic-release/npm] › ℹ Verify authentication for registry https://registry.npmjs.org/ [semantic-release] [@semantic-release/npm] › ℹ Reading npm config from /cypress/npm/package/.npmrc [semantic-release] › ✔ Completed step "verifyConditions" of plugin "@semantic-release/npm" -[semantic-release] › ℹ Found git tag @cypress/package-v${oldVersion} associated with version ${oldVersion} on branch master +[semantic-release] › ℹ Found git tag @cypress/package-v${oldVersion} associated with version ${oldVersion} on branch develop [semantic-release] › ℹ Found 2 commits since last release [semantic-release] › ℹ Start step "analyzeCommits" of plugin "[Function: semantic-release-monorepo]" [semantic-release] [[Function: semantic-release-monorepo]] › ℹ Found 1 commits for package @cypress/package since last release @@ -147,13 +147,13 @@ const semanticReleaseNew = () => { [semantic-release] › ✔ Loaded plugin "prepare" from "@semantic-release/npm" [semantic-release] › ✔ Loaded plugin "publish" from "@semantic-release/npm" [semantic-release] › ✔ Loaded plugin "addChannel" from "@semantic-release/npm" -[semantic-release] › ⚠ Run automated release from branch master on repository https://github.com/cypress-io/cypress.git in dry-run mode +[semantic-release] › ⚠ Run automated release from branch develop on repository https://github.com/cypress-io/cypress.git in dry-run mode [semantic-release] › ✔ Allowed to push to the Git repository [semantic-release] › ℹ Start step "verifyConditions" of plugin "@semantic-release/npm" [semantic-release] [@semantic-release/npm] › ℹ Verify authentication for registry https://registry.npmjs.org/ [semantic-release] [@semantic-release/npm] › ℹ Reading npm config from /cypress/npm/package/.npmrc [semantic-release] › ✔ Completed step "verifyConditions" of plugin "@semantic-release/npm" -[semantic-release] › ℹ No git tag version found on branch master +[semantic-release] › ℹ No git tag version found on branch develop [semantic-release] › ℹ No previous release found, retrieving all commits [semantic-release] › ℹ Found 100 commits since last release [semantic-release] › ℹ Start step "analyzeCommits" of plugin "[Function: semantic-release-monorepo]" diff --git a/system-tests/project-fixtures/react/cypress-vite-async-function-config.config.ts b/system-tests/project-fixtures/react/cypress-vite-async-function-config.config.ts new file mode 100644 index 0000000000..2a1c102daa --- /dev/null +++ b/system-tests/project-fixtures/react/cypress-vite-async-function-config.config.ts @@ -0,0 +1,28 @@ +import { defineConfig } from 'cypress' +import reactPlugin from '@vitejs/plugin-react' +import * as path from 'path' +import * as fs from 'fs' + +module.exports = defineConfig({ + component: { + devServer: { + framework: 'react', + bundler: 'vite', + viteConfig: async () => { + // to be really sure this was called, write a file to the disc with + // the initial config + fs.writeFileSync(path.join(__dirname, 'wrote-to-file'), 'OK') + + // inline vite config via async function + return Promise.resolve({ + plugins: [ + reactPlugin({ + jsxRuntime: 'classic', + }), + ], + }) + }, + }, + }, +}) + \ No newline at end of file diff --git a/system-tests/project-fixtures/react/cypress-webpack-dev-server-async-config.config.ts b/system-tests/project-fixtures/react/cypress-webpack-dev-server-async-config.config.ts new file mode 100644 index 0000000000..027e515b20 --- /dev/null +++ b/system-tests/project-fixtures/react/cypress-webpack-dev-server-async-config.config.ts @@ -0,0 +1,21 @@ +import { defineConfig } from 'cypress' +import * as path from 'path' +import * as fs from 'fs' + +export default defineConfig({ + component: { + devServer: { + framework: 'react', + bundler: 'webpack', + webpackConfig: async (baseConfig: any) => { + console.log(baseConfig) + fs.writeFileSync(path.join(__dirname, 'wrote-to-file'), 'OK') + const cfg = await import('./webpack.config.js') + return cfg.default + }, + }, + }, + // These tests should run quickly / fail quickly, + // since we intentionally causing error states for testing + defaultCommandTimeout: 1000, +}) diff --git a/system-tests/projects/nuxtjs-vue2-configured/package.json b/system-tests/projects/nuxtjs-vue2-configured/package.json index e65cd341be..3db3f73a65 100644 --- a/system-tests/projects/nuxtjs-vue2-configured/package.json +++ b/system-tests/projects/nuxtjs-vue2-configured/package.json @@ -12,13 +12,9 @@ "vue": "^2.6.14" }, "devDependencies": { - "@cypress/webpack-dev-server": "file:../../../npm/webpack-dev-server-fresh", "vue-server-renderer": "^2.6.14", "vue-template-compiler": "^2.6.14", - "webpack": "^4.46.0", - "webpack-dev-server": "4.7.4", "core-js": "^3.19.3", - "nuxt": "^2.15.8", - "cypress": "file:../../../cli" + "nuxt": "^2.15.8" } } diff --git a/system-tests/projects/nuxtjs-vue2-configured/yarn.lock b/system-tests/projects/nuxtjs-vue2-configured/yarn.lock index 87610af5ac..ac0b162168 100644 --- a/system-tests/projects/nuxtjs-vue2-configured/yarn.lock +++ b/system-tests/projects/nuxtjs-vue2-configured/yarn.lock @@ -932,56 +932,11 @@ "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" -"@colors/colors@1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" - integrity "sha1-u1BFecHK6SPmV2pPXaQ9Jfl729k= sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==" - "@csstools/convert-colors@^1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" integrity "sha1-rUldxBsS511YjG24uYNPCPoTHrc= sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==" -"@cypress/request@^2.88.10": - version "2.88.10" - resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce" - integrity "sha1-tm12sH+GDTpLjXoGBNAgxmJ1LM4= sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==" - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - http-signature "~1.3.6" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.5.0" - tunnel-agent "^0.6.0" - uuid "^8.3.2" - -"@cypress/webpack-dev-server@file:../../../npm/webpack-dev-server": - version "0.0.0-development" - dependencies: - debug "^4.3.2" - lodash "^4.17.21" - semver "^7.3.4" - webpack-merge "^5.4.0" - -"@cypress/xvfb@^1.2.4": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.2.4.tgz#2daf42e8275b39f4aa53c14214e557bd14e7748a" - integrity "sha1-La9C6CdbOfSqU8FCFOVXvRTndIo= sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==" - dependencies: - debug "^3.1.0" - lodash.once "^4.1.1" - "@gar/promisify@^1.0.1": version "1.1.3" resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" @@ -1373,139 +1328,26 @@ resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity "sha1-XeWiOFo1MJQn9gEZkrVEUU1VmqE= sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==" -"@types/body-parser@*": - version "1.19.2" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" - integrity "sha1-rqIFnii3ZYY5CBNHrE+rPeFm5vA= sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==" - dependencies: - "@types/connect" "*" - "@types/node" "*" - -"@types/bonjour@^3.5.9": - version "3.5.10" - resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" - integrity "sha1-D2qt/gDqQU7chvXRBjV82pcB4nU= sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==" - dependencies: - "@types/node" "*" - -"@types/connect-history-api-fallback@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" - integrity "sha1-0feooJ0O1aV67lrpwYq5uAMgXa4= sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==" - dependencies: - "@types/express-serve-static-core" "*" - "@types/node" "*" - -"@types/connect@*": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity "sha1-X89q5EXkAh0fwiGaSHPMc6O7KtE= sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==" - dependencies: - "@types/node" "*" - -"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": - version "4.17.28" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" - integrity "sha1-xH3vnzTsgdxjKNCxtTA9HsmNhrg= sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==" - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@types/express@*", "@types/express@^4.17.13": - version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" - integrity "sha1-p24plXKJmbq1GjP6vOHXBaNwkDQ= sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==" - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" - "@types/qs" "*" - "@types/serve-static" "*" - "@types/html-minifier-terser@^5.0.0": version "5.1.2" resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57" integrity "sha1-aTsxatMj6pfu1rOO0aPMArFnK1c= sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==" -"@types/http-proxy@^1.17.8": - version "1.17.8" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55" - integrity "sha1-loxmkD5+QrSDYIAw7oWADyLQP1U= sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==" - dependencies: - "@types/node" "*" - -"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": +"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": version "7.0.9" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity "sha1-l+3JA36gw4WFMgsolk3eOznkZg0= sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==" -"@types/mime@^1": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" - integrity "sha1-k+Jb+e51/g/YC1lLxP6w6GIRG1o= sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==" - "@types/node@*": version "17.0.18" resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.18.tgz#3b4fed5cfb58010e3a2be4b6e74615e4847f1074" integrity "sha1-O0/tXPtYAQ46K+S250YV5IR/EHQ= sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==" -"@types/node@^14.14.31": - version "14.18.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz#0d4557fd3b94497d793efd4e7d92df2f83b4ef24" - integrity "sha1-DUVX/TuUSX15Pv1OfZLfL4O07yQ= sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==" - "@types/q@^1.5.1": version "1.5.5" resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" integrity "sha1-daKo59irSyMEFFBdkjNdHctTpt8= sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==" -"@types/qs@*": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity "sha1-Y7t9Bn2xB8weRXwwO8JdUR/r9ss= sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==" - -"@types/range-parser@*": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" - integrity "sha1-zWZ7z90CUhOq+3ylkVqTJZCs3Nw= sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==" - -"@types/retry@^0.12.0": - version "0.12.1" - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" - integrity "sha1-2PHA0Nwjr61twWqemToIZXdLQGU= sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==" - -"@types/serve-index@^1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" - integrity "sha1-G16FNwoZLAHsbOxHNc8pFzN6Yng= sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==" - dependencies: - "@types/express" "*" - -"@types/serve-static@*": - version "1.13.10" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" - integrity "sha1-9eDOh5fS18xevtpIpSyWxPpHqNk= sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==" - dependencies: - "@types/mime" "^1" - "@types/node" "*" - -"@types/sinonjs__fake-timers@8.1.1": - version "8.1.1" - resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz#b49c2c70150141a15e0fa7e79cf1f92a72934ce3" - integrity "sha1-tJwscBUBQaFeD6fnnPH5KnKTTOM= sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==" - -"@types/sizzle@^2.3.2": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.3.tgz#ff5e2f1902969d305225a047c8a0fd5c915cebef" - integrity "sha1-/14vGQKWnTBSJaBHyKD9XJFc6+8= sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" - -"@types/sockjs@^0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" - integrity "sha1-Vw06C5msmVNg4xNv1gRRE7G9I28= sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==" - dependencies: - "@types/node" "*" - "@types/source-list-map@*": version "0.1.2" resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" @@ -1544,20 +1386,6 @@ anymatch "^3.0.0" source-map "^0.6.0" -"@types/ws@^8.2.2": - version "8.2.3" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.2.3.tgz#0bca6b03ba2f41e0fab782d4a573fe284aa907ae" - integrity "sha1-C8prA7ovQeD6t4LUpXP+KEqpB64= sha512-ahRJZquUYCdOZf/rCsWg88S0/+cb9wazUBHv6HZEe3XdYaBe2zr/slM8J28X07Hn88Pnm4ezo7N8/ofnOgrPVQ==" - dependencies: - "@types/node" "*" - -"@types/yauzl@^2.9.1": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" - integrity "sha1-sySClSds+MbxU+vmqaugyYjLJZk= sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==" - dependencies: - "@types/node" "*" - "@vue/babel-helper-vue-jsx-merge-props@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz#31624a7a505fb14da1d58023725a4c5f270e6a81" @@ -1809,7 +1637,7 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity "sha1-0pHGpOl5ibXGHZrPOWrk/hM6cY0= sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" -accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: +accepts@~1.3.5: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" integrity "sha1-C/C+EltnAUrcsLCSHmLbe//hay4= sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==" @@ -1845,25 +1673,11 @@ ajv-errors@^1.0.0: resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" integrity "sha1-81mGrOuRr63sQQL72FAUlQzvpk0= sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==" -ajv-formats@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" - integrity "sha1-bmaUAGWet0lzu/LjMycYCgmWtSA= sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==" - dependencies: - ajv "^8.0.0" - ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity "sha1-MfKdpatuANHC0yms97WSlhTVAU0= sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==" -ajv-keywords@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" - integrity "sha1-adTThaRzPNvqtElkoRcKiPh/DhY= sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==" - dependencies: - fast-deep-equal "^3.1.3" - ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -1874,16 +1688,6 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.8.0: - version "8.10.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d" - integrity "sha1-5XP3Gb068GkBfjtmU4q5aNBA5U0= sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==" - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -1896,19 +1700,14 @@ ansi-align@^3.0.0: dependencies: string-width "^4.1.0" -ansi-colors@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity "sha1-y7muJWv3UK8eqzRPIpqif+lLo0g= sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==" - -ansi-escapes@^4.2.1, ansi-escapes@^4.3.0: +ansi-escapes@^4.2.1: version "4.3.2" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" integrity "sha1-ayKR0dt9mLZSHV8e+kLQ86n+tl4= sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==" dependencies: type-fest "^0.21.3" -ansi-html-community@0.0.8, ansi-html-community@^0.0.8: +ansi-html-community@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" integrity "sha1-afvE1sy+OD+XNpNK40w/gpDxv0E= sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==" @@ -1923,11 +1722,6 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity "sha1-CCyyyJyf6GWaMRpTvWpNxTAdswQ= sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" -ansi-regex@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" - integrity "sha1-MYPjj66aZdfLXlOUXNWJfQJgoGo= sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==" - ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -1968,11 +1762,6 @@ aproba@^1.1.1: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity "sha1-aALmJk79GMeQobDVF/DyYnvyyUo= sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" -arch@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" - integrity "sha1-G8R4GPMFdk8jqzMGsL/AhsWinRE= sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==" - arg@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" @@ -2000,16 +1789,6 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==" -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" - -array-flatten@^2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity "sha1-JO+AoowaiTYX4hSbDG0NeIKTsJk= sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==" - array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" @@ -2030,18 +1809,6 @@ asn1.js@^5.2.0: minimalistic-assert "^1.0.0" safer-buffer "^2.1.0" -asn1@~0.2.3: - version "0.2.6" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d" - integrity "sha1-DTp7tuZOAqkMAwOzHykoaOoJoI0= sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==" - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==" - assert@^1.1.1: version "1.5.0" resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" @@ -2055,33 +1822,11 @@ assign-symbols@^1.0.0: resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" integrity "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==" -astral-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" - integrity "sha1-SDFDxWeu7UeFdZwIZXhtx319LjE= sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==" - async-each@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" integrity "sha1-tyfb+H12UWAvBvTUrDh/R9kbDL8= sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==" -async@^2.6.2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" - integrity "sha1-1yYl4jRKNlbjo61Pp0n6gymdgv8= sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==" - dependencies: - lodash "^4.17.14" - -async@^3.2.0: - version "3.2.3" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" - integrity "sha1-rFPa/T9HIO6eihYGKPGOqR3xlsk= sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity "sha1-x57Zf380y48robyXkLzDZkdLS3k= sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" - at-least-node@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" @@ -2105,16 +1850,6 @@ autoprefixer@^9.6.1: postcss "^7.0.32" postcss-value-parser "^4.1.0" -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==" - -aws4@^1.8.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" - integrity "sha1-1h9G2DslGSUOJ4Ta9bCUeai0HFk= sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" - babel-loader@^8.2.2: version "8.2.3" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" @@ -2179,18 +1914,6 @@ base@^0.11.1: mixin-deep "^1.2.0" pascalcase "^0.1.1" -batch@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - integrity "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==" - -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==" - dependencies: - tweetnacl "^0.14.3" - big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -2213,12 +1936,7 @@ bindings@^1.5.0: dependencies: file-uri-to-path "1.0.0" -blob-util@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb" - integrity "sha1-O048KBERu38REoUYAGzcYLQDoes= sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==" - -bluebird@^3.1.1, bluebird@^3.5.5, bluebird@^3.7.2: +bluebird@^3.1.1, bluebird@^3.5.5: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity "sha1-nyKcFb4nJFT/qXOs4NvueaGww28= sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" @@ -2233,34 +1951,6 @@ bn.js@^5.0.0, bn.js@^5.1.1: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" integrity "sha1-NYhgZ0OWxpl3canQUfzBtX1K4AI= sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==" -body-parser@1.19.2: - version "1.19.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e" - integrity "sha1-RxTM2cFX1EeXuLVgfXLAuJlS8m4= sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==" - dependencies: - bytes "3.1.2" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.8.1" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.9.7" - raw-body "2.4.3" - type-is "~1.6.18" - -bonjour@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" - integrity "sha1-jokKGD2O6aI5OzhExpGkK897yfU= sha512-RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg==" - dependencies: - array-flatten "^2.1.0" - deep-equal "^1.0.1" - dns-equal "^1.0.0" - dns-txt "^2.0.2" - multicast-dns "^6.0.1" - multicast-dns-service-types "^1.1.0" - boolbase@^1.0.0, boolbase@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" @@ -2388,21 +2078,11 @@ browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.17.5, browserslist@^4 node-releases "^2.0.2" picocolors "^1.0.0" -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==" - buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity "sha1-KxRqb9cugLT1XSVfNe1Zo6mkG9U= sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" -buffer-indexof@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" - integrity "sha1-Uvq8xqYG0aADAoAmSO9o9jnaJow= sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==" - buffer-json@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/buffer-json/-/buffer-json-2.0.0.tgz#f73e13b1e42f196fe2fd67d001c7d7107edd7c23" @@ -2422,7 +2102,7 @@ buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" -buffer@^5.1.0, buffer@^5.6.0: +buffer@^5.1.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" integrity "sha1-umLnwTEzBTWCGXFghRqPZI6Z7tA= sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==" @@ -2440,11 +2120,6 @@ bytes@3.0.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==" -bytes@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" - integrity "sha1-iwvuuYYFrfGxKPpDhkA8AJ4CIaU= sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" - cacache@^12.0.2: version "12.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" @@ -2517,11 +2192,6 @@ cache-loader@^4.1.0: neo-async "^2.6.1" schema-utils "^2.0.0" -cachedir@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8" - integrity "sha1-DHWJKgUhmPCyHHwYBNgzHt/K4Og= sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==" - call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" @@ -2590,11 +2260,6 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, can resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz#e11eba4b87e24d22697dae05455d5aea28550d5f" integrity "sha1-4R66S4fiTSJpfa4FRV1a6ihVDV8= sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==" -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==" - chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -2633,11 +2298,6 @@ chardet@^0.7.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity "sha1-kAlISfCTfy7twkJdDSip5fDLrZ4= sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" -check-more-types@^2.24.0: - version "2.24.0" - resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600" - integrity "sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA= sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==" - chokidar@^2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" @@ -2657,7 +2317,7 @@ chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" -chokidar@^3.4.1, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3: +chokidar@^3.4.1, chokidar@^3.5.1, chokidar@^3.5.2: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity "sha1-HPN8hwe5Mr0a8a4iwEMuKs0ZA70= sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==" @@ -2687,7 +2347,7 @@ chrome-trace-event@^1.0.2: resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity "sha1-EBXs7UdB4V0GZkqVfbv1DQQeJqw= sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==" -ci-info@^3.1.1, ci-info@^3.2.0: +ci-info@^3.1.1: version "3.3.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" integrity "sha1-tO0ftoGN6kgDpVxiMEH5Fl0gZrI= sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==" @@ -2734,37 +2394,11 @@ cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" -cli-table3@~0.6.1: - version "0.6.2" - resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a" - integrity "sha1-qvXfnYtb8SY03IswQIBqDAcSDSo= sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw==" - dependencies: - string-width "^4.2.0" - optionalDependencies: - "@colors/colors" "1.5.0" - -cli-truncate@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" - integrity "sha1-w54ovwXtzeW+O5iZKiLe7Vork8c= sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==" - dependencies: - slice-ansi "^3.0.0" - string-width "^4.2.0" - cli-width@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" integrity "sha1-ovSEN6LKqaIkNueUvwceyeYc7fY= sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==" -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity "sha1-wZ/Zvbv4WUK0/ZechNz31fB8I4c= sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==" - dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" - coa@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" @@ -2827,18 +2461,6 @@ colorette@^1.2.2: resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" integrity "sha1-UZD7uHJ2JZqGrXAL/yxtb6o/ykA= sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==" -colorette@^2.0.10, colorette@^2.0.16: - version "2.0.16" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" - integrity "sha1-cTua+E/bAAE58EVGvUqT9ipQhdo= sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==" - -combined-stream@^1.0.6, combined-stream@~1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity "sha1-w9RaizT9cwYxoRCoolIGgrMdWn8= sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==" - dependencies: - delayed-stream "~1.0.0" - commander@^2.19.0, commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -2849,21 +2471,11 @@ commander@^4.1.1: resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity "sha1-n9YCvZNilOnp70aj9NaWQESxgGg= sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==" -commander@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" - integrity "sha1-Rqu9FlL44Fm92u+Zu9yyrZzxea4= sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==" - commander@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity "sha1-o2y1fQtQHOEI5NIFWaFQo5HZerc= sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==" -common-tags@^1.8.0: - version "1.8.2" - resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6" - integrity "sha1-lOuzwHbSYDJ0X9VPrOf2iO9aycY= sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==" - commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -2909,11 +2521,6 @@ concat-stream@^1.5.0: readable-stream "^2.2.2" typedarray "^0.0.6" -connect-history-api-fallback@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" - integrity "sha1-izIIk1kwjRERFdgcrT/Oq4iPl7w= sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==" - connect@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" @@ -2946,18 +2553,6 @@ constants-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" integrity "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==" -content-disposition@0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" - integrity "sha1-i4K076yCUSoCuwsdzsnSxejrW/4= sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==" - dependencies: - safe-buffer "5.2.1" - -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity "sha1-4TjMdeBAxyexlm/l5fjJruJW/js= sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" - convert-source-map@^1.7.0: version "1.8.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" @@ -2965,16 +2560,6 @@ convert-source-map@^1.7.0: dependencies: safe-buffer "~5.1.1" -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity "sha1-4wOogrNCzD7oylE6eZmXNNqzriw= sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" - -cookie@0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" - integrity "sha1-DkHyTeXs8xeUfIL8eJ4GqISCRDI= sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==" - cookie@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" @@ -3015,11 +2600,6 @@ core-js@^3.19.3: resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.1.tgz#f2e0ddc1fc43da6f904706e8e955bc19d06a0d94" integrity "sha1-8uDdwfxD2m+QRwbo6VW8GdBqDZQ= sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==" -core-util-is@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" - core-util-is@~1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" @@ -3078,7 +2658,7 @@ create-require@^1.1.1: resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" integrity "sha1-wdfo8eX2z8n/ZfnNNS03NIdWwzM= sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==" -cross-spawn@^7.0.0, cross-spawn@^7.0.3: +cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity "sha1-9zqFudXUHQRVUcF34ogtSshXKKY= sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==" @@ -3309,64 +2889,6 @@ cyclist@^1.0.1: resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" integrity "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==" -"cypress@file:../../../cli": - version "0.0.0-development" - dependencies: - "@cypress/request" "^2.88.10" - "@cypress/xvfb" "^1.2.4" - "@types/node" "^14.14.31" - "@types/sinonjs__fake-timers" "8.1.1" - "@types/sizzle" "^2.3.2" - arch "^2.2.0" - blob-util "^2.0.2" - bluebird "^3.7.2" - buffer "^5.6.0" - cachedir "^2.3.0" - chalk "^4.1.0" - check-more-types "^2.24.0" - cli-cursor "^3.1.0" - cli-table3 "~0.6.1" - commander "^5.1.0" - common-tags "^1.8.0" - dayjs "^1.10.4" - debug "^4.3.2" - enquirer "^2.3.6" - eventemitter2 "^6.4.3" - execa "4.1.0" - executable "^4.1.1" - extract-zip "2.0.1" - figures "^3.2.0" - fs-extra "^9.1.0" - getos "^3.2.1" - is-ci "^3.0.0" - is-installed-globally "~0.4.0" - lazy-ass "^1.6.0" - listr2 "^3.8.3" - lodash "^4.17.21" - log-symbols "^4.0.0" - minimist "^1.2.6" - ospath "^1.2.2" - pretty-bytes "^5.6.0" - proxy-from-env "1.0.0" - request-progress "^3.0.0" - semver "^7.3.2" - supports-color "^8.1.1" - tmp "~0.2.1" - untildify "^4.0.0" - yauzl "^2.10.0" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==" - dependencies: - assert-plus "^1.0.0" - -dayjs@^1.10.4: - version "1.11.0" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.0.tgz#009bf7ef2e2ea2d5db2e6583d2d39a4b5061e805" - integrity "sha1-AJv37y4uotXbLmWD0tOaS1Bh6AU= sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug==" - de-indent@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" @@ -3379,14 +2901,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3: dependencies: ms "2.0.0" -debug@^3.1.0, debug@^3.1.1: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity "sha1-clgLfpFF+zm2Z2+cXl+xALk0F5o= sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==" - dependencies: - ms "^2.1.1" - -debug@^4.1.0, debug@^4.1.1, debug@^4.3.2: +debug@^4.1.0, debug@^4.1.1: version "4.3.3" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" integrity "sha1-BCZuC3CpjURi5uKI44JZITMytmQ= sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==" @@ -3398,35 +2913,11 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==" -deep-equal@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" - integrity "sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o= sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==" - dependencies: - is-arguments "^1.0.4" - is-date-object "^1.0.1" - is-regex "^1.0.4" - object-is "^1.0.1" - object-keys "^1.1.1" - regexp.prototype.flags "^1.2.0" - deepmerge@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity "sha1-RNLqNnm49NT/ujPwPYZfwee/SVU= sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" -default-gateway@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" - integrity "sha1-gZSUyIgFO9t0PtvzQ9bN9/KUOnE= sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==" - dependencies: - execa "^5.0.0" - -define-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity "sha1-P3rkIRKbyqrJvHSQXJigAJ7J7n8= sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==" - define-properties@^1.1.2, define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -3471,25 +2962,6 @@ defu@^5.0.0: resolved "https://registry.yarnpkg.com/defu/-/defu-5.0.1.tgz#a034278f9b032bf0845d261aa75e9ad98da878ac" integrity "sha1-oDQnj5sDK/CEXSYap16a2Y2oeKw= sha512-EPS1carKg+dkEVy3qNTqIdp2qV7mUP08nIsupfwQpz++slCVRw7qbQyWvSTig+kFPwz2XXp5/kIIkH+CwrJKkQ==" -del@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" - integrity "sha1-C0DQMyzqdD8WFPgYvk/rcXcUyVI= sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==" - dependencies: - globby "^11.0.1" - graceful-fs "^4.2.4" - is-glob "^4.0.1" - is-path-cwd "^2.2.0" - is-path-inside "^3.0.2" - p-map "^4.0.0" - rimraf "^3.0.2" - slash "^3.0.0" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity "sha1-3zrhmayt+31ECqrgsp4icrJOxhk= sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" - depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -3523,11 +2995,6 @@ detect-indent@^5.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" integrity "sha1-OHHMCmoALow+Wzz38zYmRnXwa50= sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==" -detect-node@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" - integrity "sha1-yccHdaScPQO8LAbZpzvlUPl4+LE= sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==" - devalue@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/devalue/-/devalue-2.0.1.tgz#5d368f9adc0928e47b77eea53ca60d2f346f9762" @@ -3549,26 +3016,6 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity "sha1-s55/HabrCnW6nBcySzR1PEfgZU0= sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==" - -dns-packet@^1.3.1: - version "1.3.4" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" - integrity "sha1-40VQZYJKJQe6iGxVqJljuxB97G8= sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==" - dependencies: - ip "^1.1.0" - safe-buffer "^5.0.1" - -dns-txt@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" - integrity "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= sha512-Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ==" - dependencies: - buffer-indexof "^1.0.0" - dom-converter@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" @@ -3667,14 +3114,6 @@ duplexify@^3.4.2, duplexify@^3.6.0: readable-stream "^2.0.0" stream-shift "^1.0.0" -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==" - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -3729,13 +3168,6 @@ enhanced-resolve@^4.1.1, enhanced-resolve@^4.5.0: memory-fs "^0.5.0" tapable "^1.0.0" -enquirer@^2.3.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" - integrity "sha1-Kn/l3WNKHkElqXXsmU/1RW3Dc00= sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==" - dependencies: - ansi-colors "^4.1.1" - entities@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" @@ -3852,16 +3284,6 @@ etag@^1.8.1, etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" -eventemitter2@^6.4.3: - version "6.4.5" - resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.5.tgz#97380f758ae24ac15df8353e0cc27f8b95644655" - integrity "sha1-lzgPdYriSsFd+DU+DMJ/i5VkRlU= sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw==" - -eventemitter3@^4.0.0: - version "4.0.7" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" - integrity "sha1-Lem2j2Uo1WRO9cWVJqG0oHMGFp8= sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" - events@^3.0.0: version "3.3.0" resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" @@ -3880,21 +3302,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" -execa@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" - integrity "sha1-TlSRrRVy8vF6d9OIxshXE1sihHo= sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==" - dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - signal-exit "^3.0.2" - strip-final-newline "^2.0.0" - execa@^5.0.0: version "5.1.1" resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" @@ -3910,13 +3317,6 @@ execa@^5.0.0: signal-exit "^3.0.3" strip-final-newline "^2.0.0" -executable@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c" - integrity "sha1-QVMr/zYdPlevTXY7cFgtsY9dEzw= sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==" - dependencies: - pify "^2.2.0" - exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -3935,42 +3335,6 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -express@^4.17.1: - version "4.17.3" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1" - integrity "sha1-9scwIZSk+1QnG3Oh/noGR4yPhaE= sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==" - dependencies: - accepts "~1.3.8" - array-flatten "1.1.1" - body-parser "1.19.2" - content-disposition "0.5.4" - content-type "~1.0.4" - cookie "0.4.2" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "~1.1.2" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.7" - qs "6.9.7" - range-parser "~1.2.1" - safe-buffer "5.2.1" - send "0.17.2" - serve-static "1.14.2" - setprototypeof "1.2.0" - statuses "~1.5.0" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - extend-shallow@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" @@ -3986,11 +3350,6 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo= sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" - external-editor@^3.0.3: version "3.1.0" resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" @@ -4024,28 +3383,7 @@ extract-css-chunks-webpack-plugin@^4.9.0: schema-utils "^1.0.0" webpack-sources "^1.1.0" -extract-zip@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" - integrity "sha1-Zj3KVv5G34kNXxMe9KBtIruLoTo= sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==" - dependencies: - debug "^4.1.1" - get-stream "^5.1.0" - yauzl "^2.10.0" - optionalDependencies: - "@types/yauzl" "^2.9.1" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==" - -extsprintf@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" - integrity "sha1-jRcsBkhn8jXAyEpZaAbSeb9LzAc= sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==" - -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: +fast-deep-equal@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU= sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" @@ -4073,26 +3411,12 @@ fastq@^1.6.0: dependencies: reusify "^1.0.4" -faye-websocket@^0.11.3: - version "0.11.4" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" - integrity "sha1-fw2Sdc/dhqHJY9yLZfzEUe3Lsdo= sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==" - dependencies: - websocket-driver ">=0.5.1" - -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==" - dependencies: - pend "~1.2.0" - figgy-pudding@^3.5.1: version "3.5.2" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" integrity "sha1-tO7oFIq7Adzx0aw0Nn1Z4S+mHW4= sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==" -figures@^3.0.0, figures@^3.2.0: +figures@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" integrity "sha1-YlwYvSk8YE3EqN2y/r8MiDQXRq8= sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==" @@ -4134,7 +3458,7 @@ filter-obj@^1.1.0: resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b" integrity "sha1-mzERErxsYSehbgFsbF1/GeCAXFs= sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==" -finalhandler@1.1.2, finalhandler@~1.1.2: +finalhandler@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" integrity "sha1-t+fQAP/RGTjQ/bBTUG9uur6fWH0= sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==" @@ -4198,35 +3522,11 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@^1.0.0: - version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" - integrity "sha1-3U6hV957+vnqmz+9haoWlR942Nc= sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==" - for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" integrity "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==" -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==" - -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity "sha1-3M5SwF9kTymManq5Nr1yTO/786Y= sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==" - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - -forwarded@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" - integrity "sha1-ImmTZCiq1MFcfr6XeahL8LKoGBE= sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" - fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" @@ -4259,7 +3559,7 @@ fs-extra@^8.1.0: fs-extra@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity "sha1-WVRGDHZKjaIJS6NVS/g55rmnyG0= sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== dependencies: at-least-node "^1.0.0" graceful-fs "^4.2.0" @@ -4337,13 +3637,6 @@ get-port-please@^2.2.0: dependencies: fs-memo "^1.2.0" -get-stream@^5.0.0, get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity "sha1-SWaheV7lrOZecGxLe+txJX1uItM= sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==" - dependencies: - pump "^3.0.0" - get-stream@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" @@ -4362,20 +3655,6 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==" -getos@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5" - integrity "sha1-ATTR9OAOtGFExanArE3Ah8uyfcU= sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==" - dependencies: - async "^3.2.0" - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==" - dependencies: - assert-plus "^1.0.0" - git-config-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/git-config-path/-/git-config-path-2.0.0.tgz#62633d61af63af4405a5024efd325762f58a181b" @@ -4423,19 +3702,12 @@ glob@^7.1.3, glob@^7.1.4, glob@^7.1.7, glob@^7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" -global-dirs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" - integrity "sha1-cKdv6E6jFas3sfVXbL3n1I73JoY= sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==" - dependencies: - ini "2.0.0" - globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity "sha1-q4eVM4hooLq9hSV1gBjCp+uVxC4= sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" -globby@^11.0.1, globby@^11.0.3, globby@^11.0.4: +globby@^11.0.3, globby@^11.0.4: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity "sha1-vUvpi7BC+D15b344EZkfvoKg00s= sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==" @@ -4447,7 +3719,7 @@ globby@^11.0.1, globby@^11.0.3, globby@^11.0.4: merge2 "^1.4.1" slash "^3.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: version "4.2.9" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" integrity "sha1-BBsF30V1Xlh6JJQiebnRExRuHJY= sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==" @@ -4464,11 +3736,6 @@ hable@^3.0.0: resolved "https://registry.yarnpkg.com/hable/-/hable-3.0.0.tgz#6de089b2df946635cf8134b9e4859f1b62de255f" integrity "sha1-beCJst+UZjXPgTS55IWfG2LeJV8= sha512-7+G0/2/COR8pwteYFqHIVYfQpuEiO2HXwJrhCBJVgrNrl9O5eaUoJVDGXUJX+0RpGncNVTuestexjk1afj01wQ==" -handle-thing@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" - integrity "sha1-hX95zjWVgMNA1DCBzGSJcNC7I04= sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==" - hard-source-webpack-plugin@^0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/hard-source-webpack-plugin/-/hard-source-webpack-plugin-0.13.1.tgz#a99071e25b232f1438a5bc3c99f10a3869e4428e" @@ -4606,16 +3873,6 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hpack.js@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" - integrity "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI= sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==" - dependencies: - inherits "^2.0.1" - obuf "^1.0.0" - readable-stream "^2.0.1" - wbuf "^1.1.0" - hsl-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e" @@ -4626,7 +3883,7 @@ hsla-regex@^1.0.0: resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38" integrity "sha1-wc56MWjIxmFAM6S194d/OyJfnDg= sha512-7Wn5GMLuHBjZCb2bTmnDOycho0p/7UVaAeqXZGbHrBCl6Yd/xDhQJAXe6Ga9AXJH2I5zY1dEdYw2u1UptnSBJA==" -html-entities@^2.1.0, html-entities@^2.3.2: +html-entities@^2.1.0: version "2.3.2" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" integrity "sha1-dgtARoXLHXlOT0t0QzLjsA3P5Ig= sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==" @@ -4665,7 +3922,7 @@ html-tags@^2.0.0: html-webpack-plugin@^4.5.1: version "4.5.2" resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz#76fc83fa1a0f12dd5f7da0404a54e2699666bc12" - integrity "sha1-dvyD+hoPEt1ffaBASlTiaZZmvBI= sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==" + integrity sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A== dependencies: "@types/html-minifier-terser" "^5.0.0" "@types/tapable" "^1.0.5" @@ -4687,11 +3944,6 @@ htmlparser2@^6.1.0: domutils "^2.5.2" entities "^2.0.0" -http-deceiver@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" - integrity "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==" - http-errors@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" @@ -4703,66 +3955,17 @@ http-errors@1.8.1: statuses ">= 1.5.0 < 2" toidentifier "1.0.1" -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - integrity "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==" - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - -http-parser-js@>=0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5" - integrity "sha1-18MNXTyQ2GW0ouhwGB+dbyKsesU= sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==" - -http-proxy-middleware@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.3.tgz#5df04f69a89f530c2284cd71eeaa51ba52243289" - integrity "sha1-XfBPaaifUwwihM1x7qpRulIkMok= sha512-1bloEwnrHMnCoO/Gcwbz7eSVvW50KPES01PecpagI+YLNLci4AcuKJrujW4Mc3sBLpFxMSlsLNHS5Nl/lvrTPA==" - dependencies: - "@types/http-proxy" "^1.17.8" - http-proxy "^1.18.1" - is-glob "^4.0.1" - is-plain-obj "^3.0.0" - micromatch "^4.0.2" - -http-proxy@^1.18.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" - integrity "sha1-QBVB8FNIhLv5UmAzTnL4juOXZUk= sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==" - dependencies: - eventemitter3 "^4.0.0" - follow-redirects "^1.0.0" - requires-port "^1.0.0" - -http-signature@~1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.6.tgz#cb6fbfdf86d1c974f343be94e87f7fc128662cf9" - integrity "sha1-y2+/34bRyXTzQ76U6H9/wShmLPk= sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==" - dependencies: - assert-plus "^1.0.0" - jsprim "^2.0.2" - sshpk "^1.14.1" - https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==" -human-signals@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" - integrity "sha1-xbHNFPUK6uCatsWf5jujOV/k36M= sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==" - human-signals@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity "sha1-3JH8ukLk0G5Kuu0zs+ejwC9RTqA= sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==" -iconv-lite@0.4.24, iconv-lite@^0.4.24: +iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs= sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==" @@ -4856,11 +4059,6 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==" -ini@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" - integrity "sha1-5f1Vbs3VcmvpePoQAYYurLCpS8U= sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==" - ini@^1.3.5: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" @@ -4894,21 +4092,11 @@ internal-slot@^1.0.3: has "^1.0.3" side-channel "^1.0.4" -ip@^1.1.0, ip@^1.1.5: +ip@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" integrity "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= sha512-rBtCAQAJm8A110nbwn6YdveUnuZH3WrC36IwkRXxDnq53JvXA2NVQvB7IHyKomxK1MJ4VDNw3UtFDdXQ+AvLYA==" -ipaddr.js@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity "sha1-v/OFQ+64mEglB5/zoqjmy9RngbM= sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" - -ipaddr.js@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" - integrity "sha1-7KJWp6h36Reus2iwp0l930LvgcA= sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==" - is-absolute-url@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" @@ -4928,14 +4116,6 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" -is-arguments@^1.0.4: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity "sha1-FbP4j9oB8ql/7ITKdhpWDxI++ps= sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==" - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -4985,13 +4165,6 @@ is-callable@^1.1.4, is-callable@^1.2.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity "sha1-RzAdWN0CWUB4ZVR4U99tYf5HGUU= sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==" -is-ci@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" - integrity "sha1-227L7RvWWcQ9rA9FZh52dBA9GGc= sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==" - dependencies: - ci-info "^3.2.0" - is-color-stop@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" @@ -5055,7 +4228,7 @@ is-directory@^0.3.1: resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" integrity "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==" -is-docker@^2.0.0, is-docker@^2.1.1, is-docker@^2.2.1: +is-docker@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity "sha1-M+6r4jz+hvFL3kQIoCwM+4U6zao= sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==" @@ -5096,14 +4269,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" -is-installed-globally@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" - integrity "sha1-mg/UB5ScMPhutpWe8beZTtC3tSA= sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==" - dependencies: - global-dirs "^3.0.0" - is-path-inside "^3.0.2" - is-negative-zero@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" @@ -5133,26 +4298,11 @@ is-obj@^2.0.0: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity "sha1-Rz+wXZc3BeP9liBUUBjKjiLvSYI= sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" -is-path-cwd@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" - integrity "sha1-Z9Q7gmZKe1GR/ZEZEn6zAASKn9s= sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==" - -is-path-inside@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity "sha1-0jE2LlOgf/Kw4Op/7QSRYf/RYoM= sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==" - is-plain-obj@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" integrity "sha1-caUMhCnfync8kqOQpKA7OfzVHT4= sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==" -is-plain-obj@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" - integrity "sha1-r28uoUrFpkYYOlu9tbqrvBVq2dc= sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==" - is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" @@ -5160,7 +4310,7 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-regex@^1.0.4, is-regex@^1.1.4: +is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" integrity "sha1-7vVmPNWfpMCuM5UFMj32hUuxWVg= sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==" @@ -5204,16 +4354,6 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==" - -is-unicode-supported@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" - integrity "sha1-PybHaoCVk7Ur+i7LVxDtJ3m1Iqc= sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==" - is-weakref@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" @@ -5231,13 +4371,6 @@ is-wsl@^1.1.0: resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" integrity "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==" -is-wsl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity "sha1-dKTHbnfKn9P5MvKQwX6jJs0VcnE= sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==" - dependencies: - is-docker "^2.0.0" - isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -5260,11 +4393,6 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity "sha1-TkMekrEalzFjaqH5yNHMvP2reN8= sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==" -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==" - jest-worker@^26.5.0: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" @@ -5292,11 +4420,6 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity "sha1-peZUwuWi3rXyAdls77yoDA7y9RM= sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==" - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -5317,21 +4440,6 @@ json-schema-traverse@^0.4.1: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity "sha1-afaofZUTq4u4/mO9sJecRI5oRmA= sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity "sha1-rnvLNlard6c7pcSb9lTzjmtoYOI= sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" - -json-schema@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" - integrity "sha1-995M9u+rg4666zI2R0y7paGTCrU= sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==" - json5@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" @@ -5362,16 +4470,6 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -jsprim@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-2.0.2.tgz#77ca23dbcd4135cd364800d22ff82c2185803d4d" - integrity "sha1-d8oj281BNc02SADSL/gsIYWAPU0= sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==" - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.4.0" - verror "1.10.0" - kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -5419,25 +4517,6 @@ launch-editor@^2.3.0: picocolors "^1.0.0" shell-quote "^1.6.1" -lazy-ass@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513" - integrity "sha1-eZllXoZGwX8In90YfRUNMyTVRRM= sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==" - -listr2@^3.8.3: - version "3.14.0" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz#23101cc62e1375fd5836b248276d1d2b51fdbe9e" - integrity "sha1-IxAcxi4Tdf1YNrJIJ20dK1H9vp4= sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==" - dependencies: - cli-truncate "^2.1.0" - colorette "^2.0.16" - log-update "^4.0.0" - p-map "^4.0.0" - rfdc "^1.3.0" - rxjs "^7.5.1" - through "^2.3.8" - wrap-ansi "^7.0.0" - loader-runner@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" @@ -5501,11 +4580,6 @@ lodash.memoize@^4.1.2: resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==" -lodash.once@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" - integrity "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" - lodash.template@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" @@ -5526,29 +4600,11 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==" -lodash@^4.15.0, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5: +lodash@^4.15.0, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw= sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" -log-symbols@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" - integrity "sha1-P727lbRoOsn8eFER55LlWNSr1QM= sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==" - dependencies: - chalk "^4.1.0" - is-unicode-supported "^0.1.0" - -log-update@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1" - integrity "sha1-WJ7NNSRx8qHAxXAodUOmTf0g4KE= sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==" - dependencies: - ansi-escapes "^4.3.0" - cli-cursor "^3.1.0" - slice-ansi "^4.0.0" - wrap-ansi "^6.2.0" - lower-case@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" @@ -5643,11 +4699,6 @@ mdn-data@2.0.4: resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" integrity "sha1-aZs8OKxvHXKAkaZGULZdOIUC/Vs= sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==" -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" - mem@^8.1.1: version "8.1.1" resolved "https://registry.yarnpkg.com/mem/-/mem-8.1.1.tgz#cf118b357c65ab7b7e0817bdf00c8062297c0122" @@ -5656,7 +4707,7 @@ mem@^8.1.1: map-age-cleaner "^0.1.3" mimic-fn "^3.1.0" -memfs@^3.2.2, memfs@^3.4.1: +memfs@^3.2.2: version "3.4.1" resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305" integrity "sha1-t4CS9Gag3OBU1j05J1skxx0/EwU= sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==" @@ -5679,11 +4730,6 @@ memory-fs@^0.5.0: errno "^0.1.3" readable-stream "^2.0.1" -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" - merge-source-map@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" @@ -5701,11 +4747,6 @@ merge2@^1.3.0, merge2@^1.4.1: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity "sha1-Q2iJL4hekHRVpv19xVwMnUBJkK4= sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==" - micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" @@ -5725,7 +4766,7 @@ micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.2, micromatch@^4.0.4: +micromatch@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" integrity "sha1-iW1Rnf6dsl/OlM63pQCRm/iB6/k= sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==" @@ -5746,19 +4787,7 @@ mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" integrity "sha1-2f9iRRhZsYNC2WCFDcPPt35j+ww= sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==" -mime-db@1.52.0: - version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" - integrity "sha1-u6vNwChZ9JhzAchW4zh85exDv3A= sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" - -mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" - integrity "sha1-OBqHG2KnNEUGYK497uRIE/cNlZo= sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==" - dependencies: - mime-db "1.52.0" - -mime-types@^2.1.19, mime-types@^2.1.27, mime-types@^2.1.30, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: +mime-types@^2.1.19, mime-types@^2.1.27, mime-types@^2.1.30, mime-types@~2.1.34: version "2.1.34" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" integrity "sha1-WnEvnsFQNRGpRYA2QPr+CdN5PCQ= sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==" @@ -5807,11 +4836,6 @@ minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI= sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" -minimist@^1.2.6: - version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity "sha1-hjelt1nqDW6YcCz7OpKDMjyTr0Q= sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" - minipass-collect@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" @@ -5872,7 +4896,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: +mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity "sha1-2Rzv1i0UNsoPQWIOJRKI1CAJne8= sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==" @@ -5911,24 +4935,11 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk= sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" -ms@2.1.3, ms@^2.1.1: +ms@2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity "sha1-V0yBOM4dK1hh8LRFedut1gxmFbI= sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" -multicast-dns-service-types@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" - integrity "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE= sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==" - -multicast-dns@^6.0.1: - version "6.2.3" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" - integrity "sha1-oOx72QVcQoL3kMPIL04o2zsxsik= sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==" - dependencies: - dns-packet "^1.3.1" - thunky "^1.0.2" - mustache@^2.3.0: version "2.3.2" resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" @@ -5998,11 +5009,6 @@ node-fetch@^2.6.1: dependencies: whatwg-url "^5.0.0" -node-forge@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c" - integrity "sha1-gnlJGQce8utcUJKTMlzsiv0P1Tw= sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==" - node-html-parser@^3.2.0: version "3.3.6" resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-3.3.6.tgz#fdbb3ba16d1252d7197ec39f0260d9c10ef33590" @@ -6098,7 +5104,7 @@ normalize-url@^6.1.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity "sha1-QNCIW1Nd7/4/MUe+yHfQX+TFZoo= sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==" -npm-run-path@^4.0.0, npm-run-path@^4.0.1: +npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity "sha1-t+zR5e1T2o43pV4cImnguX7XSOo= sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==" @@ -6164,14 +5170,6 @@ object-inspect@^1.11.0, object-inspect@^1.9.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" integrity "sha1-biwSDoaP0f0Yy08YwxdB0NbndvA= sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==" -object-is@^1.0.1: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" - integrity "sha1-ud7qpfx/GEag+uzc7sE45XePU6w= sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==" - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -6219,11 +5217,6 @@ object.values@^1.1.0: define-properties "^1.1.3" es-abstract "^1.19.1" -obuf@^1.0.0, obuf@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" - integrity "sha1-Cb6jND1BhZ69RGKS0RydTbYZCE4= sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==" - on-finished@^2.3.0, on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -6250,15 +5243,6 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -open@^8.0.9: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity "sha1-NFMhrhj4E4+CVlqRD9xrOejCRPg= sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==" - dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" - opener@1.5.2, opener@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" @@ -6282,11 +5266,6 @@ os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==" -ospath@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b" - integrity "sha1-EnZjl3Sj+O8lcvf+QoDg6kVQwHs= sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==" - p-defer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" @@ -6327,14 +5306,6 @@ p-map@^4.0.0: dependencies: aggregate-error "^3.0.0" -p-retry@^4.5.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" - integrity "sha1-j83dXN96Z6CRGpzy7w5d9/YCMWw= sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==" - dependencies: - "@types/retry" "^0.12.0" - retry "^0.13.1" - p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" @@ -6416,7 +5387,7 @@ parse-url@^6.0.0: parse-path "^4.0.0" protocols "^1.4.0" -parseurl@~1.3.2, parseurl@~1.3.3: +parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity "sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ= sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" @@ -6469,11 +5440,6 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity "sha1-+8EUtgykKzDZ2vWFjkvWi77bZzU= sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" - path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -6490,16 +5456,6 @@ pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity "sha1-elfrVQpng/kRUzH89GY9XI4AelA= sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" - -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" - picocolors@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" @@ -6515,7 +5471,7 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity "sha1-O6ODNzNkbZ0+SZWUbBNlpn+wekI= sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" -pify@^2.2.0, pify@^2.3.0: +pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity "sha1-7RQaasBDqEnqWISY59yosVMw6Qw= sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==" @@ -6556,15 +5512,6 @@ pnp-webpack-plugin@^1.6.4: dependencies: ts-pnp "^1.1.6" -portfinder@^1.0.28: - version "1.0.28" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" - integrity "sha1-Z8RiKFK9U3TdHdkA93n1NGL6x3g= sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==" - dependencies: - async "^2.6.2" - debug "^3.1.1" - mkdirp "^0.5.5" - posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -7271,19 +6218,6 @@ protocols@^1.1.0, protocols@^1.4.0: resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.8.tgz#48eea2d8f58d9644a4a32caae5d5db290a075ce8" integrity "sha1-SO6i2PWNlkSkoyyq5dXbKQoHXOg= sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg==" -proxy-addr@~2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" - integrity "sha1-8Z/mnOqzEe65S0LnDowgcPm6ECU= sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==" - dependencies: - forwarded "0.2.0" - ipaddr.js "1.9.1" - -proxy-from-env@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee" - integrity "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4= sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==" - prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" @@ -7294,11 +6228,6 @@ pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity "sha1-8FKijacOYYkX7wqKw0wa5aaChrM= sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==" -psl@^1.1.28: - version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" - integrity "sha1-kyb4vPsBOtzABf3/BWrM4CDlHCQ= sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" - public-encrypt@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" @@ -7346,7 +6275,7 @@ punycode@^1.2.4: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity "sha1-wNWmOycYgArY4esPpSachN1BhF4= sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==" -punycode@^2.1.0, punycode@^2.1.1: +punycode@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity "sha1-tYsBCsQMIsVldhbI0sLALHv0eew= sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" @@ -7356,23 +6285,13 @@ q@^1.1.2: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==" -qs@6.9.7: - version "6.9.7" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe" - integrity "sha1-RhCEaHFIXh4Ej0SuO5QDPw5nWv4= sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==" - qs@^6.9.4: version "6.10.3" resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e" - integrity "sha1-1s3hsv/Kh7WqV4iYFsX4FTXiLo4= sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==" + integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ== dependencies: side-channel "^1.0.4" -qs@~6.5.2: - version "6.5.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" - integrity "sha1-Ou7/yRln7241wOSI70b7KWq3aq0= sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==" - query-string@^4.1.0: version "4.3.4" resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" @@ -7431,16 +6350,6 @@ range-parser@^1.2.1, range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity "sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE= sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" -raw-body@2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c" - integrity "sha1-j4AwXRHCoKVFwtnYnXoChvzq1Dw= sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==" - dependencies: - bytes "3.1.2" - http-errors "1.8.1" - iconv-lite "0.4.24" - unpipe "1.0.0" - rc9@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/rc9/-/rc9-1.2.0.tgz#ef098181fdde714efc4c426383d6e46c14b1254a" @@ -7470,7 +6379,7 @@ read-cache@^1.0.0: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.0.6, readable-stream@^3.6.0: +readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity "sha1-M3u9o63AcGvT4CRCaihtS0sskZg= sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==" @@ -7527,14 +6436,6 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexp.prototype.flags@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307" - integrity "sha1-s/TABZr55H7Knz9mDlHYEwfnIwc= sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==" - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - regexpu-core@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3" @@ -7590,23 +6491,6 @@ repeat-string@^1.6.1: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity "sha1-jcrkcOHIirwtYA//Sndihtp15jc= sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==" -request-progress@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe" - integrity "sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4= sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==" - dependencies: - throttleit "^1.0.0" - -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity "sha1-iaf92TgmEmcxjq/hT5wy5ZjDaQk= sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" - -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==" - resolve-from@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" @@ -7644,21 +6528,11 @@ retry@^0.12.0: resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" integrity "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==" -retry@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" - integrity "sha1-GFsVh6z2eRnWOzVzSeA1N7JIRlg= sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==" - reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity "sha1-kNo4Kx4SbvwCFG6QhFqI2xKSXXY= sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==" -rfdc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" - integrity "sha1-0LfEQasnINBdxM8m4ByJYx2doIs= sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==" - rgb-regex@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1" @@ -7676,7 +6550,7 @@ rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: dependencies: glob "^7.1.3" -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity "sha1-8aVAK6YiCtUswSgrrBrjqkn9Bho= sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==" @@ -7717,19 +6591,12 @@ rxjs@^6.6.0: dependencies: tslib "^1.9.0" -rxjs@^7.5.1: - version "7.5.5" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f" - integrity "sha1-LrrYmvD1YPRgrVzEITIZ4ffdTp8= sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==" - dependencies: - tslib "^2.1.0" - safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity "sha1-mR7GnSluAxN0fVm9/St0XDX4go0= sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity "sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY= sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" @@ -7741,7 +6608,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo= sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" @@ -7778,33 +6645,11 @@ schema-utils@^3.0.0: ajv "^6.12.5" ajv-keywords "^3.5.2" -schema-utils@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" - integrity "sha1-YDMenjrnjsXRY1PEZ8NLOgodPfc= sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==" - dependencies: - "@types/json-schema" "^7.0.9" - ajv "^8.8.0" - ajv-formats "^2.1.1" - ajv-keywords "^5.0.0" - scule@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/scule/-/scule-0.2.1.tgz#0c1dc847b18e07219ae9a3832f2f83224e2079dc" integrity "sha1-DB3IR7GOByGa6aODLy+DIk4gedw= sha512-M9gnWtn3J0W+UhJOHmBxBTwv8mZCan5i1Himp60t6vvZcor0wr+IM0URKmIglsWJ7bRujNAVVN77fp+uZaWoKg==" -select-hose@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" - integrity "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==" - -selfsigned@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.0.tgz#e927cd5377cbb0a1075302cff8df1042cc2bce5b" - integrity "sha1-6SfNU3fLsKEHUwLP+N8QQswrzls= sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ==" - dependencies: - node-forge "^1.2.0" - semver@7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" @@ -7827,13 +6672,6 @@ semver@^7.3.2, semver@^7.3.5: dependencies: lru-cache "^6.0.0" -semver@^7.3.4: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity "sha1-EsW2Sa/b+QSXB3luIqQCiBTOUj8= sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==" - dependencies: - lru-cache "^6.0.0" - send@0.17.2: version "0.17.2" resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" @@ -7874,19 +6712,6 @@ serialize-javascript@^5.0.1: dependencies: randombytes "^2.1.0" -serve-index@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" - integrity "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==" - dependencies: - accepts "~1.3.4" - batch "0.6.1" - debug "2.6.9" - escape-html "~1.0.3" - http-errors "~1.6.2" - mime-types "~2.1.17" - parseurl "~1.3.2" - serve-placeholder@^1.2.3: version "1.2.4" resolved "https://registry.yarnpkg.com/serve-placeholder/-/serve-placeholder-1.2.4.tgz#513eac9c435272c7fe9a86612c852ae9b1467fd4" @@ -7894,7 +6719,7 @@ serve-placeholder@^1.2.3: dependencies: defu "^5.0.0" -serve-static@1.14.2, serve-static@^1.14.1: +serve-static@^1.14.1: version "1.14.2" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa" integrity "sha1-ci1ilLHWJibUG0OgE+zkWY0pK/o= sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==" @@ -7924,11 +6749,6 @@ setimmediate@^1.0.4: resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" integrity "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - integrity "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY= sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" - setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" @@ -7942,13 +6762,6 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity "sha1-jymBrZJTH1UDWwH7IwdppA4C76M= sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==" - dependencies: - kind-of "^6.0.2" - shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -8001,24 +6814,6 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity "sha1-ZTm+hwwWWtvVJAIg2+Nh8bxNRjQ= sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" -slice-ansi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" - integrity "sha1-Md3BCTCht+C2ewjJbC9Jt3p4l4c= sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==" - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -slice-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" - integrity "sha1-UA6N0P1VsFgVCGJVsxla3ypF/ms= sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==" - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" @@ -8049,15 +6844,6 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -sockjs@^0.3.21: - version "0.3.24" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" - integrity "sha1-ybyJlfM6ERvqA5XsMKoyBr21zM4= sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==" - dependencies: - faye-websocket "^0.11.3" - uuid "^8.3.2" - websocket-driver "^0.7.4" - sort-keys@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" @@ -8121,29 +6907,6 @@ source-map@^0.7.3, source-map@~0.7.2: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity "sha1-UwL4FpAxc1ImVECS5kmB91F1A4M= sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" -spdy-transport@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" - integrity "sha1-ANSGOmQArXXfkzYaFghgXl3NzzE= sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==" - dependencies: - debug "^4.1.0" - detect-node "^2.0.4" - hpack.js "^2.1.6" - obuf "^1.1.2" - readable-stream "^3.0.6" - wbuf "^1.7.3" - -spdy@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" - integrity "sha1-t09GYgOj7aRSwCSSuR+56EonZ3s= sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==" - dependencies: - debug "^4.1.0" - handle-thing "^2.0.0" - http-deceiver "^1.2.7" - select-hose "^2.0.0" - spdy-transport "^3.0.0" - split-on-first@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f" @@ -8161,21 +6924,6 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" -sshpk@^1.14.1: - version "1.17.0" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5" - integrity "sha1-V4CC2S1P5hKxMAdJblQ/oPvL5MU= sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==" - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - ssri@^6.0.1: version "6.0.2" resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" @@ -8213,7 +6961,7 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" -"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: +"statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==" @@ -8267,7 +7015,7 @@ strict-uri-encode@^2.0.0: resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546" integrity "sha1-ucczDHBChi9rFC3CdLvMWGbONUY= sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==" -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity "sha1-JpxxF9J7Ba0uU2gwqOyJXvnG0BA= sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==" @@ -8320,13 +7068,6 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" - integrity "sha1-YXQKCM42th5Q5lZT8HBg0ACXX7I= sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==" - dependencies: - ansi-regex "^6.0.1" - strip-final-newline@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" @@ -8370,13 +7111,6 @@ supports-color@^7.0.0, supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -supports-color@^8.1.1: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity "sha1-zW/BfihQDP9WwbhsCn/UpUpzAFw= sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==" - dependencies: - has-flag "^4.0.0" - supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" @@ -8487,11 +7221,6 @@ thread-loader@^3.0.4: neo-async "^2.6.2" schema-utils "^3.0.0" -throttleit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" - integrity "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==" - through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -8500,16 +7229,11 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" -through@^2.3.6, through@^2.3.8: +through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" -thunky@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" - integrity "sha1-Wrr3FKlAXbBQRzK7zNLO3Z75U30= sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" - time-fix-plugin@^2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/time-fix-plugin/-/time-fix-plugin-2.0.7.tgz#4ba70ae2e40cedf34dabe505eda7b71b1b244f50" @@ -8534,13 +7258,6 @@ tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" -tmp@~0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity "sha1-hFf8MDfc9HGcJRNnoa9lAO4czxQ= sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==" - dependencies: - rimraf "^3.0.0" - to-arraybuffer@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" @@ -8593,14 +7310,6 @@ totalist@^1.0.0: resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df" integrity "sha1-pNZaPlRlF3AePlw3pHpwrJf+Vt8= sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==" -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity "sha1-zZ+yoKodWhK0c72fuW+j3P9lreI= sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==" - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" @@ -8616,7 +7325,7 @@ tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity "sha1-zy04vcNKE0vK8QkcQfZhni9nLQA= sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" -tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1: +tslib@^2.0.3, tslib@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity "sha1-6KM1rdXOrlGqJh0ypJAVjvBC7wE= sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" @@ -8626,18 +7335,6 @@ tty-browserify@0.0.0: resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" integrity "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY= sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==" -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==" - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" - type-fest@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" @@ -8648,14 +7345,6 @@ type-fest@^0.21.3: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" integrity "sha1-0mCiSwGYQ24TP6JqUkptZfo7Ljc= sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==" -type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity "sha1-TlUs0F3wlGfcvE73Od6J8s83wTE= sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==" - dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" - typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -8758,7 +7447,7 @@ universalify@^2.0.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity "sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc= sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" -unpipe@1.0.0, unpipe@~1.0.0: +unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==" @@ -8776,11 +7465,6 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" -untildify@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" - integrity "sha1-K8lHuVNlJIfkYAlJ+wkeOujNkZs= sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==" - upath@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" @@ -8877,11 +7561,6 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==" -uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity "sha1-gNW1ztJxu5r2xEXyGhoExgbO++I= sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - vary@^1.1.2, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -8892,15 +7571,6 @@ vendors@^1.0.0: resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" integrity "sha1-4rgApT56Kbk1BsPPQRANFsTErY4= sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==" -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==" - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - vm-browserify@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" @@ -9007,13 +7677,6 @@ watchpack@^1.7.4: chokidar "^3.4.1" watchpack-chokidar2 "^2.0.1" -wbuf@^1.1.0, wbuf@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" - integrity "sha1-wdjRSTFtPqhShIiVy2oL/oh7h98= sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==" - dependencies: - minimalistic-assert "^1.0.0" - webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" @@ -9046,53 +7709,6 @@ webpack-dev-middleware@^4.2.0: range-parser "^1.2.1" schema-utils "^3.0.0" -webpack-dev-middleware@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f" - integrity "sha1-qgeaje3X5Yv+qzWKmvfaswTO5X8= sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==" - dependencies: - colorette "^2.0.10" - memfs "^3.4.1" - mime-types "^2.1.31" - range-parser "^1.2.1" - schema-utils "^4.0.0" - -webpack-dev-server@4.7.4: - version "4.7.4" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz#d0ef7da78224578384e795ac228d8efb63d5f945" - integrity "sha1-0O99p4IkV4OE55WsIo2O+2PV+UU= sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A==" - dependencies: - "@types/bonjour" "^3.5.9" - "@types/connect-history-api-fallback" "^1.3.5" - "@types/express" "^4.17.13" - "@types/serve-index" "^1.9.1" - "@types/sockjs" "^0.3.33" - "@types/ws" "^8.2.2" - ansi-html-community "^0.0.8" - bonjour "^3.5.0" - chokidar "^3.5.3" - colorette "^2.0.10" - compression "^1.7.4" - connect-history-api-fallback "^1.6.0" - default-gateway "^6.0.3" - del "^6.0.0" - express "^4.17.1" - graceful-fs "^4.2.6" - html-entities "^2.3.2" - http-proxy-middleware "^2.0.0" - ipaddr.js "^2.0.1" - open "^8.0.9" - p-retry "^4.5.0" - portfinder "^1.0.28" - schema-utils "^4.0.0" - selfsigned "^2.0.0" - serve-index "^1.9.1" - sockjs "^0.3.21" - spdy "^4.0.2" - strip-ansi "^7.0.0" - webpack-dev-middleware "^5.3.1" - ws "^8.4.2" - webpack-hot-middleware@^2.25.0: version "2.25.1" resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.1.tgz#581f59edf0781743f4ca4c200fd32c9266c6cf7c" @@ -9103,14 +7719,6 @@ webpack-hot-middleware@^2.25.0: querystring "^0.2.0" strip-ansi "^6.0.0" -webpack-merge@^5.4.0: - version "5.8.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" - integrity "sha1-Kznb8ir4d3atdEw5AiNzHTCmj2E= sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==" - dependencies: - clone-deep "^4.0.1" - wildcard "^2.0.0" - webpack-node-externals@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz#1a3407c158d547a9feb4229a9e3385b7b60c9917" @@ -9167,20 +7775,6 @@ webpackbar@^4.0.0: text-table "^0.2.0" wrap-ansi "^6.0.0" -websocket-driver@>=0.5.1, websocket-driver@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" - integrity "sha1-ia1Slbv2S0gKvLox5JU6ynBvV2A= sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==" - dependencies: - http-parser-js ">=0.5.1" - safe-buffer ">=5.1.0" - websocket-extensions ">=0.1.1" - -websocket-extensions@>=0.1.1: - version "0.1.4" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" - integrity "sha1-f4RzvIOd/YdgituV1+sHUhFXikI= sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==" - whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" @@ -9214,11 +7808,6 @@ widest-line@^3.1.0: dependencies: string-width "^4.0.0" -wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity "sha1-p30g5SAMb6qsl55LOq3Hs91/j+w= sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==" - worker-farm@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" @@ -9226,7 +7815,7 @@ worker-farm@^1.7.0: dependencies: errno "~0.1.7" -wrap-ansi@^6.0.0, wrap-ansi@^6.2.0: +wrap-ansi@^6.0.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" integrity "sha1-6Tk7oHEC5skaOyIUePAlfNKFblM= sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==" @@ -9275,11 +7864,6 @@ ws@^7.3.1: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" integrity "sha1-ngrHfuUK9w1YMm7P9+hes/o3Xmc= sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==" -ws@^8.4.2: - version "8.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" - integrity "sha1-v7S+lmAHV/5Tgt4SxnDauYSh7U8= sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==" - xtend@^4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" @@ -9312,14 +7896,6 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI= sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==" - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" - yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" diff --git a/system-tests/projects/passthru-preprocessor/cypress.config.js b/system-tests/projects/passthru-preprocessor/cypress.config.js new file mode 100644 index 0000000000..6fa4779282 --- /dev/null +++ b/system-tests/projects/passthru-preprocessor/cypress.config.js @@ -0,0 +1,7 @@ +module.exports = { + e2e: { + setupNodeEvents (on) { + on('file:preprocessor', ({ filePath }) => filePath) + }, + }, +} diff --git a/system-tests/projects/passthru-preprocessor/cypress/e2e/cross_origin.cy.js b/system-tests/projects/passthru-preprocessor/cypress/e2e/cross_origin.cy.js new file mode 100644 index 0000000000..2f1c2cdba6 --- /dev/null +++ b/system-tests/projects/passthru-preprocessor/cypress/e2e/cross_origin.cy.js @@ -0,0 +1,8 @@ +it('uses cy.origin() dependency handling', () => { + cy.visit('/primary_origin.html') + cy.get('a[data-cy="cross_origin_secondary_link"]').click() + + cy.origin('foobar.com:4466', () => { + Cypress.require('lodash') + }) +}) diff --git a/system-tests/projects/passthru-preprocessor/cypress/support/e2e.js b/system-tests/projects/passthru-preprocessor/cypress/support/e2e.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/system-tests/projects/passthru-preprocessor/primary_origin.html b/system-tests/projects/passthru-preprocessor/primary_origin.html new file mode 100644 index 0000000000..d5ba735d96 --- /dev/null +++ b/system-tests/projects/passthru-preprocessor/primary_origin.html @@ -0,0 +1,17 @@ + + + + + + +
+ Go to different origin: + http://www.foobar.com:4466/secondary_origin.html +
+ + diff --git a/system-tests/projects/passthru-preprocessor/secondary_origin.html b/system-tests/projects/passthru-preprocessor/secondary_origin.html new file mode 100644 index 0000000000..60c3c12ce1 --- /dev/null +++ b/system-tests/projects/passthru-preprocessor/secondary_origin.html @@ -0,0 +1 @@ +

Secondary Origin

diff --git a/system-tests/projects/vite2.9.1-react/package.json b/system-tests/projects/vite2.9.1-react/package.json index 51fb6ae399..b8f2e923e7 100644 --- a/system-tests/projects/vite2.9.1-react/package.json +++ b/system-tests/projects/vite2.9.1-react/package.json @@ -1,6 +1,7 @@ { "devDependencies": { "@cypress/vite-dev-server": "file:../../../npm/vite-dev-server", + "@vitejs/plugin-react": "1.3.2", "react": "^17.0.0", "react-dom": "^17.0.0", "vite": "2.9.1" diff --git a/system-tests/projects/vite2.9.1-react/yarn.lock b/system-tests/projects/vite2.9.1-react/yarn.lock index 6679d7a853..94006d3509 100644 --- a/system-tests/projects/vite2.9.1-react/yarn.lock +++ b/system-tests/projects/vite2.9.1-react/yarn.lock @@ -2,14 +2,386 @@ # yarn lockfile v1 +"@ampproject/remapping@^2.1.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" + integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== + dependencies: + "@jridgewell/gen-mapping" "^0.1.0" + "@jridgewell/trace-mapping" "^0.3.9" + +"@babel/code-frame@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" + integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== + dependencies: + "@babel/highlight" "^7.18.6" + +"@babel/compat-data@^7.18.8": + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.13.tgz#6aff7b350a1e8c3e40b029e46cbe78e24a913483" + integrity sha512-5yUzC5LqyTFp2HLmDoxGQelcdYgSpP9xsnMWBphAscOdFrHSAVbLNzWiy32sVNDqJRDiJK6klfDnAgu6PAGSHw== + +"@babel/core@^7.17.10": + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.13.tgz#9be8c44512751b05094a4d3ab05fc53a47ce00ac" + integrity sha512-ZisbOvRRusFktksHSG6pjj1CSvkPkcZq/KHD45LAkVP/oiHJkNBZWfpvlLmX8OtHDG8IuzsFlVRWo08w7Qxn0A== + dependencies: + "@ampproject/remapping" "^2.1.0" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.18.13" + "@babel/helper-compilation-targets" "^7.18.9" + "@babel/helper-module-transforms" "^7.18.9" + "@babel/helpers" "^7.18.9" + "@babel/parser" "^7.18.13" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.18.13" + "@babel/types" "^7.18.13" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.1" + semver "^6.3.0" + +"@babel/generator@^7.18.13": + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.13.tgz#59550cbb9ae79b8def15587bdfbaa388c4abf212" + integrity sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ== + dependencies: + "@babel/types" "^7.18.13" + "@jridgewell/gen-mapping" "^0.3.2" + jsesc "^2.5.1" + +"@babel/helper-annotate-as-pure@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" + integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-compilation-targets@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf" + integrity sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg== + dependencies: + "@babel/compat-data" "^7.18.8" + "@babel/helper-validator-option" "^7.18.6" + browserslist "^4.20.2" + semver "^6.3.0" + +"@babel/helper-environment-visitor@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" + integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== + +"@babel/helper-function-name@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0" + integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A== + dependencies: + "@babel/template" "^7.18.6" + "@babel/types" "^7.18.9" + +"@babel/helper-hoist-variables@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" + integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-module-imports@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" + integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-module-transforms@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712" + integrity sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g== + dependencies: + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-simple-access" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.18.6" + "@babel/template" "^7.18.6" + "@babel/traverse" "^7.18.9" + "@babel/types" "^7.18.9" + +"@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f" + integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w== + +"@babel/helper-simple-access@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea" + integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-split-export-declaration@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" + integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-string-parser@^7.18.10": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56" + integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw== + +"@babel/helper-validator-identifier@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076" + integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g== + +"@babel/helper-validator-option@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" + integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== + +"@babel/helpers@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9" + integrity sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ== + dependencies: + "@babel/template" "^7.18.6" + "@babel/traverse" "^7.18.9" + "@babel/types" "^7.18.9" + +"@babel/highlight@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" + integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== + dependencies: + "@babel/helper-validator-identifier" "^7.18.6" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@^7.18.10", "@babel/parser@^7.18.13": + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4" + integrity sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg== + +"@babel/plugin-syntax-jsx@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0" + integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + +"@babel/plugin-transform-react-jsx-development@^7.16.7": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz#dbe5c972811e49c7405b630e4d0d2e1380c0ddc5" + integrity sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA== + dependencies: + "@babel/plugin-transform-react-jsx" "^7.18.6" + +"@babel/plugin-transform-react-jsx-self@^7.16.7": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.18.6.tgz#3849401bab7ae8ffa1e3e5687c94a753fc75bda7" + integrity sha512-A0LQGx4+4Jv7u/tWzoJF7alZwnBDQd6cGLh9P+Ttk4dpiL+J5p7NSNv/9tlEFFJDq3kjxOavWmbm6t0Gk+A3Ig== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + +"@babel/plugin-transform-react-jsx-source@^7.16.7": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.18.6.tgz#06e9ae8a14d2bc19ce6e3c447d842032a50598fc" + integrity sha512-utZmlASneDfdaMh0m/WausbjUjEdGrQJz0vFK93d7wD3xf5wBtX219+q6IlCNZeguIcxS2f/CvLZrlLSvSHQXw== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + +"@babel/plugin-transform-react-jsx@^7.17.3", "@babel/plugin-transform-react-jsx@^7.18.6": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.10.tgz#ea47b2c4197102c196cbd10db9b3bb20daa820f1" + integrity sha512-gCy7Iikrpu3IZjYZolFE4M1Sm+nrh1/6za2Ewj77Z+XirT4TsbJcvOFOyF+fRPwU6AKKK136CZxx6L8AbSFG6A== + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/plugin-syntax-jsx" "^7.18.6" + "@babel/types" "^7.18.10" + +"@babel/template@^7.18.10", "@babel/template@^7.18.6": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" + integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA== + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/parser" "^7.18.10" + "@babel/types" "^7.18.10" + +"@babel/traverse@^7.18.13", "@babel/traverse@^7.18.9": + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.13.tgz#5ab59ef51a997b3f10c4587d648b9696b6cb1a68" + integrity sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA== + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.18.13" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.18.9" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.18.13" + "@babel/types" "^7.18.13" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/types@^7.18.10", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9": + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.13.tgz#30aeb9e514f4100f7c1cb6e5ba472b30e48f519a" + integrity sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ== + dependencies: + "@babel/helper-string-parser" "^7.18.10" + "@babel/helper-validator-identifier" "^7.18.6" + to-fast-properties "^2.0.0" + "@cypress/vite-dev-server@file:../../../npm/vite-dev-server": version "0.0.0-development" dependencies: debug "4.3.3" find-up "6.3.0" local-pkg "0.4.1" + node-html-parser "5.3.3" pathe "0.2.0" +"@jridgewell/gen-mapping@^0.1.0": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" + integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@jridgewell/gen-mapping@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" + integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== + dependencies: + "@jridgewell/set-array" "^1.0.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@^3.0.3": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" + integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== + +"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" + integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== + +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.14" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" + integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== + +"@jridgewell/trace-mapping@^0.3.9": + version "0.3.15" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774" + integrity sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@rollup/pluginutils@^4.2.1": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d" + integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ== + dependencies: + estree-walker "^2.0.1" + picomatch "^2.2.2" + +"@vitejs/plugin-react@1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-1.3.2.tgz#2fcf0b6ce9bcdcd4cec5c760c199779d5657ece1" + integrity sha512-aurBNmMo0kz1O4qRoY+FM4epSA39y3ShWGuqfLRA/3z0oEJAdtoSfgA3aO98/PCCHAqMaduLxIxErWrVKIFzXA== + dependencies: + "@babel/core" "^7.17.10" + "@babel/plugin-transform-react-jsx" "^7.17.3" + "@babel/plugin-transform-react-jsx-development" "^7.16.7" + "@babel/plugin-transform-react-jsx-self" "^7.16.7" + "@babel/plugin-transform-react-jsx-source" "^7.16.7" + "@rollup/pluginutils" "^4.2.1" + react-refresh "^0.13.0" + resolve "^1.22.0" + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +boolbase@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== + +browserslist@^4.20.2: + version "4.21.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a" + integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ== + dependencies: + caniuse-lite "^1.0.30001370" + electron-to-chromium "^1.4.202" + node-releases "^2.0.6" + update-browserslist-db "^1.0.5" + +caniuse-lite@^1.0.30001370: + version "1.0.30001387" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001387.tgz#90d2b9bdfcc3ab9a5b9addee00a25ef86c9e2e1e" + integrity sha512-fKDH0F1KOJvR+mWSOvhj8lVRr/Q/mc5u5nabU2vi1/sgvlSqEsE8dOq0Hy/BqVbDkCYQPRRHB1WRjW6PGB/7PA== + +chalk@^2.0.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== + +convert-source-map@^1.7.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== + dependencies: + safe-buffer "~5.1.1" + +css-select@^4.2.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b" + integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ== + dependencies: + boolbase "^1.0.0" + css-what "^6.0.1" + domhandler "^4.3.1" + domutils "^2.8.0" + nth-check "^2.0.1" + +css-what@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" + integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== + debug@4.3.3: version "4.3.3" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" @@ -17,6 +389,53 @@ debug@4.3.3: dependencies: ms "2.1.2" +debug@^4.1.0: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +dom-serializer@^1.0.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30" + integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.2.0" + entities "^2.0.0" + +domelementtype@^2.0.1, domelementtype@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== + +domhandler@^4.2.0, domhandler@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" + integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== + dependencies: + domelementtype "^2.2.0" + +domutils@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" + integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== + dependencies: + dom-serializer "^1.0.1" + domelementtype "^2.2.0" + domhandler "^4.2.0" + +electron-to-chromium@^1.4.202: + version "1.4.237" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.237.tgz#c695c5fedc3bb48f04ba1b39470c5aef2aaafd84" + integrity sha512-vxVyGJcsgArNOVUJcXm+7iY3PJAfmSapEszQD1HbyPLl0qoCmNQ1o/EX3RI7Et5/88In9oLxX3SGF8J3orkUgA== + +entities@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== + esbuild-android-64@0.14.31: version "0.14.31" resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.31.tgz#4b7dfbbeee62b3495ba78220b85fb590eb68d5bf" @@ -143,6 +562,21 @@ esbuild@^0.14.27: esbuild-windows-64 "0.14.31" esbuild-windows-arm64 "0.14.31" +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== + +estree-walker@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" + integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== + find-up@6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790" @@ -161,6 +595,21 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0= sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" +gensync@^1.0.0-beta.2: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== + +globals@^11.1.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== + has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -168,6 +617,11 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" +he@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== + is-core-module@^2.8.1: version "2.8.1" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" @@ -175,10 +629,20 @@ is-core-module@^2.8.1: dependencies: has "^1.0.3" -"js-tokens@^3.0.0 || ^4.0.0": +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity "sha1-GSA/tZmR35jjoocFDUZHzerzJJk= sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +jsesc@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + +json5@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" + integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== local-pkg@0.4.1: version "0.4.1" @@ -209,6 +673,26 @@ nanoid@^3.3.1: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557" integrity "sha1-yJYi+vtDgc0iFCHGnsWFR6HuxVc= sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==" +node-html-parser@5.3.3: + version "5.3.3" + resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-5.3.3.tgz#2845704f3a7331a610e0e551bf5fa02b266341b6" + integrity sha512-ncg1033CaX9UexbyA7e1N0aAoAYRDiV8jkTvzEnfd1GDvzFdrsXLzR4p4ik8mwLgnaKP/jyUFWDy9q3jvRT2Jw== + dependencies: + css-select "^4.2.1" + he "1.2.0" + +node-releases@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" + integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== + +nth-check@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" + integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w== + dependencies: + boolbase "^1.0.0" + object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -248,6 +732,11 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity "sha1-y1vcdP8/UYkiNur3nWi8RFZKuBw= sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" +picomatch@^2.2.2: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + postcss@^8.4.12: version "8.4.12" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.12.tgz#1e7de78733b28970fa4743f7da6f3763648b1905" @@ -266,6 +755,11 @@ react-dom@^17.0.0: object-assign "^4.1.1" scheduler "^0.20.2" +react-refresh@^0.13.0: + version "0.13.0" + resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.13.0.tgz#cbd01a4482a177a5da8d44c9755ebb1f26d5a1c1" + integrity sha512-XP8A9BT0CpRBD+NYLLeIhld/RqG9+gktUjW1FkE+Vm7OCinbG1SshcK5tb9ls4kzvjZr9mOQc7HYgBngEyPAXg== + react@^17.0.0: version "17.0.2" resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" @@ -290,6 +784,11 @@ rollup@^2.59.0: optionalDependencies: fsevents "~2.3.2" +safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + scheduler@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" @@ -298,16 +797,41 @@ scheduler@^0.20.2: loose-envify "^1.1.0" object-assign "^4.1.1" +semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity "sha1-rbw2HZxi3zgBJefxYfccgm8eSQw= sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity "sha1-btpL00SjyUrqN21MwxvHcxEDngk= sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== + +update-browserslist-db@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz#be06a5eedd62f107b7c19eb5bcefb194411abf38" + integrity sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" + vite@2.9.1: version "2.9.1" resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.1.tgz#84bce95fae210a7beb566a0af06246748066b48f" diff --git a/system-tests/projects/vue3-vite-ts-configured/yarn.lock b/system-tests/projects/vue3-vite-ts-configured/yarn.lock index 54b04d9a4d..36e6a280e1 100644 --- a/system-tests/projects/vue3-vite-ts-configured/yarn.lock +++ b/system-tests/projects/vue3-vite-ts-configured/yarn.lock @@ -25,8 +25,8 @@ dependencies: debug "4.3.3" find-up "6.3.0" - get-port "5.1.1" local-pkg "0.4.1" + node-html-parser "5.3.3" pathe "0.2.0" "@emmetio/abbreviation@^2.2.3": @@ -232,6 +232,11 @@ babel-walk@3.0.0-canary-5: dependencies: "@babel/types" "^7.9.6" +boolbase@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== + call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" @@ -255,6 +260,22 @@ constantinople@^4.0.1: "@babel/parser" "^7.6.0" "@babel/types" "^7.6.1" +css-select@^4.2.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b" + integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ== + dependencies: + boolbase "^1.0.0" + css-what "^6.0.1" + domhandler "^4.3.1" + domutils "^2.8.0" + nth-check "^2.0.1" + +css-what@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" + integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== + csstype@^2.6.8: version "2.6.19" resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.19.tgz#feeb5aae89020bb389e1f63669a5ed490e391caa" @@ -293,6 +314,13 @@ domhandler@^4.2.0, domhandler@^4.2.2: dependencies: domelementtype "^2.2.0" +domhandler@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" + integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== + dependencies: + domelementtype "^2.2.0" + domutils@^2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" @@ -472,11 +500,6 @@ get-intrinsic@^1.0.2: has "^1.0.3" has-symbols "^1.0.1" -get-port@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193" - integrity "sha1-BGntB1Y0ed5u+5hrrwU9zX1OMZM= sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==" - has-symbols@^1.0.1, has-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" @@ -496,6 +519,11 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" +he@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== + htmlparser2@^7.1.2: version "7.2.0" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-7.2.0.tgz#8817cdea38bbc324392a90b1990908e81a65f5a5" @@ -593,6 +621,21 @@ nanoid@^3.2.0: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" integrity "sha1-Y0ehjKyIr4j1ivCzWUtyPV6ZuzU= sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==" +node-html-parser@5.3.3: + version "5.3.3" + resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-5.3.3.tgz#2845704f3a7331a610e0e551bf5fa02b266341b6" + integrity sha512-ncg1033CaX9UexbyA7e1N0aAoAYRDiV8jkTvzEnfd1GDvzFdrsXLzR4p4ik8mwLgnaKP/jyUFWDy9q3jvRT2Jw== + dependencies: + css-select "^4.2.1" + he "1.2.0" + +nth-check@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" + integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w== + dependencies: + boolbase "^1.0.0" + object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" diff --git a/system-tests/test/cy_origin_error_spec.ts b/system-tests/test/cy_origin_error_spec.ts index 1f980ed869..7955c376d3 100644 --- a/system-tests/test/cy_origin_error_spec.ts +++ b/system-tests/test/cy_origin_error_spec.ts @@ -7,9 +7,15 @@ const e2ePath = Fixtures.projectPath('e2e') const PORT = 3500 const onServer = function (app) { app.get('/secondary_origin.html', (_, res) => { - res.sendFile(path.join(e2ePath, `secondary_origin.html`)) + res.sendFile(path.join(e2ePath, 'secondary_origin.html')) }) } +const commonConfig = { + experimentalSessionAndOrigin: true, + hosts: { + '*.foobar.com': '127.0.0.1', + }, +} // TODO: This is probably more appropriate for a cy-in-cy test // https://github.com/cypress-io/cypress/issues/20973 @@ -19,12 +25,6 @@ describe('e2e cy.origin errors', () => { port: 4466, onServer, }], - settings: { - e2e: {}, - hosts: { - '*.foobar.com': '127.0.0.1', - }, - }, }) systemTests.it('captures the stack trace correctly for errors in cross origins to point users to their "cy.origin" callback', { @@ -34,9 +34,7 @@ describe('e2e cy.origin errors', () => { spec: 'cy_origin_error.cy.ts', snapshot: true, expectedExitCode: 1, - config: { - experimentalSessionAndOrigin: true, - }, + config: commonConfig, async onRun (exec) { const res = await exec() @@ -47,4 +45,17 @@ describe('e2e cy.origin errors', () => { expect(res.stdout).to.contain('webpack:///./cypress/e2e/cy_origin_error.cy.ts:8:7') }, }) + + systemTests.it('errors when not using webpack-preprocessor', { + browser: '!webkit', // TODO(webkit): results in "TypeError: expecting an array or an iterable object but got [object Null]" + project: 'passthru-preprocessor', + spec: 'cross_origin.cy.js', + expectedExitCode: 1, + config: commonConfig, + async onRun (exec) { + const res = await exec() + + expect(res.stdout).to.contain('CypressError: Importing dependencies with `Cypress.require()` requires using the latest version of `@cypress/webpack-preprocessor`') + }, + }) }) diff --git a/yarn.lock b/yarn.lock index 0f68dc144c..942b46c25e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7575,7 +7575,17 @@ estree-walker "^2.0.2" source-map "^0.6.1" -"@vue/compiler-dom@3.2.31", "@vue/compiler-dom@^3.2.6": +"@vue/compiler-core@3.2.39": + version "3.2.39" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.39.tgz#0d77e635f4bdb918326669155a2dc977c053943e" + integrity sha512-mf/36OWXqWn0wsC40nwRRGheR/qoID+lZXbIuLnr4/AngM0ov8Xvv8GHunC0rKRIkh60bTqydlqTeBo49rlbqw== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/shared" "3.2.39" + estree-walker "^2.0.2" + source-map "^0.6.1" + +"@vue/compiler-dom@3.2.31": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz#b1b7dfad55c96c8cc2b919cd7eb5fd7e4ddbf00e" integrity sha512-60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg== @@ -7583,7 +7593,15 @@ "@vue/compiler-core" "3.2.31" "@vue/shared" "3.2.31" -"@vue/compiler-sfc@3.2.31", "@vue/compiler-sfc@^3.2.20", "@vue/compiler-sfc@^3.2.4": +"@vue/compiler-dom@3.2.39", "@vue/compiler-dom@^3.2.6": + version "3.2.39" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.39.tgz#bd69d35c1a48fe2cea4ab9e96d2a3a735d146fdf" + integrity sha512-HMFI25Be1C8vLEEv1hgEO1dWwG9QQ8LTTPmCkblVJY/O3OvWx6r1+zsox5mKPMGvqYEZa6l8j+xgOfUspgo7hw== + dependencies: + "@vue/compiler-core" "3.2.39" + "@vue/shared" "3.2.39" + +"@vue/compiler-sfc@3.2.31": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.31.tgz#d02b29c3fe34d599a52c5ae1c6937b4d69f11c2f" integrity sha512-748adc9msSPGzXgibHiO6T7RWgfnDcVQD+VVwYgSsyyY8Ans64tALHZANrKtOzvkwznV/F4H7OAod/jIlp/dkQ== @@ -7599,6 +7617,22 @@ postcss "^8.1.10" source-map "^0.6.1" +"@vue/compiler-sfc@^3.2.20", "@vue/compiler-sfc@^3.2.4": + version "3.2.39" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.39.tgz#8fe29990f672805b7c5a2ecfa5b05e681c862ea2" + integrity sha512-fqAQgFs1/BxTUZkd0Vakn3teKUt//J3c420BgnYgEOoVdTwYpBTSXCMJ88GOBCylmUBbtquGPli9tVs7LzsWIA== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/compiler-core" "3.2.39" + "@vue/compiler-dom" "3.2.39" + "@vue/compiler-ssr" "3.2.39" + "@vue/reactivity-transform" "3.2.39" + "@vue/shared" "3.2.39" + estree-walker "^2.0.2" + magic-string "^0.25.7" + postcss "^8.1.10" + source-map "^0.6.1" + "@vue/compiler-ssr@3.2.31": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.31.tgz#4fa00f486c9c4580b40a4177871ebbd650ecb99c" @@ -7607,6 +7641,14 @@ "@vue/compiler-dom" "3.2.31" "@vue/shared" "3.2.31" +"@vue/compiler-ssr@3.2.39": + version "3.2.39" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.39.tgz#4f3bfb535cb98b764bee45e078700e03ccc60633" + integrity sha512-EoGCJ6lincKOZGW+0Ky4WOKsSmqL7hp1ZYgen8M7u/mlvvEQUaO9tKKOy7K43M9U2aA3tPv0TuYYQFrEbK2eFQ== + dependencies: + "@vue/compiler-dom" "3.2.39" + "@vue/shared" "3.2.39" + "@vue/devtools-api@^6.0.0-beta.13", "@vue/devtools-api@^6.0.0-beta.14", "@vue/devtools-api@^6.0.0-beta.19", "@vue/devtools-api@^6.0.0-beta.5": version "6.0.0-beta.19" resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.0.0-beta.19.tgz#f8e88059daa424515992426a0c7ea5cde07e99bf" @@ -7623,13 +7665,31 @@ estree-walker "^2.0.2" magic-string "^0.25.7" -"@vue/reactivity@3.2.31", "@vue/reactivity@^3.2.6": +"@vue/reactivity-transform@3.2.39": + version "3.2.39" + resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.39.tgz#da6ae6c8fd77791b9ae21976720d116591e1c4aa" + integrity sha512-HGuWu864zStiWs9wBC6JYOP1E00UjMdDWIG5W+FpUx28hV3uz9ODOKVNm/vdOy/Pvzg8+OcANxAVC85WFBbl3A== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/compiler-core" "3.2.39" + "@vue/shared" "3.2.39" + estree-walker "^2.0.2" + magic-string "^0.25.7" + +"@vue/reactivity@3.2.31": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.31.tgz#fc90aa2cdf695418b79e534783aca90d63a46bbd" integrity sha512-HVr0l211gbhpEKYr2hYe7hRsV91uIVGFYNHj73njbARVGHQvIojkImKMaZNDdoDZOIkMsBc9a1sMqR+WZwfSCw== dependencies: "@vue/shared" "3.2.31" +"@vue/reactivity@^3.2.6": + version "3.2.39" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.39.tgz#e6e3615fe2288d4232b104640ddabd0729a78c80" + integrity sha512-vlaYX2a3qMhIZfrw3Mtfd+BuU+TZmvDrPMa+6lpfzS9k/LnGxkSuf0fhkP0rMGfiOHPtyKoU9OJJJFGm92beVQ== + dependencies: + "@vue/shared" "3.2.39" + "@vue/runtime-core@3.2.31": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.31.tgz#9d284c382f5f981b7a7b5971052a1dc4ef39ac7a" @@ -7655,11 +7715,16 @@ "@vue/compiler-ssr" "3.2.31" "@vue/shared" "3.2.31" -"@vue/shared@3.2.31", "@vue/shared@^3.2.6": +"@vue/shared@3.2.31": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.31.tgz#c90de7126d833dcd3a4c7534d534be2fb41faa4e" integrity sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ== +"@vue/shared@3.2.39", "@vue/shared@^3.2.6": + version "3.2.39" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.39.tgz#302df167559a1a5156da162d8cc6760cef67f8e3" + integrity sha512-D3dl2ZB9qE6mTuWPk9RlhDeP1dgNRUKC3NJxji74A4yL8M2MwlhLKUC/49WHjrNzSPug58fWx/yFbaTzGAQSBw== + "@vue/test-utils@2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.0.2.tgz#0b5edd683366153d5bc5a91edc62f292118710eb" @@ -12478,7 +12543,7 @@ common-tags@1.8.0: resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937" integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw== -common-tags@1.8.2, common-tags@^1.8.0: +common-tags@1.8.2, common-tags@^1.8.0, common-tags@^1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6" integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA== @@ -14044,9 +14109,9 @@ del@^4.0.0, del@^4.1.1: rimraf "^2.6.3" del@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" - integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ== + version "6.1.1" + resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a" + integrity sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg== dependencies: globby "^11.0.1" graceful-fs "^4.2.4" @@ -17262,10 +17327,10 @@ fs-extra@9.1.0, fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1" - integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ== +fs-extra@^10.0.0, fs-extra@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -34536,10 +34601,10 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack-virtual-modules@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.3.tgz#cd597c6d51d5a5ecb473eea1983a58fa8a17ded9" - integrity sha512-5NUqC2JquIL2pBAAo/VfBP6KuGkHIZQXW/lNKupLPfhViwh8wNsu0BObtl09yuKZszeEUfbXz8xhrHvSG16Nqw== +webpack-virtual-modules@^0.4.3, webpack-virtual-modules@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.4.tgz#a19fcf371923c59c4712d63d7d194b1e4d8262cc" + integrity sha512-h9atBP/bsZohWpHnr+2sic8Iecb60GxftXsWNLLLSqewgIsGzByd2gcIID4nXcG+3tNe4GQG3dLcff3kXupdRA== webpack@4.41.0: version "4.41.0"