browser-versions.json

@@ -1,4 +1,4 @@
 {
-  "chrome:beta": "94.0.4606.31",
-  "chrome:stable": "93.0.4577.63"
+  "chrome:beta": "94.0.4606.41",
+  "chrome:stable": "93.0.4577.82"
 }

circle.yml

@@ -8,7 +8,7 @@ macBuildFilters: &macBuildFilters
     branches:
       only:
         - develop
-        - fix-test-other-projects
+        - tgriesser/chore/fix-release
 
 defaults: &defaults
   parallelism: 1
@@ -42,7 +42,7 @@ onlyMainBranches: &onlyMainBranches
     branches:
       only:
         - develop
-        - fix-test-other-projects
+        - tgriesser/chore/fix-release
   requires:
     - create-build-artifacts
 
@@ -1481,7 +1481,7 @@ jobs:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "fix-test-other-projects" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "tgriesser/chore/fix-release" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi
@@ -2073,6 +2073,7 @@ linux-workflow: &linux-workflow
     # Any attempts to automate this are welcome
     # If CircleCI provided an "after all" hook, then this wouldn't be necessary
     - npm-release:
+        context: test-runner:npm-release
         requires:
           - build
           - npm-eslint-plugin-dev
@@ -2116,7 +2117,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - fix-test-other-projects
+              - tgriesser/chore/fix-release
         requires:
           - build
     - test-kitchensink:
@@ -2128,7 +2129,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - fix-test-other-projects
+              - tgriesser/chore/fix-release
         requires:
           - build
     - create-build-artifacts:
@@ -2178,15 +2179,15 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - fix-test-other-projects
+              - tgriesser/chore/fix-release
         requires:
           - create-build-artifacts
     - test-npm-module-and-verify-binary:
         filters:
           branches:
             only:
               - develop
-              - fix-test-other-projects
+              - tgriesser/chore/fix-release
         requires:
           - create-build-artifacts
     - test-binary-against-staging:
@@ -2195,7 +2196,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - fix-test-other-projects
+              - tgriesser/chore/fix-release
         requires:
           - create-build-artifacts
 
@@ -2220,7 +2221,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - fix-test-other-projects
+              - tgriesser/chore/fix-release
         requires:
           - create-build-artifacts
 
@@ -2292,7 +2293,7 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - fix-test-other-projects
+              - tgriesser/chore/fix-release
         requires:
           - darwin-create-build-artifacts
 
@@ -2304,7 +2305,7 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - fix-test-other-projects
+              - tgriesser/chore/fix-release
         requires:
           - darwin-create-build-artifacts
 

cli/types/cypress.d.ts

