Skip to content

Commit

Permalink
Merge pull request #1163 from w3c/development
Browse files Browse the repository at this point in the history
Includes the following changes:

**Features and Fixes**
* #1125 
* #1135
* #1144
* #1146
* #1150
* #1152
* #1153
* #1160

**Infrastructure changes**
* #969
* #1151
* #1148

---------

Co-authored-by: alflennik <[email protected]>
Co-authored-by: Mx Corey Frang <[email protected]>
Co-authored-by: cypress evelyn masso <[email protected]>
Co-authored-by: Stalgia Grigg <[email protected]>
  • Loading branch information
5 people authored Jul 22, 2024
2 parents a3e2b23 + d118b35 commit f49f6e6
Show file tree
Hide file tree
Showing 547 changed files with 55,380 additions and 56,683 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ trim_trailing_whitespace = true

[*.{html,css,js}]
indent_style = space
indent_size = 4
indent_size = 2

[*.md]
trim_trailing_whitespace = false
88 changes: 57 additions & 31 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,62 @@
{
"env": {
"browser": true,
"es6": true,
"node": true,
"jest/globals": true
"env": {
"browser": true,
"es6": true,
"node": true,
"jest/globals": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"prettier",
"plugin:prettier/recommended",
"plugin:jest/recommended"
],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"prettier",
"plugin:prettier/recommended",
"plugin:jest/recommended"
"ecmaVersion": 2020,
"sourceType": "module"
},
"plugins": [
"react",
"json",
"prettier",
"jest"
],
"rules": {
"linebreak-style": [
"error",
"unix"
],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2020,
"sourceType": "module"
},
"plugins": ["react", "json", "prettier", "jest"],
"rules": {
"linebreak-style": ["error", "unix"],
"semi": ["error", "always"],
"eol-last": ["error", "always"],
"no-console": ["error", { "allow": ["warn", "error"] }],
"no-use-before-define": ["off"],
"react/display-name": ["off"]
},
"settings": {
"react": {
"version": "detect"
}
"semi": [
"error",
"always"
],
"eol-last": [
"error",
"always"
],
"no-console": [
"error",
{
"allow": [
"warn",
"error"
]
}
],
"no-use-before-define": [
"off"
],
"react/display-name": [
"off"
]
},
"settings": {
"react": {
"version": "detect"
}
}
}
16 changes: 0 additions & 16 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,6 @@ updates:
schedule:
interval: "monthly"

- package-ecosystem: "npm"
open-pull-requests-limit: 5
directory: "/client"
schedule:
interval: "monthly"
commit-message:
prefix: "client"

- package-ecosystem: "npm"
open-pull-requests-limit: 5
directory: "/server"
schedule:
interval: "monthly"
commit-message:
prefix: "server"

- package-ecosystem: "github-actions"
open-pull-requests-limit: 99
directory: "/"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/runtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout the repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install NodeJS 18
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18'
cache: 'npm'
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"singleQuote": true,
"tabWidth": 4,
"tabWidth": 2,
"arrowParens": "avoid",
"trailingComma": "none"
}
6 changes: 2 additions & 4 deletions admins.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,15 @@ boazsender
mfairchild365
gnarf
jugglinmike
mzgoddard
isaacdurazo
sinabahram
evmiguel
alflennik
jscholes
howard-e
mcking65
lolaodelola
stalgiag
IsaDC
ccanash
Paul-Clue
gracemccants
outofambit
ChrisC
10 changes: 5 additions & 5 deletions client/.storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
core: {
builder: 'webpack5'
},
stories: ['../stories/*.stories.jsx'],
addons: ['@storybook/addon-a11y', '@storybook/addon-controls']
core: {
builder: 'webpack5'
},
stories: ['../stories/*.stories.jsx'],
addons: ['@storybook/addon-a11y', '@storybook/addon-controls']
};
9 changes: 7 additions & 2 deletions client/babel.config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{
"presets": ["@babel/env", "@babel/preset-react"],
"plugins": ["lodash"]
"presets": [
"@babel/preset-env",
"@babel/preset-react"
],
"plugins": [
"lodash"
]
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.add-test-to-queue-confirmation {
max-width: clamp(40vw, 300px, 800px);
max-width: clamp(40vw, 300px, 800px);
}
Loading

0 comments on commit f49f6e6

Please sign in to comment.