Merge branch 'develop' into emily/dynamic-cirlce-ci

# Conflicts: # .circleci/config.yml
cypress-io · Nov 22, 2022 · a835918 · a835918
2 parents d651bc9 + 2166ba0
commit a835918
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 4 deletions.
diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml
@@ -63,7 +63,7 @@ windowsWorkflowFilters: &windows-workflow-filters
   when:
     or:
     - equal: [ develop, << pipeline.git.branch >> ]
-    - equal: [ 'feature/run-all-specs', << pipeline.git.branch >> ]
+    - equal: [ 'astone123/fix-windows-lint', << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
           value: << pipeline.git.branch >>

diff --git a/.gitattributes b/.gitattributes
@@ -2,4 +2,6 @@
 
 *.json text eol=lf
 
+**/.eslintrc text eol=lf
+
 packages/errors/__snapshot-html__/** linguist-generated=true
diff --git a/cli/types/cypress.d.ts b/cli/types/cypress.d.ts
@@ -2695,7 +2695,7 @@ declare namespace Cypress {
      */
     env: { [key: string]: any }
     /**
-     * A String or Array of glob patterns used to ignore test files that would otherwise be shown in your list of tests. Cypress uses minimatch with the options: {dot: true, matchBase: true}. We suggest using http://globtester.com to test what files would match.
+     * A String or Array of glob patterns used to ignore test files that would otherwise be shown in your list of tests. Cypress uses minimatch with the options: {dot: true, matchBase: true}. We suggest using a tool to test what files would match.
      * @default "*.hot-update.js"
      */
     excludeSpecPattern: string | string[]

diff --git a/npm/vue/cypress/component/test-utils-api/TestUtilsApi.vue b/npm/vue/cypress/component/test-utils-api/TestUtilsApi.vue
@@ -6,7 +6,10 @@
 <script>
 export default {
   props: {
-    msg: String,
+    msg: {
+      type: String,
+      default: '',
+    },
   },
   data () {
     return {

diff --git a/npm/webpack-batteries-included-preprocessor/.eslintignore b/npm/webpack-batteries-included-preprocessor/.eslintignore
@@ -0,0 +1 @@
+**/tsconfig.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "11.1.0",
+  "version": "11.2.0",
   "description": "Cypress is a next generation front end testing tool built for the modern web",
   "private": true,
   "scripts": {

diff --git a/packages/errors/.eslintignore b/packages/errors/.eslintignore
@@ -0,0 +1 @@
+**/tsconfig.json
diff --git a/packages/graphql/.eslintignore b/packages/graphql/.eslintignore
@@ -0,0 +1 @@
+**/tsconfig.json
diff --git a/packages/network/.eslintignore b/packages/network/.eslintignore
@@ -0,0 +1 @@
+**/tsconfig.json
diff --git a/packages/proxy/.eslintignore b/packages/proxy/.eslintignore
@@ -0,0 +1 @@
+**/tsconfig.json
diff --git a/packages/resolve-dist/.eslintignore b/packages/resolve-dist/.eslintignore
@@ -0,0 +1 @@
+**/tsconfig.json
diff --git a/packages/scaffold-config/.eslintignore b/packages/scaffold-config/.eslintignore
@@ -0,0 +1 @@
+**/tsconfig.json
diff --git a/packages/socket/.eslintignore b/packages/socket/.eslintignore
@@ -0,0 +1 @@
+**/tsconfig.json
diff --git a/packages/types/.eslintignore b/packages/types/.eslintignore
@@ -0,0 +1 @@
+**/tsconfig.json