Merge branch 'feature-multidomain' into issue-17252-multidomain-looka…

…head

CONTRIBUTING.md

@@ -573,6 +573,8 @@ Independent packages are automatically released when code is merged into `master
  ![Select release for PR](https://user-images.githubusercontent.com/1271364/135139641-657015d6-2dca-42d4-a4fb-16478f61d63f.png)
 - Please check the "Allow edits from maintainers" checkbox when submitting your PR. This will make it easier for the maintainers to make minor adjustments, to help with tests or any other changes we may need.
 ![Allow edits from maintainers checkbox](https://user-images.githubusercontent.com/1271181/31393427-b3105d44-ada9-11e7-80f2-0dac51e3919e.png)
+- After the PR is approved, the original contributor can merge the PR (if the original contributor has access).
+- When you merge a PR into `develop`, select [**Squash and merge**](https://docs.github.com/en/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-pull-request-commits). This will squash all commits into a single commit. *The only exception to squashing is when converting files to another language and there is a clear commit history needed to maintain from the file conversion.*
 
 ### Dependencies
 

npm/cypress-schematic/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@cypress/schematic-v1.5.3](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v1.5.2...@cypress/schematic-v1.5.3) (2021-10-29)
+
+
+### Bug Fixes
+
+* remove outdated registry link ([#18710](https://github.com/cypress-io/cypress/issues/18710)) ([e2a869d](https://github.com/cypress-io/cypress/commit/e2a869d2a984abb6703aec966dd9124ee693b8c1))
+
 # [@cypress/schematic-v1.5.2](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v1.5.1...@cypress/schematic-v1.5.2) (2021-10-29)
 
 

npm/react/CHANGELOG.md

@@ -1,3 +1,12 @@
+# [@cypress/react-v5.10.2](https://github.com/cypress-io/cypress/compare/@cypress/react-v5.10.1...@cypress/react-v5.10.2) (2021-10-29)
+
+
+### Bug Fixes
+
+* Next.JS 12 components testing failing with ` TypeError: Cannot read property 'traceChild' of undefined` ([#18648](https://github.com/cypress-io/cypress/issues/18648)) ([cb0cbdf](https://github.com/cypress-io/cypress/commit/cb0cbdf4c35da09a7dedcc4563a242cb4748e994))
+* remove outdated registry link ([#18710](https://github.com/cypress-io/cypress/issues/18710)) ([e2a869d](https://github.com/cypress-io/cypress/commit/e2a869d2a984abb6703aec966dd9124ee693b8c1))
+* **cypress/react:** disable react-refresh for craco setups ([#18517](https://github.com/cypress-io/cypress/issues/18517)) ([ea10795](https://github.com/cypress-io/cypress/commit/ea1079559473fc672b5e0e188b5b54bf8ebe2f98))
+
 # [@cypress/react-v5.10.1](https://github.com/cypress-io/cypress/compare/@cypress/react-v5.10.0...@cypress/react-v5.10.1) (2021-10-04)
 
 

npm/react/plugins/next/checkSWC.ts

@@ -0,0 +1,19 @@
+import type { Configuration } from 'webpack'
+
+export function checkSWC (
+ webpackConfig: Configuration,
+ cypressConfig: Cypress.Config,
+) {
+ const hasSWCLoader = webpackConfig.module?.rules.some((rule) => {
+ return rule.oneOf?.some(
+ (oneOf) => (oneOf.use as any)?.loader === 'next-swc-loader'
+ )
+ })
+
+ if (hasSWCLoader && cypressConfig.nodeVersion !== 'system') {
+ throw new Error(`Cypress requires "nodeVersion" to be set to "system" in order to run Next.js with SWC optimizations.
+Please add "nodeVersion": "system" to your Cypress configuration and try again.`)
+ }
+
+ return false
+}

npm/react/plugins/next/findNextWebpackConfig.js

@@ -4,6 +4,7 @@ const debug = require('debug')('@cypress/react')
 const getNextJsBaseWebpackConfig = require('next/dist/build/webpack-config').default
 const { findPagesDir } = require('../../dist/next/findPagesDir')
 const { getRunWebpackSpan } = require('../../dist/next/getRunWebpackSpan')
+const { checkSWC } = require('../../dist/next/checkSWC')
 
 async function getNextWebpackConfig (config) {
  let loadConfig
@@ -38,6 +39,8 @@ async function getNextWebpackConfig (config) {
 
  debug('resolved next.js webpack config %o', nextWebpackConfig)
 
+ checkSWC(nextWebpackConfig, config)
+
  return nextWebpackConfig
 }
 

npm/vue/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@cypress/vue-v3.0.4](https://github.com/cypress-io/cypress/compare/@cypress/vue-v3.0.3...@cypress/vue-v3.0.4) (2021-10-29)
+
+
+### Bug Fixes
+
+* remove outdated registry link ([#18710](https://github.com/cypress-io/cypress/issues/18710)) ([e2a869d](https://github.com/cypress-io/cypress/commit/e2a869d2a984abb6703aec966dd9124ee693b8c1))
+
 # [@cypress/vue-v3.0.3](https://github.com/cypress-io/cypress/compare/@cypress/vue-v3.0.2...@cypress/vue-v3.0.3) (2021-07-31)
 
 

packages/driver/src/cy/commands/xhr.ts

@@ -5,7 +5,7 @@ import Promise from 'bluebird'
 import $utils from '../../cypress/utils'
 import $errUtils from '../../cypress/error_utils'
 import $stackUtils from '../../cypress/stack_utils'
-import $Server, { Server } from '../../cypress/server'
+import { Server } from '../../cypress/server'
 import { $Location } from '../../cypress/location'
 
 let server: Server | null = null
@@ -103,7 +103,7 @@ type XHRConsoleProps = {
 const startXhrServer = (cy, state, config) => {
  const logs = {}
 
- server = $Server.create({
+ server = new Server({
  xhrUrl: config('xhrUrl'),
  stripOrigin,