From 38f2ccf9d51066c38cf5f7dcde617a9902cd87fa Mon Sep 17 00:00:00 2001 From: Viktor Podzigun Date: Fri, 28 May 2021 08:55:49 +0200 Subject: [PATCH] Updated sbt build to use scommonsRequireWebpackInTest --- .../scala/definitions/ScalaJsModule.scala | 35 ++----------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/project/src/main/scala/definitions/ScalaJsModule.scala b/project/src/main/scala/definitions/ScalaJsModule.scala index 2351f47..735e578 100644 --- a/project/src/main/scala/definitions/ScalaJsModule.scala +++ b/project/src/main/scala/definitions/ScalaJsModule.scala @@ -1,12 +1,11 @@ package definitions import org.scalajs.sbtplugin.ScalaJSPlugin -import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ import sbt.Keys._ import sbt._ +import scommons.sbtplugin.ScommonsPlugin.autoImport._ import scommons.sbtplugin.project.CommonClientModule -import scalajsbundler._ import scalajsbundler.sbtplugin.ScalaJSBundlerPlugin import scalajsbundler.sbtplugin.ScalaJSBundlerPlugin.autoImport._ @@ -17,36 +16,8 @@ trait ScalaJsModule extends ClientModule { .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin) .settings(CommonClientModule.settings: _*) .settings( - requireJsDomEnv in Test := false, - - //reload workflow and tests - webpackConfigFile in Test := Some(baseDirectory.value / "test.webpack.config.js"), - version in webpack := "4.29.0", - - fastOptJS in Test := { - val sjsOutput = (fastOptJS in Test).value - - val logger = streams.value.log - val targetDir = (npmUpdate in Test).value - val sjsOutputName = sjsOutput.data.name.stripSuffix(".js") - val webpackOutput = targetDir / s"$sjsOutputName-webpack-out.js" - - val customWebpackConfigFile = (webpackConfigFile in Test).value - val nodeArgs = (webpackNodeArgs in Test).value - - logger.info("Executing webpack...") - val loader = sjsOutput.data - - customWebpackConfigFile match { - case Some(configFile) => - val customConfigFileCopy = Webpack.copyCustomWebpackConfigFiles(targetDir, webpackResources.value.get)(configFile) - Webpack.run(nodeArgs: _*)("--mode", "development", "--config", customConfigFileCopy.getAbsolutePath, loader.absolutePath, "--output", webpackOutput.absolutePath)(targetDir, logger) - case None => - Webpack.run(nodeArgs: _*)("--mode", "development", loader.absolutePath, "--output", webpackOutput.absolutePath)(targetDir, logger) - } - - Attributed(webpackOutput)(sjsOutput.metadata) - } + scommonsRequireWebpackInTest := true, + webpackConfigFile in Test := Some(baseDirectory.value / "test.webpack.config.js") ) } }