diff options
| author | Nick Schonning <nschonni@gmail.com> | 2023-04-03 06:41:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-03 12:41:10 +0200 |
| commit | 373e4a8ff034f189597cfbf651450b906eb598b1 (patch) | |
| tree | 3be5469d1aae6616fb2aa562fcc465b6dae20d38 /app | |
| parent | be230be734e5b8e33e6336771878c5840bc9216f (diff) | |
Move ESLint configs to overrides (#24370)
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/performance.js | 2 | ||||
| -rw-r--r-- | app/javascript/mastodon/utils/notifications.js | 2 | ||||
| -rw-r--r-- | app/javascript/packs/public-path.js | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/mastodon/performance.js b/app/javascript/mastodon/performance.js index 2b7e1bda8..95cf962d6 100644 --- a/app/javascript/mastodon/performance.js +++ b/app/javascript/mastodon/performance.js @@ -12,7 +12,7 @@ if (process.env.NODE_ENV === 'development') { // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1331135 performance.setResourceTimingBufferSize(Infinity); } - // eslint-disable-next-line import/no-extraneous-dependencies + marky = require('marky'); // allows us to easily do e.g. ReactPerf.printWasted() while debugging //window.ReactPerf = require('react-addons-perf'); diff --git a/app/javascript/mastodon/utils/notifications.js b/app/javascript/mastodon/utils/notifications.js index 7634cac21..42623ac7c 100644 --- a/app/javascript/mastodon/utils/notifications.js +++ b/app/javascript/mastodon/utils/notifications.js @@ -3,7 +3,7 @@ const checkNotificationPromise = () => { try { - // eslint-disable-next-line promise/catch-or-return + // eslint-disable-next-line promise/valid-params, promise/catch-or-return Notification.requestPermission().then(); } catch(e) { return false; diff --git a/app/javascript/packs/public-path.js b/app/javascript/packs/public-path.js index 539e3b8c4..f4d166a77 100644 --- a/app/javascript/packs/public-path.js +++ b/app/javascript/packs/public-path.js @@ -17,4 +17,5 @@ function formatPublicPath(host = '', path = '') { const cdnHost = document.querySelector('meta[name=cdn-host]'); +// eslint-disable-next-line no-undef __webpack_public_path__ = formatPublicPath(cdnHost ? cdnHost.content : '', process.env.PUBLIC_OUTPUT_PATH); |