Skip to content

Commit

Permalink
Rename ui project to jsui (#1132)
Browse files Browse the repository at this point in the history
  • Loading branch information
johnynek authored Feb 12, 2024
1 parent 93f371a commit 58ac0d3
Show file tree
Hide file tree
Showing 7 changed files with 5,745 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
with:
java-version: "${{matrix.java}}"
- name: "run coreJS tests"
run: "sbt \"++${{matrix.scala}} coreJS/test; jsapiJS/compile; outwatchJS/compile\""
run: "sbt \"++${{matrix.scala}} coreJS/test; jsapiJS/compile; jsuiJS/compile\""
strategy:
matrix:
java:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy_web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ jobs:
- name: "build app"
run: |
export NODE_OPTIONS=--openssl-legacy-provider
sbt "outwatchJS/fullOptJS::webpack; docs/paradox"
sbt "jsuiJS/fullOptJS::webpack; docs/paradox"
mkdir web_deploy
mkdir web_deploy/compiler
cp -a docs/target/paradox/site/main/* web_deploy
cp outwatch/index.html web_deploy/compiler/
cp outwatch/.js/target/scala-2.13/scalajs-bundler/main/bosatsu-outwatch-opt-bundle.js web_deploy/compiler/bosatsu_ui.js
cp jsui/index.html web_deploy/compiler/
cp jsui/.js/target/scala-2.13/scalajs-bundler/main/bosatsu-jsui-opt-bundle.js web_deploy/compiler/bosatsu_ui.js
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
Expand Down
9 changes: 5 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -211,19 +211,20 @@ lazy val jsapi =

lazy val jsapiJS = jsapi.js

lazy val outwatch =
(crossProject(JSPlatform).crossType(CrossType.Pure) in file("outwatch"))
lazy val jsui =
(crossProject(JSPlatform).crossType(CrossType.Pure) in file("jsui"))
.settings(
commonSettings,
//commonJsSettings,
name := "bosatsu-outwatch",
name := "bosatsu-jsui",
assembly / test := {},
scalaJSUseMainModuleInitializer := true,
libraryDependencies ++=
Seq(
cats.value,
decline.value,
outwatchDep.value,
ff4s.value,
scalaCheck.value % Test,
scalaTest.value % Test,
scalaTestPlusScalacheck.value % Test
Expand All @@ -233,7 +234,7 @@ lazy val outwatch =
.enablePlugins(ScalaJSBundlerPlugin)
.dependsOn(base, core)

lazy val outwatchJS = outwatch.js
lazy val jsuiJS = jsui.js

lazy val bench = project
.dependsOn(core.jvm)
Expand Down
Loading

0 comments on commit 58ac0d3

Please sign in to comment.