From ff67e84f5159693fe4aac7aba0a69be7c7865c1e Mon Sep 17 00:00:00 2001
From: Kevin Old <kevin@cypress.io>
Date: Thu, 17 Feb 2022 11:43:37 -0600
Subject: [PATCH 1/8] move vue-cli-2 to setup-vue-cli-2; update patch paths

---
 scripts/{vue-cli-2.sh => setup-vue-cli-2.sh}  |  0
 .../{vue-cli-2 => setup-vue-cli-2}/1.patch    | 16 +++----
 .../{vue-cli-2 => setup-vue-cli-2}/2.patch    | 42 +++++++++----------
 .../{vue-cli-2 => setup-vue-cli-2}/3.patch    | 34 +++++++--------
 scripts/{vue-cli-2 => setup-vue-cli-2}/pr.md  |  0
 5 files changed, 46 insertions(+), 46 deletions(-)
 rename scripts/{vue-cli-2.sh => setup-vue-cli-2.sh} (100%)
 rename scripts/{vue-cli-2 => setup-vue-cli-2}/1.patch (64%)
 rename scripts/{vue-cli-2 => setup-vue-cli-2}/2.patch (75%)
 rename scripts/{vue-cli-2 => setup-vue-cli-2}/3.patch (63%)
 rename scripts/{vue-cli-2 => setup-vue-cli-2}/pr.md (100%)

diff --git a/scripts/vue-cli-2.sh b/scripts/setup-vue-cli-2.sh
similarity index 100%
rename from scripts/vue-cli-2.sh
rename to scripts/setup-vue-cli-2.sh
diff --git a/scripts/vue-cli-2/1.patch b/scripts/setup-vue-cli-2/1.patch
similarity index 64%
rename from scripts/vue-cli-2/1.patch
rename to scripts/setup-vue-cli-2/1.patch
index 686bbf4..8942fc0 100644
--- a/scripts/vue-cli-2/1.patch
+++ b/scripts/setup-vue-cli-2/1.patch
@@ -1,7 +1,7 @@
-diff --git a/vue-cli-2/src/App.vue b/vue-cli-2/src/App.vue
+diff --git a/setup-vue-cli-2/src/App.vue b/setup-vue-cli-2/src/App.vue
 index 55df315..b9ac61a 100644
---- a/vue-cli-2/src/App.vue
-+++ b/vue-cli-2/src/App.vue
+--- a/setup-vue-cli-2/src/App.vue
++++ b/setup-vue-cli-2/src/App.vue
 @@ -18,11 +18,6 @@ export default {
  
  <style>
@@ -14,11 +14,11 @@ index 55df315..b9ac61a 100644
    margin-top: 60px;
  }
  </style>
-diff --git a/vue-cli-2/src/main.css b/vue-cli-2/src/main.css
+diff --git a/setup-vue-cli-2/src/main.css b/setup-vue-cli-2/src/main.css
 new file mode 100644
 index 0000000..110b5e1
 --- /dev/null
-+++ b/vue-cli-2/src/main.css
++++ b/setup-vue-cli-2/src/main.css
 @@ -0,0 +1,7 @@
 +body {
 +  font-family: Avenir, Helvetica, Arial, sans-serif;
@@ -27,10 +27,10 @@ index 0000000..110b5e1
 +  text-align: center;
 +  color: #2c3e50;
 +}
-diff --git a/vue-cli-2/src/main.js b/vue-cli-2/src/main.js
+diff --git a/setup-vue-cli-2/src/main.js b/setup-vue-cli-2/src/main.js
 index 63eb05f..1d9028a 100644
---- a/vue-cli-2/src/main.js
-+++ b/vue-cli-2/src/main.js
+--- a/setup-vue-cli-2/src/main.js
++++ b/setup-vue-cli-2/src/main.js
 @@ -1,5 +1,6 @@
  import Vue from 'vue'
  import App from './App.vue'
diff --git a/scripts/vue-cli-2/2.patch b/scripts/setup-vue-cli-2/2.patch
similarity index 75%
rename from scripts/vue-cli-2/2.patch
rename to scripts/setup-vue-cli-2/2.patch
index 6c988a3..ff1ff9c 100644
--- a/scripts/vue-cli-2/2.patch
+++ b/scripts/setup-vue-cli-2/2.patch
@@ -1,8 +1,8 @@
-diff --git a/vue-cli-2/cypress.json b/vue-cli-2/cypress.json
+diff --git a/setup-vue-cli-2/cypress.json b/setup-vue-cli-2/cypress.json
 new file mode 100644
 index 0000000..a57b21f
 --- /dev/null
-+++ b/vue-cli-2/cypress.json
++++ b/setup-vue-cli-2/cypress.json
 @@ -0,0 +1,6 @@
 +{
 +  "component": {
@@ -10,22 +10,22 @@ index 0000000..a57b21f
 +    "componentFolder": "src"
 +  }
 +}
-diff --git a/vue-cli-2/cypress/fixtures/example.json b/vue-cli-2/cypress/fixtures/example.json
+diff --git a/setup-vue-cli-2/cypress/fixtures/example.json b/setup-vue-cli-2/cypress/fixtures/example.json
 new file mode 100644
 index 0000000..02e4254
 --- /dev/null
-+++ b/vue-cli-2/cypress/fixtures/example.json
++++ b/setup-vue-cli-2/cypress/fixtures/example.json
 @@ -0,0 +1,5 @@
 +{
 +  "name": "Using fixtures to represent data",
 +  "email": "hello@cypress.io",
 +  "body": "Fixtures are a great way to mock data for responses to routes"
 +}
-diff --git a/vue-cli-2/cypress/plugins/index.js b/vue-cli-2/cypress/plugins/index.js
+diff --git a/setup-vue-cli-2/cypress/plugins/index.js b/setup-vue-cli-2/cypress/plugins/index.js
 new file mode 100644
 index 0000000..3590bd9
 --- /dev/null
-+++ b/vue-cli-2/cypress/plugins/index.js
++++ b/setup-vue-cli-2/cypress/plugins/index.js
 @@ -0,0 +1,12 @@
 +const { startDevServer } = require('@cypress/webpack-dev-server')
 +const webpackConfig = require('@vue/cli-service/webpack.config')
@@ -39,11 +39,11 @@ index 0000000..3590bd9
 +  })
 +  return config
 +}
-diff --git a/vue-cli-2/cypress/support/commands.js b/vue-cli-2/cypress/support/commands.js
+diff --git a/setup-vue-cli-2/cypress/support/commands.js b/setup-vue-cli-2/cypress/support/commands.js
 new file mode 100644
 index 0000000..119ab03
 --- /dev/null
-+++ b/vue-cli-2/cypress/support/commands.js
++++ b/setup-vue-cli-2/cypress/support/commands.js
 @@ -0,0 +1,25 @@
 +// ***********************************************
 +// This example commands.js shows you how to
@@ -70,11 +70,11 @@ index 0000000..119ab03
 +//
 +// -- This will overwrite an existing command --
 +// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-diff --git a/vue-cli-2/cypress/support/index.js b/vue-cli-2/cypress/support/index.js
+diff --git a/setup-vue-cli-2/cypress/support/index.js b/setup-vue-cli-2/cypress/support/index.js
 new file mode 100644
 index 0000000..9b7843f
 --- /dev/null
-+++ b/vue-cli-2/cypress/support/index.js
++++ b/setup-vue-cli-2/cypress/support/index.js
 @@ -0,0 +1,23 @@
 +// ***********************************************************
 +// This example support/index.js is processed and
@@ -99,11 +99,11 @@ index 0000000..9b7843f
 +
 +// Ensure global app styles are loaded:
 +import '../../src/main.css'
-diff --git a/vue-cli-2/src/App.spec.ct.js b/vue-cli-2/src/App.spec.ct.js
+diff --git a/setup-vue-cli-2/src/App.spec.ct.js b/setup-vue-cli-2/src/App.spec.ct.js
 new file mode 100644
 index 0000000..4a912ba
 --- /dev/null
