🏗️ Update the project structure

loomkit · Nov 7, 2023 · da36fa6 · da36fa6
1 parent 66994d7
commit da36fa6
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 25 deletions.
diff --git a/composer.json b/composer.json
@@ -50,7 +50,8 @@
   },
   "autoload": {
     "psr-4": {
-      "App\\": "app/src/",
+      "App\\": "app/",
+      "My\\": "src/",
       "Database\\Factories\\": "database/factories/",
       "Database\\Seeders\\": "database/seeders/"
     }

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -4,7 +4,8 @@ includes:
 parameters:
     level: max
     paths:
-        - app/src
+        - app
+        - src
 
     reportUnmatchedIgnoredErrors: true
     checkMissingIterableValueType: false
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -14,7 +14,8 @@
   </php>
   <source>
     <include>
-      <directory suffix=".php">./app/src</directory>
+      <directory suffix=".php">./app</directory>
+      <directory suffix=".php">./src</directory>
     </include>
   </source>
 </phpunit>
diff --git a/rector.php b/rector.php
@@ -8,7 +8,8 @@
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([
-        __DIR__.'/app/src',
+        __DIR__.'/app',
+        __DIR__.'/src',
         __DIR__.'/tests',
     ]);
 

diff --git a/src/.gitkeep b/src/.gitkeep
diff --git a/tailwind.config.ts b/tailwind.config.ts
@@ -5,9 +5,9 @@ export default {
   content: [
     "./vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php",
     "./storage/framework/views/*.php",
-    "./app/res/**/*.{js,jsx,ts,tsx,md,mdx}",
-    "./app/res/views/**/*.blade.php",
-    "./app/src/Views/**/*.php",
+    "./resources/**/*.{js,jsx,ts,tsx,md,mdx}",
+    "./resources/views/**/*.blade.php",
+    "./app/Views/**/*.php",
   ],
 
   theme: {

diff --git a/templates/layouts/base.blade.php b/templates/layouts/base.blade.php
@@ -12,7 +12,7 @@
                 <meta name="{{ $meta_tag['name'] }}" content="{{ $meta_tag['content'] }}"/>
             @endforeach
         @endisset
-        @vite(['app/res/assets/styles/app.css', 'app/res/assets/scripts/app.ts'])
+        @vite(['resources/assets/styles/app.css', 'resources/assets/scripts/app.ts'])
         @livewireStyles
     @show
     </head>

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "include": [
-    "app/res/assets/types/**/*",
-    "app/res/assets/scripts/**/*",
-    "app/res/views/**/*",
+    "resources/assets/types/**/*",
+    "resources/assets/scripts/**/*",
+    "resources/views/**/*",
   ],
   "exclude": [
     "node_modules",
@@ -28,7 +28,7 @@
     "outDir": "tmp",
     "noEmit": true,
     "typeRoots": [
-      "./app/res/assets/types",
+      "./resources/assets/types",
       "./node_modules/@types",
       "./node_modules",
     ],
@@ -40,19 +40,19 @@
     "baseUrl": ".",
     "paths": {
       "App/Assets/*": [
-        "app/res/assets/*",
+        "resources/assets/*",
       ],
       "App/Images/*": [
-        "app/res/assets/images/*",
+        "resources/assets/images/*",
       ],
       "App/Styles/*": [
-        "app/res/assets/styles/*",
+        "resources/assets/styles/*",
       ],
       "App/Scripts/*": [
-        "app/res/assets/scripts/*",
+        "resources/assets/scripts/*",
       ],
       "App/Types/*": [
-        "app/res/assets/types/*",
+        "resources/assets/types/*",
       ],
     },
     "noImplicitAny": true,

diff --git a/vite.config.ts b/vite.config.ts
@@ -20,10 +20,10 @@ export default defineConfig(({ mode }) => {
     plugins: [
       laravel({
         input: [
-          "app/res/assets/styles/app.css",
-          "app/res/assets/scripts/app.ts",
+          "resources/assets/styles/app.css",
+          "resources/assets/scripts/app.ts",
         ],
-        refresh: [...refreshPaths, "app/res/views/**", "app/src/Views/**"],
+        refresh: [...refreshPaths, "templates/**", "app/Views/**"],
         buildDirectory,
       }),
       tsconfigPaths(),
@@ -35,11 +35,11 @@ export default defineConfig(({ mode }) => {
     },
     resolve: {
       alias: {
-        "@assets": "app/res/assets",
-        "@images": "app/res/assets/images",
-        "@scripts": "app/res/assets/scripts",
-        "@styles": "app/res/assets/styles",
-        "@types": "app/res/assets/types",
+        "@assets": "resources/assets",
+        "@images": "resources/assets/images",
+        "@scripts": "resources/assets/scripts",
+        "@styles": "resources/assets/styles",
+        "@types": "resources/assets/types",
       },
     },
   };