nystudio107 / craft-plugin-vite

src/services/ViteService.php

Spacing +54 added lines, -54 removed lines

@@ -108,7 +108,7 @@ 
      *
      * @return string
      */
-    public function script(string $path, bool $asyncCss = true, array $scriptTagAttrs = [], array $cssTagAttrs = []): string
+    public function script(string $path, bool $asyncCss = true, array $scriptTagAttrs = [ ], array $cssTagAttrs = [ ]): string
     {
         if ($this->devServerRunning()) {
             return $this->devServerScript($path, $scriptTagAttrs);
@@ -125,12 +125,12 @@ 
      *
      * @return string
      */
-    public function devServerScript(string $path, array $scriptTagAttrs = []): string
+    public function devServerScript(string $path, array $scriptTagAttrs = [ ]): string
     {
-        $lines = [];
+        $lines = [ ];
         // Include the entry script
         $url = $this->createUrl($this->devServerPublic, $path);
-        $lines[] = HtmlHelper::jsFile($url, array_merge([
+        $lines[ ] = HtmlHelper::jsFile($url, array_merge([
             'type' => 'module',
         ], $scriptTagAttrs));
 
@@ -147,25 +147,25 @@ 
      *
      * @return string
      */
-    public function manifestScript(string $path, bool $asyncCss = true, array $scriptTagAttrs = [], array $cssTagAttrs = []): string
+    public function manifestScript(string $path, bool $asyncCss = true, array $scriptTagAttrs = [ ], array $cssTagAttrs = [ ]): string
     {
-        $lines = [];
+        $lines = [ ];
         $tags = $this->manifestTags($path, $asyncCss, $scriptTagAttrs, $cssTagAttrs);
         // Handle any legacy polyfills
         if ($this->hasLegacyTags && !$this->legacyPolyfillIncluded) {
-            $lines[] = HtmlHelper::script(self::SAFARI_NOMODULE_FIX, []);
+            $lines[ ] = HtmlHelper::script(self::SAFARI_NOMODULE_FIX, [ ]);
             $legacyPolyfillTags = $this->extractManifestTags(self::LEGACY_POLYFILLS, $asyncCss, $scriptTagAttrs, $cssTagAttrs, true);
             $tags = array_merge($legacyPolyfillTags, $tags);
             $this->legacyPolyfillIncluded = true;
         }
-        foreach($tags as $tag) {
+        foreach ($tags as $tag) {
             if (!empty($tag)) {
-                switch ($tag['type']) {
+                switch ($tag[ 'type' ]) {
                     case 'file':
-                        $lines[] = HtmlHelper::jsFile($tag['url'], $tag['options']);
+                        $lines[ ] = HtmlHelper::jsFile($tag[ 'url' ], $tag[ 'options' ]);
                         break;
                     case 'css':
-                        $lines[] = HtmlHelper::cssFile($tag['url'], $tag['options']);
+                        $lines[ ] = HtmlHelper::cssFile($tag[ 'url' ], $tag[ 'options' ]);
                         break;
                     default:
                         break;
@@ -188,7 +188,7 @@ 
      * @return void
      * @throws InvalidConfigException
      */
-    public function register(string $path, bool $asyncCss = true, array $scriptTagAttrs = [], array $cssTagAttrs = [])
+    public function register(string $path, bool $asyncCss = true, array $scriptTagAttrs = [ ], array $cssTagAttrs = [ ])
     {
         if ($this->devServerRunning()) {
             $this->devServerRegister($path, $scriptTagAttrs);
@@ -207,7 +207,7 @@ 
      *
      * @return void
      */
-    public function devServerRegister(string $path, array $scriptTagAttrs = [])
+    public function devServerRegister(string $path, array $scriptTagAttrs = [ ])
     {
         $view = Craft::$app->getView();
         // Include the entry script
@@ -229,30 +229,30 @@ 
      * @return void
      * @throws InvalidConfigException
      */
-    public function manifestRegister(string $path, bool $asyncCss = true, array $scriptTagAttrs = [], array $cssTagAttrs = [])
+    public function manifestRegister(string $path, bool $asyncCss = true, array $scriptTagAttrs = [ ], array $cssTagAttrs = [ ])
     {
         $view = Craft::$app->getView();
         $tags = $this->manifestTags($path, $asyncCss, $scriptTagAttrs, $cssTagAttrs);
         // Handle any legacy polyfills
         if ($this->hasLegacyTags && !$this->legacyPolyfillIncluded) {
-            $view->registerScript(self::SAFARI_NOMODULE_FIX, $view::POS_HEAD, [], 'SAFARI_NOMODULE_FIX');
+            $view->registerScript(self::SAFARI_NOMODULE_FIX, $view::POS_HEAD, [ ], 'SAFARI_NOMODULE_FIX');
             $legacyPolyfillTags = $this->extractManifestTags(self::LEGACY_POLYFILLS, $asyncCss, $scriptTagAttrs, $cssTagAttrs, true);
             $tags = array_merge($legacyPolyfillTags, $tags);
             $this->legacyPolyfillIncluded = true;
         }
-        foreach($tags as $tag) {
+        foreach ($tags as $tag) {
             if (!empty($tag)) {
-                switch ($tag['type']) {
+                switch ($tag[ 'type' ]) {
                     case 'file':
                         $view->registerScript(
                             '',
                             $view::POS_HEAD,
-                            array_merge(['src' => $tag['url']], $tag['options']),
-                            md5($tag['url'] . json_encode($tag['options']))
+                            array_merge([ 'src' => $tag[ 'url' ] ], $tag[ 'options' ]),
+                            md5($tag[ 'url' ].json_encode($tag[ 'options' ]))
                         );
                         break;
                     case 'css':
-                        $view->registerCssFile($tag['url'], $tag['options']);
+                        $view->registerCssFile($tag[ 'url' ], $tag[ 'options' ]);
                         break;
                     default:
                         break;
@@ -282,7 +282,7 @@ 
     public function invalidateCaches()
     {
         $cache = Craft::$app->getCache();
-        TagDependency::invalidate($cache, self::CACHE_TAG . $this->cacheKeySuffix);
+        TagDependency::invalidate($cache, self::CACHE_TAG.$this->cacheKeySuffix);
         Craft::info('All Vite caches cleared', __METHOD__);
     }
 
@@ -299,20 +299,20 @@ 
      *
      * @return array
      */
-    protected function manifestTags(string $path, bool $asyncCss = true, array $scriptTagAttrs = [], array $cssTagAttrs = []): array
+    protected function manifestTags(string $path, bool $asyncCss = true, array $scriptTagAttrs = [ ], array $cssTagAttrs = [ ]): array
     {
         // Get the modern tags for this $path
         $tags = $this->extractManifestTags($path, $asyncCss, $scriptTagAttrs, $cssTagAttrs, false);
         // Look for a legacy version of this $path too
         $parts = pathinfo($path);
-        $legacyPath = $parts['dirname']
+        $legacyPath = $parts[ 'dirname' ]
             . '/'
-            . $parts['filename']
+            . $parts[ 'filename' ]
             . self::LEGACY_EXTENSION
-            . $parts['extension'];
+            . $parts[ 'extension' ];
         $legacyTags = $this->extractManifestTags($legacyPath, $asyncCss, $scriptTagAttrs, $cssTagAttrs, true);
         // Set a flag to indicate the some legacy gets were found
-        $legacyPolyfillTags = [];
+        $legacyPolyfillTags = [ ];
         if (!empty($legacyTags)) {
             $this->hasLegacyTags = true;
         }
@@ -334,20 +334,20 @@ 
      *
      * @return array
      */
-    protected function extractManifestTags(string $path, bool $asyncCss = true, array $scriptTagAttrs = [], array $cssTagAttrs = [], $legacy = false): array
+    protected function extractManifestTags(string $path, bool $asyncCss = true, array $scriptTagAttrs = [ ], array $cssTagAttrs = [ ], $legacy = false): array
     {
-        $tags = [];
+        $tags = [ ];
         // Grab the manifest
-        $pathOrUrl = (string)Craft::parseEnv($this->manifestPath);
-        $manifest = $this->fetchFile($pathOrUrl, [JsonHelper::class, 'decodeIfJson']);
+        $pathOrUrl = (string) Craft::parseEnv($this->manifestPath);
+        $manifest = $this->fetchFile($pathOrUrl, [ JsonHelper::class, 'decodeIfJson' ]);
         // If no manifest file is found, bail
         if ($manifest === null) {
-            Craft::error('Manifest not found at ' . $this->manifestPath, __METHOD__);
+            Craft::error('Manifest not found at '.$this->manifestPath, __METHOD__);
 
-            return [];
+            return [ ];
         }
         // Set the async CSS args
-        $asyncCssOptions = [];
+        $asyncCssOptions = [ ];
         if ($asyncCss) {
             $asyncCssOptions = [
                 'media' => 'print',
@@ -366,21 +366,21 @@ 
         }
         // Iterate through the manifest
         foreach ($manifest as $manifestFile => $entry) {
-            if (isset($entry['isEntry']) && $entry['isEntry']) {
+            if (isset($entry[ 'isEntry' ]) && $entry[ 'isEntry' ]) {
                 // Include the entry script
-                if (isset($entry['file']) && strpos($path, $manifestFile) !== false) {
-                    $url = $this->createUrl($this->serverPublic, $entry['file']);
-                    $tags[] = [
+                if (isset($entry[ 'file' ]) && strpos($path, $manifestFile) !== false) {
+                    $url = $this->createUrl($this->serverPublic, $entry[ 'file' ]);
+                    $tags[ ] = [
                         'type' => 'file',
                         'url' => $url,
                         'options' => array_merge($scriptOptions, $scriptTagAttrs)
                     ];
                     // @TODO Imports are actually just a list of dynamic imports, so we probably don't need to be including them
-                    if (isset($entry['imports'])) {
-                        foreach ($entry['imports'] as $import) {
-                            if (isset($manifest[$import]['file'])) {
-                                $url = $this->createUrl($this->serverPublic, $manifest[$import]['file']);
-                                $tags[] = [
+                    if (isset($entry[ 'imports' ])) {
+                        foreach ($entry[ 'imports' ] as $import) {
+                            if (isset($manifest[ $import ][ 'file' ])) {
+                                $url = $this->createUrl($this->serverPublic, $manifest[ $import ][ 'file' ]);
+                                $tags[ ] = [
                                     'type' => 'imports',
                                     'url' => $url,
                                     'options' => array_merge([
@@ -391,10 +391,10 @@ 
                                 ];
                             }
                             // Handle CSS inside of imports
-                            if (isset($manifest[$import]['css'])) {
-                                foreach ($manifest[$import]['css'] as $css) {
+                            if (isset($manifest[ $import ][ 'css' ])) {
+                                foreach ($manifest[ $import ][ 'css' ] as $css) {
                                     $url = $this->createUrl($this->serverPublic, $css);
-                                    $tags[] = [
+                                    $tags[ ] = [
                                         'type' => 'css',
                                         'url' => $url,
                                         'options' => array_merge([
@@ -406,10 +406,10 @@ 
                         }
                     }
                     // If there are any CSS files, include them
-                    if (isset($entry['css'])) {
-                        foreach ($entry['css'] as $css) {
+                    if (isset($entry[ 'css' ])) {
+                        foreach ($entry[ 'css' ] as $css) {
                             $url = $this->createUrl($this->serverPublic, $css);
-                            $tags[] = [
+                            $tags[ ] = [
                                 'type' => 'css',
                                 'url' => $url,
                                 'options' => array_merge([
@@ -435,8 +435,8 @@ 
      */
     protected 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, '/');
     }
 
     /**
@@ -451,8 +451,8 @@ 
         // Create the dependency tags
         $dependency = new TagDependency([
             'tags' => [
-                self::CACHE_TAG . $this->cacheKeySuffix,
-                self::CACHE_TAG . $this->cacheKeySuffix . $pathOrUrl,
+                self::CACHE_TAG.$this->cacheKeySuffix,
+                self::CACHE_TAG.$this->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
@@ -473,8 +473,8 @@ 
         // Get the result from the cache, or parse the file
         $cache = Craft::$app->getCache();
         $file = $cache->getOrSet(
-            self::CACHE_KEY . $this->cacheKeySuffix . $pathOrUrl,
-            function () use ($pathOrUrl, $callback) {
+            self::CACHE_KEY.$this->cacheKeySuffix.$pathOrUrl,
+            function() use ($pathOrUrl, $callback) {
                 $contents = null;
                 $result = null;
                 if (UrlHelper::isAbsoluteUrl($pathOrUrl)) {

src/variables/ViteVariable.php

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
      *
      * @return Markup
      */
-    public function script(string $path, bool $asyncCss = true, array $scriptTagAttrs = [], array $cssTagAttrs = []): Markup
+    public function script(string $path, bool $asyncCss = true, array $scriptTagAttrs = [ ], array $cssTagAttrs = [ ]): Markup
     {
         return Template::raw(
             $this->viteService->script($path, $asyncCss, $scriptTagAttrs, $cssTagAttrs)
@@ -66,7 +66,7 @@ 
      * @return string
      * @throws InvalidConfigException
      */
-    public function register(string $path, bool $asyncCss = true, array $scriptTagAttrs = [], array $cssTagAttrs = []): string
+    public function register(string $path, bool $asyncCss = true, array $scriptTagAttrs = [ ], array $cssTagAttrs = [ ]): string
     {
         $this->viteService->register($path, $asyncCss, $scriptTagAttrs, $cssTagAttrs);