Merge branch 'develop' into webkit-experimental

circle.yml

@@ -27,6 +27,7 @@ mainBuildFilters: &mainBuildFilters
     branches:
       only:
         - develop
+        - fix-ci-deps
 
 # usually we don't build Mac app - it takes a long time
 # but sometimes we want to really confirm we are doing the right thing
@@ -1334,7 +1335,7 @@ jobs:
           steps:
             - run: yarn test-scripts
             # make sure packages with TypeScript can be transpiled to JS
-            - run: yarn lerna run build-prod --stream
+            - run: yarn lerna run build-prod --stream --concurrency 4
             # run unit tests from each individual package
             - run: yarn test
             # run type checking for each individual package

cli/package.json

@@ -38,7 +38,7 @@
     "dayjs": "^1.10.4",
     "debug": "^4.3.2",
     "enquirer": "^2.3.6",
-    "eventemitter2": "^6.4.3",
+    "eventemitter2": "6.4.7",
     "execa": "4.1.0",
     "executable": "^4.1.1",
     "extract-zip": "2.0.1",

npm/react/package.json

@@ -27,7 +27,7 @@
     "react-router-dom": "6.0.0-alpha.1",
     "semver": "^7.3.2",
     "typescript": "^4.7.4",
-    "vite": "3.0.3",
+    "vite": "3.1.0",
     "vite-plugin-require-transform": "1.0.3"
   },
   "peerDependencies": {

npm/vite-dev-server/package.json

@@ -27,7 +27,7 @@
     "mocha": "^9.2.2",
     "sinon": "^13.0.1",
     "ts-node": "^10.9.1",
-    "vite": "3.0.3",
+    "vite": "3.1.0",
     "vite-plugin-inspect": "0.4.3"
   },
   "files": [

npm/vue/package.json

@@ -25,7 +25,7 @@
     "globby": "^11.0.1",
     "tailwindcss": "1.1.4",
     "typescript": "^4.7.4",
-    "vite": "3.0.3",
+    "vite": "3.1.0",
     "vue": "3.2.31",
     "vue-i18n": "9.0.0-rc.6",
     "vue-router": "^4.0.0",

packages/app/cypress/e2e/runner/reporter.errors.cy.ts

@@ -34,27 +34,24 @@ describe('errors ui', {
     })
 
     verify('with expect().<foo>', {
+      line: 3,
       column: 25,
       message: `expected 'actual' to equal 'expected'`,
       verifyOpenInIde: true,
-      ideLine: 3,
-      ideColumn: 25,
     })
 
     verify('with assert()', {
-      column: '(5|12)', // (chrome|firefox)
+      line: 7,
+      column: [5, 12], // [chrome, firefox]
       message: `should be true`,
       verifyOpenInIde: true,
-      ideLine: 7,
-      ideColumn: 5,
     })
 
     verify('with assert.<foo>()', {
+      line: 11,
       column: 12,
       message: `expected 'actual' to equal 'expected'`,
       verifyOpenInIde: true,
-      ideLine: 11,
-      ideColumn: 12,
     })
   })
 
@@ -85,7 +82,8 @@ describe('errors ui', {
 
     verify('in file outside project', {
       message: 'An outside error',
-      regex: /\/throws\-error\.js:5:9/,
+      stackRegex: /\/throws\-error\.js:5:8/,
+      codeFrameRegex: /\/throws\-error\.js:5:9/,
       codeFrameText: `thrownewError('An outside error')`,
     })
   })
@@ -100,7 +98,7 @@ describe('errors ui', {
     // https://github.com/cypress-io/cypress/issues/8288
     // https://github.com/cypress-io/cypress/issues/8350
     verify('test', {
-      column: '(7|18)', // (chrome|firefox)
+      column: [7, 18], // [chrome, firefox]
       codeFrameText: 'beforeEach(()=>',
       message: `Cypress detected you registered a(n) beforeEach hook while a test was running`,
     })
@@ -483,7 +481,7 @@ describe('errors ui', {
     })
 
     verify('from chai expect', {
-      column: '(5|12)', // (chrome|firefox)
+      column: [5, 12], // [chrome, firefox]
       message: 'Invalid Chai property: nope',
       stack: ['proxyGetter', 'From Your Spec Code:'],
     })

packages/app/cypress/e2e/runner/reporter.hooks.cy.ts

@@ -57,7 +57,7 @@ describe('hooks', {
 
     cy.withCtx((ctx, o) => {
       expect(ctx.actions.file.openFile).to.have.been.calledWith(o.sinon.match(new RegExp(`hooks/basic\.cy\.js$`)), o.ideLine, o.ideColumn)
-    }, { ideLine: 2, ideColumn: Cypress.browser.family === 'firefox' ? 6 : 3 })
+    }, { ideLine: 2, ideColumn: Cypress.browser.family === 'firefox' ? 5 : 2 })
   })
 
   it('does not display commands from skipped tests', () => {