Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Support Scala.js minify via scalaJSMinify: Target[String] #3094

Merged
merged 2 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ object Deps {
val testScala33Version = "3.3.1"

object Scalajs_1 {
val scalaJsVersion = "1.15.0"
val scalaJsVersion = "1.16.0"
lefou marked this conversation as resolved.
Show resolved Hide resolved
val scalajsEnvJsdomNodejs = ivy"org.scala-js::scalajs-env-jsdom-nodejs:1.1.0"
val scalajsEnvExoegoJsdomNodejs = ivy"net.exoego::scalajs-env-jsdom-nodejs:2.1.0"
val scalajsEnvNodejs = ivy"org.scala-js::scalajs-env-nodejs:1.4.0"
Expand Down
27 changes: 23 additions & 4 deletions scalajslib/src/mill/scalajslib/ScalaJSModule.scala
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
moduleKind = moduleKind(),
esFeatures = esFeatures(),
moduleSplitStyle = moduleSplitStyle(),
outputPatterns = scalaJSOutputPatterns()
outputPatterns = scalaJSOutputPatterns(),
minify = scalaJSMinify()
)
}

Expand Down Expand Up @@ -170,7 +171,8 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
moduleKind: ModuleKind,
esFeatures: ESFeatures,
moduleSplitStyle: ModuleSplitStyle,
outputPatterns: OutputPatterns
outputPatterns: OutputPatterns,
minify: Boolean
)(implicit ctx: mill.api.Ctx): Result[Report] = {
val outputPath = ctx.dest

Expand All @@ -189,7 +191,8 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
moduleKind = moduleKind,
esFeatures = esFeatures,
moduleSplitStyle = moduleSplitStyle,
outputPatterns = outputPatterns
outputPatterns = outputPatterns,
minify = minify
)
}

Expand Down Expand Up @@ -269,6 +272,21 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
/** Name patterns for output. */
def scalaJSOutputPatterns: Target[OutputPatterns] = T { OutputPatterns.Defaults }

/**
* Apply Scala.js-specific minification of the produced .js files.
*
* When enabled, the linker more aggressively reduces the size of the
* generated code, at the cost of readability and debuggability. It does
* not perform size optimizations that would negatively impact run-time
* performance.
*
* The focus is on optimizations that general-purpose JavaScript minifiers
* cannot do on their own. For the best results, we expect the Scala.js
* minifier to be used in conjunction with a general-purpose JavaScript
* minifier.
*/
def scalaJSMinify: Target[Boolean] = T { true }

override def prepareOffline(all: Flag): Command[Unit] = {
val tasks =
if (all.value) Seq(scalaJSToolsClasspath)
Expand Down Expand Up @@ -327,7 +345,8 @@ trait TestScalaJSModule extends ScalaJSModule with TestModule {
moduleKind = moduleKind(),
esFeatures = esFeatures(),
moduleSplitStyle = moduleSplitStyle(),
outputPatterns = scalaJSOutputPatterns()
outputPatterns = scalaJSOutputPatterns(),
minify = scalaJSMinify()
)
}

Expand Down
6 changes: 4 additions & 2 deletions scalajslib/src/mill/scalajslib/worker/ScalaJSWorker.scala
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ private[scalajslib] class ScalaJSWorker extends AutoCloseable {
moduleKind: api.ModuleKind,
esFeatures: api.ESFeatures,
moduleSplitStyle: api.ModuleSplitStyle,
outputPatterns: api.OutputPatterns
outputPatterns: api.OutputPatterns,
minify: Boolean
)(implicit ctx: Ctx.Home): Result[api.Report] = {
bridge(toolsClasspath).link(
runClasspath = runClasspath.iterator.map(_.path.toNIO).toSeq,
Expand All @@ -174,7 +175,8 @@ private[scalajslib] class ScalaJSWorker extends AutoCloseable {
moduleKind = toWorkerApi(moduleKind),
esFeatures = toWorkerApi(esFeatures),
moduleSplitStyle = toWorkerApi(moduleSplitStyle),
outputPatterns = toWorkerApi(outputPatterns)
outputPatterns = toWorkerApi(outputPatterns),
minify = minify
) match {
case Right(report) => Result.Success(fromWorkerApi(report))
case Left(message) => Result.Failure(message)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ private[scalajslib] trait ScalaJSWorkerApi {
moduleKind: ModuleKind,
esFeatures: ESFeatures,
moduleSplitStyle: ModuleSplitStyle,
outputPatterns: OutputPatterns
outputPatterns: OutputPatterns,
minify: Boolean
): Either[String, Report]

def run(config: JsEnvConfig, report: Report): Unit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class ScalaJSWorkerImpl extends ScalaJSWorkerApi {
esFeatures: ESFeatures,
moduleSplitStyle: ModuleSplitStyle,
outputPatterns: OutputPatterns,
minify: Boolean,
dest: File
)
private def minorIsGreaterThanOrEqual(number: Int) = ScalaJSVersions.current match {
Expand Down Expand Up @@ -146,7 +147,11 @@ class ScalaJSWorkerImpl extends ScalaJSWorkerApi {
)
else withModuleSplitStyle

val linker = StandardImpl.clearableLinker(withOutputPatterns)
val withMinify =
if (minorIsGreaterThanOrEqual(16)) withOutputPatterns.withMinify(input.minify)
else withOutputPatterns

val linker = StandardImpl.clearableLinker(withMinify)
val irFileCacheCache = irFileCache.newCache
(linker, irFileCacheCache)
}
Expand All @@ -163,7 +168,8 @@ class ScalaJSWorkerImpl extends ScalaJSWorkerApi {
moduleKind: ModuleKind,
esFeatures: ESFeatures,
moduleSplitStyle: ModuleSplitStyle,
outputPatterns: OutputPatterns
outputPatterns: OutputPatterns,
minify: Boolean
): Either[String, Report] = {
// On Scala.js 1.2- we want to use the legacy mode either way since
// the new mode is not supported and in tests we always use legacy = false
Expand All @@ -177,6 +183,7 @@ class ScalaJSWorkerImpl extends ScalaJSWorkerApi {
esFeatures = esFeatures,
moduleSplitStyle = moduleSplitStyle,
outputPatterns = outputPatterns,
minify = minify,
dest = dest
))
val irContainersAndPathsFuture = PathIRContainer.fromClasspath(runClasspath)
Expand Down
Loading