Skip to content

Commit

Permalink
chore: update chakra
Browse files Browse the repository at this point in the history
  • Loading branch information
Pagebakers committed Nov 11, 2024
1 parent cf25401 commit 862937a
Show file tree
Hide file tree
Showing 30 changed files with 2,349 additions and 1,409 deletions.
21 changes: 21 additions & 0 deletions .changeset/swift-rockets-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
'@saas-ui/command-bar': patch
'@saas-ui/date-picker': patch
'@saas-ui/file-upload': patch
'@saas-ui/react-utils': patch
'@saas-ui/theme-glass': patch
'@saas-ui/data-table': patch
'@saas-ui/nprogress': patch
'@saas-ui/hotkeys': patch
'@saas-ui/charts': patch
'@saas-ui/modals': patch
'@saas-ui/system': patch
'@saas-ui/storybook-addon': patch
'@saas-ui/forms': patch
'@saas-ui/react': patch
'@saas-ui/theme': patch
'@saas-ui/auth': patch
'@saas-ui/core': patch
---

Bump chakra version
6 changes: 3 additions & 3 deletions .hygen.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ const path = require('path')

// Todo read this from the main package.json or git?
const config = {
author: 'Eelco Wiersma <eelco@appulse.nl>',
author: 'Eelco Wiersma <eelco@saas-ui.dev>',
org: 'saas-ui',
packagesDir: 'packages',
appsDir: 'apps',
blocksDir: 'packages/pro/saas-ui/blocks/src',
blocksDir: 'packages/pro/packages/blocks/src',
}

