Merge pull request #1327 from hydephp/update-playcdn-integration-to-work-gracefully-when-there-is-no-tailwind-config-file

emmadesilva · web-flow · commit ea035f17d539 · 2023-03-18T12:06:47.000+01:00
Update AssetService::injectTailwindConfig method to handle missing config file gracefully
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -26,6 +26,7 @@ This release is the first since the official release of HydePHP 1.0.0. It contai
 - Fixed https://github.com/hydephp/develop/issues/1320 in https://github.com/hydephp/develop/pull/1321
 - Fixed https://github.com/hydephp/develop/issues/1322 in https://github.com/hydephp/develop/issues/1323
 - Fixed https://github.com/hydephp/develop/issues/1324 in https://github.com/hydephp/develop/pull/1325
+- Fixed https://github.com/hydephp/develop/issues/1326 in https://github.com/hydephp/develop/pull/1327
 - Added missing function imports in https://github.com/hydephp/develop/pull/1309
 
 ### Security
diff --git a/packages/framework/src/Framework/Services/AssetService.php b/packages/framework/src/Framework/Services/AssetService.php
@@ -67,6 +67,10 @@ public function hasMediaFile(string $file): bool
 
     public function injectTailwindConfig(): string
     {
+        if (! file_exists(Hyde::path('tailwind.config.js'))) {
+            return '';
+        }
+
         $config = Str::between(file_get_contents(Hyde::path('tailwind.config.js')), '{', '}');
 
         // Remove the plugins array, as it is not used in the frontend.
diff --git a/packages/framework/tests/Unit/AssetServiceUnitTest.php b/packages/framework/tests/Unit/AssetServiceUnitTest.php
@@ -6,6 +6,7 @@
 
 use Hyde\Framework\Services\AssetService;
 use Hyde\Testing\UnitTestCase;
+use Hyde\Hyde;
 
 /**
  * @covers \Hyde\Framework\Services\AssetService
@@ -107,4 +108,12 @@ public function testInjectTailwindConfigReturnsExtractedTailwindConfig()
         $this->assertStringContainsString('typography: {', $config);
         $this->assertStringNotContainsString('plugins', $config);
     }
+
+    public function testInjectTailwindConfigHandlesMissingConfigFileGracefully()
+    {
+        rename(Hyde::path('tailwind.config.js'), Hyde::path('tailwind.config.js.bak'));
+        $this->assertIsString((new AssetService())->injectTailwindConfig());
+        $this->assertSame('', (new AssetService())->injectTailwindConfig());
+        rename(Hyde::path('tailwind.config.js.bak'), Hyde::path('tailwind.config.js'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,10 @@ public function hasMediaFile(string $file): bool`
`67`	`67`
`68`	`68`	`public function injectTailwindConfig(): string`
`69`	`69`	`{`
	`70`	`+ if (! file_exists(Hyde::path('tailwind.config.js'))) {`
	`71`	`+ return '';`
	`72`	`+ }`
	`73`	`+`
`70`	`74`	`$config = Str::between(file_get_contents(Hyde::path('tailwind.config.js')), '{', '}');`
`71`	`75`
`72`	`76`	`// Remove the plugins array, as it is not used in the frontend.`