Skip to content

Commit a43fca7

Browse files
authored
Merge pull request #2552 from system-ui/lachlanjc-patch-1
components: [Alert] Add ARIA role
2 parents 5543eae + b7615af commit a43fca7

File tree

17 files changed

+3076
-2444
lines changed

17 files changed

+3076
-2444
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ updates:
77
interval: monthly
88
open-pull-requests-limit: 10
99
ignore:
10-
- dependency-name: '@codechecks/client'
1110
- dependency-name: '*'
1211
update-types: ['version-update:semver-patch']
1312
- dependency-name: 'gatsby-plugin-mdx' # pinned to 2.4

.github/workflows/ci.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v4
1717

18-
- uses: pnpm/action-setup@v2
19-
with:
20-
version: 9.12.1
18+
- uses: pnpm/action-setup@v4
2119

22-
- uses: actions/setup-node@v3
20+
- uses: actions/setup-node@v4
2321
with:
24-
node-version: 20.x
22+
node-version: 22.x
2523
cache: 'pnpm'
2624

2725
- name: Install
@@ -39,11 +37,13 @@ jobs:
3937
- name: Build
4038
run: pnpm build
4139

42-
- name: Run Codechecks
43-
run: pnpm codechecks
44-
env:
45-
CC_SECRET: ${{ secrets.CC_SECRET }}
46-
if: ${{ env.CC_SECRET != '' }}
40+
# Commented out for now.
41+
# - name: Check bundle size
42+
# uses: andresz1/[email protected]
43+
# with:
44+
# github_token: ${{ secrets.GITHUB_TOKEN }}
45+
# skip_step: install
46+
# package_manager: pnpm
4747

4848
# Dependabot and PRs from forks should not release canaries,
4949
# but secrets and env vars cannot be read in `job.if`, so we check if
@@ -79,13 +79,13 @@ jobs:
7979
fetch-depth: 100
8080
fetch-tags: true
8181

82-
- uses: pnpm/action-setup@v2
82+
- uses: pnpm/action-setup@v4
8383
with:
84-
version: 9.12.1
84+
version: 10
8585

86-
- uses: actions/setup-node@v3
86+
- uses: actions/setup-node@v4
8787
with:
88-
node-version: 20.x
88+
node-version: 22.x
8989
cache: 'pnpm'
9090
registry-url: 'https://registry.npmjs.org'
9191

.github/workflows/e2e.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v2
2323

24-
- uses: pnpm/action-setup@v2
25-
with:
26-
version: 9.12.1
24+
- uses: pnpm/action-setup@v4
2725

28-
- uses: actions/setup-node@v2
26+
- uses: actions/setup-node@v4
2927
with:
30-
node-version: 18.x
28+
node-version: 22.x
3129
cache: 'pnpm'
3230

3331
- name: Install

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
22

.size-limit.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[
2+
{ "path": "./packages/color/dist/theme-ui-color.esm.js", "gzip": true },
3+
{ "path": "./packages/color-modes/dist/theme-ui-color-modes.esm.js", "gzip": true },
4+
{ "path": "./packages/components/dist/theme-ui-components.esm.js", "gzip": true },
5+
{ "path": "./packages/core/dist/theme-ui-core.esm.js", "gzip": true },
6+
{ "path": "./packages/css/dist/theme-ui-css.esm.js", "gzip": true },
7+
{ "path": "./packages/custom-properties/dist/theme-ui-custom-properties.esm.js", "gzip": true },
8+
{ "path": "./packages/gatsby-plugin-theme-ui/dist/gatsby-plugin-theme-ui.cjs.js", "gzip": true },
9+
{ "path": "./packages/match-media/dist/theme-ui-match-media.esm.js", "gzip": true },
10+
{ "path": "./packages/mdx/dist/theme-ui-mdx.esm.js", "gzip": true },
11+
{ "path": "./packages/parse-props/dist/theme-ui-parse-props.esm.js", "gzip": true },
12+
{ "path": "./packages/prism/dist/theme-ui-prism.esm.js", "gzip": true },
13+
{ "path": "./packages/theme-provider/dist/theme-ui-theme-provider.esm.js", "gzip": true },
14+
{ "path": "./packages/theme-ui/dist/theme-ui.esm.js", "gzip": true },
15+
{ "path": "./packages/typography/dist/theme-ui-typography.esm.js", "gzip": true }
16+
]

codechecks.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

examples/next/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@mdx-js/react": "^2.3.0",
1818
"@next/mdx": "^14.0.4",
1919
"@theme-ui/css": "workspace:^",
20-
"next": "^15.1.2",
20+
"next": "^15.3.8",
2121
"react": "^18.1.0",
2222
"react-dom": "^18",
2323
"theme-ui": "workspace:^"

examples/next/tsconfig.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
"forceConsistentCasingInFileNames": true,
99
"noEmit": true,
1010
"esModuleInterop": true,
11-
"module": "esnext",
12-
"moduleResolution": "node",
11+
"module": "ESNext",
12+
"moduleResolution": "Bundler",
1313
"resolveJsonModule": true,
1414
"isolatedModules": true,
1515
"jsx": "preserve",
1616
"incremental": true
1717
},
18-
"exclude": ["node_modules", ".next", "out"],
18+
"exclude": ["node_modules", ".next", "out", "../../packages"],
1919
"include": ["**/*.ts", "**/*.tsx", "**/*.mdx", "lib/*.d.ts", "next-env.d.ts"]
2020
}

