Skip to content

Commit c62ea3e

Browse files
committed
Updates to latest version of YouI
1 parent 3b122c0 commit c62ea3e

File tree

8 files changed

+31
-14
lines changed

8 files changed

+31
-14
lines changed

build.sbt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name in ThisBuild := "youi-template"
22
organization in ThisBuild := "io.youi"
3-
version in ThisBuild := "1.1.0"
3+
version in ThisBuild := "1.2.0-SNAPSHOT"
44
scalaVersion in ThisBuild := "2.12.8"
55
resolvers in ThisBuild += Resolver.sonatypeRepo("releases")
66

@@ -20,9 +20,9 @@ developers in ThisBuild := List(
2020
Developer(id="darkfrog", name="Matt Hicks", email="matt@matthicks.com", url=url("http://matthicks.com"))
2121
)
2222

23-
val youi = "0.10.9"
23+
val youi = "0.11.23"
2424
val powerScala = "2.0.5"
25-
val jsass = "5.7.3"
25+
val jsass = "5.9.2"
2626

2727
lazy val template = crossApplication.in(file("."))
2828
.settings(
@@ -33,6 +33,7 @@ lazy val template = crossApplication.in(file("."))
3333
fork := true,
3434
libraryDependencies ++= Seq(
3535
"io.youi" %% "youi-optimizer" % youi,
36+
"io.youi" %% "youi-ui" % youi,
3637
"org.powerscala" %% "powerscala-io" % powerScala,
3738
"io.bit3" % "jsass" % jsass
3839
),

js/src/main/scala/io/youi/template/ClientTemplateApplication.scala

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.youi.template
22

3+
import com.outr.hookup.Hookup
34
import io.youi.activate.ActivationSupport
45
import io.youi.app.ClientApplication
56
import io.youi.dom
@@ -11,6 +12,8 @@ import scala.scalajs.js.annotation.JSExportTopLevel
1112
object ClientTemplateApplication extends TemplateApplication with ClientApplication {
1213
private lazy val pages = dom.byId[html.Input]("template_pages").value.split(';').toSet
1314

15+
val hookup: TemplateHookup = Hookup.client[TemplateHookup]
16+
1417
@JSExportTopLevel("application")
1518
def main(): Unit = {
1619
ActivationSupport.debug = true

jvm/src/main/scala/io/youi/template/ServerTemplateApplication.scala

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package io.youi.template
22

33
import java.io.File
44

5+
import com.outr.hookup.{Hookup, HookupServer}
56
import io.youi.app.ServerApplication
67
import io.youi.http.content.Content
78
import io.youi.server.handler.LanguageSupport
@@ -11,6 +12,8 @@ import profig.Profig
1112
class ServerTemplateApplication(compiler: TemplateCompiler) extends ServerApplication with TemplateApplication {
1213
val languageSupport = new LanguageSupport()
1314

15+
val hookup: HookupServer[TemplateHookup] = Hookup.server[TemplateHookup]
16+
1417
addTemplate(
1518
lookup = (fileName: String) => {
1619
val file = new File(compiler.destinationDirectory, fileName)

jvm/src/main/scala/io/youi/template/TemplateCompiler.scala

+4-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ class TemplateCompiler(val sourceDirectory: File,
4646
server.languageSupport.clear()
4747

4848
// Reload all active pages
49-
server.communication.instances().foreach(_.reload(force = true))
49+
scribe.info("Compilation finished, reloading all clients...")
50+
server.hookup.all.foreach { hookup =>
51+
hookup.communication.reload(force = true)
52+
}
5053
} catch {
5154
case t: Throwable => scribe.error(t)
5255
}

project/plugins.sbt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
2-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26")
2+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28")
33

4-
addSbtPlugin("io.youi" % "youi-plugin" % "1.0.2")
5-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
4+
addSbtPlugin("io.youi" % "youi-plugin" % "1.0.3")
5+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.4")
66
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")
77
addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
8-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.8")
8+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package io.youi.template
22

3-
import io.youi.app.{CommunicationManager, YouIApplication}
3+
import io.youi.app.YouIApplication
44

5-
trait TemplateApplication extends YouIApplication {
6-
val communication: CommunicationManager[TemplateCommunication] = connectivity.communication[TemplateCommunication]
7-
}
5+
trait TemplateApplication extends YouIApplication
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.youi.template
22

3-
import io.youi.communication.{Communication, client}
3+
import com.outr.hookup.client
44

55
import scala.concurrent.Future
66

7-
trait TemplateCommunication extends Communication {
7+
trait TemplateCommunication {
88
@client def reload(force: Boolean): Future[Unit]
99
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package io.youi.template
2+
3+
import com.outr.hookup.{Hookup, HookupSupport}
4+
5+
import scribe.Execution.global
6+
7+
trait TemplateHookup extends Hookup {
8+
val communication: TemplateCommunication with HookupSupport = auto[TemplateCommunication]
9+
}

0 commit comments

Comments
 (0)