Merge pull request #722 from wikimedia/nvm-ci

Use correct npm version in CI
wikimedia · May 24, 2023 · 6059f35 · 6059f35
2 parents 3987b63 + c9ae40a
commit 6059f35
Show file tree

Hide file tree

Showing 63 changed files with 12,354 additions and 23,532 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,4 +1,5 @@
 /vendor/
 /node_modules/
 /public/assets/
-
+/i18n/
+/public/i18n/
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,14 +1,15 @@
+/* eslint-disable no-undef */
 module.exports = {
-    "extends": "wikimedia",
-    "globals": {
-        "App": false,
-        "appConfig": false,
-        "OO": false,
-        "L": false,
-        "$": false,
-        "QUnit": false,
-        "window": false,
-        "global": false,
-        "require": false
-    },
+	extends: 'wikimedia',
+	globals: {
+		App: false,
+		appConfig: false,
+		OO: false,
+		L: false,
+		$: false,
+		QUnit: false,
+		window: false,
+		global: false,
+		require: false
+	}
 };
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,6 +31,11 @@ jobs:
       with:
         php-version: ${{matrix.php}}
 
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        node-version-file: '.nvmrc'
+
     - name: Install
       run: |
         sudo apt-get update -q

diff --git a/.minus-x.json b/.minus-x.json
@@ -1,5 +1,5 @@
 {
-    "ignore": [
-        "./bin/.phpunit/phpunit-8.5-0/phpunit"
-    ]
+	"ignore": [
+		"./bin/.phpunit/phpunit-8.5-0/phpunit"
+	]
 }
diff --git a/assets/InterfaceLangButton.js b/assets/InterfaceLangButton.js
@@ -1,5 +1,6 @@
 /**
  * The language settings dialog window.
+ *
  * @param {Object} [config] Configuration options
  * @constructor
  */
