Add remove command & Fix some bugs

mihatorikei · mihatorikei · commit ff716f92536a · 2022-07-10T04:22:18.000Z
diff --git a/src/CodeigniterVite.php b/src/CodeigniterVite.php
@@ -78,4 +78,30 @@ public static function getReactTag()
 
         return null;
     }
+
+    /**
+     * Check if the vite is running or manifest does exist.
+     * 
+     * @return bool true if vite is runnig or if manifest does exist, otherwise false;
+     */
+    public static function check(): bool
+    {
+        # Check if vite is running.
+        $entryFile = env('VITE_ORIGIN') . '/' . env('VITE_RESOURCES_DIR') . '/' . env('VITE_ENTRY_FILE');
+
+        if (@file_get_contents($entryFile))
+        {
+            $result = true;
+        }
+        elseif (!empty(static::$manifest))
+        {
+            $result = true;
+        }
+        else
+        {
+            $result = false;
+        }
+
+        return $result;
+    }
 }
diff --git a/src/Commands/Init.php b/src/Commands/Init.php
@@ -114,13 +114,13 @@ private function updateEnvFile()
         $envFile = ROOTPATH . '.env';
 
         # For backup.
-        $backupFile = '-BACKUP-' . time();
+        $backupFile = 'env-BACKUP-' . time();
 
         # Does exist? if not, generate it =)
         if (is_file($envFile))
         {
             # But first, let's take a backup.
-            copy($envFile, $envFile . $backupFile);
+            copy($envFile, ROOTPATH . $backupFile);
 
             # Get .env.default content
             $content = file_get_contents($this->path . 'Config/env.default');
diff --git a/src/Commands/Remove.php b/src/Commands/Remove.php
@@ -37,7 +37,7 @@ public function run(array $params)
      */
     private function removeFrameworkFiles()
     {
-        CLI::write('⚡ Removing vite files...', 'yellow');
+        CLI::write('Removing vite files...', 'yellow');
         CLI::newLine();
 
         # First vite.config.js
@@ -52,10 +52,6 @@ private function removeFrameworkFiles()
             $publisher = new Publisher(null, ROOTPATH . 'resources');
             $publisher->wipe();
         }
-
-        CLI::newLine();
-        CLI::write('Deleted ✅', 'green');
-        CLI::newLine();
     }
 
     /**
@@ -74,7 +70,7 @@ private function resetEnvFile()
         $backupFile = ROOTPATH . env('VITE_BACKUP_FILE');
 
         # Does exist? if not, generate it =)
-        if (is_file($envFile))
+        if (is_file($backupFile))
         {
             # Remove current .env
             unlink($envFile);
@@ -85,9 +81,5 @@ private function resetEnvFile()
                 unlink($backupFile);
             }
         }
-
-        # env updated.
-        CLI::write('.env file updated ✅', 'green');
-        CLI::newLine();
     }
 }
diff --git a/src/Decorator.php b/src/Decorator.php
@@ -8,12 +8,22 @@ class Decorator implements ViewDecoratorInterface
 {
     public static function decorate(string $html): string
     {
-        # Get generated js and css tags.
-        $tags = CodeigniterVite::tags();
+        # Check if vite is running or manifest is ready.
+        if (CodeigniterVite::check())
+        {
+            # Get generated js and css tags.
+            $tags = CodeigniterVite::tags();
 
-        # Insert tags just before "</head>" tag.
-        $html = empty($tags) ? $html : str_replace('</head>', "\n\t$tags\n</head>", $html);
+            # Insert tags just before "</head>" tag.
+            $html = empty($tags) ? $html : str_replace('</head>', "\n\t$tags\n</head>", $html);
 
+            # 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);
+        }
+
+        # If not, then just return the html as it is.
         return $html;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function run(array $params)`
`37`	`37`	`*/`
`38`	`38`	`private function removeFrameworkFiles()`
`39`	`39`	`{`
`40`		`- CLI::write('⚡ Removing vite files...', 'yellow');`
	`40`	`+ CLI::write('Removing vite files...', 'yellow');`
`41`	`41`	`CLI::newLine();`
`42`	`42`
`43`	`43`	`# First vite.config.js`
`@@ -52,10 +52,6 @@ private function removeFrameworkFiles()`
`52`	`52`	`$publisher = new Publisher(null, ROOTPATH . 'resources');`
`53`	`53`	`$publisher->wipe();`
`54`	`54`	`}`
`55`		`-`
`56`		`- CLI::newLine();`
`57`		`- CLI::write('Deleted ✅', 'green');`
`58`		`- CLI::newLine();`
`59`	`55`	`}`
`60`	`56`
`61`	`57`	`/**`
`@@ -74,7 +70,7 @@ private function resetEnvFile()`
`74`	`70`	`$backupFile = ROOTPATH . env('VITE_BACKUP_FILE');`
`75`	`71`
`76`	`72`	`# Does exist? if not, generate it =)`
`77`		`- if (is_file($envFile))`
	`73`	`+ if (is_file($backupFile))`
`78`	`74`	`{`
`79`	`75`	`# Remove current .env`
`80`	`76`	`unlink($envFile);`
`@@ -85,9 +81,5 @@ private function resetEnvFile()`
`85`	`81`	`unlink($backupFile);`
`86`	`82`	`}`
`87`	`83`	`}`
`88`		`-`
`89`		`- # env updated.`
`90`		`- CLI::write('.env file updated ✅', 'green');`
`91`		`- CLI::newLine();`
`92`	`84`	`}`
`93`	`85`	`}`