Fixed assets preloading via the Link header

68publishers · Nov 29, 2022 · aa0f6b2 · aa0f6b2
1 parent c6acd78
commit aa0f6b2
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -23,6 +23,7 @@
 		"mockery/mockery": "^1.5",
 		"nette/application": "^3.1.0",
 		"nette/bootstrap": "^3.1",
+		"nette/component-model": "^3.0.2",
 		"nette/tester": "^2.4.3",
 		"phpstan/phpstan": "^1.9",
 		"phpstan/phpstan-nette": "^1.1",

diff --git a/src/Bridge/Nette/Application/ApplicationResponseHandler.php b/src/Bridge/Nette/Application/ApplicationResponseHandler.php
@@ -4,10 +4,17 @@
 
 namespace SixtyEightPublishers\WebpackEncoreBundle\Bridge\Nette\Application;
 
+use Throwable;
+use ReflectionClass;
+use Nette\Utils\Helpers;
 use Nette\Application\Application;
+use Nette\Application\UI\Template;
 use Nette\Http\IResponse as HttpResponse;
+use Nette\Application\Responses\TextResponse;
+use Nette\Application\Response as ApplicationResponse;
 use SixtyEightPublishers\WebpackEncoreBundle\Asset\TagRenderer;
 use SixtyEightPublishers\WebpackEncoreBundle\Asset\EntryPointLookupCollectionInterface;
+use function assert;
 use function explode;
 use function implode;
 use function sprintf;
@@ -44,7 +51,31 @@ public static function register(Application $application, HttpResponse $response
 		$application->onResponse[] = new self($response, $tagRenderer, $entryPointLookupCollection, $buildNames);
 	}
 
-	public function __invoke(): void
+	/**
+	 * @throws Throwable
+	 */
+	public function __invoke(Application $application, ApplicationResponse $response): void
+	{
+		if (!$response instanceof TextResponse || !$response->getSource() instanceof Template) {
+			$this->processLinks();
+
+			return;
+		}
+
+		$source = $response->getSource();
+		assert($source instanceof Template);
+		$rendered = Helpers::capture(static fn () => $source->render());
+
+		$reflection = new ReflectionClass($response);
+		$property = $reflection->getProperty('source');
+
+		$property->setAccessible(TRUE);
+		$property->setValue($response, $rendered);
+
+		$this->processLinks();
+	}
+
+	private function processLinks(): void
 	{
 		$defaultAttributes = $this->tagRenderer->getDefaultAttributes();
 		$crossOrigin = $defaultAttributes['crossorigin'] ?? NULL;

diff --git a/tests/Bridge/Nette/Application/ApplicationResponseHandlerTest.phpt b/tests/Bridge/Nette/Application/ApplicationResponseHandlerTest.phpt
@@ -9,6 +9,10 @@ use Tester\Assert;
 use Tester\TestCase;
 use Nette\Application\Application;
 use Nette\Http\IResponse as HttpResponse;
+use Nette\Bridges\ApplicationLatte\Template;
+use Nette\Application\Responses\JsonResponse;
+use Nette\Application\Responses\TextResponse;
+use Nette\Application\Response as ApplicationResponse;
 use SixtyEightPublishers\WebpackEncoreBundle\Asset\TagRenderer;
 use SixtyEightPublishers\WebpackEncoreBundle\Asset\EntryPointLookupInterface;
 use SixtyEightPublishers\WebpackEncoreBundle\Asset\EntryPointLookupCollectionInterface;
@@ -31,19 +35,43 @@ final class ApplicationResponseHandlerTest extends TestCase
 		Assert::type(ApplicationResponseHandler::class, $application->onResponse[0]);
 	}
 
-	public function testInvokingHandlerWithoutPreviousHeader(): void
+	public function testInvokingHandlerOnTextResponseWithoutPreviousHeader(): void
 	{
 		$this->assertInvokingHandler(
 			NULL,
-			'<http://localhost:8080/build/file1.js>; rel="preload"; as="script",<http://localhost:8080/build/file2.js>; rel="preload"; as="script",<http://localhost:8080/build/file1.css>; rel="preload"; as="style",<http://localhost:8080/build/file2.css>; rel="preload"; as="style"'
+			'<http://localhost:8080/build/file1.js>; rel="preload"; as="script",<http://localhost:8080/build/file2.js>; rel="preload"; as="script",<http://localhost:8080/build/file1.css>; rel="preload"; as="style",<http://localhost:8080/build/file2.css>; rel="preload"; as="style"',
+			NULL,
+			$this->createTextApplicationResponse()
 		);
 	}
 
