Skip to content

Commit

Permalink
fix: Tremor v4 react19 (#1145)
Browse files Browse the repository at this point in the history
* first fixes

* add overrides

* update recharts

* fix XAxis height bug

* fix selects

* change relase/build

* update build/relase

---------

Co-authored-by: mbauchet <[email protected]>
  • Loading branch information
severinlandolt and mbauchet authored Dec 13, 2024
1 parent c8582ef commit 2e9753b
Show file tree
Hide file tree
Showing 14 changed files with 387 additions and 319 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
node-version: 20
registry-url: https://registry.npmjs.org
- name: install react
run: npm i react
run: npm i react --legacy-peer-deps
- name: install dependencies
run: npm ci
run: npm ci --legacy-peer-deps
- name: lint checks
run: npm run lint
- name: unit tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
node-version: 20
registry-url: https://registry.npmjs.org
- name: install react
run: npm i react
run: npm i react --legacy-peer-deps
- name: install dependencies
run: npm ci
run: npm ci --legacy-peer-deps
- name: build
run: npm run build
- name: release
Expand Down
2 changes: 0 additions & 2 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ const config: StorybookConfig = {
{
name: "@storybook/addon-essentials",
},
"@storybook/addon-onboarding",
"@chromatic-com/storybook",
"@storybook/addon-interactions",
"@storybook/addon-themes",
],
Expand Down
18 changes: 11 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@headlessui/react": "2.2.0",
"date-fns": "^3.6.0",
"react-day-picker": "^8.10.1",
"recharts": "^2.13.3",
"recharts": "^2.15.0",
"tailwind-merge": "^2.5.5",
"tailwind-variants": "^0.3.0"
},
Expand All @@ -37,7 +37,6 @@
"@babel/preset-env": "^7.25.4",
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@chromatic-com/storybook": "^3.2.2",
"@mdx-js/react": "^2.3.0",
"@rollup/plugin-commonjs": "^21.1.0",
"@rollup/plugin-node-resolve": "^13.3.0",
Expand All @@ -48,7 +47,6 @@
"@semantic-release/npm": "github:semantic-release/npm",
"@storybook/addon-essentials": "^8.4.7",
"@storybook/addon-interactions": "^8.4.7",
"@storybook/addon-onboarding": "^8.4.7",
"@storybook/addon-themes": "^8.4.7",
"@storybook/blocks": "^8.4.7",
"@storybook/manager-api": "^8.4.7",
Expand All @@ -58,10 +56,11 @@
"@storybook/theming": "^8.4.7",
"@tailwindcss/forms": "^0.5.9",
"@tailwindcss/postcss": "4.0.0-beta.5",
"@testing-library/react": "^14.3.1",
"@testing-library/react": "^16.1.0",
"@types/jest": "^29.5.13",
"@types/node": "^22.6.1",
"@types/react": "^18.3.9",
"@types/react": "^19.0.1",
"@types/react-dom": "^19.0.0",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"@vitejs/plugin-react": "^4.3.4",
Expand All @@ -83,8 +82,8 @@
"prettier": "3.4.2",
"prettier-plugin-tailwindcss": "^0.6.9",
"prop-types": "^15.8.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"resize-observer-polyfill": "^1.5.1",
"rollup": "^2.79.1",
"rollup-plugin-dts": "^4.2.3",
Expand All @@ -104,6 +103,11 @@
"react": "^18.0.0",
"react-dom": ">=16.6.0"
},
"pnpm": {
"overrides": {
"react-is": "^19.0.0"
}
},
"main": "dist/index.cjs",
"module": "dist/index.js",
"files": [
Expand Down
Loading

0 comments on commit 2e9753b

Please sign in to comment.