Merge remote-tracking branch 'origin/develop' into retry-flake

npm/grep/cypress/e2e/unit.js

@@ -158,7 +158,7 @@ describe('utils', () => {
       ])
     })
 
-    // FIXME: would need to change the tokenizer
+    // TODO: would need to change the tokenizer
     it.skip('parses tag1 but not tag2', () => {
       const parsed = parseTagsGrep('@tag1-@tag2')
 

npm/webpack-preprocessor/package.json

@@ -21,7 +21,10 @@
     "lint": "eslint --ext .js,.jsx,.ts,.tsx,.json, ."
   },
   "dependencies": {
-    "@babel/parser": "7.13.0",
+    "@babel/core": "^7.0.1",
+    "@babel/generator": "^7.17.9",
+    "@babel/parser": "^7.13.0",
+    "@babel/traverse": "^7.17.9",
     "bluebird": "3.7.1",
     "debug": "^4.3.2",
     "fs-extra": "^10.1.0",
@@ -32,7 +35,6 @@
     "webpack-virtual-modules": "^0.4.4"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.1",
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.8.3",
     "@babel/preset-env": "^7.0.0",
     "@fellow/eslint-plugin-coffee": "0.4.13",

packages/app/cypress/e2e/runner/ct-framework-errors.cy.ts

@@ -265,8 +265,8 @@ describe('Vue', {
         'Timed out retrying',
         'element-that-does-not-exist',
       ],
-      codeFrameRegex: /Errors\.cy\.js:26/,
-      stackRegex: /Errors\.cy\.js:26/,
+      codeFrameRegex: /Errors\.cy\.js:25/,
+      stackRegex: /Errors\.cy\.js:25/,
     })
   })
 })

system-tests/project-fixtures/.eslintrc.json

@@ -0,0 +1,11 @@
+{
+  "plugins": [
+    "cypress"
+  ],
+  "env": {
+    "cypress/globals": true
+  },
+  "rules": {
+    "mocha/no-global-tests": "off"
+  }
+}

system-tests/project-fixtures/cra/src/App.js

@@ -1,7 +1,7 @@
-import logo from './logo.svg';
-import './App.css';
+import logo from './logo.svg'
+import './App.css'
 
-function App() {
+function App () {
   return (
     <div className="App">
       <header className="App-header">
@@ -19,7 +19,7 @@ function App() {
         </a>
       </header>
     </div>
-  );
+  )
 }
 
-export default App;
+export default App

system-tests/project-fixtures/cra/src/index.js

@@ -1,11 +1,11 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import './index.css';
-import App from './App';
+import React from 'react'
+import ReactDOM from 'react-dom'
+import './index.css'
+import App from './App'
 
 ReactDOM.render(
   <React.StrictMode>
     <App />
   </React.StrictMode>,
-  document.getElementById('root')
-);
+  document.getElementById('root'),
+)

system-tests/project-fixtures/next/cypress.config.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('path')
 
 module.exports = {
   component: {
@@ -10,12 +10,12 @@ module.exports = {
         resolve: {
           alias: {
             'react': path.resolve(__dirname, './node_modules/react'),
-          }
-        }
-      }
-    }
+          },
+        },
+      },
+    },
   },
   // These tests should run quickly / fail quickly,
   // since we intentionally causing error states for testing
-  defaultCommandTimeout: 1000
-}
+  defaultCommandTimeout: 1000,
+}

system-tests/project-fixtures/next/pages/_app.js

@@ -1,6 +1,6 @@
 import '../styles/globals.css'
 
-function MyApp({ Component, pageProps }) {
+function MyApp ({ Component, pageProps }) {
   return <Component {...pageProps} />
 }
 

system-tests/project-fixtures/next/pages/api/hello.js

@@ -1,5 +1,5 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 
-export default function handler(req, res) {
+export default function handler (req, res) {
   res.status(200).json({ name: 'John Doe' })
 }

system-tests/project-fixtures/next/pages/index.cy.js

@@ -1,5 +1,5 @@
-import { mount } from "cypress/react"
-import Index from "./index.js"
+import { mount } from 'cypress/react'
+import Index from './index.js'
 
 describe('<Index />', () => {
   it('renders', () => {

system-tests/project-fixtures/next/pages/index.js

@@ -2,7 +2,7 @@ import Head from 'next/head'
 import Image from 'next/image'
 import styles from '../styles/Home.module.css'
 
-export default function Home() {
+export default function Home () {
   return (
     <div className={styles.container}>
       <Head>

system-tests/project-fixtures/next/pages/styles.cy.js

@@ -1,5 +1,5 @@
-import { mount } from "cypress/react"
-import Index from "./index.js"
+import { mount } from 'cypress/react'
+import Index from './index.js'
 
 describe('<Index />', () => {
   it('renders', () => {

system-tests/project-fixtures/nuxtjs2/components/Tutorial.cy.js

@@ -4,4 +4,4 @@ import Tutorial from './Tutorial.vue'
 it('works', () => {
   mount(Tutorial)
   cy.contains('Nuxt')
-})
+})

system-tests/project-fixtures/react/cypress/support/component.js

@@ -2,4 +2,4 @@ import { mount } from 'cypress/react'
 
 import './backgroundColor.css'
 
-Cypress.Commands.add('mount', mount)
+Cypress.Commands.add('mount', mount)

system-tests/project-fixtures/react/vite.config.js

@@ -1,4 +1,4 @@
-const {defineConfig} = require('vite')
+const { defineConfig } = require('vite')
 
 module.exports = defineConfig({
   resolve: {
@@ -7,5 +7,5 @@ module.exports = defineConfig({
       'react-dom': require.resolve('react-dom'),
     },
   },
-  logLevel: 'silent'
-})
+  logLevel: 'silent',
+})

system-tests/project-fixtures/react/webpack.config.js

@@ -1,4 +1,5 @@
 const path = require('path')
+
 /**
  * @type {import('webpack').Configuration}
  */
@@ -24,6 +25,5 @@ module.exports = {
         use: ['style-loader', 'css-loader'],
       },
     ],
-  }
+  },
 }
-

system-tests/project-fixtures/svelte/cypress/support/component.js

@@ -1,4 +1,4 @@
-import { mount } from "cypress/svelte";
-import "../../src/styles.css"
+import { mount } from 'cypress/svelte'
+import '../../src/styles.css'
 
-Cypress.Commands.add("mount", mount);
+Cypress.Commands.add('mount', mount)

system-tests/project-fixtures/svelte/src/App.cy.js

@@ -7,4 +7,4 @@ it('should render with style', () => {
   cy.get('.very-red').should('have.css', 'color', 'rgb(255, 0, 0)')
   // Verify local styles
   cy.get('.very-blue').should('have.css', 'color', 'rgb(0, 0, 255)')
-})
+})

system-tests/project-fixtures/svelte/src/errors.cy.js

@@ -1,7 +1,6 @@
 import Errors from './Errors.svelte'
 
 describe('Errors', () => {
-
   it('error on mount', () => {
     cy.mount(Errors, { props: { throwError: true } })
   })
@@ -20,4 +19,4 @@ describe('Errors', () => {
     cy.mount(Errors)
     cy.get('element-that-does-not-exist')
   })
-})
+})

system-tests/project-fixtures/svelte/src/main.js

@@ -1,8 +1,8 @@
-import App from "./App.svelte";
-import "./styles.css";
+import App from './App.svelte'
+import './styles.css'
 
 const app = new App({
-  target: document.getElementById("app"),
-});
+  target: document.getElementById('app'),
+})
 
-export default app;
+export default app