merge from develop

dequelabs · Apr 23, 2019 · c3e0408 · c3e0408
2 parents 9772f39 + 376a6a1
commit c3e0408
Show file tree

Hide file tree

Showing 353 changed files with 8,158 additions and 4,601 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,8 +1,15 @@
 {
   "presets": [
-    "env"
+    [
+      "@babel/preset-env"
+    ]
   ],
   "plugins": [
-    "transform-object-rest-spread"
+    [
+      "@babel/plugin-proposal-object-rest-spread",
+      {
+        "loose": true
+      }
+    ]
   ]
-}
+}
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -57,6 +57,14 @@ jobs:
             - phantomjs
       - run: npm run test
 
+  # Run examples under `doc/examples`
+  test_examples:
+    <<: *defaults
+    steps:
+      - checkout
+      - <<: *restore_dependency_cache
+      - run: npm run test:examples
+
   # Release a "next" version
   next_release:
     <<: *defaults
@@ -68,7 +76,7 @@ jobs:
       - run: npm publish --tag=next
 
   # Release a "production" version
-  production_release:
+  release:
     <<: *defaults
     steps:
       - checkout
@@ -77,6 +85,20 @@ jobs:
       - run: npm run build
       - run: npm publish
 
+  # Create a GitHub release.
+  github_release:
+    docker:
+      - image: circleci/golang:1.8
+    steps:
+      - checkout
+      - run: go get gopkg.in/aktau/github-release.v0
+      - run:
+          name: Download and run GitHub release script
+          command: |
+            curl https://raw.githubusercontent.com/dequelabs/attest-release-scripts/develop/src/node-github-release.sh -s -o ./node-github-release.sh
+            chmod +x ./node-github-release.sh
+            ./node-github-release.sh
+
 workflows:
   version: 2
   build:
@@ -91,11 +113,16 @@ workflows:
       - test:
           requires:
             - dependencies
+            - lint
+      - test_examples:
+          requires:
+            - test
       # Hold for approval
       - hold:
           type: approval
           requires:
             - test
+            - test_examples
           filters:
             # We only want to hold on these two branches, as PR review acts as approval for PRs
             branches:
@@ -107,16 +134,20 @@ workflows:
           requires:
             - dependencies
             - test
-            - hold
+            - test_examples
           filters:
             branches:
               only: develop
       # Run a production release on "master" commits, but only after the tests pass and dependencies are installed
-      - production_release:
+      - release:
           requires:
             - dependencies
             - test
+            - test_examples
             - hold
           filters:
             branches:
               only: master
