Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353343 )

Change subject: Fix styles queue violation for "ext.templateData"
......................................................................

Fix styles queue violation for "ext.templateData"

Only contains a stylesheet and has a dependency. Module is only
loaded via addModuleStyles, which means the dependency is ignored.

It triggers the warning because it has a dependency, which means
it's not a pure styles-only module (despite being used as such)

> Unexpected general module "ext.templateData" in styles queue.

Aside from the addModuleStyles() load, it is also specified as
a dependency for "ext.templateDataGenerator.ui".

Dependencies on style modules from JS modules are supported since
T87871 was resolved, however the indirect dependency still doens't
make sense.

Move the dependency on ext.templateData.images, which wasn't needed
or triggered by "ext.templateData" styles anyway, to the UI module
directly.

This also fixes the fact that the "ext.templateData" css is loaded
twice (once as blocking stylesheet without dependency, and then
again as async module via "ext.templateDataGenerator.ui" with dependency).

Bug: T92459
Change-Id: I4c3bb44c135fccb85a26ad901ec9660d647dfe86
(cherry picked from commit d7069bcc7fdb332e50be99e7a64e92057f75977a)
---
M extension.json
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData 
refs/changes/43/353343/1

diff --git a/extension.json b/extension.json
index 5ce0027..f664e76 100644
--- a/extension.json
+++ b/extension.json
@@ -50,10 +50,7 @@
        "ResourceModules": {
                "ext.templateData": {
                        "styles": "resources/ext.templateData.css",
-                       "position": "top",
-                       "dependencies": [
-                               "ext.templateData.images"
-                       ]
+                       "position": "top"
                },
                "ext.templateDataGenerator.editPage": {
                        "scripts": [
@@ -89,6 +86,7 @@
                                "oojs-ui-widgets",
                                "oojs-ui-windows",
                                "ext.templateData",
+                               "ext.templateData.images",
                                "ext.templateDataGenerator.data",
                                "jquery.uls.data",
                                "ext.templateDataGenerator.ui.images"

-- 
To view, visit https://gerrit.wikimedia.org/r/353343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c3bb44c135fccb85a26ad901ec9660d647dfe86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: Krinkle <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to