Skip to content

Commit 6f90b19

Browse files
rpiaggiorpiaggio
authored
Merge pull request #1105 from japgolly/bump-react
Bump react to 18.3.1
2 parents ef75523 + f275b29 commit 6f90b19

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

‎doc/TESTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ for how to write tests for real-world scalajs-react applications.
3232
// NOTE: Requires react-with-addons.js instead of just react.js
3333
jsDependencies +=
3434

35-
"org.webjars.npm" % "react-dom" % "18.2.0" % Test
35+
"org.webjars.npm" % "react-dom" % "18.3.1" % Test
3636
/ "umd/react-dom-test-utils.development.js"
3737
minified "umd/react-dom-test-utils.production.min.js"
3838
dependsOn "umd/react-dom.development.js"

‎doc/USAGE.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,34 +44,34 @@ libraryDependencies += "com.github.japgolly.scalajs-react" %%% "core" % "2.1.1"
4444
libraryDependencies += "com.github.japgolly.scalajs-react" %%% "core" % "2.1.1"
4545

4646
Compile / npmDependencies ++= Seq(
47-
"react" -> "18.2.0",
48-
"react-dom" -> "18.2.0")
47+
"react" -> "18.3.1",
48+
"react-dom" -> "18.3.1")
4949
```
5050

5151
If you're using `jsDependencies`, add the following:
5252

5353
```scala
54-
// Required for React 18.2.0
54+
// Required for React 18.3.1
5555
dependencyOverrides += "org.webjars.npm" % "scheduler" % "0.22.0",
5656

5757
jsDependencies ++= Seq(
5858

59-
// Polyfill required for React 18.2.0
59+
// Polyfill required for React 18.3.1
6060
"org.webjars.npm" % "fast-text-encoding" % "1.0.3" / "text.js" minified "text.min.js"
6161

62-
"org.webjars.npm" % "react" % "18.2.0"
62+
"org.webjars.npm" % "react" % "18.3.1"
6363
/ "umd/react.development.js"
6464
minified "umd/react.production.min.js"
6565
dependsOn "text.js" // <-- Load the fast-text-encoding polyfill before loading React itself
6666
commonJSName "React",
6767

68-
"org.webjars.npm" % "react-dom" % "18.2.0"
68+
"org.webjars.npm" % "react-dom" % "18.3.1"
6969
/ "umd/react-dom.development.js"
7070
minified "umd/react-dom.production.min.js"
7171
dependsOn "umd/react.development.js"
7272
commonJSName "ReactDOM",
7373

74-
"org.webjars.npm" % "react-dom" % "18.2.0"
74+
"org.webjars.npm" % "react-dom" % "18.3.1"
7575
/ "umd/react-dom-server.browser.development.js"
7676
minified "umd/react-dom-server.browser.production.min.js"
7777
dependsOn "umd/react-dom.development.js"

‎doc/changelog/3.0.0-betas.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,26 @@
2626
- To upgrade when using `jsDependencies`, make your sbt config look like this (comments for clarity)
2727

2828
```scala
29-
// Required for React 18.2.0
29+
// Required for React 18.3.1
3030
dependencyOverrides += "org.webjars.npm" % "scheduler" % "0.22.0",
3131

3232
jsDependencies ++= Seq(
33-
// Polyfill required for React 18.2.0
33+
// Polyfill required for React 18.3.1
3434
"org.webjars.npm" % "fast-text-encoding" % "1.0.6" / "text.min.js" minified "text.min.js"
3535

36-
"org.webjars.npm" % "react" % "18.2.0"
36+
"org.webjars.npm" % "react" % "18.3.1"
3737
/ "umd/react.development.js"
3838
minified "umd/react.production.min.js"
3939
dependsOn "text.min.js" // <-- Load the fast-text-encoding polyfill before loading React itself
4040
commonJSName "React",
4141

42-
"org.webjars.npm" % "react-dom" % "18.2.0"
42+
"org.webjars.npm" % "react-dom" % "18.3.1"
4343
/ "umd/react-dom.development.js"
4444
minified "umd/react-dom.production.min.js"
4545
dependsOn "umd/react.development.js"
4646
commonJSName "ReactDOM",
4747

48-
"org.webjars.npm" % "react-dom" % "18.2.0"
48+
"org.webjars.npm" % "react-dom" % "18.3.1"
4949
/ "umd/react-dom-server.browser.development.js"
5050
minified "umd/react-dom-server.browser.production.min.js"
5151
dependsOn "umd/react-dom.development.js"

‎library/ghpages/html/dev2.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<head lang="en">
44
<meta charset="UTF-8">
55
<title></title>
6-
<script src="https://unpkg.com/react@18.2.0/umd/react.development.js"></script>
7-
<script src="https://unpkg.com/react-dom@18.2.0/umd/react-dom.development.js"></script>
6+
<script src="https://unpkg.com/react@18.3.1/umd/react.development.js"></script>
7+
<script src="https://unpkg.com/react-dom@18.3.1/umd/react-dom.development.js"></script>
88
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
99
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/scala.min.js"></script>
1010
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/monokai-sublime.min.css">

‎library/ghpages/html/dev3.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<head lang="en">
44
<meta charset="UTF-8">
55
<title></title>
6-
<script src="https://unpkg.com/react@18.2.0/umd/react.development.js"></script>
7-
<script src="https://unpkg.com/react-dom@18.2.0/umd/react-dom.development.js"></script>
6+
<script src="https://unpkg.com/react@18.3.1/umd/react.development.js"></script>
7+
<script src="https://unpkg.com/react-dom@18.3.1/umd/react-dom.development.js"></script>
88
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
99
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/scala.min.js"></script>
1010
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/monokai-sublime.min.css">

‎library/ghpages/html/prod.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<head lang="en">
44
<meta charset="UTF-8">
55
<title></title>
6-
<script crossorigin src="https://unpkg.com/react@18.2.0/umd/react.production.min.js"></script>
7-
<script crossorigin src="https://unpkg.com/react-dom@18.2.0/umd/react-dom.production.min.js"></script>
6+
<script crossorigin src="https://unpkg.com/react@18.3.1/umd/react.production.min.js"></script>
7+
<script crossorigin src="https://unpkg.com/react-dom@18.3.1/umd/react-dom.production.min.js"></script>
88
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
99
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/scala.min.js"></script>
1010
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/monokai-sublime.min.css">

‎library/project/Dependencies.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ object Dependencies {
2727
val kindProjector = "0.13.3"
2828
val macrotaskExecutor = "1.1.1"
2929
val nyaya = "1.0.0"
30-
val reactJs = "18.2.0"
30+
val reactJs = "18.3.1"
3131
val scalaJsJavaTime = "1.0.0"
3232
val scalaJsSecureRandom = "1.0.0"
3333
val scalaTest = "3.2.11"
@@ -83,7 +83,7 @@ object Dependencies {
8383
Dep.scalaJsDom.value,
8484
Dep.univEq.value,
8585
Dep.univEqCats.value,
86-
"org.webjars.npm" % "scheduler" % "0.22.0", // Required for React 18.2.0
86+
"org.webjars.npm" % "scheduler" % "0.22.0", // Required for React 18.3.1
8787
))
8888

8989
final case class ReactArtifact(filename: String) {

0 commit comments

Comments
 (0)