fix #12

mihatorikei · mihatorikei · commit 31fb1976ca31 · 2022-07-22T04:12:28.000Z
diff --git a/src/Decorator.php b/src/Decorator.php
@@ -11,20 +11,28 @@ public static function decorate(string $html): string
         # Check if vite is running or manifest is ready.
         if (Vite::isReady() && env('VITE_AUTO_INJECTING'))
         {
-            # Get generated js and css tags.
+            # First inject app div
+            $html = str_replace('<body>', "<body>\n\t<div id=\"app\">", $html);
+            # Close the div
+            $html = str_replace('</body>', "\n\t</div>\n</body>", $html);
+
+            # Get generated css.
             $tags = Vite::tags();
 
-            $findAndReplace = [
-                # Generated js and css tags.
-                '</head>'   => "\n\t$tags\n</head>",
-                # app div
-                '<body>'    => "<body>\n\t<div id=\"app\">",
-                # Closing app div.
-                '</body>'   => "\n\t</div>\n</body>"
-            ];
-
-            # Insert tags just before "</head>" tag and a div with "app" id
-            $html = str_replace(array_keys($findAndReplace), array_values($findAndReplace), $html);
+            $jsTags  = $tags['js'];
+
+            # now inject css
+            if (!empty($tags['css']))
+            {
+                $cssTags = $tags['css'];
+
+                $html = str_replace('</head>', "\n\t$cssTags\n", $html);
+                $html = str_replace('</body>', "\n\t$jsTags\n</body>", $html);
+            }
+            else
+            {
+                $html = str_replace('</head>', "\n\t$jsTags\n</head>", $html);
+            }
         }
 
         return $html;
diff --git a/src/Helpers/vite_helper.php b/src/Helpers/vite_helper.php
@@ -5,9 +5,9 @@
 /**
  * Get vite entry file or bundled files.
  * 
- * @return string|null
+ * @return array|null
  */
-function viteTags(): ?string
+function viteTags(): ?array
 {
     return Vite::tags();
 }
diff --git a/src/Vite.php b/src/Vite.php
@@ -13,27 +13,32 @@ class Vite
     /**
      * Get vite entry file on running or bundled files instead.
      * 
-     * @return string single script tag on developing and much more on production
+     * @return array single script tag on developing and much more on production
      */
