From 6ffa26254607706c222e579dc2527db96db994d5 Mon Sep 17 00:00:00 2001 From: Echo Date: Wed, 28 May 2025 12:04:52 +0200 Subject: [PATCH] Update ESLint to not try to resolve virtual modules (#34837) --- app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts | 1 - .../mastodon/features/emoji/emoji_unicode_mapping_light.ts | 1 - .../mastodon/service_worker/web_push_notifications.js | 1 - eslint.config.mjs | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts b/app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts index ecdda58513..1315518179 100644 --- a/app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts +++ b/app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts @@ -3,7 +3,6 @@ // emojiIndex.search functionality. import type { BaseEmoji } from 'emoji-mart'; import type { Emoji } from 'emoji-mart/dist-es/utils/data'; -// eslint-disable-next-line import/no-unresolved import emojiCompressed from 'virtual:mastodon-emoji-compressed'; import type { Search, diff --git a/app/javascript/mastodon/features/emoji/emoji_unicode_mapping_light.ts b/app/javascript/mastodon/features/emoji/emoji_unicode_mapping_light.ts index 283508db58..a53496be2a 100644 --- a/app/javascript/mastodon/features/emoji/emoji_unicode_mapping_light.ts +++ b/app/javascript/mastodon/features/emoji/emoji_unicode_mapping_light.ts @@ -2,7 +2,6 @@ // (i.e. the svg filename) and a shortCode intended to be shown // as a "title" attribute in an HTML element (aka tooltip). -// eslint-disable-next-line import/no-unresolved import emojiCompressed from 'virtual:mastodon-emoji-compressed'; import type { FilenameData, diff --git a/app/javascript/mastodon/service_worker/web_push_notifications.js b/app/javascript/mastodon/service_worker/web_push_notifications.js index 5a43449b0d..88db63280e 100644 --- a/app/javascript/mastodon/service_worker/web_push_notifications.js +++ b/app/javascript/mastodon/service_worker/web_push_notifications.js @@ -3,7 +3,6 @@ import { IntlMessageFormat } from 'intl-messageformat'; import { unescape } from 'lodash'; // see config/vite/plugins/sw-locales // it needs to be updated when new locale keys are used in this file -// eslint-disable-next-line import/no-unresolved import locales from "virtual:mastodon-sw-locales"; const MAX_NOTIFICATIONS = 5; diff --git a/eslint.config.mjs b/eslint.config.mjs index f0a4e8f145..cef7c91a31 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -258,7 +258,7 @@ export default tseslint.config([ 'import/no-unresolved': [ 'error', { - ignore: ['vite/modulepreload-polyfill'], + ignore: ['vite/modulepreload-polyfill', '^virtual:.+'], }, ],