Merge remote-tracking branch 'origin/issue-21908' into issue-21908

.eslintrc.js

@@ -25,6 +25,7 @@ const validators = specifiedRules
 )
 
 module.exports = {
+  root: true,
   plugins: [
     '@cypress/dev',
     'graphql',

cli/.eslintrc.json

@@ -1,5 +1,4 @@
 {
-  "extends": "../.eslintrc.js",
   "rules": {
     "no-restricted-syntax": [
       "error",

npm/angular/.eslintrc

@@ -4,14 +4,5 @@
   ],
   "extends": [
     "plugin:@cypress/dev/tests"
-  ],
-  "env": {
-    "cypress/globals": true
-  },
-  "rules": {
-    "mocha/no-global-tests": "off",
-    "no-unused-vars": "off",
-    "no-console": "off",
-    "@typescript-eslint/no-unused-vars": "off"
-  }
+  ]
 }

npm/create-cypress-tests/.eslintrc

@@ -7,32 +7,10 @@
     "plugin:@cypress/dev/general",
     "plugin:@cypress/dev/tests"
   ],
-  "parser": "@typescript-eslint/parser",
   "env": {
     "cypress/globals": true
   },
   "rules": {
-    "no-console": "off",
-    "mocha/no-global-tests": "off",
-    "@typescript-eslint/no-unused-vars": "off"
-  },
-  "overrides": [
-    {
-      "files": [
-        "lib/*"
-      ],
-      "rules": {
-        "no-console": 1
-      }
-    },
-    {
-      "files": [
-        "**/*.json"
-      ],
-      "rules": {
-        "quotes": "off",
-        "comma-dangle": "off"
-      }
-    }
-  ]
+    "no-console": "off"
+  }
 }

npm/create-cypress-tests/src/component-testing/config-file-updater/configFileUpdater.test.ts

@@ -1,11 +1,7 @@
 /// <reference path="../../../../../cli/types/mocha/index.d.ts" />
 
-import * as path from 'path'
 import { expect } from 'chai'
-
-import * as fs from 'fs-extra'
-import { insertValueInJSString, insertValuesInConfigFile } from './configFileUpdater'
-const projectRoot = process.cwd()
+import { insertValueInJSString } from './configFileUpdater'
 
 // Test util - if needed outside the tests we can move it to utils
 const stripIndent = (strings: any, ...args: any) => {

npm/create-cypress-tests/src/component-testing/config-file-updater/configFileUpdater.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash'
 import { parse } from '@babel/parser'
 import type { File } from '@babel/types'
 import type { NodePath } from 'ast-types/lib/node-path'

npm/eslint-plugin-dev/.eslintrc.json

@@ -6,6 +6,5 @@
   "extends": [
     "plugin:promise/recommended",
     "plugin:@cypress/dev/general"
-  ],
-  "rules": {}
+  ]
 }

npm/grep/.eslintrc

@@ -10,9 +10,7 @@
   },
   "rules": {
     "mocha/no-global-tests": "off",
-    "no-unused-vars": "off",
     "no-console": "off",
-    "@typescript-eslint/no-unused-vars": "off",
     "no-restricted-syntax": "off"
   }
-}
+}

npm/grep/cypress/e2e/nested-describe-spec.js

