Merge branch 'main' into feat/custom-template-per-field

Author: heath-freenome

.eslintrc.json

@@ -33,6 +33,7 @@
     "comma-dangle": [
       0
     ],
+    "@typescript-eslint/no-require-imports": "off",
     "@typescript-eslint/no-unused-vars": [
       2,
       {
@@ -66,5 +67,8 @@
     "react": {
       "version": "detect"
     }
+  },
+  "globals": {
+    "jest": true
   }
 }

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -22,16 +22,16 @@ body:
     attributes:
       label: What theme are you using?
       options:
-        - core
         - antd
-        - bootstrap-4
         - chakra-ui
-        - fluent-ui
-        - material-ui
+        - core
+        - daisyui
+        - fluentui-rc
         - mui
+        - react-bootstrap
         - semantic-ui
+        - shadcn
         - utils
-        - validator-ajv6
         - validator-ajv8
         - other
     validations:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -16,16 +16,16 @@ body:
     attributes:
       label: What theme are you using?
       options:
-        - core
         - antd
-        - bootstrap-4
         - chakra-ui
-        - fluent-ui
-        - material-ui
+        - core
+        - daisyui
+        - fluentui-rc
         - mui
+        - react-bootstrap
         - semantic-ui
+        - shadcn
         - utils
-        - validator-ajv6
         - validator-ajv8
         - other
     validations:

.github/ISSUE_TEMPLATE/question_issue.yml

@@ -16,16 +16,16 @@ body:
     attributes:
       label: What theme are you using?
       options:
-        - core
         - antd
-        - bootstrap-4
         - chakra-ui
-        - fluent-ui
-        - material-ui
+        - core
+        - daisyui
+        - fluentui-rc
         - mui
+        - react-bootstrap
         - semantic-ui
+        - shadcn
         - utils
-        - validator-ajv6
         - validator-ajv8
         - other
     validations:

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [20.x, 22.x]
 
     steps:
       - uses: actions/checkout@v4
@@ -21,42 +21,37 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
           cache-dependency-path: 'package-lock.json'
-      - run: npm i -g npm@9
       - run: npm ci
       - run: npm run lint
 
       - name: Build with Netlify badge
-        if: github.ref != 'refs/heads/main' && matrix.node-version != '14.x'
         run: npm run build-serial
         env:
           VITE_SHOW_NETLIFY_BADGE: true
           NODE_OPTIONS: --max_old_space_size=4096
 
       - name: Build
-        if: github.ref == 'refs/heads/main' && matrix.node-version != '14.x'
         run: npm run build-serial
         env:
           NODE_OPTIONS: --max_old_space_size=4096
 
       # Docusaurus doesn't support Node 14. These tasks can be removed once Node 14 is EOL (May 2023)
       - name: Build with Netlify badge (no docs)
-        if: github.ref != 'refs/heads/main' && matrix.node-version == '14.x'
         run: npx nx run-many --target=build --exclude=@rjsf/docs --parallel=false
         env:
           VITE_SHOW_NETLIFY_BADGE: true
           NODE_OPTIONS: --max_old_space_size=4096
       - name: Build (no docs)
-        if: github.ref == 'refs/heads/main' && matrix.node-version == '14.x'
         run: npx nx run-many --target=build --exclude=@rjsf/docs --parallel=false
         env:
           NODE_OPTIONS: --max_old_space_size=4096
 
-      - if: matrix.node-version == '18.x'
+      - if: matrix.node-version == '22.x'
         uses: actions/upload-artifact@v4
         with:
           name: playground
           path: packages/playground/dist
-      - if: matrix.node-version == '18.x'
+      - if: matrix.node-version == '22.x'
         uses: actions/upload-artifact@v4
         with:
           name: docs
@@ -79,7 +74,7 @@ jobs:
           name: docs
           path: dist/docs
       - name: Deploy playground + docs to GitHub Pages
-        uses: crazy-max/ghaction-github-pages@v4.1.0
+        uses: crazy-max/ghaction-github-pages@v4.2.0
         with:
           keep_history: true
           target_branch: gh-pages

.github/workflows/release.yml

@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Use Node.js 18.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 22.x
           cache: 'npm'
           cache-dependency-path: 'package-lock.json'
       - run: npm i -g npm@9
@@ -26,6 +26,6 @@ jobs:
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       - run: git update-index --assume-unchanged .npmrc
-      - run: npx lerna publish from-package --yes
+      - run: npx nx release publish
       - if: always()
         run: rm .npmrc

.gitignore

@@ -141,6 +141,14 @@ out/
 # typescript tsbuildinfo
 *.tsbuildinfo
 lodashReplacer.js
+lodashReplacer.cjs
 muiReplacer.js
+muiReplacer.cjs
 ajvReplacer.js
+ajvReplacer.cjs
 
+# Need this due to shadcn default utils folder is lib
+!packages/shadcn/src/lib
+
+.nx/cache
+.nx/workspace-data

.husky/pre-commit

@@ -1,5 +1,3 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
 # Hopefully this disables husky on github CI
 [ -n "$CI" ] && exit 0
 npm run pre-commit:husky

.node-version

@@ -1 +1 @@
-18.16.0
+22.13.1

.nvmrc

@@ -1 +1 @@
-18
+22