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

Jump to bottom

fix: Do not override user npm dependency version #17661

Merged
merged 20 commits into from
Sep 25, 2023
Merged

fix: Do not override user npm dependency version #17661

merged 20 commits into from
Sep 25, 2023

Conversation

Artur-
Copy link
Member

@Artur- Artur- commented Sep 20, 2023

Fixes #17654

@github-actions
Copy link

github-actions bot commented Sep 20, 2023 •
edited
Loading

Test Results

1 007 files  +23  1 007 suites  +23   1h 3m 56s ⏱️ - 5m 9s
6 418 tests +48  6 377 ✔️ +46  41 💤 +2  0 ❌ ±0 
6 677 runs  +74  6 629 ✔️ +72  48 💤 +2  0 ❌ ±0 

Results for commit 787527d. ± Comparison against base commit 84b1a04.

♻️ This comment has been updated with latest results.

knoobie
knoobie reviewed Sep 20, 2023
View reviewed changes
flow-server/src/main/java/com/vaadin/flow/server/frontend/TaskUpdatePackages.java
if ((vaadinDepsVersion != null && packageJsonVersion != null)
&& !vaadinDepsVersion.equals(packageJsonVersion)) {
// The user has overridden the version, use that
return false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this interfere with people downgrading? e.g. developer upgrades from 24.1 to 24.2 and notices errors, now he downgrades to 24.1 again - now I would expect that all 24.1 dependencies are used again and not those from 24.2.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As long as the version in the dependencies section and the vaadin/dependencies match, the ´dependenciessection should be updated. So as long as a user never touches thedependencies`, the versions are always supposed to be updated.

What this changes is that when the user HAS changed the dependencies section manually, then the version should never be touched

caalador
caalador previously approved these changes Sep 20, 2023
View reviewed changes
@caalador caalador dismissed their stale review September 20, 2023 07:59

Some package tests seem to be in slow tests

@Artur-
Copy link
Member Author

Artur- commented Sep 20, 2023

I think the problem is that the pnpmfile for pnpm is generated based on versions.json so it does not really work properly anymore. The best solution would be #17667

dependabot bot and others added 17 commits September 22, 2023 12:48
@dependabot @Artur-
chore(deps): bump com.nimbusds:nimbus-jose-jwt from 9.34 to 9.35 (#17652
9a3fb69 
)

Bumps [com.nimbusds:nimbus-jose-jwt](https://bitbucket.org/connect2id/nimbus-jose-jwt) from 9.34 to 9.35.
- [Changelog](https://bitbucket.org/connect2id/nimbus-jose-jwt/src/master/CHANGELOG.txt)
- [Commits](https://bitbucket.org/connect2id/nimbus-jose-jwt/branches/compare/9.35..9.34)

---
updated-dependencies:
- dependency-name: com.nimbusds:nimbus-jose-jwt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mshabarov @Artur-
chore: Update Node.js to latest 20.7.0 (#17646)
028ce90
@caalador @Artur-
fix: router-link postpone navigation (#17647)
4756a18 
Fixes issue with update timing
when postponing a router-link
as the navigation goes through
the vaadin-router.

Fixes #17528
@brunovianarezende @Artur-
Feat/add tests for vaadin components (#17673)
ec69db8 
* Adds a test for Icon in theme-editor

This is the first step to make the tests for all components in theme-editor.

This PR also adds setup/tearDown support to the theme-editor Testbench tests.

* Adds a test for Checkbox in theme-editor and make tests a bit more reliable

* In theme editor tests, check if the modified label appears after a change

a side effect of this change is that the checking of the values in the file
is deferred and then the dev server can write to the file before we try to
read it.
@tepi @Artur-
Caching: Cache all com.vaadin.flow class instances (#17644)
d42d8d5 
* Caching: Cache all com.vaadin.flow class instances

* Caching: Cache all com.vaadin.flow class instances

* Ensure only classes from JARs are cached

* Fix cache test

* Use replace instead of replaceAll

* Cache com.vaadin.* and org.vaadin.* classes
@tltv @Artur-
fix: synchronize cache maps in SpringLookupInitializer (#17668)
5d4b915 
To avoid possibility to get ConcurrentModificationException.
@tltv @Artur-
chore: changed synchronizedMap to ConcurrentHashMap (#17677)
932213b 
For better non-blocking read-performance for lookups with SpringLookup.
@mshabarov @Artur-
test: Ignore failed test for Theme Editor (#17679)
775d891
@mcollovati @Artur-
chore: cache JS imported paths during chunk generation (#17672)
fb61e2d 
* chore: cache JS imported paths during chunk generation

In a production build, for every chunk the JS files are parsed to extract the
imported paths. There are checks to ensure that a module is visited only once,
but this works on a chunk level.
This change caches the JS imports extraction results, so that a single JS file
is visited only once during the build.

Part of #17234

* cleanup

* improve caching of imported paths
@dependabot @Artur-
chore(deps): bump com.vaadin:vaadin-parent from 2.2.0 to 2.2.1 (#17682)
40a0bec 
Bumps [com.vaadin:vaadin-parent](https://github.com/vaadin/maven-integration) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/vaadin/maven-integration/releases)
- [Commits](vaadin/maven-integration@2.2.0...2.2.1)

---
updated-dependencies:
- dependency-name: com.vaadin:vaadin-parent
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mcollovati @Artur-
fix: forward/reroute when query parameters changed (#17659)
5b9387b 
Forward and reroute should run even when targeting the same target
but with different query parameters.

Fixes #17639
@ZheSun88 @Artur-
fix: upgrade spring-boot to 3.1.4 (#17680)
15615d3
@brunovianarezende @Artur-
Fixes the flaky theme editor tests (#17686)
56f064a
@dependabot @Artur-
chore(deps): bump com.typesafe.akka:akka-actor_2.13 from 2.8.4 to 2.8…
d84514e 
….5 (#17683)

Bumps [com.typesafe.akka:akka-actor_2.13](https://github.com/akka/akka) from 2.8.4 to 2.8.5.
- [Release notes](https://github.com/akka/akka/releases)
- [Changelog](https://github.com/akka/akka/blob/main/akka-docs/release-train-issue-template.md)
- [Commits](akka/akka@v2.8.4...v2.8.5)

---
updated-dependencies:
- dependency-name: com.typesafe.akka:akka-actor_2.13
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @mcollovati @Artur-
chore(deps): bump component.version from 24.1.9 to 24.1.10 (#17651)
5201b85 
Bumps `component.version` from 24.1.9 to 24.1.10.

Updates `com.vaadin:vaadin-lumo-theme` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-upload-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-upload-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-notification-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-notification-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-button-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-button-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-text-field-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-text-field-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-tabs-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-tabs-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-app-layout-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-app-layout-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-ordered-layout-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-ordered-layout-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-login-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-login-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-dialog-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-dialog-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-avatar-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-core` from 24.1.9 to 24.1.10

---
updated-dependencies:
- dependency-name: com.vaadin:vaadin-lumo-theme
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-upload-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-upload-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-notification-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-notification-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-button-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-button-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-text-field-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-text-field-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-tabs-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-tabs-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-app-layout-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-app-layout-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-ordered-layout-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-ordered-layout-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-login-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-login-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-dialog-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-dialog-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-avatar-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marco Collovati <marco@vaadin.com>
@Artur-
Merge remote-tracking branch 'origin/main' into use-user-version
d044f17
@Artur-
Remove tests that test user versions end up in the vaadin section
811df0d
@sonarcloud
Copy link

sonarcloud bot commented Sep 22, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@mshabarov mshabarov merged commit cb63006 into main Sep 25, 2023
26 checks passed
@mshabarov mshabarov deleted the use-user-version branch September 25, 2023 11:51
vaadin-bot pushed a commit that referenced this pull request Sep 25, 2023
@Artur- @dependabot
@mshabarov @caalador @brunovianarezende @tepi @tltv @mcollovati @ZheSun88 @vaadin-bot
fix: Do not override user npm dependency version (#17661)
9cf3423 
* fix: Do not override user npm dependency version

Fixes #17654

* chore(deps): bump com.nimbusds:nimbus-jose-jwt from 9.34 to 9.35 (#17652)

Bumps [com.nimbusds:nimbus-jose-jwt](https://bitbucket.org/connect2id/nimbus-jose-jwt) from 9.34 to 9.35.
- [Changelog](https://bitbucket.org/connect2id/nimbus-jose-jwt/src/master/CHANGELOG.txt)
- [Commits](https://bitbucket.org/connect2id/nimbus-jose-jwt/branches/compare/9.35..9.34)

---
updated-dependencies:
- dependency-name: com.nimbusds:nimbus-jose-jwt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: Update Node.js to latest 20.7.0 (#17646)

* fix: router-link postpone navigation (#17647)

Fixes issue with update timing
when postponing a router-link
as the navigation goes through
the vaadin-router.

Fixes #17528

* Feat/add tests for vaadin components (#17673)

* Adds a test for Icon in theme-editor

This is the first step to make the tests for all components in theme-editor.

This PR also adds setup/tearDown support to the theme-editor Testbench tests.

* Adds a test for Checkbox in theme-editor and make tests a bit more reliable

* In theme editor tests, check if the modified label appears after a change

a side effect of this change is that the checking of the values in the file
is deferred and then the dev server can write to the file before we try to
read it.

* Caching: Cache all com.vaadin.flow class instances (#17644)

* Caching: Cache all com.vaadin.flow class instances

* Caching: Cache all com.vaadin.flow class instances

* Ensure only classes from JARs are cached

* Fix cache test

* Use replace instead of replaceAll

* Cache com.vaadin.* and org.vaadin.* classes

* fix: synchronize cache maps in SpringLookupInitializer (#17668)

To avoid possibility to get ConcurrentModificationException.

* chore: changed synchronizedMap to ConcurrentHashMap (#17677)

For better non-blocking read-performance for lookups with SpringLookup.

* test: Ignore failed test for Theme Editor (#17679)

* chore: cache JS imported paths during chunk generation (#17672)

* chore: cache JS imported paths during chunk generation

In a production build, for every chunk the JS files are parsed to extract the
imported paths. There are checks to ensure that a module is visited only once,
but this works on a chunk level.
This change caches the JS imports extraction results, so that a single JS file
is visited only once during the build.

Part of #17234

* cleanup

* improve caching of imported paths

* chore(deps): bump com.vaadin:vaadin-parent from 2.2.0 to 2.2.1 (#17682)

Bumps [com.vaadin:vaadin-parent](https://github.com/vaadin/maven-integration) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/vaadin/maven-integration/releases)
- [Commits](vaadin/maven-integration@2.2.0...2.2.1)

---
updated-dependencies:
- dependency-name: com.vaadin:vaadin-parent
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: forward/reroute when query parameters changed (#17659)

Forward and reroute should run even when targeting the same target
but with different query parameters.

Fixes #17639

* fix: upgrade spring-boot to 3.1.4 (#17680)

* Fixes the flaky theme editor tests (#17686)

* chore(deps): bump com.typesafe.akka:akka-actor_2.13 from 2.8.4 to 2.8.5 (#17683)

Bumps [com.typesafe.akka:akka-actor_2.13](https://github.com/akka/akka) from 2.8.4 to 2.8.5.
- [Release notes](https://github.com/akka/akka/releases)
- [Changelog](https://github.com/akka/akka/blob/main/akka-docs/release-train-issue-template.md)
- [Commits](akka/akka@v2.8.4...v2.8.5)

---
updated-dependencies:
- dependency-name: com.typesafe.akka:akka-actor_2.13
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump component.version from 24.1.9 to 24.1.10 (#17651)

Bumps `component.version` from 24.1.9 to 24.1.10.

Updates `com.vaadin:vaadin-lumo-theme` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-upload-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-upload-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-notification-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-notification-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-button-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-button-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-text-field-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-text-field-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-tabs-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-tabs-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-app-layout-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-app-layout-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-ordered-layout-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-ordered-layout-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-login-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-login-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-dialog-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-dialog-testbench` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-avatar-flow` from 24.1.9 to 24.1.10

Updates `com.vaadin:vaadin-core` from 24.1.9 to 24.1.10

---
updated-dependencies:
- dependency-name: com.vaadin:vaadin-lumo-theme
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-upload-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-upload-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-notification-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-notification-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-button-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-button-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-text-field-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-text-field-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-tabs-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-tabs-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-app-layout-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-app-layout-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-ordered-layout-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-ordered-layout-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-login-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-login-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-dialog-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-dialog-testbench
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-avatar-flow
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.vaadin:vaadin-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marco Collovati <marco@vaadin.com>

* Remove tests that test user versions end up in the vaadin section

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mikhail Shabarov <61410877+mshabarov@users.noreply.github.com>
Co-authored-by: caalador <mikael.grankvist@vaadin.com>
Co-authored-by: Bruno Rezende <brunovianarezende@gmail.com>
Co-authored-by: Teppo Kurki <teppo.kurki@vaadin.com>
Co-authored-by: Tomi Virtanen <tltv@vaadin.com>
Co-authored-by: Marco Collovati <marco@vaadin.com>
Co-authored-by: Zhe Sun <31067185+ZheSun88@users.noreply.github.com>
mcollovati pushed a commit that referenced this pull request Sep 25, 2023
@vaadin-bot
fix: Do not override user npm dependency version (#17661) (#17711)
0cca842 
Fixes #17654
@vaadin-bot
Copy link
Collaborator

This ticket/PR has been released with Vaadin 24.3.0.alpha1 and is also targeting the upcoming stable 24.3.0 version.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@knoobie knoobie knoobie left review comments

@caalador caalador caalador approved these changes

Assignees
No one assigned
Labels
cherry-picked-24.2 prerelease version for Vaadin 24.3.0 Released with Vaadin 24.3.0.alpha1 target/24.2 +0.0.1
Projects
Vaadin Flow ongoing work (Vaadin 10+)
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

@hilla/react-components is automatically downgraded after two restarts
10 participants
@Artur- @vaadin-bot @caalador @knoobie @mshabarov @brunovianarezende @tepi @tltv @mcollovati @ZheSun88