Merge pull request #8 from firtadokei/dev

mihatorikei · web-flow · commit 453ca1a45412 · 2022-07-15T02:45:08.000Z
- Add some helpers
- auto injecting is now optional
diff --git a/src/Config/env.default b/src/Config/env.default
@@ -2,12 +2,11 @@
 # Codeigniter vite
 #--------------------------------------------------------------------
 
+VITE_AUTO_INJECTING='true'
 VITE_ORIGIN='http://localhost:3479'
 VITE_PORT=3479
 VITE_BUILD_DIR='build'
 VITE_ENTRY_FILE='main.js'
 VITE_RESOURCES_DIR='resources'
 VITE_FRAMEWORK='none'
-# Set this to false, or otherwise the plugin will try to add a div with an app id in your view file
-VITE_ADD_APP_ID='true'
 VITE_BACKUP_FILE=
diff --git a/src/Decorator.php b/src/Decorator.php
@@ -9,21 +9,22 @@ class Decorator implements ViewDecoratorInterface
     public static function decorate(string $html): string
     {
         # Check if vite is running or manifest is ready.
-        if (CodeigniterVite::check())
+        if (Vite::isReady() && env('VITE_AUTO_INJECTING'))
         {
             # 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);
+            $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>"
+            ];
 
-            if (env('VITE_ADD_APP_ID') == "true")
-            {
-                # Insert app id just after body tag
-                $html = empty($tags) ? $html : str_replace('<body>', "<body>\n\t<div id=\"app\">", $html);
-                # Close it.
-                $html = empty($tags) ? $html : str_replace('</body>', "\n\t</div>\n</body>", $html);
-            }
+            # Insert tags just before "</head>" tag and a div with "app" id
+            $html = str_replace(array_keys($findAndReplace), array_values($findAndReplace), $html);
         }
 
         return $html;
diff --git a/src/Helpers/vite_helper.php b/src/Helpers/vite_helper.php
@@ -0,0 +1,42 @@
+<?php
+
+use Mihatori\CodeigniterVite\Vite;
+
+/**
+ * Get vite entry file or bundled files.
+ * 
+ * @return string|null
+ */
+function viteTags(): ?string
+{
+    return Vite::tags();
+}
+
+/**
+ * Get react module
+ * 
+ * @return string|null
+ */
+function getReactModule(): ?string
+{
+    return vite::getReactTag();
+}
+
+/**
+ * @return bool true if vite is running
+ */
+function viteIsRunning(): bool
+{
+    $entryFile = env('VITE_ORIGIN') . '/' . env('VITE_RESOURCES_DIR') . '/' . env('VITE_ENTRY_FILE');
+    return (bool) @file_get_contents($entryFile);
+}
+
+/**
+ * Get vite framework
+ * 
+ * @return string react, vue, svelte or none
+ */
+function viteFramework()
+{
+    return env('VITE_FRAMEWORK');
+}
diff --git a/src/Vite.php b/src/Vite.php
@@ -2,7 +2,7 @@
 
 namespace Mihatori\CodeigniterVite;
 
-class CodeigniterVite
+class Vite
 {
 
     /**
@@ -79,7 +79,7 @@ public static function getReactTag(): ?string
      * 
      * @return bool true if vite is runnig or if manifest does exist, otherwise false;
      */
-    public static function check(): bool
+    public static function isReady(): bool
     {
         # Check if vite is running.
         $entryFile = env('VITE_ORIGIN') . '/' . env('VITE_RESOURCES_DIR') . '/' . env('VITE_ENTRY_FILE');

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Mihatori\CodeigniterVite;`
`4`	`4`
`5`		`-class CodeigniterVite`
	`5`	`+class Vite`
`6`	`6`	`{`
`7`	`7`
`8`	`8`	`/**`
`@@ -79,7 +79,7 @@ public static function getReactTag(): ?string`
`79`	`79`	`*`
`80`	`80`	`* @return bool true if vite is runnig or if manifest does exist, otherwise false;`
`81`	`81`	`*/`
`82`		`- public static function check(): bool`
	`82`	`+ public static function isReady(): bool`
`83`	`83`	`{`
`84`	`84`	`# Check if vite is running.`
`85`	`85`	`$entryFile = env('VITE_ORIGIN') . '/' . env('VITE_RESOURCES_DIR') . '/' . env('VITE_ENTRY_FILE');`