@@ -12,7 +12,7 @@ describe('grand', () => {
 describe('top', { tags: '@smoke' }, () => {
   describe('middle', () => {
     context('bottom', { tags: ['@integration', '@fast'] }, () => {
-      it('runs too', () => {});
+      it('runs too', () => {})
     })
   })
 })

npm/grep/cypress/e2e/omit-and-skip-spec.js

@@ -3,6 +3,7 @@
 // @ts-check
 describe('Page', () => {
   describe('List', { tags: ['@us1'] }, () => {
+    // eslint-disable-next-line @cypress/dev/skip-comment
     it.skip('first test', () => {})
     it('second test', () => {})
     it('third test', () => {})

npm/grep/cypress/e2e/skip-spec.js

@@ -1,3 +1,4 @@
+/* eslint-disable @cypress/dev/skip-comment */
 /// <reference types="cypress" />
 describe('tests that use .skip', () => {
   // use a template literal

npm/grep/cypress/e2e/ts-spec.ts

@@ -13,6 +13,7 @@ describe('TypeScript spec', () => {
 
   it('loads', () => {
     const n: number = 1
+
     cy.wrap(n).should('eq', 1)
   })
 
@@ -24,6 +25,7 @@ describe('TypeScript spec', () => {
     const p: Person = {
       name: 'Joe',
     }
+
     cy.wrap(p).should('have.property', 'name', 'Joe')
   })
 })

npm/grep/cypress/support/e2e.js

@@ -2,6 +2,7 @@
 /// <reference types="cypress" />
 
 import cypressGrep from '../../src/support'
+
 // register the grep feature
 // /~https://github.com/cypress-io/cypress-grep
-cypressGrep()
+cypressGrep()

npm/grep/package.json

@@ -5,7 +5,8 @@
   "main": "src/support.js",
   "scripts": {
     "cy:run": "node ../../scripts/cypress.js run --config specPattern='**/unit.js'",
-    "cy:open": "node ../../scripts/cypress.js open --e2e -b electron --config specPattern='**/unit.js'"
+    "cy:open": "node ../../scripts/cypress.js open --e2e -b electron --config specPattern='**/unit.js'",
+    "lint": "eslint . --ext .js,.ts"
   },
   "dependencies": {
     "debug": "^4.3.2",

npm/react/.eslintrc

@@ -19,7 +19,6 @@
   "rules": {
     "no-console": "off",
     "mocha/no-global-tests": "off",
-    "@typescript-eslint/no-unused-vars": "off",
     "react/jsx-filename-extension": [
       "warn",
       {
@@ -30,24 +29,5 @@
         ]
       }
     ]
-  },
-  "overrides": [
-    {
-      "files": [
-        "lib/*"
-      ],
-      "rules": {
-        "no-console": 1
-      }
-    },
-    {
-      "files": [
-        "**/*.json"
-      ],
-      "rules": {
-        "quotes": "off",
-        "comma-dangle": "off"
-      }
-    }
-  ]
+  }
 }

npm/svelte/.eslintrc

@@ -10,8 +10,6 @@
   },
   "rules": {
     "mocha/no-global-tests": "off",
-    "no-unused-vars": "off",
-    "no-console": "off",
-    "@typescript-eslint/no-unused-vars": "off"
+    "no-console": "off"
   }
 }

npm/svelte/src/mount.ts

@@ -31,7 +31,7 @@ const cleanup = () => {
 // Extract the component name from the object passed to mount
 const getComponentDisplayName = <T extends SvelteComponent>(Component: SvelteConstructor<T>): string => {
   if (Component.name) {
-    const [_, match] = /Proxy\<(\w+)\>/.exec(Component.name) || []
+    const [, match] = /Proxy\<(\w+)\>/.exec(Component.name) || []
 
     return match || Component.name
   }

npm/vite-dev-server/.eslintrc

@@ -21,7 +21,6 @@
   "rules": {
     "no-console": "off",
     "mocha/no-global-tests": "off",
-    "@typescript-eslint/no-unused-vars": "off",
     "react/jsx-filename-extension": [
       "warn",
       {
@@ -32,24 +31,5 @@
         ]
       }
     ]
-  },
-  "overrides": [
-    {
-      "files": [
-        "lib/*"
-      ],
-      "rules": {
-        "no-console": 1
-      }
-    },
-    {
-      "files": [
-        "**/*.json"
-      ],
-      "rules": {
-        "quotes": "off",
-        "comma-dangle": "off"
-      }
-    }
-  ]
+  }
 }

npm/vite-dev-server/src/devServer.ts

@@ -1,5 +1,5 @@
 import debugFn from 'debug'
-import type { InlineConfig, UserConfig } from 'vite'
+import type { UserConfig } from 'vite'
 import { getVite, Vite } from './getVite'
 import { createViteDevServerConfig } from './resolveConfig'
 

npm/vue/.eslintrc

@@ -19,9 +19,7 @@
   },
   "rules": {
     "mocha/no-global-tests": "off",
-    "no-unused-vars": "off",
     "no-console": "off",
-    "@typescript-eslint/no-unused-vars": "off",
     "vue/multi-word-component-names": "off"
   }
 }

npm/vue/cypress/component/tailwind/redbox.cy.js

@@ -1,4 +1,4 @@
-import { mount, mountCallback } from '@cypress/vue'
+import { mount } from '@cypress/vue'
 import RedBox from './RedBox.vue'
 
 const tailwindCdnLink = 'https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css'

npm/vue2/.eslintrc

@@ -10,8 +10,6 @@
   },
   "rules": {
     "mocha/no-global-tests": "off",
-    "no-unused-vars": "off",
-    "no-console": "off",
-    "@typescript-eslint/no-unused-vars": "off"
+    "no-console": "off"
   }
 }

