Merge branch 'master' into master

.circleci/config.yml

@@ -9,9 +9,9 @@ jobs:
   lint:
     description: Checks the code formatting
     docker:
-      - image: cimg/node:16.20.1
+      - image: cimg/node:20.9.0
         environment:
-          # we don't need Cypress to check code styl
+          # we don't need Cypress to check code style
           CYPRESS_INSTALL_BINARY: '0'
     steps:
       - attach_workspace:
@@ -25,14 +25,6 @@ jobs:
     executor: cypress/default
     steps:
       - cypress/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
       - run: npm run check:markdown
       - persist_to_workspace:
           paths:
@@ -55,35 +47,31 @@ jobs:
           command: nvm use 16.16.0
       - run:
           name: Install deps for code coverage
-          command: npm ci 
-      - run:
-          name: Install deps for test-apps/old-cypress-config
           command: npm ci
-          working_directory: test-apps/old-cypress-config   
       - cypress/run-tests:
           # no-workspace: true
-          start-command: npm run start:windows --prefix test-apps/old-cypress-config/all-files
+          start-command: npm run start:windows --prefix test-apps/all-files
           # wait-on: 'http://localhost:1234'
-          cypress-command: npx cypress run --project test-apps/old-cypress-config/all-files
+          cypress-command: npx cypress run --project test-apps/all-files
           # store screenshots and videos
           # store_artifacts: true          
       - run:
           # make sure the examples captures 100% of code
           name: Verify Code Coverage
           command: npm run coverage:verify
-          working_directory: test-apps/old-cypress-config/all-files
+          working_directory: test-apps/all-files
       - 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 i -D check-code-coverage && npm run coverage:check-files:windows
-          working_directory: test-apps/old-cypress-config/all-files
+          command: npm i -D check-code-coverage && npm run coverage:check-files
+          working_directory: test-apps/all-files
 
   publish:
     description: Publishes the new version of the plugin to NPM
     docker:
-      - image: cimg/node:16.20.1
+      - image: cimg/node:20.9.0
     environment:
       # we don't need Cypress to do the release
       CYPRESS_INSTALL_BINARY: '0'
@@ -156,33 +144,21 @@ workflows:
           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/cra-e2e-and-ct
-                - 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
+                - all-files
+                - backend
+                - before-all-visit
+                - before-each-visit
+                - cra-e2e-and-ct
+                - exclude-files
+                - frontend
+                - fullstack
+                - one-spec
+                - same-folder
+                - support-files
+                - ts-example
+                - unit-tests-js
+                - use-webpack
+                - redirect
       - windows_test
       - publish:
           filters:
@@ -195,31 +171,19 @@ workflows:
           requires:
             - lint
             - test-code-coverage-plugin
-            - test-old-cypress-config/all-files
-            - test-old-cypress-config/backend
-            - test-old-cypress-config/before-all-visit
-            - test-old-cypress-config/before-each-visit
-            - test-old-cypress-config/exclude-files
-            - test-old-cypress-config/frontend
-            - test-old-cypress-config/fullstack
-            - test-old-cypress-config/one-spec
-            - test-old-cypress-config/same-folder
-            - test-old-cypress-config/support-files
-            - test-old-cypress-config/ts-example
-            - test-old-cypress-config/unit-tests-js
-            - test-old-cypress-config/use-webpack
-            - test-new-cypress-config/all-files
-            - test-new-cypress-config/backend
-            - test-new-cypress-config/before-all-visit
-            - test-new-cypress-config/before-each-visit
-            - test-new-cypress-config/cra-e2e-and-ct
-            - test-new-cypress-config/exclude-files
-            - test-new-cypress-config/frontend
-            - test-new-cypress-config/fullstack
-            - test-new-cypress-config/one-spec
-            - test-new-cypress-config/same-folder
-            - test-new-cypress-config/support-files
-            - test-new-cypress-config/ts-example
-            - test-new-cypress-config/unit-tests-js
-            - test-new-cypress-config/use-webpack
+            - test-all-files
+            - test-backend
+            - test-before-all-visit
+            - test-before-each-visit
+            - test-cra-e2e-and-ct
+            - test-exclude-files
+            - test-frontend
+            - test-fullstack
+            - test-one-spec
+            - test-same-folder
+            - test-support-files
+            - test-ts-example
+            - test-unit-tests-js
+            - test-use-webpack
+            - test-redirect
             - windows_test

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,28 +7,28 @@ assignees: ''
 ---
 
 **Logs and screenshots**
