Skip to content

Commit

Permalink
Merge pull request #365 from ember-a11y/melsumner/update-test-scenarios
Browse files Browse the repository at this point in the history
Dependency upgrades and switch to pnpm
  • Loading branch information
MelSumner authored May 29, 2024
2 parents 5d4bf73 + ff8304d commit 295efc1
Show file tree
Hide file tree
Showing 9 changed files with 14,443 additions and 14,771 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Run tests

on:
push:
branches:
- main
pull_request:

jobs:
test:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '18.x'

- name: Install pnpm
run: npm install -g pnpm

- name: Install dependencies
run: pnpm install

- name: Run tests
run: pnpm test
60 changes: 0 additions & 60 deletions .github/workflows/main.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
/yarn.lock.ember-try
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
[![Ember Observer Score](https://emberobserver.com/badges/ember-a11y-refocus.svg)](http://emberobserver.com/addons/ember-a11y-refocus)
[![Build status](https://github.com/ember-a11y/ember-a11y-refocus/actions/workflows/main.yml/badge.svg)](https://github.com/ember-a11y/ember-a11y-refocus/actions)


## What This Addon Does

This addon does three things:

1. it adds a message to the page to let the screen reader user know that the route has changed and regular page navigation can resume (it is similar to [https://github.com/ember-a11y/a11y-announcer](https://github.com/ember-a11y/a11y-announcer) but does not use `aria-live`).
2. It moves the focus to that message for the screen reader user, effectively resetting focus in Ember apps (similar to how a native web page/site works).
3. It provides a bypass mechanism so the user can skip to the page's primary content (see https://www.w3.org/TR/WCAG20-TECHS/G1.html). You can opt out of this if you want (see the `Options` section for available options).
Expand All @@ -28,14 +28,11 @@ Async data can be loaded as it normally would be. Since this addon does not use

Since this will run before other content, focus can be programmatically moved by the developer to go somewhere else. The message should still read out, and is findable by users with screen readers.



Compatibility
------------------------------------------------------------------------------

* Ember.js v3.26 or above
* Ember CLI v3.26 or above
* Node.js v12 or above
* Ember.js v3.28 or above
* Node.js v16 or above

Installation
------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Once the prep work is completed, the actual release is straight forward:
* First, ensure that you have installed your projects dependencies:

```sh
yarn
pnpm i
```

* Second, ensure that you have obtained a
Expand Down
29 changes: 10 additions & 19 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,54 +1,45 @@
'use strict';

const getChannelURL = require('ember-source-channel-url');
const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');

module.exports = async function () {
return {
useYarn: true,
useYarn: false,
usePnpm: true,
scenarios: [
{
name: 'ember-lts-3.24',
npm: {
devDependencies: {
'ember-source': '~3.24.6',
},
},
},
{
name: 'ember-lts-3.28',
npm: {
devDependencies: {
'ember-source': '~3.28.8',
'ember-source': '3.28.12',
},
},
},
{
name: 'ember-release',
name: 'ember-lts-4.8',
npm: {
devDependencies: {
'ember-source': await getChannelURL('release'),
'ember-source': '4.8.6',
},
},
},
{
name: 'ember-beta',
name: 'ember-lts-4.12',
npm: {
devDependencies: {
'ember-source': await getChannelURL('beta'),
'ember-source': '4.12.4',
},
},
},
{
name: 'ember-canary',
name: 'ember-release',
allowedToFail: true,
npm: {
devDependencies: {
'ember-source': await getChannelURL('canary'),
'ember-source': await getChannelURL('release'),
},
},
},
embroiderSafe(),
embroiderOptimized(),
],
};
};
27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,28 @@
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"start": "ember serve",
"preinstall": "npx only-allow pnpm",
"start": "ember serve -p 0",
"test": "npm-run-all lint test:*",
"test:ember": "ember test",
"test:ember-compatibility": "ember try:each"
"test:ember-compat": "ember try:each"
},
"dependencies": {
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.0.1"
},
"devDependencies": {
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-async-generator-functions": "^7.20.7",
"@babel/plugin-proposal-class-static-block": "^7.21.0",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/compat": "1.9.0",
"@embroider/core": "1.9.0",
"@embroider/test-setup": "1.8.3",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@embroider/webpack": "1.9.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "2.4.2",
Expand All @@ -53,7 +60,7 @@
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "4.6.0",
"ember-source": "4.9.2",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^4.0.0",
"ember-try": "2.0.0",
Expand All @@ -69,13 +76,10 @@
"qunit-dom": "^2.0.0",
"release-it": "^14.2.1",
"release-it-lerna-changelog": "^4.0.0",
"webpack": "^5.65.0",
"@embroider/core": "1.9.0",
"@embroider/webpack": "1.9.0",
"@embroider/compat": "1.9.0"
"webpack": "^5.65.0"
},
"engines": {
"node": "14.* || >= 16"
"node": "16.* || >= 18.*"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand All @@ -100,8 +104,5 @@
"release": true,
"tokenRef": "GITHUB_AUTH"
}
},
"volta": {
"node": "14.20.0"
}
}
Loading

0 comments on commit 295efc1

Please sign in to comment.