Merge branch 'develop' into marktnoonan/script-error-height

Author: marktnoonan

.vscode/cspell.json

@@ -7,6 +7,7 @@
         "Chainable",
         "composables",
         "ERRORED",
+        "execa",
         "forcedefault",
         "Iconify",
         "Lachlan",

graphql-codegen.yml

@@ -103,7 +103,7 @@ generates:
     <<: *vueOperations
 
   './packages/frontend-shared/src/generated/graphql.ts':
-    documents: './packages/frontend-shared/src/gql-components/**/*.{vue,ts,tsx,js,jsx}'
+    documents: './packages/frontend-shared/src/{gql-components,graphql}/**/*.{vue,ts,tsx,js,jsx}'
     <<: *vueOperations
   ###
   # All GraphQL documents imported into the .spec.tsx files for component testing.

npm/create-cypress-tests/package.json

@@ -2,7 +2,7 @@
   "name": "create-cypress-tests",
   "version": "0.0.0-development",
   "description": "Cypress smart installation wizard",
-  "private": false,
+  "private": true,
   "main": "dist/src/main.js",
   "scripts": {
     "build": "yarn prepare-example && tsc -p ./tsconfig.json && node scripts/example copy-to ./dist/initial-template && yarn prepare-copy-templates",

npm/cypress-schematic/package.json

@@ -2,7 +2,7 @@
   "name": "@cypress/schematic",
   "version": "0.0.0-development",
   "description": "Official Cypress schematic for the Angular CLI",
-  "private": false,
+  "private": true,
   "main": "./src",
   "scripts": {
     "build": "tsc -p tsconfig.json",

npm/mount-utils/package.json

@@ -2,6 +2,7 @@
   "name": "@cypress/mount-utils",
   "version": "0.0.0-development",
   "description": "Shared utilities for the various component testing adapters",
+  "private": true,
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc || echo 'built, with type errors'",

npm/react/package.json

@@ -2,6 +2,7 @@
   "name": "@cypress/react",
   "version": "0.0.0-development",
   "description": "Test React components using Cypress",
+  "private": true,
   "main": "dist/cypress-react.cjs.js",
   "scripts": {
     "build": "rimraf dist && rollup -c rollup.config.js",

npm/vue/package.json

@@ -2,6 +2,7 @@
   "name": "@cypress/vue",
   "version": "0.0.0-development",
   "description": "Browser-based Component Testing for Vue.js with Cypress.io ✌️🌲",
+  "private": true,
   "main": "dist/cypress-vue.cjs.js",
   "scripts": {
     "build-prod": "yarn build",

npm/vue2/package.json

@@ -2,6 +2,7 @@
   "name": "@cypress/vue2",
   "version": "0.0.0-development",
   "description": "Browser-based Component Testing for Vue.js@2 with Cypress.io ✌️🌲",
+  "private": true,
   "main": "dist/cypress-vue2.cjs.js",
   "scripts": {
     "typecheck": "tsc --noEmit",

packages/app/cypress.config.ts

@@ -1,6 +1,6 @@
 import { defineConfig } from 'cypress'
 import getenv from 'getenv'
-import { initGitRepoForTestProject } from './cypress/tasks/git'
+import { initGitRepoForTestProject, resetGitRepoForTestProject } from './cypress/tasks/git'
 
 const CYPRESS_INTERNAL_CLOUD_ENV = getenv('CYPRESS_INTERNAL_CLOUD_ENV', process.env.CYPRESS_INTERNAL_ENV || 'development')
 
@@ -55,6 +55,7 @@ export default defineConfig({
 
       on('task', {
         initGitRepoForTestProject,
+        resetGitRepoForTestProject,
       })
 
       return await e2ePluginSetup(on, config)

packages/app/cypress/e2e/cypress-in-cypress-component.cy.ts

@@ -126,7 +126,7 @@ describe('Cypress In Cypress CT', { viewportWidth: 1500, defaultCommandTimeout:
       cy.get('[data-model-state="passed"]').should('contain', 'renders the test component')
 
       cy.withCtx((ctx, o) => {
-        o.sinon.stub(ctx.actions.app, 'setActiveBrowserById')
+        o.sinon.stub(ctx.actions.browser, 'setActiveBrowserById')
         o.sinon.stub(ctx.actions.project, 'launchProject').resolves()
       })
 
@@ -137,10 +137,10 @@ describe('Cypress In Cypress CT', { viewportWidth: 1500, defaultCommandTimeout:
       .click()
 
       cy.withCtx((ctx, o) => {
-        const browserId = (ctx.actions.app.setActiveBrowserById as SinonStub).args[0][0]
+        const browserId = (ctx.actions.browser.setActiveBrowserById as SinonStub).args[0][0]
         const genId = ctx.fromId(browserId, 'Browser')
 
-        expect(ctx.actions.app.setActiveBrowserById).to.have.been.calledWith(browserId)
+        expect(ctx.actions.browser.setActiveBrowserById).to.have.been.calledWith(browserId)
         expect(genId).to.eql('firefox-firefox-stable')
         expect(ctx.actions.project.launchProject).to.have.been.calledWith(
           ctx.coreData.currentTestingType, {}, o.sinon.match(new RegExp('cypress\-in\-cypress\/src\/TestComponent\.spec\.jsx$')),