Combine the user.tokens and user.options modules
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	Krinkle
	Oct 15 2019, 1:43 AM

Description

See also Migration guide § user.tokens module. In short: Replace user.tokens with user.options.

The user.options used to contain the default user options as well, but this was split off into a regular module called user.defaults (stateless, cacheable) in 2015 (https://gerrit.wikimedia.org/r/177501).

What's left is a fairly small blob of JSON that is user-specific, private, and embedded into the HTML head. Which is exactly what user.tokens is as well.

Let's merge these.

Actual plan

Merge user.tokens into user.options (Yes, we found a way. Yes, it's hacky but it's worth it as it'll be least disruptive to end-users and developers this way).
Update uses of user.tokens to user.options in core.
Update uses of user.tokens to user.options in WMF extensions.
Update uses of user.tokens to user.options on WMF wikis (after the core change is deployed to all wikis).
Write a short migration guide on https://www.mediawiki.org/wiki/ResourceLoader/Migration_guide_(users).
Remove user.tokens in MW 1.35.

Original plan

Define new module user.private that does what both of these do. Leaving user.options and user.tokens as empty modules (properly empty with isKnownEmpty returning true and no dependencies, not even an alias to the new module). The benefit of it being properly empty is that it will get a preset state=ready declaration and thus never roundtrip. We don't need this to have a back-compat alias because the module is always loaded so we can fulfil it without looking at user.private and anything using it will still observe tokens and options as having been loaded. Per T235457#5817934, they will be empty modules with back-compat alias.

Update any uses in core, tarballed/WMF-extensions.

Ask Krenair or Krinkle to run tourbot to the majority of uses. There should be little to none because it is loaded by default and can't be lazy-loaded even if it weren't due to being private/embed-only.

Remove the addModules() call and the empty modules.

Details

Subject	Repo	Branch	Lines +/-
resourceloader: Remove 'user.tokens' module alias	mediawiki/core	master	+2 -11
Migrate 'user.tokens' dependency to 'user.options'	mediawiki/extensions/Translate	master	+18 -13
Remove unneeded 'user.tokens' dependency from SearchnamespaceTokenModule	mediawiki/extensions/AdvancedSearch	master	+1 -4
Migrate 'user.tokens' dependency to 'user.options'	mediawiki/extensions/MobileFrontend	master	+2 -2
Migrate 'user.tokens' dependency to 'user.options'	mediawiki/extensions/LiquidThreads	master	+0 -1
Migrate 'user.tokens' dependency to 'user.options'	mediawiki/extensions/AbuseFilter	master	+1 -1
resourceloader: Merge 'user.tokens' module into 'user.options'	mediawiki/core	master	+40 -113

Customize query in gerrit

Related Objects
Search...

		Status	Subtype	Assigned	Task
		Resolved		Krinkle	T233676 Audit default module payload (2019)
		Resolved		Krinkle	T235457 Combine the user.tokens and user.options modules

Event Timeline

Krinkle created this task.Oct 15 2019, 1:43 AM

Krinkle removed a project: MW-1.35-notes (1.35.0-wmf.2; 2019-10-15).

Krinkle added a project: MediaWiki-ResourceLoader.Oct 15 2019, 8:44 AM

Schnark subscribed.Oct 15 2019, 9:20 AM

https://www.mediawiki.org/wiki/ResourceLoader/Core_modules#user.options states: "This module is loaded asynchronously and may depend on a separate HTTP request for the user.defaults module. Always declare the relevant dependencies for your module, or use mw.loader.using()." Assuming this is still true and won't be changed, setting the state of user.options to ready immediately might break scripts.

• Gilles moved this task from Inbox, needs triage to To-do: Goals, prioritized next 4 Quarters on the Performance-Team board.Oct 15 2019, 7:56 PM

Krinkle triaged this task as Medium priority.Oct 19 2019, 7:36 PM

Krinkle moved this task from Inbox to Accepted Enhancement on the MediaWiki-ResourceLoader board.

In T235457#5574499, @Schnark wrote:

https://www.mediawiki.org/wiki/ResourceLoader/Core_modules#user.options states: "This module is loaded asynchronously and may depend on a separate HTTP request for the user.defaults module. Always declare the relevant dependencies for your module, or use mw.loader.using()." Assuming this is still true and won't be changed, setting the state of user.options to ready immediately might break scripts.

Thanks, yeah, we'll leave them as empty modules than with a simple dependency on user.private which, like user.options today will start in state loading with the embedded script fulfilling it via the implement() call. Any uses of the old name will result in it first waiting for the embed to complete, and then requesting the empty placeholder together wit the main batch. Still effectively free of cost given it won't need its own roundtrip and won't flush a unique response body. It'll just be an empty implement() call which compresses well along other modules.

Krinkle updated the task description. (Show Details)Mar 13 2020, 10:29 PM

Change 579660 had a related patch set uploaded (by Krinkle; owner: Krinkle):
[mediawiki/core@master] resourceloader: Merge 'user.tokens' module into 'user.options'

https://gerrit.wikimedia.org/r/579660

gerritbot added a project: Patch-For-Review.Mar 13 2020, 10:51 PM

Krinkle moved this task from To-do: Goals, prioritized next 4 Quarters to Blocked (old) on the Performance-Team board.Mar 13 2020, 10:51 PM

Krinkle claimed this task.Mar 17 2020, 7:04 PM

Change 579660 merged by jenkins-bot:
[mediawiki/core@master] resourceloader: Merge 'user.tokens' module into 'user.options'

https://gerrit.wikimedia.org/r/579660

ReleaseTaggerBot added a project: MW-1.35-notes (1.35.0-wmf.25; 2020-03-24).Mar 18 2020, 5:01 AM

Krinkle updated the task description. (Show Details)Mar 22 2020, 1:10 AM

Krinkle updated the task description. (Show Details)Mar 22 2020, 1:14 AM

Krinkle updated the task description. (Show Details)

Krinkle moved this task from Blocked (old) to Doing (old) on the Performance-Team board.Mar 22 2020, 1:39 AM

Change 584001 had a related patch set uploaded (by Krinkle; owner: Krinkle):
[mediawiki/extensions/AbuseFilter@master] Migrate 'user.tokens' dependency to 'user.options'

https://gerrit.wikimedia.org/r/584001

Change 584003 had a related patch set uploaded (by Krinkle; owner: Krinkle):
[mediawiki/extensions/AdvancedSearch@master] Remove unneeded 'user.tokens' dependency from SearchnamespaceTokenModule

https://gerrit.wikimedia.org/r/584003

Change 584004 had a related patch set uploaded (by Krinkle; owner: Krinkle):
[mediawiki/extensions/LiquidThreads@master] Migrate 'user.tokens' dependency to 'user.options'

https://gerrit.wikimedia.org/r/584004

Change 584009 had a related patch set uploaded (by Krinkle; owner: Krinkle):
[mediawiki/extensions/MobileFrontend@master] Migrate 'user.tokens' dependency to 'user.options'

https://gerrit.wikimedia.org/r/584009

Change 584010 had a related patch set uploaded (by Krinkle; owner: Krinkle):
[mediawiki/extensions/Translate@master] Migrate 'user.tokens' dependency to 'user.options'

https://gerrit.wikimedia.org/r/584010

Krinkle moved this task from Doing (old) to Blocked (old) on the Performance-Team board.Mar 27 2020, 4:50 PM

Change 584001 merged by jenkins-bot:
[mediawiki/extensions/AbuseFilter@master] Migrate 'user.tokens' dependency to 'user.options'

https://gerrit.wikimedia.org/r/584001

Change 584009 merged by jenkins-bot:
[mediawiki/extensions/MobileFrontend@master] Migrate 'user.tokens' dependency to 'user.options'

https://gerrit.wikimedia.org/r/584009

Change 584004 merged by jenkins-bot:
[mediawiki/extensions/LiquidThreads@master] Migrate 'user.tokens' dependency to 'user.options'

https://gerrit.wikimedia.org/r/584004

Change 584010 merged by jenkins-bot:
[mediawiki/extensions/Translate@master] Migrate 'user.tokens' dependency to 'user.options'

https://gerrit.wikimedia.org/r/584010

Change 584003 merged by jenkins-bot:
[mediawiki/extensions/AdvancedSearch@master] Remove unneeded 'user.tokens' dependency from SearchnamespaceTokenModule

https://gerrit.wikimedia.org/r/584003

Krinkle mentioned this in rEASRd76aea7d36ee: Remove unneeded 'user.tokens' dependency from SearchnamespaceTokenModule.Mar 27 2020, 5:55 PM

ReleaseTaggerBot edited projects, added MW-1.35-notes (1.35.0-wmf.26; 2020-03-31); removed MW-1.35-notes (1.35.0-wmf.25; 2020-03-24).Mar 27 2020, 7:00 PM

Krinkle updated the task description. (Show Details)Mar 29 2020, 5:40 PM

Krinkle removed a project: Patch-For-Review.

Krinkle updated the task description. (Show Details)Mar 29 2020, 10:20 PM

Krinkle updated the task description. (Show Details)Mar 29 2020, 10:23 PM

Krinkle updated the task description. (Show Details)

Krinkle moved this task from Blocked (old) to Doing (old) on the Performance-Team board.Mar 30 2020, 7:44 PM

Krinkle mentioned this in T236828: Unexpected PST effect when saving edits to .js pages that were formerly <nowiki>.Apr 2 2020, 1:31 AM

Uses on public WMF wikis have all been fixed (search results). The remaining results are either unrelated mentions (such as in HTML code), or outdated search results from titles that have already been fixed.

Change 585853 had a related patch set uploaded (by Krinkle; owner: Krinkle):
[mediawiki/core@master] resourceloader: Remove 'user.tokens' module alias

https://gerrit.wikimedia.org/r/585853

gerritbot added a project: Patch-For-Review.Apr 4 2020, 3:45 AM

Change 585853 merged by jenkins-bot:
[mediawiki/core@master] resourceloader: Remove 'user.tokens' module alias

https://gerrit.wikimedia.org/r/585853

Jdforrester-WMF closed this task as Resolved.Apr 6 2020, 9:51 PM

Jdforrester-WMF removed a project: Patch-For-Review.

Jdforrester-WMF updated the task description. (Show Details)

ReleaseTaggerBot edited projects, added MW-1.35-notes (1.35.0-wmf.27; 2020-04-07); removed MW-1.35-notes (1.35.0-wmf.26; 2020-03-31).Apr 6 2020, 10:01 PM