Resolve conversations. Scala js cli version hygene, clearer path logi…

…c for import file.
VirtusLab · Feb 16, 2024 · 8b6264c · 8b6264c
1 parent c06c63a
commit 8b6264c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/modules/cli/src/main/scala/scala/cli/commands/shared/ScalaJsOptions.scala b/modules/cli/src/main/scala/scala/cli/commands/shared/ScalaJsOptions.scala
@@ -51,7 +51,7 @@ final case class ScalaJsOptions(
 
   @Group(HelpGroup.ScalaJs.toString)
   @HelpMessage("A file relative to the root directory containing import maps for ES module imports")
-  @Tag(tags.experimental)
+  @Tag(tags.restricted)
     jsEsModuleImportMap: Option[String] = None,
 
   @Group(HelpGroup.ScalaJs.toString)

diff --git a/modules/directives/src/main/scala/scala/build/preprocessing/directives/ScalaJs.scala b/modules/directives/src/main/scala/scala/build/preprocessing/directives/ScalaJs.scala
@@ -87,13 +87,7 @@ final case class ScalaJs(
     )
 
     def absFilePath(pathStr: String): Either[ImportMapNotFound, Path] = {
-      Try {
-        os.Path(pathStr)
-      }.orElse(
-        Try{
-          os.Path(pathStr, base = os.pwd)
-        }
-      ).toEither.fold(ex =>
+      Try(os.Path(pathStr, os.pwd)).toEither.fold(ex =>
         Left(ImportMapNotFound(s"""Invalid path to EsImportMap. Please check your "using jsEsModuleImportMap xxxx" directive. Does this file exist $pathStr ?""", ex)),
         path =>
           os.isFile(path) && os.exists(path) match {

diff --git a/modules/integration/src/test/scala/scala/cli/integration/RunScalaJsTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/RunScalaJsTestDefinitions.scala
@@ -332,7 +332,6 @@ trait RunScalaJsTestDefinitions { _: RunTestDefinitions =>
         fileName,
         "--js",
         "--js-module-kind", "ESModule",
-        "--js-cli-version", "1.15.0.1",
         "-o", outFile,
         "-f"
       ).call(cwd = root).out.trim()
@@ -378,7 +377,6 @@ trait RunScalaJsTestDefinitions { _: RunTestDefinitions =>
         fileName,
         "--js",
         "--js-module-kind", "ESModule",
-        "--js-cli-version", "1.15.0.1",
         "-o", outFile,
         "-f"
       ).call(cwd = root,check = false, mergeErrIntoOut = true).out.trim()
@@ -428,7 +426,6 @@ trait RunScalaJsTestDefinitions { _: RunTestDefinitions =>
         fileName,
         "--js",
         "--js-module-kind", "ESModule",
-        "--js-cli-version", "1.15.0.1",
         "-o", outFile,
         "-f",
         "--js-es-module-import-map", importmapFile