feat: Upgrade to React 19

vaadin · Jun 27, 2024 · 9c187c8 · 9c187c8
1 parent 9669549
commit 9c187c8
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 82 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -36,4 +36,4 @@ runs:
     - name: Install npm dependencies
       if: ${{ steps.cache-node_modules.outputs.cache-hit != 'true' }}
       shell: bash
-      run: npm ci
+      run: npm ci --legacy-peer-deps
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/java/engine-runtime/src/test/java/com/vaadin/hilla/internal/TaskTest.java b/packages/java/engine-runtime/src/test/java/com/vaadin/hilla/internal/TaskTest.java
@@ -75,7 +75,8 @@ public void setUpTaskApplication() throws IOException, URISyntaxException,
                 : Stream.<String> empty();
 
         var npmCmd = Stream.of("npm", "--no-update-notifier", "--no-audit",
-                "install", "--no-save", "--install-links");
+                "install", "--no-save", "--install-links",
+                "--legacy-peer-deps");
 
         var generatorFiles = Files.list(packagesDirectory).map(Path::toString);
 

diff --git a/packages/ts/file-router/package.json b/packages/ts/file-router/package.json
@@ -57,7 +57,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "react": "^18.2.0",
+    "react": "19.0.0-rc-3563387fe3-20240621",
     "react-router-dom": "^6.21.1"
   },
   "devDependencies": {
@@ -81,7 +81,7 @@
   "dependencies": {
     "@vaadin/hilla-generator-utils": "24.5.0-alpha3",
     "@vaadin/hilla-react-auth": "24.5.0-alpha3",
-    "react": "^18.2.0",
+    "react": "19.0.0-rc-3563387fe3-20240621",
     "rollup": "^4.12.0",
     "typescript": "5.5.2"
   }

diff --git a/packages/ts/react-auth/package.json b/packages/ts/react-auth/package.json
@@ -49,7 +49,7 @@
     "@vaadin/hilla-frontend": "24.5.0-alpha3"
   },
   "peerDependencies": {
-    "react": "^18",
+    "react": "19.0.0-rc-3563387fe3-20240621",
     "react-router-dom": "^6"
   },
   "devDependencies": {

diff --git a/packages/ts/react-crud/package.json b/packages/ts/react-crud/package.json
@@ -62,8 +62,8 @@
     "@vaadin/react-components": "24.5.0-alpha3"
   },
   "peerDependencies": {
-    "react": "^18",
-    "react-dom": "^18"
+    "react": "19.0.0-rc-3563387fe3-20240621",
+    "react-dom": "19.0.0-rc-3563387fe3-20240621"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",

diff --git a/packages/ts/react-form/package.json b/packages/ts/react-form/package.json
@@ -49,7 +49,7 @@
     "@vaadin/hilla-lit-form": "24.5.0-alpha3"
   },
   "peerDependencies": {
-    "react": "^18"
+    "react": "19.0.0-rc-3563387fe3-20240621"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",

diff --git a/packages/ts/react-i18n/package.json b/packages/ts/react-i18n/package.json
@@ -51,7 +51,7 @@
     "intl-messageformat": "^10.5.11"
   },
   "peerDependencies": {
-    "react": "^18"
+    "react": "19.0.0-rc-3563387fe3-20240621"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",

diff --git a/packages/ts/react-signals/package.json b/packages/ts/react-signals/package.json
@@ -46,7 +46,7 @@
     "@preact/signals-react": "^2.0.0"
   },
   "peerDependencies": {
-    "react": "^18",
+    "react": "19.0.0-rc-3563387fe3-20240621",
     "react-router-dom": "^6"
   },
   "devDependencies": {

diff --git a/pom.xml b/pom.xml
@@ -75,7 +75,7 @@
     <jackson.version>2.17.1</jackson.version>
     <junit.version>5.10.1</junit.version>
     <mockito.version>4.5.0</mockito.version>
-    <flow.version>24.5-SNAPSHOT</flow.version>
+    <flow.version>24.5.react19-SNAPSHOT</flow.version>
     <slf4j.version>2.0.9</slf4j.version>
     <spring.boot.version>3.2.7</spring.boot.version>
     <testbench.version>9.3.1</testbench.version>

diff --git a/scripts/link-npm.sh b/scripts/link-npm.sh
@@ -15,4 +15,4 @@ do
   pkgs+=" "@vaadin/hilla-`basename $tsPkg`@$tsPkg
 done
 
-npm i $pkgs --offline
+npm i $pkgs --offline --legacy-peer-deps
diff --git a/scripts/prepare/index.ts b/scripts/prepare/index.ts
@@ -66,8 +66,8 @@ const reactComponentsVersion = versions.react['react-components'].jsVersion ?? '
 const reactComponentsSpec = `${reactComponentsPackageName}@${reactComponentsVersion}`;
 console.log(`Installing "${reactComponentsSpec}".`);
 // The root hoisted version should be updated first, before the workspaces
-await run('npm', ['install', reactComponentsSpec, '--save-dev', '--save-exact']);
+await run('npm', ['install', reactComponentsSpec, '--save-dev', '--save-exact', '--legacy-peer-deps']);
 const workspaceArg = `--workspace=@vaadin/hilla-react-crud`;
 // Workaround: doing "npm uninstall" first, the package.json in the workspace is not updated otherwise
-await run('npm', ['uninstall', reactComponentsPackageName, workspaceArg, '--save']);
-await run('npm', ['install', reactComponentsSpec, workspaceArg, '--save', '--save-exact']);
+await run('npm', ['uninstall', reactComponentsPackageName, workspaceArg, '--save', '--legacy-peer-deps']);
+await run('npm', ['install', reactComponentsSpec, workspaceArg, '--save', '--save-exact', '--legacy-peer-deps']);