-+++ b/vue-cli-2/src/App.spec.ct.js
++++ b/setup-vue-cli-2/src/App.spec.ct.js
 @@ -0,0 +1,11 @@
 +import { mount } from '@cypress/vue'
 +import App from './App.vue'
@@ -116,11 +116,11 @@ index 0000000..4a912ba
 +  cy.get('[data-test=count]').should("have.text", "Total clicks: 1")
 +  cy.get('button').click()
 +})
-diff --git a/vue-cli-2/src/components/HelloWorld.spec.ct.js b/vue-cli-2/src/components/HelloWorld.spec.ct.js
+diff --git a/setup-vue-cli-2/src/components/HelloWorld.spec.ct.js b/setup-vue-cli-2/src/components/HelloWorld.spec.ct.js
 new file mode 100644
 index 0000000..bbbb6c3
 --- /dev/null
-+++ b/vue-cli-2/src/components/HelloWorld.spec.ct.js
++++ b/setup-vue-cli-2/src/components/HelloWorld.spec.ct.js
 @@ -0,0 +1,11 @@
 +import { mount } from '@cypress/vue'
 +import HelloWorld from './HelloWorld.vue'
@@ -133,10 +133,10 @@ index 0000000..bbbb6c3
 +  })
 +  cy.get('h1').contains('Hello World')
 +})
-diff --git a/vue-cli-2/src/App.vue b/vue-cli-2/src/App.vue
+diff --git a/setup-vue-cli-2/src/App.vue b/setup-vue-cli-2/src/App.vue
 index b9ac61a..7988bf5 100644
---- a/vue-cli-2/src/App.vue
-+++ b/vue-cli-2/src/App.vue
+--- a/setup-vue-cli-2/src/App.vue
++++ b/setup-vue-cli-2/src/App.vue
 @@ -2,16 +2,19 @@
    <div id="app">
      <img alt="Vue logo" src="./assets/logo.png">
@@ -158,11 +158,11 @@ index b9ac61a..7988bf5 100644
    }
  }
  </script>
-diff --git a/vue-cli-2/src/components/Counter.vue b/vue-cli-2/src/components/Counter.vue
+diff --git a/setup-vue-cli-2/src/components/Counter.vue b/setup-vue-cli-2/src/components/Counter.vue
 new file mode 100644
 index 0000000..5eb6269
 --- /dev/null
-+++ b/vue-cli-2/src/components/Counter.vue
++++ b/setup-vue-cli-2/src/components/Counter.vue
 @@ -0,0 +1,20 @@
 +<template>
 +  <div>
@@ -185,11 +185,11 @@ index 0000000..5eb6269
 +}
 +</script>
 \ No newline at end of file
-diff --git a/vue-cli-2/src/components/Counter.spec.ct.js b/vue-cli-2/src/components/Counter.spec.ct.js
+diff --git a/setup-vue-cli-2/src/components/Counter.spec.ct.js b/setup-vue-cli-2/src/components/Counter.spec.ct.js
 new file mode 100644
 index 0000000..afd7e21
 --- /dev/null
-+++ b/vue-cli-2/src/components/Counter.spec.ct.js
++++ b/setup-vue-cli-2/src/components/Counter.spec.ct.js
 @@ -0,0 +1,10 @@
 +import { mount } from '@cypress/vue'
 +import Counter from './Counter.vue'
diff --git a/scripts/vue-cli-2/3.patch b/scripts/setup-vue-cli-2/3.patch
similarity index 63%
rename from scripts/vue-cli-2/3.patch
rename to scripts/setup-vue-cli-2/3.patch
index 1793961..737dde8 100644
--- a/scripts/vue-cli-2/3.patch
+++ b/scripts/setup-vue-cli-2/3.patch
@@ -1,7 +1,7 @@
-diff --git a/vue-cli-2/.gitignore b/vue-cli-2/.gitignore
+diff --git a/setup-vue-cli-2/.gitignore b/setup-vue-cli-2/.gitignore
 index 403adbc..372a13f 100644
---- a/vue-cli-2/.gitignore
-+++ b/vue-cli-2/.gitignore
+--- a/setup-vue-cli-2/.gitignore
++++ b/setup-vue-cli-2/.gitignore
 @@ -21,3 +21,6 @@ pnpm-debug.log*
  *.njsproj
  *.sln
@@ -9,11 +9,11 @@ index 403adbc..372a13f 100644
 +
 +.nyc_output
 +coverage
-diff --git a/vue-cli-2/.nycrc b/vue-cli-2/.nycrc
+diff --git a/setup-vue-cli-2/.nycrc b/setup-vue-cli-2/.nycrc
 new file mode 100644
 index 0000000..3a40283
 --- /dev/null
