Skip to content

Commit

Permalink
Fixes after review
Browse files Browse the repository at this point in the history
  • Loading branch information
lwronski committed Mar 29, 2022
1 parent ec93ef9 commit f5844e9
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions modules/cli/src/main/scala/scala/cli/commands/Package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -709,10 +709,16 @@ object Package extends ScalaCommand[PackageOptions] {
val sourceMapJs = linkingDir / relSourceMapJs

if (os.exists(mainJs))
if (os.walk(linkingDir).filterNot(_ == mainJs).filterNot(_ == sourceMapJs).nonEmpty) {
// copy linking dir to dest,
os.copy(linkingDir, dest, createFolders = true, replaceExisting = true)
logger.debug(s"Scala.js linker generate multiple files for js multi-modules. Copy files to $dest directory.")
if (
os.walk.stream(linkingDir)
.filter(_ != mainJs).filter(_ != sourceMapJs)
.headOption.nonEmpty
) {
// copy linking dir to dest
os.copy(linkingDir, dest, replaceExisting = true, mergeFolders = true)
logger.debug(
s"Scala.js linker generate multiple files for js multi-modules. Copy files to $dest directory."
)
dest / "main.js"
}
else {
Expand Down

0 comments on commit f5844e9

Please sign in to comment.