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.

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

refactor: Circular imports #32885

Merged
merged 4 commits into from
Jul 27, 2024
Merged

refactor: Circular imports #32885

merged 4 commits into from
Jul 27, 2024

Conversation

tassoevan
Copy link
Contributor

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

@tassoevan tassoevan added this to the 6.11 milestone Jul 23, 2024
Copy link
Contributor

dionisio-bot bot commented Jul 23, 2024

Looks like this PR is not ready to merge, because of the following issues:

  • This PR is targeting the wrong base branch. It should target 6.12.0, but it targets 6.11.0

Please fix the issues and try again

If you have any trouble, please check the PR guidelines

Copy link

changeset-bot bot commented Jul 23, 2024

⚠️ No Changeset found

Latest commit: 26ce896

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link

codecov bot commented Jul 24, 2024

Codecov Report

Attention: Patch coverage is 35.29412% with 33 lines in your changes missing coverage. Please review.

Project coverage is 55.48%. Comparing base (03c8b06) to head (26ce896).
Report is 5 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32885      +/-   ##
===========================================
- Coverage    55.48%   55.48%   -0.01%     
===========================================
  Files         2636     2636              
  Lines        57365    57499     +134     
  Branches     11881    11917      +36     
===========================================
+ Hits         31831    31905      +74     
- Misses       22837    22905      +68     
+ Partials      2697     2689       -8     
Flag Coverage Δ
e2e 54.06% <ø> (-0.02%) ⬇️
e2e-api 41.16% <34.00%> (+0.15%) ⬆️
unit 72.19% <100.00%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@ggazzo ggazzo modified the milestones: 6.11, 6.12 Jul 24, 2024
@tassoevan tassoevan marked this pull request as ready for review July 24, 2024 14:56
@tassoevan tassoevan requested review from a team as code owners July 24, 2024 14:56
Copy link
Contributor

@pierre-lehnen-rc pierre-lehnen-rc left a comment

Choose a reason for hiding this comment

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

While reviewing I noticed some things (unaffected by this PR, but related to the same stuff that was changed):

  1. We stil have a few meteor methods on the client, but they are using the types defined on the ServerMethods interface.
  2. Some of the apps on /ee/apps are importing files from the main meteor app and those files in turn are importing other packages like @rocket.chat/string-helpers, which are not being copied along on the app's Dockerfile. If something on those apps tried to call one of the functions imported from those packages, it would crash.

@pierre-lehnen-rc pierre-lehnen-rc added the stat: QA assured Means it has been tested and approved by a company insider label Jul 24, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jul 24, 2024
@ggazzo ggazzo merged commit 1abe580 into develop Jul 27, 2024
51 checks passed
@ggazzo ggazzo deleted the refactor/circular-imports branch July 27, 2024 13:30
debdutdeb pushed a commit that referenced this pull request Jul 31, 2024
gabriellsh added a commit that referenced this pull request Jul 31, 2024
…ove/threadMetrics

* 'develop' of github.com:RocketChat/Rocket.Chat: (26 commits)
  chore: Bump rocket.chat to 6.12.0-develop (#32936)
  test: Move Jest configuration to a package of presets (#32802)
  chore: bump turbo (#32938)
  feat: New users page deactivated tab and active tab ui (#32032)
  chore: bump traefik (#32892)
  test: fix flaky test `Archive department` (#32933)
  fix(Livechat): `After Registration Triggers` showing in wrong screen (#32928)
  refactor: Remove deprecated `Options.AvatarSize` constant (#32909)
  chore: improve `on login` cached collection (#32929)
  i18n: Rocket.Chat language update from Lingohub 🤖 on 2024-07-25Z (#32908)
  refactor: Circular imports (#32885)
  regression: notify user properly on logout (#32920)
  chore(client): stop replacing  `Meteor.user` (#32910)
  regression: Messagebox sending message instead of just selecting popup suggestion (#32890)
  refactor: move broadcastMessageFromData to notifyListener (#32843)
  chore: prevent destructuring _id of deleted users (#32899)
  ci: increase kernel limits (#32902)
  ci: lint issues
  Release 6.10.1
  fix: imported fixes (#32894)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants