Skip to content

Commit

Permalink
Merge branch 'main' into avatar-referer-policy
Browse files Browse the repository at this point in the history
  • Loading branch information
chaance authored Aug 16, 2024
2 parents a479bc4 + 060746a commit ac71ba5
Show file tree
Hide file tree
Showing 223 changed files with 6,670 additions and 7,893 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Add the following users as reviewers on new pull requests

* @benoitgrelard @andy-hook @vladmoroz @lucasmotta
* @StephenHaney @vladmoroz @lucasmotta @hadihallak @chaance
10 changes: 10 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@ const config: StorybookConfig = {
strictMode: true,
},
},
swc: () => ({
jsc: {
transform: {
react: {
// Do not require importing React into scope to use JSX
runtime: 'automatic',
},
},
},
}),

// we need to add aliases to webpack so it knows how to follow
// to the source of the packages rather than the built version (dist)
Expand Down
13 changes: 0 additions & 13 deletions .yarn/versions/2ab74363.yml

This file was deleted.

13 changes: 0 additions & 13 deletions .yarn/versions/5793010b.yml

This file was deleted.

18 changes: 0 additions & 18 deletions .yarn/versions/75dcd823.yml

This file was deleted.

File renamed without changes.
6 changes: 6 additions & 0 deletions .yarn/versions/a54ad5a9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
releases:
"@radix-ui/react-scroll-area": minor

declined:
- primitives
- ssr-testing
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
releases:
"@radix-ui/react-scroll-area": patch
"@radix-ui/react-select": patch

declined:
Expand Down
13 changes: 0 additions & 13 deletions .yarn/versions/dc4b1017.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .yarn/versions/ded3a040.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .yarn/versions/e97b6ff3.yml

This file was deleted.

17 changes: 0 additions & 17 deletions .yarn/versions/efa9f1f5.yml

This file was deleted.

13 changes: 0 additions & 13 deletions .yarn/versions/f4333956.yml

This file was deleted.

2 changes: 0 additions & 2 deletions .yarn/versions/fad3e42d.yml

This file was deleted.

42 changes: 0 additions & 42 deletions babel.config.js

This file was deleted.

48 changes: 48 additions & 0 deletions build.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { globSync } from 'glob';
import * as esbuild from 'esbuild';
import * as tsup from 'tsup';

async function build(path) {
const file = `${path}/src/index.ts`;
const dist = `${path}/dist`;

const esbuildConfig = {
entryPoints: [file],
external: ['@radix-ui/*'],
packages: 'external',
bundle: true,
sourcemap: true,
format: 'cjs',
target: 'es2022',
outdir: dist,
};

await esbuild.build(esbuildConfig);
console.log(`Built ${path}/dist/index.js`);

await esbuild.build({
...esbuildConfig,
format: 'esm',
outExtension: { '.js': '.mjs' },
});
console.log(`Built ${path}/dist/index.mjs`);

// tsup is used to emit d.ts files only (esbuild can't do that).
//
// Notes:
// 1. Emitting d.ts files is super slow for whatever reason.
// 2. It could have fully replaced esbuild (as it uses that internally),
// but at the moment its esbuild version is somewhat outdated.
// It’s also harder to configure and esbuild docs are more thorough.
await tsup.build({
entry: [file],
format: ['cjs', 'esm'],
dts: { only: true },
outDir: dist,
silent: true,
external: [/@radix-ui\/.+/],
});
console.log(`Built ${path}/dist/index.d.ts`);
}

globSync('packages/*/*').forEach(build);
1 change: 1 addition & 0 deletions cypress/integration/Form.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ describe('Form', () => {
});

