Skip to content

Commit

Permalink
chore(root): main conflicts merge fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@jrgarciadev
jrgarciadev committed Nov 5, 2023
2 parents 4c56839 + ef61a3f commit 5b60840
Show file tree
Hide file tree
Showing 40 changed files with 161 additions and 164 deletions.
3 changes: 0 additions & 3 deletions .changeset/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
"access": "public",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
"onlyUpdatePeerDependentsWhenOutOfRange": true
},
"ignore": [
"@nextui-org/docs",
"@nextui-org/storybook"
Expand Down
4 changes: 2 additions & 2 deletions packages/components/accordion/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"react": ">=18",
"react-dom": ">=18",
"framer-motion": ">=4.0.0",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/aria-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/autocomplete/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"react": ">=18",
"react-dom": ">=18",
"framer-motion": ">=4.0.0",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/aria-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/avatar/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/components/badge/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0"
"@nextui-org/theme": ">=2.1.12"
},
"dependencies": {
"@nextui-org/system-rsc": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/breadcrumbs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/react-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/button/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"react": ">=18",
"react-dom": ">=18",
"framer-motion": ">=4.0.0",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/card/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"react": ">=18",
"react-dom": ">=18",
"framer-motion": ">=4.0.0",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/checkbox/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/chip/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-icons": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/components/code/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0"
"@nextui-org/theme": ">=2.1.12"
},
"dependencies": {
"@nextui-org/system-rsc": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/components/divider/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0"
"@nextui-org/theme": ">=2.1.12"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/dropdown/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"react": ">=18",
"react-dom": ">=18",
"framer-motion": ">=4.0.0",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/menu": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/image/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/input/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/react-utils": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/components/kbd/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0"
"@nextui-org/theme": ">=2.1.12"
},
"dependencies": {
"@nextui-org/system-rsc": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/link/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/listbox/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/react-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/menu/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/divider": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/modal/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"react": ">=18",
"react-dom": ">=18",
"framer-motion": ">=4.0.0",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/use-disclosure": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/navbar/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"react": ">=18",
"react-dom": ">=18",
"framer-motion": ">=4.0.0",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/pagination/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/popover/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"react": ">=18",
"react-dom": ">=18",
"framer-motion": ">=4.0.0",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/aria-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/progress/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/radio/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/ripple/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"react": ">=18",
"react-dom": ">=18",
"framer-motion": ">=4.0.0",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/scroll-shadow/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/select/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"react": ">=18",
"react-dom": ">=18",
"framer-motion": ">=4.0.0",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/aria-utils": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/components/skeleton/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0"
"@nextui-org/theme": ">=2.1.12"
},
"dependencies": {
"@nextui-org/system-rsc": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/slider/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/snippet/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"react": ">=18",
"react-dom": ">=18",
"framer-motion": ">=4.0.0",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/button": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/components/spacer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0"
"@nextui-org/theme": ">=2.1.12"
},
"dependencies": {
"@nextui-org/system-rsc": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/components/spinner/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0"
"@nextui-org/theme": ">=2.1.12"
},
"dependencies": {
"@nextui-org/system-rsc": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/switch/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/table/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/checkbox": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/tabs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"react": ">=18",
"react-dom": ">=18",
"framer-motion": ">=4.0.0",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/tooltip/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"react": ">=18",
"react-dom": ">=18",
"framer-motion": ">=4.0.0",
"@nextui-org/theme": ">=2.1.0",
"@nextui-org/system": ">=2.0.0"
"@nextui-org/theme": ">=2.1.12",
"@nextui-org/system": ">=2.0.11"
},
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
Expand Down
Loading

1 comment on commit 5b60840

@vercel
Copy link

@vercel vercel bot commented on 5b60840 Nov 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

nextui-storybook-v2 – ./packages/storybook

nextui-storybook-v2-nextui-org.vercel.app
nextui-storybook-v2.vercel.app
nextui-storybook-v2-git-main-nextui-org.vercel.app
sb.nextui.org
storybook.nextui.org

Please sign in to comment.