0.3.2: only copy important artifacts to webjar crossTarget for scalaJ…

…SBundler
lhns · Jun 2, 2020 · 54a4ab8 · 54a4ab8
1 parent dab9cde
commit 54a4ab8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 lazy val commonSettings: Seq[Setting[_]] = Seq(
   organization := "de.lolhens",
-  version := "0.3.1-SNAPSHOT",
+  version := "0.3.2-SNAPSHOT",
 
   licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0")),
 

diff --git a/...dler-webjar/src/main/scala/de/lolhens/sbt/scalajs/webjar/ScalaJSBundlerWebjarPlugin.scala b/...dler-webjar/src/main/scala/de/lolhens/sbt/scalajs/webjar/ScalaJSBundlerWebjarPlugin.scala
@@ -12,17 +12,22 @@ object ScalaJSBundlerWebjarPlugin extends AutoPlugin {
 
   override lazy val projectSettings: Seq[Setting[_]] =
     Seq(
-      Compile / npmUpdate / crossTarget := (Compile / webjarArtifacts / crossTarget).value,
-
       Compile / webjarMainResourceName := stagedOptJS(Compile / _ / artifactPath).value.name.stripSuffix(".js") + "-bundle.js",
 
       Compile / webjarArtifacts := {
         val attributedFiles = stagedOptJS(Compile / _ / webpack).value
+        val target = (Compile / webjarArtifacts / crossTarget).value
 
-        Seq(
+        val artifacts = Seq(
           attributedFiles.find(_.metadata.get(BundlerFileTypeAttr).exists(_ == BundlerFileType.ApplicationBundle)).map(_.data),
           attributedFiles.find(_.metadata.get(BundlerFileTypeAttr).exists(_ == BundlerFileType.Asset)).map(_.data),
-        ).flatMap(_.toList)
+        )
+          .flatMap(_.toList)
+          .map(file => (file, target / file.name))
+
+        IO.copy(artifacts)
+
+        artifacts.map(_._2)
       }
     )
 }