-	public function testInvokingHandlerWithPreviousHeaderAndCrossOrigin(): void
+	public function testInvokingHandlerOnJsonResponseWithoutPreviousHeader(): void
+	{
+		$this->assertInvokingHandler(
+			NULL,
+			'<http://localhost:8080/build/file1.js>; rel="preload"; as="script",<http://localhost:8080/build/file2.js>; rel="preload"; as="script",<http://localhost:8080/build/file1.css>; rel="preload"; as="style",<http://localhost:8080/build/file2.css>; rel="preload"; as="style"',
+			NULL,
+			new JsonResponse(['status' => 'ok'])
+		);
+	}
+
+	public function testInvokingHandlerOnTextResponseWithPreviousHeaderAndCrossOrigin(): void
 	{
 		$this->assertInvokingHandler(
 			'<http://localhost:8080/static.js>; rel="preload"; as="script",<http://localhost:8080/static.css>; rel="preload"; as="style"',
-			'<http://localhost:8080/static.js>; rel="preload"; as="script",<http://localhost:8080/static.css>; rel="preload"; as="style",<http://localhost:8080/build/file1.js>; rel="preload"; as="script",<http://localhost:8080/build/file2.js>; rel="preload"; as="script",<http://localhost:8080/build/file1.css>; rel="preload"; as="style",<http://localhost:8080/build/file2.css>; rel="preload"; as="style"'
+			'<http://localhost:8080/static.js>; rel="preload"; as="script",<http://localhost:8080/static.css>; rel="preload"; as="style",<http://localhost:8080/build/file1.js>; rel="preload"; as="script"; crossorigin="anonymous",<http://localhost:8080/build/file2.js>; rel="preload"; as="script"; crossorigin="anonymous",<http://localhost:8080/build/file1.css>; rel="preload"; as="style"; crossorigin="anonymous",<http://localhost:8080/build/file2.css>; rel="preload"; as="style"; crossorigin="anonymous"',
+			'anonymous',
+			$this->createTextApplicationResponse()
+		);
+	}
+
+	public function testInvokingHandlerOnJsonResponseWithPreviousHeader(): void
+	{
+		$this->assertInvokingHandler(
+			'<http://localhost:8080/static.js>; rel="preload"; as="script",<http://localhost:8080/static.css>; rel="preload"; as="style"',
+			'<http://localhost:8080/static.js>; rel="preload"; as="script",<http://localhost:8080/static.css>; rel="preload"; as="style",<http://localhost:8080/build/file1.js>; rel="preload"; as="script",<http://localhost:8080/build/file2.js>; rel="preload"; as="script",<http://localhost:8080/build/file1.css>; rel="preload"; as="style",<http://localhost:8080/build/file2.css>; rel="preload"; as="style"',
+			NULL,
+			new JsonResponse(['status' => 'ok'])
 		);
 	}
 
@@ -52,7 +80,7 @@ final class ApplicationResponseHandlerTest extends TestCase
 		Mockery::close();
 	}
 
-	private function assertInvokingHandler(?string $previousHeader, string $expectedHeader, ?string $crossOrigin = NULL): void
+	private function assertInvokingHandler(?string $previousHeader, string $expectedHeader, ?string $crossOrigin, ApplicationResponse $applicationResponse): void
 	{
 		$entrypointLookup1 = Mockery::mock(EntryPointLookupInterface::class);
 		$entrypointLookup2 = Mockery::mock(EntryPointLookupInterface::class);
@@ -97,7 +125,18 @@ final class ApplicationResponseHandlerTest extends TestCase
 
 		$handler = new ApplicationResponseHandler($response, $tagRenderer, $entrypointCollection, ['_default', 'other_build']);
 
-		$handler();
+		$handler(Mockery::mock(Application::class), $applicationResponse);
+	}
+
+	private function createTextApplicationResponse(): ApplicationResponse
+	{
+		$template = Mockery::mock(Template::class);
+
+		$template->shouldReceive('render')
+			->once()
+			->andReturnUndefined();
+
+		return new TextResponse($template);
 	}
 }
 

diff --git a/tests/Bridge/Nette/Application/TestPresenter.php b/tests/Bridge/Nette/Application/TestPresenter.php
@@ -4,22 +4,12 @@
 
 namespace SixtyEightPublishers\WebpackEncoreBundle\Tests\Bridge\Nette\Application;
 
-use Nette\Application\Request;
-use Nette\Application\Response;
 use Nette\Application\UI\Presenter;
-use Nette\Bridges\ApplicationLatte\Template;
-use Nette\Application\Responses\VoidResponse;
-use function assert;
 
 final class TestPresenter extends Presenter
 {
-	public function run(Request $request): Response
+	protected function beforeRender(): void
 	{
-		$template = $this->getTemplate()->setFile(__DIR__ . '/testPresenter.latte');
-		assert($template instanceof Template);
-
-		$template->renderToString();
-
-		return new VoidResponse();
+		$this->getTemplate()->setFile(__DIR__ . '/testPresenter.latte');
 	}
 }
diff --git a/tests/bootstrap.withoutSymfonyConsole.php b/tests/bootstrap.withoutSymfonyConsole.php
@@ -18,6 +18,12 @@
 			$loader->missingClasses[$className] = TRUE;
 		}
 	}
+
+	$psr4Dir = $needle . '\\';
+
+	if (isset($loader->prefixDirsPsr4[$psr4Dir])) {
+		unset($loader->prefixDirsPsr4[$psr4Dir]);
+	}
 }, NULL, ClassLoader::class));
 
 return $loader;