Merge pull request #5 from tonysm/fix-windows

Fix windows

Author: tonysm

config/tailwindcss.php

@@ -13,7 +13,7 @@
      */
     'build' => [
         'source_file_path' => resource_path('css/app.css'),
-        'destination_file_path' => public_path('dist/css/app.css'),
+        'destination_path' => public_path('dist'),
         'manifest_file_path' => public_path('.tailwindcss-manifest.json'),
     ],
 
@@ -27,7 +27,7 @@
      | Use the `tailwindcss:download` Artisan command to ensure the binary is there.
      |
      */
-    'bin_path' => base_path('tailwindcss'),
+    'bin_path' => PHP_OS === 'WINNT' ? base_path('tailwindcss.exe') : base_path('tailwindcss'),
 
     /*
      |---------------------------------------------------------------------

src/Commands/BuildCommand.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
-use Illuminate\Support\Str;
 use Symfony\Component\Process\Process;
 use Tonysm\TailwindCss\Manifest;
 
@@ -31,23 +30,26 @@ public function handle()
 
         $this->info('Building assets...');
 
-        $generatedFile = config('tailwindcss.build.destination_file_path');
-        $generatedFileRelativePath = Str::after($generatedFile, rtrim(public_path(), '/'));
+        $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);
+        $destinationFileRelativePath = str_replace(rtrim(public_path(), DIRECTORY_SEPARATOR), '', $destinationFileAbsolutePath);
 
-        File::ensureDirectoryExists(dirname($generatedFile));
-        File::cleanDirectory(dirname($generatedFile));
+        File::ensureDirectoryExists(dirname($destinationFileAbsolutePath));
+        File::cleanDirectory(dirname($destinationFileAbsolutePath));
 
         if ($this->option('watch') || ! $this->shouldVersion()) {
             // Ensure there is at least one mix-manifest.json that points to the unversioned asset...
             File::put(Manifest::path(), json_encode([
-                '/css/app.css' => $generatedFileRelativePath,
+                $this->fixOsFilePathToUriPath($sourceRelativePath) => $this->fixOsFilePathToUriPath($destinationFileRelativePath),
             ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
         }
 
         $process = new Process(array_filter([
             $binFile,
-            '-i', config('tailwindcss.build.source_file_path'),
-            '-o', $generatedFile,
+            '-i', $sourcePath,
+            '-o', $destinationFileAbsolutePath,
             $this->option('watch') ? '-w' : null,
             $this->shouldMinify() ? '-m' : null,
         ]), timeout: null);
@@ -59,14 +61,15 @@ public function handle()
         });
 
         if ($this->shouldVersion()) {
-            $generatedFile = $this->ensureAssetIsVersioned($generatedFile);
+            $destinationFileAbsolutePath = $this->ensureAssetIsVersioned($destinationFileAbsolutePath);
+            $destinationFileRelativePath = str_replace(rtrim(public_path(), DIRECTORY_SEPARATOR), '', $destinationFileAbsolutePath);
         }
 
         if (! $this->option('watch') && $this->shouldVersion()) {
             $this->info(sprintf('Generating the versioned %s file...', Manifest::filename()));
 
             File::put(Manifest::path(), json_encode([
-                '/css/app.css' => Str::after($generatedFile, rtrim(dirname(Manifest::path()), '/')),
+                $this->fixOsFilePathToUriPath($sourceRelativePath) => $this->fixOsFilePathToUriPath($destinationFileRelativePath),
             ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
         }
 
@@ -75,6 +78,16 @@ public function handle()
         return self::SUCCESS;
     }
 
+    private function fixFilePathForOs(string $path): string
+    {
+        return str_replace('/', DIRECTORY_SEPARATOR, $path);
+    }
+
+    private function fixOsFilePathToUriPath(string $path): string
+    {
+        return str_replace(DIRECTORY_SEPARATOR, '/', $path);
+    }
+
     private function shouldVersion(): bool
     {
         return $this->option('digest') || $this->option('prod');

src/Commands/DownloadCommand.php

@@ -8,7 +8,11 @@
 
 class DownloadCommand extends Command
 {
-    protected $signature = 'tailwindcss:download {--force : If the file already exists, we will not touch it. Use this flag if you want to replace it with a new version.}';
+    protected $signature = 'tailwindcss:download
+        {--force : If the file already exists, we will not touch it. Use this flag if you want to replace it with a new version.}
+        {--timeout=600 : Timeout in seconds. Defaults to 5 mins (600s).}
+    ';
+
     protected $description = 'Downloads the Tailwind CSS binary for the version specified in your config/tailwindcss.php.';
 
     public function handle()
@@ -21,6 +25,7 @@ public function handle()
             'Linux-aarch64' => 'tailwindcss-linux-arm64',
             'Darwin-arm64' => 'tailwindcss-macos-arm64',
             'Darwin-x86_64' => 'tailwindcss-macos-x64',
+            'Windows NT-AMD64' => 'tailwindcss-windows-x64.exe',
         ];
 
         if (! $targetArchitecture = ($architectureToBinary["{$os}-{$cpu}"] ?? false)) {
@@ -40,7 +45,8 @@ public function handle()
 
         $this->info(sprintf('Downloading the Tailwind CSS binary (%s/%s/%s)...', $os, $cpu, $targetVersion));
 
-        $contents = Http::get($this->downloadUrl($targetArchitecture, $targetVersion))
+        $contents = Http::timeout($this->option('timeout'))
+            ->get($this->downloadUrl($targetArchitecture, $targetVersion))
             ->throw()
             ->body();