Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Bump react to 18.3.1 #1105

Merged
merged 1 commit into from
Dec 30, 2024
Merged

Bump react to 18.3.1 #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 doc/TESTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ for how to write tests for real-world scalajs-react applications.
// NOTE: Requires react-with-addons.js instead of just react.js
jsDependencies +=

"org.webjars.npm" % "react-dom" % "18.2.0" % Test
"org.webjars.npm" % "react-dom" % "18.3.1" % Test
/ "umd/react-dom-test-utils.development.js"
minified "umd/react-dom-test-utils.production.min.js"
dependsOn "umd/react-dom.development.js"
Expand Down
14 changes: 7 additions & 7 deletions doc/USAGE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,34 +44,34 @@ libraryDependencies += "com.github.japgolly.scalajs-react" %%% "core" % "2.1.1"
libraryDependencies += "com.github.japgolly.scalajs-react" %%% "core" % "2.1.1"

Compile / npmDependencies ++= Seq(
"react" -> "18.2.0",
"react-dom" -> "18.2.0")
"react" -> "18.3.1",
"react-dom" -> "18.3.1")
```

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

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

jsDependencies ++= Seq(

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

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

"org.webjars.npm" % "react-dom" % "18.2.0"
"org.webjars.npm" % "react-dom" % "18.3.1"
/ "umd/react-dom.development.js"
minified "umd/react-dom.production.min.js"
dependsOn "umd/react.development.js"
commonJSName "ReactDOM",

"org.webjars.npm" % "react-dom" % "18.2.0"
"org.webjars.npm" % "react-dom" % "18.3.1"
/ "umd/react-dom-server.browser.development.js"
minified "umd/react-dom-server.browser.production.min.js"
dependsOn "umd/react-dom.development.js"
Expand Down
10 changes: 5 additions & 5 deletions doc/changelog/3.0.0-betas.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,26 @@
- To upgrade when using `jsDependencies`, make your sbt config look like this (comments for clarity)

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

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

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

"org.webjars.npm" % "react-dom" % "18.2.0"
"org.webjars.npm" % "react-dom" % "18.3.1"
/ "umd/react-dom.development.js"
minified "umd/react-dom.production.min.js"
dependsOn "umd/react.development.js"
commonJSName "ReactDOM",

"org.webjars.npm" % "react-dom" % "18.2.0"
"org.webjars.npm" % "react-dom" % "18.3.1"
/ "umd/react-dom-server.browser.development.js"
minified "umd/react-dom-server.browser.production.min.js"
dependsOn "umd/react-dom.development.js"
Expand Down
4 changes: 2 additions & 2 deletions library/ghpages/html/dev2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<head lang="en">
<meta charset="UTF-8">
<title></title>
<script src="https://unpkg.com/react@18.2.0/umd/react.development.js"></script>
<script src="https://unpkg.com/react-dom@18.2.0/umd/react-dom.development.js"></script>
<script src="https://unpkg.com/react@18.3.1/umd/react.development.js"></script>
<script src="https://unpkg.com/react-dom@18.3.1/umd/react-dom.development.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/scala.min.js"></script>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/monokai-sublime.min.css">
Expand Down
4 changes: 2 additions & 2 deletions library/ghpages/html/dev3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<head lang="en">
<meta charset="UTF-8">
<title></title>
<script src="https://unpkg.com/react@18.2.0/umd/react.development.js"></script>
<script src="https://unpkg.com/react-dom@18.2.0/umd/react-dom.development.js"></script>
<script src="https://unpkg.com/react@18.3.1/umd/react.development.js"></script>
<script src="https://unpkg.com/react-dom@18.3.1/umd/react-dom.development.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/scala.min.js"></script>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/monokai-sublime.min.css">
Expand Down
4 changes: 2 additions & 2 deletions library/ghpages/html/prod.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<head lang="en">
<meta charset="UTF-8">
<title></title>
<script crossorigin src="https://unpkg.com/react@18.2.0/umd/react.production.min.js"></script>
<script crossorigin src="https://unpkg.com/react-dom@18.2.0/umd/react-dom.production.min.js"></script>
<script crossorigin src="https://unpkg.com/react@18.3.1/umd/react.production.min.js"></script>
<script crossorigin src="https://unpkg.com/react-dom@18.3.1/umd/react-dom.production.min.js"></script>
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/scala.min.js"></script>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/monokai-sublime.min.css">
Expand Down
4 changes: 2 additions & 2 deletions library/project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ object Dependencies {
val kindProjector = "0.13.3"
val macrotaskExecutor = "1.1.1"
val nyaya = "1.0.0"
val reactJs = "18.2.0"
val reactJs = "18.3.1"
val scalaJsJavaTime = "1.0.0"
val scalaJsSecureRandom = "1.0.0"
val scalaTest = "3.2.11"
Expand Down Expand Up @@ -83,7 +83,7 @@ object Dependencies {
Dep.scalaJsDom.value,
Dep.univEq.value,
Dep.univEqCats.value,
"org.webjars.npm" % "scheduler" % "0.22.0", // Required for React 18.2.0
"org.webjars.npm" % "scheduler" % "0.22.0", // Required for React 18.3.1
))

final case class ReactArtifact(filename: String) {
Expand Down
Loading