Merge pull request #107 from balajidharma/3.x-changes

Updated vite and tailwindcss

Author: balajidharma

package.json

@@ -7,17 +7,20 @@
     },
     "devDependencies": {
         "@tailwindcss/forms": "^0.5.2",
+        "@tailwindcss/postcss": "^4.0.12",
+        "@tailwindcss/vite": "^4.0.0",
         "@yaireo/tagify": "^4.31.6",
         "alpinejs": "^3.4.2",
         "autoprefixer": "^10.4.2",
-        "axios": "^1.6.4",
+        "axios": "^1.11.0",
         "choices.js": "^10.2.0",
-        "daisyui": "^4.0.0",
-        "laravel-vite-plugin": "^1.0",
+        "concurrently": "^9.0.1",
+        "daisyui": "^5.0.0",
+        "laravel-vite-plugin": "^2.0.0",
         "postcss": "^8.4.31",
         "sass": "^1.80.5",
-        "tailwindcss": "^3.1.0",
+        "tailwindcss": "^4.0.0",
         "theme-change": "^2.5.0",
-        "vite": "^5.0"
+        "vite": "^7.0.7"
     }
 }

postcss.config.js

@@ -1,6 +1,6 @@
 export default {
     plugins: {
-        tailwindcss: {},
+        "@tailwindcss/postcss": {},
         autoprefixer: {},
     },
 };

resources/css/app.css

@@ -1,3 +1,13 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import 'tailwindcss';
+
+@plugin '@tailwindcss/forms';
+
+@source '../../vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php';
+@source '../../storage/framework/views/*.php';
+@source '../**/*.blade.php';
+@source '../**/*.js';
+
+@theme {
+    --font-sans: 'Instrument Sans', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
+        'Segoe UI Symbol', 'Noto Color Emoji';
+}

resources/css/vendor/laravel-admin/app.scss

@@ -1,10 +1,19 @@
-@use "choices.js/src/styles/choices";
+@use 'choices.js/src/styles/choices';
 @use '@yaireo/tagify/dist/tagify.css';
 
-@config "../../../../tailwind.admin.config.js";
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@use 'tailwindcss';
+@plugin 'daisyui';
+
+@source '../../vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php';
+@source '../../storage/framework/views/*.php';
+@source '../../vendor/balajidharma/laravel-crud/src/resources/views/*.blade.php';
+@source '../../vendor/balajidharma/laravel-admin-core/Grid/*.php';
+@source '../../storage/framework/views/*.php';
+@source '../../resources/views/vendor/laravel-admin/components/**/*.blade.php';
+@source '../../resources/views/vendor/laravel-admin/**/*.blade.php';
+@source '../../app/Forms/Admin/*.php';
+@source '../../config/form-builder.php';
+
 
 :root {
   --my-color: #fff;

tailwind.admin.config.js

@@ -1,17 +1,19 @@
 import { defineConfig } from 'vite';
 import laravel from 'laravel-vite-plugin';
+import tailwindcss from '@tailwindcss/vite';
 
 export default defineConfig({
     plugins: [
         laravel({
             input: [
                 'resources/css/app.css',
                 'resources/js/app.js',
-                "resources/js/vendor/laravel-admin/admin/app.js",
+                "resources/js/vendor/laravel-admin/app.js",
                 "resources/js/vendor/laravel-admin/form-builder/field.js",
-                "resources/css/vendor/laravel-admin/admin/app.scss"
+                "resources/css/vendor/laravel-admin/app.scss"
             ],
             refresh: true,
         }),
+        tailwindcss(),
     ],
 });