chore: resolve conflicts

.changeset/brave-trains-wave.md

@@ -0,0 +1,6 @@
+---
+"@nextui-org/menu": patch
+"@nextui-org/theme": patch
+---
+
+Fix menu item classNames not work (#4119)

.changeset/calm-weeks-tie.md

@@ -0,0 +1,10 @@
+---
+"@nextui-org/accordion": patch
+"@nextui-org/button": patch
+"@nextui-org/card": patch
+"@nextui-org/date-picker": patch
+"@nextui-org/navbar": patch
+"@nextui-org/snippet": patch
+---
+
+fix missing peer / dev dependency for framer-motion

.changeset/config.json

@@ -8,7 +8,7 @@
   "fixed": [],
   "linked": [],
   "access": "public",
-  "baseBranch": "main",
+  "baseBranch": "canary",
   "updateInternalDependencies": "patch",
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "onlyUpdatePeerDependentsWhenOutOfRange": true

.changeset/curly-rules-warn.md

@@ -0,0 +1,5 @@
+---
+"@nextui-org/calendar": patch
+---
+
+add missing `framer-motion` in `peerDependencies`

.changeset/few-ants-breathe.md

@@ -0,0 +1,5 @@
+---
+"@nextui-org/input-otp": patch
+---
+
+Fix input-otp peer deps

.changeset/five-adults-protect.md

@@ -0,0 +1,7 @@
+---
+"@nextui-org/input": patch
+"@nextui-org/shared-icons": patch
+"@nextui-org/theme": patch
+---
+
+introduce `isClearable` to Textarea component (#2348, #2112)

.changeset/fluffy-icons-refuse.md

@@ -0,0 +1,5 @@
+---
+"@nextui-org/table": patch
+---
+
+Currently, whenever any arrow-key keypress is triggered it navigates the focus to other cell/row. This creates an issue when the table cell contains a component which requires this keys for specific purpose (eg. if a table cell contains input component, it might need arrow keys for editing. But it is not possible because whenever the keypress triggers navigation). The PR adds an `isKeyboardNavigationDisabled` prop to disable the navigation.

.changeset/fuzzy-lies-brush.md

@@ -0,0 +1,5 @@
+---
+"@nextui-org/table": patch
+---
+
+The `layoutNode` prop has been removed due to the update to react-aria.

.changeset/lazy-buttons-exercise.md

@@ -0,0 +1,7 @@
+---
+"@nextui-org/listbox": patch
+"@nextui-org/menu": patch
+"@nextui-org/theme": patch
+---
+
+Add truncate class to the list item to avoid overflow the wrapper

.changeset/many-starfishes-refuse.md

@@ -0,0 +1,5 @@
+---
+"@nextui-org/theme": patch
+---
+
+revise label font size for lg (#3073)

.changeset/nasty-bees-sniff.md

@@ -0,0 +1,7 @@
+---
+"@nextui-org/listbox": patch
+"@nextui-org/menu": patch
+"@nextui-org/pagination": patch
+---
+
+Fixes missing `<li>` wrapper when `href` prop is passed in `ListboxItem`, `MenuItem`, and `PaginationItem` (#4147)

.changeset/pink-days-yawn.md

@@ -0,0 +1,49 @@
+---
+"@nextui-org/scroll-shadow": patch
+"@nextui-org/autocomplete": patch
+"@nextui-org/breadcrumbs": patch
+"@nextui-org/date-picker": patch
+"@nextui-org/date-input": patch
+"@nextui-org/pagination": patch
+"@nextui-org/accordion": patch
+"@nextui-org/input-otp": patch
+"@nextui-org/calendar": patch
+"@nextui-org/checkbox": patch
+"@nextui-org/dropdown": patch
+"@nextui-org/progress": patch
+"@nextui-org/skeleton": patch
+"@nextui-org/divider": patch
+"@nextui-org/listbox": patch
+"@nextui-org/popover": patch
+"@nextui-org/snippet": patch
+"@nextui-org/spinner": patch
+"@nextui-org/tooltip": patch
+"@nextui-org/avatar": patch
+"@nextui-org/button": patch
+"@nextui-org/drawer": patch
+"@nextui-org/navbar": patch
+"@nextui-org/ripple": patch
+"@nextui-org/select": patch
+"@nextui-org/slider": patch
+"@nextui-org/spacer": patch
+"@nextui-org/switch": patch
+"@nextui-org/alert": patch
+"@nextui-org/badge": patch
+"@nextui-org/image": patch
+"@nextui-org/input": patch
+"@nextui-org/modal": patch
+"@nextui-org/radio": patch
+"@nextui-org/table": patch
+"@nextui-org/card": patch
+"@nextui-org/chip": patch
+"@nextui-org/code": patch
+"@nextui-org/form": patch
+"@nextui-org/link": patch
+"@nextui-org/menu": patch
+"@nextui-org/tabs": patch
+"@nextui-org/user": patch
+"@nextui-org/system-rsc": patch
+"@nextui-org/kbd": patch
+---
+
+Fix peer deps

.changeset/purple-berries-play.md

@@ -0,0 +1,5 @@
+---
+"@nextui-org/form": patch
+---
+
+add form component

.changeset/sharp-pianos-pump.md

@@ -0,0 +1,9 @@
+---
+"@nextui-org/autocomplete": patch
+"@nextui-org/checkbox": patch
+"@nextui-org/date-picker": patch
+"@nextui-org/input": patch
+"@nextui-org/radio": patch
+---
+
+support server validation with form

.changeset/spotty-flies-jump.md

@@ -0,0 +1,7 @@
+---
+"@nextui-org/input-otp": patch
+"@nextui-org/theme": patch
+"@nextui-org/react": patch
+---
+
+Adding new input-otp component.

.changeset/spotty-spies-call.md

@@ -0,0 +1,5 @@
+---
+"@nextui-org/select": patch
+---
+
+Fix Controlled IsInvalid Prop In Select

.changeset/tiny-laws-cheer.md

@@ -0,0 +1,5 @@
+---
+"@nextui-org/system": patch
+---
+
+align `navigate` function parameters with `@react-aria`

.github/workflows/QA.yaml

@@ -8,7 +8,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-m
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4
@@ -21,7 +21,7 @@ jobs:
 
   tests:
     name: Tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-m
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4
@@ -34,7 +34,7 @@ jobs:
 
   eslint:
     name: ESLint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-m
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4
@@ -47,7 +47,7 @@ jobs:
 
   types:
     name: TypeScript
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-m
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4
@@ -60,7 +60,7 @@ jobs:
 
   prettier:
     name: Prettier
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-m
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4

.github/workflows/enter-pre-release-mode.yaml

@@ -1,10 +1,10 @@
 name: Enter pre-release mode
-on: workflow_dispatch
 
+on: workflow_dispatch
 jobs:
   enter-pre-release-mode:
     if: ${{ github.ref == 'refs/heads/beta/release-next' || github.ref == 'refs/heads/canary' }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-m
     permissions:
       contents: write
       pull-requests: write
@@ -20,6 +20,8 @@ jobs:
 
       - name: Enter pre-release mode
         id: enter-pre-release-mode
+        env:
+          GITHUB_TOKEN: ${{ secrets.GA_ACCESS_TOKEN }}
         run: |
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config user.name "github-actions[bot]"

.github/workflows/exit-pre-release.yaml → .github/workflows/exit-pre-release-mode.yaml

@@ -5,15 +5,15 @@ jobs:
   exit-pre-release-mode:
     if: ${{ github.ref == 'refs/heads/beta/release-next' || github.ref == 'refs/heads/canary' }}
     name: exit pre-release mode
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-m
     permissions:
       contents: write
       pull-requests: write
       id-token: write
 
     steps:
       - name: Checkout branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.branch }}
           fetch-depth: 0
@@ -29,6 +29,8 @@ jobs:
         run: npx rimraf .changeset/pre.json
 
       - name: Commit and push changes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GA_ACCESS_TOKEN }}
         run: |
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config user.name "github-actions[bot]"

.github/workflows/pre-release.yaml

@@ -7,7 +7,6 @@ on:
       - "packages/**"
     branches:
       - "beta/release-next"
-      - "canary"
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 
@@ -28,6 +27,13 @@ jobs:
       - name: Install
         uses: ./.github/common-actions/install
 
+      - name: Debug condition values
+        run: |
+          echo "pre.json exists: ${{ steps.check_if_pre_json_exists.outputs.files_exists }}"
+          echo "Commit message: ${{ github.event.head_commit.message }}"
+          echo "Contains version packages: ${{ contains(github.event.head_commit.message, 'ci(changesets): version packages') }}"
+          echo "Full condition would be: ${{ steps.check_if_pre_json_exists.outputs.files_exists == 'true' && contains(github.event.head_commit.message, 'ci(changesets): version packages') }}"
+
       - name: Check if pre.json exists
         id: check_if_pre_json_exists
         uses: andstor/file-existence-action@v3.0.0
@@ -52,20 +58,15 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Debug condition values
-        run: |
-          echo "pre.json exists: ${{ steps.check_if_pre_json_exists.outputs.files_exists }}"
-          echo "Commit message: ${{ github.event.head_commit.message }}"
-          echo "Contains version packages: ${{ contains(github.event.head_commit.message, 'ci(changesets): version packages') }}"
-          echo "Full condition would be: ${{ steps.check_if_pre_json_exists.outputs.files_exists == 'true' && contains(github.event.head_commit.message, 'ci(changesets): version packages') }}"
-
       - name: Tests
         if: "${{ steps.check_if_pre_json_exists.outputs.files_exists == 'true' && contains(github.event.head_commit.message, 'ci(changesets): version packages') }}"
         run: pnpm test
 
       - name: Build
         if: "${{ steps.check_if_pre_json_exists.outputs.files_exists == 'true' && contains(github.event.head_commit.message, 'ci(changesets): version packages') }}"
         run: pnpm build
+        env:
+          NODE_OPTIONS: "--max-old-space-size=4096"
 
       - name: Publish to NPM
         id: publish-to-npm

.github/workflows/release.yaml

@@ -6,28 +6,28 @@ on:
       - ".changeset/**"
       - "packages/**"
     branches:
-      - main
+      - canary
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 
 jobs:
   release:
     name: Release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-m
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4
 
       - name: Install
         uses: ./.github/common-actions/install
 
-      - name: Build
-        run: pnpm build
-
       - name: Tests
         run: pnpm test
 
+      - name: Build
+        run: pnpm build
+
       - name: Create Release Pull Request or Publish to NPM
         id: changesets
         uses: changesets/action@v1
@@ -39,4 +39,15 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create canary release
+        if: steps.changesets.outputs.published != 'true'
+        timeout-minutes: 15
+        run: |
+          git checkout canary
+          pnpm version:canary
+          pnpm release:canary
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/update-stats.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   update-stats:
     name: Update Stats
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-m
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4

.gitignore

@@ -56,6 +56,7 @@ packages/**/*.backup.ts
 
 # ignore sitemap
 apps/**/sitemap.xml
+apps/**/sitemap-0.xml
 
 # turbo
 .turbo

.vscode/settings.json

@@ -10,5 +10,5 @@
   },
   "tailwindCSS.experimental.classRegex": [
     ["([\"'`][^\"'`]*.*?[\"'`])", "[\"'`]([^\"'`]*).*?[\"'`]"]
-  ]
+  ],
 }

apps/docs/.eslintrc.json

@@ -22,10 +22,6 @@
     {
       "files": ["*.ts", "*.tsx"],
       "rules": {}
-    },
-    {
-      "files": ["*.js", "*.jsx"],
-      "rules": {}
     }
   ]
 }