From cb7962cf134e5132e347364da40a793e2b841464 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 28 Sep 2026 16:24:10 +0000
Subject: [PATCH] Resolve custom plugin mts/ts config deprecation warnings
 (#40670)

---
 ...ugin-assets-manifest.ts => plugin-assets-manifest.mts} | 0
 ...ugin-mastodon-themes.ts => plugin-mastodon-themes.mts} | 0
 ...plugin-sw-chunk-paths.ts => plugin-sw-chunk-paths.mts} | 0
 .../vite/{plugin-sw-locales.ts => plugin-sw-locales.mts}  | 0
 package.json                                              | 2 +-
 tsconfig.json                                             | 1 +
 vite.config.mts                                           | 8 ++++----
 7 files changed, 6 insertions(+), 5 deletions(-)
 rename config/vite/{plugin-assets-manifest.ts => plugin-assets-manifest.mts} (100%)
 rename config/vite/{plugin-mastodon-themes.ts => plugin-mastodon-themes.mts} (100%)
 rename config/vite/{plugin-sw-chunk-paths.ts => plugin-sw-chunk-paths.mts} (100%)
 rename config/vite/{plugin-sw-locales.ts => plugin-sw-locales.mts} (100%)

diff --git a/config/vite/plugin-assets-manifest.ts b/config/vite/plugin-assets-manifest.mts
similarity index 100%
rename from config/vite/plugin-assets-manifest.ts
rename to config/vite/plugin-assets-manifest.mts
diff --git a/config/vite/plugin-mastodon-themes.ts b/config/vite/plugin-mastodon-themes.mts
similarity index 100%
rename from config/vite/plugin-mastodon-themes.ts
rename to config/vite/plugin-mastodon-themes.mts
diff --git a/config/vite/plugin-sw-chunk-paths.ts b/config/vite/plugin-sw-chunk-paths.mts
similarity index 100%
rename from config/vite/plugin-sw-chunk-paths.ts
rename to config/vite/plugin-sw-chunk-paths.mts
diff --git a/config/vite/plugin-sw-locales.ts b/config/vite/plugin-sw-locales.mts
similarity index 100%
rename from config/vite/plugin-sw-locales.ts
rename to config/vite/plugin-sw-locales.mts
diff --git a/package.json b/package.json
index 9a3f99cd7a8..87d53a629b3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "fix": "yarn fix:js && yarn fix:css",
     "format": "oxfmt",
     "format:check": "oxfmt --check",
-    "i18n:extract": "formatjs extract 'app/javascript/**/*.{js,jsx,ts,tsx}' config/vite/plugin-sw-locales.ts --ignore '**/*.d.ts' --out-file app/javascript/mastodon/locales/en.json --format config/formatjs-formatter.js",
+    "i18n:extract": "formatjs extract 'app/javascript/**/*.{js,jsx,ts,tsx}' config/vite/plugin-sw-locales.mts --ignore '**/*.d.ts' --out-file app/javascript/mastodon/locales/en.json --format config/formatjs-formatter.js",
     "lint:js": "cd $INIT_CWD && eslint --cache --report-unused-disable-directives",
     "lint:css": "stylelint \"**/*.{css,scss}\"",
     "lint": "yarn lint:js && yarn lint:css",
diff --git a/tsconfig.json b/tsconfig.json
index df65eee0e1a..704d71c80fd 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "jsx": "react-jsx",
     "allowJs": true,
+    "allowImportingTsExtensions": true,
     "resolveJsonModule": true,
     "noEmit": true,
     "strict": true,
diff --git a/vite.config.mts b/vite.config.mts
index 11a4b1f5e66..218042a3092 100644
--- a/vite.config.mts
+++ b/vite.config.mts
@@ -19,10 +19,10 @@ import {
 import manifestSRI from 'vite-plugin-manifest-sri';
 import svgr from 'vite-plugin-svgr';
 
-import { MastodonAssetsManifest } from './config/vite/plugin-assets-manifest';
-import { MastodonThemes } from './config/vite/plugin-mastodon-themes';
-import { MastodonServiceWorkerChunkPaths } from './config/vite/plugin-sw-chunk-paths';
-import { MastodonServiceWorkerLocales } from './config/vite/plugin-sw-locales';
+import { MastodonAssetsManifest } from './config/vite/plugin-assets-manifest.mts';
+import { MastodonThemes } from './config/vite/plugin-mastodon-themes.mts';
+import { MastodonServiceWorkerChunkPaths } from './config/vite/plugin-sw-chunk-paths.mts';
+import { MastodonServiceWorkerLocales } from './config/vite/plugin-sw-locales.mts';
 
 const jsRoot = path.resolve(import.meta.dirname, 'app/javascript');