Skip to content

Commit bab2e63

Browse files
committed
.
1 parent ba79e24 commit bab2e63

File tree

3 files changed

+36
-4
lines changed

3 files changed

+36
-4
lines changed

build.mill

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//| mill-jvm-version: 21
33
//| mvnDeps:
44
//| - com.goyeau::mill-scalafix::0.6.0
5+
//| - com.lihaoyi::mill-contrib-buildinfo:$MILL_VERSION
56

67

78
import os.copy.over
@@ -13,12 +14,16 @@ import mill.util.*
1314
import com.goyeau.mill.scalafix.ScalafixModule
1415
import java.text.Format
1516

17+
1618
object V{
1719
val scalaLts = "3.3.5"
1820
val pwV = build.pwV
1921
val http4sVersion = "0.23.30"
2022
val circeVersion = "0.14.10"
2123
val scalaVersion = "3.7.2"
24+
val laminar = "0.17.1"
25+
val scalaJsDom = "2.8.1"
26+
val scalaJs = "1.19.1"
2227
}
2328

2429
trait FormatFix extends ScalafmtModule with ScalafixModule with ScalaModule

sjsls/package.mill

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ package build.sjsls
33
import build.*
44
import mill.*
55
import mill.scalalib.*
6+
import mill.scalajslib.*
67
import mill.scalalib.publish.*
7-
8+
import mill.contrib.buildinfo.BuildInfo
89
object `package` extends FormatFixPublish:
910

1011
override def scalaVersion = V.scalaLts
@@ -25,11 +26,36 @@ object `package` extends FormatFixPublish:
2526

2627
def artifactName = "sjsls"
2728

28-
object test extends Testy with ScalaTests:
29+
object test extends Testy with ScalaTests with BuildInfo:
30+
val name = "sjsls"
31+
val buildInfoPackageName = "sjsls"
32+
def buildInfoMembers = Seq(
33+
BuildInfo.Value("laminar", V.laminar),
34+
BuildInfo.Value("scalaJsDom", V.scalaJsDom),
35+
BuildInfo.Value("scalaJsVersion", V.scalaJs)
36+
)
2937
def mvnDeps = super.mvnDeps() ++ sjsls.mvnDeps() ++ Seq(
3038
mvn"com.microsoft.playwright:playwright:${V.pwV}",
3139
mvn"com.microsoft.playwright:driver-bundle:${V.pwV}"
3240
)
41+
override def resources = super.resources
42+
43+
override def runClasspath = Task {
44+
sjsls.cacheJsLibs.resolvedMvnDeps()
45+
super.runClasspath()
46+
}
3347
end test
48+
49+
object cacheJsLibs extends ScalaJSModule:
50+
def scalaVersion = V.scalaVersion
51+
def scalaJSVersion = V.scalaJs
52+
def testFramework = "munit.Framework"
53+
def mvnDeps = super.mvnDeps() ++ Seq(
54+
mvn"org.scala-js::scalajs-dom:${V.scalaJsDom}",
55+
mvn"com.raquo::laminar_sjs1_3:${V.laminar}"
56+
)
57+
end cacheJsLibs
58+
59+
3460
// def scalaNativeVersion = "0.4.17" // aspirational :-)
3561
end `package`

sjsls/test/src/liveServer.test.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,10 @@ end PlaywrightTest
323323
def helloWorldCode(greet: String) = s"""
324324
//> using scala 3.3.5
325325
//> using platform js
326+
//> using jsVersion ${sjsls.BuildInfo.scalaJsVersion}
326327

327-
//> using dep org.scala-js::scalajs-dom::2.8.1
328-
//> using dep com.raquo::laminar::17.2.1
328+
//> using dep org.scala-js::scalajs-dom::${sjsls.BuildInfo.scalaJsDom}
329+
//> using dep com.raquo::laminar::${sjsls.BuildInfo.laminar}
329330

330331
//> using jsModuleKind es
331332
//> using jsModuleSplitStyleStr smallmodulesfor

0 commit comments

Comments
 (0)