function checkControlMessageAssociation() {
cy.get('@control').should('have.attr', 'aria-describedby');
cy.get('@control')
.invoke('attr', 'aria-describedby')
.then((ariaDescribedby) =>
Expand Down
32 changes: 9 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,44 +18,31 @@
"cypress:dev": "cypress open",
"dev": "yarn storybook",
"build-storybook": "storybook build",
"// build": "For context on tsconfig replacements in build scripts, see https://github.com/radix-ui/primitives/pull/361#discussion_r555004944",
"build": "yarn build:config && yarn build:packages && yarn build:cleanup",
"build:config": "mv tsconfig.json tsconfig.tmp.json && mv tsconfig.production.json tsconfig.json",
"build:packages": "parcel build 'packages/*/*/' --no-cache && yarn build:fix-type-defs",
"build:fix-type-defs": "node ./scripts/fix-type-defs-imports",
"build:cleanup": "mv tsconfig.json tsconfig.production.json && mv tsconfig.tmp.json tsconfig.json",
"build": "node build.mjs",
"publish:stable": "yarn bump:stable && yarn clean && yarn build && yarn workspaces foreach -pvW --exclude primitives --exclude ssr-testing npm publish --tolerate-republish --access public",
"publish:next": "yarn bump:next && yarn clean && yarn build && yarn workspaces foreach -pvW --exclude primitives --exclude ssr-testing npm publish --tolerate-republish --access public --tag next",
"clean": "yarn workspaces foreach -pvW --exclude primitives --exclude ssr-testing run clean",
"reset": "yarn clean && rm -rf node_modules .yarn/cache .parcel-cache",
"reset": "yarn clean && rm -rf node_modules .yarn/cache",
"bump:stable": "yarn version apply --all",
"bump:next": "yarn version apply --all --prerelease",
"bump:check": "yarn version check"
},
"dependencies": {
"react": "^18.0.0",
"react-dom": "^18.0.0"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@babel/core": "^7.17.9",
"@babel/plugin-transform-typescript": "^7.16.8",
"@babel/preset-react": "^7.16.7",
"@babel/template": "^7.16.7",
"@parcel/babel-plugin-transform-runtime": "^2.4.1",
"@parcel/babel-preset-env": "^2.4.1",
"@parcel/packager-ts": "2.4.1",
"@parcel/transformer-typescript-types": "2.4.1",
"@stitches/core": "^1.2.8",
"@storybook/addon-essentials": "^7.6.17",
"@storybook/addon-storysource": "^7.6.17",
"@storybook/react": "^7.6.17",
"@storybook/react-webpack5": "^7.6.17",
"@storybook/test": "^7.6.17",
"@testing-library/cypress": "^7.0.6",
"@testing-library/dom": "^10.1.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.0.1",
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "^14.1.0",
"@types/babel__template": "^7.4.1",
"@types/eslint": "^7.28.0",
"@types/fs-extra": "^11",
"@types/jest": "^27.4.1",
Expand All @@ -65,10 +52,9 @@
"@types/react-test-renderer": "^18.0.0",
"@typescript-eslint/eslint-plugin": "^5.19.0",
"@typescript-eslint/parser": "^5.19.0",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.2.4",
"cypress": "^8.0.0",
"cypress-real-events": "^1.5.0",
"esbuild": "0.21.4",
"eslint": "^7.32.0",
"eslint-config-react-app": "^6.0.0",
"eslint-plugin-cypress": "^2.11.3",
Expand All @@ -85,14 +71,14 @@
"jest-axe": "^6.0.0",
"jest-watch-typeahead": "^1.0.0",
"lint-staged": "^10.5.3",
"parcel": "2.4.1",
"prettier": "^2.0.5",
"pretty-quick": "^2.0.1",
"react-test-renderer": "^18.0.0",
"replace-in-files": "^3.0.0",
"start-server-and-test": "^1.12.5",
"start-server-and-test": "2.0.3",
"storybook": "^7.6.17",
"ts-jest": "^27.1.4",
"tsup": "8.0.2",
"typescript": "^4.6.3"
},
"resolutions": {
Expand Down
5 changes: 1 addition & 4 deletions packages/core/number/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@radix-ui/number",
"version": "1.0.1",
"version": "1.1.0",
"license": "MIT",
"exports": {
".": {
Expand Down Expand Up @@ -34,8 +34,5 @@
},
"bugs": {
"url": "https://github.com/radix-ui/primitives/issues"
},
"dependencies": {
"@babel/runtime": "^7.13.10"
}
}
5 changes: 1 addition & 4 deletions packages/core/primitive/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@radix-ui/primitive",
"version": "1.0.1",
"version": "1.1.0",
"license": "MIT",
"exports": {
".": {
Expand Down Expand Up @@ -34,8 +34,5 @@
},
"bugs": {
"url": "https://github.com/radix-ui/primitives/issues"
},
"dependencies": {
"@babel/runtime": "^7.13.10"
}
}
5 changes: 1 addition & 4 deletions packages/core/rect/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@radix-ui/rect",
"version": "1.0.1",
"version": "1.1.0",
"license": "MIT",
"exports": {
".": {
Expand Down Expand Up @@ -34,8 +34,5 @@
},
"bugs": {
"url": "https://github.com/radix-ui/primitives/issues"
},
"dependencies": {
"@babel/runtime": "^7.13.10"
}
}
7 changes: 3 additions & 4 deletions packages/react/accessible-icon/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@radix-ui/react-accessible-icon",
"version": "1.0.3",
"version": "1.1.0",
"license": "MIT",
"exports": {
".": {
Expand Down Expand Up @@ -28,14 +28,13 @@
"version": "yarn version"
},
"dependencies": {
"@babel/runtime": "^7.13.10",
"@radix-ui/react-visually-hidden": "workspace:*"
},
"peerDependencies": {
"@types/react": "*",
"@types/react-dom": "*",
"react": "^16.8 || ^17.0 || ^18.0",
"react-dom": "^16.8 || ^17.0 || ^18.0"
"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
},
"peerDependenciesMeta": {
"@types/react": {
Expand Down
Loading

0 comments on commit ac71ba5

Please sign in to comment.