use-package piccolo

src/components/document.lisp

@@ -1,6 +1,6 @@
 (defpackage #:hp/components/document
-  (:use #:cl)
-  (:local-nicknames (#:pi #:piccolo))
+  (:use #:cl
+        #:piccolo)
   (:import-from #:hp/view/asset
                 #:defasset)
   (:export #:document))
@@ -20,24 +20,23 @@
 (defasset *global-css* :root "global.css")
 (defasset *dist-css* :root "dist.css")
 
-(pi:define-element document (title description)
-  (pi:h
-    (html :lang "ja"
-      (head
-        (meta :charset "UTF-8")
-        (script :src *htmx*)
-        (mapcar (lambda (path) (script :src path))
-                *htmx-exts*)
-        (mapcar (lambda (path) (script :src path :defer t))
-                *alpine-exts*)
-        (script :src *alpine-store* :defer t)
-        (script :src *alpine* :defer t)
-        (style
-          "@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@400;700&display=swap');")
-        (link :rel "stylesheet" :type "text/css" :href *global-css*)
-        (link :rel "stylesheet" :type "text/css" :href *dist-css*)
-        (title (format nil "~@[~a - ~]skyizwhite.dev" title))
-        (meta
-          :name "description"
-          :content (or description "pakuの個人サイト")))      
-      pi:children)))
+(define-element document (title description)
+  (html :lang "ja"
+    (head
+      (meta :charset "UTF-8")
+      (script :src *htmx*)
+      (mapcar (lambda (path) (script :src path))
+              *htmx-exts*)
+      (mapcar (lambda (path) (script :src path :defer t))
+              *alpine-exts*)
+      (script :src *alpine-store* :defer t)
+      (script :src *alpine* :defer t)
+      (style
+        "@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@400;700&display=swap');")
+      (link :rel "stylesheet" :type "text/css" :href *global-css*)
+      (link :rel "stylesheet" :type "text/css" :href *dist-css*)
+      (title (format nil "~@[~a - ~]skyizwhite.dev" title))
+      (meta
+        :name "description"
+        :content (or description "pakuの個人サイト")))      
+    children))

src/components/layout.lisp

@@ -1,17 +1,16 @@
 (defpackage #:hp/components/layout
-  (:use #:cl)
-  (:local-nicknames (#:pi #:piccolo))
+  (:use #:cl
+        #:piccolo)
   (:local-nicknames (#:cfg #:hp/config/*))
   (:export #:layout))
 (in-package #:hp/components/layout)
 
-(pi:define-element layout ()
-  (pi:h
-    (body
-      :hx-ext cfg:*hx-ext*
-      :class "h-[100svh] flex flex-col"
-      (header)
-      (main :class "flex-1"
-        pi:children)
-      ; footer
-      (footer))))
+(define-element layout ()
+  (body
+    :hx-ext cfg:*hx-ext*
+    :class "h-[100svh] flex flex-col"
+    (header)
+    (main :class "flex-1"
+      children)
+    ; footer
+    (footer)))