-+++ b/vue-cli-2/.nycrc
++++ b/setup-vue-cli-2/.nycrc
 @@ -0,0 +1,13 @@
 +{
 +  "include": [
@@ -29,10 +29,10 @@ index 0000000..3a40283
 +  "all": true
 +}
 \ No newline at end of file
-diff --git a/vue-cli-2/babel.config.js b/vue-cli-2/babel.config.js
+diff --git a/setup-vue-cli-2/babel.config.js b/setup-vue-cli-2/babel.config.js
 index e955840..f4b8fdb 100644
---- a/vue-cli-2/babel.config.js
-+++ b/vue-cli-2/babel.config.js
+--- a/setup-vue-cli-2/babel.config.js
++++ b/setup-vue-cli-2/babel.config.js
 @@ -1,5 +1,12 @@
 -module.exports = {
 -  presets: [
@@ -51,20 +51,20 @@ index e955840..f4b8fdb 100644
 +  plugins
 +}
 \ No newline at end of file
-diff --git a/vue-cli-2/cypress.json b/vue-cli-2/cypress.json
+diff --git a/setup-vue-cli-2/cypress.json b/setup-vue-cli-2/cypress.json
 index ee59bec..622829d 100644
---- a/vue-cli-2/cypress.json
-+++ b/vue-cli-2/cypress.json
+--- a/setup-vue-cli-2/cypress.json
++++ b/setup-vue-cli-2/cypress.json
 @@ -1,4 +1,5 @@
  {
 +  "coverage": true,
    "component": {
      "testFiles": "**/*.spec.ct.{js,ts,jsx,tsx}",
      "componentFolder": "src"
-diff --git a/vue-cli-2/cypress/plugins/index.js b/vue-cli-2/cypress/plugins/index.js
+diff --git a/setup-vue-cli-2/cypress/plugins/index.js b/setup-vue-cli-2/cypress/plugins/index.js
 index 3590bd9..9fa1b7a 100644
---- a/vue-cli-2/cypress/plugins/index.js
-+++ b/vue-cli-2/cypress/plugins/index.js
+--- a/setup-vue-cli-2/cypress/plugins/index.js
++++ b/setup-vue-cli-2/cypress/plugins/index.js
 @@ -1,5 +1,6 @@
  const { startDevServer } = require('@cypress/webpack-dev-server')
  const webpackConfig = require('@vue/cli-service/webpack.config')
@@ -79,10 +79,10 @@ index 3590bd9..9fa1b7a 100644
 +  codeCoverageTask(on, config)
    return config
  }
-diff --git a/vue-cli-2/cypress/support/index.js b/vue-cli-2/cypress/support/index.js
+diff --git a/setup-vue-cli-2/cypress/support/index.js b/setup-vue-cli-2/cypress/support/index.js
 index 9b7843f..05cf3eb 100644
---- a/vue-cli-2/cypress/support/index.js
-+++ b/vue-cli-2/cypress/support/index.js
+--- a/setup-vue-cli-2/cypress/support/index.js
++++ b/setup-vue-cli-2/cypress/support/index.js
 @@ -13,6 +13,8 @@
  // https://on.cypress.io/configuration
  // ***********************************************************
diff --git a/scripts/vue-cli-2/pr.md b/scripts/setup-vue-cli-2/pr.md
similarity index 100%
rename from scripts/vue-cli-2/pr.md
rename to scripts/setup-vue-cli-2/pr.md

From 5480295292e4a50b425a0f26f79519fffa47ad20 Mon Sep 17 00:00:00 2001
From: Kevin Old <kevin@cypress.io>
Date: Thu, 17 Feb 2022 11:46:26 -0600
Subject: [PATCH 2/8] update setup-vue-cli-2 to latest v10 binary

---
 scripts/setup-vue-cli-2.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/setup-vue-cli-2.sh b/scripts/setup-vue-cli-2.sh
index 33ddba2..e02aed7 100755
--- a/scripts/setup-vue-cli-2.sh
+++ b/scripts/setup-vue-cli-2.sh
@@ -43,7 +43,7 @@ apply_patch
 commit_all "Update app to move global styles into main.css file"
 
 step
-cmd yarn add -D cypress @cypress/vue @cypress/webpack-dev-server webpack-dev-server
+cmd yarn add -D https://cdn.cypress.io/beta/npm/10.0.0/linux-x64/circle-10.0-release-e7718f7489276cac2e8ad71bc57a627eb0135fbd/cypress.tgz @cypress/vue @cypress/webpack-dev-server webpack-dev-server
 apply_patch
 commit_all "Add Cypress with example component and page tests"
 

From 4bc597dcbb4507747c1af86776049e84a55d7b37 Mon Sep 17 00:00:00 2001
From: Kevin Old <kevin@cypress.io>
Date: Thu, 17 Feb 2022 15:30:30 -0600
Subject: [PATCH 3/8] updates to setup-vue-cli-2 script and patch

---
 scripts/setup-vue-cli-2.sh      | 10 ++--
 scripts/setup-vue-cli-2/2.patch | 98 +++++++++++++++------------------
 2 files changed, 50 insertions(+), 58 deletions(-)

diff --git a/scripts/setup-vue-cli-2.sh b/scripts/setup-vue-cli-2.sh
index e02aed7..4ada181 100755
--- a/scripts/setup-vue-cli-2.sh
+++ b/scripts/setup-vue-cli-2.sh
@@ -43,13 +43,13 @@ apply_patch
 commit_all "Update app to move global styles into main.css file"
 
 step
-cmd yarn add -D https://cdn.cypress.io/beta/npm/10.0.0/linux-x64/circle-10.0-release-e7718f7489276cac2e8ad71bc57a627eb0135fbd/cypress.tgz @cypress/vue @cypress/webpack-dev-server webpack-dev-server
+cmd yarn add -D https://cdn.cypress.io/beta/npm/10.0.0/linux-x64/circle-10.0-release-e7718f7489276cac2e8ad71bc57a627eb0135fbd/cypress.tgz @cypress/vue@^2.2.4 @cypress/webpack-dev-server webpack-dev-server
 apply_patch
 commit_all "Add Cypress with example component and page tests"
 
-step
-cmd yarn add -D @cypress/code-coverage babel-plugin-istanbul
-apply_patch
-commit_all "Configure Cypress Code Coverage plugin"
+# step
+# cmd yarn add -D @cypress/code-coverage babel-plugin-istanbul
+# apply_patch
+# commit_all "Configure Cypress Code Coverage plugin"
 
 finalize
diff --git a/scripts/setup-vue-cli-2/2.patch b/scripts/setup-vue-cli-2/2.patch
index ff1ff9c..cd94eb7 100644
--- a/scripts/setup-vue-cli-2/2.patch
+++ b/scripts/setup-vue-cli-2/2.patch
@@ -1,15 +1,21 @@
-diff --git a/setup-vue-cli-2/cypress.json b/setup-vue-cli-2/cypress.json
+diff --git a/setup-vue-cli-2/cypress.config.js b/setup-vue-cli-2/cypress.config.js
 new file mode 100644
-index 0000000..a57b21f
+index 0000000..eabdc78
 --- /dev/null
-+++ b/setup-vue-cli-2/cypress.json
-@@ -0,0 +1,6 @@
-+{
-+  "component": {
-+    "testFiles": "**/*.spec.ct.{js,ts,jsx,tsx}",
-+    "componentFolder": "src"
-+  }
-+}
++++ b/setup-vue-cli-2/cypress.config.js
+@@ -0,0 +1,11 @@
++const { defineConfig } = require('cypress')
++const { devServer } = require('@cypress/webpack-dev-server')
++const webpackConfig = require('@vue/cli-service/webpack.config')
++
++module.exports = defineConfig({
++  // Component testing, JavaScript, Vue CLI, Webpack
++  component: {
++    devServer,
++    devServerConfig: { webpackConfig }
++  },
++})
+\ No newline at end of file
 diff --git a/setup-vue-cli-2/cypress/fixtures/example.json b/setup-vue-cli-2/cypress/fixtures/example.json
 new file mode 100644
 index 0000000..02e4254
@@ -21,24 +27,27 @@ index 0000000..02e4254
 +  "email": "hello@cypress.io",
 +  "body": "Fixtures are a great way to mock data for responses to routes"
 +}
-diff --git a/setup-vue-cli-2/cypress/plugins/index.js b/setup-vue-cli-2/cypress/plugins/index.js
+diff --git a/setup-vue-cli-2/cypress/component/index.html b/setup-vue-cli-2/cypress/component/index.html
 new file mode 100644
-index 0000000..3590bd9
+index 0000000..410b588
 --- /dev/null
-+++ b/setup-vue-cli-2/cypress/plugins/index.js
-@@ -0,0 +1,12 @@
-+const { startDevServer } = require('@cypress/webpack-dev-server')
-+const webpackConfig = require('@vue/cli-service/webpack.config')
++++ b/setup-vue-cli-2/cypress/component/index.html
+@@ -0,0 +1,14 @@
++<!DOCTYPE html>
++<html>
++  <head>
++    <meta charset="utf-8">
++    <meta http-equiv="X-UA-Compatible" content="IE=edge">
++    <meta name="viewport" content="width=device-width,initial-scale=1.0">
++    <title>Components App</title>
 +
-+module.exports = (on, config) => {
-+  on('dev-server:start', (options) => {
-+    return startDevServer({
-+      options,
-+      webpackConfig,
-+    })
-+  })
-+  return config
-+}
++  </head>
++  <body>
++
++    <div id="__cy_root"></div>
++  </body>
++</html>
+\ No newline at end of file
 diff --git a/setup-vue-cli-2/cypress/support/commands.js b/setup-vue-cli-2/cypress/support/commands.js
 new file mode 100644
 index 0000000..119ab03
@@ -70,40 +79,23 @@ index 0000000..119ab03
 +//
 +// -- This will overwrite an existing command --
 +// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-diff --git a/setup-vue-cli-2/cypress/support/index.js b/setup-vue-cli-2/cypress/support/index.js
+diff --git a/setup-vue-cli-2/cypress/support/component.js b/setup-vue-cli-2/cypress/support/component.js
 new file mode 100644
-index 0000000..9b7843f
+index 0000000..7e654cd
 --- /dev/null
-+++ b/setup-vue-cli-2/cypress/support/index.js
-@@ -0,0 +1,23 @@
-+// ***********************************************************
-+// This example support/index.js is processed and
-+// loaded automatically before your test files.
-+//
-+// This is a great place to put global configuration and
-+// behavior that modifies Cypress.
-+//
-+// You can change the location of this file or turn off
-+// automatically serving support files with the
-+// 'supportFile' configuration option.
-+//
-+// You can read more here:
-+// https://on.cypress.io/configuration
-+// ***********************************************************
-+
++++ b/setup-vue-cli-2/cypress/support/component.js
+@@ -0,0 +1,5 @@
 +// Import commands.js using ES2015 syntax:
 +import './commands'
 +
-+// Alternatively you can use CommonJS syntax:
-+// require('./commands')
-+
 +// Ensure global app styles are loaded:
 +import '../../src/main.css'
-diff --git a/setup-vue-cli-2/src/App.spec.ct.js b/setup-vue-cli-2/src/App.spec.ct.js
+\ No newline at end of file
+diff --git a/setup-vue-cli-2/src/App.cy.js b/setup-vue-cli-2/src/App.cy.js
 new file mode 100644
 index 0000000..4a912ba
 --- /dev/null
-+++ b/setup-vue-cli-2/src/App.spec.ct.js
++++ b/setup-vue-cli-2/src/App.cy.js
 @@ -0,0 +1,11 @@
 +import { mount } from '@cypress/vue'
 +import App from './App.vue'
@@ -116,11 +108,11 @@ index 0000000..4a912ba
 +  cy.get('[data-test=count]').should("have.text", "Total clicks: 1")
 +  cy.get('button').click()
 +})
