diff --git a/.circleci/config.yml b/.circleci/config.yml
index e1ff78cc..bbff0048 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,39 +2,27 @@
version: 2.1
orbs:
# https://github.com/cypress-io/circleci-orb
- cypress: cypress-io/cypress@1.26.0 # used to run e2e tests
- node: circleci/node@1.1.6 # used to publish new NPM version
+ cypress: cypress-io/cypress@1.29.0 # used to run e2e tests
win: circleci/windows@2 # run a test job on Windows
jobs:
- unit:
+ lint:
description: Checks the code formatting
- executor:
- name: node/default
- tag: '12'
- environment:
- # we don't need Cypress to check code style
- CYPRESS_INSTALL_BINARY: '0'
+ docker:
+ - image: cimg/node:16.9.1
+ environment:
+ # we don't need Cypress to check code styl
+ CYPRESS_INSTALL_BINARY: '0'
steps:
- - checkout
- - node/with-cache:
- steps:
- - run:
- name: Install dependencies ๐ฆ
- # installs NPM dependencies but skips Cypress
- command: CYPRESS_INSTALL_BINARY=0 npm ci
+ - attach_workspace:
+ at: ~/
- run:
name: Code style check ๐งน
command: npm run format:check
- - run:
- name: Types lint ๐งน
- command: npm run types
-
publish:
description: Publishes the new version of the plugin to NPM
- executor:
- name: node/default
- tag: '12'
+ docker:
+ - image: cimg/node:16.9.1
environment:
# we don't need Cypress to do the release
CYPRESS_INSTALL_BINARY: '0'
@@ -45,569 +33,166 @@ jobs:
CI_PULL_REQUEST: ''
steps:
- checkout
- - node/with-cache:
- steps:
- - run: npm ci
+ - run: npm ci
- run: npm run semantic-release
+
+ cyrun:
+ docker:
+ - image: cypress/base:16.13.2
+ parameters:
+ jobname:
+ type: string
+ steps:
+ - attach_workspace:
+ at: ~/
+ - run:
+ command: npm run test
+ working_directory: test-apps/<< parameters.jobname >>
+ - store_artifacts:
+ path: test-apps/<< parameters.jobname >>/coverage
+ - run:
+ name: Verify Code Coverage
+ command: npm run coverage:verify
+ working_directory: test-apps/<< parameters.jobname >>
+ - run:
+ name: Check code coverage files ๐
+ # we will check the final coverage report
+ # to make sure it only has files we are interested in
+ # because there are files covered at 0 in the report
+ command: npm run coverage:check-files
+ working_directory: test-apps/<< parameters.jobname >>
+
+ test-code-coverage-plugin:
+ docker:
+ - image: cypress/base:16.13.2
+ steps:
+ - attach_workspace:
+ at: ~/
+ - run:
+ command: npm run test
+ - store_artifacts:
+ path: coverage
+ - run:
+ name: Verify Code Coverage
+ command: npm run coverage:verify
workflows:
build:
- jobs:
- - unit
+ jobs:
- cypress/install:
- post-steps:
- - run: npm run check:markdown
-
- - cypress/run:
- name: frontend coverage
- requires:
- - cypress/install
- # grab the workspace created by cypress/install job
- attach-workspace: true
- # we need to start the web application
- start: npm start
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- post-steps:
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: coverage
- # print code coverage summary to the terminal
- # and make sure there the coverage is above certain limit
- - run: npx nyc report --check-coverage true --lines 80
- # make sure second page (about.html) has its JavaScript counted and covered
- - run: npx nyc report --check-coverage true --lines 100 --include cypress/about.js
- # make sure unit tests are covered
- - run: npx nyc report --check-coverage true --lines 100 --include cypress/unit.js
-
- - cypress/run:
- name: backend coverage
- requires:
- - cypress/install
- # grab the workspace created by cypress/install job
- attach-workspace: true
- working_directory: examples/backend
- start: npm start
- wait-on: 'http://localhost:3003'
- command: '../../node_modules/.bin/cypress run'
-
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- post-steps:
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/backend/coverage
- - run:
- command: npm run coverage:report
- working_directory: examples/backend
- - run:
- name: Check code coverage ๐
- command: |
- ../../node_modules/.bin/check-coverage server.js
- ../../node_modules/.bin/only-covered server.js
- working_directory: examples/backend
-
- - cypress/run:
- name: fullstack coverage
- requires:
- - cypress/install
- # grab the workspace created by cypress/install job
- attach-workspace: true
- working_directory: examples/fullstack
- start: npm start
- wait-on: 'http://localhost:3003'
- command: '../../node_modules/.bin/cypress run'
-
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- post-steps:
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/backend/coverage
- - run:
- command: npm run report
- working_directory: examples/fullstack
- - run:
- name: Check code coverage ๐
- command: |
- ../../node_modules/.bin/check-coverage fullstack/server/server.js
- ../../node_modules/.bin/check-coverage fullstack/main.js
- ../../node_modules/.bin/check-coverage fullstack/string-utils.js
- ../../node_modules/.bin/only-covered server.js main.js string-utils.js
- working_directory: examples/fullstack
-
- - cypress/run:
- attach-workspace: true
- name: example-before-each-visit
- requires:
- - cypress/install
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- command: npx cypress run --project examples/before-each-visit
- # store screenshots and videos
- store_artifacts: true
- post-steps:
- - run: cat examples/before-each-visit/.nyc_output/out.json
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/before-each-visit/coverage
- # make sure the examples captures 100% of code
- - run:
- command: npx nyc report --check-coverage true --lines 100
- working_directory: examples/before-each-visit
- - run:
- name: Check code coverage ๐
- command: |
- ../../node_modules/.bin/check-coverage main.js
- ../../node_modules/.bin/only-covered main.js
- working_directory: examples/before-each-visit
-
- - cypress/run:
- attach-workspace: true
- name: example-before-all-visit
- requires:
- - cypress/install
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- command: npx cypress run --project examples/before-all-visit
- # store screenshots and videos
- store_artifacts: true
- post-steps:
- - run: cat examples/before-all-visit/.nyc_output/out.json
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/before-all-visit/coverage
- # make sure the examples captures 100% of code
- - run:
- command: npx nyc report --check-coverage true --lines 100
- working_directory: examples/before-all-visit
- - run:
- name: Check code coverage ๐
- command: |
- ../../node_modules/.bin/check-coverage main.js
- ../../node_modules/.bin/only-covered main.js
- working_directory: examples/before-all-visit
-
- - cypress/run:
- attach-workspace: true
- name: example-docker-paths
- requires:
- - cypress/install
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- working_directory: examples/docker-paths
- command: '../../node_modules/.bin/cypress run'
- post-steps:
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/docker-paths/coverage
- - run:
- name: Check code coverage ๐
- command: |
- ../../node_modules/.bin/check-coverage main.js
- ../../node_modules/.bin/check-coverage second.js
- ../../node_modules/.bin/only-covered main.js second.js
- working_directory: examples/docker-paths
-
- - cypress/run:
- attach-workspace: true
- name: example-ts-example
- requires:
- - cypress/install
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- working_directory: examples/ts-example
- start: npm start
- wait-on: 'http://localhost:1234'
- command: '../../node_modules/.bin/cypress run'
- post-steps:
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/ts-example/coverage
- - run:
- command: npm run coverage:check
- working_directory: examples/ts-example
- - run:
- name: Check code coverage ๐
- command: |
- ../../node_modules/.bin/check-coverage main.ts
- ../../node_modules/.bin/check-coverage calc.ts
- ../../node_modules/.bin/only-covered main.ts calc.ts
- working_directory: examples/ts-example
-
- - cypress/run:
- attach-workspace: true
- name: example-use-webpack
- requires:
- - cypress/install
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- working_directory: examples/use-webpack
- build: npm run build
- start: npm start
- wait-on: 'http://localhost:5000'
- command: '../../node_modules/.bin/cypress run'
- # wrong path when using working_directory
- # https://github.com/cypress-io/circleci-orb/issues/265
- # store screenshots and videos
- # store_artifacts: true
- post-steps:
- - store_artifacts:
- path: examples/use-webpack/cypress/videos
- - store_artifacts:
- path: examples/use-webpack/cypress/screenshots
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/use-webpack/coverage
- - run:
- name: Check code coverage ๐
- command: |
- ../../node_modules/.bin/check-coverage src/index.js
- ../../node_modules/.bin/check-coverage src/calc.js
- ../../node_modules/.bin/only-covered src/index.js src/calc.js
- working_directory: examples/use-webpack
-
- - cypress/run:
- attach-workspace: true
- name: example-same-folder
- requires:
- - cypress/install
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- command: npx cypress run --project examples/same-folder
- # store screenshots and videos
- store_artifacts: true
- post-steps:
- - run: cat examples/same-folder/.nyc_output/out.json
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/same-folder/coverage
- # make sure the examples captures 100% of code
- - run:
- command: npx nyc report --check-coverage true --lines 100
- working_directory: examples/same-folder
- - run:
- command: npx nyc report --check-coverage true --lines 100 --include unit-utils.js
- working_directory: examples/same-folder
- - run:
- name: Check code coverage ๐
- command: |
- ../../node_modules/.bin/check-coverage main.js
- ../../node_modules/.bin/check-coverage unit-utils.js
- ../../node_modules/.bin/only-covered main.js unit-utils.js
- working_directory: examples/same-folder
-
- - cypress/run:
- attach-workspace: true
- name: example-support-files
- requires:
- - cypress/install
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- start: npm start --prefix examples/support-files
- wait-on: 'http://localhost:1234'
- command: npx cypress run --project examples/support-files
- # store screenshots and videos
- store_artifacts: true
- post-steps:
- - run: cat examples/support-files/.nyc_output/out.json
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/support-files/coverage
- # make sure the examples captures 100% of code
- - run:
- command: npx nyc report --check-coverage true --lines 100
- working_directory: examples/support-files
- - run:
- name: Check code coverage ๐
- command: |
- ../../node_modules/.bin/check-coverage main.js
- ../../node_modules/.bin/only-covered main.js
- working_directory: examples/support-files
-
- - cypress/run:
- attach-workspace: true
- name: example-all-files
- requires:
- - cypress/install
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- start: npm start --prefix examples/all-files
- wait-on: 'http://localhost:1234'
- command: npx cypress run --project examples/all-files
- # store screenshots and videos
- store_artifacts: true
- post-steps:
- - run: cat examples/all-files/.nyc_output/out.json
- - run: cat examples/all-files/coverage/coverage-final.json
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/all-files/coverage
- # make sure the examples captures 100% of code
- - run:
- command: npx nyc report --check-coverage true --lines 100
- working_directory: examples/all-files
- - run:
- name: Check code coverage ๐
- # we will check the final coverage report
- # to make sure it only has files we are interested in
- # because there are files covered at 0 in the report
- command: |
- ../../node_modules/.bin/check-coverage main.js
- ../../node_modules/.bin/check-coverage second.js
- ../../node_modules/.bin/check-coverage not-covered.js
- ../../node_modules/.bin/only-covered --from coverage/coverage-final.json main.js second.js not-covered.js
- working_directory: examples/all-files
-
- - cypress/run:
- attach-workspace: true
- name: example-placeholders
- requires:
- - cypress/install
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- command: npx cypress run --project examples/placeholders
- # store screenshots and videos
- store_artifacts: true
- post-steps:
- - run: cat examples/placeholders/.nyc_output/out.json
- - run: cat examples/placeholders/coverage/coverage-final.json
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/placeholders/coverage
- # make sure the examples captures 100% of code
- - run:
- command: npx nyc report --check-coverage true --lines 100
- working_directory: examples/placeholders
- - run:
- name: Check code coverage ๐
- # we will check the final coverage report
- # to make sure it only has files we are interested in
- # because there are files covered at 0 in the report
- command: |
- ../../node_modules/.bin/check-coverage src/a.js
- ../../node_modules/.bin/check-coverage src/a.js
- ../../node_modules/.bin/only-covered --from coverage/coverage-final.json src/a.js src/b.js
- working_directory: examples/placeholders
-
- - cypress/run:
- attach-workspace: true
- name: example-exclude-files
- requires:
- - cypress/install
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- start: npm start --prefix examples/exclude-files
- wait-on: 'http://localhost:1234'
- command: npx cypress run --project examples/exclude-files
- # store screenshots and videos
- store_artifacts: true
- post-steps:
- - run: cat examples/exclude-files/.nyc_output/out.json
- - run: cat examples/exclude-files/coverage/coverage-final.json
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/exclude-files/coverage
- # make sure the examples captures 100% of code
- - run:
- command: npx nyc report --check-coverage true --lines 100
- working_directory: examples/exclude-files
- - run:
- name: Check code coverage ๐
- # we will check the final coverage report
- # to make sure it only has files we are interested in
- command: |
- ../../node_modules/.bin/check-coverage main.js
- ../../node_modules/.bin/only-covered --from coverage/coverage-final.json main.js
- working_directory: examples/exclude-files
-
- - cypress/run:
- attach-workspace: true
- name: example-use-plugins-and-support
- requires:
- - cypress/install
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- command: npx cypress run --project examples/use-plugins-and-support
- # store screenshots and videos
- store_artifacts: true
- post-steps:
- - run: cat examples/use-plugins-and-support/.nyc_output/out.json
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/use-plugins-and-support/coverage
- # make sure the examples captures 100% of code
- - run:
- command: npx nyc report --check-coverage true --lines 100
- working_directory: examples/use-plugins-and-support
- - run:
- name: Check code coverage ๐
- command: |
- ../../node_modules/.bin/check-coverage main.js
- ../../node_modules/.bin/only-covered main.js
- working_directory: examples/use-plugins-and-support
-
- - cypress/run:
- attach-workspace: true
- name: example-one-spec
- requires:
- - cypress/install
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- command: npx cypress run --project examples/one-spec
- # store screenshots and videos
- store_artifacts: true
- post-steps:
- - run: cat examples/one-spec/.nyc_output/out.json
- - run: cat examples/one-spec/coverage/coverage-summary.json
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/one-spec/coverage
- # make sure the examples captures 100% of code
- - run:
- command: npx nyc report --check-coverage true --lines 100
- working_directory: examples/one-spec
- - run:
- name: Check code coverage ๐
- command: |
- ../../node_modules/.bin/check-coverage main.js
- ../../node_modules/.bin/only-covered main.js
- working_directory: examples/one-spec
-
- - cypress/run:
- attach-workspace: true
- name: example-unit-tests-js
- requires:
- - cypress/install
- # there are no jobs to follow this one
- # so no need to save the workspace files (saves time)
- no-workspace: true
- command: npx cypress run --project examples/unit-tests-js
- # store screenshots and videos
- store_artifacts: true
- post-steps:
- - run: cat examples/unit-tests-js/.nyc_output/out.json
- - run: cat examples/unit-tests-js/coverage/coverage-summary.json
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/unit-tests-js/coverage
- # make sure the examples captures 100% of code
- - run:
- command: npx nyc report --check-coverage true --lines 100
- working_directory: examples/unit-tests-js
- - run:
- name: Check code coverage ๐
- command: |
- ../../node_modules/.bin/check-coverage misc.js
- ../../node_modules/.bin/only-covered misc.js
- working_directory: examples/unit-tests-js
-
- - cypress/run:
- name: Windows test
- executor:
- # executor comes from the "windows" orb
- name: win/default
- shell: bash.exe
- no-workspace: true
- start: npm run start:windows --prefix examples/all-files
- wait-on: 'http://localhost:1234'
- command: npx cypress run --project examples/all-files
- # store screenshots and videos
- store_artifacts: true
- post-steps:
- - run: cat examples/all-files/.nyc_output/out.json
- - run: cat examples/all-files/coverage/coverage-final.json
- # store the created coverage report folder
- # you can click on it in the CircleCI UI
- # to see live static HTML site
- - store_artifacts:
- path: examples/all-files/coverage
- # make sure the examples captures 100% of code
- - run:
- command: npx nyc report --check-coverage true --lines 100
- working_directory: examples/all-files
- - run:
- name: Check code coverage ๐
- # we will check the final coverage report
- # to make sure it only has files we are interested in
- # because there are files covered at 0 in the report
- command: |
- ../../node_modules/.bin/check-coverage main.js
- ../../node_modules/.bin/check-coverage second.js
- ../../node_modules/.bin/check-coverage not-covered.js
- ../../node_modules/.bin/only-covered --from coverage/coverage-final.json main.js second.js not-covered.js
- working_directory: examples/all-files
-
- - publish:
- filters:
- branches:
- only:
- - master
- - beta
- requires:
- - unit
- - frontend coverage
- - backend coverage
- - fullstack coverage
- - example-before-each-visit
- - example-before-all-visit
- - example-ts-example
- - example-same-folder
- - example-support-files
- - example-use-plugins-and-support
- - example-one-spec
- - example-exclude-files
- - example-docker-paths
- - example-use-webpack
- - example-all-files
- - example-placeholders
- - example-unit-tests-js
- - Windows test
+ cache-key: 'cache-{{ arch }}-{{ .Branch }}-{{ checksum "package-lock.json" }}'
+ pre-steps:
+ - run: npm i -g npm@latest
+ post-install:
+ - run:
+ name: Install deps for test-apps/old-cypress-config
+ command: npm ci
+ working_directory: test-apps/old-cypress-config
+ - run:
+ name: Install deps for test-apps/new-cypress-config
+ command: npm ci
+ working_directory: test-apps/new-cypress-config
+ post-steps:
+ - run: npm run check:markdown
+
+ - lint:
+ requires:
+ - cypress/install
+
+ - test-code-coverage-plugin:
+ requires:
+ - cypress/install
+
+ - cyrun:
+ name: test-<< matrix.jobname>>
+ requires:
+ - cypress/install
+ matrix:
+ parameters:
+ jobname:
+ - old-cypress-config/all-files
+ - old-cypress-config/backend
+ - old-cypress-config/before-all-visit
+ - old-cypress-config/before-each-visit
+ - old-cypress-config/exclude-files
+ - old-cypress-config/frontend
+ - old-cypress-config/fullstack
+ - old-cypress-config/one-spec
+ - old-cypress-config/same-folder
+ - old-cypress-config/support-files
+ - old-cypress-config/ts-example
+ - old-cypress-config/unit-tests-js
+ - old-cypress-config/use-webpack
+ - new-cypress-config/all-files
+ - new-cypress-config/backend
+ - new-cypress-config/before-all-visit
+ - new-cypress-config/before-each-visit
+ - new-cypress-config/exclude-files
+ - new-cypress-config/frontend
+ - new-cypress-config/fullstack
+ - new-cypress-config/one-spec
+ - new-cypress-config/same-folder
+ - new-cypress-config/support-files
+ - new-cypress-config/ts-example
+ - new-cypress-config/unit-tests-js
+ - new-cypress-config/use-webpack
+
+ # - cypress/run:
+ # name: Windows test
+ # executor:
+ # # executor comes from the "windows" orb
+ # name: win/default
+ # shell: bash.exe
+ # no-workspace: true
+ # start: npm run start:windows --prefix test-apps/old-cypress-config/all-files
+ # wait-on: 'http://localhost:1234'
+ # command: ../node_modules/.bin/cypress run
+ # # store screenshots and videos
+ # store_artifacts: true
+ # post-steps:
+ # - run: cat test-apps/old-cypress-config/all-files/.nyc_output/out.json
+ # - run: cat test-apps/old-cypress-config/all-files/coverage/coverage-final.json
+ # # store the created coverage report folder
+ # # you can click on it in the CircleCI UI
+ # # to see live static HTML site
+ # - store_artifacts:
+ # path: test-apps/old-cypress-config/all-files/coverage
+ # # make sure the test-apps captures 100% of code
+ # - run:
+ # command: npx nyc report --check-coverage true --lines 100
+ # working_directory: test-apps/old-cypress-config/all-files
+ # - run:
+ # name: Check code coverage ๐
+ # # we will check the final coverage report
+ # # to make sure it only has files we are interested in
+ # # because there are files covered at 0 in the report
+ # command: |
+ # ../../node_modules/.bin/check-coverage main.js
+ # ../../node_modules/.bin/check-coverage second.js
+ # ../../node_modules/.bin/check-coverage not-covered.js
+ # ../../node_modules/.bin/only-covered --from coverage/coverage-final.json main.js second.js not-covered.js
+ # working_directory: test-apps/old-cypress-config/all-files
+
+ # - publish:
+ # filters:
+ # branches:
+ # only:
+ # - master
+ # - beta
+ # requires:
+ # - unit
+ # - backend coverage
+ # - fullstack coverage
+ # - example-before-each-visit
+ # - example-before-all-visit
+ # - example-ts-example
+ # - example-same-folder
+ # - example-support-files
+ # - example-use-plugins-and-support
+ # - example-exclude-files
+ # - example-docker-paths
+ # - example-use-webpack
+ # - example-all-files
+ # - example-unit-tests-js
+ # - Windows test
diff --git a/.gitignore b/.gitignore
index 8e5b1368..663f335d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,11 @@
node_modules/
-cypress/videos
-cypress/screenshots
+**/cypress/videos
+**/cypress/screenshots
coverage/
.nyc_output/
dist/
.cache/
.vscode/
cypress-coverage/
-examples/*/cypress/videos
-examples/*/cypress/screenshots
yarn.lock
+.parcel-cache
diff --git a/README.md b/README.md
index 45bf9b15..173419b3 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ This plugin **DOES NOT** instrument your code. You have to instrument it yoursel
}
```
-Please see the [Examples](#examples) section down below, you can probably find a linked project matching your situation to see how to instrument your application's source code before running end-to-end tests to get the code coverage.
+Please see the [Test Apps](#test-apps) section down below, you can probably find a linked project matching your situation to see how to instrument your application's source code before running end-to-end tests to get the code coverage.
If your application has been instrumented correctly, then you should see additional counters and instructions in the application's JavaScript resources, like the image down below shows.
@@ -66,7 +66,7 @@ That should be it! You should see messages from this plugin in the Cypress Comma
### App vs unit tests
-You need to instrument your web application. This means that when the test does `cy.visit('localhost:3000')` any code the `index.html` requests should be instrumented by YOU. See [Examples](#examples) section for advice, usually you need to stick `babel-plugin-istanbul` into your pipeline somewhere.
+You need to instrument your web application. This means that when the test does `cy.visit('localhost:3000')` any code the `index.html` requests should be instrumented by YOU. See [Test Apps](#test-apps) section for advice, usually you need to stick `babel-plugin-istanbul` into your pipeline somewhere.
If you are testing individual functions from your application code by importing them directly into Cypress spec files, this is called "unit tests" and Cypress can instrument this scenario for you. See [Instrument unit tests](#instrument-unit-tests) section.
@@ -136,7 +136,7 @@ module.exports = (on, config) => {
Now the code coverage from spec files will be combined with end-to-end coverage.
-Find example of a just the unit tests and JavaScript source files with collected code coverage in [examples/unit-tests-js](./examples/unit-tests-js).
+Find example of a just the unit tests and JavaScript source files with collected code coverage in [test-apps/new-cypress-config/unit-tests-js](./test-apps/new-cypress-config/unit-tests-js).
### Alternative for unit tests
@@ -155,7 +155,7 @@ module.exports = (on, config) => {
## Instrument backend code
-Example in [examples/backend](examples/backend) folder.
+Example in [test-apps/new-cypress-config/backend](test-apps/backend) folder.
You can also instrument your server-side code and produce combined coverage report that covers both the backend and frontend code
@@ -275,7 +275,7 @@ Sometimes NYC tool might be installed in a different folder not in the current o
TypeScript source files should be automatically included in the report, if they are instrumented.
-See [examples/ts-example](examples/ts-example), [bahmutov/cra-ts-code-coverage-example](https://github.com/bahmutov/cra-ts-code-coverage-example) or [bahmutov/cypress-angular-coverage-example](https://github.com/bahmutov/cypress-angular-coverage-example).
+See [test-apps/new-cypress-config/ts-example](test-apps/ts-example), [bahmutov/cra-ts-code-coverage-example](https://github.com/bahmutov/cra-ts-code-coverage-example) or [bahmutov/cypress-angular-coverage-example](https://github.com/bahmutov/cypress-angular-coverage-example).
## Include code
@@ -292,7 +292,7 @@ For example, if you want to make sure the final report includes all JS files fro
}
```
-See example [examples/all-files](./examples/all-files)
+See example [test-app/all-files](./test-apps/new-cypress-config/all-files)
## Exclude code
@@ -335,7 +335,20 @@ switch (foo) {
### Exclude files and folders
-See [`nyc` configuration](https://github.com/istanbuljs/nyc#common-configuration-options) and [ include and exclude options](https://github.com/istanbuljs/nyc#using-include-and-exclude-arrays). You can include and exclude files using `minimatch` patterns in `.nycrc` file or using "nyc" object inside your `package.json` file.
+The code coverage plugin will automatically exclude any test/spec files you have defined in `testFiles` (Cypress < v10) or `specPattern` (Cypress >= v10) configuration options. Additionaly, you can set the `exclude` pattern glob in the code coverage environment variable to specify additional files to be excluded:
+
+```javascript
+// cypress.config.js or cypress.json
+env: {
+ codeCoverage: {
+ exclude: ['cypress/**/*.*'],
+ },
+},
+```
+
+Cypress v10 and later users should set the `exclude` option to exclude any items from the `cypress` folder they don't want to be included in the coverage reports.
+
+Additionaly, you can use [`nyc` configuration](https://github.com/istanbuljs/nyc#common-configuration-options) and [include and exclude options](https://github.com/istanbuljs/nyc#using-include-and-exclude-arrays). You can include and exclude files using `minimatch` patterns in `.nycrc` file or using "nyc" object inside your `package.json` file.
For example, if you want to only include files in the `app` folder, but exclude `app/util.js` file, you can set in your `package.json`
@@ -350,7 +363,7 @@ For example, if you want to only include files in the `app` folder, but exclude
**Note:** if you have `all: true` NYC option set, this plugin will check the produced `.nyc_output/out.json` before generating the final report. If the `out.json` file does not have information for some files that should be there according to `include` list, then an empty placeholder will be included, see [PR 208](https://github.com/cypress-io/code-coverage/pull/208).
-Another important option is `excludeAfterRemap`. By default it is false, which might let excluded files through. If you are excluding the files, and the instrumenter does not respect the `nyc.exclude` setting, then add `excludeAfterRemap: true` to tell `nyc report` to exclude files. See [examples/exclude-files](examples/exclude-files).
+Another important option is `excludeAfterRemap`. By default it is false, which might let excluded files through. If you are excluding the files, and the instrumenter does not respect the `nyc.exclude` setting, then add `excludeAfterRemap: true` to tell `nyc report` to exclude files. See [test-apps/exclude-files](test-apps/new-cypress-config/exclude-files).
## Disable plugin
@@ -392,19 +405,19 @@ npm run dev:no:coverage
## Examples
-### Internal examples
+### Internal test apps
Full examples we use for testing in this repository:
-- [examples/backend](examples/backend) only instruments the backend Node server and saves the coverage report
-- [examples/fullstack](examples/fullstack) instruments and merges backend, e2e and unit test coverage into a single report
-- [examples/before-all-visit](examples/before-all-visit) checks if code coverage works when `cy.visit` is made once in the `before` hook
-- [examples/before-each-visit](examples/before-each-visit) checks if code coverage correctly keeps track of code when doing `cy.visit` before each test
-- [examples/one-spec.js](examples/one-spec.js) confirms that coverage is collected and filtered correctly if the user only executes a single Cypress test
-- [examples/ts-example](examples/ts-example) uses Babel + Parcel to instrument and serve TypeScript file
-- [examples/use-webpack](examples/use-webpack) shows Webpack build with source maps and Babel
-- [examples/unit-tests-js](examples/unit-tests-js) runs just the unit tests and reports code coverage (JavaScript source code)
-- [examples/unit-tests-ts](examples/unit-tests-ts) **NOT WORKING** runs just the unit tests and reports code coverage (TypeScript source code)
+- [test-apps/backend](test-apps/new-cypress-config/backend) only instruments the backend Node server and saves the coverage report
+- [test-apps/fullstack](test-apps/new-cypress-config/fullstack) instruments and merges backend, e2e and unit test coverage into a single report
+- [test-apps/before-all-visit](test-apps/new-cypress-config/before-all-visit) checks if code coverage works when `cy.visit` is made once in the `before` hook
+- [test-apps/before-each-visit](test-apps/new-cypress-config/before-each-visit) checks if code coverage correctly keeps track of code when doing `cy.visit` before each test
+- [test-apps/one-spec.js](test-apps/new-cypress-config/one-spec.js) confirms that coverage is collected and filtered correctly if the user only executes a single Cypress test
+- [test-apps/ts-example](test-apps/new-cypress-config/ts-example) uses Babel + Parcel to instrument and serve TypeScript file
+- [test-apps/use-webpack](test-apps/new-cypress-config/use-webpack) shows Webpack build with source maps and Babel
+- [test-apps/unit-tests-js](test-apps/new-cypress-config/unit-tests-js) runs just the unit tests and reports code coverage (JavaScript source code)
+- [test-apps/unit-tests-ts](test-apps/new-cypress-config/unit-tests-ts) **NOT WORKING** runs just the unit tests and reports code coverage (TypeScript source code)
### External examples
@@ -459,7 +472,7 @@ module.exports = (on, config) => {
}
```
-See [examples/use-plugins-and-support](examples/use-plugins-and-support)
+See [test-apps/use-plugins-and-support](test-apps/new-cypress-config/use-plugins-and-support)
## Debugging
diff --git a/cypress/index.html b/cypress/index.html
index c8eee001..fac83385 100644
--- a/cypress/index.html
+++ b/cypress/index.html
@@ -1,8 +1,3 @@
-
- About
-
Test page
- Open the DevTools to see console messages
-
diff --git a/cypress/integration/filtering.js b/cypress/integration/filtering.js
index 76cd3de4..3948216a 100644
--- a/cypress/integration/filtering.js
+++ b/cypress/integration/filtering.js
@@ -1,84 +1,283 @@
-const { filterSpecsFromCoverage } = require('../../support-utils')
+const { filterFilesFromCoverage } = require('../../support-utils')
describe('minimatch', () => {
it('string matches', () => {
expect(
- Cypress.minimatch('/path/to/specA.js', '/path/to/specA.js'),
+ Cypress.minimatch('/user/app/src/codeA.js', '/user/app/src/codeA.js'),
'matches full strings'
).to.be.true
expect(
- Cypress.minimatch('/path/to/specA.js', 'specA.js'),
+ Cypress.minimatch('/user/app/src/codeA.js', 'codeA.js'),
'does not match just the end'
).to.be.false
expect(
- Cypress.minimatch('/path/to/specA.js', '**/specA.js'),
+ Cypress.minimatch('/user/app/src/codeA.js', '**/codeA.js'),
'matches using **'
).to.be.true
})
})
describe('filtering specs', () => {
- it('filters list of specs by single string', () => {
- const config = cy.stub()
- config.withArgs('testFiles').returns(['specA.js'])
- config.withArgs('integrationFolder').returns('/path/to/integration/')
-
- const totalCoverage = {
- '/path/to/specA.js': {},
- '/path/to/specB.js': {}
- }
- const result = filterSpecsFromCoverage(totalCoverage, config)
- expect(result).to.deep.equal({
- '/path/to/specB.js': {}
+ describe('using integrationFolder and testFiles in Cypress < v10', () => {
+ let config
+ let env
+ let spec
+
+ beforeEach(() => {
+ config = cy.stub()
+ config.withArgs('integrationFolder').returns('/user/app/cypress/integration')
+ config
+ .withArgs('supportFile')
+ .returns('/user/app/cypress/support/index.js')
+ config
+ .withArgs('supportFolder')
+ .returns('/user/app/cypress/support')
+
+ env = cy.stub().returns({})
+
+ spec = {
+ absolute: '/user/app/cypress/integration/test.cy.js',
+ relative: 'cypress/integration/test.cy.js'
+ }
})
- })
- it('filters list of specs by pattern', () => {
- const config = cy.stub()
- config.withArgs('testFiles').returns(['**/*B.js'])
- config.withArgs('integrationFolder').returns('/path/to/integration/')
+ it('filters list of specs by single string', () => {
+ config.withArgs('testFiles').returns('specA.js')
+ const totalCoverage = {
+ '/user/app/cypress/integration/specA.js': {},
+ '/user/app/cypress/integration/specB.js': {}
+ }
+ const result = filterFilesFromCoverage(totalCoverage, config, env, spec)
+ expect(result).to.deep.equal({
+ '/user/app/cypress/integration/specB.js': {}
+ })
+ })
- const totalCoverage = {
- '/path/to/specA.js': {},
- '/path/to/specB.js': {}
- }
- const result = filterSpecsFromCoverage(totalCoverage, config)
- expect(result).to.deep.equal({
- '/path/to/specA.js': {}
+ it('filters list of specs by single string in array', () => {
+ config.withArgs('testFiles').returns(['codeA.js'])
+ const totalCoverage = {
+ '/user/app/src/codeA.js': {},
+ '/user/app/src/codeB.js': {}
+ }
+ const result = filterFilesFromCoverage(totalCoverage, config, env, spec)
+ expect(result).to.deep.equal({
+ '/user/app/src/codeB.js': {}
+ })
})
- })
- it('filters list of specs by pattern and single spec', () => {
- const config = cy.stub()
- config.withArgs('testFiles').returns(['**/*B.js', 'specA.js'])
- config.withArgs('integrationFolder').returns('/path/to/integration/')
-
- const totalCoverage = {
- '/path/to/specA.js': {},
- '/path/to/specB.js': {}
- }
- const result = filterSpecsFromCoverage(totalCoverage, config)
- expect(result, 'all specs have been filtered out').to.deep.equal({})
+ it('filters list of specs by pattern', () => {
+ config.withArgs('testFiles').returns(['**/*B.js'])
+
+ const totalCoverage = {
+ '/user/app/src/codeA.js': {},
+ '/user/app/src/codeB.js': {}
+ }
+ const result = filterFilesFromCoverage(totalCoverage, config, env, spec)
+ expect(result).to.deep.equal({
+ '/user/app/src/codeA.js': {}
+ })
+ })
+
+ it('filters list of specs by pattern and single spec', () => {
+ config.withArgs('testFiles').returns(['**/*B.js', 'codeA.js'])
+
+ const totalCoverage = {
+ '/user/app/src/codeA.js': {},
+ '/user/app/src/codeB.js': {}
+ }
+ const result = filterFilesFromCoverage(totalCoverage, config, env, spec)
+ expect(result, 'all specs have been filtered out').to.deep.equal({})
+ })
+
+ it('filters specs from integration folder', () => {
+ config.withArgs('testFiles').returns('**/*.*') // default pattern
+
+ const totalCoverage = {
+ '/user/app/src/codeA.js': {},
+ '/user/app/src/codeB.js': {},
+ // these files should be removed
+ '/user/app/cypress/integration/spec1.js': {},
+ '/user/app/cypress/integration/spec2.js': {}
+ }
+ const result = filterFilesFromCoverage(totalCoverage, config, env, spec)
+ expect(result).to.deep.equal({
+ '/user/app/src/codeA.js': {},
+ '/user/app/src/codeB.js': {}
+ })
+ })
+
+ it('filters list of specs when testFiles specifies folder', () => {
+ config.withArgs('testFiles').returns(['cypress/integration/**.*'])
+
+ const totalCoverage = {
+ '/user/app/cypress/integration/specA.js': {},
+ '/user/app/cypress/integration/specB.js': {},
+ // This file should be included in coverage
+ 'src/my-code.js': {}
+ }
+ const result = filterFilesFromCoverage(totalCoverage, config, env, spec)
+ expect(result).to.deep.equal({
+ 'src/my-code.js': {}
+ })
+ })
+
+ it('filters files out of cypress support directory', () => {
+ config.withArgs('testFiles').returns(['**/*.*']) // default pattern
+ const totalCoverage = {
+ '/user/app/cypress/support/index.js': {},
+ '/user/app/cypress/support/command.js': {},
+ '/user/app/cypress/integration/spec.js': {},
+ // This file should be included in coverage
+ 'src/my-code.js': {}
+ }
+ const result = filterFilesFromCoverage(totalCoverage, config, env, spec)
+ expect(result).to.deep.equal({
+ 'src/my-code.js': {}
+ })
+ })
})
- it('filters list of specs in integration folder', () => {
- const config = cy.stub()
- config.withArgs('testFiles').returns('**/*.*') // default pattern
- config.withArgs('integrationFolder').returns('/path/to/integration/')
-
- const totalCoverage = {
- '/path/to/specA.js': {},
- '/path/to/specB.js': {},
- // these files should be removed
- '/path/to/integration/spec1.js': {},
- '/path/to/integration/spec2.js': {}
- }
- const result = filterSpecsFromCoverage(totalCoverage, config)
- expect(result).to.deep.equal({
- '/path/to/specA.js': {},
- '/path/to/specB.js': {}
+ describe('using codeCoverage.exclude and specPattern in Cypress >= v10', () => {
+ let config
+ let env
+ let spec
+
+ beforeEach(() => {
+ config = cy.stub()
+
+ env = cy.stub().returns({
+ //filter out all files in the cypress folder
+ codeCoverage: {
+ exclude: 'cypress/**/*.*'
+ }
+ })
+
+ spec = {
+ absolute: '/user/app/cypress/integration/test.cy.js',
+ relative: 'cypress/integration/test.cy.js'
+ }
+ })
+
+ it('filters list of specs by single string', () => {
+ config.withArgs('specPattern').returns('specA.cy.js')
+ const totalCoverage = {
+ '/user/app/src/specA.cy.js': {},
+ '/user/app/src/specB.cy.js': {}
+ }
+ const result = filterFilesFromCoverage(totalCoverage, config, env, spec)
+ expect(result).to.deep.equal({
+ '/user/app/src/specB.cy.js': {}
+ })
+ })
+
+ it('filters list of specs by single string in array', () => {
+ config.withArgs('specPattern').returns(['specA.cy.js'])
+ const totalCoverage = {
+ '/user/app/src/specA.cy.js': {},
+ '/user/app/src/specB.cy.js': {}
+ }
+ const result = filterFilesFromCoverage(totalCoverage, config, env, spec)
+ expect(result).to.deep.equal({
+ '/user/app/src/specB.cy.js': {}
+ })
+ })
+
+ it('filters out file in codeCoverage.exclude', () => {
+ config.withArgs('specPattern').returns(['**/*.cy.js'])
+ const totalCoverage = {
+ '/user/app/cypress/support/index.js': {},
+ '/user/app/cypress/commands/index.js': {},
+ //these files should be included
+ '/user/app/src/codeA.js': {},
+ '/user/app/src/codeB.js': {}
+ }
+ const result = filterFilesFromCoverage(totalCoverage, config, env, spec)
+ expect(result).to.deep.equal({
+ '/user/app/src/codeA.js': {},
+ '/user/app/src/codeB.js': {}
+ })
+ })
+
+ it('filters list of specs by pattern', () => {
+ config.withArgs('specPattern').returns(['**/*B.js'])
+
+ const totalCoverage = {
+ '/user/app/src/codeA.js': {},
+ '/user/app/src/codeB.js': {}
+ }
+ const result = filterFilesFromCoverage(totalCoverage, config, env, spec)
+ expect(result).to.deep.equal({
+ '/user/app/src/codeA.js': {}
+ })
+ })
+
+ it('filters list of specs by pattern and single spec', () => {
+ config.withArgs('specPattern').returns(['**/*B.js', 'codeA.js'])
+
+ const totalCoverage = {
+ '/user/app/src/codeA.js': {},
+ '/user/app/src/codeB.js': {}
+ }
+ const result = filterFilesFromCoverage(totalCoverage, config, env, spec)
+ expect(result, 'all specs have been filtered out').to.deep.equal({})
+ })
+
+ it('filters list of specs in integration folder', () => {
+ config.withArgs('specPattern').returns('**/*.cy.{js,jsx,ts,tsx}') // default pattern
+
+ const totalCoverage = {
+ '/user/app/src/codeA.js': {},
+ '/user/app/src/codeB.js': {},
+ // these files should be removed
+ '/user/app/cypress/integration/spec1.js': {},
+ '/user/app/cypress/integration/spec2.js': {}
+ }
+ const result = filterFilesFromCoverage(totalCoverage, config, env, spec)
+ expect(result).to.deep.equal({
+ '/user/app/src/codeA.js': {},
+ '/user/app/src/codeB.js': {}
+ })
+ })
+
+ it('filters list of specs when specPattern specifies folder', () => {
+ config.withArgs('specPattern').returns(['src/**/*.cy.js'])
+
+ const totalCoverage = {
+ '/user/app/src/specA.cy.js': {},
+ '/user/app/src/specB.cy.js': {},
+ // This file should be included in coverage
+ 'src/my-code.js': {}
+ }
+ const result = filterFilesFromCoverage(totalCoverage, config, env, spec)
+ expect(result).to.deep.equal({
+ 'src/my-code.js': {}
+ })
+ })
+
+ it('filters list of specs when exclude pattern is an array', () => {
+ env = cy.stub().returns({
+ //filter out a.js and b.js in cypress folder
+ codeCoverage: {
+ exclude: ['cypress/**/a.js', 'cypress/**/b.js']
+ }
+ })
+
+ config.withArgs('specPattern').returns(['src/**/*.cy.js'])
+
+ const totalCoverage = {
+ '/user/app/cypress/a.js': {},
+ '/user/app/cypress/b.js': {},
+ // These files should be included in coverage
+ '/user/app/cypress/c.js': {},
+ 'src/my-code.js': {}
+ }
+ const result = filterFilesFromCoverage(totalCoverage, config, env, spec)
+ expect(result).to.deep.equal({
+ '/user/app/cypress/c.js': {},
+ 'src/my-code.js': {}
+ })
})
})
})
diff --git a/cypress/integration/spec.js b/cypress/integration/fix-source-paths.js
similarity index 51%
rename from cypress/integration/spec.js
rename to cypress/integration/fix-source-paths.js
index ba1b59d7..c4e964ea 100644
--- a/cypress/integration/spec.js
+++ b/cypress/integration/fix-source-paths.js
@@ -1,42 +1,6 @@
-// enables intelligent code completion for Cypress commands
-// https://on.cypress.io/intelligent-code-completion
-/// {
+ if (pattern === '**/*.*') {
+ testFilePatterns[idx] = `${integrationFolder}/${pattern}`.replace(
+ '//',
+ '/'
+ )
+ }
+ })
+ }
- const coverage = Cypress._.omitBy(totalCoverage, isTestFileFilter)
+ return testFilePatterns
+}
+
+/**
+ * Removes support file from the coverage object.
+ * If there are more files loaded from support folder, also removes them
+ */
+const filterSupportFilesFromCoverage = (
+ totalCoverage,
+ config = Cypress.config
+) => {
+ const integrationFolder = config('integrationFolder')
+
+ /**
+ * Cypress v10 doesn't have an integrationFolder config value any more, so we nope out here if its undefined.
+ * Instead, we rely on the new exclude option logic done in the getCypressExcludePatterns function.
+ */
+ if (!integrationFolder) {
+ return totalCoverage
+ }
+
+ const supportFile = config('supportFile')
+
+ /** @type {string} Cypress run-time config has the support folder string */
+ // @ts-ignore
+ const supportFolder = config('supportFolder')
+
+ const isSupportFile = (filename) => filename === supportFile
+
+ let coverage = Cypress._.omitBy(totalCoverage, (fileCoverage, filename) =>
+ isSupportFile(filename)
+ )
+
+ // check the edge case
+ // if we have files from support folder AND the support folder is not same
+ // as the integration, or its prefix (this might remove all app source files)
+ // then remove all files from the support folder
+ if (!integrationFolder.startsWith(supportFolder)) {
+ // remove all covered files from support folder
+ coverage = Cypress._.omitBy(totalCoverage, (fileCoverage, filename) =>
+ filename.startsWith(supportFolder)
+ )
+ }
return coverage
}
@@ -64,5 +149,5 @@ function fixSourcePaths(coverage) {
module.exports = {
fixSourcePaths,
- filterSpecsFromCoverage
+ filterFilesFromCoverage
}
diff --git a/support.js b/support.js
index c99ceb23..5ba64f0d 100644
--- a/support.js
+++ b/support.js
@@ -3,7 +3,7 @@
const dayjs = require('dayjs')
var duration = require('dayjs/plugin/duration')
-const { filterSpecsFromCoverage } = require('./support-utils')
+const { filterFilesFromCoverage } = require('./support-utils')
dayjs.extend(duration)
@@ -14,11 +14,10 @@ dayjs.extend(duration)
const sendCoverage = (coverage, pathname = '/') => {
logMessage(`Saving code coverage for **${pathname}**`)
- const withoutSpecs = filterSpecsFromCoverage(coverage)
- const appCoverageOnly = filterSupportFilesFromCoverage(withoutSpecs)
+ const totalCoverage = filterFilesFromCoverage(coverage)
// stringify coverage object for speed
- cy.task('combineCoverage', JSON.stringify(appCoverageOnly), {
+ cy.task('combineCoverage', JSON.stringify(totalCoverage), {
log: false
})
}
@@ -32,37 +31,6 @@ const logMessage = (s) => {
cy.log(`${s} \`[@cypress/code-coverage]\``)
}
-/**
- * Removes support file from the coverage object.
- * If there are more files loaded from support folder, also removes them
- */
-const filterSupportFilesFromCoverage = (totalCoverage) => {
- const integrationFolder = Cypress.config('integrationFolder')
- const supportFile = Cypress.config('supportFile')
-
- /** @type {string} Cypress run-time config has the support folder string */
- // @ts-ignore
- const supportFolder = Cypress.config('supportFolder')
-
- const isSupportFile = (filename) => filename === supportFile
-
- let coverage = Cypress._.omitBy(totalCoverage, (fileCoverage, filename) =>
- isSupportFile(filename)
- )
-
- // check the edge case
- // if we have files from support folder AND the support folder is not same
- // as the integration, or its prefix (this might remove all app source files)
- // then remove all files from the support folder
- if (!integrationFolder.startsWith(supportFolder)) {
- // remove all covered files from support folder
- coverage = Cypress._.omitBy(totalCoverage, (fileCoverage, filename) =>
- filename.startsWith(supportFolder)
- )
- }
- return coverage
-}
-
const registerHooks = () => {
let windowCoverageObjects
diff --git a/examples/all-files/.babelrc b/test-apps/new-cypress-config/all-files/.babelrc
similarity index 100%
rename from examples/all-files/.babelrc
rename to test-apps/new-cypress-config/all-files/.babelrc
diff --git a/examples/all-files/README.md b/test-apps/new-cypress-config/all-files/README.md
similarity index 100%
rename from examples/all-files/README.md
rename to test-apps/new-cypress-config/all-files/README.md
diff --git a/test-apps/new-cypress-config/all-files/cypress.config.js b/test-apps/new-cypress-config/all-files/cypress.config.js
new file mode 100644
index 00000000..7b34c2f8
--- /dev/null
+++ b/test-apps/new-cypress-config/all-files/cypress.config.js
@@ -0,0 +1,11 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+ fixturesFolder: false,
+ e2e: {
+ setupNodeEvents(on, config) {
+ return require('./cypress/plugins/index.js')(on, config)
+ },
+ baseUrl: 'http://localhost:1234'
+ }
+})
diff --git a/examples/all-files/cypress/integration/spec.js b/test-apps/new-cypress-config/all-files/cypress/e2e/spec.cy.js
similarity index 100%
rename from examples/all-files/cypress/integration/spec.js
rename to test-apps/new-cypress-config/all-files/cypress/e2e/spec.cy.js
diff --git a/examples/ts-example/cypress/plugins/index.js b/test-apps/new-cypress-config/all-files/cypress/plugins/index.js
similarity index 50%
rename from examples/ts-example/cypress/plugins/index.js
rename to test-apps/new-cypress-config/all-files/cypress/plugins/index.js
index fa838f18..101311b6 100644
--- a/examples/ts-example/cypress/plugins/index.js
+++ b/test-apps/new-cypress-config/all-files/cypress/plugins/index.js
@@ -1,4 +1,4 @@
module.exports = (on, config) => {
- require('../../../../task')(on, config)
+ require('@cypress/code-coverage/task')(on, config)
return config
}
diff --git a/test-apps/new-cypress-config/all-files/cypress/support/commands.js b/test-apps/new-cypress-config/all-files/cypress/support/commands.js
new file mode 100644
index 00000000..cc6040de
--- /dev/null
+++ b/test-apps/new-cypress-config/all-files/cypress/support/commands.js
@@ -0,0 +1 @@
+import '@cypress/code-coverage/support'
diff --git a/examples/all-files/cypress/support/index.js b/test-apps/new-cypress-config/all-files/cypress/support/e2e.js
similarity index 100%
rename from examples/all-files/cypress/support/index.js
rename to test-apps/new-cypress-config/all-files/cypress/support/e2e.js
diff --git a/examples/all-files/index.html b/test-apps/new-cypress-config/all-files/index.html
similarity index 100%
rename from examples/all-files/index.html
rename to test-apps/new-cypress-config/all-files/index.html
diff --git a/examples/all-files/main.js b/test-apps/new-cypress-config/all-files/main.js
similarity index 100%
rename from examples/all-files/main.js
rename to test-apps/new-cypress-config/all-files/main.js
diff --git a/examples/all-files/not-covered.js b/test-apps/new-cypress-config/all-files/not-covered.js
similarity index 100%
rename from examples/all-files/not-covered.js
rename to test-apps/new-cypress-config/all-files/not-covered.js
diff --git a/test-apps/new-cypress-config/all-files/package.json b/test-apps/new-cypress-config/all-files/package.json
new file mode 100644
index 00000000..d87b4567
--- /dev/null
+++ b/test-apps/new-cypress-config/all-files/package.json
@@ -0,0 +1,21 @@
+{
+ "name": "example-all-files",
+ "description": "Report all files",
+ "private": true,
+ "scripts": {
+ "cy:run": "../node_modules/.bin/cypress run",
+ "start": "../node_modules/.bin/parcel serve index.html",
+ "start:windows": "npx bin-up parcel serve index.html",
+ "pretest": "rimraf .nyc_output .cache coverage dist",
+ "test": "../node_modules/.bin/start-test 1234 cy:run",
+ "coverage:verify": "npx nyc report --check-coverage true --lines 100",
+ "coverage:check-files": "../node_modules/.bin/check-coverage main.js && ../node_modules/.bin/check-coverage second.js && ../node_modules/.bin/check-coverage not-covered.js && ../node_modules/.bin/check-coverage cypress.config.js && ../node_modules/.bin/only-covered --from coverage/coverage-final.json main.js second.js not-covered.js cypress.config.js"
+ },
+ "nyc": {
+ "all": true,
+ "include": "*.js"
+ },
+ "devDependencies": {
+ "@babel/core": "^7.16.12"
+ }
+}
diff --git a/examples/all-files/second.js b/test-apps/new-cypress-config/all-files/second.js
similarity index 100%
rename from examples/all-files/second.js
rename to test-apps/new-cypress-config/all-files/second.js
diff --git a/examples/exclude-files/.babelrc b/test-apps/new-cypress-config/backend/.babelrc
similarity index 100%
rename from examples/exclude-files/.babelrc
rename to test-apps/new-cypress-config/backend/.babelrc
diff --git a/examples/backend/README.md b/test-apps/new-cypress-config/backend/README.md
similarity index 100%
rename from examples/backend/README.md
rename to test-apps/new-cypress-config/backend/README.md
diff --git a/test-apps/new-cypress-config/backend/cypress.config.js b/test-apps/new-cypress-config/backend/cypress.config.js
new file mode 100644
index 00000000..a032f9df
--- /dev/null
+++ b/test-apps/new-cypress-config/backend/cypress.config.js
@@ -0,0 +1,17 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+ fixturesFolder: false,
+ env: {
+ codeCoverage: {
+ url: 'http://localhost:3003/__coverage__',
+ expectBackendCoverageOnly: true,
+ },
+ },
+ e2e: {
+ setupNodeEvents(on, config) {
+ return require('./cypress/plugins/index.js')(on, config)
+ },
+ baseUrl: 'http://localhost:3003',
+ },
+})
diff --git a/examples/backend/cypress/integration/spec.js b/test-apps/new-cypress-config/backend/cypress/e2e/spec.cy.js
similarity index 100%
rename from examples/backend/cypress/integration/spec.js
rename to test-apps/new-cypress-config/backend/cypress/e2e/spec.cy.js
diff --git a/test-apps/new-cypress-config/backend/cypress/plugins/index.js b/test-apps/new-cypress-config/backend/cypress/plugins/index.js
new file mode 100644
index 00000000..101311b6
--- /dev/null
+++ b/test-apps/new-cypress-config/backend/cypress/plugins/index.js
@@ -0,0 +1,4 @@
+module.exports = (on, config) => {
+ require('@cypress/code-coverage/task')(on, config)
+ return config
+}
diff --git a/test-apps/new-cypress-config/backend/cypress/support/e2e.js b/test-apps/new-cypress-config/backend/cypress/support/e2e.js
new file mode 100644
index 00000000..cc6040de
--- /dev/null
+++ b/test-apps/new-cypress-config/backend/cypress/support/e2e.js
@@ -0,0 +1 @@
+import '@cypress/code-coverage/support'
diff --git a/test-apps/new-cypress-config/backend/package.json b/test-apps/new-cypress-config/backend/package.json
new file mode 100644
index 00000000..953a6b71
--- /dev/null
+++ b/test-apps/new-cypress-config/backend/package.json
@@ -0,0 +1,14 @@
+{
+ "name": "example-backend",
+ "description": "Code coverage for backend",
+ "devDependencies": {},
+ "private": true,
+ "scripts": {
+ "cy:run": "../node_modules/.bin/cypress run",
+ "start": "../node_modules/.bin/nyc --silent node server/server",
+ "pretest": "rimraf .nyc_output .cache coverage dist",
+ "test": "../node_modules/.bin/start-test 3003 cy:run",
+ "coverage:verify": "npx nyc report --check-coverage true --lines 100",
+ "coverage:check-files": "../node_modules/.bin/check-coverage server.js && ../node_modules/.bin/only-covered server.js"
+ }
+}
diff --git a/examples/backend/server/index.html b/test-apps/new-cypress-config/backend/server/index.html
similarity index 100%
rename from examples/backend/server/index.html
rename to test-apps/new-cypress-config/backend/server/index.html
diff --git a/examples/backend/server/server.js b/test-apps/new-cypress-config/backend/server/server.js
similarity index 90%
rename from examples/backend/server/server.js
rename to test-apps/new-cypress-config/backend/server/server.js
index 7e4786e7..3fc5aebf 100644
--- a/examples/backend/server/server.js
+++ b/test-apps/new-cypress-config/backend/server/server.js
@@ -8,7 +8,7 @@ const port = 3003
if (global.__coverage__) {
console.log('have code coverage, will add middleware for express')
console.log(`to fetch: GET :${port}/__coverage__`)
- require('../../../middleware/express')(app)
+ require('@cypress/code-coverage/middleware/express')(app)
}
app.use(express.static(__dirname))
diff --git a/examples/one-spec/.babelrc b/test-apps/new-cypress-config/before-all-visit/.babelrc
similarity index 100%
rename from examples/one-spec/.babelrc
rename to test-apps/new-cypress-config/before-all-visit/.babelrc
diff --git a/test-apps/new-cypress-config/before-all-visit/README.md b/test-apps/new-cypress-config/before-all-visit/README.md
new file mode 100644
index 00000000..9dbe54e0
--- /dev/null
+++ b/test-apps/new-cypress-config/before-all-visit/README.md
@@ -0,0 +1,4 @@
+# example: before-all-visit
+
+Code coverage example where the `cy.visit` happens in `before` hook
+
diff --git a/test-apps/new-cypress-config/before-all-visit/cypress.config.js b/test-apps/new-cypress-config/before-all-visit/cypress.config.js
new file mode 100644
index 00000000..13899753
--- /dev/null
+++ b/test-apps/new-cypress-config/before-all-visit/cypress.config.js
@@ -0,0 +1,11 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+ fixturesFolder: false,
+ e2e: {
+ setupNodeEvents(on, config) {
+ return require('./cypress/plugins/index.js')(on, config)
+ },
+ baseUrl: 'http://localhost:1234',
+ },
+})
diff --git a/test-apps/new-cypress-config/before-all-visit/cypress/e2e/spec.cy.js b/test-apps/new-cypress-config/before-all-visit/cypress/e2e/spec.cy.js
new file mode 100644
index 00000000..9df185c5
--- /dev/null
+++ b/test-apps/new-cypress-config/before-all-visit/cypress/e2e/spec.cy.js
@@ -0,0 +1,19 @@
+///
+ About
+
+ Test page
+ Open the DevTools to see console messages
+
+
diff --git a/test-apps/new-cypress-config/frontend/package.json b/test-apps/new-cypress-config/frontend/package.json
new file mode 100644
index 00000000..3aa6b84c
--- /dev/null
+++ b/test-apps/new-cypress-config/frontend/package.json
@@ -0,0 +1,15 @@
+{
+ "name": "example-frontend",
+ "description": "Tests a frontend app",
+ "devDependencies": {
+ "@babel/core": "7.9.0"
+ },
+ "scripts": {
+ "cy:run": "../node_modules/.bin/cypress run",
+ "start": "../node_modules/.bin/parcel serve index.html",
+ "pretest": "rimraf .nyc_output .cache coverage dist",
+ "test": "../node_modules/.bin/start-test 1234 cy:run",
+ "coverage:verify": "npx nyc report --check-coverage true --lines 100",
+ "coverage:check-files": "../node_modules/.bin/check-coverage app.js && ../node_modules/.bin/check-coverage about.js && ../node_modules/.bin/check-coverage unit.js && ../node_modules/.bin/only-covered app.js about.js unit.js"
+ }
+}
diff --git a/cypress/unit.js b/test-apps/new-cypress-config/frontend/unit.js
similarity index 100%
rename from cypress/unit.js
rename to test-apps/new-cypress-config/frontend/unit.js
diff --git a/examples/ts-example/.babelrc b/test-apps/new-cypress-config/fullstack/.babelrc
similarity index 100%
rename from examples/ts-example/.babelrc
rename to test-apps/new-cypress-config/fullstack/.babelrc
diff --git a/examples/fullstack/README.md b/test-apps/new-cypress-config/fullstack/README.md
similarity index 97%
rename from examples/fullstack/README.md
rename to test-apps/new-cypress-config/fullstack/README.md
index b2e554de..4ea545fd 100644
--- a/examples/fullstack/README.md
+++ b/test-apps/new-cypress-config/fullstack/README.md
@@ -7,7 +7,7 @@ This example runs instrumented server code, that serves instrumented frontend co
To run
```sh
-$ npm run dev
+$ npm run test
```
You should see messages from the plugin when it saves each coverage object
diff --git a/test-apps/new-cypress-config/fullstack/cypress.config.js b/test-apps/new-cypress-config/fullstack/cypress.config.js
new file mode 100644
index 00000000..b060f6e5
--- /dev/null
+++ b/test-apps/new-cypress-config/fullstack/cypress.config.js
@@ -0,0 +1,17 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+ fixturesFolder: false,
+ env: {
+ codeCoverage: {
+ url: 'http://localhost:1234/__coverage__',
+ exclude: 'cypress/**/*.*'
+ }
+ },
+ e2e: {
+ setupNodeEvents(on, config) {
+ return require('./cypress/plugins/index.js')(on, config)
+ },
+ baseUrl: 'http://localhost:1234'
+ }
+})
diff --git a/examples/fullstack/cypress/integration/spec.js b/test-apps/new-cypress-config/fullstack/cypress/e2e/spec.cy.js
similarity index 100%
rename from examples/fullstack/cypress/integration/spec.js
rename to test-apps/new-cypress-config/fullstack/cypress/e2e/spec.cy.js
diff --git a/test-apps/new-cypress-config/fullstack/cypress/plugins/index.js b/test-apps/new-cypress-config/fullstack/cypress/plugins/index.js
new file mode 100644
index 00000000..87769a5d
--- /dev/null
+++ b/test-apps/new-cypress-config/fullstack/cypress/plugins/index.js
@@ -0,0 +1,6 @@
+module.exports = (on, config) => {
+ require('@cypress/code-coverage/task')(on, config)
+ //Used to instrument code ran like unit tests
+ on('file:preprocessor', require('@cypress/code-coverage/use-babelrc'))
+ return config
+}
diff --git a/test-apps/new-cypress-config/fullstack/cypress/support/e2e.js b/test-apps/new-cypress-config/fullstack/cypress/support/e2e.js
new file mode 100644
index 00000000..cc6040de
--- /dev/null
+++ b/test-apps/new-cypress-config/fullstack/cypress/support/e2e.js
@@ -0,0 +1 @@
+import '@cypress/code-coverage/support'
diff --git a/examples/fullstack/images/fullstack.png b/test-apps/new-cypress-config/fullstack/images/fullstack.png
similarity index 100%
rename from examples/fullstack/images/fullstack.png
rename to test-apps/new-cypress-config/fullstack/images/fullstack.png
diff --git a/test-apps/new-cypress-config/fullstack/index.html b/test-apps/new-cypress-config/fullstack/index.html
new file mode 100644
index 00000000..65196f78
--- /dev/null
+++ b/test-apps/new-cypress-config/fullstack/index.html
@@ -0,0 +1,4 @@
+
+ Page body
+
+
diff --git a/examples/exclude-files/main.js b/test-apps/new-cypress-config/fullstack/main.js
similarity index 100%
rename from examples/exclude-files/main.js
rename to test-apps/new-cypress-config/fullstack/main.js
diff --git a/test-apps/new-cypress-config/fullstack/package-lock.json b/test-apps/new-cypress-config/fullstack/package-lock.json
new file mode 100644
index 00000000..9d34bab3
--- /dev/null
+++ b/test-apps/new-cypress-config/fullstack/package-lock.json
@@ -0,0 +1,969 @@
+{
+ "name": "example-fullstack",
+ "lockfileVersion": 2,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "example-fullstack",
+ "devDependencies": {
+ "@babel/core": "^7.16.12"
+ }
+ },
+ "node_modules/@babel/code-frame": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+ "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/highlight": "^7.16.7"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/compat-data": {
+ "version": "7.16.8",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz",
+ "integrity": "sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/core": {
+ "version": "7.16.12",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz",
+ "integrity": "sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/code-frame": "^7.16.7",
+ "@babel/generator": "^7.16.8",
+ "@babel/helper-compilation-targets": "^7.16.7",
+ "@babel/helper-module-transforms": "^7.16.7",
+ "@babel/helpers": "^7.16.7",
+ "@babel/parser": "^7.16.12",
+ "@babel/template": "^7.16.7",
+ "@babel/traverse": "^7.16.10",
+ "@babel/types": "^7.16.8",
+ "convert-source-map": "^1.7.0",
+ "debug": "^4.1.0",
+ "gensync": "^1.0.0-beta.2",
+ "json5": "^2.1.2",
+ "semver": "^6.3.0",
+ "source-map": "^0.5.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/babel"
+ }
+ },
+ "node_modules/@babel/generator": {
+ "version": "7.16.8",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz",
+ "integrity": "sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/types": "^7.16.8",
+ "jsesc": "^2.5.1",
+ "source-map": "^0.5.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-compilation-targets": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
+ "integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
+ "dev": true,
+ "dependencies": {
+ "@babel/compat-data": "^7.16.4",
+ "@babel/helper-validator-option": "^7.16.7",
+ "browserslist": "^4.17.5",
+ "semver": "^6.3.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
+ }
+ },
+ "node_modules/@babel/helper-environment-visitor": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
+ "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+ "dev": true,
+ "dependencies": {
+ "@babel/types": "^7.16.7"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-function-name": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
+ "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-get-function-arity": "^7.16.7",
+ "@babel/template": "^7.16.7",
+ "@babel/types": "^7.16.7"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-get-function-arity": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
+ "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/types": "^7.16.7"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-hoist-variables": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+ "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/types": "^7.16.7"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-module-imports": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+ "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/types": "^7.16.7"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-module-transforms": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
+ "integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-environment-visitor": "^7.16.7",
+ "@babel/helper-module-imports": "^7.16.7",
+ "@babel/helper-simple-access": "^7.16.7",
+ "@babel/helper-split-export-declaration": "^7.16.7",
+ "@babel/helper-validator-identifier": "^7.16.7",
+ "@babel/template": "^7.16.7",
+ "@babel/traverse": "^7.16.7",
+ "@babel/types": "^7.16.7"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-simple-access": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
+ "integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
+ "dev": true,
+ "dependencies": {
+ "@babel/types": "^7.16.7"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-split-export-declaration": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+ "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/types": "^7.16.7"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-validator-identifier": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+ "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-validator-option": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+ "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helpers": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz",
+ "integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/template": "^7.16.7",
+ "@babel/traverse": "^7.16.7",
+ "@babel/types": "^7.16.7"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/highlight": {
+ "version": "7.16.10",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
+ "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-validator-identifier": "^7.16.7",
+ "chalk": "^2.0.0",
+ "js-tokens": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/parser": {
+ "version": "7.16.12",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz",
+ "integrity": "sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==",
+ "dev": true,
+ "bin": {
+ "parser": "bin/babel-parser.js"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/@babel/template": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+ "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+ "dev": true,
+ "dependencies": {
+ "@babel/code-frame": "^7.16.7",
+ "@babel/parser": "^7.16.7",
+ "@babel/types": "^7.16.7"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/traverse": {
+ "version": "7.16.10",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz",
+ "integrity": "sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/code-frame": "^7.16.7",
+ "@babel/generator": "^7.16.8",
+ "@babel/helper-environment-visitor": "^7.16.7",
+ "@babel/helper-function-name": "^7.16.7",
+ "@babel/helper-hoist-variables": "^7.16.7",
+ "@babel/helper-split-export-declaration": "^7.16.7",
+ "@babel/parser": "^7.16.10",
+ "@babel/types": "^7.16.8",
+ "debug": "^4.1.0",
+ "globals": "^11.1.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/types": {
+ "version": "7.16.8",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz",
+ "integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-validator-identifier": "^7.16.7",
+ "to-fast-properties": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "dependencies": {
+ "color-convert": "^1.9.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/browserslist": {
+ "version": "4.19.1",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+ "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
+ "dev": true,
+ "dependencies": {
+ "caniuse-lite": "^1.0.30001286",
+ "electron-to-chromium": "^1.4.17",
+ "escalade": "^3.1.1",
+ "node-releases": "^2.0.1",
+ "picocolors": "^1.0.0"
+ },
+ "bin": {
+ "browserslist": "cli.js"
+ },
+ "engines": {
+ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/browserslist"
+ }
+ },
+ "node_modules/caniuse-lite": {
+ "version": "1.0.30001303",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001303.tgz",
+ "integrity": "sha512-/Mqc1oESndUNszJP0kx0UaQU9kEv9nNtJ7Kn8AdA0mNnH8eR1cj0kG+NbNuC1Wq/b21eA8prhKRA3bbkjONegQ==",
+ "dev": true,
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/browserslist"
+ }
+ },
+ "node_modules/chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dev": true,
+ "dependencies": {
+ "color-name": "1.1.3"
+ }
+ },
+ "node_modules/color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+ "dev": true
+ },
+ "node_modules/convert-source-map": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+ "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.1"
+ }
+ },
+ "node_modules/debug": {
+ "version": "4.3.3",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+ "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+ "dev": true,
+ "dependencies": {
+ "ms": "2.1.2"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependenciesMeta": {
+ "supports-color": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/electron-to-chromium": {
+ "version": "1.4.56",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.56.tgz",
+ "integrity": "sha512-0k/S0FQqRRpJbX7YUjwCcLZ8D42RqGKtaiq90adXBOYgTIWwLA/g3toO8k9yEpqU8iC4QyaWYYWSTBIna8WV4g==",
+ "dev": true
+ },
+ "node_modules/escalade": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+ "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/gensync": {
+ "version": "1.0.0-beta.2",
+ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+ "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/globals": {
+ "version": "11.12.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/js-tokens": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+ "dev": true
+ },
+ "node_modules/jsesc": {
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+ "dev": true,
+ "bin": {
+ "jsesc": "bin/jsesc"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/json5": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+ "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+ "dev": true,
+ "dependencies": {
+ "minimist": "^1.2.5"
+ },
+ "bin": {
+ "json5": "lib/cli.js"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/minimist": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+ "dev": true
+ },
+ "node_modules/ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ },
+ "node_modules/node-releases": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+ "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
+ "dev": true
+ },
+ "node_modules/picocolors": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+ "dev": true
+ },
+ "node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver.js"
+ }
+ },
+ "node_modules/source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "dependencies": {
+ "has-flag": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/to-fast-properties": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+ "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ }
+ },
+ "dependencies": {
+ "@babel/code-frame": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+ "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+ "dev": true,
+ "requires": {
+ "@babel/highlight": "^7.16.7"
+ }
+ },
+ "@babel/compat-data": {
+ "version": "7.16.8",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz",
+ "integrity": "sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==",
+ "dev": true
+ },
+ "@babel/core": {
+ "version": "7.16.12",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz",
+ "integrity": "sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.16.7",
+ "@babel/generator": "^7.16.8",
+ "@babel/helper-compilation-targets": "^7.16.7",
+ "@babel/helper-module-transforms": "^7.16.7",
+ "@babel/helpers": "^7.16.7",
+ "@babel/parser": "^7.16.12",
+ "@babel/template": "^7.16.7",
+ "@babel/traverse": "^7.16.10",
+ "@babel/types": "^7.16.8",
+ "convert-source-map": "^1.7.0",
+ "debug": "^4.1.0",
+ "gensync": "^1.0.0-beta.2",
+ "json5": "^2.1.2",
+ "semver": "^6.3.0",
+ "source-map": "^0.5.0"
+ }
+ },
+ "@babel/generator": {
+ "version": "7.16.8",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz",
+ "integrity": "sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.16.8",
+ "jsesc": "^2.5.1",
+ "source-map": "^0.5.0"
+ }
+ },
+ "@babel/helper-compilation-targets": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
+ "integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
+ "dev": true,
+ "requires": {
+ "@babel/compat-data": "^7.16.4",
+ "@babel/helper-validator-option": "^7.16.7",
+ "browserslist": "^4.17.5",
+ "semver": "^6.3.0"
+ }
+ },
+ "@babel/helper-environment-visitor": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
+ "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/helper-function-name": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
+ "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-get-function-arity": "^7.16.7",
+ "@babel/template": "^7.16.7",
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/helper-get-function-arity": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
+ "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/helper-hoist-variables": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+ "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/helper-module-imports": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+ "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/helper-module-transforms": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
+ "integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-environment-visitor": "^7.16.7",
+ "@babel/helper-module-imports": "^7.16.7",
+ "@babel/helper-simple-access": "^7.16.7",
+ "@babel/helper-split-export-declaration": "^7.16.7",
+ "@babel/helper-validator-identifier": "^7.16.7",
+ "@babel/template": "^7.16.7",
+ "@babel/traverse": "^7.16.7",
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/helper-simple-access": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
+ "integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/helper-split-export-declaration": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+ "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/helper-validator-identifier": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+ "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+ "dev": true
+ },
+ "@babel/helper-validator-option": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+ "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+ "dev": true
+ },
+ "@babel/helpers": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz",
+ "integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==",
+ "dev": true,
+ "requires": {
+ "@babel/template": "^7.16.7",
+ "@babel/traverse": "^7.16.7",
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/highlight": {
+ "version": "7.16.10",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
+ "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.16.7",
+ "chalk": "^2.0.0",
+ "js-tokens": "^4.0.0"
+ }
+ },
+ "@babel/parser": {
+ "version": "7.16.12",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz",
+ "integrity": "sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==",
+ "dev": true
+ },
+ "@babel/template": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+ "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.16.7",
+ "@babel/parser": "^7.16.7",
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/traverse": {
+ "version": "7.16.10",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz",
+ "integrity": "sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.16.7",
+ "@babel/generator": "^7.16.8",
+ "@babel/helper-environment-visitor": "^7.16.7",
+ "@babel/helper-function-name": "^7.16.7",
+ "@babel/helper-hoist-variables": "^7.16.7",
+ "@babel/helper-split-export-declaration": "^7.16.7",
+ "@babel/parser": "^7.16.10",
+ "@babel/types": "^7.16.8",
+ "debug": "^4.1.0",
+ "globals": "^11.1.0"
+ }
+ },
+ "@babel/types": {
+ "version": "7.16.8",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz",
+ "integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.16.7",
+ "to-fast-properties": "^2.0.0"
+ }
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "^1.9.0"
+ }
+ },
+ "browserslist": {
+ "version": "4.19.1",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+ "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
+ "dev": true,
+ "requires": {
+ "caniuse-lite": "^1.0.30001286",
+ "electron-to-chromium": "^1.4.17",
+ "escalade": "^3.1.1",
+ "node-releases": "^2.0.1",
+ "picocolors": "^1.0.0"
+ }
+ },
+ "caniuse-lite": {
+ "version": "1.0.30001303",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001303.tgz",
+ "integrity": "sha512-/Mqc1oESndUNszJP0kx0UaQU9kEv9nNtJ7Kn8AdA0mNnH8eR1cj0kG+NbNuC1Wq/b21eA8prhKRA3bbkjONegQ==",
+ "dev": true
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ }
+ },
+ "color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dev": true,
+ "requires": {
+ "color-name": "1.1.3"
+ }
+ },
+ "color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+ "dev": true
+ },
+ "convert-source-map": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+ "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "~5.1.1"
+ }
+ },
+ "debug": {
+ "version": "4.3.3",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+ "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
+ "electron-to-chromium": {
+ "version": "1.4.56",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.56.tgz",
+ "integrity": "sha512-0k/S0FQqRRpJbX7YUjwCcLZ8D42RqGKtaiq90adXBOYgTIWwLA/g3toO8k9yEpqU8iC4QyaWYYWSTBIna8WV4g==",
+ "dev": true
+ },
+ "escalade": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+ "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+ "dev": true
+ },
+ "escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+ "dev": true
+ },
+ "gensync": {
+ "version": "1.0.0-beta.2",
+ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+ "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+ "dev": true
+ },
+ "globals": {
+ "version": "11.12.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "js-tokens": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+ "dev": true
+ },
+ "jsesc": {
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+ "dev": true
+ },
+ "json5": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+ "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+ "dev": true,
+ "requires": {
+ "minimist": "^1.2.5"
+ }
+ },
+ "minimist": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+ "dev": true
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ },
+ "node-releases": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+ "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
+ "dev": true
+ },
+ "picocolors": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+ "dev": true
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true
+ },
+ "source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ },
+ "to-fast-properties": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+ "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+ "dev": true
+ }
+ }
+}
diff --git a/test-apps/new-cypress-config/fullstack/package.json b/test-apps/new-cypress-config/fullstack/package.json
new file mode 100644
index 00000000..398ce08e
--- /dev/null
+++ b/test-apps/new-cypress-config/fullstack/package.json
@@ -0,0 +1,16 @@
+{
+ "name": "example-fullstack",
+ "description": "Combined code coverage from the backend code, and e2e and unit tests",
+ "scripts": {
+ "prestart": "../node_modules/.bin/parcel build index.html",
+ "start": "../node_modules/.bin/nyc --silent node server/server",
+ "cy:run": "../node_modules/.bin/cypress run",
+ "pretest": "rimraf .nyc_output .cache coverage dist",
+ "test": "../node_modules/.bin/start-test 1234 cy:run",
+ "coverage:verify": "npx nyc report --check-coverage true --lines 100",
+ "coverage:check-files": "../node_modules/.bin/check-coverage fullstack/server/server.js && ../node_modules/.bin/check-coverage fullstack/main.js && ../node_modules/.bin/check-coverage fullstack/string-utils.js && ../node_modules/.bin/only-covered server.js main.js string-utils.js"
+ },
+ "devDependencies": {
+ "@babel/core": "^7.16.12"
+ }
+}
diff --git a/test-apps/new-cypress-config/fullstack/server/server.js b/test-apps/new-cypress-config/fullstack/server/server.js
new file mode 100644
index 00000000..f6ebcb1c
--- /dev/null
+++ b/test-apps/new-cypress-config/fullstack/server/server.js
@@ -0,0 +1,22 @@
+const express = require('express')
+const path = require('path')
+const app = express()
+const port = 1234
+
+// if there is code coverage information
+// then expose an endpoint that returns it
+/* istanbul ignore next */
+if (global.__coverage__) {
+ console.log('have code coverage, will add middleware for express')
+ console.log(`to fetch: GET :${port}/__coverage__`)
+ require('@cypress/code-coverage/middleware/express')(app)
+}
+
+app.use(express.static(path.join(__dirname, '../dist')))
+
+app.get('/hello', (req, res) => {
+ console.log('sending hello world')
+ res.send('Hello World!')
+})
+
+app.listen(port, () => console.log(`Example app listening on port ${port}!`))
diff --git a/examples/fullstack/string-utils.js b/test-apps/new-cypress-config/fullstack/string-utils.js
similarity index 100%
rename from examples/fullstack/string-utils.js
rename to test-apps/new-cypress-config/fullstack/string-utils.js
diff --git a/examples/unit-tests-js/.babelrc b/test-apps/new-cypress-config/one-spec/.babelrc
similarity index 100%
rename from examples/unit-tests-js/.babelrc
rename to test-apps/new-cypress-config/one-spec/.babelrc
diff --git a/test-apps/new-cypress-config/one-spec/README.md b/test-apps/new-cypress-config/one-spec/README.md
new file mode 100644
index 00000000..77a34719
--- /dev/null
+++ b/test-apps/new-cypress-config/one-spec/README.md
@@ -0,0 +1,3 @@
+# example: one-spec
+
+Only running a single spec using a specFiles pattern
diff --git a/test-apps/new-cypress-config/one-spec/cypress.config.js b/test-apps/new-cypress-config/one-spec/cypress.config.js
new file mode 100644
index 00000000..68caa159
--- /dev/null
+++ b/test-apps/new-cypress-config/one-spec/cypress.config.js
@@ -0,0 +1,12 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+ fixturesFolder: false,
+ e2e: {
+ setupNodeEvents(on, config) {
+ return require('./cypress/plugins/index.js')(on, config)
+ },
+ baseUrl: 'http://localhost:1234',
+ specPattern: 'cypress/e2e/spec-a.cy.js',
+ },
+})
diff --git a/test-apps/new-cypress-config/one-spec/cypress/e2e/spec-a.cy.js b/test-apps/new-cypress-config/one-spec/cypress/e2e/spec-a.cy.js
new file mode 100644
index 00000000..9fecd8eb
--- /dev/null
+++ b/test-apps/new-cypress-config/one-spec/cypress/e2e/spec-a.cy.js
@@ -0,0 +1,13 @@
+/// About
+
+ About
+
+ Test page
+ Open the DevTools to see console messages
+
+
diff --git a/test-apps/old-cypress-config/frontend/package.json b/test-apps/old-cypress-config/frontend/package.json
new file mode 100644
index 00000000..3aa6b84c
--- /dev/null
+++ b/test-apps/old-cypress-config/frontend/package.json
@@ -0,0 +1,15 @@
+{
+ "name": "example-frontend",
+ "description": "Tests a frontend app",
+ "devDependencies": {
+ "@babel/core": "7.9.0"
+ },
+ "scripts": {
+ "cy:run": "../node_modules/.bin/cypress run",
+ "start": "../node_modules/.bin/parcel serve index.html",
+ "pretest": "rimraf .nyc_output .cache coverage dist",
+ "test": "../node_modules/.bin/start-test 1234 cy:run",
+ "coverage:verify": "npx nyc report --check-coverage true --lines 100",
+ "coverage:check-files": "../node_modules/.bin/check-coverage app.js && ../node_modules/.bin/check-coverage about.js && ../node_modules/.bin/check-coverage unit.js && ../node_modules/.bin/only-covered app.js about.js unit.js"
+ }
+}
diff --git a/test-apps/old-cypress-config/frontend/unit.js b/test-apps/old-cypress-config/frontend/unit.js
new file mode 100644
index 00000000..6e31ef4b
--- /dev/null
+++ b/test-apps/old-cypress-config/frontend/unit.js
@@ -0,0 +1 @@
+export const add = (a, b) => a + b
diff --git a/test-apps/old-cypress-config/fullstack/.babelrc b/test-apps/old-cypress-config/fullstack/.babelrc
new file mode 100644
index 00000000..7a016cf8
--- /dev/null
+++ b/test-apps/old-cypress-config/fullstack/.babelrc
@@ -0,0 +1,3 @@
+{
+ "plugins": ["istanbul"]
+}
diff --git a/test-apps/old-cypress-config/fullstack/README.md b/test-apps/old-cypress-config/fullstack/README.md
new file mode 100644
index 00000000..4ea545fd
--- /dev/null
+++ b/test-apps/old-cypress-config/fullstack/README.md
@@ -0,0 +1,21 @@
+# example: fullstack
+
+> Combined code coverage from the backend code, and e2e and unit tests
+
+This example runs instrumented server code, that serves instrumented frontend code, and instruments the unit tests on the fly. The final report combines all 3 sources of information.
+
+To run
+
+```sh
+$ npm run test
+```
+
+You should see messages from the plugin when it saves each coverage object
+
+
+
+In the produced report, you should see
+
+- `server/server.js` coverage for backend
+- `main.js` coverage from end-to-end tests
+- `string-utils.js` coverage from unit tests
diff --git a/test-apps/old-cypress-config/fullstack/cypress.json b/test-apps/old-cypress-config/fullstack/cypress.json
new file mode 100644
index 00000000..cefeed61
--- /dev/null
+++ b/test-apps/old-cypress-config/fullstack/cypress.json
@@ -0,0 +1,9 @@
+{
+ "fixturesFolder": false,
+ "baseUrl": "http://localhost:1234",
+ "env": {
+ "codeCoverage": {
+ "url": "http://localhost:1234/__coverage__"
+ }
+ }
+}
diff --git a/test-apps/old-cypress-config/fullstack/cypress/integration/spec.js b/test-apps/old-cypress-config/fullstack/cypress/integration/spec.js
new file mode 100644
index 00000000..7b4d9d7d
--- /dev/null
+++ b/test-apps/old-cypress-config/fullstack/cypress/integration/spec.js
@@ -0,0 +1,23 @@
+/// Webpack example
+
+
+
+ Webpack page
+
+
+
+
diff --git a/test-apps/old-cypress-config/use-webpack/package.json b/test-apps/old-cypress-config/use-webpack/package.json
new file mode 100644
index 00000000..310fa1cd
--- /dev/null
+++ b/test-apps/old-cypress-config/use-webpack/package.json
@@ -0,0 +1,18 @@
+{
+ "name": "example-use-webpack",
+ "version": "1.0.0",
+ "description": "Code coverage from webpack",
+ "private": true,
+ "scripts": {
+ "cy:run": "../node_modules/.bin/cypress run",
+ "build": "../node_modules/.bin/webpack && cp ./index.html ./dist/index.html",
+ "start": "../node_modules/.bin/serve -p 1234 dist",
+ "pretest": "rimraf .nyc_output .cache coverage dist",
+ "test": "npm run build && ../node_modules/.bin/start-test 1234 cy:run",
+ "coverage:verify": "npx nyc report --check-coverage true --lines 100",
+ "coverage:check-files": "../node_modules/.bin/check-coverage src/index.js && ../node_modules/.bin/check-coverage src/calc.js && ../node_modules/.bin/only-covered src/index.js src/calc.js"
+ },
+ "keywords": [],
+ "author": "",
+ "license": "ISC"
+}
diff --git a/test-apps/old-cypress-config/use-webpack/src/calc.js b/test-apps/old-cypress-config/use-webpack/src/calc.js
new file mode 100644
index 00000000..44341b61
--- /dev/null
+++ b/test-apps/old-cypress-config/use-webpack/src/calc.js
@@ -0,0 +1,10 @@
+export const add = (a, b) => {
+ return a + b
+}
+
+export const reverse = s => {
+ return s
+ .split('')
+ .reverse()
+ .join('')
+}
diff --git a/test-apps/old-cypress-config/use-webpack/src/index.js b/test-apps/old-cypress-config/use-webpack/src/index.js
new file mode 100644
index 00000000..56c457b8
--- /dev/null
+++ b/test-apps/old-cypress-config/use-webpack/src/index.js
@@ -0,0 +1,14 @@
+import { reverse } from './calc'
+
+if (window.Cypress) {
+ require('console-log-div')
+ console.log('attaching event listeners')
+}
+
+document.getElementById('user-input').addEventListener('change', e => {
+ const s = e.target.value
+ console.log(`input string "${s}"`)
+ const reversed = reverse(s)
+ document.getElementById('reversed').innerText = reversed
+})
+console.log('added event listener')
diff --git a/test-apps/old-cypress-config/use-webpack/webpack.config.js b/test-apps/old-cypress-config/use-webpack/webpack.config.js
new file mode 100644
index 00000000..ff9c2905
--- /dev/null
+++ b/test-apps/old-cypress-config/use-webpack/webpack.config.js
@@ -0,0 +1,28 @@
+const path = require('path')
+
+// https://webpack.js.org/guides/development/
+module.exports = {
+ entry: './src/index.js',
+ mode: 'development',
+ devtool: 'inline-source-map',
+ output: {
+ filename: 'main.js',
+ path: path.resolve(__dirname, 'dist')
+ },
+ module: {
+ rules: [
+ {
+ // when bundling application's own source code
+ // transpile using Babel which uses .babelrc file
+ // and instruments code using babel-plugin-istanbul
+ test: /\.js/,
+ exclude: /(node_modules|bower_components)/,
+ use: [
+ {
+ loader: 'babel-loader'
+ }
+ ]
+ }
+ ]
+ }
+}
diff --git a/use-babelrc.js b/use-babelrc.js
index 38305d7b..6f967221 100644
--- a/use-babelrc.js
+++ b/use-babelrc.js
@@ -1,9 +1,5 @@
-const browserify = require('@cypress/browserify-preprocessor')
-
-// TODO check if there is .babelrc file
-// if not, maybe create one?
-
-// Tells Cypress to use .babelrc when bundling spec code
-const options = browserify.defaultOptions
-options.browserifyOptions.transform[1][1].babelrc = true
-module.exports = browserify(options)
+const webpackPreprocessor = require('@cypress/webpack-preprocessor')
+const defaults = webpackPreprocessor.defaultOptions
+// remove presets so the babelrc file will be used
+delete defaults.webpackOptions.module.rules[0].use[0].options.presets
+module.exports = webpackPreprocessor(defaults)
diff --git a/use-browserify-istanbul.js b/use-browserify-istanbul.js
deleted file mode 100644
index 838da10b..00000000
--- a/use-browserify-istanbul.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const browserify = require('@cypress/browserify-preprocessor')
-
-const options = browserify.defaultOptions
-// transform[1][1] is "babelify"
-// so we just add our code instrumentation plugin to the list
-options.browserifyOptions.transform[1][1].plugins.push('babel-plugin-istanbul')
-module.exports = browserify(options)