From 5d2fce49fc4ba9684e9e8b607d312913be871fe7 Mon Sep 17 00:00:00 2001 From: ChaosExAnima Date: Mon, 14 Apr 2025 18:27:23 +0200 Subject: [PATCH] remove references to Webpack --- .github/renovate.json5 | 17 --- app/javascript/entrypoints/inert.ts | 2 +- .../features/ui/util/async-components.js | 118 +++++++++--------- .../mastodon/load_keyboard_extensions.js | 2 +- app/javascript/mastodon/performance.js | 1 - app/javascript/mastodon/polyfills/index.ts | 2 +- app/javascript/mastodon/polyfills/intl.ts | 2 - 7 files changed, 62 insertions(+), 82 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index e638b9c5482..0cf15040cd6 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -25,23 +25,6 @@ 'tesseract.js', // Requires code changes 'react-hotkeys', // Requires code changes - // Requires Webpacker upgrade or replacement - '@svgr/webpack', - '@types/webpack', - 'babel-loader', - 'compression-webpack-plugin', - 'css-loader', - 'imports-loader', - 'mini-css-extract-plugin', - 'postcss-loader', - 'sass-loader', - 'terser-webpack-plugin', - 'webpack', - 'webpack-assets-manifest', - 'webpack-bundle-analyzer', - 'webpack-dev-server', - 'webpack-cli', - // react-router: Requires manual upgrade 'history', 'react-router-dom', diff --git a/app/javascript/entrypoints/inert.ts b/app/javascript/entrypoints/inert.ts index 7c04a97fafd..3d32325505d 100644 --- a/app/javascript/entrypoints/inert.ts +++ b/app/javascript/entrypoints/inert.ts @@ -1,4 +1,4 @@ -/* Placeholder file to have `inert.scss` compiled by Webpack +/* Placeholder file to have `inert.scss` compiled by Vite This is used by the `wicg-inert` polyfill */ import '../styles/inert.scss'; diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js index ec493ae283e..d865f7d7a53 100644 --- a/app/javascript/mastodon/features/ui/util/async-components.js +++ b/app/javascript/mastodon/features/ui/util/async-components.js @@ -1,235 +1,235 @@ export function EmojiPicker () { - return import(/* webpackChunkName: "emoji_picker" */'../../emoji/emoji_picker'); + return import('../../emoji/emoji_picker'); } export function Compose () { - return import(/* webpackChunkName: "features/compose" */'../../compose'); + return import('../../compose'); } export function Notifications () { - return import(/* webpackChunkName: "features/notifications" */'../../notifications_v2'); + return import('../../notifications_v2'); } export function HomeTimeline () { - return import(/* webpackChunkName: "features/home_timeline" */'../../home_timeline'); + return import('../../home_timeline'); } export function PublicTimeline () { - return import(/* webpackChunkName: "features/public_timeline" */'../../public_timeline'); + return import('../../public_timeline'); } export function CommunityTimeline () { - return import(/* webpackChunkName: "features/community_timeline" */'../../community_timeline'); + return import('../../community_timeline'); } export function Firehose () { - return import(/* webpackChunkName: "features/firehose" */'../../firehose'); + return import('../../firehose'); } export function HashtagTimeline () { - return import(/* webpackChunkName: "features/hashtag_timeline" */'../../hashtag_timeline'); + return import('../../hashtag_timeline'); } export function DirectTimeline() { - return import(/* webpackChunkName: "features/direct_timeline" */'../../direct_timeline'); + return import('../../direct_timeline'); } export function ListTimeline () { - return import(/* webpackChunkName: "features/list_timeline" */'../../list_timeline'); + return import('../../list_timeline'); } export function Lists () { - return import(/* webpackChunkName: "features/lists" */'../../lists'); + return import('../../lists'); } export function Status () { - return import(/* webpackChunkName: "features/status" */'../../status'); + return import('../../status'); } export function GettingStarted () { - return import(/* webpackChunkName: "features/getting_started" */'../../getting_started'); + return import('../../getting_started'); } export function KeyboardShortcuts () { - return import(/* webpackChunkName: "features/keyboard_shortcuts" */'../../keyboard_shortcuts'); + return import('../../keyboard_shortcuts'); } export function PinnedStatuses () { - return import(/* webpackChunkName: "features/pinned_statuses" */'../../pinned_statuses'); + return import('../../pinned_statuses'); } export function AccountTimeline () { - return import(/* webpackChunkName: "features/account_timeline" */'../../account_timeline'); + return import('../../account_timeline'); } export function AccountGallery () { - return import(/* webpackChunkName: "features/account_gallery" */'../../account_gallery'); + return import('../../account_gallery'); } export function AccountFeatured() { - return import(/* webpackChunkName: "features/account_featured" */'../../account_featured'); + return import('../../account_featured'); } export function Followers () { - return import(/* webpackChunkName: "features/followers" */'../../followers'); + return import('../../followers'); } export function Following () { - return import(/* webpackChunkName: "features/following" */'../../following'); + return import('../../following'); } export function Reblogs () { - return import(/* webpackChunkName: "features/reblogs" */'../../reblogs'); + return import('../../reblogs'); } export function Favourites () { - return import(/* webpackChunkName: "features/favourites" */'../../favourites'); + return import('../../favourites'); } export function FollowRequests () { - return import(/* webpackChunkName: "features/follow_requests" */'../../follow_requests'); + return import('../../follow_requests'); } export function FavouritedStatuses () { - return import(/* webpackChunkName: "features/favourited_statuses" */'../../favourited_statuses'); + return import('../../favourited_statuses'); } export function FollowedTags () { - return import(/* webpackChunkName: "features/followed_tags" */'../../followed_tags'); + return import('../../followed_tags'); } export function BookmarkedStatuses () { - return import(/* webpackChunkName: "features/bookmarked_statuses" */'../../bookmarked_statuses'); + return import('../../bookmarked_statuses'); } export function Blocks () { - return import(/* webpackChunkName: "features/blocks" */'../../blocks'); + return import('../../blocks'); } export function DomainBlocks () { - return import(/* webpackChunkName: "features/domain_blocks" */'../../domain_blocks'); + return import('../../domain_blocks'); } export function Mutes () { - return import(/* webpackChunkName: "features/mutes" */'../../mutes'); + return import('../../mutes'); } export function MuteModal () { - return import(/* webpackChunkName: "modals/mute_modal" */'../components/mute_modal'); + return import('../components/mute_modal'); } export function BlockModal () { - return import(/* webpackChunkName: "modals/block_modal" */'../components/block_modal'); + return import('../components/block_modal'); } export function DomainBlockModal () { - return import(/* webpackChunkName: "modals/domain_block_modal" */'../components/domain_block_modal'); + return import('../components/domain_block_modal'); } export function ReportModal () { - return import(/* webpackChunkName: "modals/report_modal" */'../components/report_modal'); + return import('../components/report_modal'); } export function IgnoreNotificationsModal () { - return import(/* webpackChunkName: "modals/domain_block_modal" */'../components/ignore_notifications_modal'); + return import('../components/ignore_notifications_modal'); } export function MediaGallery () { - return import(/* webpackChunkName: "status/media_gallery" */'../../../components/media_gallery'); + return import('../../../components/media_gallery'); } export function Video () { - return import(/* webpackChunkName: "features/video" */'../../video'); + return import('../../video'); } export function EmbedModal () { - return import(/* webpackChunkName: "modals/embed_modal" */'../components/embed_modal'); + return import('../components/embed_modal'); } export function ListAdder () { - return import(/*webpackChunkName: "features/list_adder" */'../../list_adder'); + return import('../../list_adder'); } export function Tesseract () { - return import(/*webpackChunkName: "tesseract" */'tesseract.js'); + return import('tesseract.js'); } export function Audio () { - return import(/* webpackChunkName: "features/audio" */'../../audio'); + return import('../../audio'); } export function Directory () { - return import(/* webpackChunkName: "features/directory" */'../../directory'); + return import('../../directory'); } export function OnboardingProfile () { - return import(/* webpackChunkName: "features/onboarding" */'../../onboarding/profile'); + return import('../../onboarding/profile'); } export function OnboardingFollows () { - return import(/* webpackChunkName: "features/onboarding" */'../../onboarding/follows'); + return import('../../onboarding/follows'); } export function CompareHistoryModal () { - return import(/*webpackChunkName: "modals/compare_history_modal" */'../components/compare_history_modal'); + return import('../components/compare_history_modal'); } export function Explore () { - return import(/* webpackChunkName: "features/explore" */'../../explore'); + return import('../../explore'); } export function Search () { - return import(/* webpackChunkName: "features/explore" */'../../search'); + return import('../../search'); } export function FilterModal () { - return import(/*webpackChunkName: "modals/filter_modal" */'../components/filter_modal'); + return import('../components/filter_modal'); } export function InteractionModal () { - return import(/*webpackChunkName: "modals/interaction_modal" */'../../interaction_modal'); + return import('../../interaction_modal'); } export function SubscribedLanguagesModal () { - return import(/*webpackChunkName: "modals/subscribed_languages_modal" */'../../subscribed_languages_modal'); + return import('../../subscribed_languages_modal'); } export function ClosedRegistrationsModal () { - return import(/*webpackChunkName: "modals/closed_registrations_modal" */'../../closed_registrations_modal'); + return import('../../closed_registrations_modal'); } export function About () { - return import(/*webpackChunkName: "features/about" */'../../about'); + return import('../../about'); } export function PrivacyPolicy () { - return import(/*webpackChunkName: "features/privacy_policy" */'../../privacy_policy'); + return import('../../privacy_policy'); } export function TermsOfService () { - return import(/*webpackChunkName: "features/terms_of_service" */'../../terms_of_service'); + return import('../../terms_of_service'); } export function NotificationRequests () { - return import(/*webpackChunkName: "features/notifications/requests" */'../../notifications/requests'); + return import('../../notifications/requests'); } export function NotificationRequest () { - return import(/*webpackChunkName: "features/notifications/request" */'../../notifications/request'); + return import('../../notifications/request'); } export function LinkTimeline () { - return import(/*webpackChunkName: "features/link_timeline" */'../../link_timeline'); + return import('../../link_timeline'); } export function AnnualReportModal () { - return import(/*webpackChunkName: "modals/annual_report_modal" */'../components/annual_report_modal'); + return import('../components/annual_report_modal'); } export function ListEdit () { - return import(/*webpackChunkName: "features/lists" */'../../lists/new'); + return import('../../lists/new'); } export function ListMembers () { - return import(/* webpackChunkName: "features/lists" */'../../lists/members'); + return import('../../lists/members'); } diff --git a/app/javascript/mastodon/load_keyboard_extensions.js b/app/javascript/mastodon/load_keyboard_extensions.js index 2dd0e45fa71..ebdf94561c2 100644 --- a/app/javascript/mastodon/load_keyboard_extensions.js +++ b/app/javascript/mastodon/load_keyboard_extensions.js @@ -3,7 +3,7 @@ // can at least log in using KaiOS devices). function importArrowKeyNavigation() { - return import(/* webpackChunkName: "arrow-key-navigation" */ 'arrow-key-navigation'); + return import('arrow-key-navigation'); } export default function loadKeyboardExtensions() { diff --git a/app/javascript/mastodon/performance.js b/app/javascript/mastodon/performance.js index 3bca95e85e6..dd002ab6097 100644 --- a/app/javascript/mastodon/performance.js +++ b/app/javascript/mastodon/performance.js @@ -1,7 +1,6 @@ // // Tools for performance debugging, only enabled in development mode. // Open up Chrome Dev Tools, then Timeline, then User Timing to see output. -// Also see config/webpack/loaders/mark.js for the webpack loader marks. import * as marky from 'marky'; diff --git a/app/javascript/mastodon/polyfills/index.ts b/app/javascript/mastodon/polyfills/index.ts index 431c5b0f30f..9f0ce04e504 100644 --- a/app/javascript/mastodon/polyfills/index.ts +++ b/app/javascript/mastodon/polyfills/index.ts @@ -5,7 +5,7 @@ import { loadIntlPolyfills } from './intl'; function importExtraPolyfills() { - return import(/* webpackChunkName: "extra_polyfills" */ './extra_polyfills'); + return import('./extra_polyfills'); } export function loadPolyfills() { diff --git a/app/javascript/mastodon/polyfills/intl.ts b/app/javascript/mastodon/polyfills/intl.ts index b7a06e557af..b1157557e5b 100644 --- a/app/javascript/mastodon/polyfills/intl.ts +++ b/app/javascript/mastodon/polyfills/intl.ts @@ -68,11 +68,9 @@ async function loadIntlPluralRulesPolyfills(locale: string) { // } // // Load the polyfill 1st BEFORE loading data // await import( -// /* webpackChunkName: "i18n-relativetimeformat-polyfill" */ // '@formatjs/intl-relativetimeformat/polyfill-force' // ); // await import( -// /* webpackChunkName: "i18n-relativetimeformat-polyfill-[request]" */ // `@formatjs/intl-relativetimeformat/locale-data/${unsupportedLocale}` // ); // }