fix: Upgrade HTMX packages (#408)

* fix: Upgrade HTMX packages

* chore: Update `codeigniter-markdown-pages`

Author: neznaika0

app/Config/Format.php

@@ -6,6 +6,7 @@
 use CodeIgniter\Format\FormatterInterface;
 use CodeIgniter\Format\JSONFormatter;
 use CodeIgniter\Format\XMLFormatter;
+use Michalsn\CodeIgniterHtmx\Format\HTMLFormatter;
 
 class Format extends BaseConfig
 {
@@ -28,6 +29,7 @@ class Format extends BaseConfig
         'application/json',
         'application/xml', // machine-readable XML
         'text/xml', // human-readable XML
+        'text/html'
     ];
 
     /**
@@ -45,6 +47,7 @@ class Format extends BaseConfig
         'application/json' => JSONFormatter::class,
         'application/xml'  => XMLFormatter::class,
         'text/xml'         => XMLFormatter::class,
+        'text/html'        => HTMLFormatter::class,
     ];
 
     /**

app/Config/Htmx.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Config;
+
+use Michalsn\CodeIgniterHtmx\Config\Htmx as BaseHtmx;
+
+class Htmx extends BaseHtmx
+{
+    /**
+     * Enable / disable ToolbarDecorator.
+     */
+    public bool $toolbarDecorator = true;
+
+    /**
+     * Enable / diable ErrorModalDecorator.
+     */
+    public bool $errorModalDecorator = true;
+
+    /**
+     * The appearance of this string in the view
+     * content will skip the htmx decorators. Even
+     * when they are enabled.
+     */
+    public string $skipViewDecoratorsString = 'htmxSkipViewDecorators';
+
+    /**
+     * Enable / disable storing previous URLs for HTMX requests.
+     */
+    public bool $storePreviousURL = true;
+}

composer.json

@@ -16,7 +16,7 @@
     "league/flysystem": "^3.18",
     "league/flysystem-aws-s3-v3": "^3.16",
     "league/flysystem-memory": "^3.19",
-    "michalsn/codeigniter-htmx": "^1.4",
+    "michalsn/codeigniter-htmx": "^2.1",
     "michalsn/codeigniter-markdown-pages": "dev-develop",
     "michalsn/codeigniter-signed-url": "^2.1",
     "michalsn/codeigniter-tags": "^1.0",

composer.lock

@@ -16,7 +16,8 @@
     "autoprefixer": "^10.4.16",
     "daisyui": "^4.7.2",
     "easymde": "^2.18.0",
-    "htmx.org": "^1.9.10",
+    "htmx.org": "^2.0",
+    "htmx-ext-loading-states": "^2.0",
     "postcss": "^8.4.35",
     "postcss-advanced-variables": "^4.0.0",
     "postcss-cli": "^10.1.0",

package-lock.json

@@ -1,5 +1,5 @@
 import "./htmx.js";
-import "htmx.org/dist/ext/loading-states";
+import "htmx-ext-loading-states/dist/loading-states.min.js";
 import Alpine from "alpinejs";
 import alerts from "./components/alerts.js";
 import "./components/themeSwitch.js";

package.json

@@ -1,5 +1,5 @@
 import "./htmx.js";
-import "htmx.org/dist/ext/loading-states";
+import "htmx-ext-loading-states/dist/loading-states.min.js";
 import Alpine from "alpinejs";
 import "./events.js";
 import { initEditor } from "./components/markdownEditor.js";