package.json

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"lint": "eslint --ext .ts,.tsx,.js \"packages/**/*.{ts,tsx,js,mtsx,mts}\"",
1313
"test": "cross-env \"NODE_OPTIONS=--experimental-vm-modules --no-warnings\" jest",
1414
"test:coverage": "cross-env \"NODE_OPTIONS=--experimental-vm-modules --no-warnings\" jest --coverage",
15+
"test:update-snapshots": "cross-env \"NODE_OPTIONS=--experimental-vm-modules --no-warnings\" jest --updateSnapshot",
1516
"typecheck": "tsc --noEmit",
1617
"typecheck:tests": "tsc --noEmit -P ./tsconfig.test.json",
1718
"logo": "pnpm run --filter docs logo",
@@ -60,7 +61,14 @@
6061
"@typescript-eslint/parser": "*",
6162
"@typescript-eslint/eslint-plugin": "*"
6263
}
63-
}
64+
},
65+
"onlyBuiltDependencies": [
66+
"@percy/core",
67+
"cypress",
68+
"esbuild",
69+
"gatsby",
70+
"sharp"
71+
]
6472
},
6573
"dependencies": {
6674
"@auto-it/all-contributors": "^11.2.1",
@@ -71,31 +79,29 @@
7179
"@auto-it/npm": "^11.2.1",
7280
"@auto-it/omit-commits": "^11.2.1",
7381
"@auto-it/released": "^11.2.1",
74-
"@babel/cli": "^7.22.5",
75-
"@babel/helper-string-parser": "^7.22.5",
76-
"@babel/helper-validator-identifier": "^7.22.5",
82+
"@babel/cli": "^7.28.3",
83+
"@babel/helper-string-parser": "^7.27.1",
84+
"@babel/helper-validator-identifier": "^7.28.5",
7785
"@babel/plugin-transform-runtime": "^7.24.3",
78-
"@babel/preset-env": "^7.22.5",
79-
"@babel/preset-react": "^7.22.5",
80-
"@babel/preset-typescript": "^7.22.5",
81-
"@babel/runtime": "^7.25.7",
82-
"@codechecks/build-size-watcher": "^0.1.0",
83-
"@codechecks/client": "0.1.12",
84-
"@emotion/jest": "^11.13.0",
86+
"@babel/preset-env": "^7.28.5",
87+
"@babel/preset-react": "^7.28.5",
88+
"@babel/preset-typescript": "^7.28.5",
89+
"@babel/runtime": "^7.28.4",
90+
"@emotion/jest": "^11.14.2",
8591
"@jest/types": "^29.6.3",
86-
"@preconstruct/cli": "^2.8.9",
92+
"@preconstruct/cli": "^2.8.12",
8793
"@testing-library/react": "^14.2.1",
8894
"@types/eslint": "8.56.2",
8995
"@types/jest": "^29.5.13",
9096
"@types/node": "^20.3.1",
9197
"@types/react-dom": "^18.2.5",
9298
"@types/react-test-renderer": "^18.3.0",
93-
"@types/semver": "^7.5.0",
99+
"@types/semver": "^7.7.1",
94100
"@typescript-eslint/eslint-plugin": "^5.59.11",
95101
"@typescript-eslint/parser": "^5.59.11",
96-
"auto": "^11.2.1",
102+
"auto": "^11.3.6",
97103
"babel-jest": "^29.7.0",
98-
"babel-preset-gatsby": "^3.13.2",
104+
"babel-preset-gatsby": "^3.15.0",
99105
"cross-env": "^7.0.3",
100106
"egzek": "^1.2.0",
101107
"eslint": "^8.56.0",
@@ -104,16 +110,18 @@
104110
"jest-canvas-mock": "^2.5.2",
105111
"jest-environment-jsdom": "^29.7.0",
106112
"jest-mock-console": "^2.0.0",
107-
"jest-ts-webcompat-resolver": "^1.0.0",
113+
"jest-ts-webcompat-resolver": "^1.0.1",
108114
"postinstall-postinstall": "^2.1.0",
109115
"prettier": "^2.8.8",
110116
"react-test-renderer": "^18.3.1",
111117
"rimraf": "^5.0.1",
112-
"semver": "^7.6.3",
113-
"ts-jest": "^29.2.5",
118+
"semver": "^7.7.3",
119+
"ts-jest": "^29.4.6",
114120
"ts-toolbelt": "^9.6.0",
115121
"typecov": "^0.2.3",
116-
"typescript": "^5.6.3"
122+
"typescript": "^5.9.3",
123+
"@size-limit/preset-big-lib": "12.0.0",
124+
"size-limit": "12.0.0"
117125
},
118-
"packageManager": "pnpm@9.12.1+sha512.e5a7e52a4183a02d5931057f7a0dbff9d5e9ce3161e33fa68ae392125b79282a8a8a470a51dfc8a0ed86221442eb2fb57019b0990ed24fab519bf0e1bc5ccfc4"
126+
"packageManager": "pnpm@10.26.2"
119127
}

packages/components/src/Alert.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export const Alert: ForwardRef<HTMLDivElement, AlertProps> = React.forwardRef(
1818
<Box
1919
ref={ref}
2020
variant="primary"
21+
role="alert"
2122
{...props}
2223
{...__internalProps({
2324
__themeKey: 'alerts',

0 commit comments

Comments
 (0)