From 1099de7702ce3fc146f1375ff4f26ebe2dec46aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 15 Nov 2022 11:17:52 -0500 Subject: [PATCH] fix: #11037, update eslint-nodebb-config --- .eslintignore | 9 --------- install/package.json | 2 +- public/src/admin/admin.js | 4 ++-- public/src/app.js | 7 ++++--- public/src/client.js | 4 ++-- public/src/client/account/header.js | 3 ++- public/src/modules/ace-editor.js | 2 ++ 7 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.eslintignore b/.eslintignore index ed7af0301b..b7a6ad79cd 100644 --- a/.eslintignore +++ b/.eslintignore @@ -18,12 +18,3 @@ logs/ .eslintrc test/files *.min.js - -/public/src/app.js -/public/src/client.js -/public/src/admin/admin.js -/public/src/modules/translator.common.js -/public/src/modules/pictureCropper.js -/public/src/modules/ace-editor.js -/public/src/client/account/header.js -/public/src/client/test.js \ No newline at end of file diff --git a/install/package.json b/install/package.json index a5acc72644..3d810ecac5 100644 --- a/install/package.json +++ b/install/package.json @@ -154,7 +154,7 @@ "@commitlint/config-angular": "17.2.0", "coveralls": "3.1.1", "eslint": "8.27.0", - "eslint-config-nodebb": "0.1.1", + "eslint-config-nodebb": "0.2.1", "eslint-plugin-import": "2.26.0", "grunt": "1.5.3", "grunt-contrib-watch": "1.1.0", diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js index 5b4424e22f..d65e291ea7 100644 --- a/public/src/admin/admin.js +++ b/public/src/admin/admin.js @@ -2,9 +2,9 @@ require('../app'); -// scripts-admin.js contains javascript files +// scripts-admin.js is generated during build, it contains javascript files // from plugins that add files to "acpScripts" block in plugin.json -// eslint-disable-next-line import/no-unresolved +// eslint-disable-next-line require('../../scripts-admin'); app.onDomReady(); diff --git a/public/src/app.js b/public/src/app.js index c66003d998..acce0e59ba 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -10,6 +10,7 @@ window.utils = require('./utils'); require('timeago'); const Benchpress = require('benchpressjs'); + Benchpress.setGlobal('config', config); require('./sockets'); @@ -21,7 +22,7 @@ app = window.app || {}; Object.defineProperty(app, 'isFocused', { get() { return document.visibilityState === 'visible'; - } + }, }); app.currentRoom = null; app.widgets = {}; @@ -148,7 +149,7 @@ if (document.readyState === 'loading') { } const result = await Promise.all(modules.map(requireModule)); return single ? result.pop() : result; - } + }; app.enterRoom = function (room, callback) { callback = callback || function () { }; @@ -260,7 +261,7 @@ if (document.readyState === 'loading') { translator.translate('[[global:' + status + ']]', function (translated) { el.removeClass('online offline dnd away') .addClass(status) - .attr('data-new-title', translated) + .attr('data-new-title', translated); }); }); }; diff --git a/public/src/client.js b/public/src/client.js index 67a641e4e4..b16c9e184e 100644 --- a/public/src/client.js +++ b/public/src/client.js @@ -2,9 +2,9 @@ require('./app'); -// scripts-client.js contains javascript files +// scripts-client.js is generated during build, it contains javascript files // from plugins that add files to "scripts" block in plugin.json -// eslint-disable-next-line import/no-unresolved +// eslint-disable-next-line require('../scripts-client'); app.onDomReady(); diff --git a/public/src/client/account/header.js b/public/src/client/account/header.js index e04133de2e..ca8ad4c1c3 100644 --- a/public/src/client/account/header.js +++ b/public/src/client/account/header.js @@ -11,7 +11,8 @@ define('forum/account/header', [ 'api', 'bootbox', 'alerts', -], function (coverPhoto, pictureCropper, components, translator, AccountsDelete, AccountsModerate, api, bootbox, alerts) { +], function (coverPhoto, pictureCropper, components, translator, + AccountsDelete, AccountsModerate, api, bootbox, alerts) { const AccountHeader = {}; let isAdminOrSelfOrGlobalMod; diff --git a/public/src/modules/ace-editor.js b/public/src/modules/ace-editor.js index 6b0d20ba0a..867fd197ed 100644 --- a/public/src/modules/ace-editor.js +++ b/public/src/modules/ace-editor.js @@ -1,3 +1,5 @@ +/* eslint-disable import/first */ + export * from 'ace-builds'; // only import the modes and theme we use