Skip to content

Commit

Permalink
Merge branch 'main' into feat/generator/transfer-type-plugin
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
  • Loading branch information
Lodin committed Feb 4, 2025
2 parents 8b26d90 + 40c4ef3 commit 91ff57d
Show file tree
Hide file tree
Showing 34 changed files with 14,355 additions and 10,859 deletions.
4,596 changes: 3,975 additions & 621 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@types/sinon": "17.0.3",
"@types/sinon-chai": "4.0.0",
"@types/validator": "13.12.2",
"@vaadin/react-components": "24.7.0-alpha7",
"@vaadin/react-components": "24.7.0-alpha8",
"@vitejs/plugin-react": "4.3.4",
"@vitest/browser": "3.0.4",
"@vitest/coverage-v8": "3.0.4",
Expand Down
408 changes: 204 additions & 204 deletions packages/java/tests/csrf-context/package-lock.json

Large diffs are not rendered by default.

50 changes: 25 additions & 25 deletions packages/java/tests/csrf-context/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"@vaadin/common-frontend": "0.0.19",
"@vaadin/hilla-frontend": "file:../../../ts/frontend",
"@vaadin/hilla-lit-form": "file:../../../ts/lit-form",
"@vaadin/icon": "24.7.0-alpha7",
"@vaadin/icons": "24.7.0-alpha7",
"@vaadin/polymer-legacy-adapter": "24.7.0-alpha7",
"@vaadin/icon": "24.7.0-alpha8",
"@vaadin/icons": "24.7.0-alpha8",
"@vaadin/polymer-legacy-adapter": "24.7.0-alpha8",
"@vaadin/router": "2.0.0",
"@vaadin/tooltip": "24.7.0-alpha7",
"@vaadin/vaadin-lumo-styles": "24.7.0-alpha7",
"@vaadin/vaadin-themable-mixin": "24.7.0-alpha7",
"@vaadin/tooltip": "24.7.0-alpha8",
"@vaadin/vaadin-lumo-styles": "24.7.0-alpha8",
"@vaadin/vaadin-themable-mixin": "24.7.0-alpha8",
"construct-style-sheets-polyfill": "3.1.0",
"lit": "3.2.1"
},
Expand Down Expand Up @@ -50,15 +50,15 @@
"dependencies": {
"@polymer/polymer": "3.5.2",
"@vaadin/common-frontend": "0.0.19",
"@vaadin/hilla-frontend": "24.7.0-alpha9",
"@vaadin/hilla-lit-form": "24.7.0-alpha9",
"@vaadin/icon": "24.7.0-alpha7",
"@vaadin/icons": "24.7.0-alpha7",
"@vaadin/polymer-legacy-adapter": "24.7.0-alpha7",
"@vaadin/hilla-frontend": "24.7.0-alpha10",
"@vaadin/hilla-lit-form": "24.7.0-alpha10",
"@vaadin/icon": "24.7.0-alpha8",
"@vaadin/icons": "24.7.0-alpha8",
"@vaadin/polymer-legacy-adapter": "24.7.0-alpha8",
"@vaadin/router": "2.0.0",
"@vaadin/tooltip": "24.7.0-alpha7",
"@vaadin/vaadin-lumo-styles": "24.7.0-alpha7",
"@vaadin/vaadin-themable-mixin": "24.7.0-alpha7",
"@vaadin/tooltip": "24.7.0-alpha8",
"@vaadin/vaadin-lumo-styles": "24.7.0-alpha8",
"@vaadin/vaadin-themable-mixin": "24.7.0-alpha8",
"construct-style-sheets-polyfill": "3.1.0",
"lit": "3.2.1"
},
Expand All @@ -67,16 +67,16 @@
"@preact/signals-react-transform": "0.5.1",
"@rollup/plugin-replace": "6.0.2",
"@rollup/pluginutils": "5.1.4",
"@vaadin/hilla-generator-cli": "24.7.0-alpha9",
"@vaadin/hilla-generator-core": "24.7.0-alpha9",
"@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
"@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha9",
"@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
"@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
"@vaadin/hilla-generator-plugin-push": "24.7.0-alpha9",
"@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha9",
"@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha9",
"@vaadin/hilla-generator-utils": "24.7.0-alpha9",
"@vaadin/hilla-generator-cli": "24.7.0-alpha10",
"@vaadin/hilla-generator-core": "24.7.0-alpha10",
"@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha10",
"@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha10",
"@vaadin/hilla-generator-plugin-client": "24.7.0-alpha10",
"@vaadin/hilla-generator-plugin-model": "24.7.0-alpha10",
"@vaadin/hilla-generator-plugin-push": "24.7.0-alpha10",
"@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha10",
"@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha10",
"@vaadin/hilla-generator-utils": "24.7.0-alpha10",
"@vitejs/plugin-react": "4.3.4",
"async": "3.2.6",
"glob": "11.0.1",
Expand All @@ -91,7 +91,7 @@
"workbox-core": "7.3.0",
"workbox-precaching": "7.3.0"
},
"hash": "50e9636e0aa421a12cdc2e3884e30f29bf2eb1a54803343e70bdf0b1475ff758"
"hash": "3b02337ff8e6481ff7a4a9e13e26ddb5477afcf66218c48ad0153f648da8bccf"
},
"overrides": {
"@vaadin/common-frontend": "$@vaadin/common-frontend",
Expand Down
Loading

0 comments on commit 91ff57d

Please sign in to comment.