Merge pull request #1519 from w3c/apg-1.2-merge-latest

APG 1.2 Publication Branch: Merge latest from main branch

.eslintrc.json

@@ -3,8 +3,16 @@
   "env": {
     "browser": true
   },
+  "parserOptions": {
+    "ecmaVersion": 6
+  },
   "rules": {
     "no-unused-vars": 0,
-    "no-undef": 0
+    "no-undef": 0,
+    "no-restricted-properties": [2, {
+      "property": "findElements",
+      "message": "Please use t.context.queryElements()."
+    }],
+    "strict": [2, "global"]
   }
 }

.github/workflows/deploy.yml

@@ -0,0 +1,57 @@
+name: Deploy gh-pages
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - .github/workflows/deploy.yml
+      - common/**
+      - examples/**
+      - img/**
+      - aria-practices.html
+      - README.md
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ secrets.GH_TOKEN || github.token }}
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        path: main
+
+    - uses: actions/checkout@v2
+      with:
+        path: deploy
+        ref: gh-pages
+        token: ${{ env.GH_TOKEN }}
+
+    - name: Cleanup old files
+      run: |
+        rm -rf deploy/common/
+        rm -rf deploy/examples/
+        rm -rf deploy/img/
+        rm -rf deploy/index.html
+        rm -rf deploy/README.md
+
+    - name: Copy files
+      run: |
+        cp -R main/common deploy
+        cp -R main/examples deploy
+        cp -R main/img deploy
+        cp main/README.md deploy
+
+    - name: Generate new index
+      run: |
+        curl "https://labs.w3.org/spec-generator/?type=respec&url=https://raw.githack.com/${{ github.repository }}/${{ github.sha }}/aria-practices.html" -o deploy/index.html -f --retry 3
+
+    - name: Commit back
+      run: |
+        cd deploy
+        git config user.name github-actions[bot]
+        git config user.email github-actions[bot]@users.noreply.github.com
+        git add --all
+        git commit -am "Generated by ${{ github.sha }}" || true
+        git push

.gitignore

@@ -1,2 +1,4 @@
 .DS_*
 node_modules
+.vscode/*
+!.vscode/extensions.json

.travis.yml

@@ -7,42 +7,57 @@ git:
   depth: 3
 
 stages:
+- Lint
 - Test
-- Deploy
 
 jobs:
   fast_finish: true
   allow_failures:
     - env: ALLOW_FAILURE=true
 
   include:
-    - stage: Test
+    - stage: Lint
       name: CSS Linting
       script: npm run lint:css
-    - stage: Test
+    - stage: Lint
       name: JS Linting
       script: npm run lint:es
-    - stage: Test
+    - stage: Lint
       name: HTML Linting
       script: npm run vnu-jar
+    - stage: Lint
+      name: Spellcheck
+      script: npm run lint:spelling
+      env: ALLOW_FAILURE=true
+    - stage: Lint
+      name: Regression Tests Coverage Report
+      script: node test/util/report.js
+      env: ALLOW_FAILURE=true
 
     - stage: Test
       name: AVA Regression Tests
       addons:
         firefox: latest
       script: scripts/regression-tests.sh
-      env: TEST_WAIT_TIME=1000
+      env:
+        - TEST_WAIT_TIME=1000
+        - CI_NODE_TOTAL=3
+        - CI_NODE_INDEX=0
     - stage: Test
-      name: Regression Tests Coverage Report
-      script: node test/util/report.js
-      env: ALLOW_FAILURE=true
-    - stage: Deploy
-      if: branch = master AND type != pull_request
-      script: skip
-      before_deploy: scripts/travis-before_deploy.sh
-      deploy:
-        provider: script
-        skip_cleanup: true
-        script: /tmp/deploy/travis-deploy.sh
-        on:
-          branch: master
+      name: AVA Regression Tests
+      addons:
+        firefox: latest
+      script: scripts/regression-tests.sh
+      env:
+        - TEST_WAIT_TIME=1000
+        - CI_NODE_TOTAL=3
+        - CI_NODE_INDEX=1
+    - stage: Test
+      name: AVA Regression Tests
+      addons:
+        firefox: latest
+      script: scripts/regression-tests.sh
+      env:
+        - TEST_WAIT_TIME=1000
+        - CI_NODE_TOTAL=3
+        - CI_NODE_INDEX=2

.vnurc

@@ -4,7 +4,7 @@
 # Proposed, tracking in gh-429
 Bad value “” for attribute “aria-activedescendant” on element “ul”:.*
 # Ignoring for Slider examples because it is forcing rule with role=img
-An “img” element must have an “alt” attribute, except under certain conditions. For details, consult guidance on providing text alternatives for images.
+Element “img” is missing required attribute “alt”.
 # Ignoring aria-posinset and aria-setsize on role row
 Attribute “aria-posinset” not allowed on element “tr” at this point.
 Attribute “aria-setsize” not allowed on element “tr” at this point.

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "streetsidesoftware.code-spell-checker"
+    ]
+}

common/biblio.js

@@ -1,4 +1,4 @@
-var biblio = {
+respecConfig.localBiblio = {
 
 	"ACCNAME-AAM": {
 		"aliasOf": "ACCNAME-AAM-1.1",
@@ -26,6 +26,14 @@ var biblio = {
 	"HTML-AAM": {
 		"aliasOf": "HTML-AAM-1.0",
 	},
+        "MathML-Core": {
+		"href": "https://mathml-refresh.github.io/mathml-core/",
+		"title": "MathML Core",
+                "authors": [
+                    "David Carlisle",
+                    "Frédéric Wang"
+		]
+	},
 	"SVG-AAM": {
 		"aliasOf": "SVG-AAM-1.0",
 	},