Merge mw:Image|mw:Audio|mw:Video into a single mw:File
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	Arlolra
	Feb 1 2021, 5:33 PM

Description

The distinction is already made by the nested <img|audio|video> tags, so there doesn't seem to be a loss of information

This should help simplify the css in content.media.less ~~and probably be helpful for T270150~~

Note that there's already an mw:MediaLink type for linking to, instead of rendering, media (ex, [[Media:Foo.jpg]])

A migration plan for clients is needed ... similar to T266143

Details

Subject	Repo	Branch	Lines +/-
Add support for mw:File	mediawiki/extensions/ContentTranslation	master	+4 -0
Support the upcoming mw:File typeof	mediawiki/extensions/VisualEditor	master	+79 -47
Bump parsoid to 0.16.0-a14	mediawiki/vendor	master	+851 -828
Bump output content version to 2.5.0	mediawiki/services/parsoid	master	+14 -14
Consolidate media types to mw:File	mediawiki/services/parsoid	master	+679 -694
Update cxserver to 2022-05-31-045829-production	operations/deployment-charts	master	+1 -1
Update cxserver to 2022-05-31-123738-production	operations/deployment-charts	master	+29 -5
Update tests with mw:File type	mediawiki/services/mobileapps	master	+294 -291
Add support for mw:File as well as mw:Image, et al.	mediawiki/services/mobileapps	master	+36 -20
Update tests with mw:File type	mediawiki/services/cxserver	master	+15 -16
Add support for mw:File as well as mw:Image, et al.	mediawiki/services/cxserver	master	+17 -4
Bump parsoid to 0.16.0-a10	mediawiki/vendor	master	+1 K -633
Update comments for Parsoid type name change	mediawiki/extensions/GrowthExperiments	master	+3 -3
Update tests with mw:File type	mediawiki/extensions/Flow	master	+16 -16
Add support for mw:File as well as mw:Image, et al.	mediawiki/extensions/Flow	master	+29 -8
Emit mw:File typeof for media	mediawiki/core	master	+276 -301
Update typeofs to mw:File	mediawiki/extensions/ImageMap	master	+10 -10
Update typeofs to mw:File	mediawiki/extensions/TimedMediaHandler	master	+8 -8
Add mw:File to media styles	mediawiki/core	master	+27 -2
Support mw:File as well as mw:Image	mediawiki/extensions/MultimediaViewer	master	+16 -2
Add forward compatibility to serialize mw:File	mediawiki/services/parsoid	master	+20 -4
Disable tests to avoid circular dependency	mediawiki/extensions/TimedMediaHandler	master	+4 -4
Disable tests to avoid circular dependency	mediawiki/extensions/ImageMap	master	+5 -5
[WIP] Consolidate media types to mw:Media	mediawiki/services/parsoid	main	+23 -30

Related Objects

Mentioned In: T313172: Block images are left aligned in mobile VE
T311916: "Add an image" structured edits add a blank line instead of an image
T310624: Newly added images in galleries always have |alt= (empty alt)
T310623: Newly added images in galleries are invisible
T302114: Parsoid ignores manualthumb for non-image media
T270150: Selectors in content.media.less need improvement in terms of performance and stability
T53245: Link MediaWiki styles and create Parsoid-specific CSS styling to match MediaWiki's for differing DOM elements
Mentioned Here: T266143: Parsoid clients should handle inline media HTML change from <figure-inline> to <span>
T270150: Selectors in content.media.less need improvement in terms of performance and stability

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes

Change 683428 abandoned by Arlolra:

[mediawiki/services/parsoid@main] [WIP] Consolidate media types to mw:Media

Reason:

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

Maintenance_bot removed a project: Patch-For-Review.Apr 30 2021, 7:10 PM

Change 683993 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/services/parsoid@master] [WIP] Consolidate media types to mw:Media

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

gerritbot added a project: Patch-For-Review.Apr 30 2021, 9:55 PM

Arlolra edited projects, added Parsoid-Media-Structure; removed Parsoid.Jul 13 2021, 5:14 PM

Krinkle mentioned this in T270150: Selectors in content.media.less need improvement in terms of performance and stability.Jul 14 2021, 3:05 AM

MBinder_WMF added a project: Parsoid-Read-Views-Deprecated-Project (Phase 0 - Parsoid-Media-Structure).Sep 3 2021, 9:30 PM

MBinder_WMF edited projects, added Parsoid; removed Parsoid-Read-Views-Deprecated-Project (Phase 0 - Parsoid-Media-Structure).Sep 3 2021, 9:37 PM

MBinder_WMF added a project: Parsoid-Read-Views (Phase 0 - Parsoid-Media-Structure).Sep 3 2021, 9:58 PM

Arlolra moved this task from Backlog to Needs decision on the Parsoid-Read-Views (Phase 0 - Parsoid-Media-Structure) board.Dec 9 2021, 5:46 PM

