Skip to content
This repository was archived by the owner on Feb 10, 2023. It is now read-only.

Commit 8a987e1

Browse files
authored
Merge pull request #174 from cquiroz/next
Next version
2 parents 65583af + 0db5c88 commit 8a987e1

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changes
22

3+
## 0.7.0
4+
5+
* Upgrade scala.js to 1.2.0
6+
* Upgrade react-common to 0.10.0
7+
* Upgrade semantic ui react to 1.2.1
8+
39
## 0.6.4
410

511
* Update cats to 2.2.0

build.sbt

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
val reactJS = "16.13.1"
22
val scalaJsReact = "1.7.5"
3-
val FUILess = "2.8.6"
4-
val reactSUI = "1.2.0"
3+
val FUILess = "2.8.7"
4+
val reactSUI = "1.2.1"
55
val Toasts = "0.6.5"
66

77
parallelExecution in (ThisBuild, Test) := false
@@ -60,8 +60,8 @@ lazy val demo =
6060
.enablePlugins(ScalaJSBundlerPlugin)
6161
.settings(commonSettings: _*)
6262
.settings(
63-
version in webpack := "4.43.0",
64-
version in startWebpackDevServer := "3.11.0",
63+
webpack / version := "4.44.1",
64+
startWebpackDevServer / version := "3.11.0",
6565
webpackConfigFile in fastOptJS := Some(
6666
baseDirectory.value / "webpack" / "dev.webpack.config.js"
6767
),
@@ -120,16 +120,12 @@ lazy val facade =
120120
.settings(commonSettings: _*)
121121
.settings(
122122
name := "react-semantic-ui",
123-
version in webpack := "4.44.1",
124-
version in startWebpackDevServer := "3.11.0",
125-
version in installJsdom := "16.4.0",
123+
webpack / version := "4.44.1",
124+
startWebpackDevServer / version := "3.11.0",
125+
installJsdom / version := "16.4.0",
126+
webpackCliVersion / version := "3.3.11",
126127
// Requires the DOM for tests
127128
requireJsDomEnv in Test := true,
128-
// Remove the following when a new scalajs-bundler is released.
129-
// See https://github.com/scalacenter/scalajs-bundler/issues/332
130-
// Test / jsEnv := new build.JSDOMNodeJSEnv(
131-
// build.JSDOMNodeJSEnv.Config((Test / installJsdom).value)
132-
// ),
133129
// Compile tests to JS using fast-optimisation
134130
scalaJSStage in Test := FastOptStage,
135131
npmDependencies in Compile ++= Seq(
@@ -143,12 +139,14 @@ lazy val facade =
143139
"com.github.japgolly.scalajs-react" %%% "core" % scalaJsReact,
144140
"com.github.japgolly.scalajs-react" %%% "extra" % scalaJsReact,
145141
"com.github.japgolly.scalajs-react" %%% "test" % scalaJsReact % Test,
146-
"io.github.cquiroz.react" %%% "common" % "0.9.8",
142+
"io.github.cquiroz.react" %%% "common" % "0.10.0",
143+
"org.scalameta" %%% "munit" % "0.7.12" % Test,
147144
"com.lihaoyi" %%% "utest" % "0.7.5" % Test,
148145
"org.typelevel" %%% "cats-core" % "2.2.0" % Test
149146
),
150147
webpackConfigFile in Test := Some(baseDirectory.value / "test.webpack.config.js"),
151-
testFrameworks += new TestFramework("utest.runner.Framework")
148+
testFrameworks += new TestFramework("utest.runner.Framework"),
149+
testFrameworks += new TestFramework("munit.Framework")
152150
)
153151

154152
lazy val commonSettings = Seq(

0 commit comments

Comments
 (0)