-diff --git a/setup-vue-cli-2/src/components/HelloWorld.spec.ct.js b/setup-vue-cli-2/src/components/HelloWorld.spec.ct.js
+diff --git a/setup-vue-cli-2/src/components/HelloWorld.cy.js b/setup-vue-cli-2/src/components/HelloWorld.cy.js
 new file mode 100644
 index 0000000..bbbb6c3
 --- /dev/null
-+++ b/setup-vue-cli-2/src/components/HelloWorld.spec.ct.js
++++ b/setup-vue-cli-2/src/components/HelloWorld.cy.js
 @@ -0,0 +1,11 @@
 +import { mount } from '@cypress/vue'
 +import HelloWorld from './HelloWorld.vue'
@@ -185,11 +177,11 @@ index 0000000..5eb6269
 +}
 +</script>
 \ No newline at end of file
-diff --git a/setup-vue-cli-2/src/components/Counter.spec.ct.js b/setup-vue-cli-2/src/components/Counter.spec.ct.js
+diff --git a/setup-vue-cli-2/src/components/Counter.cy.js b/setup-vue-cli-2/src/components/Counter.cy.js
 new file mode 100644
 index 0000000..afd7e21
 --- /dev/null
-+++ b/setup-vue-cli-2/src/components/Counter.spec.ct.js
++++ b/setup-vue-cli-2/src/components/Counter.cy.js
 @@ -0,0 +1,10 @@
 +import { mount } from '@cypress/vue'
 +import Counter from './Counter.vue'

From 6aabcb4853cf4c804187c7f6b89005ef9b643766 Mon Sep 17 00:00:00 2001
From: Kevin Old <kevin@cypress.io>
Date: Thu, 17 Feb 2022 15:36:00 -0600
Subject: [PATCH 4/8] updates to setup-vue-cli-2/pr.md

---
 scripts/setup-vue-cli-2/pr.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/setup-vue-cli-2/pr.md b/scripts/setup-vue-cli-2/pr.md
index 2c915bb..64d65ec 100644
--- a/scripts/setup-vue-cli-2/pr.md
+++ b/scripts/setup-vue-cli-2/pr.md
@@ -8,12 +8,13 @@
    3. ${COMMIT_1}
 3. Add Cypress component testing support with sample tests
    1. ${COMMAND_2}
-   2. Add [cypress.json](cypress.json)
-   3. Add [cypress/plugins/index.js](cypress/plugins/index.js)
+   2. Add [cypress.config.js](cypress.config.js)
+   3. Add [cypress/component/index.html](cypress/component/index.html)
+   1. Add [cypress/support/component.js](cypress/support/component.js)
    1. Update [src/App.vue](src/App.vue) to reference new [src/components/Counter.vue](src/components/Counter.vue) component
-   1. Add [src/App.spec.ct.js](src/App.spec.ct.js), [src/components/HelloWorld.spec.ct.js](src/components/HelloWorld.spec.ct.js), [src/components/Counter.spec.ct.js](src/components/Counter.spec.ct.js) spec files
-   5. `npx cypress open-ct` (Notice that the fonts don't inherit global app styles)
-   6. Edit [cypress/support/index.js](cypress/support/index.js) to import global app styles, the Cypress test preview should update automatically
+   1. Add [src/App.cy.js](src/App.cy.js), [src/components/HelloWorld.cy.js](src/components/HelloWorld.cy.js), [src/components/Counter.cy.js](src/components/Counter.cy.js) spec files
+   5. `npx cypress open` (Notice that the fonts don't inherit global app styles)
+   6. Edit [cypress/support/component.js](cypress/support/component.js) to import global app styles, the Cypress test preview should update automatically
    7. ${COMMIT_2}
 4. Add Cypress Code Coverage
    1. ${COMMAND_3}

From b119cbb2a4079669fd25c6ebdf46894b2e1cf515 Mon Sep 17 00:00:00 2001
From: Kevin Old <kevin@cypress.io>
Date: Thu, 17 Feb 2022 16:54:02 -0600
Subject: [PATCH 5/8] updates patches and pr for code coverage

---
 scripts/setup-vue-cli-2.sh      |  8 ++--
 scripts/setup-vue-cli-2/3.patch | 80 ++++++++++++++++-----------------
 scripts/setup-vue-cli-2/pr.md   |  5 +--
 3 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/scripts/setup-vue-cli-2.sh b/scripts/setup-vue-cli-2.sh
index 4ada181..0dc56af 100755
--- a/scripts/setup-vue-cli-2.sh
+++ b/scripts/setup-vue-cli-2.sh
@@ -47,9 +47,9 @@ cmd yarn add -D https://cdn.cypress.io/beta/npm/10.0.0/linux-x64/circle-10.0-rel
 apply_patch
 commit_all "Add Cypress with example component and page tests"
 
-# step
-# cmd yarn add -D @cypress/code-coverage babel-plugin-istanbul
-# apply_patch
-# commit_all "Configure Cypress Code Coverage plugin"
+step
+cmd yarn add -D @cypress/code-coverage@3.10.0-dev.1 babel-plugin-istanbul
+apply_patch
+commit_all "Configure Cypress Code Coverage plugin"
 
 finalize
diff --git a/scripts/setup-vue-cli-2/3.patch b/scripts/setup-vue-cli-2/3.patch
index 737dde8..8d75b9d 100644
--- a/scripts/setup-vue-cli-2/3.patch
+++ b/scripts/setup-vue-cli-2/3.patch
@@ -20,7 +20,7 @@ index 0000000..3a40283
 +    "src/**/*.{js,vue}"
 +  ],
 +  "exclude": [
-+    "src/**/*.spec.ct.js"
++    "src/**/*.cy.js"
 +  ],
 +  "extension": [
 +    ".js",
@@ -51,44 +51,44 @@ index e955840..f4b8fdb 100644
 +  plugins
 +}
 \ No newline at end of file
-diff --git a/setup-vue-cli-2/cypress.json b/setup-vue-cli-2/cypress.json
-index ee59bec..622829d 100644
---- a/setup-vue-cli-2/cypress.json
-+++ b/setup-vue-cli-2/cypress.json
-@@ -1,4 +1,5 @@
- {
-+  "coverage": true,
-   "component": {
-     "testFiles": "**/*.spec.ct.{js,ts,jsx,tsx}",
-     "componentFolder": "src"
-diff --git a/setup-vue-cli-2/cypress/plugins/index.js b/setup-vue-cli-2/cypress/plugins/index.js
-index 3590bd9..9fa1b7a 100644
---- a/setup-vue-cli-2/cypress/plugins/index.js
-+++ b/setup-vue-cli-2/cypress/plugins/index.js
-@@ -1,5 +1,6 @@
- const { startDevServer } = require('@cypress/webpack-dev-server')
+diff --git a/setup-vue-cli-2/cypress.config.js b/setup-vue-cli-2/cypress.config.js
+index eabdc78..6c3dd60 100644
+--- a/setup-vue-cli-2/cypress.config.js
++++ b/setup-vue-cli-2/cypress.config.js
+@@ -1,11 +1,20 @@
+ const { defineConfig } = require('cypress')
+ const { devServer } = require('@cypress/webpack-dev-server')
  const webpackConfig = require('@vue/cli-service/webpack.config')
-+const codeCoverageTask = require('@cypress/code-coverage/task')
- 
- module.exports = (on, config) => {
-   on('dev-server:start', (options) => {
-@@ -8,5 +9,6 @@ module.exports = (on, config) => {
-       webpackConfig,
-     })
-   })
-+  codeCoverageTask(on, config)
-   return config
- }
-diff --git a/setup-vue-cli-2/cypress/support/index.js b/setup-vue-cli-2/cypress/support/index.js
-index 9b7843f..05cf3eb 100644
---- a/setup-vue-cli-2/cypress/support/index.js
-+++ b/setup-vue-cli-2/cypress/support/index.js
-@@ -13,6 +13,8 @@
- // https://on.cypress.io/configuration
- // ***********************************************************
- 
-+import '@cypress/code-coverage/support'
-+
- // Import commands.js using ES2015 syntax:
++const codeCoverageTask = require("@cypress/code-coverage/task")
+
+ module.exports = defineConfig({
++  coverage: true,
++  codeCoverage: {
++    exclude: "cypress/**/*.*",
++  },
+   // Component testing, JavaScript, Vue CLI, Webpack
+   component: {
+     devServer,
+-    devServerConfig: { webpackConfig }
++    devServerConfig: { webpackConfig },
++    setupNodeEvents(on, config) {
++      codeCoverageTask(on, config);
++      return config;
++    },
+   },
+ })
+\ No newline at end of file
+diff --git a/setup-vue-cli-2/cypress/support/component.js b/setup-vue-cli-2/cypress/support/component.js
+index 7e654cd..a5eff01 100644
+--- a/setup-vue-cli-2/cypress/support/component.js
++++ b/setup-vue-cli-2/cypress/support/component.js
+@@ -2,4 +2,6 @@
  import './commands'
- 
+
+ // Ensure global app styles are loaded:
+-import '../../src/main.css'
+\ No newline at end of file
++import '../../src/main.css'
++
++import '@cypress/code-coverage/support'
+\ No newline at end of file
diff --git a/scripts/setup-vue-cli-2/pr.md b/scripts/setup-vue-cli-2/pr.md
index 64d65ec..48a959f 100644
--- a/scripts/setup-vue-cli-2/pr.md
+++ b/scripts/setup-vue-cli-2/pr.md
@@ -18,9 +18,8 @@
    7. ${COMMIT_2}
 4. Add Cypress Code Coverage
    1. ${COMMAND_3}
-   2. Edit [cypress.json](cypress.json) to enable `coverage`
-   3. Edit [cypress/plugins/index.js](cypress/plugins/index.js) to configure the Cypress code coverage task with Istanbul
-   4. Edit [cypress/support/index.js](cypress/support/index.js) to import Cypress code coverage support
+   2. Edit [cypress.config.js](cypress.config.js) to enable `coverage` and configure the Cypress code coverage task with Istanbul
+   4. Edit [cypress/support/component.js](cypress/support/component.js) to import Cypress code coverage support
    5. Update [babel.config.js](babel.config.js) to conditionally use `babel-plugin-istanbul` when Cypress Component tests are running
    6. Add [.nycrc](.nycrc) to configure istanbul
    7. Edit [.gitignore](.gitignore) to ignore coverage and .nyc_output directories

From cd0c0b2191849d29121a7a1d549667c23b2c8c89 Mon Sep 17 00:00:00 2001
From: Kevin Old <kevin@cypress.io>
Date: Thu, 17 Feb 2022 17:04:41 -0600
Subject: [PATCH 6/8] rename vue-cli-3 script, folder and patches to
 setup-vue-cli-3

---
 scripts/{vue-cli-3.sh => setup-vue-cli-3.sh}  |  0
 .../{vue-cli-3 => setup-vue-cli-3}/1.patch    | 16 ++++-----
 .../{vue-cli-3 => setup-vue-cli-3}/2.patch    | 28 +++++++--------
 .../{vue-cli-3 => setup-vue-cli-3}/3.patch    | 34 +++++++++----------
 scripts/{vue-cli-3 => setup-vue-cli-3}/pr.md  |  0
 5 files changed, 39 insertions(+), 39 deletions(-)
 rename scripts/{vue-cli-3.sh => setup-vue-cli-3.sh} (100%)
 rename scripts/{vue-cli-3 => setup-vue-cli-3}/1.patch (64%)
 rename scripts/{vue-cli-3 => setup-vue-cli-3}/2.patch (86%)
 rename scripts/{vue-cli-3 => setup-vue-cli-3}/3.patch (63%)
 rename scripts/{vue-cli-3 => setup-vue-cli-3}/pr.md (100%)

diff --git a/scripts/vue-cli-3.sh b/scripts/setup-vue-cli-3.sh
similarity index 100%
rename from scripts/vue-cli-3.sh
rename to scripts/setup-vue-cli-3.sh
diff --git a/scripts/vue-cli-3/1.patch b/scripts/setup-vue-cli-3/1.patch
similarity index 64%
rename from scripts/vue-cli-3/1.patch
rename to scripts/setup-vue-cli-3/1.patch
index 686bbf4..8004fe2 100644
--- a/scripts/vue-cli-3/1.patch
+++ b/scripts/setup-vue-cli-3/1.patch
@@ -1,7 +1,7 @@
-diff --git a/vue-cli-2/src/App.vue b/vue-cli-2/src/App.vue
+diff --git a/setup-vue-cli-3/src/App.vue b/setup-vue-cli-3/src/App.vue
 index 55df315..b9ac61a 100644
---- a/vue-cli-2/src/App.vue
-+++ b/vue-cli-2/src/App.vue
+--- a/setup-vue-cli-3/src/App.vue
++++ b/setup-vue-cli-3/src/App.vue
 @@ -18,11 +18,6 @@ export default {
  
  <style>
@@ -14,11 +14,11 @@ index 55df315..b9ac61a 100644
    margin-top: 60px;
  }
  </style>
-diff --git a/vue-cli-2/src/main.css b/vue-cli-2/src/main.css
+diff --git a/setup-vue-cli-3/src/main.css b/setup-vue-cli-3/src/main.css
 new file mode 100644
 index 0000000..110b5e1
 --- /dev/null
-+++ b/vue-cli-2/src/main.css
++++ b/setup-vue-cli-3/src/main.css
 @@ -0,0 +1,7 @@
 +body {
 +  font-family: Avenir, Helvetica, Arial, sans-serif;
@@ -27,10 +27,10 @@ index 0000000..110b5e1
 +  text-align: center;
 +  color: #2c3e50;
 +}
-diff --git a/vue-cli-2/src/main.js b/vue-cli-2/src/main.js
+diff --git a/setup-vue-cli-3/src/main.js b/setup-vue-cli-3/src/main.js
 index 63eb05f..1d9028a 100644
---- a/vue-cli-2/src/main.js
-+++ b/vue-cli-2/src/main.js
+--- a/setup-vue-cli-3/src/main.js
++++ b/setup-vue-cli-3/src/main.js
 @@ -1,5 +1,6 @@
  import Vue from 'vue'
  import App from './App.vue'
diff --git a/scripts/vue-cli-3/2.patch b/scripts/setup-vue-cli-3/2.patch
similarity index 86%
rename from scripts/vue-cli-3/2.patch
rename to scripts/setup-vue-cli-3/2.patch
index 5f44841..2e29b76 100644
--- a/scripts/vue-cli-3/2.patch
+++ b/scripts/setup-vue-cli-3/2.patch
@@ -1,8 +1,8 @@
-diff --git a/vue-cli-2/cypress.json b/vue-cli-2/cypress.json
+diff --git a/setup-vue-cli-3/cypress.json b/setup-vue-cli-3/cypress.json
 new file mode 100644
 index 0000000..a57b21f
 --- /dev/null
-+++ b/vue-cli-2/cypress.json
++++ b/setup-vue-cli-3/cypress.json
 @@ -0,0 +1,6 @@
 +{
 +  "component": {
@@ -10,22 +10,22 @@ index 0000000..a57b21f
 +    "componentFolder": "src"
 +  }
 +}
-diff --git a/vue-cli-2/cypress/fixtures/example.json b/vue-cli-2/cypress/fixtures/example.json
+diff --git a/setup-vue-cli-3/cypress/fixtures/example.json b/setup-vue-cli-3/cypress/fixtures/example.json
 new file mode 100644
 index 0000000..02e4254
 --- /dev/null
-+++ b/vue-cli-2/cypress/fixtures/example.json
++++ b/setup-vue-cli-3/cypress/fixtures/example.json
 @@ -0,0 +1,5 @@
 +{
 +  "name": "Using fixtures to represent data",
 +  "email": "hello@cypress.io",
 +  "body": "Fixtures are a great way to mock data for responses to routes"
 +}
-diff --git a/vue-cli-2/cypress/plugins/index.js b/vue-cli-2/cypress/plugins/index.js
+diff --git a/setup-vue-cli-3/cypress/plugins/index.js b/setup-vue-cli-3/cypress/plugins/index.js
 new file mode 100644
 index 0000000..3590bd9
 --- /dev/null
-+++ b/vue-cli-2/cypress/plugins/index.js
++++ b/setup-vue-cli-3/cypress/plugins/index.js
 @@ -0,0 +1,12 @@
 +const { startDevServer } = require('@cypress/webpack-dev-server')
 +const webpackConfig = require('@vue/cli-service/webpack.config')
@@ -39,11 +39,11 @@ index 0000000..3590bd9
 +  })
 +  return config
 +}
