fix: find assets from manifest instead of generating urls

innocenzi · innocenzi · commit ffca5eb0fcb1 · 2022-09-14T14:43:36.000+02:00
diff --git a/src/Configuration.php b/src/Configuration.php
@@ -192,7 +192,7 @@ public function getEntryUrl(string $entryName): string
     public function getAssetUrl(string $path): string
     {
         if ($this->shouldUseManifest()) {
-            return asset(sprintf('/%s/%s', trim($this->config('build_path'), '/\\'), ltrim($path, '/')));
+            return $this->getManifest()->getChunk($path)->getAssetUrl();
         }
 
         return sprintf('%s/%s', rtrim($this->config('dev_server.url'), '/'), ltrim($path, '/'));
diff --git a/src/Manifest.php b/src/Manifest.php
@@ -61,6 +61,18 @@ public function getEntry(string $name): Chunk
         return $entry;
     }
 
+    /**
+     * Gets a chunk for the given name.
+     */
+    public function getChunk(string $name): Chunk
+    {
+        if (!$chunk = $this->chunks->first(fn (array $chunk) => data_get($chunk, 'src') === $name)) {
+            throw NoSuchEntrypointException::inManifest($name, static::guessConfigName($this->getPath()));
+        }
+
+        return Chunk::fromArray($this, $chunk);
+    }
+
     /**
      * Gets every entry.
      */
diff --git a/tests/Features/ConfigurationTest.php b/tests/Features/ConfigurationTest.php
@@ -148,27 +148,18 @@
 });
 
 it('returns a valid asset URL in production', function () {
+    set_fixtures_path('builds');
     set_env('production');
 
-    set_vite_config('default', ['build_path' => '/with/slashes/']);
-    expect(vite()->getAssetUrl('/my-custom-asset.txt'))->toContain('https://localhost/with/slashes/my-custom-asset.txt');
-
-    set_vite_config('default', ['build_path' => '/with/leading/slash']);
-    expect(vite()->getAssetUrl('/my-custom-asset.txt'))->toContain('https://localhost/with/leading/slash/my-custom-asset.txt');
-
-    set_vite_config('default', ['build_path' => 'with/trailing/slash/']);
-    expect(vite()->getAssetUrl('/my-custom-asset.txt'))->toContain('https://localhost/with/trailing/slash/my-custom-asset.txt');
-
-    set_vite_config('default', ['build_path' => 'build']);
-    expect(vite()->getAssetUrl('/my-custom-asset.txt'))->toContain('https://localhost/build/my-custom-asset.txt');
-    expect(vite()->getAssetUrl('my-custom/asset.txt'))->toContain('https://localhost/build/my-custom/asset.txt');
+    set_vite_config('default', ['build_path' => '/with-image-assets']);
+    expect(vite()->getAssetUrl('resources/images/background.png'))->toContain('https://localhost/with-image-assets/assets/background.bbe601e4.png');
 
     $property = new ReflectionProperty(UrlGenerator::class, 'assetRoot');
     $property->setAccessible(true);
     $property->setValue(app('url'), 'https://s3.us-west-2.amazonaws.com/12345678');
 
-    expect(vite()->getAssetUrl('/my-custom-asset.txt'))
-        ->toContain('https://s3.us-west-2.amazonaws.com/12345678/build/my-custom-asset');
+    expect(vite()->getAssetUrl('resources/images/background.png'))
+        ->toContain('https://s3.us-west-2.amazonaws.com/12345678/with-image-assets/assets/background.bbe601e4.png');
 });
 
 it('respects the mode override in production', function () {
diff --git a/tests/Fixtures/builds/public/with-image-assets/manifest.json b/tests/Fixtures/builds/public/with-image-assets/manifest.json
@@ -0,0 +1,11 @@
+{
+  "resources/images/background.png": {
+    "file": "assets/background.bbe601e4.png",
+    "src": "resources/images/background.png"
+  },
+	"resources/scripts/entry.ts": {
+		"file": "entry.2615a355.js",
+		"src": "resources/scripts/entry.ts",
+		"isEntry": true
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public function getEntryUrl(string $entryName): string`
`192`	`192`	`public function getAssetUrl(string $path): string`
`193`	`193`	`{`
`194`	`194`	`if ($this->shouldUseManifest()) {`
`195`		`- return asset(sprintf('/%s/%s', trim($this->config('build_path'), '/\\'), ltrim($path, '/')));`
	`195`	`+ return $this->getManifest()->getChunk($path)->getAssetUrl();`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`return sprintf('%s/%s', rtrim($this->config('dev_server.url'), '/'), ltrim($path, '/'));`