Skip to content

Commit 146587b

Browse files
committed
Merge branch 'main' into thumb-alignment
2 parents 1a4be49 + 22473d1 commit 146587b

File tree

691 files changed

+34686
-31291
lines changed

Some content is hidden

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

691 files changed

+34686
-31291
lines changed

.changeset/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Changesets
2+
3+
Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
4+
with multi-package repos, or single-package repos to help you version and publish your code. You can
5+
find the full documentation for it [in our repository](https://github.com/changesets/changesets)
6+
7+
We have a quick list of common questions to get you started engaging with this project in
8+
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/changelog.cjs

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
// https://github.com/ariakit/ariakit/blob/main/.changeset/changelog.cjs
2+
// MIT License, Copyright (c) Diego Haz
3+
4+
/** @type {import("@changesets/types").ChangelogFunctions["getDependencyReleaseLine"]} */
5+
async function getDependencyReleaseLine(_, dependenciesUpdated) {
6+
if (dependenciesUpdated.length === 0) return '';
7+
const updatedDepenenciesList = dependenciesUpdated.map(
8+
(dependency) => `\`${dependency.name}@${dependency.newVersion}\``,
9+
);
10+
return `- Updated dependencies: ${updatedDepenenciesList.join(', ')}`;
11+
}
12+
13+
/** @type {import("@changesets/types").ChangelogFunctions["getReleaseLine"]} */
14+
async function getReleaseLine(changeset) {
15+
const [firstLine, ...nextLines] = changeset.summary.split('\n').map((l) => l.trimEnd());
16+
17+
if (!nextLines.length) return `- ${firstLine}`;
18+
19+
return `### ${firstLine}\n${nextLines.join('\n')}`;
20+
}
21+
22+
/**
23+
* @param {Array<Promise<string>} changelogLines
24+
*/
25+
async function getChangelogText(changelogLines) {
26+
const lines = await Promise.all(changelogLines);
27+
if (!lines.length) return '';
28+
29+
const isOverviewLine = (l) => l.startsWith('### Overview\n');
30+
const isHeadingLine = (l) => l.startsWith('###');
31+
const isOtherLine = (l) => !l.startsWith('###');
32+
33+
const headingLines = lines
34+
.filter(isHeadingLine)
35+
.sort((a, b) => {
36+
if (isOverviewLine(a)) return -1;
37+
if (isOverviewLine(b)) return 1;
38+
return 0;
39+
})
40+
.map((l) => l.replace('### Overview\n\n', ''));
41+
42+
const otherLines = lines.filter(isOtherLine);
43+
if (!headingLines.length && !otherLines.length) return '';
44+
45+
const other = otherLines.join('\n');
46+
if (!headingLines.length) return other;
47+
48+
const heading = headingLines.join('\n\n');
49+
if (!otherLines.length) return heading;
50+
51+
return `${heading}\n\n### Other updates\n\n${other}`;
52+
}
53+
54+
/**
55+
* @param {import("@changesets/types").ModCompWithPackage} release
56+
* @param {Record<"major" | "minor" | "patch", Array<Promise<string>>} changelogLines
57+
*/
58+
async function getChangelogEntry(release, changelogLines) {
59+
// const date = new Date().toLocaleDateString("en-US", {
60+
// month: "long",
61+
// day: "numeric",
62+
// year: "numeric",
63+
// });
64+
const text = await getChangelogText(Object.values(changelogLines).flat());
65+
return `## ${release.newVersion}\n\n${text}`;
66+
}
67+
68+
module.exports = {
69+
getDependencyReleaseLine,
70+
getReleaseLine,
71+
getChangelogEntry,
72+
};

.changeset/config.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"$schema": "https://unpkg.com/@changesets/config@3.1.1/schema.json",
3+
"changelog": "./changelog.cjs",
4+
"access": "public",
5+
"commit": false,
6+
"fixed": [],
7+
"linked": [],
8+
"baseBranch": "main",
9+
"updateInternalDependencies": "patch",
10+
"snapshot": {
11+
"useCalculatedVersion": true,
12+
"prereleaseTemplate": "rc.{timestamp}"
13+
},
14+
"ignore": ["@repo/ssr-testing", "@repo/storybook"]
15+
}

.changeset/silent-turkeys-fly.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@radix-ui/react-collection': patch
3+
---
4+
5+
Updated `unstable_createCollection` signature to extend `BaseItemData` internally

