diff --git a/build.sbt b/build.sbt index 505f83f23..870de08ba 100644 --- a/build.sbt +++ b/build.sbt @@ -159,16 +159,19 @@ lazy val schemas_lib = createNpmProject := { val npmDir = target.value / "npm" - val odbSchemaFile = + val odbSchemaFile: File = (Compile / clueSourceDirectory).value / "resources" / "lucuma" / "schemas" / "ObservationDB.graphql" - val navigateSchemaFile = + val navigateSchemaFile: File = (Compile / crossProjectBaseDirectory).value / "../../navigate/web/server/src/main/resources/navigate.graphql" + val semVerWithPrerelease: String = // Just keep X.Y.Z from the latest tag + gitDescribedVersion.value.getOrElse("0.0.0").takeWhile(c => c != '+' && c != '-') + + "-" + version.value IO.write( npmDir / "package.json", s"""|{ | "name": "lucuma-schemas", - | "version": "${gitDescribedVersion.value.getOrElse("0.0.0")}", + | "version": "$semVerWithPrerelease", | "license": "${licenses.value.head._1}", | "exports": { | "./odb": "./${odbSchemaFile.getName}", diff --git a/project/Versions.scala b/project/Versions.scala index 1acd23c62..e38b4541a 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -49,7 +49,7 @@ object Versions { val pprint = "0.9.4" val pureConfig = "0.17.9" val sbtBuildInfo = "0.13.1" - val sbtLucuma = "0.14.6" + val sbtLucuma = "0.14.7" val sbtRevolver = "0.10.0" val scalaCollectionContrib = "0.4.0" val scalaJsDom = "2.8.1"