Fix optimize command when vendor import starts with forward slash

tonysm · Feb 2, 2024 · 4e17a78 · 4e17a78
1 parent 139b788
commit 4e17a78
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/src/Commands/OptimizeCommand.php b/src/Commands/OptimizeCommand.php
@@ -24,7 +24,7 @@ public function handle(Importmap $importmap): int
             $optimizedImports = collect($imports['imports'])
                 ->reject(fn (string $url) => Str::startsWith($url, ['http://', 'https://']))
                 ->map(function (string $file) use ($importmap) {
-                    $sourceFile = $importmap->rootPath.(str_starts_with($file, 'vendor/') ? '/public/' : '/resources/').trim($file, '/');
+                    $sourceFile = $importmap->rootPath.(str_starts_with(trim($file, '/'), 'vendor/') ? '/public/' : '/resources/').trim($file, '/');
                     $sourceReplacement = $importmap->rootPath.'/public/dist/'.trim($this->digest($file, $sourceFile), '/');
 
                     File::ensureDirectoryExists(dirname($sourceReplacement));

diff --git a/tests/OptimizeCommandTest.php b/tests/OptimizeCommandTest.php
@@ -22,6 +22,7 @@ protected function setUp(): void
         $this->map->pin('app');
         $this->map->pin('md5', to: 'https://cdn.skypack.dev/md5', preload: true);
         $this->map->pin('my_lib', to: 'vendor/nova/my_lib.js', preload: true);
+        $this->map->pin('my_other_lib', to: '/vendor/nova/my_other_lib.js', preload: true);
 
         if (File::isDirectory($this->distPath = $this->rootPath.'/public/dist/')) {
             File::cleanDirectory($this->distPath);

diff --git a/tests/stubs/public/vendor/nova/my_other_lib.js b/tests/stubs/public/vendor/nova/my_other_lib.js