.changeset/ten-pumas-agree.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@radix-ui/react-direction': patch
3+
---
4+
5+
Added `use client` directive to module entrypoint

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Add the following users as reviewers on new pull requests
22

3-
* @StephenHaney @vladmoroz @lucasmotta @hadihallak @chaance
3+
- @lucasmotta @hadihallak @chaance

.github/CONTRIBUTING.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ git pull upstream main
6868
node -v
6969
```
7070

71-
5. Install dependencies with [yarn](https://yarnpkg.com):
71+
1. Install dependencies with [pnpm](https://pnpm.io):
7272

7373
```sh
74-
yarn install
74+
pnpm install
7575
```
7676

7777
6. Create a new branch related to your PR:
@@ -92,20 +92,20 @@ git push -u origin HEAD
9292

9393
## Working locally
9494

95-
The repo is managed with Yarn Workspaces.
95+
The repo is managed with pnpm workspaces.
9696

9797
### Development
9898

9999
```bash
100100
# install dependencies
101-
yarn install
101+
pnpm install
102102

103103
# start Storybook and see examples in the browser
104-
yarn dev
104+
pnpm dev
105105
```
106106

107-
Make your changes and check that they resolve the problem with an example in Storybook. We also suggest adding tests to support your change, and then run `yarn test` to make sure nothing is broken.
107+
Make your changes and check that they resolve the problem with an example in Storybook. We also suggest adding tests to support your change, and then run `pnpm test` to make sure nothing is broken.
108108

109-
You also need to inform Yarn workspaces that a particular package has changed for proper versioning. Run `yarn version check -i` to mark the appropriate type of change for those packages.
109+
You also need to inform Changesets that a particular package has changed for proper versioning. Run `pnpm changeset` to mark the appropriate type of change for those packages, then commit the resulting Changeset files.
110110

111-
Lastly, run `yarn build` to ensure that the build runs successfully before submitting the pull request.
111+
Lastly, run `pnpm build` to ensure that the build runs successfully before submitting the pull request.

.github/ISSUE_TEMPLATE/Bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ about: 'Create a bug report'
3636
| Browser | | |
3737
| Assistive tech | | |
3838
| Node | n/a | |
39-
| npm/yarn | | |
39+
| npm/yarn/pnpm | | |
4040
| Operating System | | |

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
Thank you for contributing! Please follow the steps below to help us process your PR quickly.
44
55
- 📝 Use a meaningful title for the pull request and include the name of the package modified.
6-
- ✅ Add or edit tests to reflect the change (run `yarn test`).
7-
- 🔍 Add or edit Storybook examples to reflect the change (run `yarn dev`).
6+
- ✅ Add or edit tests to reflect the change (run `pnpm test`).
7+
- 🔍 Add or edit Storybook examples to reflect the change (run `pnpm dev`).
88
- 🙏 Please review your own PR to check for anything you may have missed.
99
1010
-->

.github/workflows/build.yml

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,36 @@ on:
55
branches:
66
- main
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
913
test:
1014
runs-on: ubuntu-latest
1115
steps:
1216
- name: Checkout
13-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1418

15-
- name: Read Node version
16-
id: node_version
17-
run: echo "NVMRC=$(cat .nvmrc)" >> $GITHUB_OUTPUT
18-
- name: Set Node version
19-
uses: actions/setup-node@v2
19+
- name: Setup pnpm
20+
uses: pnpm/action-setup@v4
2021
with:
21-
node-version: '${{ steps.node_version.outputs.NVMRC }}'
22+
run_install: false
2223

23-
- name: Get yarn cache directory path
24-
id: yarn-cache-dir-path
25-
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
26-
- uses: actions/cache@v1
24+
- name: Setup Node
25+
uses: actions/setup-node@v4
2726
with:
28-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
29-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
27+
node-version-file: '.nvmrc'
28+
cache: 'pnpm'
29+
3030
- name: Install dependencies
31-
if: steps.yarn-cache-dir-path.outputs.cache-hit != 'true'
32-
run: yarn
31+
run: pnpm install --frozen-lockfile
32+
33+
- name: Lint
34+
run: pnpm lint
35+
3336
- name: Run build
34-
run: yarn build
37+
run: pnpm build
38+
3539
- name: Run tests
36-
run: yarn test:ci
40+
run: pnpm test:ci

0 commit comments

Comments
 (0)