Skip to content

fix: keep package.json ordered - #11179

Merged
mshabarov merged 6 commits into
masterfrom
7431-package-json
Jun 10, 2021
Merged

mshabarov merged 6 commits into
masterfrom
7431-package-json

Conversation

@denis-anisimov

@denis-anisimov denis-anisimov commented Jun 8, 2021 •

Copy link
Copy Markdown
Contributor

fixes #7431

Description

Please list all relevant dependencies in this section and provide summary of the change, motivation and context.

Fixes # (issue)

Type of change

  • Bugfix
  • Feature

Checklist

  • I have read the contribution guide: https://vaadin.com/docs/latest/guide/contributing/overview/
  • I have added a description following the guideline.
  • The issue is created in the corresponding repository and I have referenced it.
  • I have added tests to ensure my change is effective and works as intended.
  • New and existing tests are passing locally with my change.
  • I have performed self-review and corrected misspellings.

Additional for Feature type of change

  • Enhancement / new feature was discussed in a corresponding GitHub issue and Acceptance Criteria were created.

@vaadin-bot

Copy link
Copy Markdown
Collaborator

SonarQube analysis reported 7 issues

  1. CRITICAL TaskUpdatePackages.java#L170: Refactor this code to not nest more than 3 if/for/while/switch/try statements. rule
  2. MAJOR Anchor.java#L89: Remove this call from a constructor to the overridable "setHref" method. rule
  3. MAJOR Anchor.java#L90: Remove this call from a constructor to the overridable "setText" method. rule
  4. MAJOR Anchor.java#L91: Remove this call from a constructor to the overridable "setTarget" method. rule
  5. MAJOR TaskUpdatePackages.java#L86: Constructor has 8 parameters, which is greater than 7 authorized. rule
  6. MAJOR TaskUpdatePackages.java#L145: Refactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed. rule
  7. MAJOR TaskUpdatePackages.java#L197: Take the required action to fix the issue indicated by this comment. rule

@mshabarov
mshabarov self-requested a review June 9, 2021 08:07
denis-anisimov pushed a commit that referenced this pull request Jun 9, 2021

@mshabarov mshabarov left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Let's try not to forget to mention this in the release notes, as it is a behaviour change on how the dependencies now sorted.

@mshabarov
mshabarov merged commit 439995d into master Jun 10, 2021
@mshabarov
mshabarov deleted the 7431-package-json branch June 10, 2021 06:23
vaadin-bot pushed a commit that referenced this pull request Jun 10, 2021
@vaadin-bot

Copy link
Copy Markdown
Collaborator

Hi @denis-anisimov and @{commit.merged_by.login}, when i performed cherry-pick to this commit to 6.0, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick 439995d
error: could not apply 439995d... fix: keep package.json ordered (#11179)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
hint: and commit the result with 'git commit'

@vaadin-bot

Copy link
Copy Markdown
Collaborator

Hi @denis-anisimov and @{commit.merged_by.login}, when i performed cherry-pick to this commit to 2.7, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick 439995d
error: could not apply 439995d... fix: keep package.json ordered (#11179)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
hint: and commit the result with 'git commit'

@vaadin-bot

Copy link
Copy Markdown
Collaborator

Hi @denis-anisimov and @{commit.merged_by.login}, when i performed cherry-pick to this commit to 2.6, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick 439995d
error: could not apply 439995d... fix: keep package.json ordered (#11179)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
hint: and commit the result with 'git commit'

denis-anisimov pushed a commit that referenced this pull request Jun 10, 2021
denis-anisimov pushed a commit that referenced this pull request Jun 10, 2021
denis-anisimov pushed a commit that referenced this pull request Jun 10, 2021
mshabarov pushed a commit that referenced this pull request Jun 11, 2021
mshabarov pushed a commit that referenced this pull request Jun 11, 2021
@vaadin-bot

Copy link
Copy Markdown
Collaborator

This ticket/PR has been released with platform 21.0.0.alpha5. For prerelease versions, it will be included in its final version.

denis-anisimov pushed a commit that referenced this pull request Jun 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

package.json is generated in a seemingly random fashion

4 participants