Bladeren bron

Fix laravel type generation

shalvah 4 jaren geleden
bovenliggende
commit
dbb172a61a
2 gewijzigde bestanden met toevoegingen van 3 en 2 verwijderingen
  1. 1 0
      src/Tools/Utils.php
  2. 2 2
      src/Writing/Writer.php

+ 1 - 0
src/Tools/Utils.php

@@ -99,6 +99,7 @@ class Utils
         $adapter = new Local($workingDir ?: getcwd());
         $fs = new Filesystem($adapter);
         $dir = ltrim($dir, '/');
+        $dir = ltrim($dir, $adapter->getPathPrefix());
         $fs->deleteDir($dir);
     }
 

+ 2 - 2
src/Writing/Writer.php

@@ -140,12 +140,12 @@ class Writer
 
         // Move assets from public/docs to public/vendor/scribe
         // We need to do this delete first, otherwise move won't work if folder exists
-        Utils::deleteDirectoryAndContents("$publicDirectory/vendor/scribe/", "/");
+        Utils::deleteDirectoryAndContents("$publicDirectory/vendor/scribe/");
         rename("{$this->staticTypeOutputPath}/", "$publicDirectory/vendor/scribe/");
 
         $contents = file_get_contents("$this->laravelTypeOutputPath/index.blade.php");
 
-        // Rewrite links to go through Laravel
+        // Rewrite asset links to go through Laravel
         $contents = preg_replace('#href="css/(.+?)"#', 'href="{{ asset("vendor/scribe/css/$1") }}"', $contents);
         $contents = preg_replace('#src="(js|images)/(.+?)"#', 'src="{{ asset("vendor/scribe/$1/$2") }}"', $contents);
         $contents = str_replace('href="./collection.json"', 'href="{{ route("scribe.postman") }}"', $contents);