Skip to content

Commit

Permalink
Merge pull request #1311 from w3c/development
Browse files Browse the repository at this point in the history
Create February 4, 2025 Release

Includes the following changes:
* #1302
* #1303
* #1300, addresses #1270
* #1301, addresses #759 (additional documentation to follow)
* #1281, addresses #1241
* #1307
* #1308, addresses w3c/aria-at#1175
* #1309
* #1288, addresses #1253
  • Loading branch information
howard-e authored Feb 5, 2025
2 parents 3bf1fa8 + 46851ce commit 8fd97e7
Show file tree
Hide file tree
Showing 76 changed files with 2,672 additions and 582 deletions.
40 changes: 12 additions & 28 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{
"ignorePatterns": [
"client/dist/*",
"client/dist/bundle.js",
"client/tests/e2e/snapshots/saved"
],
"env": {
"browser": true,
"es6": true,
Expand All @@ -19,40 +24,19 @@
"ecmaVersion": 2020,
"sourceType": "module"
},
"plugins": [
"react",
"json",
"prettier",
"jest"
],
"plugins": ["react", "json", "prettier", "jest"],
"rules": {
"linebreak-style": [
"error",
"unix"
],
"semi": [
"error",
"always"
],
"eol-last": [
"error",
"always"
],
"linebreak-style": ["error", "unix"],
"semi": ["error", "always"],
"eol-last": ["error", "always"],
"no-console": [
"error",
{
"allow": [
"warn",
"error"
]
"allow": ["warn", "error"]
}
],
"no-use-before-define": [
"off"
],
"react/display-name": [
"off"
]
"no-use-before-define": ["off"],
"react/display-name": ["off"]
},
"settings": {
"react": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
python-version: '3.10'
- name: Install ansible and deploy to production
run: |
python -m pip install --user ansible-core==2.11.1
python -m pip install --user ansible-core==2.16.14
cd deploy
echo ${{ secrets.ANSIBLE_VAULT_PASSWORD }} > ansible-vault-password.txt
ansible-vault view --vault-password-file ansible-vault-password.txt files/jwt-signing-key.pem.enc > ../jwt-signing-key.pem
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
python-version: '3.10'
- name: Install ansible and deploy to staging
run: |
python -m pip install --user ansible-core==2.11.1
python -m pip install --user ansible-core==2.16.14
cd deploy
echo ${{ secrets.ANSIBLE_VAULT_PASSWORD }} > ansible-vault-password.txt
ansible-vault view --vault-password-file ansible-vault-password.txt files/jwt-signing-key.pem.enc > ../jwt-signing-key.pem
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/runtest.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Run the tests
on: [push, pull_request]
on: [push]

jobs:
runtest_task:
Expand Down
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npx lint-staged
5 changes: 5 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
client/dist/*
client/dist/bundle.js

# snaphosts
client/tests/e2e/snapshots/saved
2 changes: 0 additions & 2 deletions client/.eslintignore

This file was deleted.

4 changes: 2 additions & 2 deletions client/components/App/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const App = () => {
const [isNavbarExpanded, setIsNavbarExpanded] = useState(false);

const auth = evaluateAuth(data && data.me ? data.me : {});
const { username, isSignedIn, isAdmin, isVendor } = auth;
const { username, isSignedIn, isAdmin, isVendor, isTester } = auth;

const signOut = async () => {
await fetch('/api/auth/signout', { method: 'POST' });
Expand Down Expand Up @@ -104,7 +104,7 @@ const App = () => {
)}
{isSignedIn && (
<>
{!isVendor && (
{(isAdmin || isTester) && (
<li>
<Nav.Link
as={Link}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,3 +152,8 @@
position: relative;
top: -5px;
}

.begin-review-button-container {
margin-left: auto;
flex-grow: 0;
}
Loading

0 comments on commit 8fd97e7

Please sign in to comment.