Remove bundle cross target from stage task scope (#130)

ptrdom · Feb 16, 2024 · da4cba5 · da4cba5
1 parent c9b0ee9
commit da4cba5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/...scalajs-esbuild-electron/src/main/scala/scalajsesbuild/ScalaJSEsbuildElectronPlugin.scala b/...scalajs-esbuild-electron/src/main/scala/scalajsesbuild/ScalaJSEsbuildElectronPlugin.scala
@@ -67,7 +67,7 @@ object ScalaJSEsbuildElectronPlugin extends AutoPlugin {
 
         val targetDirectory = (esbuildInstall / crossTarget).value
         val outputDirectory =
-          (stageTask / esbuildBundle / crossTarget).value
+          (esbuildBundle / crossTarget).value
         val path =
           targetDirectory
             .relativize(new File(outputDirectory, mainModule.jsFileName))
@@ -117,7 +117,7 @@ object ScalaJSEsbuildElectronPlugin extends AutoPlugin {
           .mkString("[", ",", "]")
         val targetDirectory = (esbuildInstall / crossTarget).value
         val outputDirectory =
-          (stageTask / esbuildBundle / crossTarget).value
+          (esbuildBundle / crossTarget).value
         val relativeOutputDirectory =
           targetDirectory
             .relativize(outputDirectory)
@@ -206,7 +206,7 @@ object ScalaJSEsbuildElectronPlugin extends AutoPlugin {
         val targetDirectory = (esbuildInstall / crossTarget).value
         val nodeRelativeOutputDirectoryJs = {
           val outputDirectory =
-            (stageTask / esbuildBundle / crossTarget).value
+            (esbuildBundle / crossTarget).value
           val nodeRelativeOutputDirectory = targetDirectory
             .relativize(outputDirectory)
             .getOrElse(

diff --git a/sbt-scalajs-esbuild-web/src/main/scala/scalajsesbuild/ScalaJSEsbuildWebPlugin.scala b/sbt-scalajs-esbuild-web/src/main/scala/scalajsesbuild/ScalaJSEsbuildWebPlugin.scala
@@ -114,7 +114,7 @@ object ScalaJSEsbuildWebPlugin extends AutoPlugin {
           entryPoints.map("'" + _ + "'").mkString("[", ",", "]")
         val targetDirectory = (esbuildInstall / crossTarget).value
         val outputDirectory =
-          (stageTask / esbuildBundle / crossTarget).value
+          (esbuildBundle / crossTarget).value
         val relativeOutputDirectory =
           targetDirectory
             .relativize(outputDirectory)

diff --git a/sbt-scalajs-esbuild/src/main/scala/scalajsesbuild/ScalaJSEsbuildPlugin.scala b/sbt-scalajs-esbuild/src/main/scala/scalajsesbuild/ScalaJSEsbuildPlugin.scala
@@ -85,6 +85,7 @@ object ScalaJSEsbuildPlugin extends AutoPlugin {
         "esbuild" /
         (if (configuration.value == Compile) "main" else "test")
     },
+    esbuildBundle / crossTarget := (esbuildInstall / crossTarget).value / "out",
     esbuildCopyResources / fileInputs += (esbuildResourcesDirectory.value.toGlob / **),
     esbuildCopyResources / fileInputExcludeFilter := (esbuildCopyResources / fileInputExcludeFilter).value || (esbuildResourcesDirectory.value.toGlob / "node_modules" / **),
     esbuildCopyResources := {
@@ -185,16 +186,14 @@ object ScalaJSEsbuildPlugin extends AutoPlugin {
 
         installFileChanges ++ stageTaskFileChanges
       },
-      // TODO move out of `stageTask` scope
-      stageTask / esbuildBundle / crossTarget := (esbuildInstall / crossTarget).value / "out",
       stageTask / esbuildBundleScript := {
         val stageTaskReport = stageTask.value.data
         val entryPoints = jsFileNames(stageTaskReport)
         val entryPointsJs =
           s"${entryPoints.map("'" + _ + "'").mkString("[", ",", "]")}"
         val targetDirectory = (esbuildInstall / crossTarget).value
         val outputDirectory =
-          (stageTask / esbuildBundle / crossTarget).value
+          (esbuildBundle / crossTarget).value
         val relativeOutputDirectory =
           targetDirectory
             .relativize(outputDirectory)
@@ -238,7 +237,7 @@ object ScalaJSEsbuildPlugin extends AutoPlugin {
         val fileChanges = (stageTask / esbuildCompile).value
         val bundlingScript = (stageTask / esbuildBundleScript).value
         val targetDir = (esbuildInstall / crossTarget).value
-        val outDir = (stageTask / esbuildBundle / crossTarget).value
+        val outDir = (esbuildBundle / crossTarget).value
 
         if (fileChanges.hasChanges || !outDir.exists()) {
           val scriptFileName = "sbt-scalajs-esbuild-bundle-script.cjs"

diff --git a/sbt-scalajs-esbuild/src/main/scala/scalajsesbuild/package.scala b/sbt-scalajs-esbuild/src/main/scala/scalajsesbuild/package.scala
@@ -111,7 +111,7 @@ package object scalajsesbuild {
       val mainModule = resolveMainModule(report)
 
       val path =
-        ((stageTask / esbuildBundle / crossTarget).value / mainModule.jsFileName).toPath
+        ((esbuildBundle / crossTarget).value / mainModule.jsFileName).toPath
       Seq(Input.Script(path))
     }
   }