Skip to content

Commit 9fb6094

Browse files
committed
Merge branch 'main' into goNative
2 parents 67dd290 + b0f9efd commit 9fb6094

19 files changed

+1007
-550
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.scala-build
22
.metals
33
.bsp
4-
.vscode
54
native
65
testDir
76
.bsp

.vscode/launch.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"type": "scala",
9+
"request": "attach",
10+
"name": "Attach debugger",
11+
// name of the module that is being debugging
12+
"buildTarget": "project.test",
13+
// Host of the jvm to connect to
14+
"hostName": "localhost",
15+
// Port to connect to
16+
"port": 5005
17+
}
18+
]
19+
}

.vscode/settings.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"files.watcherExclude": {
3+
"**/target": true
4+
},
5+
"remote.extensionKind": {
6+
"scalameta.metals": [
7+
"workspace"
8+
]
9+
}
10+
11+
}

build.sc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ object project extends ScalaModule with PublishModule with FormatFix /*with Scal
2828
ivy"com.lihaoyi::scalatags::0.12.0",
2929
ivy"com.monovore::decline::2.4.1",
3030
ivy"com.monovore::decline-effect::2.4.1",
31-
ivy"com.lihaoyi::os-lib:0.10.1",
3231
ivy"com.outr::scribe-cats::3.13.5"
3332
)
3433

@@ -42,7 +41,8 @@ object project extends ScalaModule with PublishModule with FormatFix /*with Scal
4241
ivy"com.microsoft.playwright:playwright:${playwrightVersion.pwV}",
4342
ivy"com.microsoft.playwright:driver-bundle:${playwrightVersion.pwV}",
4443
ivy"org.typelevel::munit-cats-effect::2.0.0-M1",
45-
ivy"com.lihaoyi::requests::0.8.2"
44+
ivy"com.lihaoyi::requests::0.8.2",
45+
ivy"com.lihaoyi::os-lib:0.10.1"
4646
)
4747
}
4848

justfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ checkOpts:
1515
mill project.run --help
1616

1717
jvmServe:
18-
mill project.run --build-tool scala-cli --project-dir /Users/simon/Code/helloScalaJs --out-dir /Users/simon/Code/helloScalaJs/out --styles-dir /Users/simon/Code/helloScalaJs/styles --log-level info --browse-on-open-at / --port 3005
18+
mill -w project.runBackground --build-tool scala-cli --project-dir /Users/simon/Code/indigoLite --log-level info --browse-on-open-at / --path-to-index-html /Users/simon/Code/indigoLite/static
19+
20+
goViteless:
21+
mill -w project.run --project-dir /Users/simon/Code/viteless --styles-dir /Users/simon/Code/viteless/styles
1922

2023
jvmServeNoStyles:
21-
mill project.run --build-tool scala-cli --project-dir /Users/simon/Code/helloScalaJs --out-dir /Users/simon/Code/helloScalaJs/out
24+
mill project.run --build-tool scala-cli --project-dir /Users/simon/Code/helloScalaJs --out-dir /Users/simon/Code/helloScalaJs/out --log-level trace
2225

2326
jvmLinker:
2427
mill project.run --build-tool scala-cli --project-dir /Users/simon/Code/helloScalaJs --out-dir /Users/simon/Code/helloScalaJs/out --extra-build-args --js-cli-on-jvm --port 3007

mill

Lines changed: 0 additions & 241 deletions
This file was deleted.

0 commit comments

Comments
 (0)