diff --git a/.circleci/config.yml b/.circleci/config.yml index 4175d429d0..0664c44068 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 docker_defaults: &docker_defaults docker: - - image: cypress/browsers:node16.17.1-chrome106-ff105-edge + - image: cypress/browsers:latest environment: TERM: xterm working_directory: ~/project/repo diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json index 513e922358..22e243ad13 100644 --- a/.codesandbox/ci.json +++ b/.codesandbox/ci.json @@ -2,5 +2,5 @@ "buildCommand": "build", "packages": ["packages/*"], "sandboxes": ["nfmxw"], - "node": "16" + "node": "20" } diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9007e0dfb5..65b2c9e3ba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,10 +23,10 @@ jobs: # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits fetch-depth: 0 - - name: Setup Node.js 16.x - uses: actions/setup-node@v3 + - name: Setup Node.js 22.x + uses: actions/setup-node@v4 with: - node-version: 16.x + node-version: 22.x - name: Install Dependencies run: yarn diff --git a/.nvmrc b/.nvmrc index b6a7d89c68..2bd5a0a98a 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16 +22 diff --git a/README.md b/README.md index f053de2e98..99367b05d5 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The Select control for [React](https://reactjs.org). Initially built for use in See [react-select.com](https://www.react-select.com) for live demos and comprehensive docs. `react-select` is funded by [Thinkmill](https://www.thinkmill.com.au) and [Atlassian](https://atlaskit.atlassian.com). -We are an open source project that is continously supported by the community. +We are an open source project that is continuously supported by the community. React Select helps you develop powerful select components that _just work_ out of the box, without stopping you from customising the parts that are important to you. @@ -127,7 +127,7 @@ Thank you to everyone who has contributed to this project. It's been a wild ride If you like React Select, you should [follow me on Twitter](https://twitter.com/jedwatson)! -Shout out to [Joss Mackison](https://github.com/jossmac), [Charles Lee](https://github.com/gwyneplaine), [Ben Conolly](https://github.com/Noviny), [Tom Walker](https://github.com/bladey), [Nathan Bierema](https://github.com/Methuselah96), [Eric Bonow](https://github.com/ebonow), [Mitchell Hamilton](https://github.com/mitchellhamilton), [Dave Brotherstone](https://github.com/bruderstein), [Brian Vaughn](https://github.com/bvaughn), and the [Atlassian Design System](https://atlassian.design) team who along with many other contributors have made this possible ❤️ +Shout out to [Joss Mackison](https://github.com/jossmac), [Charles Lee](https://github.com/gwyneplaine), [Ben Conolly](https://github.com/Noviny), [Tom Walker](https://github.com/bladey), [Nathan Bierema](https://github.com/Methuselah96), [Eric Bonow](https://github.com/ebonow), [Emma Hamilton](https://github.com/emmatown), [Dave Brotherstone](https://github.com/bruderstein), [Brian Vaughn](https://github.com/bvaughn), and the [Atlassian Design System](https://atlassian.design) team who along with many other contributors have made this possible ❤️ ## License diff --git a/cypress/fixtures/selectors.json b/cypress/fixtures/selectors.json index 9c6ecbdaba..da975f7e1c 100644 --- a/cypress/fixtures/selectors.json +++ b/cypress/fixtures/selectors.json @@ -10,6 +10,7 @@ "indicatorClear": ".react-select__clear-indicator", "indicatorDropdown": ".react-select__dropdown-indicator", "menu": ".react-select__menu", + "control": ".react-select__control", "menuOption": ".react-select__option", "noOptionsValue": ".react-select__menu-notice--no-options", "placeholder": ".react-select__placeholder", diff --git a/cypress/integration/single-select.spec.ts b/cypress/integration/single-select.spec.ts index d4700dc154..2e7effeca5 100644 --- a/cypress/integration/single-select.spec.ts +++ b/cypress/integration/single-select.spec.ts @@ -107,7 +107,11 @@ describe('Single Select', () => { .click({ force: true }) .find('input') .should('exist') - .should('be.disabled'); + .should('be.disabled') + // control should have aria-disabled + .get(selector.singleBasicSelect) + .find(selector.control) + .should('have.attr', 'aria-disabled', 'true'); }); it(`Should filter options when searching in view: ${viewport}`, () => { diff --git a/docs/generate-magical-types/generate/package.json b/docs/generate-magical-types/generate/package.json index c8cade72a6..3ea23b80e4 100644 --- a/docs/generate-magical-types/generate/package.json +++ b/docs/generate-magical-types/generate/package.json @@ -1,3 +1,4 @@ { - "main": "dist/react-select-generate-magical-types-generate.cjs.js" + "main": "dist/react-select-generate-magical-types-generate.cjs.js", + "module": "dist/react-select-generate-magical-types-generate.esm.js" } diff --git a/docs/generate-magical-types/package.json b/docs/generate-magical-types/package.json index 9af9564a97..0879e4ece4 100644 --- a/docs/generate-magical-types/package.json +++ b/docs/generate-magical-types/package.json @@ -1,6 +1,19 @@ { "name": "@react-select/generate-magical-types", "main": "dist/generate-magical-types.cjs.js", + "exports": { + "./generate": { + "module": "./generate/dist/react-select-generate-magical-types-generate.esm.js", + "import": "./generate/dist/react-select-generate-magical-types-generate.cjs.mjs", + "default": "./generate/dist/react-select-generate-magical-types-generate.cjs.js" + }, + "./serialize": { + "module": "./serialize/dist/react-select-generate-magical-types-serialize.esm.js", + "import": "./serialize/dist/react-select-generate-magical-types-serialize.cjs.mjs", + "default": "./serialize/dist/react-select-generate-magical-types-serialize.cjs.js" + }, + "./package.json": "./package.json" + }, "//": "these deps aren't real, they're just to appease preconstruct", "dependencies": { "@babel/runtime": "*", diff --git a/docs/generate-magical-types/serialize/package.json b/docs/generate-magical-types/serialize/package.json index 2b2d88a1f4..c2c2c78370 100644 --- a/docs/generate-magical-types/serialize/package.json +++ b/docs/generate-magical-types/serialize/package.json @@ -1,3 +1,4 @@ { - "main": "dist/react-select-generate-magical-types-serialize.cjs.js" + "main": "dist/react-select-generate-magical-types-serialize.cjs.js", + "module": "dist/react-select-generate-magical-types-serialize.esm.js" } diff --git a/docs/pages/typescript/index.tsx b/docs/pages/typescript/index.tsx index ae1f1b4f1c..f296b03e20 100644 --- a/docs/pages/typescript/index.tsx +++ b/docs/pages/typescript/index.tsx @@ -84,14 +84,19 @@ const onChange = (option: readonly Option[], actionMeta: ActionMeta