restore rebase removal of shadcn

Author: JJediny

package.json

@@ -6,8 +6,6 @@
     "node": ">=20"
   },
   "scripts": {
-    "publish-repo": "lerna publish",
-    "changed": "lerna changed",
     "test": "lerna run test --stream --concurrency=1",
     "test:ci": "lerna run test:ci --stream --concurrency=1",
     "test:update": "lerna run --concurrency 2 --stream test:update",
@@ -84,6 +82,7 @@
     "packages/utils",
     "packages/validator-ajv8",
     "packages/snapshot-tests",
-    "packages/shadcn"
+    "packages/shadcn",
+    "packages/uswds"
   ]
 }

packages/playground/src/app.tsx

@@ -4,12 +4,9 @@ import { Theme as SuiTheme } from '@rjsf/semantic-ui';
 import { Theme as AntdTheme } from '@rjsf/antd';
 import { Theme as BootstrapTheme } from '@rjsf/react-bootstrap';
 import { Theme as ChakraUITheme } from '@rjsf/chakra-ui';
-<<<<<<< HEAD
-import { Theme as shadcnTheme } from '@rjsf/shadcn';
-import { Theme as DaisyUITheme } from '@rjsf/daisyui';
-=======
->>>>>>> f066e3da (Add USWDS theme)
 import { Theme as UswdsTheme } from '@rjsf/uswds';
+import { Theme as DaisyUITheme } from '@rjsf/daisyui';
+import { Theme as ShadcnTheme } from '@rjsf/shadcn';
 import v8Validator, { customizeValidator } from '@rjsf/validator-ajv8';
 import Ajv2019 from 'ajv/dist/2019.js';
 import Ajv2020 from 'ajv/dist/2020.js';
@@ -160,6 +157,10 @@ const themes: PlaygroundProps['themes'] = {
     stylesheet: '//cdn.jsdelivr.net/npm/[email protected]/dist/semantic.min.css',
     theme: SuiTheme,
   },
+  shadcn: {
+    stylesheet: 'https://cdn.jsdelivr.net/gh/tuanphung2308/rjsf-shadcn-css@main/public/zinc.css',
+    theme: ShadcnTheme,
+  },
   uswds: {
     stylesheet: '//cdn.jsdelivr.net/npm/uswds/dist/css/uswds.min.css',
     theme: UswdsTheme,

packages/playground/vite.config.ts

@@ -22,6 +22,7 @@ export default defineConfig({
       '@rjsf/mui': path.resolve(__dirname, '../mui/src'),
       '@rjsf/react-bootstrap': path.resolve(__dirname, '../react-bootstrap/src'),
       '@rjsf/semantic-ui': path.resolve(__dirname, '../semantic-ui/src'),
+      '@rjsf/shadcn': path.resolve(__dirname, '../shadcn/src'),
       '@rjsf/uswds': path.resolve(__dirname, '../uswds/src'),
       '@rjsf/utils': path.resolve(__dirname, '../utils/src'),
       '@rjsf/validator-ajv8': path.resolve(__dirname, '../validator-ajv8/src'),

packages/uswds/package.json

@@ -9,7 +9,7 @@
     "build": "tsc",
     "cs-check": "prettier -c --ignore-path ../../.prettierignore \"src/**/*.{js,jsx,ts,tsx,json}\"",
     "cs-format": "prettier -w --ignore-path ../../.prettierignore \"src/**/*.{js,jsx,ts,tsx,json}\"",
-    "lint": "eslint src",
+    "lint": "eslint src test",
     "test": "jest",
     "test:update": "jest --u"
   },

packages/uswds/tsconfig.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "./dist",
     "rootDir": "./src",
-    "jsx": "react"
+    "jsx": "react-jsx"
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist", "test"]