V4 Upgrade

config/tailwindcss.php

@@ -39,5 +39,5 @@
      | @see https://github.com/tailwindlabs/tailwindcss/releases to know the version availables.
      |
      */
-    'version' => env('TAILWINDCSS_CLI_VERSION', 'v3.4.9'),
+    'version' => env('TAILWINDCSS_CLI_VERSION', 'v4.0.0'),
 ];

src/Commands/BuildCommand.php

@@ -35,7 +35,7 @@ public function handle()
         $sourcePath = $this->fixFilePathForOs(config('tailwindcss.build.source_file_path'));
         $sourceRelativePath = str_replace(rtrim(resource_path(), DIRECTORY_SEPARATOR), '', $sourcePath);
         $destinationPath = $this->fixFilePathForOs(config('tailwindcss.build.destination_path'));
-        $destinationFileAbsolutePath = $destinationPath.DIRECTORY_SEPARATOR.trim($sourceRelativePath, DIRECTORY_SEPARATOR);
+        $destinationFileAbsolutePath = $destinationPath . DIRECTORY_SEPARATOR . trim($sourceRelativePath, DIRECTORY_SEPARATOR);
         $destinationFileRelativePath = str_replace(rtrim(public_path(), DIRECTORY_SEPARATOR), '', $destinationFileAbsolutePath);
 
         File::ensureDirectoryExists(dirname($destinationFileAbsolutePath));
@@ -55,7 +55,7 @@ public function handle()
                 $binFile,
                 '-i', $sourcePath,
                 '-o', $destinationFileAbsolutePath,
-                $this->option('watch') ? '-w' : null,
+                $this->option('watch') ? '--watch=always' : null,
                 $this->shouldMinify() ? '-m' : null,
             ]), function ($type, $output) {
                 $this->output->write($output);
@@ -79,6 +79,21 @@ public function handle()
         return self::SUCCESS;
     }
 
+    protected function ensureAssetIsVersioned(string $generatedFile): string
+    {
+        $digest = sha1_file($generatedFile);
+
+        $versionedFile = preg_replace(
+            '/(\.css)$/',
+            sprintf('-%s$1', $digest),
+            $generatedFile,
+        );
+
+        File::move($generatedFile, $versionedFile);
+
+        return $versionedFile;
+    }
+
     private function fixFilePathForOs(string $path): string
     {
         return str_replace('/', DIRECTORY_SEPARATOR, $path);
@@ -98,19 +113,4 @@ private function shouldMinify(): bool
     {
         return $this->option('minify') || $this->option('prod');
     }
-
-    protected function ensureAssetIsVersioned(string $generatedFile): string
-    {
-        $digest = sha1_file($generatedFile);
-
-        $versionedFile = preg_replace(
-            '/(\.css)$/',
-            sprintf('-%s$1', $digest),
-            $generatedFile,
-        );
-
-        File::move($generatedFile, $versionedFile);
-
-        return $versionedFile;
-    }
 }

src/Commands/DownloadCommand.php

@@ -18,6 +18,8 @@ class DownloadCommand extends Command
 
     public function handle()
     {
+        ini_set('memory_limit', '1024M');
+
         $os = php_uname('s');
         $cpu = php_uname('m');
 

src/Commands/InstallCommand.php

@@ -36,16 +36,21 @@ public function handle()
         return self::SUCCESS;
     }
 
+    protected function phpBinary()
+    {
+        return (new PhpExecutableFinder())->find(false) ?: 'php';
+    }
+
     private function ensureTailwindConfigExists()
     {
         $this->copyStubToApp(
-            stub: __DIR__.'/../../stubs/tailwind.config.js',
-            to: base_path('tailwind.config.js'),
+            stub: __DIR__ . '/../../stubs/postcss.config.js',
+            to: base_path('postcss.config.js'),
         );
 
         if (! File::exists($appCssFilePath = resource_path('css/app.css')) || empty(trim(File::get($appCssFilePath)))) {
             $this->copyStubToApp(
-                stub: __DIR__.'/../../stubs/resources/css/app.css',
+                stub: __DIR__ . '/../../stubs/resources/css/app.css',
                 to: $appCssFilePath,
             );
         }
@@ -85,15 +90,15 @@ private function installMiddlewareAfter($after, $name, $group = 'web')
         $httpKernel = file_get_contents(app_path('Http/Kernel.php'));
 
         $middlewareGroups = Str::before(Str::after($httpKernel, '$middlewareGroups = ['), '];');
-        $middlewareGroup = Str::before(Str::after($middlewareGroups, "'$group' => ["), '],');
+        $middlewareGroup = Str::before(Str::after($middlewareGroups, "'{$group}' => ["), '],');
 
         if (str_contains($middlewareGroup, $name)) {
             return;
         }
 
         $modifiedMiddlewareGroup = str_replace(
-            $after.',',
-            $after.','.PHP_EOL.'            '.$name.',',
+            $after . ',',
+            $after . ',' . PHP_EOL . '            ' . $name . ',',
             $middlewareGroup,
         );
 
@@ -140,10 +145,10 @@ private function installMiddlewareToBootstrap(string $middleware, string $group
         $bootstrapApp = str_replace(
             '->withMiddleware(function (Middleware $middleware) {',
             '->withMiddleware(function (Middleware $middleware) {'
-                .PHP_EOL."        \$middleware->$group($modifier: ["
-                .PHP_EOL."            $middleware,"
-                .PHP_EOL.'        ]);'
-                .PHP_EOL,
+                . PHP_EOL . "        \$middleware->{$group}({$modifier}: ["
+                . PHP_EOL . "            {$middleware},"
+                . PHP_EOL . '        ]);'
+                . PHP_EOL,
             $bootstrapApp,
         );
 
@@ -177,9 +182,4 @@ private function runFirstBuild()
             $this->output->write($output);
         });
     }
-
-    protected function phpBinary()
-    {
-        return (new PhpExecutableFinder())->find(false) ?: 'php';
-    }
 }

stubs/postcss.config.js

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

stubs/resources/css/app.css

@@ -1,3 +1,2 @@
-@import "tailwindcss/base";
-@import "tailwindcss/components";
-@import "tailwindcss/utilities";
+@import "tailwindcss";
+