Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream

Too many conflicts to list, because of webpack → vite migration.

app/javascript/flavours/glitch/entrypoints/admin.tsx

@@ -1,4 +1,3 @@
-import '@/entrypoints/public-path';
 import { createRoot } from 'react-dom/client';
 
 import Rails from '@rails/ujs';
@@ -273,7 +272,7 @@ async function mountReactComponent(element: Element) {
   );
 
   const { default: Component } = (await import(
-    `@/flavours/glitch/components/admin/${componentName}`
+    `@/flavours/glitch/components/admin/${componentName}.jsx`
   )) as { default: React.ComponentType };
 
   const root = createRoot(element);

app/javascript/flavours/glitch/entrypoints/application.ts

@@ -1,12 +1,7 @@
-import '@/entrypoints/public-path';
-
-import { start } from 'flavours/glitch/common';
 import { loadLocale } from 'flavours/glitch/locales';
 import main from 'flavours/glitch/main';
 import { loadPolyfills } from 'flavours/glitch/polyfills';
 
-start();
-
 loadPolyfills()
   .then(loadLocale)
   .then(main)

app/javascript/flavours/glitch/entrypoints/common.js

@@ -1,7 +0,0 @@
-/* This file is a hack to have something more reliable than the upstream `common` tag
-  that is implicitly generated as the common chunk through webpack's `splitChunks` config */
-
-import '@/entrypoints/public-path';
-
-// This is a hack to ensures that webpack compiles our images.
-require.context('../images', true);

app/javascript/flavours/glitch/entrypoints/common.ts

@@ -0,0 +1,3 @@
+import { start } from 'flavours/glitch/common';
+
+start();

app/javascript/flavours/glitch/entrypoints/embed.tsx

@@ -1,15 +1,10 @@
 import { createRoot } from 'react-dom/client';
 
-import '@/entrypoints/public-path';
-
-import { start } from 'flavours/glitch/common';
 import { Status } from 'flavours/glitch/features/standalone/status';
 import { afterInitialRender } from 'flavours/glitch/hooks/useRenderSignal';
 import { loadPolyfills } from 'flavours/glitch/polyfills';
 import ready from 'flavours/glitch/ready';
 
-start();
-
 function loaded() {
   const mountNode = document.getElementById('mastodon-status');
 

app/javascript/flavours/glitch/entrypoints/error.ts

@@ -1,4 +1,3 @@
-import '@/entrypoints/public-path';
 import ready from 'flavours/glitch/ready';
 
 ready(() => {

app/javascript/flavours/glitch/entrypoints/inert.ts

@@ -1,4 +0,0 @@
-/* Placeholder file to have `inert.scss` compiled by Webpack
-   This is used by the `wicg-inert` polyfill */
-
-import '@/styles/inert.scss';

app/javascript/flavours/glitch/entrypoints/mailer.ts

@@ -1,3 +0,0 @@
-import '@/styles/mailer.scss';
-
-require.context('@/icons');

app/javascript/flavours/glitch/entrypoints/public.tsx

@@ -1,7 +1,5 @@
 import { createRoot } from 'react-dom/client';
 
-import '@/entrypoints/public-path';
-
 import { IntlMessageFormat } from 'intl-messageformat';
 import type { MessageDescriptor, PrimitiveType } from 'react-intl';
 import { defineMessages } from 'react-intl';
@@ -10,7 +8,6 @@ import Rails from '@rails/ujs';
 import axios from 'axios';
 import { throttle } from 'lodash';
 
-import { start } from 'flavours/glitch/common';
 import { timeAgoString } from 'flavours/glitch/components/relative_timestamp';
 import emojify from 'flavours/glitch/features/emoji/emoji';
 import loadKeyboardExtensions from 'flavours/glitch/load_keyboard_extensions';
@@ -20,8 +17,6 @@ import ready from 'flavours/glitch/ready';
 
 import 'cocoon-js-vanilla';
 
-start();
-
 const messages = defineMessages({
   usernameTaken: {
     id: 'username.taken',
@@ -153,9 +148,7 @@ function loaded() {
   const reactComponents = document.querySelectorAll('[data-component]');
 
   if (reactComponents.length > 0) {
-    import(
-      /* webpackChunkName: "containers/media_container" */ 'flavours/glitch/containers/media_container'
-    )
+    import('flavours/glitch/containers/media_container')
       .then(({ default: MediaContainer }) => {
         reactComponents.forEach((component) => {
           Array.from(component.children).forEach((child) => {

app/javascript/flavours/glitch/entrypoints/remote_interaction_helper.ts

@@ -8,8 +8,6 @@ and performs no other task.
 
 */
 
-import '@/entrypoints/public-path';
-
 import axios from 'axios';
 
 interface JRDLink {

app/javascript/flavours/glitch/entrypoints/share.tsx

@@ -1,13 +1,9 @@
-import '@/entrypoints/public-path';
 import { createRoot } from 'react-dom/client';
 
-import { start } from 'flavours/glitch/common';
 import ComposeContainer from 'flavours/glitch/containers/compose_container';
 import { loadPolyfills } from 'flavours/glitch/polyfills';
 import ready from 'flavours/glitch/ready';
 
-start();
-
 function loaded() {
   const mountNode = document.getElementById('mastodon-compose');
 

app/javascript/flavours/glitch/entrypoints/sign_up.ts

@@ -1,4 +1,3 @@
-import '@/entrypoints/public-path';
 import axios from 'axios';
 
 import ready from 'flavours/glitch/ready';