-    public static function tags(): ?string
+    public static function tags(): ?array
     {
+        $result = [
+            'js'    => null,
+            'css'   => null
+        ];
+
         # Check if vite is running.
         $entryFile = env('VITE_ORIGIN') . '/' . env('VITE_RESOURCES_DIR') . '/' . env('VITE_ENTRY_FILE');
 
-        $result = @file_get_contents($entryFile) ? '<script type="module" src="' . $entryFile . '"></script>' : null;
+        $result['js'] = @file_get_contents($entryFile) ? '<script type="module" src="' . $entryFile . '"></script>' : null;
 
         # React HMR fix.
-        if (!empty($result))
+        if (!empty($result['js']))
         {
-            $result = self::getReactTag() . "$result";
+            $result['js'] = self::getReactTag() . $result['js'];
         }
 
-        # If vite isn't running, then return the compiled resources.
-        if (empty($result) && is_file(self::$manifest))
+        # If vite isn't running, then return the bundled resources.
+        if (empty($result['js']) && is_file(self::$manifest))
         {
             # Get the manifest content.
             $manifest = file_get_contents(self::$manifest);
-            # You look much pretty as an php object =).
+            # You look much pretty as a php object =).
             $manifest = json_decode($manifest);
 
             # Now, we will get all js files and css from the manifest.
@@ -45,14 +50,14 @@ public static function tags(): ?string
                 # Generate js tag.
                 if ($fileExtension === '.js' && isset($file->isEntry) && $file->isEntry === true)
                 {
-                    $result .= '<script type="module" src="/' . $file->file . '"></script>';
+                    $result['js'] .= '<script type="module" src="/' . $file->file . '"></script>';
                 }
 
                 if (!empty($file->css))
                 {
                     foreach ($file->css as $cssFile)
                     {
-                        $result .= '<link rel="stylesheet" href="/' . $cssFile . '" />';
+                        $result['css'] .= '<link rel="stylesheet" href="/' . $cssFile . '" />';
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`	`/**`
`6`	`6`	`* Get vite entry file or bundled files.`
`7`	`7`	`*`
`8`		`- * @return string\|null`
	`8`	`+ * @return array\|null`
`9`	`9`	`*/`
`10`		`-function viteTags(): ?string`
	`10`	`+function viteTags(): ?array`
`11`	`11`	`{`
`12`	`12`	`return Vite::tags();`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,27 +13,32 @@ class Vite`
`13`	`13`	`/**`
`14`	`14`	`* Get vite entry file on running or bundled files instead.`
`15`	`15`	`*`
`16`		`- * @return string single script tag on developing and much more on production`
	`16`	`+ * @return array single script tag on developing and much more on production`
`17`	`17`	`*/`
`18`		`- public static function tags(): ?string`
	`18`	`+ public static function tags(): ?array`
`19`	`19`	`{`
	`20`	`+ $result = [`
	`21`	`+ 'js' => null,`
	`22`	`+ 'css' => null`
	`23`	`+ ];`
	`24`	`+`
`20`	`25`	`# Check if vite is running.`
`21`	`26`	`$entryFile = env('VITE_ORIGIN') . '/' . env('VITE_RESOURCES_DIR') . '/' . env('VITE_ENTRY_FILE');`
`22`	`27`
`23`		`- $result = @file_get_contents($entryFile) ? '<script type="module" src="' . $entryFile . '"></script>' : null;`
	`28`	`+ $result['js'] = @file_get_contents($entryFile) ? '<script type="module" src="' . $entryFile . '"></script>' : null;`
`24`	`29`
`25`	`30`	`# React HMR fix.`
`26`		`- if (!empty($result))`
	`31`	`+ if (!empty($result['js']))`
`27`	`32`	`{`
`28`		`- $result = self::getReactTag() . "$result";`
	`33`	`+ $result['js'] = self::getReactTag() . $result['js'];`
`29`	`34`	`}`
`30`	`35`
`31`		`- # If vite isn't running, then return the compiled resources.`
`32`		`- if (empty($result) && is_file(self::$manifest))`
	`36`	`+ # If vite isn't running, then return the bundled resources.`
	`37`	`+ if (empty($result['js']) && is_file(self::$manifest))`
`33`	`38`	`{`
`34`	`39`	`# Get the manifest content.`
`35`	`40`	`$manifest = file_get_contents(self::$manifest);`
`36`		`- # You look much pretty as an php object =).`
	`41`	`+ # You look much pretty as a php object =).`
`37`	`42`	`$manifest = json_decode($manifest);`
`38`	`43`
`39`	`44`	`# Now, we will get all js files and css from the manifest.`
`@@ -45,14 +50,14 @@ public static function tags(): ?string`
`45`	`50`	`# Generate js tag.`
`46`	`51`	`if ($fileExtension === '.js' && isset($file->isEntry) && $file->isEntry === true)`
`47`	`52`	`{`
`48`		`- $result .= '<script type="module" src="/' . $file->file . '"></script>';`
	`53`	`+ $result['js'] .= '<script type="module" src="/' . $file->file . '"></script>';`
`49`	`54`	`}`
`50`	`55`
`51`	`56`	`if (!empty($file->css))`
`52`	`57`	`{`
`53`	`58`	`foreach ($file->css as $cssFile)`
`54`	`59`	`{`
`55`		`- $result .= '<link rel="stylesheet" href="/' . $cssFile . '" />';`
	`60`	`+ $result['css'] .= '<link rel="stylesheet" href="/' . $cssFile . '" />';`
`56`	`61`	`}`
`57`	`62`	`}`
`58`	`63`	`}`