-diff --git a/vue-cli-2/cypress/support/commands.js b/vue-cli-2/cypress/support/commands.js
+diff --git a/setup-vue-cli-3/cypress/support/commands.js b/setup-vue-cli-3/cypress/support/commands.js
 new file mode 100644
 index 0000000..119ab03
 --- /dev/null
-+++ b/vue-cli-2/cypress/support/commands.js
++++ b/setup-vue-cli-3/cypress/support/commands.js
 @@ -0,0 +1,25 @@
 +// ***********************************************
 +// This example commands.js shows you how to
@@ -70,11 +70,11 @@ index 0000000..119ab03
 +//
 +// -- This will overwrite an existing command --
 +// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-diff --git a/vue-cli-2/cypress/support/index.js b/vue-cli-2/cypress/support/index.js
+diff --git a/setup-vue-cli-3/cypress/support/index.js b/setup-vue-cli-3/cypress/support/index.js
 new file mode 100644
 index 0000000..9b7843f
 --- /dev/null
-+++ b/vue-cli-2/cypress/support/index.js
++++ b/setup-vue-cli-3/cypress/support/index.js
 @@ -0,0 +1,23 @@
 +// ***********************************************************
 +// This example support/index.js is processed and
@@ -99,11 +99,11 @@ index 0000000..9b7843f
 +
 +// Ensure global app styles are loaded:
 +import '../../src/main.css'
-diff --git a/vue-cli-2/src/App.spec.ct.js b/vue-cli-2/src/App.spec.ct.js
+diff --git a/setup-vue-cli-3/src/App.spec.ct.js b/setup-vue-cli-3/src/App.spec.ct.js
 new file mode 100644
 index 0000000..4a912ba
 --- /dev/null
-+++ b/vue-cli-2/src/App.spec.ct.js
++++ b/setup-vue-cli-3/src/App.spec.ct.js
 @@ -0,0 +1,11 @@
 +import { mount } from '@cypress/vue'
 +import App from './App.vue'
@@ -116,11 +116,11 @@ index 0000000..4a912ba
 +  cy.get('[data-test=count]').should("have.text", "Total clicks: 1")
 +  cy.get('button').click()
 +})
-diff --git a/vue-cli-2/src/components/HelloWorld.spec.ct.js b/vue-cli-2/src/components/HelloWorld.spec.ct.js
+diff --git a/setup-vue-cli-3/src/components/HelloWorld.spec.ct.js b/setup-vue-cli-3/src/components/HelloWorld.spec.ct.js
 new file mode 100644
 index 0000000..bbbb6c3
 --- /dev/null
-+++ b/vue-cli-2/src/components/HelloWorld.spec.ct.js
++++ b/setup-vue-cli-3/src/components/HelloWorld.spec.ct.js
 @@ -0,0 +1,11 @@
 +import { mount } from '@cypress/vue'
 +import HelloWorld from './HelloWorld.vue'
diff --git a/scripts/vue-cli-3/3.patch b/scripts/setup-vue-cli-3/3.patch
similarity index 63%
rename from scripts/vue-cli-3/3.patch
rename to scripts/setup-vue-cli-3/3.patch
index 49c6c5c..0379bb3 100644
--- a/scripts/vue-cli-3/3.patch
+++ b/scripts/setup-vue-cli-3/3.patch
@@ -1,7 +1,7 @@
-diff --git a/vue-cli-3/.gitignore b/vue-cli-3/.gitignore
+diff --git a/setup-vue-cli-3/.gitignore b/setup-vue-cli-3/.gitignore
 index 403adbc..f6061b7 100644
---- a/vue-cli-3/.gitignore
-+++ b/vue-cli-3/.gitignore
+--- a/setup-vue-cli-3/.gitignore
++++ b/setup-vue-cli-3/.gitignore
 @@ -2,6 +2,8 @@
  node_modules
  /dist
@@ -11,11 +11,11 @@ index 403adbc..f6061b7 100644
  
  # local env files
  .env.local
-diff --git a/vue-cli-3/.nycrc b/vue-cli-3/.nycrc
+diff --git a/setup-vue-cli-3/.nycrc b/setup-vue-cli-3/.nycrc
 new file mode 100644
 index 0000000..3a40283
 --- /dev/null
-+++ b/vue-cli-3/.nycrc
++++ b/setup-vue-cli-3/.nycrc
 @@ -0,0 +1,13 @@
 +{
 +  "include": [
@@ -31,10 +31,10 @@ index 0000000..3a40283
 +  "all": true
 +}
 \ No newline at end of file
-diff --git a/vue-cli-3/babel.config.js b/vue-cli-3/babel.config.js
+diff --git a/setup-vue-cli-3/babel.config.js b/setup-vue-cli-3/babel.config.js
 index e955840..9f7fe23 100644
---- a/vue-cli-3/babel.config.js
-+++ b/vue-cli-3/babel.config.js
+--- a/setup-vue-cli-3/babel.config.js
++++ b/setup-vue-cli-3/babel.config.js
 @@ -1,5 +1,12 @@
 +const plugins = []
 +
@@ -51,20 +51,20 @@ index e955840..9f7fe23 100644
 +  plugins
 +}
 \ No newline at end of file
-diff --git a/vue-cli-3/cypress.json b/vue-cli-3/cypress.json
+diff --git a/setup-vue-cli-3/cypress.json b/setup-vue-cli-3/cypress.json
 index ee59bec..622829d 100644