cscott mentioned this in T302114: Parsoid ignores manualthumb for non-image media.Mar 31 2022, 10:33 PM

Arlolra claimed this task.May 19 2022, 12:06 AM

Arlolra moved this task from Needs decision to In Progress on the Parsoid-Read-Views (Phase 0 - Parsoid-Media-Structure) board.

Arlolra renamed this task from Merge mw:Image|mw:Audio|mw:Video into a single mw:Media to Merge mw:Image|mw:Audio|mw:Video into a single mw:File.May 19 2022, 4:55 PM

Change 793535 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/services/parsoid@master] Add forward compatibility to serialize mw:File

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

Change 793536 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/core@master] Add mw:File to media styles

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

Change 793541 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/extensions/ImageMap@master] Disable tests to avoid circular dependency

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

Change 793543 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/extensions/TimedMediaHandler@master] Disable tests to avoid circular dependency

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

Change 793545 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/core@master] Emit mw:File typeof for media

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

Change 793546 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/extensions/ImageMap@master] Update typeofs to mw:File

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

Change 793552 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/extensions/MultimediaViewer@master] Support mw:File as well as mw:Image

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

I complained to Arlo about this a few weeks ago, +1 from me!

Change 793541 merged by jenkins-bot:

[mediawiki/extensions/ImageMap@master] Disable tests to avoid circular dependency

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

Change 793543 merged by jenkins-bot:

[mediawiki/extensions/TimedMediaHandler@master] Disable tests to avoid circular dependency

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

Arlolra updated the task description. (Show Details)May 19 2022, 10:50 PM

Arlolra updated the task description. (Show Details)

ReleaseTaggerBot added a project: MW-1.39-notes (1.39.0-wmf.13; 2022-05-23).May 19 2022, 11:00 PM

Change 793535 merged by jenkins-bot:

[mediawiki/services/parsoid@master] Add forward compatibility to serialize mw:File

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

Change 793560 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/services/mobileapps@master] [WIP] Add support for mw:File as well as mw:Image, et al.

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

Change 793854 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/extensions/Flow@master] [WIP] Add support for mw:File as well as mw:Image, et al.

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

Arlolra updated the task description. (Show Details)May 20 2022, 6:03 PM

Change 799426 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/services/mobileapps@master] Update tests with mw:File type

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

Change 800238 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/services/parsoid@master] Bump output content version to 2.5.0

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

Change 800243 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/extensions/Flow@master] Update tests with mw:File type

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

Change 793552 merged by jenkins-bot:

[mediawiki/extensions/MultimediaViewer@master] Support mw:File as well as mw:Image

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

Change 800269 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/services/cxserver@master] [WIP] Add support for mw:File as well as mw:Image, et al.

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

Arlolra updated the task description. (Show Details)May 26 2022, 8:58 PM

ReleaseTaggerBot edited projects, added MW-1.39-notes (1.39.0-wmf.14; 2022-05-30); removed MW-1.39-notes (1.39.0-wmf.13; 2022-05-23).May 26 2022, 9:00 PM

Change 800330 had a related patch set uploaded (by Gergő Tisza; author: Gergő Tisza):

[mediawiki/extensions/GrowthExperiments@master] Update comments for Parsoid type name change

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

Change 793536 merged by jenkins-bot:

[mediawiki/core@master] Add mw:File to media styles

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

Change 793547 had a related patch set uploaded (by Jforrester; author: Arlolra):

[mediawiki/extensions/TimedMediaHandler@master] Update typeofs to mw:File

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

Change 793545 merged by jenkins-bot:

[mediawiki/core@master] Emit mw:File typeof for media

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

Change 793546 merged by jenkins-bot:

[mediawiki/extensions/ImageMap@master] Update typeofs to mw:File

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

Change 793547 merged by jenkins-bot:

[mediawiki/extensions/TimedMediaHandler@master] Update typeofs to mw:File

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

Krinkle awarded a token.May 27 2022, 4:43 PM

Arlolra updated the task description. (Show Details)May 27 2022, 9:21 PM

Change 793854 merged by jenkins-bot:

[mediawiki/extensions/Flow@master] Add support for mw:File as well as mw:Image, et al.

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

Change 800243 merged by jenkins-bot:

[mediawiki/extensions/Flow@master] Update tests with mw:File type

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

Change 800808 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/services/cxserver@master] Update tests with mw:File type

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

Change 800330 merged by jenkins-bot:

[mediawiki/extensions/GrowthExperiments@master] Update comments for Parsoid type name change

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

Change 801428 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/vendor@master] Bump parsoid to 0.16.0-a10

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

Change 801428 merged by jenkins-bot:

[mediawiki/vendor@master] Bump parsoid to 0.16.0-a10

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

