Merge branch '2.x-dev' into new-asset-system

hydephp · Dec 6, 2024 · def9236 · def9236
2 parents 62f5092 + d031807
commit def9236
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml
diff --git a/docs/digging-deeper/troubleshooting.md b/docs/digging-deeper/troubleshooting.md
@@ -5,9 +5,7 @@ navigation:
 
 # Troubleshooting
 
-Since Hyde has a lot of "magic" features which depend on some base assumptions,
-there might be some "gotchas" you might run into. Here are some I can think of,
-did you find a new one? Send a PR to [update the docs](https://github.com/hydephp/docs)!
+Since Hyde has a lot of "magic" features which depend on some base assumptions, there might be some "gotchas" you might run into. Here are some common issues you might encounter. Did you find a new one? Send a PR to [update the docs](https://github.com/hydephp/docs)!
 
 >info Tip: You can run `php hyde validate` to run a series of tests to help you catch common issues.
 

diff --git a/packages/framework/README.md b/packages/framework/README.md
@@ -22,7 +22,7 @@ You don't _need_ to customize anything. But you _can_ customize everything.
 
 ### Links & Media
 
-Hyde has already been featured in the [Laravel News Podcast](https://laravel-news.com/podcast/836911), the [Symfony Station Communique](https://www.symfonystation.com/Symfony-Station-Communique-13-May-2022), and in the [JetBrains PhpStorm blog](https://blog.jetbrains.com/phpstorm/2024/03/php-annotated-february-march-2024/). You can find several tutorials on [DEV Community](https://dev.to/t/hydephp) and learn much more on the [HydePHP website](https://hydephp.com) and [official documentation](https://hydephp.com/docs).
+Hyde has already been featured in [Laravel News](https://laravel-news.com/hydephp-is-a-laravel-powered-static-site-generator) and the [Laravel News Podcast](https://laravel-news.com/podcast/836911), the [Symfony Station Communique](https://www.symfonystation.com/Symfony-Station-Communique-13-May-2022), and in the [JetBrains PhpStorm blog](https://blog.jetbrains.com/phpstorm/2024/03/php-annotated-february-march-2024/). You can find several tutorials on [DEV Community](https://dev.to/t/hydephp) and learn much more on the [HydePHP website](https://hydephp.com) and [official documentation](https://hydephp.com/docs).
 
 ### Repositories
 

diff --git a/packages/hyde/package.json b/packages/hyde/package.json
@@ -11,7 +11,7 @@
         "hydefront": "^3.4.1",
         "laravel-mix": "^6.0.49",
         "postcss": "^8.4.31",
-        "prettier": "3.3.3",
+        "prettier": "3.4.2",
         "tailwindcss": "^3.0.24"
     }
 }
diff --git a/packages/hyde/tailwind.config.js b/packages/hyde/tailwind.config.js
@@ -3,7 +3,7 @@ const defaultTheme = require('tailwindcss/defaultTheme');
 module.exports = {
     darkMode: 'class',
     content: [
-        './_pages/*.blade.php',
+        './_pages/**/*.blade.php',
         './resources/views/**/*.blade.php',
         './vendor/hyde/framework/resources/views/**/*.blade.php',
     ],

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -3,7 +3,7 @@ const defaultTheme = require('tailwindcss/defaultTheme');
 module.exports = {
     darkMode: 'class',
     content: [
-        './_pages/*.blade.php',
+        './_pages/**/*.blade.php',
         './resources/views/**/*.blade.php',
         './vendor/hyde/framework/resources/views/**/*.blade.php',
     ],