-Please provide debug logs by running Cypress from the terminal with `DEBUG=code-coverage` environment variable set, see the [Debugging](https://github.com/cypress-io/code-coverage#debugging) section of the README file.
+Please provide debug logs by running Cypress from the terminal with `DEBUG=code-coverage` environment variable set. See the [Debugging](https://github.com/cypress-io/code-coverage#debugging) section of the README file.
 
 **Versions**
 
-- What is this plugin's version? If this is NOT the latest [released version](https://github.com/cypress-io/code-coverage/releases) can you try the latest version, please?
-- If the plugin worked before in version X, but stopped after upgrading to version Y, please try the [released versions](https://github.com/cypress-io/code-coverage/releases) between X and Y to see where the breaking change was.
-- What is Cypress version?
+- What is this plugin's version? If this is NOT the latest [released version](https://github.com/cypress-io/code-coverage/releases), can you try the latest version, please?
+- If the plugin worked before in version X but stopped after upgrading to version Y, please try the [released versions](https://github.com/cypress-io/code-coverage/releases) between X and Y to see where the breaking change was.
+- What is the Cypress version?
 - What is your operating system?
 - What is the shell?
 - What is the Node version?
 - What is the NPM version?
-- How do you instrument your application? Cypress [does not instrument web application code](https://github.com/cypress-io/code-coverage#instrument-your-application), so you need to do it yourself.
-- When running tests, if you open the web application in regular browser, and open DevTools, do you see `window.__coverage__` object? Can you paste a screenshot?
-- Is there `.nyc_output` folder? Is there `.nyc_output/out.json` file. Is it empty? Can you paste at least part of it so we can see the keys and file paths?
-- Do you have any custom NYC settings in `package.json` (`nyc` object) or in other [NYC config files](https://github.com/istanbuljs/nyc#configuration-files)
+- How do you instrument your application? Cypress [does not instrument web application code](https://github.com/cypress-io/code-coverage#instrument-your-application), so you must do it yourself.
+- When running tests, if you open the web application in a regular browser and open DevTools, do you see `window.__coverage__` object? Can you paste a screenshot?
+- Is there a `.nyc_output` folder? Is there a `.nyc_output/out.json` file? Is it empty? Can you paste at least part of it so we can see the keys and file paths?
+- Do you have any custom NYC settings in `package.json` (`nyc` object) or in other [NYC config files](https://github.com/istanbuljs/nyc#configuration-files)?
 - Do you run Cypress tests in a Docker container?
 
 **Describe the bug**
 A clear and concise description of what the bug is.
 
 **Link to the repo**
-Bugs with a reproducible example, like an open source repo showing the bug, are the most likely to be resolved.
+Bugs with a reproducible example, like an open-source repo showing the bug, are the most likely to be resolved.
 
 **Example**
 See [#217](https://github.com/cypress-io/code-coverage/issues/217) that is an excellent bug report example

.github/workflows/snyk_sca_scan.yaml

@@ -1,4 +1,8 @@
 name: Snyk Software Composition Analysis Scan
+# This git workflow leverages Snyk actions to perform a Software Composition 
+# Analysis scan on our Opensource libraries upon Pull Requests to Master & 
+# Develop branches. We use this as a control to prevent vulnerable packages 
+# from being introduced into the codebase. 
 on:
   pull_request:
     branches:
@@ -9,17 +13,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [20.x]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setting up Node
-        #- name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-      - name: Run Snyk to check for opensource vulnerabilities
-        uses: snyk/actions/setup@master
+      - name: Installing snyk-delta and dependencies
+        run: npm i -g snyk-delta
+      - uses: snyk/actions/setup@master
+      - name: Perform SCA Scan
+        continue-on-error: false
         run: |
-          snyk test --all-projects --strict-out-of-sync=false --detection-depth=6 --exclude=docker,Dockerfile --severity-threshold=critical
+          snyk test --all-projects --detection-depth=4 --exclude=docker,Dockerfile --severity-threshold=critical
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_API_TOKEN }}

.github/workflows/snyk_static_analysis_scan.yaml

@@ -10,7 +10,7 @@ jobs:
   Snyk_SAST_Scan:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: snyk/actions/setup@master
       - name: Perform Static Analysis Test
         env:

.nycrc.json

@@ -1,6 +1,6 @@
 {
   "exclude": [
-    "support-utils.js",
+    "support.js",
     "task-utils.js"
   ]
 }