Skip to content

Commit a9b8e4a

Browse files
committed
Merge remote-tracking branch 'origin/main' into mcp-multiple-packages-refactor
2 parents accba22 + cf7c154 commit a9b8e4a

File tree

705 files changed

+62388
-16501
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

705 files changed

+62388
-16501
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,30 @@ parameters:
1616
executors:
1717
rsp:
1818
docker:
19-
- image: cimg/node:22.13.1
19+
- image: cimg/node:22.21.1
2020
environment:
2121
CACHE_VERSION: v1
2222
working_directory: ~/react-spectrum
2323

2424
rsp-large:
2525
docker:
26-
- image: cimg/node:22.13.1
26+
- image: cimg/node:22.21.1
2727
resource_class: large
2828
environment:
2929
CACHE_VERSION: v1
3030
working_directory: ~/react-spectrum
3131

3232
rsp-xlarge:
3333
docker:
34-
- image: cimg/node:22.13.1
34+
- image: cimg/node:22.21.1
3535
resource_class: xlarge
3636
environment:
3737
CACHE_VERSION: v1
3838
working_directory: ~/react-spectrum
3939

4040
rsp-2xlarge:
4141
docker:
42-
- image: cimg/node:22.13.1
42+
- image: cimg/node:22.21.1
4343
resource_class: 2xlarge
4444
environment:
4545
CACHE_VERSION: v1

.cursor/rules/add-subheadings.mdc

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
alwaysApply: false
3+
---
4+
5+
# Step 3: Add sub-headings
6+
7+
Within the Enhancements, Fixes, and Under Construction categories, group commits by UI component under sub-headings.
8+
9+
### Sub-heading rules:
10+
- Use sub-headings ONLY for:
11+
- Enhancements
12+
- Fixes
13+
- Under Construction
14+
- Do NOT create sub-headings for:
15+
- Documentation
16+
- To Be Categorized
17+
- S2
18+
- Sub-headings should be in alphabetical order
19+
- Use "Miscellaneous" as a sub-heading for commits that do not belong to a specific component
20+
- Each category can have its own Miscellaneous sub-heading
21+
- Write sub-headings and commits as unordered lists using a hyphen (-)
22+
- Do NOT bold the sub-heading text
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
alwaysApply: false
3+
---
4+
5+
# Step 1: Categorize commits
6+
7+
Sort ALL commit messages into one of six main categories. The main categories are the following:
8+
- Enhancements
9+
- Fixes
10+
- Documentation
11+
- Under Construction
12+
- To Be Categorized
13+
- S2
14+
15+
Before categorizing commits into other groups, check whether each commit should be classified as “Under Construction.”
16+
- Follow the steps below in order:
17+
1. Identify pre-release packages
18+
- Use a command such as grep to scan the repository for package versions that include prerelease identifiers (e.g., alpha, beta, rc)
19+
2. Extract component keywords from commit messages
20+
- Parse each commit message to identify possible component names
21+
- Normalize these keywords (e.g., lowercase, remove punctuation) for easier comparison.
22+
3. Compare extracted keywords with pre-release packages
23+
- If any keyword matches a package in the list, mark the commit as Under Construction.
24+
4. Check for explicit prerelease keywords in commit text
25+
- If the commit message directly includes alpha, beta, or rc, classify it as Under Construction, regardless of package matches.
26+
27+
Next, categorize the remaining commits not categorized as "Under Construction". Use the following keywords to determine the category:
28+
| Keyword | Category |
29+
|----------------------------|----------|
30+
| feat | Enhancements|
31+
| fix | Fixes |
32+
| docs | Documentation |
33+
| chore, revert, bump, build | To Be Categorized |
34+
| S2 | S2 |
35+
36+
Do not duplicate commits. In terms of priority, it should be Under Construction > S2 > To Be Categorized > Enhancements > Fixes > Documentation
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
alwaysApply: false
3+
---
4+
5+
You are a expert technical writer for front-end development.
6+
7+
# Step 2: Rewrite commit messages
8+
9+
Original format: Type (Scope): Summary of changes - [@username](link to username) - [PR](link to PR)
10+
New Format: Summary of changes - [@username](link to username) - [PR](link to PR)
11+
12+
### General Guidelines:
13+
- Keep the summary as a single, grammatically correct sentence
14+
- Verbs should be first person present tense but do NOT include the subject (e.g. I)
15+
- The message should be concise and easy to read
16+
- Wrap any camelCase or code-like terms (e.g. onClick, onAction, isDisabled) in backticks (``)
17+
- Do NOT use backticks for component names
18+
- Replace specific terms:
19+
- RAC -> React Aria
20+
- V3 -> React Spectrum
21+
- ALWAYS capitalize UI component names
22+
- Example:
23+
- toast -> Toast
24+
- inline alert -> InlineAlert
25+
26+
### Component Names to Capitalize:
27+
Accordion, Autocomplete, Badge, Breadcrumbs, Buttons, Calendar, Checkbox, CheckboxGroup, Collections, ColorArea, ColorField, ColorPicker, ColorSlider, ColorSwatch, ColorSwatchPicker, ColorWheel, ComboBox, Date and Time, DateField, DatePicker, DateRangePicker, Dialog, Disclosure, DisclosureGroup, Drag and Drop, DropZone, FileTrigger, Form, InlineAlert, Link, Listbox, ListView, Menu, Meter, Modal, NotificationBadge, NumberField, Picker, ProgressBar, ProgressCircle, RadioGroup, RangeCalendar, SearchField, Select, Slider, StatusLight, Switch, Table, Tabs, TagGroup, TextArea, TextField, TimeField, Toast, ToggleButton, ToggleButtonGroup, Tooltip, Tree, Virtualizer.

.parcelrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"*.{md,mdx}": ["parcel-transformer-mdx-docs"],
1212
"*.svg": ["@parcel/transformer-svg-react"],
1313
"packages/@react-aria/example-theme/**/*.css": ["@parcel/transformer-css"],
14+
"starters/docs/src/*.css": ["@parcel/transformer-css"],
1415
"*.css": ["...", "parcel-transformer-css-env"],
1516
"*.{js,mjs,jsm,jsx,es6,cjs,ts,tsx}": [
1617
"@parcel/transformer-js",

eslint.config.mjs

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import reactHooks from "eslint-plugin-react-hooks";
55
import jest from "eslint-plugin-jest";
66
import monorepo from "@jdb8/eslint-plugin-monorepo";
77
import * as rspRules from "eslint-plugin-rsp-rules";
8-
import { fixupPluginRules } from "@eslint/compat";
98
import globals from "globals";
109
import babelParser from "@babel/eslint-parser";
1110
import typescriptEslint from "@typescript-eslint/eslint-plugin";
@@ -68,7 +67,7 @@ export default [{
6867
react,
6968
rulesdir,
7069
"jsx-a11y": jsxA11Y,
71-
"react-hooks": fixupPluginRules(reactHooks),
70+
"react-hooks": reactHooks,
7271
jest,
7372
monorepo,
7473
"rsp-rules": rspRules,
@@ -226,8 +225,28 @@ export default [{
226225
"react/jsx-boolean-value": ERROR,
227226
"react/jsx-first-prop-new-line": [ERROR, "multiline"],
228227
"react/self-closing-comp": ERROR,
228+
229+
// Core hooks rules
229230
"react-hooks/rules-of-hooks": ERROR, // https://github.com/facebook/react/blob/main/packages/eslint-plugin-react-hooks/CHANGELOG.md
230231
"react-hooks/exhaustive-deps": WARN,
232+
233+
// React Compiler rules
234+
'react-hooks/config': ERROR,
235+
'react-hooks/error-boundaries': ERROR,
236+
'react-hooks/component-hook-factories': ERROR,
237+
'react-hooks/gating': ERROR,
238+
'react-hooks/globals': ERROR,
239+
// 'react-hooks/immutability': ERROR,
240+
// 'react-hooks/preserve-manual-memoization': ERROR, // No idea how to turn this one on yet
241+
'react-hooks/purity': ERROR,
242+
// 'react-hooks/refs': ERROR, // can't turn on until https://github.com/facebook/react/issues/34775 is fixed
243+
'react-hooks/set-state-in-effect': ERROR,
244+
'react-hooks/set-state-in-render': ERROR,
245+
'react-hooks/static-components': ERROR,
246+
'react-hooks/unsupported-syntax': WARN,
247+
'react-hooks/use-memo': ERROR,
248+
'react-hooks/incompatible-library': WARN,
249+
231250
"rsp-rules/no-react-key": [ERROR],
232251
"rsp-rules/sort-imports": [ERROR],
233252
"rulesdir/imports": [ERROR],
@@ -333,7 +352,7 @@ export default [{
333352
react,
334353
rulesdir,
335354
"jsx-a11y": jsxA11Y,
336-
"react-hooks": fixupPluginRules(reactHooks),
355+
"react-hooks": reactHooks,
337356
jest,
338357
"@typescript-eslint": typescriptEslint,
339358
monorepo,

0 commit comments

Comments
 (0)