const packageName = (org, name, separator = '/') => {
Expand Down Expand Up @@ -76,7 +76,7 @@ module.exports = {
return path.join(config.appsDir, app)
},
/**
* Returns the blocks directory, eg: packages/pro/saas-ui/blocks/src/
* Returns the blocks directory, eg: packages/pro/packages/blocks/src/
* @param {string} category
* @param {string} name
* @returns
Expand Down
2 changes: 1 addition & 1 deletion apps/palette/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@chakra-ui/react": "^2.10.1",
"@chakra-ui/react": "^2.10.4",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@fontsource/inter": "^5.1.0",
Expand Down
1 change: 1 addition & 0 deletions apps/website/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ let config = {

config.resolve = {
...config.resolve,
extensions: ['.js', '.jsx', '.ts', '.tsx'],
}

config.module.rules.push({
Expand Down
9 changes: 5 additions & 4 deletions apps/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@ark-ui/react": "^4.1.0",
"@chakra-ui/next-js": "^2.4.1",
"@chakra-ui/props-docs": "^2.4.1",
"@chakra-ui/react": "^2.10.1",
"@ark-ui/react": "^4.3.0",
"@chakra-ui/next-js": "^2.4.3",
"@chakra-ui/props-docs": "^2.4.3",
"@chakra-ui/react": "^2.10.4",
"@chakra-ui/react-env": "^3.1.0",
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/modifiers": "^7.0.0",
Expand All @@ -34,6 +34,7 @@
"@next/bundle-analyzer": "^14.2.14",
"@octokit/rest": "^21.0.2",
"@radix-ui/react-navigation-menu": "^1.2.1",
"@saas-ui-pro/react": "workspace:*",
"@saas-ui/command-bar": "workspace:^",
"@saas-ui/file-upload": "workspace:*",
"@saas-ui/forms": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion apps/website/src/components/blocks/canvas-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export function CanvasHeader({
variant="default"
aria-label="View source on github"
as="a"
href={`https://github.com/saas-js/saas-ui-pro/tree/main/saas-ui/blocks/src/${attributes.category}/${slug}/${slug}.tsx`}
href={`https://github.com/saas-js/saas-ui-pro/tree/main/packages/blocks/src/${attributes.category}/${slug}/${slug}.tsx`}
target="_blank"
rel="noopener noreferrer"
>
Expand Down
2 changes: 1 addition & 1 deletion apps/website/src/components/blocks/component-canvas.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { forwardRef, useCallback, useState } from 'react'
import { Box, Card, CardBody, Stack, extendTheme } from '@chakra-ui/react'
import * as UiComponents from '../../../../../packages/pro/saas-ui/blocks'
import * as UiComponents from '../../../../../packages/pro/packages/blocks'
import { UiComponent } from '../../data/blocks'
import { ComponentPreview } from './component-preview'
import { CanvasHeader } from './canvas-header'
Expand Down
2 changes: 1 addition & 1 deletion apps/website/src/data/blocks/components.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function getComponentCode(componentFolder: string, componentName: string) {
const getRootFolder = () => {
return path.join(
process.env.PROJECT_CWD ?? process.cwd(),
'/packages/pro/saas-ui/blocks/src'
'/packages/pro/packages/blocks'
)
}

Expand Down
8 changes: 4 additions & 4 deletions apps/website/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@
"@saas-ui/use-hotkeys": ["../../packages/saas-ui/use-hotkeys/src"],
"@saas-ui/data-table": ["../../packages/saas-ui/data-table/src"],
"@saas-ui-pro/feature-flags": [
"../../packages/pro/saas-ui/feature-flags/src"
"../../packages/pro/packages/feature-flags/src"
],
"@saas-ui-pro/react": ["../../packages/pro/saas-ui/react/src"],
"@saas-ui-pro/react": ["../../packages/pro/packages/react/src"],
"@saas-ui-pro/theme-glass": [
"../../packages/pro/saas-ui/pro-theme-glass/src"
"../../packages/pro/packages/pro-theme-glass/src"
],
"@saas-ui/theme-glass/components/src": [
"../../packages/saas-ui-theme-glass/src/components"
],
"@saas-ui-pro/kanban": ["../../packages/pro/saas-ui/kanban/src"]
"@saas-ui-pro/kanban": ["../../packages/pro/packages/kanban/src"]
},
"incremental": true,
"plugins": [
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
},
"workspaces": [
"apps/*",
"packages/pro/saas-ui/*",
"packages/pro/packages/*",
"packages/storybook",
"packages/saas-ui-*",
"tooling/next-workspaces",
Expand All @@ -71,8 +71,8 @@
"tooling/storybook-addon"
],
"devDependencies": {
"@chakra-ui/cli": "^2.5.4",
"@chakra-ui/react": "^2.10.1",
"@chakra-ui/cli": "^2.5.6",
"@chakra-ui/react": "^2.10.4",
"@changesets/cli": "^2.27.9",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/pro
Submodule pro updated from 0dbe14 to 8b625a
2 changes: 1 addition & 1 deletion packages/saas-ui-auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"url": "https://storybook.saas-ui.dev"
},
"dependencies": {
"@chakra-ui/utils": "^2.2.1",
"@chakra-ui/utils": "^2.2.3",
"@saas-ui/auth-provider": "workspace:*",
"@saas-ui/core": "workspace:*",
"@saas-ui/forms": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/saas-ui-charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"clean": "rm -rf dist"
},
"dependencies": {
"@chakra-ui/styled-system": "^2.11.1",
"@chakra-ui/styled-system": "^2.12.1",
"recharts": "^2.13.0"
},
"peerDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/saas-ui-command-bar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@
"url": "https://storybook.saas-ui.dev"
},
"dependencies": {
"@chakra-ui/anatomy": "^2.3.4",
"@chakra-ui/styled-system": "^2.11.1",
"@chakra-ui/theme": "^3.4.5",
"@chakra-ui/theme-tools": "^2.2.5",
"@chakra-ui/utils": "^2.2.1",
"@chakra-ui/anatomy": "^2.3.5",
"@chakra-ui/styled-system": "^2.12.1",
"@chakra-ui/theme": "^3.4.7",
"@chakra-ui/theme-tools": "^2.2.7",
"@chakra-ui/utils": "^2.2.3",
"cmdk": "^1.0.0"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/saas-ui-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@
"url": "https://storybook.saas-ui.dev"
},
"dependencies": {
"@chakra-ui/styled-system": "^2.11.1",
"@chakra-ui/theme-tools": "^2.2.5",
"@chakra-ui/utils": "^2.2.1",
"@chakra-ui/styled-system": "^2.12.1",
"@chakra-ui/theme-tools": "^2.2.7",
"@chakra-ui/utils": "^2.2.3",
"@react-aria/interactions": "^3.22.3",
"@react-aria/utils": "^3.25.3",
"@saas-ui/react-utils": "workspace:*",
"@saas-ui/theme": "workspace:*",
"@zag-js/dom-event": "^0.73.0",
"@zag-js/dom-event": "^0.73.1",
"@zag-js/dom-utils": "^0.2.4"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/saas-ui-data-table/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"url": "https://storybook.saas-ui.dev"
},
"dependencies": {
"@chakra-ui/utils": "^2.2.1",
"@chakra-ui/utils": "^2.2.3",
"@saas-ui/core": "workspace:*",
"@tanstack/react-table": "^8.20.5"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/saas-ui-date-picker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
"url": "https://storybook.saas-ui.dev"
},
"dependencies": {
"@chakra-ui/styled-system": "^2.11.1",
"@chakra-ui/theme-tools": "^2.2.5",
"@chakra-ui/utils": "^2.2.1",
"@chakra-ui/styled-system": "^2.12.1",
"@chakra-ui/theme-tools": "^2.2.7",
"@chakra-ui/utils": "^2.2.3",
"@internationalized/date": "3.5.6",
"@react-aria/calendar": "^3.5.12",
"@react-aria/datepicker": "^3.11.3",
Expand Down
10 changes: 5 additions & 5 deletions packages/saas-ui-file-upload/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@
"url": "https://storybook.saas-ui.dev"
},
"dependencies": {
"@chakra-ui/styled-system": "^2.11.1",
"@chakra-ui/theme-tools": "^2.2.5",
"@chakra-ui/utils": "^2.2.1",
"@zag-js/file-upload": "^0.73.0",
"@zag-js/react": "^0.73.0"
"@chakra-ui/styled-system": "^2.12.1",
"@chakra-ui/theme-tools": "^2.2.7",
"@chakra-ui/utils": "^2.2.3",
"@zag-js/file-upload": "^0.73.1",
"@zag-js/react": "^0.73.1"
},
"peerDependencies": {
"@chakra-ui/react": ">=2.9.0 <3",
Expand Down
2 changes: 1 addition & 1 deletion packages/saas-ui-forms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"url": "https://storybook.saas-ui.dev"
},
"dependencies": {
"@chakra-ui/utils": "^2.2.1",
"@chakra-ui/utils": "^2.2.3",
"@hookform/resolvers": "^3.9.0",
"@saas-ui/core": "workspace:*",
"react-hook-form": "^7.53.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/saas-ui-hotkeys/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"url": "https://storybook.saas-ui.dev"
},
"dependencies": {
"@chakra-ui/utils": "^2.2.1",
"@chakra-ui/utils": "^2.2.3",
"@saas-ui/core": "workspace:*",
"@saas-ui/use-hotkeys": "workspace:*"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/saas-ui-modals/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"url": "https://storybook.saas-ui.dev"
},
"dependencies": {
"@chakra-ui/utils": "^2.2.1",
"@chakra-ui/utils": "^2.2.3",
"@saas-ui/forms": "workspace:*",
"@saas-ui/hooks": "workspace:*",
"@saas-ui/react-utils": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion packages/saas-ui-nprogress/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"url": "https://storybook.saas-ui.dev"
},
"dependencies": {
"@chakra-ui/utils": "^2.2.1",
"@chakra-ui/utils": "^2.2.3",
"@tanem/react-nprogress": "^5.0.51"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/saas-ui-react-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"url": "https://storybook.saas-ui.dev"
},
"dependencies": {
"@chakra-ui/utils": "^2.2.1"
"@chakra-ui/utils": "^2.2.3"
},
"peerDependencies": {
"@chakra-ui/react": ">=2.9.0 <3",
Expand Down
2 changes: 1 addition & 1 deletion packages/saas-ui-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"url": "https://storybook.saas-ui.dev"
},
"dependencies": {
"@chakra-ui/utils": "^2.2.1",
"@chakra-ui/utils": "^2.2.3",
"@saas-ui/core": "workspace:*",
"@saas-ui/data-table": "workspace:*",
"@saas-ui/forms": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/saas-ui-system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
"url": "https://storybook.saas-ui.dev"
},
"dependencies": {
"@chakra-ui/styled-system": "^2.11.1",
"@chakra-ui/utils": "^2.2.1",
"@chakra-ui/styled-system": "^2.12.1",
"@chakra-ui/utils": "^2.2.3",
"react-fast-compare": "^3.2.2"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/saas-ui-theme-glass/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@
"url": "https://storybook.saas-ui.pro"
},
"dependencies": {
"@chakra-ui/anatomy": "^2.3.4",
"@chakra-ui/styled-system": "^2.11.1",
"@chakra-ui/theme-tools": "^2.2.5",
"@chakra-ui/utils": "^2.2.1"
"@chakra-ui/anatomy": "^2.3.5",
"@chakra-ui/styled-system": "^2.12.1",
"@chakra-ui/theme-tools": "^2.2.7",
"@chakra-ui/utils": "^2.2.3"
},
"peerDependencies": {
"@chakra-ui/react": ">=2.9.0 <3",
Expand Down
6 changes: 3 additions & 3 deletions packages/saas-ui-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
"url": "https://storybook.saas-ui.dev"
},
"dependencies": {
"@chakra-ui/anatomy": "^2.3.4",
"@chakra-ui/styled-system": "^2.11.1",
"@chakra-ui/theme-tools": "^2.2.5"
"@chakra-ui/anatomy": "^2.3.5",
"@chakra-ui/styled-system": "^2.12.1",
"@chakra-ui/theme-tools": "^2.2.7"
},
"peerDependencies": {
"@chakra-ui/react": ">=2.9.0 <3",
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@babel/preset-env": "^7.25.7",
"@babel/preset-react": "^7.25.7",
"@babel/preset-typescript": "^7.25.7",
"@chakra-ui/react": "^2.10.1",
"@chakra-ui/react": "^2.10.4",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@saas-ui/react": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion tooling/storybook-addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
"homepage": "https://github.com/saas-ui/saas-ui#readme",
"devDependencies": {
"@chakra-ui/react": "^2.10.1",
"@chakra-ui/react": "^2.10.4",
"@emotion/react": ">=11.1.5",
"@emotion/styled": ">=11.1.5",
"@saas-ui/react": "workspace:*",
Expand Down
Loading

0 comments on commit 862937a

Please sign in to comment.