Change 801441 had a related patch set uploaded (by Arlolra; author: Arlolra):

[mediawiki/extensions/VisualEditor@master] [WIP] Support mw:File typeof

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

Arlolra updated the task description. (Show Details)May 31 2022, 12:08 AM

Change 800269 merged by jenkins-bot:

[mediawiki/services/cxserver@master] Add support for mw:File as well as mw:Image, et al.

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

Change 800808 merged by jenkins-bot:

[mediawiki/services/cxserver@master] Update tests with mw:File type

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

Change 801663 had a related patch set uploaded (by KartikMistry; author: KartikMistry):

[operations/deployment-charts@master] Update cxserver to 2022-05-31-111430-production

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

Arlolra updated the task description. (Show Details)May 31 2022, 2:44 PM

Arlolra moved this task from In Progress to Code Review on the Parsoid-Read-Views (Phase 0 - Parsoid-Media-Structure) board.Jun 2 2022, 4:59 PM

Change 793560 merged by jenkins-bot:

[mediawiki/services/mobileapps@master] Add support for mw:File as well as mw:Image, et al.

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

Arlolra updated the task description. (Show Details)Jun 3 2022, 5:38 PM

Change 799426 merged by jenkins-bot:

[mediawiki/services/mobileapps@master] Update tests with mw:File type

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

Change 801663 merged by jenkins-bot:

[operations/deployment-charts@master] Update cxserver to 2022-05-31-123738-production

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

Change 803869 had a related patch set uploaded (by KartikMistry; author: KartikMistry):

[operations/deployment-charts@master] Update cxserver to 2022-05-31-045829-production

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

Change 803869 merged by jenkins-bot:

[operations/deployment-charts@master] Update cxserver to 2022-05-31-045829-production

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

This is deployed for cxserver now.

matmarex mentioned this in T310623: Newly added images in galleries are invisible.Jun 14 2022, 2:32 PM

matmarex mentioned this in T310624: Newly added images in galleries always have |alt= (empty alt).

Change 801441 merged by jenkins-bot:

[mediawiki/extensions/VisualEditor@master] Support the upcoming mw:File typeof

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

ReleaseTaggerBot edited projects, added MW-1.39-notes (1.39.0-wmf.17; 2022-06-20); removed MW-1.39-notes (1.39.0-wmf.14; 2022-05-30).Jun 14 2022, 4:00 PM

Arlolra updated the task description. (Show Details)Jun 14 2022, 4:44 PM

cscott added a project: User-notice.Jun 14 2022, 5:54 PM

@Kelson Just a heads up about these upcoming changes since I see https://github.com/openzim/mwoffliner/search?q=mw%3AImage

Arlolra moved this task from Code Review to To Deploy on the Parsoid-Read-Views (Phase 0 - Parsoid-Media-Structure) board.Jun 14 2022, 6:39 PM

In T273505#8003816, @Arlolra wrote:

@Kelson Just a heads up about these upcoming changes since I see https://github.com/openzim/mwoffliner/search?q=mw%3AImage

Pull opened at to ease the burden https://github.com/openzim/mwoffliner/pull/1636

Re: Tech News - What wording would you suggest as the content? (I can't quite understand the result of this task just from reading the Description, and whether there are any actions-required from Tech News readers).
And when should it be included? (next Monday's edition needs to be finalized within ~24 hours)
Thanks!

What wording would you suggest as the content?

Something like,

Clients making use of Parsoid's HTML output should be aware that in an upcoming version (2.5.0), media will no longer be annotate with a "typeof" that depends on the type being rendered ("mw:Image", "mw:Video", "mw:Audio"), but will instead all get a consistent "mw:File" for all types.  This matches the wikitext syntax for media, `[[File:Test.jpg]]`.  Link to the spec, https://www.mediawiki.org/wiki/Specs/HTML/2.5.0

And when should it be included?

This will hopefully get deployed in the next few weeks. So, an early a heads up as possible will be best.

IIUC, that means that normal editors don't need to worry about this, but it might (?) affect bot-operators, and/or tool authors, and/or API users. Those affected users will need to check that their code doesn't invoke these now-retired options.

Generally, we try to keep the Tech News entries fairly simple English, with links to suitable locations for in-depth details.
I would suggest something like this for a Tech News entry:

Parsoid's HTML output will soon stop annotating media file links with a custom typeof statement, and instead use mw:File for all types. Tool authors should remove any code that expects types for: mw:Image, mw:Audio, or mw:Video. [ 1 ]

and then you could place any more detailed notes/instructions above in this task's Description.
Does that seem reasonable, and is that draft accurate (or improvable!)?

How about,

Parsoid's HTML output will soon stop annotating file links with different typeof attribute values, and instead use mw:File for all types. Tool authors should adjust any code that expects: mw:Image, mw:Audio, or mw:Video. [ 1 ]