@@ -17,6 +18,7 @@ OO.inheritClass( App.InterfaceLangButton, OO.ui.ButtonWidget );
 
 /**
  * Handles mouse click events.
+ *
  * @protected
  * @param {jQuery.Event} e Mouse click event
  * @fires click
@@ -33,6 +35,7 @@ App.InterfaceLangButton.prototype.onClick = function ( e ) {
 
 /**
  * Called when the user selects a language in the ULS.
+ *
  * @param {string} language The code of the selected language.
  */
 App.InterfaceLangButton.prototype.onUlsSelect = function ( language ) {

diff --git a/assets/LanguageDialog.js b/assets/LanguageDialog.js
@@ -1,5 +1,6 @@
 /**
  * The language settings dialog window.
+ *
  * @param {Object} [config] Configuration options
  * @constructor
  */
@@ -17,6 +18,7 @@ App.LanguageDialog.static.size = 'medium';
 
 /**
  * Set the height to a reasonable maximum.
+ *
  * @return {number} Body height.
  */
 App.LanguageDialog.prototype.getBodyHeight = function () {
@@ -26,6 +28,7 @@ App.LanguageDialog.prototype.getBodyHeight = function () {
 
 /**
  * Called each time the window is opened.
+ *
  * @param {Object} [data] Dialog opening data
  * @param {jQuery|string|Function|null} [data.title] Dialog title.
  * @param {Object[]} [data.actions] List of configuration options for each action.
@@ -98,15 +101,17 @@ App.LanguageDialog.prototype.initialize = function () {
 /**
  * Get the required top offset (in pixels) for a ULS menu.
  * Should be bound to the button element in question.
- * @HACK: ULS doesn't know its position relative to the button because of OOUI.
- * @return {int}
+ * HACK: ULS doesn't know its position relative to the button because of OOUI.
+ *
+ * @return {number}
  */
 App.LanguageDialog.prototype.calculateUlsTop = function () {
 	return $( this ).offset().top - ( $( this ).outerHeight() / 2 );
 };
 
 /**
  * Handle actions.
+ *
  * @param {string} [action] Symbolic name of action
  * @return {OO.ui.Process} Action process
  */

diff --git a/assets/SearchWidget.js b/assets/SearchWidget.js
@@ -1,3 +1,4 @@
+/* eslint-disable jsdoc/check-tag-names */
 /**
  * SVG file search widget.
  *
@@ -17,6 +18,7 @@ OO.mixinClass( App.SearchWidget, OO.ui.mixin.LookupElement );
 /**
  * Get a new request object of the current lookup query value.
  * Note that the default result count limit of the API is 10.
+ *
  * @link https://www.mediawiki.org/wiki/API:Search
  *
  * @protected
@@ -27,7 +29,7 @@ App.SearchWidget.prototype.getLookupRequest = function () {
 	var val = this.getValue();
 	if ( val.indexOf( 'File:' ) !== -1 ) {
 		// Strip any 'File:' prefix, including if a URL has been supplied.
-		val = val.substring( val.indexOf( 'File:' ) + 'File:'.length );
+		val = val.slice( Math.max( 0, val.indexOf( 'File:' ) + 'File:'.length ) );
 	}
 	return $.ajax( {
 		url: appConfig.wikiUrl,
@@ -74,7 +76,7 @@ App.SearchWidget.prototype.getLookupMenuOptionsFromData = function ( data ) {
 		i, svgFilename;
 	for ( i = 0; i < data.length; i++ ) {
 		// Strip 'File:' prefix.
-		svgFilename = String( data[ i ].title ).substring( 'File:'.length );
+		svgFilename = String( data[ i ].title ).slice( 'File:'.length );
 		items.push( new OO.ui.MenuOptionWidget( {
 			data: svgFilename,
 			label: svgFilename

diff --git a/assets/UlsTagMultiselectWidget.js b/assets/UlsTagMultiselectWidget.js
@@ -1,5 +1,6 @@
 /**
  * The preferred languages input widget.
+ *
  * @param {Object} [config] Configuration options
  * @constructor
  */
@@ -33,6 +34,7 @@ OO.inheritClass( App.UlsTagMultiselectWidget, OO.ui.TagMultiselectWidget );
 
 /**
  * Select handler for the ULS popup.
+ *
  * @param {string} language The code of the selected language.
  */
 App.UlsTagMultiselectWidget.prototype.onUlsSelect = function ( language ) {

diff --git a/assets/app.js b/assets/app.js
@@ -32,6 +32,7 @@ $( function () {
 
 /**
  * Helper function for getting values out of the 'svgtranslate' cookie.
+ *
  * @param {string} key The key to get, either 'interfaceLang' or 'preferredLangs'.
  * @param {*} defaultVal The default value to use if none is set in the cookie.
  * @return {*}

diff --git a/assets/js/Model.js b/assets/js/Model.js
@@ -110,6 +110,7 @@ App.Model.prototype.getSourceTranslation = function ( nodeId ) {
 
 /**
  * Set a single target translation string for the current target language.
+ *
  * @param {string} filename
  * @param {string} nodeId
  * @param {string} translation
@@ -137,18 +138,18 @@ App.Model.prototype.setTargetTranslation = function ( filename, nodeId, translat
 	// Save the new translation.
 	this.translations[ nodeId ][ this.targetLang ].text = translation;
 	// Also save to local storage if it differs from the original translation.
-	Object.keys( this.translations ).forEach( function ( nodeId ) {
+	Object.keys( this.translations ).forEach( function ( nId ) {
 		var origTrans, currentTrans;
-		currentTrans = model.translations[ nodeId ][ model.targetLang ] !== undefined ?
-			model.translations[ nodeId ][ model.targetLang ].text :
+		currentTrans = model.translations[ nId ][ model.targetLang ] !== undefined ?
+			model.translations[ nId ][ model.targetLang ].text :
 			'';
-		origTrans = model.originalTranslations[ nodeId ][ model.targetLang ] !== undefined ?
-			model.originalTranslations[ nodeId ][ model.targetLang ].text :
+		origTrans = model.originalTranslations[ nId ][ model.targetLang ] !== undefined ?
+			model.originalTranslations[ nId ][ model.targetLang ].text :
 			'';
 		if ( currentTrans !== origTrans ) {
-			changedTranslations[ nodeId ] = model.translations[ nodeId ][ model.targetLang ].text;
+			changedTranslations[ nId ] = model.translations[ nId ][ model.targetLang ].text;
 		} else {
-			delete changedTranslations[ nodeId ];
+			delete changedTranslations[ nId ];
 		}
 	} );
 	if ( changedTranslations ) {
@@ -166,6 +167,7 @@ App.Model.prototype.getTargetTranslation = function ( nodeId ) {
 
 /**
  * Load model values from LocalStorage.
+ *
  * @param {string} filename
  * @return {boolean} Whether translation changes were loaded.
  */
@@ -196,6 +198,7 @@ App.Model.prototype.loadFromLocalStorage = function ( filename ) {
 
 /**
  * Get a value from our LocalStorage item.
+ *
  * @protected
  * @param {string} key
  * @return {*}
@@ -214,6 +217,7 @@ App.Model.prototype.getLocalStorageValue = function ( key ) {
 
 /**
  * Set a value in our LocalStorage item.
+ *
  * @protected
  * @param {string} key
  * @param {*} val