npm/vue2/webpack.config.js

@@ -2,7 +2,6 @@
 // The default for running tests in this project
 // https://vue-loader.vuejs.org/guide/#manual-setup
 const VueLoaderPlugin = require('vue-loader/lib/plugin')
-const HtmlWebpackPlugin = require('html-webpack-plugin')
 const path = require('path')
 const pkg = require('package.json')
 

npm/webpack-dev-server/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@cypress/webpack-dev-server-v3.2.1](/~https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v3.2.0...@cypress/webpack-dev-server-v3.2.1) (2022-12-29)
+
+
+### Bug Fixes
+
+* Allow component tests with special characters in filepath ([#25299](/~https://github.com/cypress-io/cypress/issues/25299)) ([dc78750](/~https://github.com/cypress-io/cypress/commit/dc7875064bc1ff0193d1f46ef9411f753cf39600))
+
 # [@cypress/webpack-dev-server-v3.2.0](/~https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v3.1.2...@cypress/webpack-dev-server-v3.2.0) (2022-12-19)
 
 

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

@@ -18,7 +18,7 @@ const makeImport = (file: Cypress.Cypress['spec'], filename: string, chunkName:
   const magicComments = chunkName ? `/* webpackChunkName: "${chunkName}" */` : ''
 
   return `"${filename}": {
-    shouldLoad: () => document.location.pathname.includes("${encodeURI(file.absolute)}"),
+    shouldLoad: () => decodeURI(document.location.pathname).includes("${file.absolute}"),
     load: () => import("${file.absolute}" ${magicComments}),
     absolute: "${file.absolute.split(path.sep).join(path.posix.sep)}",
     relative: "${file.relative.split(path.sep).join(path.posix.sep)}",

npm/webpack-preprocessor/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@cypress/webpack-preprocessor-v5.16.1](/~https://github.com/cypress-io/cypress/compare/@cypress/webpack-preprocessor-v5.16.0...@cypress/webpack-preprocessor-v5.16.1) (2022-12-29)
+
+
+### Bug Fixes
+
+* added missing pending data which caused incorrect mochaawesome reports ([#25264](/~https://github.com/cypress-io/cypress/issues/25264)) ([6fc13e6](/~https://github.com/cypress-io/cypress/commit/6fc13e6f20f203fd58aa18c0a736414aea5e0556))
+
 # [@cypress/webpack-preprocessor-v5.16.0](/~https://github.com/cypress-io/cypress/compare/@cypress/webpack-preprocessor-v5.15.7...@cypress/webpack-preprocessor-v5.16.0) (2022-12-19)
 
 

npm/webpack-preprocessor/__snapshots__/compilation.spec.js

@@ -1,6 +1,6 @@
 exports['webpack preprocessor - e2e correctly preprocesses the file 1'] = `
 it("is a test",(function(){expect(1).to.equal(1),expect(2).to.equal(2),expect(Math.min.apply(Math,[3,4])).to.equal(3)}));
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhhbXBsZV9zcGVjX291dHB1dC5qcyIsIm1hcHBpbmdzIjoiQUFBQUEsR0FBRyxhQUFhLFdBR2RDLE9BRmdCLEdBRU5DLEdBQUdDLE1BQU0sR0FDbkJGLE9BSG1CLEdBR1RDLEdBQUdDLE1BQU0sR0FDbkJGLE9BQU9HLEtBQUtDLElBQUcsTUFBUkQsS0FBWSxDQUFDLEVBQUcsS0FBS0YsR0FBR0MsTUFBTSIsInNvdXJjZXMiOlsid2VicGFjazovL0BjeXByZXNzL3dlYnBhY2stcHJlcHJvY2Vzc29yLy4vdGVzdC9fdGVzdC1vdXRwdXQvZXhhbXBsZV9zcGVjLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIml0KCdpcyBhIHRlc3QnLCAoKSA9PiB7XG4gIGNvbnN0IFthLCBiXSA9IFsxLCAyXVxuXG4gIGV4cGVjdChhKS50by5lcXVhbCgxKVxuICBleHBlY3QoYikudG8uZXF1YWwoMilcbiAgZXhwZWN0KE1hdGgubWluKC4uLlszLCA0XSkpLnRvLmVxdWFsKDMpXG59KVxuIl0sIm5hbWVzIjpbIml0IiwiZXhwZWN0IiwidG8iLCJlcXVhbCIsIk1hdGgiLCJtaW4iXSwic291cmNlUm9vdCI6IiJ9
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhhbXBsZV9zcGVjX291dHB1dC5qcyIsIm1hcHBpbmdzIjoiQUFBQUEsR0FBRyxhQUFhLFdBR2RDLE9BRmdCLEdBRU5DLEdBQUdDLE1BQU0sR0FDbkJGLE9BSG1CLEdBR1RDLEdBQUdDLE1BQU0sR0FDbkJGLE9BQU9HLEtBQUtDLElBQUcsTUFBUkQsS0FBWSxDQUFDLEVBQUcsS0FBS0YsR0FBR0MsTUFBTSxFQUN2QyIsInNvdXJjZXMiOlsid2VicGFjazovL0BjeXByZXNzL3dlYnBhY2stcHJlcHJvY2Vzc29yLy4vdGVzdC9fdGVzdC1vdXRwdXQvZXhhbXBsZV9zcGVjLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIml0KCdpcyBhIHRlc3QnLCAoKSA9PiB7XG4gIGNvbnN0IFthLCBiXSA9IFsxLCAyXVxuXG4gIGV4cGVjdChhKS50by5lcXVhbCgxKVxuICBleHBlY3QoYikudG8uZXF1YWwoMilcbiAgZXhwZWN0KE1hdGgubWluKC4uLlszLCA0XSkpLnRvLmVxdWFsKDMpXG59KVxuIl0sIm5hbWVzIjpbIml0IiwiZXhwZWN0IiwidG8iLCJlcXVhbCIsIk1hdGgiLCJtaW4iXSwic291cmNlUm9vdCI6IiJ9
 `
 
 exports['webpack preprocessor - e2e has less verbose syntax error 1'] = `

npm/xpath/.eslintrc

@@ -9,9 +9,6 @@
     "cypress/globals": true
   },
   "rules": {
-    "mocha/no-global-tests": "off",
-    "no-unused-vars": "off",
-    "no-console": "off",
-    "@typescript-eslint/no-unused-vars": "off"
+    "no-console": "off"
   }
 }

npm/xpath/package.json

@@ -4,6 +4,7 @@
   "description": "Adds XPath command to Cypress.io test runner",
   "main": "src",
   "scripts": {
+    "lint": "eslint . --ext .ts,.js",
     "cy:run": "node ../../scripts/cypress.js run --e2e",
     "cy:open": "node ../../scripts/cypress.js open --e2e --project ${PWD}"
   },