From 67af8aad501780cd0a47a915efb289a05fac31ef Mon Sep 17 00:00:00 2001
From: paku <paku@skyizwhite.dev>
Date: Fri, 20 Dec 2024 15:25:14 +0900
Subject: [PATCH] Remove wild-package-inferred-system
---
hp-tests.asd | 4 ++--
hp.asd | 3 +--
qlfile | 1 -
qlfile.lock | 6 +-----
src/app.lisp | 15 ++++++++++-----
src/renderer.lisp | 9 ++++++---
6 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/hp-tests.asd b/hp-tests.asd
index 9a730f7..33716a7 100644
--- a/hp-tests.asd
+++ b/hp-tests.asd
@@ -1,8 +1,8 @@
(defsystem "hp-tests"
:defsystem-depends-on ("wild-package-inferred-system")
- :class "winfer:wild-package-inferred-system"
+ :class :package-inferred-system
:pathname "tests"
:depends-on ("fiveam"
- "hp-tests/**/*")
+ "hp-tests/example")
:perform (test-op (o c)
(symbol-call :fiveam :run-all-tests)))
diff --git a/hp.asd b/hp.asd
index b4e7bf4..395a4fe 100644
--- a/hp.asd
+++ b/hp.asd
@@ -1,8 +1,7 @@
(defsystem "hp"
:description "My personal project template for Common Lisp"
:author "paku <paku@skyizwhite.dev>"
- :defsystem-depends-on ("wild-package-inferred-system")
- :class "winfer:wild-package-inferred-system"
+ :class :package-inferred-system
:pathname "src"
:depends-on ("hp/main")
:in-order-to ((test-op (test-op "hp-tests"))))
diff --git a/qlfile b/qlfile
index 04a33b8..70b08f9 100644
--- a/qlfile
+++ b/qlfile
@@ -1,4 +1,3 @@
-ql wild-package-inferred-system
ql fiveam
ql cl-jingle
git hsx https://github.com/skyizwhite/hsx.git
diff --git a/qlfile.lock b/qlfile.lock
index 21e1eca..4625fbc 100644
--- a/qlfile.lock
+++ b/qlfile.lock
@@ -2,10 +2,6 @@
(:class qlot/source/dist:source-dist
:initargs (:distribution "https://beta.quicklisp.org/dist/quicklisp.txt" :%version :latest)
:version "2023-10-21"))
-("wild-package-inferred-system" .
- (:class qlot/source/ql:source-ql
- :initargs (:%version :latest)
- :version "ql-2023-10-21"))
("fiveam" .
(:class qlot/source/ql:source-ql
:initargs (:%version :latest)
@@ -21,7 +17,7 @@
("ningle-fbr" .
(:class qlot/source/git:source-git
:initargs (:remote-url "https://github.com/skyizwhite/ningle-fbr.git")
- :version "git-7ab7284e88b82fdf31d55187f893e815a551ef38"))
+ :version "git-d20dbe264911b7dfd6e6fade899db9b09bd2dd32"))
("cl-ppcre" .
(:class qlot/source/ql:source-ql
:initargs (:%version :latest)
diff --git a/src/app.lisp b/src/app.lisp
index 5944a1c..6465f44 100644
--- a/src/app.lisp
+++ b/src/app.lisp
@@ -3,7 +3,12 @@
(:local-nicknames (#:jg #:jingle))
(:local-nicknames (#:fbr #:ningle-fbr))
(:local-nicknames (#:env #:hp/env))
- (:local-nicknames (#:mw #:hp/middlewares/*))
+ (:import-from #:hp/middlewares/recoverer
+ #:*recoverer*)
+ (:import-from #:hp/middlewares/trailing-slash
+ #:*trim-trailing-slash*)
+ (:import-from #:hp/middlewares/public-server
+ #:*public-server*)
(:import-from #:hp/renderer)
(:export #:*app*))
(in-package #:hp/app)
@@ -11,7 +16,7 @@
(defparameter *app* (jg:make-app :address env:*address*
:port env:*port*))
-(fbr:assign-routes *app* :system "hp" :directory "src/routes")
-(jg:install-middleware *app* mw:*recoverer*)
-(jg:install-middleware *app* mw:*trim-trailing-slash*)
-(jg:install-middleware *app* mw:*public-server*)
+(fbr:set-routes *app* :system :hp :target-dir-path "routes")
+(jg:install-middleware *app* *recoverer*)
+(jg:install-middleware *app* *trim-trailing-slash*)
+(jg:install-middleware *app* *public-server*)
diff --git a/src/renderer.lisp b/src/renderer.lisp
index 47f740d..05f127d 100644
--- a/src/renderer.lisp
+++ b/src/renderer.lisp
@@ -7,7 +7,10 @@
(:import-from #:hsx/element
#:element)
(:local-nicknames (#:env #:hp/env))
- (:local-nicknames (#:cmp #:hp/components/*)))
+ (:import-from #:hp/components/header
+ #:~header)
+ (:import-from #:hp/components/footer
+ #:~footer))
(in-package #:hp/renderer)
(defun bust-cache (url)
@@ -43,10 +46,10 @@
:hx-ext "head-support, response-targets"
:hx-boost "true" :hx-target-404 "body" :hx-target-5* "body"
:class "h-[100svh] flex flex-col"
- (cmp:~header)
+ (~header)
(main :class "flex-1 h-full"
children)
- (cmp:~footer)))))
+ (~footer)))))
(defmethod jg:process-response ((app jg:app) result)
(jg:set-response-header :content-type "text/html; charset=utf-8")