diff --git a/.eslintrc.json b/.eslintrc.json index 1c970ae..04f9da7 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,21 +1,6 @@ { "root": true, "extends": [ - "wikimedia/client-common", - "wikimedia/language/es6", - "wikimedia/vue3-es6", - "wikimedia/mediawiki" - ], - "globals": { - "require": "readonly", - "module": "readonly" - }, - "rules": { - "one-var": "off", - "//": [ - "off", - "ResourceLoader's `packageFiles` do not require wrapping but the `module` option is only available in ES6+." - ], - "no-implicit-globals": "off" - } + "wikimedia/server" + ] } diff --git a/extension.json b/extension.json index bca66bc..6739b1c 100644 --- a/extension.json +++ b/extension.json @@ -45,11 +45,11 @@ "mobile" ] }, - "ext.tabberNeue.legacy": { + "ext.tabberNeue": { "packageFiles": [ - "ext.tabberNeue.legacy/ext.tabberNeue.legacy.js", + "ext.tabberNeue/ext.tabberNeue.js", { - "name": "ext.tabberNeue.legacy/config.json", + "name": "ext.tabberNeue/config.json", "config": { "enableAnimation": "TabberNeueEnableAnimation", "parseTabName": "TabberNeueParseTabName", @@ -61,8 +61,8 @@ "error" ], "styles": [ - "ext.tabberNeue.legacy/ext.tabberNeue.legacy.less", - "ext.tabberNeue.legacy/ext.tabberNeue.legacy.mobile.less" + "ext.tabberNeue/ext.tabberNeue.less", + "ext.tabberNeue/ext.tabberNeue.mobile.less" ], "dependencies": [ "mediawiki.Uri", diff --git a/includes/Tabber.php b/includes/Tabber.php index 3888ae1..9c154f5 100644 --- a/includes/Tabber.php +++ b/includes/Tabber.php @@ -66,7 +66,7 @@ class Tabber { // See ext.tabberNeue.inline.less $style = sprintf( '', self::$criticalInlineStyle ); $parser->getOutput()->addHeadItem( $style, true ); - $parser->getOutput()->addModules( [ 'ext.tabberNeue.legacy' ] ); + $parser->getOutput()->addModules( [ 'ext.tabberNeue' ] ); } $parser->addTrackingCategory( 'tabberneue-tabber-category' ); @@ -150,7 +150,7 @@ class Tabber { } } - // Legacy mode + // Normal mode if ( self::$parseTabName ) { $tabName = $parser->recursiveTagParseFully( $tabName ); $tabName = $parser->stripOuterParagraph( $tabName ); diff --git a/includes/TabberTransclude.php b/includes/TabberTransclude.php index 931ba2c..1e470a4 100644 --- a/includes/TabberTransclude.php +++ b/includes/TabberTransclude.php @@ -42,7 +42,7 @@ class TabberTransclude { // See ext.tabberNeue.inline.less $style = sprintf( '', Tabber::$criticalInlineStyle ); $parser->getOutput()->addHeadItem( $style, true ); - $parser->getOutput()->addModules( [ 'ext.tabberNeue.legacy' ] ); + $parser->getOutput()->addModules( [ 'ext.tabberNeue' ] ); $parser->addTrackingCategory( 'tabberneue-tabbertransclude-category' ); return $html; @@ -118,7 +118,6 @@ class TabberTransclude { '
%s
', $linkRenderer->makeLink( $title, null, [ 'rel' => 'nofollow' ] ) ); - $dataProps['pending-load'] = '1'; $currentTitle = $parser->getPage(); $query = sprintf( '?action=parse&format=json&formatversion=2&title=%s&text={{:%s}}&redirects=1&prop=text&disablelimitreport=1&disabletoc=1&wrapoutputclass=', @@ -151,7 +150,7 @@ class TabberTransclude { $tab = '
'; $selected = false; diff --git a/modules/.eslintrc.json b/modules/.eslintrc.json new file mode 100644 index 0000000..d059a34 --- /dev/null +++ b/modules/.eslintrc.json @@ -0,0 +1,19 @@ +{ + "extends": [ + "wikimedia/client-es6", + "wikimedia/mediawiki" + ], + "env": { + "browser": true + }, + "globals": { + "exports": true + }, + "parserOptions": { + "sourceType": "module" + }, + "rules": { + "jsdoc/no-undefined-types": "off", + "max-len": "off" + } +} diff --git a/modules/ext.tabberNeue.codex/.eslintrc.json b/modules/ext.tabberNeue.codex/.eslintrc.json new file mode 100644 index 0000000..c0b7b1b --- /dev/null +++ b/modules/ext.tabberNeue.codex/.eslintrc.json @@ -0,0 +1,9 @@ +{ + "plugins": [ + "no-jquery" + ], + "extends": [ + "plugin:no-jquery/all", + "wikimedia/vue3-es6" + ] +} diff --git a/modules/ext.tabberNeue.codex/App.vue b/modules/ext.tabberNeue.codex/App.vue index 9259eb2..c68f552 100644 --- a/modules/ext.tabberNeue.codex/App.vue +++ b/modules/ext.tabberNeue.codex/App.vue @@ -1,18 +1,17 @@