Merge pull request #14 from jaguarch/master

mihatorikei · web-flow · commit f62b4e1ae69f · 2022-07-24T05:54:19.000Z
throw an exception error if the package isn't initialized
diff --git a/src/Decorator.php b/src/Decorator.php
@@ -8,9 +8,14 @@ class Decorator implements ViewDecoratorInterface
 {
     public static function decorate(string $html): string
     {
-        # Check if vite is running or manifest is ready.
-        if (Vite::isReady() && env('VITE_AUTO_INJECTING'))
+        # Check whether vite is running or manifest is ready.
+        if (env('VITE_AUTO_INJECTING'))
         {
+            if (Vite::isReady() === false)
+            {
+                throw new \Exception('CodeignIter Vite package is installed, but not initialized. did you run "php spark vite:init" ?');
+            }
+
             # First inject app div
             $html = str_replace('<body>', "<body>\n\t<div id=\"app\">", $html);
             # Close the div
diff --git a/src/Vite.php b/src/Vite.php
@@ -86,27 +86,25 @@ public static function getReactTag(): ?string
     }
 
     /**
-     * Check if the vite is running or manifest does exist.
+     * Check whether vite is running or manifest does exist.
      * 
      * @return bool true if vite is runnig or if manifest does exist, otherwise false;
      */
     public static function isReady(): bool
     {
-        # Check if vite is running.
         $entryFile = env('VITE_ORIGIN') . '/' . env('VITE_RESOURCES_DIR') . '/' . env('VITE_ENTRY_FILE');
 
         switch (true)
         {
             case @file_get_contents($entryFile):
                 $result = true;
                 break;
-            case !empty(self::$manifest):
+            case is_file(self::$manifest):
                 $result = true;
                 break;
 
             default:
                 $result = false;
-                break;
         }
 
         return $result;

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,14 @@ class Decorator implements ViewDecoratorInterface`
`8`	`8`	`{`
`9`	`9`	`public static function decorate(string $html): string`
`10`	`10`	`{`
`11`		`- # Check if vite is running or manifest is ready.`
`12`		`- if (Vite::isReady() && env('VITE_AUTO_INJECTING'))`
	`11`	`+ # Check whether vite is running or manifest is ready.`
	`12`	`+ if (env('VITE_AUTO_INJECTING'))`
`13`	`13`	`{`
	`14`	`+ if (Vite::isReady() === false)`
	`15`	`+ {`
	`16`	`+ throw new \Exception('CodeignIter Vite package is installed, but not initialized. did you run "php spark vite:init" ?');`
	`17`	`+ }`
	`18`	`+`
`14`	`19`	`# First inject app div`
`15`	`20`	`$html = str_replace('<body>', "<body>\n\t<div id=\"app\">", $html);`
`16`	`21`	`# Close the div`
Original file line number	Diff line number	Diff line change
`@@ -86,27 +86,25 @@ public static function getReactTag(): ?string`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`/**`
`89`		`- * Check if the vite is running or manifest does exist.`
	`89`	`+ * Check whether vite is running or manifest does exist.`
`90`	`90`	`*`
`91`	`91`	`* @return bool true if vite is runnig or if manifest does exist, otherwise false;`
`92`	`92`	`*/`
`93`	`93`	`public static function isReady(): bool`
`94`	`94`	`{`
`95`		`- # Check if vite is running.`
`96`	`95`	`$entryFile = env('VITE_ORIGIN') . '/' . env('VITE_RESOURCES_DIR') . '/' . env('VITE_ENTRY_FILE');`
`97`	`96`
`98`	`97`	`switch (true)`
`99`	`98`	`{`
`100`	`99`	`case @file_get_contents($entryFile):`
`101`	`100`	`$result = true;`
`102`	`101`	`break;`
`103`		`- case !empty(self::$manifest):`
	`102`	`+ case is_file(self::$manifest):`
`104`	`103`	`$result = true;`
`105`	`104`	`break;`
`106`	`105`
`107`	`106`	`default:`
`108`	`107`	`$result = false;`
`109`		`- break;`
`110`	`108`	`}`
`111`	`109`
`112`	`110`	`return $result;`