+      - github_release:
+          requires:
+            - release
diff --git a/.eslintignore b/.eslintignore
@@ -6,3 +6,5 @@ doc/api/*
 doc/examples/jest_react/*.js
 
 lib/core/imports/*.js
+axe.js
+axe.min.js
diff --git a/.eslintrc b/.eslintrc
@@ -42,14 +42,6 @@
       2,
       5
     ],
-    "max-statements": [
-      2,
-      15
-    ],
-    "complexity": [
-      1,
-      12
-    ],
     "no-cond-assign": 0,
     "no-debugger": 0,
     "no-eq-null": 0,
@@ -70,6 +62,12 @@
       {
         "selector": "MemberExpression[property.name=tagName]",
         "message": "Don't use node.tagName, use node.nodeName instead."
+      },
+      {
+        // node.attributes can be clobbered so is unsafe to use
+        // @see https://github.com/dequelabs/axe-core/pull/1432
+        "selector": "MemberExpression[object.name=node][property.name=attributes]",
+        "message": "Don't use node.attributes, use node.hasAttributes() or axe.utils.getNodeAttributes(node) instead."
       }
     ]
   }

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -5,9 +5,3 @@
 
 # Localisation
 locales/ja.json @mlca11y/mlca11y @dequelabs/axe-codeowners
-
-# Core features
-lib/core/* @stephenmathieson @dequelabs/axe-codeowners
-test/core/* @stephenmathieson @dequelabs/axe-codeowners
-build/* @stephenmathieson @dequelabs/axe-codeowners
-Gruntfile.js @stephenmathieson @dequelabs/axe-codeowners
diff --git a/.npmignore b/.npmignore
@@ -1,4 +1,23 @@
 tmp
 dist
+build
+test
 node_modules
 *.tgz
+.npmignore
+.circleci
+.github
+.babelrc
+.editorconfig
+.eslintignore
+.eslintrc
+.gitattributes
+.huskyrc
+.jsdoc.json
+.prettierignore
+.prettierrc
+.retireignore.json
+appveyor.yml
+greenkeeper.json
+Gruntfile.js
+tsconfig.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [3.2.2](https://github.com/dequelabs/axe-core/compare/v3.2.0...v3.2.2) (2019-03-07)
+
+### Bug Fixes
+
+- Avoid "screen is not defined" error [[#1404](https://github.com/dequelabs/axe-core/issues/1404)](<[#1415](https://github.com/dequelabs/axe-core/issues/1415)>) ([c9653a5](https://github.com/dequelabs/axe-core/commit/c9653a5))
+
+## [3.2.1](https://github.com/dequelabs/axe-core/compare/v3.2.0...v3.2.1) (2019-03-06)
+
+### Bug Fixes
+
+- Avoid require conflict with Cypress [[#1405](https://github.com/dequelabs/axe-core/issues/1405)](<[#1406](https://github.com/dequelabs/axe-core/issues/1406)>) ([30aa570](https://github.com/dequelabs/axe-core/commit/30aa570))
+
 # [3.2.0](https://github.com/dequelabs/axe-core/compare/v3.0.3...v3.2.0) (2019-03-04)
 
 ### Bug Fixes
@@ -695,7 +707,7 @@ All notable changes to this project will be documented in this file. See [standa
 - Security improvements
 - Build includes Babel/ES6
 - Improvements to table rules
-- aXe can be loaded in Node
+- axe can be loaded in Node
 
 <a name="2.0.0"></a>
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -110,13 +110,13 @@ To build the package:
 grunt build
 ```
 
-## Using aXe with TypeScript
+## Using axe with TypeScript
 
-### aXe Development
+### Axe Development
 
 The TypeScript definition file for axe-core is distributed with this module and can be found in [axe.d.ts](./axe.d.ts). It currently supports TypeScript 2.0+.
 
-To maintain aXe support for TypeScript you must first install it (globally recommended):
+To maintain axe support for TypeScript you must first install it (globally recommended):
 
 ```console
 sudo npm -g install typescript
@@ -128,9 +128,9 @@ Once that's installed, you can run TypeScript definition tests (with the optiona
 tsc --noImplicitAny typings/axe-core/axe-core-tests.ts
 ```
 
-## Including aXe's type definition in tests
+## Including axe's type definition in tests
 
-Installing aXe to run accessibility tests in your TypeScript project should be as simple as importing the module:
+Installing axe to run accessibility tests in your TypeScript project should be as simple as importing the module:
 
 ```js
 import * as axe from 'axe-core';

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,6 +1,4 @@
 /*eslint
-complexity: ["error",12],
-max-statements: ["error", 35],
 camelcase: ["error", {"properties": "never"}]
 */
 var testConfig = require('./build/test/config');
