nystudio107 / craft-plugin-vite

src/helpers/FileHelper.php

Spacing +7 added lines, -7 removed lines

@@ -54,12 +54,12 @@ 
      */
     public static function fetch(string $pathOrUrl, callable $callback = null, string $cacheKeySuffix = '')
     {
-        $pathOrUrl = (string)Craft::parseEnv($pathOrUrl);
+        $pathOrUrl = (string) Craft::parseEnv($pathOrUrl);
         // Create the dependency tags
         $dependency = new TagDependency([
             'tags' => [
-                self::CACHE_TAG . $cacheKeySuffix,
-                self::CACHE_TAG . $cacheKeySuffix . $pathOrUrl,
+                self::CACHE_TAG.$cacheKeySuffix,
+                self::CACHE_TAG.$cacheKeySuffix.$pathOrUrl,
             ],
         ]);
         // If this is a file path such as for the `manifest.json`, add a FileDependency so it's cache bust if the file changes
@@ -80,8 +80,8 @@ 
         // Get the result from the cache, or parse the file
         $cache = Craft::$app->getCache();
         return $cache->getOrSet(
-            self::CACHE_KEY . $cacheKeySuffix . $pathOrUrl,
-            function () use ($pathOrUrl, $callback) {
+            self::CACHE_KEY.$cacheKeySuffix.$pathOrUrl,
+            function() use ($pathOrUrl, $callback) {
                 $contents = null;
                 $result = null;
                 if (UrlHelper::isAbsoluteUrl($pathOrUrl)) {
@@ -133,8 +133,8 @@ 
      */
     public static function createUrl(string $url, string $path): string
     {
-        $url = (string)Craft::parseEnv($url);
-        return rtrim($url, '/') . '/' . trim($path, '/');
+        $url = (string) Craft::parseEnv($url);
+        return rtrim($url, '/').'/'.trim($path, '/');
     }
 
     /**

src/helpers/ManifestHelper.php

Indentation +35 added lines, -35 removed lines

@@ -152,15 +152,15 @@ 
                 'options' => $tagOptions
             ];
             // Include any imports
-	        $importFiles = [];
-	        self::extractImportFiles(self::$manifest, $manifestKey, $importFiles);
-	        foreach ($importFiles as $importFile) {
-		        $tags[] = [
-			        'crossorigin' => $tagOptions['crossorigin'] ?? true,
-			        'type' => 'import',
-			        'url' => $importFile,
-		        ];
-	        }
+            $importFiles = [];
+            self::extractImportFiles(self::$manifest, $manifestKey, $importFiles);
+            foreach ($importFiles as $importFile) {
+                $tags[] = [
+                    'crossorigin' => $tagOptions['crossorigin'] ?? true,
+                    'type' => 'import',
+                    'url' => $importFile,
+                ];
+            }
             // Include any CSS tags
             $cssFiles = [];
             self::extractCssFiles(self::$manifest, $manifestKey, $cssFiles);
@@ -178,32 +178,32 @@ 
         return $tags;
     }
 
-	/**
-	 * Extract any import files from entries recursively
-	 *
-	 * @param array $manifest
-	 * @param string $manifestKey
-	 * @param array $importFiles
-	 *
-	 * @return array
-	 */
-	protected static function extractImportFiles(array $manifest, string $manifestKey, array &$importFiles): array
-	{
-		$entry = $manifest[$manifestKey] ?? null;
-		if (!$entry) {
-			return [];
-		}
-
-		$imports = $entry['imports'] ?? [];
-		foreach($imports as $import) {
-			$importFiles[] = $manifest[$import]['file'];
-			self::extractImportFiles($manifest, $import, $importFiles);
-		}
-
-		return $importFiles;
-	}
-
-	/**
+    /**
+     * Extract any import files from entries recursively
+     *
+     * @param array $manifest
+     * @param string $manifestKey
+     * @param array $importFiles
+     *
+     * @return array
+     */
+    protected static function extractImportFiles(array $manifest, string $manifestKey, array &$importFiles): array
+    {
+        $entry = $manifest[$manifestKey] ?? null;
+        if (!$entry) {
+            return [];
+        }
+
+        $imports = $entry['imports'] ?? [];
+        foreach($imports as $import) {
+            $importFiles[] = $manifest[$import]['file'];
+            self::extractImportFiles($manifest, $import, $importFiles);
+        }
+
+        return $importFiles;
+    }
+
+    /**
      * Extract any CSS files from entries recursively
      *
      * @param array $manifest

Spacing +4 added lines, -4 removed lines

@@ -45,14 +45,14 @@ 
     public static function fetchManifest(string $manifestPath)
     {
         // Grab the manifest
-        $pathOrUrl = (string)Craft::parseEnv($manifestPath);
+        $pathOrUrl = (string) Craft::parseEnv($manifestPath);
         $manifest = FileHelper::fetch($pathOrUrl, [JsonHelper::class, 'decodeIfJson']);
         // If no manifest file is found, log it
         if ($manifest === null) {
-            Craft::error('Manifest not found at ' . $manifestPath, __METHOD__);
+            Craft::error('Manifest not found at '.$manifestPath, __METHOD__);
         }
         // Ensure we're dealing with an array
-        self::$manifest = (array)$manifest;
+        self::$manifest = (array) $manifest;
     }
 
     /**
@@ -195,7 +195,7 @@ 
 		}
 
 		$imports = $entry['imports'] ?? [];
-		foreach($imports as $import) {
+		foreach ($imports as $import) {
 			$importFiles[] = $manifest[$import]['file'];
 			self::extractImportFiles($manifest, $import, $importFiles);
 		}

src/services/ViteService.php

Indentation +55 added lines, -55 removed lines

@@ -233,30 +233,30 @@ 
         }
 
         // modulepreload any imports from modern tags
-	    $modulepreloadPolyfillRequired = false;
-	    foreach($tags as $tag) {
-		    if (!empty($tag)) {
-			    $url = FileHelper::createUrl($this->serverPublic, $tag['url']);
-			    switch ($tag['type']) {
-				    case 'import':
-					    $lines[] = HtmlHelper::tag('link', '', [
-						    'crossorigin' => $tag['crossorigin'],
-						    'href' => $url,
-						    'rel' => 'modulepreload',
-					    ]);
-					    $modulepreloadPolyfillRequired = true;
-					    break;
-				    default:
-					    break;
-			    }
-		    }
-	    }
-	    if($modulepreloadPolyfillRequired && ! $this->modulepreloadPolyfillIncluded) {
-	        $this->modulepreloadPolyfillIncluded = true;
-	        $lines[] = HtmlHelper::script(
-		        FileHelper::fetchScript('modulepreload-polyfill.min.js', $this->cacheKeySuffix),
-		        ['type' => 'module']
-	        );
+        $modulepreloadPolyfillRequired = false;
+        foreach($tags as $tag) {
+            if (!empty($tag)) {
+                $url = FileHelper::createUrl($this->serverPublic, $tag['url']);
+                switch ($tag['type']) {
+                    case 'import':
+                        $lines[] = HtmlHelper::tag('link', '', [
+                            'crossorigin' => $tag['crossorigin'],
+                            'href' => $url,
+                            'rel' => 'modulepreload',
+                        ]);
+                        $modulepreloadPolyfillRequired = true;
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+        if($modulepreloadPolyfillRequired && ! $this->modulepreloadPolyfillIncluded) {
+            $this->modulepreloadPolyfillIncluded = true;
+            $lines[] = HtmlHelper::script(
+                FileHelper::fetchScript('modulepreload-polyfill.min.js', $this->cacheKeySuffix),
+                ['type' => 'module']
+            );
         }
 
         return implode("\r\n", $lines);
@@ -383,37 +383,37 @@ 
             }
         }
 
-	    // modulepreload any imports from modern tags
-	    $modulepreloadPolyfillRequired = false;
-	    foreach($tags as $tag) {
-		    if (!empty($tag)) {
-			    $url = FileHelper::createUrl($this->serverPublic, $tag['url']);
-			    switch ($tag['type']) {
-				    case 'import':
-					    $view->registerLinkTag(
-						    [
-							    'crossorigin' => $tag['crossorigin'],
-							    'href' => $url,
-							    'rel' => 'modulepreload',
-						    ],
-						    md5($url)
-					    );
-					    $modulepreloadPolyfillRequired = true;
-					    break;
-				    default:
-					    break;
-			    }
-		    }
-	    }
-	    if($modulepreloadPolyfillRequired && ! $this->modulepreloadPolyfillIncluded) {
-		    $this->modulepreloadPolyfillIncluded = true;
-		    $view->registerScript(
-			    FileHelper::fetchScript('modulepreload-polyfill.min.js', $this->cacheKeySuffix),
-			    $view::POS_HEAD,
-			    ['type' => 'module'],
-			    'MODULEPRELOAD_POLYFILL'
-		    );
-	    }
+        // modulepreload any imports from modern tags
+        $modulepreloadPolyfillRequired = false;
+        foreach($tags as $tag) {
+            if (!empty($tag)) {
+                $url = FileHelper::createUrl($this->serverPublic, $tag['url']);
+                switch ($tag['type']) {
+                    case 'import':
+                        $view->registerLinkTag(
+                            [
+                                'crossorigin' => $tag['crossorigin'],
+                                'href' => $url,
+                                'rel' => 'modulepreload',
+                            ],
+                            md5($url)
+                        );
+                        $modulepreloadPolyfillRequired = true;
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+        if($modulepreloadPolyfillRequired && ! $this->modulepreloadPolyfillIncluded) {
+            $this->modulepreloadPolyfillIncluded = true;
+            $view->registerScript(
+                FileHelper::fetchScript('modulepreload-polyfill.min.js', $this->cacheKeySuffix),
+                $view::POS_HEAD,
+                ['type' => 'module'],
+                'MODULEPRELOAD_POLYFILL'
+            );
+        }
     }
 
     /**

Spacing +9 added lines, -9 removed lines

@@ -216,7 +216,7 @@ 
             $this->manifestShimsIncluded = true;
         }
 
-        foreach(array_merge($tags, $legacyTags) as $tag) {
+        foreach (array_merge($tags, $legacyTags) as $tag) {
             if (!empty($tag)) {
                 $url = FileHelper::createUrl($this->serverPublic, $tag['url']);
                 switch ($tag['type']) {
@@ -234,7 +234,7 @@ 
 
         // modulepreload any imports from modern tags
 	    $modulepreloadPolyfillRequired = false;
-	    foreach($tags as $tag) {
+	    foreach ($tags as $tag) {
 		    if (!empty($tag)) {
 			    $url = FileHelper::createUrl($this->serverPublic, $tag['url']);
 			    switch ($tag['type']) {
@@ -251,7 +251,7 @@ 
 			    }
 		    }
 	    }
-	    if($modulepreloadPolyfillRequired && ! $this->modulepreloadPolyfillIncluded) {
+	    if ($modulepreloadPolyfillRequired && !$this->modulepreloadPolyfillIncluded) {
 	        $this->modulepreloadPolyfillIncluded = true;
 	        $lines[] = HtmlHelper::script(
 		        FileHelper::fetchScript('modulepreload-polyfill.min.js', $this->cacheKeySuffix),
@@ -324,7 +324,7 @@ 
         $view->registerJsFile(
             $url,
             array_merge(['type' => 'module'], $scriptTagAttrs),
-            md5($url . JsonHelper::encode($scriptTagAttrs))
+            md5($url.JsonHelper::encode($scriptTagAttrs))
         );
     }
 
@@ -360,7 +360,7 @@ 
             }
             $this->manifestShimsIncluded = true;
         }
-        foreach(array_merge($tags, $legacyTags) as $tag) {
+        foreach (array_merge($tags, $legacyTags) as $tag) {
             if (!empty($tag)) {
                 $url = FileHelper::createUrl($this->serverPublic, $tag['url']);
                 switch ($tag['type']) {
@@ -368,7 +368,7 @@ 
                         $view->registerJsFile(
                             $url,
                             $tag['options'],
-                            md5($url . JsonHelper::encode($tag['options']))
+                            md5($url.JsonHelper::encode($tag['options']))
                         );
                         break;
                     case 'css':
@@ -385,7 +385,7 @@ 
 
 	    // modulepreload any imports from modern tags
 	    $modulepreloadPolyfillRequired = false;
-	    foreach($tags as $tag) {
+	    foreach ($tags as $tag) {
 		    if (!empty($tag)) {
 			    $url = FileHelper::createUrl($this->serverPublic, $tag['url']);
 			    switch ($tag['type']) {
@@ -405,7 +405,7 @@ 
 			    }
 		    }
 	    }
-	    if($modulepreloadPolyfillRequired && ! $this->modulepreloadPolyfillIncluded) {
+	    if ($modulepreloadPolyfillRequired && !$this->modulepreloadPolyfillIncluded) {
 		    $this->modulepreloadPolyfillIncluded = true;
 		    $view->registerScript(
 			    FileHelper::fetchScript('modulepreload-polyfill.min.js', $this->cacheKeySuffix),
@@ -458,7 +458,7 @@ 
     public function invalidateCaches()
     {
         $cache = Craft::$app->getCache();
-        TagDependency::invalidate($cache, FileHelper::CACHE_TAG . $this->cacheKeySuffix);
+        TagDependency::invalidate($cache, FileHelper::CACHE_TAG.$this->cacheKeySuffix);
         Craft::info('All Vite caches cleared', __METHOD__);
     }