---- a/vue-cli-3/cypress.json
-+++ b/vue-cli-3/cypress.json
+--- a/setup-vue-cli-3/cypress.json
++++ b/setup-vue-cli-3/cypress.json
 @@ -1,4 +1,5 @@
  {
 +  "coverage": true,
    "component": {
      "testFiles": "**/*.spec.ct.{js,ts,jsx,tsx}",
      "componentFolder": "src"
-diff --git a/vue-cli-3/cypress/plugins/index.js b/vue-cli-3/cypress/plugins/index.js
+diff --git a/setup-vue-cli-3/cypress/plugins/index.js b/setup-vue-cli-3/cypress/plugins/index.js
 index 3590bd9..1f08a26 100644
---- a/vue-cli-3/cypress/plugins/index.js
-+++ b/vue-cli-3/cypress/plugins/index.js
+--- a/setup-vue-cli-3/cypress/plugins/index.js
++++ b/setup-vue-cli-3/cypress/plugins/index.js
 @@ -1,5 +1,6 @@
  const { startDevServer } = require('@cypress/webpack-dev-server')
  const webpackConfig = require('@vue/cli-service/webpack.config')
@@ -80,10 +80,10 @@ index 3590bd9..1f08a26 100644
 +  codeCoverageTask(on, config)
    return config
  }
-diff --git a/vue-cli-3/cypress/support/index.js b/vue-cli-3/cypress/support/index.js
+diff --git a/setup-vue-cli-3/cypress/support/index.js b/setup-vue-cli-3/cypress/support/index.js
 index 9b7843f..05cf3eb 100644
---- a/vue-cli-3/cypress/support/index.js
-+++ b/vue-cli-3/cypress/support/index.js
+--- a/setup-vue-cli-3/cypress/support/index.js
++++ b/setup-vue-cli-3/cypress/support/index.js
 @@ -13,6 +13,8 @@
  // https://on.cypress.io/configuration
  // ***********************************************************
diff --git a/scripts/vue-cli-3/pr.md b/scripts/setup-vue-cli-3/pr.md
similarity index 100%
rename from scripts/vue-cli-3/pr.md
rename to scripts/setup-vue-cli-3/pr.md

From bcfb8119d19d0db5d38c2b7c8e60a448300cb1d0 Mon Sep 17 00:00:00 2001
From: Kevin Old <kevin@cypress.io>
Date: Fri, 18 Feb 2022 09:28:38 -0600
Subject: [PATCH 7/8] update setup-vue-cli-3 pr and 2.patch with v10 config

---
 scripts/setup-vue-cli-3/2.patch | 102 +++++++++++++++-----------------
 scripts/setup-vue-cli-3/pr.md   |  12 ++--
 2 files changed, 53 insertions(+), 61 deletions(-)

diff --git a/scripts/setup-vue-cli-3/2.patch b/scripts/setup-vue-cli-3/2.patch
index 2e29b76..30ef758 100644
--- a/scripts/setup-vue-cli-3/2.patch
+++ b/scripts/setup-vue-cli-3/2.patch
@@ -1,15 +1,21 @@
-diff --git a/setup-vue-cli-3/cypress.json b/setup-vue-cli-3/cypress.json
+diff --git a/setup-vue-cli-3/cypress.config.js b/setup-vue-cli-3/cypress.config.js
 new file mode 100644
-index 0000000..a57b21f
+index 0000000..eabdc78
 --- /dev/null
-+++ b/setup-vue-cli-3/cypress.json
-@@ -0,0 +1,6 @@
-+{
-+  "component": {
-+    "testFiles": "**/*.spec.ct.{js,ts,jsx,tsx}",
-+    "componentFolder": "src"
-+  }
-+}
++++ b/setup-vue-cli-3/cypress.config.js
+@@ -0,0 +1,11 @@
++const { defineConfig } = require('cypress')
++const { devServer } = require('@cypress/webpack-dev-server')
++const webpackConfig = require('@vue/cli-service/webpack.config')
++
++module.exports = defineConfig({
++  // Component testing, JavaScript, Vue CLI, Webpack
++  component: {
++    devServer,
++    devServerConfig: { webpackConfig }
++  },
++})
+\ No newline at end of file
 diff --git a/setup-vue-cli-3/cypress/fixtures/example.json b/setup-vue-cli-3/cypress/fixtures/example.json
 new file mode 100644
 index 0000000..02e4254
@@ -21,24 +27,27 @@ index 0000000..02e4254
 +  "email": "hello@cypress.io",
 +  "body": "Fixtures are a great way to mock data for responses to routes"
 +}
-diff --git a/setup-vue-cli-3/cypress/plugins/index.js b/setup-vue-cli-3/cypress/plugins/index.js
+diff --git a/setup-vue-cli-3/cypress/component/index.html b/setup-vue-cli-3/cypress/component/index.html
 new file mode 100644
-index 0000000..3590bd9
+index 0000000..410b588
 --- /dev/null
-+++ b/setup-vue-cli-3/cypress/plugins/index.js
-@@ -0,0 +1,12 @@
-+const { startDevServer } = require('@cypress/webpack-dev-server')
-+const webpackConfig = require('@vue/cli-service/webpack.config')
++++ b/setup-vue-cli-3/cypress/component/index.html
+@@ -0,0 +1,14 @@
++<!DOCTYPE html>
++<html>
++  <head>
++    <meta charset="utf-8">
++    <meta http-equiv="X-UA-Compatible" content="IE=edge">
++    <meta name="viewport" content="width=device-width,initial-scale=1.0">
++    <title>Components App</title>
 +
-+module.exports = (on, config) => {
-+  on('dev-server:start', (options) => {
-+    return startDevServer({
-+      options,
-+      webpackConfig,
-+    })
-+  })
-+  return config
-+}
++  </head>
++  <body>
++
++    <div id="__cy_root"></div>
++  </body>
++</html>
+\ No newline at end of file
 diff --git a/setup-vue-cli-3/cypress/support/commands.js b/setup-vue-cli-3/cypress/support/commands.js
 new file mode 100644
 index 0000000..119ab03
@@ -70,40 +79,23 @@ index 0000000..119ab03
 +//
 +// -- This will overwrite an existing command --
 +// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-diff --git a/setup-vue-cli-3/cypress/support/index.js b/setup-vue-cli-3/cypress/support/index.js
+diff --git a/setup-vue-cli-2/cypress/support/component.js b/setup-vue-cli-2/cypress/support/component.js
 new file mode 100644
-index 0000000..9b7843f
+index 0000000..7e654cd
 --- /dev/null
-+++ b/setup-vue-cli-3/cypress/support/index.js
-@@ -0,0 +1,23 @@
-+// ***********************************************************
-+// This example support/index.js is processed and
-+// loaded automatically before your test files.
-+//
-+// This is a great place to put global configuration and
-+// behavior that modifies Cypress.
-+//
-+// You can change the location of this file or turn off
-+// automatically serving support files with the
-+// 'supportFile' configuration option.
-+//
-+// You can read more here:
-+// https://on.cypress.io/configuration
-+// ***********************************************************
-+
++++ b/setup-vue-cli-2/cypress/support/component.js
+@@ -0,0 +1,5 @@
 +// Import commands.js using ES2015 syntax:
 +import './commands'
 +
-+// Alternatively you can use CommonJS syntax:
-+// require('./commands')
-+
 +// Ensure global app styles are loaded:
 +import '../../src/main.css'
-diff --git a/setup-vue-cli-3/src/App.spec.ct.js b/setup-vue-cli-3/src/App.spec.ct.js
+\ No newline at end of file
+diff --git a/setup-vue-cli-3/src/App.cy.js b/setup-vue-cli-3/src/App.cy.js
 new file mode 100644
 index 0000000..4a912ba
 --- /dev/null
-+++ b/setup-vue-cli-3/src/App.spec.ct.js
++++ b/setup-vue-cli-3/src/App.cy.js
 @@ -0,0 +1,11 @@
 +import { mount } from '@cypress/vue'
 +import App from './App.vue'
@@ -116,11 +108,11 @@ index 0000000..4a912ba
 +  cy.get('[data-test=count]').should("have.text", "Total clicks: 1")
 +  cy.get('button').click()
 +})
-diff --git a/setup-vue-cli-3/src/components/HelloWorld.spec.ct.js b/setup-vue-cli-3/src/components/HelloWorld.spec.ct.js
+diff --git a/setup-vue-cli-3/src/components/HelloWorld.cy.js b/setup-vue-cli-3/src/components/HelloWorld.cy.js
 new file mode 100644
 index 0000000..bbbb6c3
 --- /dev/null
-+++ b/setup-vue-cli-3/src/components/HelloWorld.spec.ct.js
++++ b/setup-vue-cli-3/src/components/HelloWorld.cy.js
 @@ -0,0 +1,11 @@
 +import { mount } from '@cypress/vue'
 +import HelloWorld from './HelloWorld.vue'
@@ -188,11 +180,11 @@ index 0000000..5eb6269
 +}
 +</script>
 \ No newline at end of file
-diff --git a/vue-cli-3/src/components/Counter.spec.ct.js b/vue-cli-3/src/components/Counter.spec.ct.js
+diff --git a/vue-cli-3/src/components/Counter.cy.js b/vue-cli-3/src/components/Counter.cy.js
 new file mode 100644
 index 0000000..afd7e21
 --- /dev/null
-+++ b/vue-cli-3/src/components/Counter.spec.ct.js
++++ b/vue-cli-3/src/components/Counter.cy.js
 @@ -0,0 +1,10 @@
 +import { mount } from '@cypress/vue'
 +import Counter from './Counter.vue'
@@ -204,11 +196,11 @@ index 0000000..afd7e21
 +  cy.get('button').click()
 +  cy.get('[data-test=count]').should("have.text", "Total clicks: 2")
 +})
-diff --git a/vue-cli-3/src/components/CounterCompositionApi.spec.ct.js b/vue-cli-3/src/components/CounterCompositionApi.spec.ct.js
+diff --git a/vue-cli-3/src/components/CounterCompositionApi.cy.js b/vue-cli-3/src/components/CounterCompositionApi.cy.js
 new file mode 100644
 index 0000000..afd7e21
 --- /dev/null