@@ -73,7 +71,7 @@ module.exports = function(grunt) {
 		clean: ['dist', 'tmp', 'axe.js', 'axe.*.js'],
 		babel: {
 			options: {
-				compact: 'false'
+				compact: false
 			},
 			core: {
 				files: [
@@ -209,7 +207,7 @@ module.exports = function(grunt) {
 						quote_style: 1
 					},
 					output: {
-						comments: /^\/*! aXe/
+						comments: /^\/*! axe/
 					}
 				}
 			},
@@ -222,7 +220,7 @@ module.exports = function(grunt) {
 				}),
 				options: {
 					output: {
-						comments: /^\/*! aXe/
+						comments: /^\/*! axe/
 					},
 					mangle: {
 						reserved: ['commons', 'utils', 'axe', 'window', 'document']
@@ -243,7 +241,18 @@ module.exports = function(grunt) {
 		},
 		testconfig: {
 			test: {
-				src: ['test/integration/rules/**/*.json'],
+				src: ['test/integration/rules/**/*.json'].concat(
+					process.env.APPVEYOR
+						? [
+								// These tests are causing PhantomJS to timeout on Appveyor
+								// Warning: PhantomJS timed out, possibly due to a missing Mocha run() call. Use --force to continue.
+								'!test/integration/rules/td-has-header/*.json',
+								'!test/integration/rules/label-content-name-mismatch/*.json',
+								'!test/integration/rules/label/*.json',
+								'!test/integration/rules/th-has-data-cells/*.json'
+						  ]
+						: []
+				),
 				dest: 'tmp/integration-tests.js'
 			}
 		},
@@ -255,7 +264,7 @@ module.exports = function(grunt) {
 					fixture: 'test/runner.tmpl',
 					testCwd: 'test/core',
 					data: {
-						title: 'aXe Core Tests'
+						title: 'Axe Core Tests'
 					}
 				}
 			},
@@ -270,7 +279,7 @@ module.exports = function(grunt) {
 					fixture: 'test/runner.tmpl',
 					testCwd: 'test/checks',
 					data: {
-						title: 'aXe Check Tests'
+						title: 'Axe Check Tests'
 					}
 				}
 			},
@@ -285,7 +294,7 @@ module.exports = function(grunt) {
 					fixture: 'test/runner.tmpl',
 					testCwd: 'test/commons',
 					data: {
-						title: 'aXe Commons Tests'
+						title: 'Axe Commons Tests'
 					}
 				}
 			},
@@ -300,7 +309,7 @@ module.exports = function(grunt) {
 					fixture: 'test/runner.tmpl',
 					testCwd: 'test/rule-matches',
 					data: {
-						title: 'aXe Rule Matches Tests'
+						title: 'Axe Rule Matches Tests'
 					}
 				}
 			},
@@ -312,7 +321,7 @@ module.exports = function(grunt) {
 					testCwd: 'test/integration/rules',
 					tests: ['../../../tmp/integration-tests.js', 'runner.js'],
 					data: {
-						title: 'aXe Integration Tests'
+						title: 'Axe Integration Tests'
 					}
 				}
 			}

diff --git a/README.md b/README.md
@@ -74,6 +74,8 @@ Support means that we will fix bugs and attempt to test each browser regularly.
 
 There is limited support for JSDOM. We will attempt to make all rules compatible with JSDOM but where this is not possible, we recommend turning those rules off. Currently the `color-contrast` rule is known not to work with JSDOM.
 
+We can only support environments where features are either natively supported or polyfilled correctly.
+
 ## The Accessibility Rules
 
 The complete list of rules run by axe-core can be found in [doc/rule-descriptions.md](./doc/rule-descriptions.md).

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,21 +1,24 @@
-# Test against the latest version of this Node.js version
+version: 1.0.{build}-{branch}
+
+ # Test against this version of node.
 environment:
-  nodejs_version: "6"
+  nodejs_version: "10"
+skip_tags: true
 
-# Install scripts. (runs after repo cloning)
+ # Install scripts. (runs after repo cloning)
 install:
-  # Get the latest stable version of Node.js or io.js
   - ps: Install-Product node $env:nodejs_version
-  # install modules
   - npm install
 
-# Post-install test scripts.
+ # Post-install test scripts.
 test_script:
-  # Output useful info for debugging.
   - node --version
   - npm --version
-  # run tests
-  - npm test
+  - npm run build
+  # A few tests are flaky, causing occasional random failures
+  # When we have time, we should investigate to see if we can eliminate these flakes
+  # - npm run test
+  - npm run test:examples
 
-# Don't actually build.
-build: off
+ # Don't actually build.
+build: off