From 6ac26c81f4abbeb55aab2a8c9f2a511e041739bb Mon Sep 17 00:00:00 2001
From: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
Date: Tue, 22 Apr 2025 11:55:32 +0200
Subject: [PATCH] fixes for testing

---
 .gitignore                                | 4 +---
 app/javascript/entrypoints/admin.tsx      | 2 +-
 app/javascript/entrypoints/application.ts | 2 --
 app/javascript/entrypoints/mailer.ts      | 1 -
 app/javascript/mastodon/main.tsx          | 2 +-
 config/vite.json                          | 4 ++--
 vite.config.mts                           | 7 +++++--
 7 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 app/javascript/entrypoints/mailer.ts

diff --git a/.gitignore b/.gitignore
index bbbb33dff6..b4fb2c946b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@
 /public/system
 /public/assets
 /public/packs
+/public/packs-dev
 /public/packs-test
 .env
 .env.production
@@ -74,6 +75,3 @@ docker-compose.override.yml
 
 # Ignore local-only rspec configuration
 .rspec-local
-
-# Vite Ruby output
-/public/vite*
diff --git a/app/javascript/entrypoints/admin.tsx b/app/javascript/entrypoints/admin.tsx
index 8f5c2d9f5e..a60778f0c0 100644
--- a/app/javascript/entrypoints/admin.tsx
+++ b/app/javascript/entrypoints/admin.tsx
@@ -272,7 +272,7 @@ async function mountReactComponent(element: Element) {
   );
 
   const { default: Component } = (await import(
-    `@/mastodon/components/admin/${componentName}`
+    `@/mastodon/components/admin/${componentName}.jsx`
   )) as { default: React.ComponentType };
 
   const root = createRoot(element);
diff --git a/app/javascript/entrypoints/application.ts b/app/javascript/entrypoints/application.ts
index b8cf0d3cf9..a2b9fce06c 100644
--- a/app/javascript/entrypoints/application.ts
+++ b/app/javascript/entrypoints/application.ts
@@ -3,8 +3,6 @@ import { loadLocale } from 'mastodon/locales';
 import main from 'mastodon/main';
 import { loadPolyfills } from 'mastodon/polyfills';
 
-import '@/styles/application.scss';
-
 start();
 
 loadPolyfills()
diff --git a/app/javascript/entrypoints/mailer.ts b/app/javascript/entrypoints/mailer.ts
deleted file mode 100644
index 22b3ef6ecd..0000000000
--- a/app/javascript/entrypoints/mailer.ts
+++ /dev/null
@@ -1 +0,0 @@
-import '../styles/mailer.scss';
diff --git a/app/javascript/mastodon/main.tsx b/app/javascript/mastodon/main.tsx
index 8222faca53..a9696ac50e 100644
--- a/app/javascript/mastodon/main.tsx
+++ b/app/javascript/mastodon/main.tsx
@@ -28,7 +28,7 @@ function main() {
     if (isProduction() && me && 'serviceWorker' in navigator) {
       const { Workbox } = await import('workbox-window');
       const wb = new Workbox(
-        isDevelopment() ? '/vite-dev/dev-sw.js?dev-sw' : '/sw.js',
+        isDevelopment() ? '/packs-dev/dev-sw.js?dev-sw' : '/sw.js',
         { type: 'module', scope: '/' },
       );
       let registration;
diff --git a/config/vite.json b/config/vite.json
index fbd96ae8fc..75b0b6849e 100644
--- a/config/vite.json
+++ b/config/vite.json
@@ -9,12 +9,12 @@
   },
   "development": {
     "autoBuild": true,
-    "publicOutputDir": "vite-dev",
+    "publicOutputDir": "packs-dev",
     "port": 3036
   },
   "test": {
     "autoBuild": true,
-    "publicOutputDir": "vite-test",
+    "publicOutputDir": "packs-test",
     "port": 3037
   }
 }
diff --git a/vite.config.mts b/vite.config.mts
index 4060128305..7e8a9d00ed 100644
--- a/vite.config.mts
+++ b/vite.config.mts
@@ -24,7 +24,7 @@ import { MastodonServiceWorkerLocales } from './config/vite/plugin-sw-locales';
 const jsRoot = path.resolve(__dirname, 'app/javascript');
 const entrypointRoot = path.resolve(jsRoot, 'entrypoints');
 
-const config: UserConfigFnPromise = async ({ mode }) => {
+const config: UserConfigFnPromise = async ({ mode, command }) => {
   const entrypointFiles = await fs.readdir(entrypointRoot);
   const entrypoints: Record<string, string> = entrypointFiles.reduce(
     (acc, file) => {
@@ -69,6 +69,7 @@ const config: UserConfigFnPromise = async ({ mode }) => {
       outDir: path.resolve(__dirname, '.dist'),
       emptyOutDir: true,
       manifest: 'manifest.json',
+      sourcemap: true,
       rollupOptions: {
         input: entrypoints,
         output: {
@@ -110,7 +111,9 @@ const config: UserConfigFnPromise = async ({ mode }) => {
       },
     },
     plugins: [
-      RailsPlugin(),
+      RailsPlugin({
+        compress: mode !== 'production' && command === 'build',
+      }),
       react(),
       MastodonServiceWorkerLocales(),
       VitePWA({