@@ -2876,7 +2876,7 @@ declare namespace Cypress {
     socketId: null | string
     socketIoCookie: string
     socketIoRoute: string
-    spec: Cypress['spec']
+    spec: Cypress['spec'] | null
     specs: Array<Cypress['spec']>
     xhrRoute: string
     xhrUrl: string

npm/cypress-schematic/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@cypress/schematic-v1.5.1](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v1.5.0...@cypress/schematic-v1.5.1) (2021-09-10)
+
+
+### Bug Fixes
+
+* **cypress/schematic:** add edge to list of allowed browsers ([#17637](https://github.com/cypress-io/cypress/issues/17637)) ([49de24f](https://github.com/cypress-io/cypress/commit/49de24f6178e0ef7bfd654c3efc0bfa8008e962e))
+
 # [@cypress/schematic-v1.5.0](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v1.4.2...@cypress/schematic-v1.5.0) (2021-07-20)
 
 

npm/react/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@cypress/react-v5.10.0](https://github.com/cypress-io/cypress/compare/@cypress/react-v5.9.4...@cypress/react-v5.10.0) (2021-09-10)
+
+
+### Features
+
+* allow usage of @react/plugins with cypress.config.js ([#17738](https://github.com/cypress-io/cypress/issues/17738)) ([da4b1e0](https://github.com/cypress-io/cypress/commit/da4b1e06ce33945aabddda0e6e175dc0e1b488a5))
+
 # [@cypress/react-v5.9.4](https://github.com/cypress-io/cypress/compare/@cypress/react-v5.9.3...@cypress/react-v5.9.4) (2021-08-10)
 
 

npm/react/package.json

@@ -4,16 +4,19 @@
   "description": "Test React components using Cypress",
   "main": "dist/cypress-react.cjs.js",
   "scripts": {
-    "build": "rimraf dist && yarn rollup -c rollup.config.js",
+    "build": "rimraf dist && yarn transpile-plugins && yarn rollup -c rollup.config.js",
     "build-prod": "yarn build",
     "cy:open": "node ../../scripts/cypress.js open-ct",
     "cy:open:debug": "node --inspect-brk ../../scripts/start.js --component-testing --run-project ${PWD}",
     "cy:run": "node ../../scripts/cypress.js run-ct",
     "cy:run:debug": "node --inspect-brk ../../scripts/start.js --component-testing --run-project ${PWD}",
     "pretest": "yarn transpile",
-    "test": "yarn cy:run",
+    "test": "yarn test-unit && yarn test-component",
+    "test-unit": "mocha -r @packages/ts/register test/**/*.spec.*",
+    "test-component": "yarn cy:run",
     "test-ci": "node ../../scripts/run-ct-examples.js --examplesList=./examples.env",
     "transpile": "tsc",
+    "transpile-plugins": "yarn transpile --project ./plugins",
     "watch": "yarn build --watch --watch.exclude ./dist/**/*"
   },
   "dependencies": {

npm/react/plugins/next/findNextWebpackConfig.js

@@ -2,6 +2,7 @@
 /// <reference types="next" />
 const debug = require('debug')('@cypress/react')
 const getNextJsBaseWebpackConfig = require('next/dist/build/webpack-config').default
+const { findPagesDir } = require('../../dist/next/findPagesDir')
 
 async function getNextWebpackConfig (config) {
   let loadConfig
@@ -26,7 +27,7 @@ async function getNextWebpackConfig (config) {
       config: nextConfig,
       dev: true,
       isServer: false,
-      pagesDir: config.projectRoot,
+      pagesDir: findPagesDir(config.projectRoot),
       entrypoints: {},
       rewrites: { fallback: [], afterFiles: [], beforeFiles: [] },
     },

npm/react/plugins/next/findPagesDir.ts

@@ -0,0 +1,33 @@
+import * as fs from 'fs'
+import * as path from 'path'
+
+const existsSync = (file: string) => {
+  try {
+    fs.accessSync(file, fs.constants.F_OK)
+
+    return true
+  } catch (_) {
+    return false
+  }
+}
+
+/**
+ * Next allows the `pages` directory to be located at either
+ * `${projectRoot}/pages` or `${projectRoot}/src/pages`.
+ * If neither is found, return projectRoot
+ */
+export function findPagesDir (projectRoot: string) {
+  // prioritize ./pages over ./src/pages
+  let pagesDir = path.join(projectRoot, 'pages')
+
+  if (existsSync(pagesDir)) {
+    return pagesDir
+  }
+
+  pagesDir = path.join(projectRoot, 'src/pages')
+  if (existsSync(pagesDir)) {
+    return pagesDir
+  }
+
+  return projectRoot
+}

npm/react/plugins/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "./",
+    "types": [
+      "cypress",
+      "node"
+    ]
+  },
+  "include": ["./**/*.ts"]
+}

npm/react/test/unit/findPagesDir.spec.ts

@@ -0,0 +1,19 @@
+import { expect } from 'chai'
+import * as path from 'path'
+import { findPagesDir } from '../../plugins/next/findPagesDir'
+
+describe('Next.js findPagesDir', () => {
+  it('should find the correct pagesDir', () => {
+    const nextPluginFixturePath = path.join(__dirname, '../fixtures/next-plugin')
+
+    let projectRoot = nextPluginFixturePath
+
+    expect(findPagesDir(projectRoot)).to.equal(projectRoot)
+
+    projectRoot = path.join(nextPluginFixturePath, 'next-project-one')
+    expect(findPagesDir(projectRoot)).to.equal(path.join(projectRoot, 'pages'))
+
+    projectRoot = path.join(nextPluginFixturePath, 'next-project-two')
+    expect(findPagesDir(projectRoot)).to.equal(path.join(projectRoot, 'src/pages'))
+  })
+})

npm/vite-dev-server/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@cypress/vite-dev-server-v2.1.0](https://github.com/cypress-io/cypress/compare/@cypress/vite-dev-server-v2.0.8...@cypress/vite-dev-server-v2.1.0) (2021-09-10)
+
+
+### Features
+
+* allow usage of @react/plugins with cypress.config.js ([#17738](https://github.com/cypress-io/cypress/issues/17738)) ([da4b1e0](https://github.com/cypress-io/cypress/commit/da4b1e06ce33945aabddda0e6e175dc0e1b488a5))
+
 # [@cypress/vite-dev-server-v2.0.8](https://github.com/cypress-io/cypress/compare/@cypress/vite-dev-server-v2.0.7...@cypress/vite-dev-server-v2.0.8) (2021-08-30)
 
 

npm/webpack-dev-server/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@cypress/webpack-dev-server-v1.6.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.5.0...@cypress/webpack-dev-server-v1.6.0) (2021-09-10)
+
+
+### Features
+
+* allow usage of @react/plugins with cypress.config.js ([#17738](https://github.com/cypress-io/cypress/issues/17738)) ([da4b1e0](https://github.com/cypress-io/cypress/commit/da4b1e06ce33945aabddda0e6e175dc0e1b488a5))
+
 # [@cypress/webpack-dev-server-v1.5.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.4.0...@cypress/webpack-dev-server-v1.5.0) (2021-08-30)
 
 

npm/webpack-dev-server/src/startServer.ts

@@ -57,13 +57,13 @@ export async function start ({ webpackConfig: userWebpackConfig, template, optio
     debug('using webpack-dev-server v3')
     webpackDevServerConfig = {
       ...webpackDevServerConfig,
-      // @ts-expect-error ignore webpack-dev-server v3 type errors
+      // @ts-ignore ignore webpack-dev-server v3 type errors
       inline: false,
       publicPath: devServerPublicPathRoute,
       noInfo: false,
     }
 
-    // @ts-expect-error ignore webpack-dev-server v3 type errors
+    // @ts-ignore ignore webpack-dev-server v3 type errors
     return new WebpackDevServer(compiler, webpackDevServerConfig)
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "8.4.0",
+  "version": "8.4.1",
   "description": "Cypress.io end to end testing tool",
   "private": true,
   "scripts": {

packages/desktop-gui/cypress/fixtures/config.json

@@ -132,7 +132,6 @@
   "integrationFolder": "/Users/jennifer/Dev/Projects/cypress-example-kitchensink/cypress/integration",
   "isHeadless": false,
   "isNewProject": false,
-  "javascripts": [],
   "morgan": true,
   "namespace": "__cypress",
   "numTestsKeptInMemory": 50,

packages/driver/src/cypress.ts

@@ -136,7 +136,7 @@ class $Cypress {
     // change this in the NEXT_BREAKING
     const { env } = config
 
-    config = _.omit(config, 'env', 'remote', 'resolved', 'scaffoldedFiles', 'javascripts', 'state', 'testingType')
+    config = _.omit(config, 'env', 'remote', 'resolved', 'scaffoldedFiles', 'state', 'testingType')
 
     _.extend(this, browserInfo(config))
 

packages/server/lib/config_options.ts

@@ -137,10 +137,6 @@ export const options = [
     name: 'isTextTerminal',
     defaultValue: false,
     isInternal: true,
-  }, {
-    name: 'javascripts',
-    defaultValue: [],
-    isInternal: true,
   }, {
     name: 'morgan',
     defaultValue: true,

packages/server/lib/controllers/files.js

@@ -15,7 +15,7 @@ module.exports = {
   handleFiles (req, res, config) {
     debug('handle files')
 
-    return specsUtil.find(config)
+    return specsUtil.default.findSpecs(config)
     .then((files) => {
       return res.json({
         integration: files,
@@ -32,7 +32,7 @@ module.exports = {
 
     return this.getSpecs(test, config, extraOptions)
     .then((specs) => {
-      return this.getJavascripts(config)
+      return this.getSupportFile(config)
       .then((js) => {
         const allFilesToSend = js.concat(specs)
 
@@ -67,7 +67,6 @@ module.exports = {
     }
 
     const specFilter = _.get(extraOptions, 'specFilter')
-    const specTypeFilter = _.get(extraOptions, 'specType', 'integration')
 
     debug('specFilter %o', { specFilter })
     const specFilterContains = (spec) => {
@@ -85,17 +84,15 @@ module.exports = {
       if (spec === '__all') {
         debug('returning all specs')
 
-        return specsUtil.find(config)
+        return specsUtil.default.findSpecs(config)
         .then(R.tap((specs) => {
           return debug('found __all specs %o', specs)
         }))
         .filter(specFilterFn)
         .filter((foundSpec) => {
-          if (componentTestingEnabled) {
-            return foundSpec.specType === specTypeFilter
-          }
-
-          return true
+          return componentTestingEnabled
+            ? foundSpec.specType === 'component'
+            : foundSpec.specType === 'integration'
         }).then(R.tap((specs) => {
           return debug('filtered __all specs %o', specs)
         })).map((spec) => {
@@ -142,14 +139,13 @@ module.exports = {
     return test
   },
 
-  getJavascripts (config) {
-    const { projectRoot, supportFile, javascripts } = config
+  getSupportFile (config) {
+    const { projectRoot, supportFile } = config
 
-    // automatically add in support scripts and any javascripts
-    let files = [].concat(javascripts)
+    let files = []
 
     if (supportFile !== false) {
-      files = [supportFile].concat(files)
+      files = [supportFile]
     }
 
     // TODO: there shouldn't be any reason