From b5ad286b65f85379348dfb51333e630ed188d56a Mon Sep 17 00:00:00 2001
From: Craig P Jolicoeur <cpjolicoeur@gmail.com>
Date: Thu, 25 Aug 2022 11:32:50 -0400
Subject: [PATCH 1/2] Switch to spork/json

---
 docs/form-submission.md  | 2 +-
 project.janet            | 2 +-
 src/joy/middleware.janet | 2 +-
 src/joy/responder.janet  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/form-submission.md b/docs/form-submission.md
index 9fdaea24..9728e9dc 100644
--- a/docs/form-submission.md
+++ b/docs/form-submission.md
@@ -53,7 +53,7 @@ I waved away some of the complexity that's associated with generating that token
 
 ```clojure
 (import joy)
-(import json)
+(import spork/json)
 
 (defn create [{:body body}]
   (let [name (get body :username)]
diff --git a/project.janet b/project.janet
index 6ac3f254..5a39439f 100644
--- a/project.janet
+++ b/project.janet
@@ -2,7 +2,7 @@
   :name "joy"
   :description "A full stack web framework written in janet"
   :dependencies [{:repo "https://github.com/andrewchambers/janet-uri" :tag "9737a6aee88cc2e426b496532014d6d85605afc2"}
-                 {:repo "https://github.com/janet-lang/json" :tag "61437d96b5df6eb7e524f88847e7d7521201662d"}
+                 {:repo "https://github.com/janet-lang/spork" :tag "f547fee9ebfe96c09029bfe232336aab1212a617"}
                  {:repo "https://github.com/janet-lang/path" :tag "0ae7b60b8aaaa7f80f84692b7efb8e46b7d38eb3"}
                  {:repo "https://github.com/pyrmont/musty" :tag "e1a821940072a5ae5ddc9d3cb2ae6d1bdba41468"}
                  "https://github.com/joy-framework/cipher"
diff --git a/src/joy/middleware.janet b/src/joy/middleware.janet
index f2447765..42fa2b58 100644
--- a/src/joy/middleware.janet
+++ b/src/joy/middleware.janet
@@ -6,7 +6,7 @@
 (import ./html :as html)
 (import cipher)
 (import path)
-(import json)
+(import spork/json)
 
 
 (defn layout
diff --git a/src/joy/responder.janet b/src/joy/responder.janet
index 1939249d..182f25eb 100644
--- a/src/joy/responder.janet
+++ b/src/joy/responder.janet
@@ -1,4 +1,4 @@
-(import json)
+(import spork/json)
 (import ./html)
 
 (defn- content-type [k]

From ac58148312cc00e8f4fa362cdf24b4ca403c4724 Mon Sep 17 00:00:00 2001
From: Craig P Jolicoeur <cpjolicoeur@gmail.com>
Date: Thu, 25 Aug 2022 11:39:12 -0400
Subject: [PATCH 2/2] Switch to spork/path

---
 project.janet                | 1 -
 src/joy/cli/controller.janet | 2 +-
 src/joy/cli/projects.janet   | 2 +-
 src/joy/cli/route.janet      | 2 +-
 src/joy/middleware.janet     | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/project.janet b/project.janet
index 5a39439f..0a0fc7ff 100644
--- a/project.janet
+++ b/project.janet
@@ -3,7 +3,6 @@
   :description "A full stack web framework written in janet"
   :dependencies [{:repo "https://github.com/andrewchambers/janet-uri" :tag "9737a6aee88cc2e426b496532014d6d85605afc2"}
                  {:repo "https://github.com/janet-lang/spork" :tag "f547fee9ebfe96c09029bfe232336aab1212a617"}
-                 {:repo "https://github.com/janet-lang/path" :tag "0ae7b60b8aaaa7f80f84692b7efb8e46b7d38eb3"}
                  {:repo "https://github.com/pyrmont/musty" :tag "e1a821940072a5ae5ddc9d3cb2ae6d1bdba41468"}
                  "https://github.com/joy-framework/cipher"
                  "https://github.com/joy-framework/halo2"
diff --git a/src/joy/cli/controller.janet b/src/joy/cli/controller.janet
index 6545feb9..04763b34 100644
--- a/src/joy/cli/controller.janet
+++ b/src/joy/cli/controller.janet
@@ -1,7 +1,7 @@
 (import ../helper :prefix "")
 (import ../env :as env)
 (import db)
-(import path)
+(import spork/path)
 (import musty)
 
 
diff --git a/src/joy/cli/projects.janet b/src/joy/cli/projects.janet
index f32d00be..9d8bbdb6 100644
--- a/src/joy/cli/projects.janet
+++ b/src/joy/cli/projects.janet
@@ -1,5 +1,5 @@
 (import ../helper :prefix "")
-(import path)
+(import spork/path)
 (import cipher)
 (import musty)
 
diff --git a/src/joy/cli/route.janet b/src/joy/cli/route.janet
index 0feaae50..523e5bfe 100644
--- a/src/joy/cli/route.janet
+++ b/src/joy/cli/route.janet
@@ -1,7 +1,7 @@
 (import ../helper :prefix "")
 (import ../env :as env)
 (import db)
-(import path)
+(import spork/path)
 (import musty)
 
 
diff --git a/src/joy/middleware.janet b/src/joy/middleware.janet
index 42fa2b58..171e7245 100644
--- a/src/joy/middleware.janet
+++ b/src/joy/middleware.janet
@@ -5,7 +5,7 @@
 (import ./responder :as responder)
 (import ./html :as html)
 (import cipher)
-(import path)
+(import spork/path)
 (import spork/json)