Merge branch 'develop' into feature-multidomain

Author: chrisbreiding

appveyor.yml

@@ -2,8 +2,7 @@ branches:
   only:
     - master
     - develop
-    - issue-17944-remove-source-files
-    - windows-code-signing
+    - fix-test-other-projects
     - /win*/
 
 # https://www.appveyor.com/docs/lang/nodejs-iojs/

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
-        - issue-17944-remove-source-files
+        - fix-test-other-projects
 
 defaults: &defaults
   parallelism: 1
@@ -42,7 +42,7 @@ onlyMainBranches: &onlyMainBranches
     branches:
       only:
         - develop
-        - issue-17944-remove-source-files
+        - fix-test-other-projects
   requires:
     - create-build-artifacts
 
@@ -1481,7 +1481,7 @@ jobs:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "issue-17944-remove-source-files" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "fix-test-other-projects" ]]; 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
-              - issue-17944-remove-source-files
+              - fix-test-other-projects
         requires:
           - build
     - test-kitchensink:
@@ -2128,7 +2129,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - issue-17944-remove-source-files
+              - fix-test-other-projects
         requires:
           - build
     - create-build-artifacts:
@@ -2178,15 +2179,15 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - issue-17944-remove-source-files
+              - fix-test-other-projects
         requires:
           - create-build-artifacts
     - test-npm-module-and-verify-binary:
         filters:
           branches:
             only:
               - develop
-              - issue-17944-remove-source-files
+              - fix-test-other-projects
         requires:
           - create-build-artifacts
     - test-binary-against-staging:
@@ -2195,7 +2196,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - issue-17944-remove-source-files
+              - fix-test-other-projects
         requires:
           - create-build-artifacts
 
@@ -2220,7 +2221,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - issue-17944-remove-source-files
+              - fix-test-other-projects
         requires:
           - create-build-artifacts
 
@@ -2292,7 +2293,7 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - issue-17944-remove-source-files
+              - fix-test-other-projects
         requires:
           - darwin-create-build-artifacts
 
@@ -2304,7 +2305,7 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - issue-17944-remove-source-files
+              - fix-test-other-projects
         requires:
           - darwin-create-build-artifacts
 

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"]
+}