Merge branch 'release/v0.18.13'

.editorconfig

@@ -18,3 +18,11 @@ indent_size = 2
 
 [*.md]
 trim_trailing_whitespace = false
+
+[src/Glitch/Renderer/assets/**]
+generated_code = true
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset

.gitattributes

@@ -8,3 +8,4 @@ phpstan.neon export-ignore
 phpunit.xml.dist export-ignore
 docs/ export-ignore
 tests/ export-ignore
+zest/ export-ignore

.gitignore

@@ -5,3 +5,6 @@ composer.lock
 Thumbs.db
 /phpunit.xml
 /.idea
+node_modules
+
+effigy.json

CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.18.13 (2024-04-29)
+* Converted theme to Vite
+
 ## v0.18.12 (2024-04-29)
 * Updated dependency list
 * Fixed Veneer stubs in gitattributes

composer.json

@@ -23,6 +23,7 @@
     },
     "require-dev": {
         "decodelabs/phpstan-decodelabs": "^0.6.1",
+        "decodelabs/zest": "^0.2.15",
 
         "symfony/var-dumper": "^5|^6",
         "php-ds/php-ds": "~1.2"
@@ -39,5 +40,7 @@
         "branch-alias": {
             "dev-develop": "0.18.x-dev"
         }
+    },
+    "repositories": {
     }
 }

src/Glitch/Context.php

@@ -30,7 +30,7 @@
 
 class Context implements LoggerAwareInterface
 {
-    public const VERSION = 'v0.18.12';
+    public const VERSION = 'v0.18.13';
 
     protected float $startTime;
     protected string $runMode = 'development';

src/Glitch/Renderer/Html.php

@@ -22,6 +22,7 @@
 use DecodeLabs\Glitch\Stack\Frame;
 use DecodeLabs\Glitch\Stack\Trace;
 use DecodeLabs\Glitch\Stat;
+use DecodeLabs\Zest\Manifest;
 
 use Throwable;
 
@@ -44,8 +45,6 @@ class Html implements Renderer
 
     public const RENDER_STACK = true;
 
-    public const DEV = false;
-
     public const HTTP_STATUSES = [
         100 => 'Continue',
         101 => 'Switching Protocols',
@@ -209,44 +208,75 @@ protected function renderHeader(
 
         // Meta
         $output[] = '<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">';
+        $css = $js = [];
 
+        // Zest
+        if (
+            class_exists(Manifest::class) &&
+            file_exists(__DIR__ . '/assets/.vite/manifest.json.php')
+        ) {
+            $manifest = Manifest::load(__DIR__ . '/assets/.vite/manifest.json');
 
-        // Css
-        $sassCss = $vendor . '/decodelabs/glitch/src/Glitch/Renderer/assets/glitch.css';
-        $this->buildScss($sassCss);
+            foreach ($manifest->getCssData() as $file => $attrs) {
+                $css[$file] = $attrs;
+            }
 
+            foreach ($manifest->getHeadJsData() as $file => $attrs) {
+                $js[$file] = $attrs;
+            }
 
-        $css = [
-            'glitch' => $sassCss
-        ];
+            foreach ($manifest->getBodyJsData() as $file => $attrs) {
+                $js[$file] = $attrs;
+            }
+        } else {
+            $css[__DIR__ . '/assets/style.css'] = [
+                'id' => 'style-glitch'
+            ];
+
+            $js[__DIR__ . '/assets/main.js'] = [
+                'id' => 'script-glitch',
+                'type' => 'module'
+            ];
+
+            //$css['glitch'] = $vendor . '/decodelabs/glitch/src/Glitch/Renderer/assets/style.css';
+        }
 
+
+        // Css
         if (isset($this->customCssFile)) {
-            $css['custom'] = $this->customCssFile;
+            $css[$this->customCssFile] = [
+                'id' => 'style-custom'
+            ];
         }
 
-        foreach ($css as $name => $cssPath) {
+        foreach ($css as $cssPath => $attrs) {
             if (file_exists($cssPath)) {
-                $output[] = '<style id="style-' . $name . '">';
+                $output[] = '<style' . $this->prepareAttrs($attrs) . '>';
                 $output[] = file_get_contents($cssPath);
                 $output[] = '</style>';
+            } elseif (
+                str_starts_with($cssPath, 'http://') ||
+                str_starts_with($cssPath, 'https://')
+            ) {
+                $output[] = '<link rel="stylesheet" href="' . $cssPath . '"' . $this->prepareAttrs($attrs) . ' />';
             }
         }
 
         // Js
-        if ($this->shouldRender()) {
-            $js = [
-                'jQuery' => $vendor . '/components/jquery/jquery.min.js',
-                'glitch' => __DIR__ . '/assets/glitch.js'
-            ];
-
-            foreach ($js as $name => $jsPath) {
-                if (file_exists($jsPath)) {
-                    $output[] = '<script id="script-' . $name . '">';
-                    $output[] = file_get_contents($jsPath);
-                    $output[] = '</script>';
-                }
+        //if ($this->shouldRender()) {
+        foreach ($js as $jsPath => $attrs) {
+            if (file_exists($jsPath)) {
+                $output[] = '<script' . $this->prepareAttrs($attrs) . '>';
+                $output[] = file_get_contents($jsPath);
+                $output[] = '</script>';
+            } elseif (
+                str_starts_with($jsPath, 'http://') ||
+                str_starts_with($jsPath, 'https://')
+            ) {
+                $output[] = '<script src="' . $jsPath . '"' . $this->prepareAttrs($attrs) . '></script>';
             }
         }
+        //}
 
 
         $output[] = '</head>';
@@ -257,78 +287,26 @@ protected function renderHeader(
     }
 
     /**
-     * Build scss files
+     * @param array<string, mixed> $attrs
+     * @return string
      */
-    protected function buildScss(
-        string $cssPath
-    ): void {
-        $vendor = $this->context->getVendorPath();
-        $isDev = is_link($vendor . '/decodelabs/glitch');
-
-        if (!static::DEV || !$isDev) {
-            return;
-        }
-
-
-        $enlightenPath = $vendor . '/decodelabs/enlighten/src/resources/styles.css';
-        $_sourcePath = $vendor . '/decodelabs/glitch/src/Glitch/Renderer/assets/scss/auto/_source.scss';
-        file_put_contents($_sourcePath, file_get_contents($enlightenPath));
-
-
-
-        $scssPath = substr($cssPath, 0, -3) . 'scss';
+    protected function prepareAttrs(
+        array $attrs
+    ): string {
+        $output = [];
 
-        if (!file_exists($scssPath)) {
-            return;
+        foreach ($attrs as $key => $value) {
+            $output[] = $key . '="' . $value . '"';
         }
 
-        $build = false;
-
-        if (file_exists($cssPath)) {
-            $cssTime = filemtime($cssPath);
-            $scssTime = filemtime($scssPath);
-
-            if ($scssTime > $cssTime) {
-                $build = true;
-            }
-        } else {
-            $cssTime = 0;
-            $build = true;
+        if (!empty($output)) {
+            return ' ' . implode(' ', $output);
         }
 
-        if (!$build) {
-            if (false === ($test = scandir(__DIR__ . '/assets/scss/'))) {
-                $test = [];
-            }
-
-            foreach ($test as $testFileName) {
-                if ($testFileName === '.' || $testFileName === '..') {
-                    continue;
-                }
-
-                $testFilePath = __DIR__ . '/assets/scss/' . $testFileName;
-
-                if (is_file($testFilePath)) {
-                    $scssTime = filemtime($testFilePath);
-
-                    if ($scssTime > $cssTime) {
-                        $build = true;
-                        break;
-                    }
-                }
-            }
-        }
-
-
-        if ($build) {
-            exec('cd ' . $vendor . '; sassc --style=compressed ' . $scssPath . ' ' . $cssPath . ' 2>&1', $execOut);
-
-            if (!empty($execOut)) {
-                die('<pre>' . print_r($execOut, true));
-            }
-        }
+        return '';
     }
 
+
     /**
      * Render exception message
      */

zest/.gitignore

@@ -0,0 +1,2 @@
+.sass-cache
+node_modules