From 54296a9d83a0ef612f123de950e1f9e9c42eec85 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 25 Jun 2024 12:27:42 +0300 Subject: [PATCH 1/5] refactor: Do not use installAutoSignalTracking --- karma-context.html | 43 ++++++ karma-debug.html | 45 +++++++ karma.config.cjs | 22 +++- package-lock.json | 122 ++++++++++++++++++ package.json | 2 + .../tests/spring/react-i18n/package-lock.json | 58 +++++++++ .../java/tests/spring/react-i18n/package.json | 4 +- .../spring/react-signals/package-lock.json | 58 +++++++++ .../tests/spring/react-signals/package.json | 4 +- packages/ts/react-signals/src/index.ts | 5 - 10 files changed, 354 insertions(+), 9 deletions(-) create mode 100644 karma-context.html create mode 100644 karma-debug.html diff --git a/karma-context.html b/karma-context.html new file mode 100644 index 0000000000..f0513f5ba0 --- /dev/null +++ b/karma-context.html @@ -0,0 +1,43 @@ + + + + + Foo + + + + + + + + + + %SCRIPTS% + + + + + \ No newline at end of file diff --git a/karma-debug.html b/karma-debug.html new file mode 100644 index 0000000000..d7373bd716 --- /dev/null +++ b/karma-debug.html @@ -0,0 +1,45 @@ + + + + + %X_UA_COMPATIBLE% + Karma DEBUG RUNNER + + + + + + + + + + + + %SCRIPTS% + + + + + \ No newline at end of file diff --git a/karma.config.cjs b/karma.config.cjs index 987c0256b1..929b75362d 100644 --- a/karma.config.cjs +++ b/karma.config.cjs @@ -12,6 +12,7 @@ const MagicString = require('magic-string'); const postcss = require('postcss'); const cssnanoPlugin = require('cssnano'); const { karmaMochaConfig } = require('./.mocharc.cjs'); +const reactPlugin = require('@vitejs/plugin-react'); // The current package, one of the packages in the `packages` dir const cwd = process.cwd(); @@ -162,7 +163,23 @@ module.exports = (config) => { }, }, }, - plugins: [loadRegisterJs(), constructCss()], + plugins: [ + loadRegisterJs(), + constructCss(), + reactPlugin({ + include: '**/*.tsx', + babel: { + plugins: [ + [ + 'module:@preact/signals-react-transform', + { + mode: 'all', + }, + ], + ], + }, + }), + ], resolve: { alias: Object.entries(mocks).map(([find, file]) => { const replacement = join(cwd, `test/mocks/${file}`); @@ -186,7 +203,8 @@ module.exports = (config) => { client: { mocha: karmaMochaConfig, }, - + customContextFile: resolve(cwd, '../../../karma-context.html'), + customDebugFile: resolve(cwd, '../../../karma-debug.html'), // Viewport configuration viewport: { breakpoints: [ diff --git a/package-lock.json b/package-lock.json index fe75cea6bd..d7458d1897 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,9 +11,11 @@ ], "devDependencies": { "@nx/js": "^18.0.4", + "@preact/signals-react-transform": "^0.3.1", "@types/karma": "^6.3.8", "@types/node": "^20.11.19", "@vaadin/react-components": "24.5.0-alpha3", + "@vitejs/plugin-react": "^4.3.1", "chai-dom": "^1.12.0", "compare-versions": "^6.1.0", "concurrently": "^8.2.2", @@ -1642,6 +1644,36 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-transform-react-jsx-self": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.7.tgz", + "integrity": "sha512-fOPQYbGSgH0HUp4UJO4sMBFjY6DuWq+2i8rixyUMb3CdGixs/gccURvYOAhajBdKDoGajFr3mUq5rH3phtkGzw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-react-jsx-source": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.7.tgz", + "integrity": "sha512-J2z+MWzZHVOemyLweMqngXrgGC42jQ//R0KdxqkIz/OrbVIIlhFI3WigZ5fO+nwFvBlncr4MGapd8vTyc7RPNQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/plugin-transform-regenerator": { "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz", @@ -3461,6 +3493,27 @@ "react": "^16.14.0 || 17.x || 18.x" } }, + "node_modules/@preact/signals-react-transform": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@preact/signals-react-transform/-/signals-react-transform-0.3.1.tgz", + "integrity": "sha512-30wip3FKvXciDlUpd3XkGu+HOCYKV9GD4W3ELDceqK1OWysjryph/pbKW+ZcAVx5WzQTFcdkobhP+AjN6piauw==", + "dev": true, + "dependencies": { + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@preact/signals-react": "^2.0.1", + "debug": "^4.3.4", + "use-sync-external-store": "^1.2.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + }, + "peerDependencies": { + "@babel/core": "^7.0.0", + "react": "^16.14.0 || 17.x || 18.x" + } + }, "node_modules/@remix-run/router": { "version": "1.17.0", "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.17.0.tgz", @@ -3961,6 +4014,47 @@ "integrity": "sha512-Anitqkl3+KrzcW2k77lRlg/GfLZLWXBuNgbEcIOU6M92yw42vsd3xV/Z/yAHEj8m+KUjL6bWOVOFqX8PFPJ4LA==", "dev": true }, + "node_modules/@types/babel__core": { + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.6.8", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", + "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz", + "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==", + "dev": true, + "dependencies": { + "@babel/types": "^7.20.7" + } + }, "node_modules/@types/body-parser": { "version": "1.19.5", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", @@ -5606,6 +5700,25 @@ "lit": "^3.0.0" } }, + "node_modules/@vitejs/plugin-react": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.1.tgz", + "integrity": "sha512-m/V2syj5CuVnaxcUJOQRel/Wr31FFXRFlnOoq1TVtkCxsY5veGMTEmpWHndrhB2U8ScHtCQB1e+4hWYExQc6Lg==", + "dev": true, + "dependencies": { + "@babel/core": "^7.24.5", + "@babel/plugin-transform-react-jsx-self": "^7.24.5", + "@babel/plugin-transform-react-jsx-source": "^7.24.1", + "@types/babel__core": "^7.20.5", + "react-refresh": "^0.14.2" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "peerDependencies": { + "vite": "^4.2.0 || ^5.0.0" + } + }, "node_modules/@web/browser-logs": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/@web/browser-logs/-/browser-logs-0.4.0.tgz", @@ -14320,6 +14433,15 @@ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", "dev": true }, + "node_modules/react-refresh": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz", + "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/react-router": { "version": "6.24.0", "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.24.0.tgz", diff --git a/package.json b/package.json index bc0d6d1544..48709b39b6 100644 --- a/package.json +++ b/package.json @@ -34,9 +34,11 @@ }, "devDependencies": { "@nx/js": "^18.0.4", + "@preact/signals-react-transform": "^0.3.1", "@types/karma": "^6.3.8", "@types/node": "^20.11.19", "@vaadin/react-components": "24.5.0-alpha3", + "@vitejs/plugin-react": "^4.3.1", "chai-dom": "^1.12.0", "compare-versions": "^6.1.0", "concurrently": "^8.2.2", diff --git a/packages/java/tests/spring/react-i18n/package-lock.json b/packages/java/tests/spring/react-i18n/package-lock.json index 7f285c903c..66ee70cf25 100644 --- a/packages/java/tests/spring/react-i18n/package-lock.json +++ b/packages/java/tests/spring/react-i18n/package-lock.json @@ -34,6 +34,7 @@ }, "devDependencies": { "@babel/preset-react": "7.24.7", + "@preact/signals-react-transform": "0.3.1", "@rollup/plugin-replace": "5.0.7", "@rollup/pluginutils": "5.1.0", "@types/react": "18.3.3", @@ -3040,6 +3041,54 @@ "@webcomponents/shadycss": "^1.9.1" } }, + "node_modules/@preact/signals-core": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@preact/signals-core/-/signals-core-1.6.1.tgz", + "integrity": "sha512-KXEEmJoKDlo0Igju/cj9YvKIgyaWFDgnprShQjzimUd5VynAAdTWMshawEOjUVeKbsI0aR58V6WOQp+DNcKApw==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + } + }, + "node_modules/@preact/signals-react": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@preact/signals-react/-/signals-react-2.0.2.tgz", + "integrity": "sha512-JcqkrRJtYmSlVy89DL65ruFEGv4rTreQWVE/fmGQ+FtN86TaYUcwIesE4lR6IkuX33ZpGjdoh8a+0auDePD5UA==", + "dev": true, + "dependencies": { + "@preact/signals-core": "^1.6.1", + "use-sync-external-store": "^1.2.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + }, + "peerDependencies": { + "react": "^16.14.0 || 17.x || 18.x" + } + }, + "node_modules/@preact/signals-react-transform": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@preact/signals-react-transform/-/signals-react-transform-0.3.1.tgz", + "integrity": "sha512-30wip3FKvXciDlUpd3XkGu+HOCYKV9GD4W3ELDceqK1OWysjryph/pbKW+ZcAVx5WzQTFcdkobhP+AjN6piauw==", + "dev": true, + "dependencies": { + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@preact/signals-react": "^2.0.1", + "debug": "^4.3.4", + "use-sync-external-store": "^1.2.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + }, + "peerDependencies": { + "@babel/core": "^7.0.0", + "react": "^16.14.0 || 17.x || 18.x" + } + }, "node_modules/@remix-run/router": { "version": "1.16.1", "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz", @@ -8594,6 +8643,15 @@ "punycode": "^2.1.0" } }, + "node_modules/use-sync-external-store": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz", + "integrity": "sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==", + "dev": true, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/vite": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.1.tgz", diff --git a/packages/java/tests/spring/react-i18n/package.json b/packages/java/tests/spring/react-i18n/package.json index 0365992c42..ecb3404a66 100644 --- a/packages/java/tests/spring/react-i18n/package.json +++ b/packages/java/tests/spring/react-i18n/package.json @@ -30,6 +30,7 @@ }, "devDependencies": { "@babel/preset-react": "7.24.7", + "@preact/signals-react-transform": "0.3.1", "@rollup/plugin-replace": "5.0.7", "@rollup/pluginutils": "5.1.0", "@types/react": "18.3.3", @@ -86,6 +87,7 @@ }, "devDependencies": { "@babel/preset-react": "7.24.7", + "@preact/signals-react-transform": "0.3.1", "@rollup/plugin-replace": "5.0.7", "@rollup/pluginutils": "5.1.0", "@types/react": "18.3.3", @@ -113,7 +115,7 @@ "workbox-core": "7.1.0", "workbox-precaching": "7.1.0" }, - "hash": "c82f832ffb59d66dde1948274c83627ffb639371902bb1e40d7882fa436e8671" + "hash": "316ce801b8c30276eacc1ea1e1e2a41c78fd044f280cf3df62df0dbc223eae2b" }, "overrides": { "@vaadin/common-frontend": "$@vaadin/common-frontend", diff --git a/packages/java/tests/spring/react-signals/package-lock.json b/packages/java/tests/spring/react-signals/package-lock.json index 8e7ce85f45..e2b6db54a4 100644 --- a/packages/java/tests/spring/react-signals/package-lock.json +++ b/packages/java/tests/spring/react-signals/package-lock.json @@ -34,6 +34,7 @@ }, "devDependencies": { "@babel/preset-react": "7.24.7", + "@preact/signals-react-transform": "0.3.1", "@rollup/plugin-replace": "5.0.7", "@rollup/pluginutils": "5.1.0", "@types/react": "18.3.3", @@ -3008,6 +3009,54 @@ "@webcomponents/shadycss": "^1.9.1" } }, + "node_modules/@preact/signals-core": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@preact/signals-core/-/signals-core-1.6.1.tgz", + "integrity": "sha512-KXEEmJoKDlo0Igju/cj9YvKIgyaWFDgnprShQjzimUd5VynAAdTWMshawEOjUVeKbsI0aR58V6WOQp+DNcKApw==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + } + }, + "node_modules/@preact/signals-react": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@preact/signals-react/-/signals-react-2.0.2.tgz", + "integrity": "sha512-JcqkrRJtYmSlVy89DL65ruFEGv4rTreQWVE/fmGQ+FtN86TaYUcwIesE4lR6IkuX33ZpGjdoh8a+0auDePD5UA==", + "dev": true, + "dependencies": { + "@preact/signals-core": "^1.6.1", + "use-sync-external-store": "^1.2.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + }, + "peerDependencies": { + "react": "^16.14.0 || 17.x || 18.x" + } + }, + "node_modules/@preact/signals-react-transform": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@preact/signals-react-transform/-/signals-react-transform-0.3.1.tgz", + "integrity": "sha512-30wip3FKvXciDlUpd3XkGu+HOCYKV9GD4W3ELDceqK1OWysjryph/pbKW+ZcAVx5WzQTFcdkobhP+AjN6piauw==", + "dev": true, + "dependencies": { + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@preact/signals-react": "^2.0.1", + "debug": "^4.3.4", + "use-sync-external-store": "^1.2.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + }, + "peerDependencies": { + "@babel/core": "^7.0.0", + "react": "^16.14.0 || 17.x || 18.x" + } + }, "node_modules/@remix-run/router": { "version": "1.16.1", "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz", @@ -8562,6 +8611,15 @@ "punycode": "^2.1.0" } }, + "node_modules/use-sync-external-store": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz", + "integrity": "sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==", + "dev": true, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/vite": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.1.tgz", diff --git a/packages/java/tests/spring/react-signals/package.json b/packages/java/tests/spring/react-signals/package.json index 930d8ff141..7a2c21fecf 100644 --- a/packages/java/tests/spring/react-signals/package.json +++ b/packages/java/tests/spring/react-signals/package.json @@ -30,6 +30,7 @@ }, "devDependencies": { "@babel/preset-react": "7.24.7", + "@preact/signals-react-transform": "0.3.1", "@rollup/plugin-replace": "5.0.7", "@rollup/pluginutils": "5.1.0", "@types/react": "18.3.3", @@ -86,6 +87,7 @@ }, "devDependencies": { "@babel/preset-react": "7.24.7", + "@preact/signals-react-transform": "0.3.1", "@rollup/plugin-replace": "5.0.7", "@rollup/pluginutils": "5.1.0", "@types/react": "18.3.3", @@ -113,7 +115,7 @@ "workbox-core": "7.1.0", "workbox-precaching": "7.1.0" }, - "hash": "c82f832ffb59d66dde1948274c83627ffb639371902bb1e40d7882fa436e8671" + "hash": "316ce801b8c30276eacc1ea1e1e2a41c78fd044f280cf3df62df0dbc223eae2b" }, "overrides": { "@vaadin/common-frontend": "$@vaadin/common-frontend", diff --git a/packages/ts/react-signals/src/index.ts b/packages/ts/react-signals/src/index.ts index 047f8d9520..4cbe9dd400 100644 --- a/packages/ts/react-signals/src/index.ts +++ b/packages/ts/react-signals/src/index.ts @@ -1,6 +1 @@ -import { installAutoSignalTracking } from '@preact/signals-react/runtime'; - -// eslint-disable-next-line @typescript-eslint/no-unsafe-call -installAutoSignalTracking(); - export * from '@preact/signals-react'; From 0a64d781e33b2ef9fbaeb2110ae6b4d70580762e Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 27 Jun 2024 20:15:48 +0300 Subject: [PATCH 2/5] test: Bump @testing-library to latest --- package-lock.json | 369 ++++++++-------------------- packages/ts/react-auth/package.json | 5 +- packages/ts/react-crud/package.json | 5 +- packages/ts/react-form/package.json | 5 +- packages/ts/react-i18n/package.json | 5 +- 5 files changed, 109 insertions(+), 280 deletions(-) diff --git a/package-lock.json b/package-lock.json index d7458d1897..8cb3687631 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3775,7 +3775,6 @@ "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.2.0.tgz", "integrity": "sha512-CytIvb6tVOADRngTHGWNxH8LPgO/3hi/BdCEHOf7Qd2GvZVClhVP0Wo/QHzWhpki49Bk0b4VT6xpt3fx8HTSIw==", "dev": true, - "peer": true, "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", @@ -3795,7 +3794,6 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, - "peer": true, "engines": { "node": ">=10" }, @@ -3808,7 +3806,6 @@ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", "dev": true, - "peer": true, "dependencies": { "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", @@ -3819,123 +3816,6 @@ } }, "node_modules/@testing-library/dom/node_modules/react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", - "dev": true, - "peer": true - }, - "node_modules/@testing-library/react": { - "version": "14.3.1", - "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.3.1.tgz", - "integrity": "sha512-H99XjUhWQw0lTgyMN05W3xQG1Nh4lq574D8keFf1dDoNTJgp66VbJozRaczoF+wsiaPJNt/TcnfpLGufGxSrZQ==", - "dev": true, - "dependencies": { - "@babel/runtime": "^7.12.5", - "@testing-library/dom": "^9.0.0", - "@types/react-dom": "^18.0.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "react": "^18.0.0", - "react-dom": "^18.0.0" - } - }, - "node_modules/@testing-library/react/node_modules/@testing-library/dom": { - "version": "9.3.4", - "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.4.tgz", - "integrity": "sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.10.4", - "@babel/runtime": "^7.12.5", - "@types/aria-query": "^5.0.1", - "aria-query": "5.1.3", - "chalk": "^4.1.0", - "dom-accessibility-api": "^0.5.9", - "lz-string": "^1.5.0", - "pretty-format": "^27.0.2" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/@testing-library/react/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@testing-library/react/node_modules/aria-query": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", - "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", - "dev": true, - "dependencies": { - "deep-equal": "^2.0.5" - } - }, - "node_modules/@testing-library/react/node_modules/deep-equal": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", - "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==", - "dev": true, - "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "call-bind": "^1.0.5", - "es-get-iterator": "^1.1.3", - "get-intrinsic": "^1.2.2", - "is-arguments": "^1.1.1", - "is-array-buffer": "^3.0.2", - "is-date-object": "^1.0.5", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", - "isarray": "^2.0.5", - "object-is": "^1.1.5", - "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.1", - "side-channel": "^1.0.4", - "which-boxed-primitive": "^1.0.2", - "which-collection": "^1.0.1", - "which-typed-array": "^1.1.13" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/@testing-library/react/node_modules/isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - }, - "node_modules/@testing-library/react/node_modules/pretty-format": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", - "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/@testing-library/react/node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", @@ -4382,7 +4262,8 @@ "version": "18.3.0", "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz", "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==", - "devOptional": true, + "optional": true, + "peer": true, "dependencies": { "@types/react": "*" } @@ -6280,7 +6161,6 @@ "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", "dev": true, - "peer": true, "dependencies": { "dequal": "^2.0.3" } @@ -8224,7 +8104,6 @@ "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", "dev": true, - "peer": true, "engines": { "node": ">=6" } @@ -8641,32 +8520,6 @@ "node": ">= 0.4" } }, - "node_modules/es-get-iterator": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", - "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", - "has-symbols": "^1.0.3", - "is-arguments": "^1.1.1", - "is-map": "^2.0.2", - "is-set": "^2.0.2", - "is-string": "^1.0.7", - "isarray": "^2.0.5", - "stop-iteration-iterator": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es-get-iterator/node_modules/isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - }, "node_modules/es-module-lexer": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", @@ -10620,22 +10473,6 @@ "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==", "dev": true }, - "node_modules/is-arguments": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", - "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-array-buffer": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", @@ -10827,18 +10664,6 @@ "node": ">=8" } }, - "node_modules/is-map": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", - "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-negative-zero": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", @@ -10909,18 +10734,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-set": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", - "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-shared-array-buffer": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", @@ -11011,18 +10824,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/is-weakmap": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", - "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-weakref": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", @@ -11035,22 +10836,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-weakset": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", - "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "get-intrinsic": "^1.2.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-wsl": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", @@ -13091,22 +12876,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/object-is": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz", - "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", @@ -15324,18 +15093,6 @@ "node": ">= 0.6" } }, - "node_modules/stop-iteration-iterator": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", - "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", - "dev": true, - "dependencies": { - "internal-slot": "^1.0.4" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/streamroller": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz", @@ -16635,24 +16392,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/which-collection": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", - "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", - "dev": true, - "dependencies": { - "is-map": "^2.0.3", - "is-set": "^2.0.3", - "is-weakmap": "^2.0.2", - "is-weakset": "^2.0.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/which-typed-array": { "version": "1.1.15", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", @@ -17408,8 +17147,9 @@ }, "devDependencies": { "@esm-bundle/chai": "^4.3.4-fix.0", - "@testing-library/react": "^14.0.0", - "@testing-library/user-event": "^14.5.1", + "@testing-library/dom": "^10.2.0", + "@testing-library/react": "^16.0.0", + "@testing-library/user-event": "^14.5.2", "@types/chai": "^4.3.6", "@types/chai-dom": "^1.11.1", "@types/mocha": "^10.0.2", @@ -17428,6 +17168,33 @@ "react-router-dom": "^6" } }, + "packages/ts/react-auth/node_modules/@testing-library/react": { + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.0.0.tgz", + "integrity": "sha512-guuxUKRWQ+FgNX0h0NS0FIq3Q3uLtWVpBzcLOggmfMoUpgBnzBzvLLd4fbm6yS8ydJd94cIfY4yP9qUQjM2KwQ==", + "dev": true, + "dependencies": { + "@babel/runtime": "^7.12.5" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@testing-library/dom": "^10.0.0", + "@types/react": "^18.0.0", + "@types/react-dom": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "packages/ts/react-crud": { "name": "@vaadin/hilla-react-crud", "version": "24.5.0-alpha3", @@ -17440,8 +17207,9 @@ }, "devDependencies": { "@esm-bundle/chai": "^4.3.4-fix.0", - "@testing-library/react": "^14.0.0", - "@testing-library/user-event": "^14.5.1", + "@testing-library/dom": "^10.2.0", + "@testing-library/react": "^16.0.0", + "@testing-library/user-event": "^14.5.2", "@types/chai": "^4.3.6", "@types/chai-as-promised": "^7.1.6", "@types/chai-dom": "^1.11.1", @@ -17464,8 +17232,9 @@ }, "packages/ts/react-crud/node_modules/@testing-library/react": { "version": "16.0.0", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.0.0.tgz", + "integrity": "sha512-guuxUKRWQ+FgNX0h0NS0FIq3Q3uLtWVpBzcLOggmfMoUpgBnzBzvLLd4fbm6yS8ydJd94cIfY4yP9qUQjM2KwQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/runtime": "^7.12.5" }, @@ -17497,8 +17266,9 @@ }, "devDependencies": { "@esm-bundle/chai": "^4.3.4-fix.0", - "@testing-library/react": "^14.0.0", - "@testing-library/user-event": "^14.5.1", + "@testing-library/dom": "^10.2.0", + "@testing-library/react": "^16.0.0", + "@testing-library/user-event": "^14.5.2", "@types/chai": "^4.3.6", "@types/chai-as-promised": "^7.1.8", "@types/chai-dom": "^1.11.1", @@ -17517,6 +17287,33 @@ "react": "^18" } }, + "packages/ts/react-form/node_modules/@testing-library/react": { + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.0.0.tgz", + "integrity": "sha512-guuxUKRWQ+FgNX0h0NS0FIq3Q3uLtWVpBzcLOggmfMoUpgBnzBzvLLd4fbm6yS8ydJd94cIfY4yP9qUQjM2KwQ==", + "dev": true, + "dependencies": { + "@babel/runtime": "^7.12.5" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@testing-library/dom": "^10.0.0", + "@types/react": "^18.0.0", + "@types/react-dom": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "packages/ts/react-i18n": { "name": "@vaadin/hilla-react-i18n", "version": "24.5.0-alpha3", @@ -17528,8 +17325,9 @@ }, "devDependencies": { "@esm-bundle/chai": "^4.3.4-fix.0", - "@testing-library/react": "^14.0.0", - "@testing-library/user-event": "^14.5.1", + "@testing-library/dom": "^10.2.0", + "@testing-library/react": "^16.0.0", + "@testing-library/user-event": "^14.5.2", "@types/chai": "^4.3.6", "@types/chai-as-promised": "^7.1.8", "@types/chai-dom": "^1.11.1", @@ -17549,6 +17347,33 @@ "react": "^18" } }, + "packages/ts/react-i18n/node_modules/@testing-library/react": { + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.0.0.tgz", + "integrity": "sha512-guuxUKRWQ+FgNX0h0NS0FIq3Q3uLtWVpBzcLOggmfMoUpgBnzBzvLLd4fbm6yS8ydJd94cIfY4yP9qUQjM2KwQ==", + "dev": true, + "dependencies": { + "@babel/runtime": "^7.12.5" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@testing-library/dom": "^10.0.0", + "@types/react": "^18.0.0", + "@types/react-dom": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "packages/ts/react-signals": { "name": "@vaadin/hilla-react-signals", "version": "24.5.0-alpha3", diff --git a/packages/ts/react-auth/package.json b/packages/ts/react-auth/package.json index e1627a411b..8449c06b8a 100644 --- a/packages/ts/react-auth/package.json +++ b/packages/ts/react-auth/package.json @@ -54,8 +54,9 @@ }, "devDependencies": { "@esm-bundle/chai": "^4.3.4-fix.0", - "@testing-library/react": "^14.0.0", - "@testing-library/user-event": "^14.5.1", + "@testing-library/dom": "^10.2.0", + "@testing-library/react": "^16.0.0", + "@testing-library/user-event": "^14.5.2", "@types/chai": "^4.3.6", "@types/chai-dom": "^1.11.1", "@types/mocha": "^10.0.2", diff --git a/packages/ts/react-crud/package.json b/packages/ts/react-crud/package.json index 2246206964..883a241fbd 100644 --- a/packages/ts/react-crud/package.json +++ b/packages/ts/react-crud/package.json @@ -67,8 +67,9 @@ }, "devDependencies": { "@esm-bundle/chai": "^4.3.4-fix.0", - "@testing-library/react": "^14.0.0", - "@testing-library/user-event": "^14.5.1", + "@testing-library/dom": "^10.2.0", + "@testing-library/react": "^16.0.0", + "@testing-library/user-event": "^14.5.2", "@types/chai": "^4.3.6", "@types/chai-as-promised": "^7.1.6", "@types/chai-dom": "^1.11.1", diff --git a/packages/ts/react-form/package.json b/packages/ts/react-form/package.json index 467cb69adb..1d62415d7d 100644 --- a/packages/ts/react-form/package.json +++ b/packages/ts/react-form/package.json @@ -53,8 +53,9 @@ }, "devDependencies": { "@esm-bundle/chai": "^4.3.4-fix.0", - "@testing-library/react": "^14.0.0", - "@testing-library/user-event": "^14.5.1", + "@testing-library/dom": "^10.2.0", + "@testing-library/react": "^16.0.0", + "@testing-library/user-event": "^14.5.2", "@types/chai": "^4.3.6", "@types/chai-as-promised": "^7.1.8", "@types/chai-dom": "^1.11.1", diff --git a/packages/ts/react-i18n/package.json b/packages/ts/react-i18n/package.json index d4091716c4..d43dec285c 100644 --- a/packages/ts/react-i18n/package.json +++ b/packages/ts/react-i18n/package.json @@ -55,8 +55,9 @@ }, "devDependencies": { "@esm-bundle/chai": "^4.3.4-fix.0", - "@testing-library/react": "^14.0.0", - "@testing-library/user-event": "^14.5.1", + "@testing-library/dom": "^10.2.0", + "@testing-library/react": "^16.0.0", + "@testing-library/user-event": "^14.5.2", "@types/chai": "^4.3.6", "@types/chai-as-promised": "^7.1.8", "@types/chai-dom": "^1.11.1", From 9669549bb934d77fb3ab154ad2d09abb2e67bfa5 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 24 Jun 2024 14:15:56 +0300 Subject: [PATCH 3/5] Set custom Maven version --- packages/java/endpoint/pom.xml | 4 ++-- packages/java/engine-core/pom.xml | 2 +- packages/java/engine-runtime/pom.xml | 2 +- packages/java/gradle-plugin/pom-portal.xml | 2 +- packages/java/gradle-plugin/pom.xml | 2 +- packages/java/hilla-bom/pom.xml | 2 +- packages/java/hilla-dev/pom.xml | 2 +- packages/java/hilla/pom.xml | 2 +- packages/java/maven-plugin/pom.xml | 2 +- packages/java/parser-jvm-core/pom.xml | 2 +- packages/java/parser-jvm-plugin-backbone/pom.xml | 2 +- packages/java/parser-jvm-plugin-model/pom.xml | 2 +- packages/java/parser-jvm-plugin-nonnull/pom.xml | 2 +- packages/java/parser-jvm-plugin-subtypes/pom.xml | 2 +- packages/java/parser-jvm-plugin-transfertypes/pom.xml | 2 +- packages/java/parser-jvm-test-utils/pom.xml | 2 +- packages/java/parser-jvm-utils/pom.xml | 2 +- packages/java/runtime-plugin-transfertypes/pom.xml | 2 +- packages/java/tests/csrf-context/pom.xml | 2 +- packages/java/tests/csrf/pom.xml | 2 +- packages/java/tests/pom.xml | 2 +- packages/java/tests/spring/endpoints discovery/pom.xml | 2 +- packages/java/tests/spring/endpoints-contextpath/pom.xml | 2 +- packages/java/tests/spring/endpoints-custom-client/pom.xml | 2 +- packages/java/tests/spring/endpoints-latest-java/pom.xml | 2 +- packages/java/tests/spring/endpoints/pom.xml | 2 +- packages/java/tests/spring/native/pom.xml | 2 +- packages/java/tests/spring/pom.xml | 2 +- packages/java/tests/spring/react-grid-test/pom.xml | 2 +- packages/java/tests/spring/react-i18n/pom.xml | 2 +- packages/java/tests/spring/react-signals/pom.xml | 2 +- packages/java/tests/spring/security-contextpath/pom.xml | 2 +- packages/java/tests/spring/security-jwt/pom.xml | 2 +- packages/java/tests/spring/security-urlmapping/pom.xml | 2 +- packages/java/tests/spring/security/pom.xml | 2 +- pom.xml | 2 +- 36 files changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/java/endpoint/pom.xml b/packages/java/endpoint/pom.xml index 065e0af8bc..d43b86dbec 100644 --- a/packages/java/endpoint/pom.xml +++ b/packages/java/endpoint/pom.xml @@ -6,12 +6,12 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml hilla-endpoint - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT Hilla Endpoint jar diff --git a/packages/java/engine-core/pom.xml b/packages/java/engine-core/pom.xml index 88370aee4a..3b22d9e1ac 100644 --- a/packages/java/engine-core/pom.xml +++ b/packages/java/engine-core/pom.xml @@ -6,7 +6,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/engine-runtime/pom.xml b/packages/java/engine-runtime/pom.xml index 63a13b3ca4..d13220d36e 100644 --- a/packages/java/engine-runtime/pom.xml +++ b/packages/java/engine-runtime/pom.xml @@ -6,7 +6,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/gradle-plugin/pom-portal.xml b/packages/java/gradle-plugin/pom-portal.xml index bb055ad01e..4ed032b3ac 100644 --- a/packages/java/gradle-plugin/pom-portal.xml +++ b/packages/java/gradle-plugin/pom-portal.xml @@ -5,7 +5,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/gradle-plugin/pom.xml b/packages/java/gradle-plugin/pom.xml index 69eddcdf67..307a5a6ffc 100644 --- a/packages/java/gradle-plugin/pom.xml +++ b/packages/java/gradle-plugin/pom.xml @@ -3,7 +3,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/hilla-bom/pom.xml b/packages/java/hilla-bom/pom.xml index 0809726311..51ed50f9cf 100644 --- a/packages/java/hilla-bom/pom.xml +++ b/packages/java/hilla-bom/pom.xml @@ -13,7 +13,7 @@ hilla-bom pom Hilla Platform (Bill of Materials) - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT Hilla Platform (Bill of Materials) https://hilla.dev diff --git a/packages/java/hilla-dev/pom.xml b/packages/java/hilla-dev/pom.xml index cf6d2061c8..64e5a3ec7c 100644 --- a/packages/java/hilla-dev/pom.xml +++ b/packages/java/hilla-dev/pom.xml @@ -7,7 +7,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/hilla/pom.xml b/packages/java/hilla/pom.xml index a5b9234822..81fdcf7652 100644 --- a/packages/java/hilla/pom.xml +++ b/packages/java/hilla/pom.xml @@ -7,7 +7,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/maven-plugin/pom.xml b/packages/java/maven-plugin/pom.xml index d66764d3f8..50bd3df71d 100644 --- a/packages/java/maven-plugin/pom.xml +++ b/packages/java/maven-plugin/pom.xml @@ -6,7 +6,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/parser-jvm-core/pom.xml b/packages/java/parser-jvm-core/pom.xml index 1b86f2d47c..7790cc915c 100644 --- a/packages/java/parser-jvm-core/pom.xml +++ b/packages/java/parser-jvm-core/pom.xml @@ -6,7 +6,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/parser-jvm-plugin-backbone/pom.xml b/packages/java/parser-jvm-plugin-backbone/pom.xml index 4bf0c65736..c4ea18ee69 100644 --- a/packages/java/parser-jvm-plugin-backbone/pom.xml +++ b/packages/java/parser-jvm-plugin-backbone/pom.xml @@ -7,7 +7,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/parser-jvm-plugin-model/pom.xml b/packages/java/parser-jvm-plugin-model/pom.xml index af783a4bb6..49107f6145 100644 --- a/packages/java/parser-jvm-plugin-model/pom.xml +++ b/packages/java/parser-jvm-plugin-model/pom.xml @@ -7,7 +7,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/parser-jvm-plugin-nonnull/pom.xml b/packages/java/parser-jvm-plugin-nonnull/pom.xml index 9faf0893eb..3ba9ffb1ee 100644 --- a/packages/java/parser-jvm-plugin-nonnull/pom.xml +++ b/packages/java/parser-jvm-plugin-nonnull/pom.xml @@ -7,7 +7,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/parser-jvm-plugin-subtypes/pom.xml b/packages/java/parser-jvm-plugin-subtypes/pom.xml index 2aeab6b63e..3224e8c9b2 100644 --- a/packages/java/parser-jvm-plugin-subtypes/pom.xml +++ b/packages/java/parser-jvm-plugin-subtypes/pom.xml @@ -7,7 +7,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/parser-jvm-plugin-transfertypes/pom.xml b/packages/java/parser-jvm-plugin-transfertypes/pom.xml index 07320328a1..2d24da6ddf 100644 --- a/packages/java/parser-jvm-plugin-transfertypes/pom.xml +++ b/packages/java/parser-jvm-plugin-transfertypes/pom.xml @@ -7,7 +7,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/parser-jvm-test-utils/pom.xml b/packages/java/parser-jvm-test-utils/pom.xml index c39e1a4388..073848ee4a 100644 --- a/packages/java/parser-jvm-test-utils/pom.xml +++ b/packages/java/parser-jvm-test-utils/pom.xml @@ -7,7 +7,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/parser-jvm-utils/pom.xml b/packages/java/parser-jvm-utils/pom.xml index 67bb357df7..d50ef14009 100644 --- a/packages/java/parser-jvm-utils/pom.xml +++ b/packages/java/parser-jvm-utils/pom.xml @@ -6,7 +6,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/runtime-plugin-transfertypes/pom.xml b/packages/java/runtime-plugin-transfertypes/pom.xml index 200b376c9c..e32b9f746b 100644 --- a/packages/java/runtime-plugin-transfertypes/pom.xml +++ b/packages/java/runtime-plugin-transfertypes/pom.xml @@ -7,7 +7,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/tests/csrf-context/pom.xml b/packages/java/tests/csrf-context/pom.xml index 6c682443a1..3c37a1d111 100644 --- a/packages/java/tests/csrf-context/pom.xml +++ b/packages/java/tests/csrf-context/pom.xml @@ -4,7 +4,7 @@ com.vaadin tests - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-csrf-context diff --git a/packages/java/tests/csrf/pom.xml b/packages/java/tests/csrf/pom.xml index 094764532b..239b235bbf 100644 --- a/packages/java/tests/csrf/pom.xml +++ b/packages/java/tests/csrf/pom.xml @@ -6,7 +6,7 @@ com.vaadin tests - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-csrf diff --git a/packages/java/tests/pom.xml b/packages/java/tests/pom.xml index 9f7ddd81ee..05918cf0a2 100644 --- a/packages/java/tests/pom.xml +++ b/packages/java/tests/pom.xml @@ -6,7 +6,7 @@ com.vaadin hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT ../../../pom.xml diff --git a/packages/java/tests/spring/endpoints discovery/pom.xml b/packages/java/tests/spring/endpoints discovery/pom.xml index 2cd22c9632..7bdf07d7d1 100644 --- a/packages/java/tests/spring/endpoints discovery/pom.xml +++ b/packages/java/tests/spring/endpoints discovery/pom.xml @@ -6,7 +6,7 @@ com.vaadin tests-spring - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-spring-endpoints-discovery ITs for Endpoints Discovery diff --git a/packages/java/tests/spring/endpoints-contextpath/pom.xml b/packages/java/tests/spring/endpoints-contextpath/pom.xml index e2728b91b0..c22595bd9f 100644 --- a/packages/java/tests/spring/endpoints-contextpath/pom.xml +++ b/packages/java/tests/spring/endpoints-contextpath/pom.xml @@ -6,7 +6,7 @@ com.vaadin tests-spring - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-spring-endpoints-contextpath ITs for Endpoints when using a context path diff --git a/packages/java/tests/spring/endpoints-custom-client/pom.xml b/packages/java/tests/spring/endpoints-custom-client/pom.xml index 311dfd7f79..852631dd4a 100644 --- a/packages/java/tests/spring/endpoints-custom-client/pom.xml +++ b/packages/java/tests/spring/endpoints-custom-client/pom.xml @@ -5,7 +5,7 @@ com.vaadin tests-spring - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-spring-endpoints-custom-client ITs for Endpoints / custom client diff --git a/packages/java/tests/spring/endpoints-latest-java/pom.xml b/packages/java/tests/spring/endpoints-latest-java/pom.xml index 444844d9f9..66e77a36c3 100644 --- a/packages/java/tests/spring/endpoints-latest-java/pom.xml +++ b/packages/java/tests/spring/endpoints-latest-java/pom.xml @@ -6,7 +6,7 @@ com.vaadin tests-spring - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-spring-endpoints-latest-java ITs for Endpoints / latest Java diff --git a/packages/java/tests/spring/endpoints/pom.xml b/packages/java/tests/spring/endpoints/pom.xml index a47fa1a3f2..aa8f114dd6 100644 --- a/packages/java/tests/spring/endpoints/pom.xml +++ b/packages/java/tests/spring/endpoints/pom.xml @@ -6,7 +6,7 @@ com.vaadin tests-spring - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-spring-endpoints ITs for Endpoints diff --git a/packages/java/tests/spring/native/pom.xml b/packages/java/tests/spring/native/pom.xml index 45c003aa5e..6bdc5fe210 100644 --- a/packages/java/tests/spring/native/pom.xml +++ b/packages/java/tests/spring/native/pom.xml @@ -6,7 +6,7 @@ com.vaadin tests-spring - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-spring-native ITs for Hilla compiled to native diff --git a/packages/java/tests/spring/pom.xml b/packages/java/tests/spring/pom.xml index cef81235f9..ce8ff1253c 100644 --- a/packages/java/tests/spring/pom.xml +++ b/packages/java/tests/spring/pom.xml @@ -6,7 +6,7 @@ com.vaadin tests - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-spring diff --git a/packages/java/tests/spring/react-grid-test/pom.xml b/packages/java/tests/spring/react-grid-test/pom.xml index ebbdf2f8d2..df0def5b00 100644 --- a/packages/java/tests/spring/react-grid-test/pom.xml +++ b/packages/java/tests/spring/react-grid-test/pom.xml @@ -6,7 +6,7 @@ com.vaadin tests-spring - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-react-grid ITs for React Auto Grid diff --git a/packages/java/tests/spring/react-i18n/pom.xml b/packages/java/tests/spring/react-i18n/pom.xml index 24ab6bc9b0..ea8a948f60 100644 --- a/packages/java/tests/spring/react-i18n/pom.xml +++ b/packages/java/tests/spring/react-i18n/pom.xml @@ -6,7 +6,7 @@ com.vaadin tests-spring - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-react-i18n ITs for React I18N diff --git a/packages/java/tests/spring/react-signals/pom.xml b/packages/java/tests/spring/react-signals/pom.xml index 28e7809b81..66ef04f2b5 100644 --- a/packages/java/tests/spring/react-signals/pom.xml +++ b/packages/java/tests/spring/react-signals/pom.xml @@ -6,7 +6,7 @@ com.vaadin tests-spring - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-react-signals ITs for React Signals diff --git a/packages/java/tests/spring/security-contextpath/pom.xml b/packages/java/tests/spring/security-contextpath/pom.xml index 1d9b4827fb..94615b9155 100644 --- a/packages/java/tests/spring/security-contextpath/pom.xml +++ b/packages/java/tests/spring/security-contextpath/pom.xml @@ -6,7 +6,7 @@ com.vaadin tests-spring - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-spring-security-contextpath ITs for Vaadin Spring Security and Hilla / context path diff --git a/packages/java/tests/spring/security-jwt/pom.xml b/packages/java/tests/spring/security-jwt/pom.xml index b5a847fbec..867d213b30 100644 --- a/packages/java/tests/spring/security-jwt/pom.xml +++ b/packages/java/tests/spring/security-jwt/pom.xml @@ -6,7 +6,7 @@ com.vaadin tests-spring - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-spring-security-jwt ITs for Vaadin Spring Security and Hilla / JWT diff --git a/packages/java/tests/spring/security-urlmapping/pom.xml b/packages/java/tests/spring/security-urlmapping/pom.xml index 626c61a77f..0baa6d04d2 100644 --- a/packages/java/tests/spring/security-urlmapping/pom.xml +++ b/packages/java/tests/spring/security-urlmapping/pom.xml @@ -6,7 +6,7 @@ com.vaadin tests-spring - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-spring-security-urlmapping ITs for Vaadin Spring Security and Hilla / URL mapping diff --git a/packages/java/tests/spring/security/pom.xml b/packages/java/tests/spring/security/pom.xml index 36a5d8fe7e..e8dc99611d 100644 --- a/packages/java/tests/spring/security/pom.xml +++ b/packages/java/tests/spring/security/pom.xml @@ -6,7 +6,7 @@ com.vaadin tests-spring - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT tests-spring-security ITs for Vaadin Spring Security and Hilla diff --git a/pom.xml b/pom.xml index 689cf73c1a..69d4c9015a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 hilla-project - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT Hilla pom From 9c187c80eb2e4ec46900081682fddf3ca234549e Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 24 Jun 2024 12:39:18 +0300 Subject: [PATCH 4/5] feat: Upgrade to React 19 --- .github/actions/setup/action.yml | 2 +- package-lock.json | 94 ++++++------------- .../com/vaadin/hilla/internal/TaskTest.java | 3 +- packages/ts/file-router/package.json | 4 +- packages/ts/react-auth/package.json | 2 +- packages/ts/react-crud/package.json | 4 +- packages/ts/react-form/package.json | 2 +- packages/ts/react-i18n/package.json | 2 +- packages/ts/react-signals/package.json | 2 +- pom.xml | 2 +- scripts/link-npm.sh | 2 +- scripts/prepare/index.ts | 6 +- 12 files changed, 43 insertions(+), 82 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index be17ad1a21..60946fe714 100644 --- 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 index 8cb3687631..166c945d6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3518,6 +3518,7 @@ "version": "1.17.0", "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.17.0.tgz", "integrity": "sha512-2D6XaHEVvkCn682XBnipbJjgZUU7xjLtA4dGJRBVUKpEaDYOZMENZoZjAOSb7qirxt5RupjzZxz4fK2FO+EFPw==", + "dev": true, "engines": { "node": ">=14.0.0" } @@ -4235,7 +4236,8 @@ "node_modules/@types/prop-types": { "version": "15.7.12", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz", - "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==" + "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==", + "dev": true }, "node_modules/@types/qs": { "version": "6.9.15", @@ -4253,21 +4255,12 @@ "version": "18.3.3", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz", "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==", + "dev": true, "dependencies": { "@types/prop-types": "*", "csstype": "^3.0.2" } }, - "node_modules/@types/react-dom": { - "version": "18.3.0", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz", - "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==", - "optional": true, - "peer": true, - "dependencies": { - "@types/react": "*" - } - }, "node_modules/@types/semver": { "version": "7.5.8", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", @@ -7850,7 +7843,8 @@ "node_modules/csstype": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "dev": true }, "node_modules/custom-event": { "version": "1.0.1", @@ -11054,7 +11048,8 @@ "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true }, "node_modules/js-yaml": { "version": "3.14.1", @@ -12060,17 +12055,6 @@ "node": ">=8.0" } }, - "node_modules/loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dependencies": { - "js-tokens": "^3.0.0 || ^4.0.0" - }, - "bin": { - "loose-envify": "cli.js" - } - }, "node_modules/loupe": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", @@ -14172,30 +14156,6 @@ "node": ">= 0.8" } }, - "node_modules/react": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", - "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", - "dependencies": { - "loose-envify": "^1.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/react-dom": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", - "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", - "peer": true, - "dependencies": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.2" - }, - "peerDependencies": { - "react": "^18.3.1" - } - }, "node_modules/react-is": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", @@ -14215,6 +14175,7 @@ "version": "6.24.0", "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.24.0.tgz", "integrity": "sha512-sQrgJ5bXk7vbcC4BxQxeNa5UmboFm35we1AFK0VvQaz9g0LzxEIuLOhHIoZ8rnu9BO21ishGeL9no1WB76W/eg==", + "dev": true, "dependencies": { "@remix-run/router": "1.17.0" }, @@ -14229,6 +14190,7 @@ "version": "6.24.0", "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.24.0.tgz", "integrity": "sha512-960sKuau6/yEwS8e+NVEidYQb1hNjAYM327gjEyXlc6r3Skf2vtwuJ2l7lssdegD2YjoKG5l8MsVyeTDlVeY8g==", + "dev": true, "dependencies": { "@remix-run/router": "1.17.0", "react-router": "6.24.0" @@ -14756,15 +14718,6 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, - "node_modules/scheduler": { - "version": "0.23.2", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", - "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", - "peer": true, - "dependencies": { - "loose-envify": "^1.1.0" - } - }, "node_modules/secure-json-parse": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz", @@ -16716,7 +16669,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" }, @@ -16739,10 +16692,18 @@ "type-fest": "^4.9.0" }, "peerDependencies": { - "react": "^18.2.0", + "react": "19.0.0-rc-3563387fe3-20240621", "react-router-dom": "^6.21.1" } }, + "packages/ts/file-router/node_modules/react": { + "version": "19.0.0-rc-3563387fe3-20240621", + "resolved": "https://registry.npmjs.org/react/-/react-19.0.0-rc-3563387fe3-20240621.tgz", + "integrity": "sha512-euYgnMufgCGN0vAuIiSDAXB8Uog8LAJKQPhDtccHpY9vvu4+Uz43NCF5/tGRd7y0TXN48LRUbBfnU5+0dWfoiA==", + "engines": { + "node": ">=0.10.0" + } + }, "packages/ts/frontend": { "name": "@vaadin/hilla-frontend", "version": "24.5.0-alpha3", @@ -17164,7 +17125,7 @@ "typescript": "5.5.2" }, "peerDependencies": { - "react": "^18", + "react": "19.0.0-rc-3563387fe3-20240621", "react-router-dom": "^6" } }, @@ -17226,15 +17187,14 @@ "typescript": "5.5.2" }, "peerDependencies": { - "react": "^18", - "react-dom": "^18" + "react": "19.0.0-rc-3563387fe3-20240621", + "react-dom": "19.0.0-rc-3563387fe3-20240621" } }, "packages/ts/react-crud/node_modules/@testing-library/react": { "version": "16.0.0", - "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.0.0.tgz", - "integrity": "sha512-guuxUKRWQ+FgNX0h0NS0FIq3Q3uLtWVpBzcLOggmfMoUpgBnzBzvLLd4fbm6yS8ydJd94cIfY4yP9qUQjM2KwQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/runtime": "^7.12.5" }, @@ -17284,7 +17244,7 @@ "typescript": "5.5.2" }, "peerDependencies": { - "react": "^18" + "react": "19.0.0-rc-3563387fe3-20240621" } }, "packages/ts/react-form/node_modules/@testing-library/react": { @@ -17344,7 +17304,7 @@ "typescript": "5.5.2" }, "peerDependencies": { - "react": "^18" + "react": "19.0.0-rc-3563387fe3-20240621" } }, "packages/ts/react-i18n/node_modules/@testing-library/react": { @@ -17390,7 +17350,7 @@ "typescript": "5.5.2" }, "peerDependencies": { - "react": "^18", + "react": "19.0.0-rc-3563387fe3-20240621", "react-router-dom": "^6" } } 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 index 4ee7fc6cf8..6d36bec90e 100644 --- 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. 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 index 017cabfec2..b73aa65933 100644 --- 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 index 8449c06b8a..71d2b4575b 100644 --- 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 index 883a241fbd..8a5ec72486 100644 --- 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 index 1d62415d7d..fa9dd4c182 100644 --- 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 index d43dec285c..d6c0b36694 100644 --- 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 index c5ade93f39..b90711a075 100644 --- 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 index 69d4c9015a..61dcf80948 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 2.17.1 5.10.1 4.5.0 - 24.5-SNAPSHOT + 24.5.react19-SNAPSHOT 2.0.9 3.2.7 9.3.1 diff --git a/scripts/link-npm.sh b/scripts/link-npm.sh index b2d3e2c914..39f87d777f 100755 --- 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 index f54bfe4157..bad02f2eda 100644 --- 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']); From 51ecf09590278fa86a7f44051f5e15f0dfba1f54 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 27 Jun 2024 20:31:44 +0300 Subject: [PATCH 5/5] Install react top level to deal with peer deps and pre releases --- package-lock.json | 36 ++++++++++++++++++++++++++++-------- package.json | 4 ++++ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 166c945d6a..c2deaa11b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,10 @@ "workspaces": [ "packages/ts/*" ], + "dependencies": { + "react": "^19.0.0-rc-3563387fe3-20240621", + "react-dom": "^19.0.0-rc-3563387fe3-20240621" + }, "devDependencies": { "@nx/js": "^18.0.4", "@preact/signals-react-transform": "^0.3.1", @@ -14156,6 +14160,25 @@ "node": ">= 0.8" } }, + "node_modules/react": { + "version": "19.0.0-rc-3563387fe3-20240621", + "resolved": "https://registry.npmjs.org/react/-/react-19.0.0-rc-3563387fe3-20240621.tgz", + "integrity": "sha512-euYgnMufgCGN0vAuIiSDAXB8Uog8LAJKQPhDtccHpY9vvu4+Uz43NCF5/tGRd7y0TXN48LRUbBfnU5+0dWfoiA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-dom": { + "version": "19.0.0-rc-3563387fe3-20240621", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0-rc-3563387fe3-20240621.tgz", + "integrity": "sha512-nKVSxUP1sfPYfCxpJWKiVq0xlLRNKZTVDUA4Wnk6h1fq02IiBTZwU3BA7HJEivjsm0QzBsMctL2kl1jAleWZ5g==", + "dependencies": { + "scheduler": "0.25.0-rc-3563387fe3-20240621" + }, + "peerDependencies": { + "react": "19.0.0-rc-3563387fe3-20240621" + } + }, "node_modules/react-is": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", @@ -14718,6 +14741,11 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, + "node_modules/scheduler": { + "version": "0.25.0-rc-3563387fe3-20240621", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0-rc-3563387fe3-20240621.tgz", + "integrity": "sha512-BZfteLABepXgAsOrP1H+33NjBb+Xz1kDPstBlb0zQ0V+PHgyGCPaF8rF38i+TnnB84d0fQ2Lb+MhBUMqpZMhsw==" + }, "node_modules/secure-json-parse": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz", @@ -16696,14 +16724,6 @@ "react-router-dom": "^6.21.1" } }, - "packages/ts/file-router/node_modules/react": { - "version": "19.0.0-rc-3563387fe3-20240621", - "resolved": "https://registry.npmjs.org/react/-/react-19.0.0-rc-3563387fe3-20240621.tgz", - "integrity": "sha512-euYgnMufgCGN0vAuIiSDAXB8Uog8LAJKQPhDtccHpY9vvu4+Uz43NCF5/tGRd7y0TXN48LRUbBfnU5+0dWfoiA==", - "engines": { - "node": ">=0.10.0" - } - }, "packages/ts/frontend": { "name": "@vaadin/hilla-frontend", "version": "24.5.0-alpha3", diff --git a/package.json b/package.json index 48709b39b6..fd893639b7 100644 --- a/package.json +++ b/package.json @@ -70,5 +70,9 @@ "tsx": "4.7.1", "typescript": "5.5.2", "vite": "5.3.1" + }, + "dependencies": { + "react": "^19.0.0-rc-3563387fe3-20240621", + "react-dom": "^19.0.0-rc-3563387fe3-20240621" } }