Merge pull request #6 from firtadokei/dev

Fix a bug
mihatorikei · Jul 12, 2022 · d75affc · d75affc
2 parents 8256a47 + 92bf6a8
commit d75affc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/CodeigniterVite.php b/src/CodeigniterVite.php
@@ -8,19 +8,19 @@ class CodeigniterVite
     /**
      * @var string manifest path.
      */
-    private static $manifest;
+    private $manifest;
 
     public function __construct()
     {
-        self::$manifest = is_file(FCPATH . 'manifest.json') ? FCPATH . 'manifest.json' : null;
+        $this->manifest = is_file(FCPATH . 'manifest.json') ? FCPATH . 'manifest.json' : null;
     }
 
     /**
      * Get vite entry file on running or bundled files instead.
      * 
      * @return string single script tag on developing and much more on production
      */
-    public static function tags()
+    public function tags()
     {
         # Check if vite is running.
         $entryFile = env('VITE_ORIGIN') . '/' . env('VITE_RESOURCES_DIR') . '/' . env('VITE_ENTRY_FILE');
@@ -30,14 +30,14 @@ public static function tags()
         # React HMR fix.
         if (!empty($result))
         {
-            $result = self::getReactTag() . "$result";
+            $result = $this->getReactTag() . "$result";
         }
 
         # If vite isn't running, then return the compiled resources.
-        if (empty($result) && self::$manifest)
+        if (empty($result) && $this->manifest)
         {
             # Get the manifest content.
-            $manifest = file_get_contents(self::$manifest);
+            $manifest = file_get_contents($this->manifest);
             # You look much pretty as an php object =).
             $manifest = json_decode($manifest);
 
@@ -67,7 +67,7 @@ public static function tags()
      * 
      * @return string|null a simple module script
      */
-    public static function getReactTag()
+    public function getReactTag()
     {
         if (env('VITE_FRAMEWORK') === 'react')
         {
@@ -84,7 +84,7 @@ public static function getReactTag()
      * 
      * @return bool true if vite is runnig or if manifest does exist, otherwise false;
      */
-    public static function check(): bool
+    public function check(): bool
     {
         # Check if vite is running.
         $entryFile = env('VITE_ORIGIN') . '/' . env('VITE_RESOURCES_DIR') . '/' . env('VITE_ENTRY_FILE');
@@ -93,7 +93,7 @@ public static function check(): bool
         {
             $result = true;
         }
-        elseif (!empty(self::$manifest))
+        elseif (!empty($this->manifest))
         {
             $result = true;
         }

diff --git a/src/Decorator.php b/src/Decorator.php
@@ -8,11 +8,13 @@ class Decorator implements ViewDecoratorInterface
 {
     public static function decorate(string $html): string
     {
+        $vite = new CodeigniterVite();
+
         # Check if vite is running or manifest is ready.
-        if (CodeigniterVite::check())
+        if ($vite->check())
         {
             # Get generated js and css tags.
-            $tags = CodeigniterVite::tags();
+            $tags = $vite->tags();
 
             # Insert tags just before "</head>" tag.
             $html = empty($tags) ? $html : str_replace('</head>', "\n\t$tags\n</head>", $html);