1772390 - imServices.jsm should not export Services

Status: RESOLVED FIXED

(Chat Core :: General, task)

Description

[Magnus Melin [:mkmelin]]

imServices.jsm builds on to the normal Services instead of only exporting an object with the IM specific services.
This is a bit of a mess, and the mess will grow further during the ESMification effort, like bug 1772313 and related linting...

imServices.jsm should instead export something like IMServices, and the callers that import imServices.jsm but use it for Services.jsm should be split out to call that instead.

Comment 1

[Martin Giger [:freaktechnik]]

There is some prior art calling the exported object imServices:
https://searchfox.org/comm-central/source/mail/components/im/content/chat-messenger.js#16
https://searchfox.org/comm-central/source/mail/components/about-support/content/chat.js#7

Comment 2

[Magnus Melin [:mkmelin]]

Yeah, but modules are supposed to be Capitalized, so that it's clear what is a "normal" variable and what is not.
I'll take the opportunity to capitalize the file name as well. (IMServices.jsm)

Comment 3

[Magnus Melin [:mkmelin]]

Attachment: Bug 1772390 - imServices.jsm should not export Services. r=freaktechnik

• Make imServices.jsm export IMServices
• hg mv ./chat/modules/imServices.jsm ./chat/modules/IMServices.js
• global rewrite
  grep --exclude-dir=.hg --exclude-dir=suite -rl '{ Services } = ChromeUtils.import("resource:///modules/imServices.jsm");' | xargs sed -i -E 's#(var|const) { Services } = ChromeUtils.import("resource:///modules/imServices.jsm");#\1 { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");\1 { IMServices } = ChromeUtils.import("resource:///modules/IMServices.jsm");#g'
• Fix stray cases of imServices.jsm imported as something else
• rewrite callers
  grep --exclude-dir=.hg --exclude-dir=suite -rEl "\b(Services.accounts.|Services.core.|Services.cmd.|Services.contacts|Services.conversations|Services.tags.|Services.logs.)" | xargs sed -i -E 's/\b(Services.accounts.|Services.core.|Services.cmd.|Services.contacts|Services.conversations|Services.tags.|Services.logs.)/IM\1/g'
• linting

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/4bbe7e059e02
imServices.jsm should not export Services. r=freaktechnik

Comment 5

[Martin Giger [:freaktechnik]]

Attachment: Bug 1772390 followup - Use correct accounts service in OTR. r=#thunderbird-reviewers

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/91c8e5227140
followup - Use correct accounts service in OTR. r=#thunderbird-reviewers,mkmelin

Comment 7

[Magnus Melin [:mkmelin]]

Rob, if you're doing bug 1783250 this is likely needed as well.

Comment 8

[Rob Lemley [:rjl]]

Comment on attachment 9279592 [details]
Bug 1772390 - imServices.jsm should not export Services. r=freaktechnik

[Triage Comment]
Per Magnus this is needed to prevent future uplift issues.

Comment 9

[Rob Lemley [:rjl]]

Thunderbird 102.2.0:
https://hg.mozilla.org/releases/comm-esr102/rev/b4ba532de79a
https://hg.mozilla.org/releases/comm-esr102/rev/5a8acad74b88