Skip to content

Commit 4e8c2a0

Browse files
QuafadasQuafadas
committed
fix
1 parent 241d0ca commit 4e8c2a0

17 files changed

+88
-107
lines changed

‎build.sc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ trait Testy extends TestModule.Munit with FormatFix {
5757

5858
object routes extends FormatFixPublish {
5959

60-
def scalaVersion: T[String] = "3.3.3" // Latest LTS
60+
def scalaVersion: T[String] = "3.4.2" // Latest LTS
6161

6262
def ivyDeps = Agg(
6363
ivy"org.http4s::http4s-core:${V.http4sVersion}",

‎routes/src/app.route.scala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package io.github.quafadas.sjsls
22

33
import org.http4s.HttpRoutes
4-
import org.http4s.dsl.io.*
4+
import org.http4s.Response
55
import org.http4s.StaticFile
6-
import cats.effect.kernel.Async
7-
import fs2.io.file.Files
8-
import cats.MonadThrow
9-
6+
import org.http4s.Status
7+
import org.http4s.dsl.io.*
108
import org.http4s.server.staticcontent.FileService
119
import org.http4s.server.staticcontent.fileService
12-
import org.http4s.Response
13-
import org.http4s.Status
10+
11+
import fs2.io.file.Files
12+
13+
import cats.effect.kernel.Async
1414

1515
def appRoute[F[_]: Files](stringPath: String)(using f: Async[F]): HttpRoutes[F] = HttpRoutes.of[F] {
1616

‎routes/src/buildRoutes.scala‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
package io.github.quafadas.sjsls
2-
3-
import cats.effect.kernel.Ref
4-
import fs2.concurrent.Topic
5-
import fs2.io.file.Files
6-
import org.http4s.HttpRoutes
72
import org.http4s
8-
9-
import cats.MonadThrow
10-
import cats.effect.IO
11-
import scribe.Scribe
12-
import cats.effect.kernel.Resource
13-
import org.http4s.server.Router
14-
import cats.syntax.all.*
3+
import org.http4s.HttpRoutes
4+
import org.http4s.StaticFile
155
import org.http4s.dsl.io.*
6+
import org.http4s.server.Router
167

178
import cats.Monad
18-
import org.http4s.StaticFile
9+
import cats.effect.IO
10+
import cats.syntax.all.*
1911

2012
/** This is a helper function which would allow you to construct a Router which mimics the behaviour of the "live
2113
* server".

‎routes/src/proxy.http.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import cats.effect.kernel.*
1313
import cats.effect.std.Random
1414
import cats.syntax.all.*
1515

16-
import ProxyConfig.Location
16+
import io.github.quafadas.sjsls.ProxyConfig.Location
1717

1818
object HttpProxy:
1919

‎routes/src/proxy.routes.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import cats.effect.kernel.Resource
1616
import cats.effect.std.Random
1717
import cats.syntax.all.*
1818

19-
import ProxyConfig.Equilibrium
20-
import ProxyConfig.LocationMatcher
21-
import ProxyConfig.Server
19+
import io.github.quafadas.sjsls.ProxyConfig.Equilibrium
20+
import io.github.quafadas.sjsls.ProxyConfig.LocationMatcher
21+
import io.github.quafadas.sjsls.ProxyConfig.Server
2222

2323
def makeProxyRoutes(
2424
client: Client[IO],

‎routes/test/src/build.routes.test.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.github.quafadas.sjsls
22

3-
import munit.CatsEffectSuite
4-
import cats.effect.IO
5-
import org.http4s.server.Router
63
import org.http4s.HttpRoutes
7-
import org.http4s.Status
84
import org.http4s.Response
9-
import cats.data.OptionT
5+
import org.http4s.Status
6+
7+
import cats.effect.IO
8+
9+
import munit.CatsEffectSuite
1010

1111
class BuildRoutesSuite extends CatsEffectSuite:
1212

‎sjsls/src/build.runner.scala‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,19 @@ package io.github.quafadas.sjsls
22

33
import java.util.Locale
44

5-
import scala.concurrent.duration.*
6-
75
import fs2.*
86
import fs2.concurrent.Topic
97
import fs2.io.Watcher
108
import fs2.io.Watcher.Event
11-
import fs2.io.Watcher.Event.Created
12-
import fs2.io.Watcher.Event.Deleted
13-
import fs2.io.Watcher.Event.Modified
14-
import fs2.io.Watcher.Event.NonStandard
15-
import fs2.io.Watcher.Event.Overflow
169
import fs2.io.process.ProcessBuilder
1710
import fs2.io.process.Processes
1811

1912
import scribe.Scribe
2013

2114
import cats.effect.IO
2215
import cats.effect.ResourceIO
23-
import cats.syntax.all.*
2416
import cats.effect.kernel.Resource
17+
import cats.syntax.all.*
2518

2619
sealed trait BuildTool(val invokedVia: String)
2720
class ScalaCli

‎sjsls/src/buildSpaRoute.scala‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
package io.github.quafadas.sjsls
2+
import java.time.ZonedDateTime
23

3-
import io.github.quafadas.sjsls.StaticFileMiddleware
4-
import cats.effect.IO
54
import org.http4s.HttpRoutes
6-
import scribe.Scribe
7-
import org.http4s.dsl.io.*
8-
import org.http4s.StaticFile
9-
import fs2.text
10-
import cats.effect.kernel.Ref
115
import org.http4s.Response
12-
import cats.effect.kernel.Async
6+
import org.http4s.dsl.io.*
137
import org.http4s.scalatags.*
14-
import java.time.ZonedDateTime
8+
9+
import scribe.Scribe
10+
11+
import cats.effect.IO
12+
import cats.effect.kernel.Async
13+
import cats.effect.kernel.Ref
1514

1615
/** This is expected to be hidden behind a route with the SPA prefix. It will serve the index.html file from all routes.
1716
*

‎sjsls/src/htmlGen.scala‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
package io.github.quafadas.sjsls
22

3+
import java.time.ZonedDateTime
4+
35
import scalatags.Text.all.*
46

5-
import fs2.io.file.Path
6-
import cats.effect.kernel.Ref
7-
import cats.effect.IO
87
import org.http4s.HttpRoutes
9-
import org.http4s.dsl.io.*
10-
import scribe.Scribe
118
import org.http4s.Response
12-
import java.time.ZonedDateTime
13-
import org.http4s.scalatags.*
149
import org.http4s.Status
10+
import org.http4s.dsl.io.*
11+
import org.http4s.scalatags.*
12+
13+
import fs2.io.file.Path
14+
15+
import scribe.Scribe
16+
17+
import cats.effect.IO
18+
import cats.effect.kernel.Ref
1519
import cats.syntax.all.*
1620

1721
def generatedIndexHtml(injectStyles: Boolean, modules: Ref[IO, Map[String, String]], zdt: ZonedDateTime)(

‎sjsls/src/middleware/trace.logger.scala‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package io.github.quafadas.sjsls
22

33
import org.http4s.server.middleware.Logger
4-
import cats.effect.IO
4+
55
import scribe.Scribe
66

7+
import cats.effect.IO
8+
79
def traceLoggerMiddleware(logger: Scribe[IO]) = Logger.httpRoutes[IO](
810
logHeaders = true,
911
logBody = true,

0 commit comments

Comments
 (0)