-+++ b/vue-cli-3/src/components/CounterCompositionApi.spec.ct.js
++++ b/vue-cli-3/src/components/CounterCompositionApi.cy.js
 @@ -0,0 +1,10 @@
 +import { mount } from '@cypress/vue'
 +import CounterCompositionApi from './CounterCompositionApi.vue'
diff --git a/scripts/setup-vue-cli-3/pr.md b/scripts/setup-vue-cli-3/pr.md
index 218b7a0..f8dc9ad 100644
--- a/scripts/setup-vue-cli-3/pr.md
+++ b/scripts/setup-vue-cli-3/pr.md
@@ -8,13 +8,13 @@
    3. ${COMMIT_1}
 3. Add Cypress component testing support with sample tests
    1. ${COMMAND_2}
-   2. Add [cypress.json](cypress.json)
-   3. Add [cypress/plugins/index.js](cypress/plugins/index.js)
+   2. Add [cypress.config.js](cypress.config.js)
+   3. Add [cypress/component/index.html](cypress/component/index.html)
    1. Update [src/App.vue](src/App.vue) to reference new [src/components/Counter.vue](src/components/Counter.vue) component
-   1. Add [src/App.spec.ct.js](src/App.spec.ct.js), [src/components/HelloWorld.spec.ct.js](src/components/HelloWorld.spec.ct.js), [src/components/Counter.spec.ct.js](src/components/Counter.spec.ct.js) spec files
-   5. Add [src/CounterCompositionApi.vue](src/components/CounterCompositionApi.vue), a Composition API component with tests in [src/components/CounterCompositionApi.spec.ct.js](src/components/CounterCompositionApi.spec.ct.js)
-   6. `npx cypress open-ct` (Notice that the fonts don't inherit global app styles)
-   7. Edit [cypress/support/index.js](cypress/support/index.js) to import global app styles, the Cypress test preview should update automatically
+   1. Add [src/App.cy.js](src/App.cy.js), [src/components/HelloWorld.cy.js](src/components/HelloWorld.cy.js), [src/components/Counter.cy.js](src/components/Counter.cy.js) spec files
+   5. Add [src/CounterCompositionApi.vue](src/components/CounterCompositionApi.vue), a Composition API component with tests in [src/components/CounterCompositionApi.cy.js](src/components/CounterCompositionApi.cy.js)
+   6. `npx cypress open` (Notice that the fonts don't inherit global app styles)
+   7. Edit [cypress/support/component.js](cypress/support/component.js) to import global app styles, the Cypress test preview should update automatically
    8. ${COMMIT_2}
 4. Add Cypress Code Coverage
    1. ${COMMAND_3}

From 86438e913298ddb396bd850b74f42e7ae39866a7 Mon Sep 17 00:00:00 2001
From: Kevin Old <kevin@cypress.io>
Date: Tue, 22 Feb 2022 11:36:28 -0600
Subject: [PATCH 8/8] update patches and script for v10 with code coverage

---
 scripts/setup-vue-cli-3.sh      |  4 +-
 scripts/setup-vue-cli-3/3.patch | 76 ++++++++++++++++-----------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/scripts/setup-vue-cli-3.sh b/scripts/setup-vue-cli-3.sh
index 067139f..d6460c2 100755
--- a/scripts/setup-vue-cli-3.sh
+++ b/scripts/setup-vue-cli-3.sh
@@ -43,12 +43,12 @@ apply_patch
 commit_all "Update app to move global styles into main.css file"
 
 step
-cmd yarn add -D cypress @cypress/vue@3 @cypress/webpack-dev-server webpack-dev-server
+cmd yarn add -D https://cdn.cypress.io/beta/npm/10.0.0/linux-x64/circle-10.0-release-e7718f7489276cac2e8ad71bc57a627eb0135fbd/cypress.tgz @cypress/vue@3 @cypress/webpack-dev-server webpack-dev-server
 apply_patch
 commit_all "Add Cypress with example components and page tests"
 
 step
-cmd yarn add -D @cypress/code-coverage babel-plugin-istanbul
+cmd yarn add -D @cypress/code-coverage@3.10.0-dev.1 babel-plugin-istanbul
 apply_patch
 commit_all "Configure Cypress Code Coverage plugin"
 
diff --git a/scripts/setup-vue-cli-3/3.patch b/scripts/setup-vue-cli-3/3.patch
index 0379bb3..eec9fd2 100644
--- a/scripts/setup-vue-cli-3/3.patch
+++ b/scripts/setup-vue-cli-3/3.patch
@@ -51,44 +51,44 @@ index e955840..9f7fe23 100644
 +  plugins
 +}
 \ No newline at end of file
-diff --git a/setup-vue-cli-3/cypress.json b/setup-vue-cli-3/cypress.json
-index ee59bec..622829d 100644
---- a/setup-vue-cli-3/cypress.json
-+++ b/setup-vue-cli-3/cypress.json
-@@ -1,4 +1,5 @@
- {
-+  "coverage": true,
-   "component": {
-     "testFiles": "**/*.spec.ct.{js,ts,jsx,tsx}",
-     "componentFolder": "src"
-diff --git a/setup-vue-cli-3/cypress/plugins/index.js b/setup-vue-cli-3/cypress/plugins/index.js
-index 3590bd9..1f08a26 100644
---- a/setup-vue-cli-3/cypress/plugins/index.js
-+++ b/setup-vue-cli-3/cypress/plugins/index.js
-@@ -1,5 +1,6 @@
- const { startDevServer } = require('@cypress/webpack-dev-server')
+diff --git a/setup-vue-cli-3/cypress.config.js b/setup-vue-cli-3/cypress.config.js
+index eabdc78..6c3dd60 100644
+--- a/setup-vue-cli-3/cypress.config.js
++++ b/setup-vue-cli-3/cypress.config.js
+@@ -1,11 +1,20 @@
+ const { defineConfig } = require('cypress')
+ const { devServer } = require('@cypress/webpack-dev-server')
  const webpackConfig = require('@vue/cli-service/webpack.config')
-+const codeCoverageTask = require('@cypress/code-coverage/task')
- 
- module.exports = (on, config) => {
-   on('dev-server:start', (options) => {
-@@ -8,5 +9,7 @@ module.exports = (on, config) => {
-       webpackConfig,
-     })
-   })
++const codeCoverageTask = require("@cypress/code-coverage/task")
+
+ module.exports = defineConfig({
++  coverage: true,
++  codeCoverage: {
++    exclude: "cypress/**/*.*",
++  },
+   // Component testing, JavaScript, Vue CLI, Webpack
+   component: {
+     devServer,
+-    devServerConfig: { webpackConfig }
++    devServerConfig: { webpackConfig },
++    setupNodeEvents(on, config) {
++      codeCoverageTask(on, config);
++      return config;
++    },
+   },
+ })
+\ No newline at end of file
+diff --git a/setup-vue-cli-3/cypress/support/component.js b/setup-vue-cli-3/cypress/support/component.js
+index 7e654cd..a5eff01 100644
+--- a/setup-vue-cli-3/cypress/support/component.js
++++ b/setup-vue-cli-3/cypress/support/component.js
+@@ -2,4 +2,6 @@
+ import './commands'
+
+ // Ensure global app styles are loaded:
+-import '../../src/main.css'
+\ No newline at end of file
++import '../../src/main.css'
 +
-+  codeCoverageTask(on, config)
-   return config
- }
-diff --git a/setup-vue-cli-3/cypress/support/index.js b/setup-vue-cli-3/cypress/support/index.js
-index 9b7843f..05cf3eb 100644
---- a/setup-vue-cli-3/cypress/support/index.js
-+++ b/setup-vue-cli-3/cypress/support/index.js
-@@ -13,6 +13,8 @@
- // https://on.cypress.io/configuration
- // ***********************************************************
- 
 +import '@cypress/code-coverage/support'
-+
- // Import commands.js using ES2015 syntax:
- import './commands'
+\ No newline at end of file