Merge pull request #5913 from thornbill/index-refactor

Refactor app startup code

README.md

@@ -85,8 +85,11 @@ Jellyfin Web is the frontend used for most of the clients available for end user
     ├── controllers       # Legacy page views and controllers 🧹
     ├── elements          # Basic webcomponents and React wrappers 🧹
     ├── hooks             # Custom React hooks
-    ├── legacy            # Polyfills for legacy browsers
+    ├── lib               # Reusable libraries
-    ├── libraries         # Third party libraries 🧹
+    │   ├── globalize     # Custom localization library
+    │   ├── legacy        # Polyfills for legacy browsers
+    │   ├── navdrawer     # Navigation drawer library for classic layout
+    │   └── scroller      # Content scrolling library
     ├── plugins           # Client plugins
     ├── scripts           # Random assortment of visual components and utilities 🐉
     ├── strings           # Translation files

src/apps/dashboard/components/activityTable/LogLevelChip.tsx

@@ -2,7 +2,7 @@ import { LogLevel } from '@jellyfin/sdk/lib/generated-client/models/log-level';
 import Chip from '@mui/material/Chip';
 import React from 'react';
 
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 const LogLevelChip = ({ level }: { level: LogLevel }) => {
     let color: 'info' | 'warning' | 'error' | undefined;

src/apps/dashboard/components/drawer/sections/AdvancedDrawerSection.tsx

@@ -10,7 +10,7 @@ import ListSubheader from '@mui/material/ListSubheader';
 import React from 'react';
 
 import ListItemLink from 'components/ListItemLink';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 const AdvancedDrawerSection = () => {
     return (

src/apps/dashboard/components/drawer/sections/DevicesDrawerSection.tsx

@@ -7,7 +7,7 @@ import ListSubheader from '@mui/material/ListSubheader';
 import React from 'react';
 
 import ListItemLink from 'components/ListItemLink';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 const DevicesDrawerSection = () => {
     return (

src/apps/dashboard/components/drawer/sections/LiveTvDrawerSection.tsx

@@ -7,7 +7,7 @@ import ListSubheader from '@mui/material/ListSubheader';
 import React from 'react';
 
 import ListItemLink from 'components/ListItemLink';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 const LiveTvDrawerSection = () => {
     return (

src/apps/dashboard/components/drawer/sections/PluginDrawerSection.tsx

@@ -8,7 +8,7 @@ import ListSubheader from '@mui/material/ListSubheader';
 import React, { useEffect } from 'react';
 
 import ListItemLink from 'components/ListItemLink';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import Dashboard from 'utils/dashboard';
 import { useConfigurationPages } from 'apps/dashboard/features/plugins/api/useConfigurationPages';
 

src/apps/dashboard/components/drawer/sections/ServerDrawerSection.tsx

@@ -9,7 +9,7 @@ import React from 'react';
 import { useLocation } from 'react-router-dom';
 
 import ListItemLink from 'components/ListItemLink';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 const LIBRARY_PATHS = [
     '/dashboard/libraries',

src/apps/dashboard/features/plugins/components/PluginDetailsTable.tsx

@@ -9,7 +9,7 @@ import TableRow from '@mui/material/TableRow/TableRow';
 import React, { FC } from 'react';
 import { Link as RouterLink } from 'react-router-dom';
 
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 import type { PluginDetails } from '../types/PluginDetails';
 

src/apps/dashboard/features/plugins/components/PluginRevisions.tsx

@@ -10,7 +10,7 @@ import React, { type FC } from 'react';
 
 import MarkdownBox from 'components/MarkdownBox';
 import { parseISO8601Date, toLocaleString } from 'scripts/datetime';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 import type { PluginDetails } from '../types/PluginDetails';
 import { VersionInfo } from '@jellyfin/sdk/lib/generated-client';

src/apps/dashboard/routes/activity.tsx

@@ -16,7 +16,7 @@ import Page from 'components/Page';
 import UserAvatar from 'components/UserAvatar';
 import { useApi } from 'hooks/useApi';
 import { parseISO8601Date, toLocaleDateString, toLocaleTimeString } from 'scripts/datetime';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { toBoolean } from 'utils/string';
 
 import LogLevelChip from '../components/activityTable/LogLevelChip';

src/apps/dashboard/routes/playback/trickplay.tsx

@@ -3,7 +3,7 @@ import { TrickplayScanBehavior } from '@jellyfin/sdk/lib/generated-client/models
 import { ProcessPriorityClass } from '@jellyfin/sdk/lib/generated-client/models/process-priority-class';
 import React, { type FC, useCallback, useEffect, useRef } from 'react';
 
-import globalize from '../../../../scripts/globalize';
+import globalize from '../../../../lib/globalize';
 import Page from '../../../../components/Page';
 import SectionTitleContainer from '../../../../elements/SectionTitleContainer';
 import ButtonElement from '../../../../elements/ButtonElement';

src/apps/dashboard/routes/plugins/plugin.tsx

@@ -33,7 +33,7 @@ import type { PluginDetails } from 'apps/dashboard/features/plugins/types/Plugin
 import ConfirmDialog from 'components/ConfirmDialog';
 import Page from 'components/Page';
 import { useApi } from 'hooks/useApi';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { getPluginUrl } from 'utils/dashboard';
 import { getUri } from 'utils/api';
 

src/apps/dashboard/routes/users/access.tsx

@@ -4,7 +4,7 @@ import { useSearchParams } from 'react-router-dom';
 
 import loading from '../../../../components/loading/loading';
 import libraryMenu from '../../../../scripts/libraryMenu';
-import globalize from '../../../../scripts/globalize';
+import globalize from '../../../../lib/globalize';
 import toast from '../../../../components/toast/toast';
 import SectionTabs from '../../../../components/dashboard/users/SectionTabs';
 import ButtonElement from '../../../../elements/ButtonElement';

src/apps/dashboard/routes/users/add.tsx

@@ -2,7 +2,7 @@ import type { BaseItemDto } from '@jellyfin/sdk/lib/generated-client';
 import React, { useCallback, useEffect, useState, useRef } from 'react';
 
 import Dashboard from '../../../../utils/dashboard';
-import globalize from '../../../../scripts/globalize';
+import globalize from '../../../../lib/globalize';
 import loading from '../../../../components/loading/loading';
 import toast from '../../../../components/toast/toast';
 import SectionTitleContainer from '../../../../elements/SectionTitleContainer';

src/apps/dashboard/routes/users/index.tsx

@@ -2,7 +2,7 @@ import type { UserDto } from '@jellyfin/sdk/lib/generated-client';
 import React, { useEffect, useState, useRef } from 'react';
 
 import Dashboard from '../../../../utils/dashboard';
-import globalize from '../../../../scripts/globalize';
+import globalize from '../../../../lib/globalize';
 import loading from '../../../../components/loading/loading';
 import dom from '../../../../scripts/dom';
 import confirm from '../../../../components/confirm/confirm';

src/apps/dashboard/routes/users/parentalcontrol.tsx

@@ -5,7 +5,7 @@ import escapeHTML from 'escape-html';
 import React, { useCallback, useEffect, useState, useRef } from 'react';
 import { useSearchParams } from 'react-router-dom';
 
-import globalize from '../../../../scripts/globalize';
+import globalize from '../../../../lib/globalize';
 import LibraryMenu from '../../../../scripts/libraryMenu';
 import AccessScheduleList from '../../../../components/dashboard/users/AccessScheduleList';
 import TagList from '../../../../components/dashboard/users/TagList';

src/apps/dashboard/routes/users/profile.tsx

@@ -4,7 +4,7 @@ import React, { useCallback, useEffect, useState, useRef } from 'react';
 import { useSearchParams } from 'react-router-dom';
 
 import Dashboard from '../../../../utils/dashboard';
-import globalize from '../../../../scripts/globalize';
+import globalize from '../../../../lib/globalize';
 import LibraryMenu from '../../../../scripts/libraryMenu';
 import ButtonElement from '../../../../elements/ButtonElement';
 import CheckBoxElement from '../../../../elements/CheckBoxElement';

src/apps/experimental/components/AppToolbar/RemotePlayButton.tsx

@@ -8,7 +8,7 @@ import { useTheme } from '@mui/material/styles';
 import Tooltip from '@mui/material/Tooltip';
 
 import { playbackManager } from 'components/playback/playbackmanager';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import Events from 'utils/events';
 
 import RemotePlayMenu, { ID } from './menus/RemotePlayMenu';

src/apps/experimental/components/AppToolbar/SearchButton.tsx

@@ -9,7 +9,7 @@ import {
 import SearchIcon from '@mui/icons-material/Search';
 import IconButton from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 const getUrlParams = (searchParams: URLSearchParams) => {
     const parentId =

src/apps/experimental/components/AppToolbar/SyncPlayButton.tsx

@@ -6,7 +6,7 @@ import React, { useCallback, useState } from 'react';
 
 import { pluginManager } from 'components/pluginManager';
 import { useApi } from 'hooks/useApi';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { PluginType } from 'types/plugin';
 
 import AppSyncPlayMenu, { ID } from './menus/SyncPlayMenu';

src/apps/experimental/components/AppToolbar/menus/RemotePlayActiveMenu.tsx

@@ -13,7 +13,7 @@ import React, { FC, useCallback, useState } from 'react';
 import { Link } from 'react-router-dom';
 
 import { enable, isEnabled } from 'scripts/autocast';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 interface RemotePlayActiveMenuProps extends MenuProps {
     onMenuClose: () => void

src/apps/experimental/components/AppToolbar/menus/RemotePlayMenu.tsx

@@ -6,7 +6,7 @@ import Menu, { type MenuProps } from '@mui/material/Menu';
 import MenuItem from '@mui/material/MenuItem';
 import React, { FC, useEffect, useState } from 'react';
 
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { playbackManager } from 'components/playback/playbackmanager';
 import { pluginManager } from 'components/pluginManager';
 import type { PlayTarget } from 'types/playTarget';

src/apps/experimental/components/AppToolbar/menus/SyncPlayMenu.tsx

@@ -20,7 +20,7 @@ import React, { FC, useCallback, useEffect, useState } from 'react';
 import { pluginManager } from 'components/pluginManager';
 import { useApi } from 'hooks/useApi';
 import { useSyncPlayGroups } from 'hooks/useSyncPlayGroups';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { PluginType } from 'types/plugin';
 import Events, { Event } from 'utils/events';
 

src/apps/experimental/components/drawers/MainDrawerContent.tsx

@@ -18,7 +18,7 @@ import { appRouter } from 'components/router/appRouter';
 import { useApi } from 'hooks/useApi';
 import { useUserViews } from 'hooks/useUserViews';
 import { useWebConfig } from 'hooks/useWebConfig';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 import LibraryIcon from '../LibraryIcon';
 import DrawerHeaderLink from './DrawerHeaderLink';

src/apps/experimental/components/library/GenresItemsContainer.tsx

@@ -2,7 +2,7 @@ import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/bas
 import type { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
 import React, { FC } from 'react';
 import { useGetGenres } from 'hooks/useFetchItems';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import Loading from 'components/loading/LoadingComponent';
 import GenresSectionContainer from './GenresSectionContainer';
 import type { ParentId } from 'types/library';

src/apps/experimental/components/library/GridListViewButton.tsx

@@ -2,7 +2,7 @@ import React, { FC, useCallback } from 'react';
 import { ButtonGroup, IconButton } from '@mui/material';
 import ViewModuleIcon from '@mui/icons-material/ViewModule';
 import ViewListIcon from '@mui/icons-material/ViewList';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { LibraryViewSettings, ViewMode } from 'types/library';
 import { LibraryTab } from 'types/libraryTab';
 import ViewSettingsButton from './ViewSettingsButton';

src/apps/experimental/components/library/NewCollectionButton.tsx

@@ -1,7 +1,7 @@
 import React, { FC, useCallback } from 'react';
 import { IconButton } from '@mui/material';
 import AddIcon from '@mui/icons-material/Add';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 const NewCollectionButton: FC = () => {
     const showCollectionEditor = useCallback(() => {

src/apps/experimental/components/library/Pagination.tsx

@@ -5,7 +5,7 @@ import Box from '@mui/material/Box';
 import ButtonGroup from '@mui/material/ButtonGroup';
 import IconButton from '@mui/material/IconButton';
 
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import * as userSettings from 'scripts/settings/userSettings';
 import { LibraryViewSettings } from 'types/library';
 

src/apps/experimental/components/library/PlayAllButton.tsx

@@ -4,7 +4,7 @@ import { IconButton } from '@mui/material';
 import PlayArrowIcon from '@mui/icons-material/PlayArrow';
 
 import { playbackManager } from 'components/playback/playbackmanager';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { getFiltersQuery } from 'utils/items';
 import { LibraryViewSettings } from 'types/library';
 import { LibraryTab } from 'types/libraryTab';

src/apps/experimental/components/library/ProgramsSectionView.tsx

@@ -1,7 +1,7 @@
 import React, { type FC } from 'react';
 import { useGetProgramsSectionsWithItems, useGetTimers } from 'hooks/useFetchItems';
 import { appRouter } from 'components/router/appRouter';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import Loading from 'components/loading/LoadingComponent';
 import SectionContainer from './SectionContainer';
 import { CardShape } from 'utils/card';

src/apps/experimental/components/library/QueueButton.tsx

@@ -4,7 +4,7 @@ import { IconButton } from '@mui/material';
 import QueueIcon from '@mui/icons-material/Queue';
 
 import { playbackManager } from 'components/playback/playbackmanager';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 interface QueueButtonProps {
     item: BaseItemDto | undefined

src/apps/experimental/components/library/ShuffleButton.tsx

@@ -5,7 +5,7 @@ import { IconButton } from '@mui/material';
 import ShuffleIcon from '@mui/icons-material/Shuffle';
 
 import { playbackManager } from 'components/playback/playbackmanager';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { getFiltersQuery } from 'utils/items';
 import { LibraryViewSettings } from 'types/library';
 import { LibraryTab } from 'types/libraryTab';

src/apps/experimental/components/library/SortButton.tsx

@@ -10,7 +10,7 @@ import FormControl from '@mui/material/FormControl';
 import Select, { SelectChangeEvent } from '@mui/material/Select';
 import SortByAlphaIcon from '@mui/icons-material/SortByAlpha';
 
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { LibraryViewSettings } from 'types/library';
 import { LibraryTab } from 'types/libraryTab';
 import { ItemSortBy } from '@jellyfin/sdk/lib/models/api/item-sort-by';

src/apps/experimental/components/library/SuggestionsSectionView.tsx

@@ -8,7 +8,7 @@ import {
     useGetSuggestionSectionsWithItems
 } from 'hooks/useFetchItems';
 import { appRouter } from 'components/router/appRouter';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import Loading from 'components/loading/LoadingComponent';
 import SectionContainer from './SectionContainer';
 import { CardShape } from 'utils/card';

src/apps/experimental/components/library/UpcomingView.tsx

@@ -2,7 +2,7 @@ import React, { type FC } from 'react';
 import Box from '@mui/material/Box';
 import { useGetGroupsUpcomingEpisodes } from 'hooks/useFetchItems';
 import Loading from 'components/loading/LoadingComponent';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import SectionContainer from './SectionContainer';
 import { CardShape } from 'utils/card';
 import type { LibraryViewProps } from 'types/library';

src/apps/experimental/components/library/ViewSettingsButton.tsx

@@ -15,7 +15,7 @@ import Select, { SelectChangeEvent } from '@mui/material/Select';
 import Popover from '@mui/material/Popover';
 import ViewComfyIcon from '@mui/icons-material/ViewComfy';
 
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { LibraryViewSettings } from 'types/library';
 import { LibraryTab } from 'types/libraryTab';
 

src/apps/experimental/components/library/filter/FilterButton.tsx

@@ -15,7 +15,7 @@ import { styled } from '@mui/material/styles';
 import Typography from '@mui/material/Typography';
 
 import { useGetQueryFiltersLegacy, useGetStudios } from 'hooks/useFetchItems';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 import FiltersFeatures from './FiltersFeatures';
 import FiltersGenres from './FiltersGenres';

src/apps/experimental/components/library/filter/FiltersEpisodesStatus.tsx

@@ -2,7 +2,7 @@ import React, { FC, useCallback } from 'react';
 import FormGroup from '@mui/material/FormGroup';
 import FormControlLabel from '@mui/material/FormControlLabel';
 import Checkbox from '@mui/material/Checkbox';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { EpisodeFilter, LibraryViewSettings } from 'types/library';
 
 const episodeFilterOptions = [

src/apps/experimental/components/library/filter/FiltersFeatures.tsx

@@ -2,7 +2,7 @@ import React, { FC, useCallback } from 'react';
 import FormGroup from '@mui/material/FormGroup';
 import FormControlLabel from '@mui/material/FormControlLabel';
 import Checkbox from '@mui/material/Checkbox';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { FeatureFilters, LibraryViewSettings } from 'types/library';
 
 const featuresOptions = [

src/apps/experimental/components/library/filter/FiltersSeriesStatus.tsx

@@ -2,7 +2,7 @@ import React, { FC, useCallback } from 'react';
 import FormGroup from '@mui/material/FormGroup';
 import FormControlLabel from '@mui/material/FormControlLabel';
 import Checkbox from '@mui/material/Checkbox';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { LibraryViewSettings } from 'types/library';
 import { SeriesStatus } from '@jellyfin/sdk/lib/generated-client';
 

src/apps/experimental/components/library/filter/FiltersStatus.tsx

@@ -2,7 +2,7 @@ import React, { FC, useCallback } from 'react';
 import FormGroup from '@mui/material/FormGroup';
 import FormControlLabel from '@mui/material/FormControlLabel';
 import Checkbox from '@mui/material/Checkbox';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { LibraryViewSettings } from 'types/library';
 import { ItemFilter } from '@jellyfin/sdk/lib/generated-client';
 import { LibraryTab } from 'types/libraryTab';

src/apps/experimental/components/tabs/tabRoutes.ts

@@ -1,4 +1,4 @@
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import * as userSettings from 'scripts/settings/userSettings';
 import { LibraryTab } from 'types/libraryTab';
 

src/apps/experimental/routes/home.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { useSearchParams } from 'react-router-dom';
 
-import globalize from '../../../scripts/globalize';
+import globalize from '../../../lib/globalize';
 import { clearBackdrop } from '../../../components/backdrop/backdrop';
 import layoutManager from '../../../components/layoutManager';
 import Page from '../../../components/Page';

src/apps/experimental/routes/user/display/DisplayPreferences.tsx

@@ -13,7 +13,7 @@ import React, { Fragment } from 'react';
 import { appHost } from 'components/apphost';
 import { useApi } from 'hooks/useApi';
 import { useThemes } from 'hooks/useThemes';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 import { DisplaySettingsValues } from './types';
 import { useScreensavers } from './hooks/useScreensavers';

src/apps/experimental/routes/user/display/ItemDetailPreferences.tsx

@@ -6,7 +6,7 @@ import Stack from '@mui/material/Stack';
 import Typography from '@mui/material/Typography';
 import React from 'react';
 
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { DisplaySettingsValues } from './types';
 
 interface ItemDetailPreferencesProps {

src/apps/experimental/routes/user/display/LibraryPreferences.tsx

@@ -7,7 +7,7 @@ import TextField from '@mui/material/TextField';
 import Typography from '@mui/material/Typography';
 import React from 'react';
 
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { DisplaySettingsValues } from './types';
 
 interface LibraryPreferencesProps {

src/apps/experimental/routes/user/display/LocalizationPreferences.tsx

@@ -10,7 +10,7 @@ import React from 'react';
 
 import { appHost } from 'components/apphost';
 import datetime from 'scripts/datetime';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { DATE_LOCALE_OPTIONS, LANGUAGE_OPTIONS } from './constants';
 import { DisplaySettingsValues } from './types';
 

src/apps/experimental/routes/user/display/NextUpPreferences.tsx

@@ -7,7 +7,7 @@ import TextField from '@mui/material/TextField';
 import Typography from '@mui/material/Typography';
 import React from 'react';
 
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { DisplaySettingsValues } from './types';
 
 interface NextUpPreferencesProps {

src/apps/experimental/routes/user/display/constants.ts

@@ -1,4 +1,4 @@
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 export const LANGUAGE_OPTIONS = [
     { value: 'auto', label: globalize.translate('Auto') },

src/apps/experimental/routes/user/display/hooks/useDisplaySettingForm.ts

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from 'react';
 import { useSearchParams } from 'react-router-dom';
 
 import toast from 'components/toast/toast';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { DisplaySettingsValues } from '../types';
 import { useDisplaySettings } from './useDisplaySettings';
 

src/apps/experimental/routes/user/display/hooks/useScreensavers.ts

@@ -2,7 +2,7 @@ import { useMemo } from 'react';
 
 import { pluginManager } from 'components/pluginManager';
 import { Plugin, PluginType } from 'types/plugin';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 export function useScreensavers() {
     const screensavers = useMemo<Plugin[]>(() => {

src/apps/experimental/routes/user/display/index.tsx

@@ -4,7 +4,7 @@ import Stack from '@mui/material/Stack';
 import React, { useCallback } from 'react';
 
 import Page from 'components/Page';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { DisplayPreferences } from './DisplayPreferences';
 import { ItemDetailPreferences } from './ItemDetailPreferences';
 import { LibraryPreferences } from './LibraryPreferences';

src/apps/stable/routes/quickConnect/index.tsx

@@ -3,7 +3,7 @@ import React, { FC, FormEvent, useCallback, useMemo, useState } from 'react';
 import { Link, useSearchParams } from 'react-router-dom';
 
 import Page from 'components/Page';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import InputElement from 'elements/InputElement';
 import ButtonElement from 'elements/ButtonElement';
 import { useApi } from 'hooks/useApi';

src/apps/stable/routes/search.tsx

@@ -2,7 +2,7 @@ import React, { type FC, useEffect, useState } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import { useDebounceValue } from 'usehooks-ts';
 import { usePrevious } from 'hooks/usePrevious';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import Page from 'components/Page';
 import SearchFields from 'components/search/SearchFields';
 import SearchSuggestions from 'components/search/SearchSuggestions';

src/apps/stable/routes/user/userprofile.tsx

@@ -4,7 +4,7 @@ import React, { FunctionComponent, useEffect, useState, useRef, useCallback } fr
 import { useSearchParams } from 'react-router-dom';
 
 import Dashboard from '../../../../utils/dashboard';
-import globalize from '../../../../scripts/globalize';
+import globalize from '../../../../lib/globalize';
 import LibraryMenu from '../../../../scripts/libraryMenu';
 import { appHost } from '../../../../components/apphost';
 import confirm from '../../../../components/confirm/confirm';

src/components/ConfirmDialog.tsx

@@ -6,7 +6,7 @@ import DialogContentText from '@mui/material/DialogContentText/DialogContentText
 import DialogTitle from '@mui/material/DialogTitle/DialogTitle';
 import React, { type FC } from 'react';
 
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 interface ConfirmDialogProps extends DialogProps {
     confirmButtonColor?: 'inherit' | 'primary' | 'secondary' | 'success' | 'error' | 'info' | 'warning'

src/components/ConnectionRequired.tsx

@@ -6,7 +6,7 @@ import alert from './alert';
 import { appRouter } from './router/appRouter';
 import Loading from './loading/LoadingComponent';
 import ServerConnections from './ServerConnections';
-import globalize from '../scripts/globalize';
+import globalize from '../lib/globalize';
 import { ConnectionState } from '../utils/jellyfin-apiclient/ConnectionState';
 
 enum BounceRoutes {

src/components/ServerContentPage.tsx

@@ -3,7 +3,7 @@ import { useLocation } from 'react-router-dom';
 
 import ServerConnections from './ServerConnections';
 import viewManager from './viewManager/viewManager';
-import globalize from '../scripts/globalize';
+import globalize from '../lib/globalize';
 import type { RestoreViewFailResponse } from '../types/viewManager';
 
 interface ServerContentPageProps {

src/components/accessSchedule/accessSchedule.js

@@ -5,7 +5,7 @@
 
 import dialogHelper from '../dialogHelper/dialogHelper';
 import datetime from '../../scripts/datetime';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import '../../elements/emby-select/emby-select';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../formdialog.scss';

src/components/actionSheet/actionSheet.ts

@@ -1,7 +1,7 @@
 import escapeHtml from 'escape-html';
 import dialogHelper from '../dialogHelper/dialogHelper';
 import layoutManager from '../layoutManager';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import dom from '../../scripts/dom';
 import '../../elements/emby-button/emby-button';
 import './actionSheet.scss';

src/components/activitylog.js

@@ -1,6 +1,6 @@
 import escapeHtml from 'escape-html';
 import Events from '../utils/events.ts';
-import globalize from '../scripts/globalize';
+import globalize from '../lib/globalize';
 import dom from '../scripts/dom';
 import { formatRelative } from 'date-fns';
 import serverNotifications from '../scripts/serverNotifications';

src/components/alert.js

@@ -1,7 +1,7 @@
 import { appRouter } from './router/appRouter';
 import browser from '../scripts/browser';
 import dialog from './dialog/dialog';
-import globalize from '../scripts/globalize';
+import globalize from '../lib/globalize';
 
 export default async function (text, title) {
     // Modals seem to be blocked on Web OS and Tizen 2.x

src/components/alphaPicker/alphaPicker.js

@@ -6,7 +6,7 @@
 import focusManager from '../focusManager';
 import layoutManager from '../layoutManager';
 import dom from '../../scripts/dom';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import './style.scss';
 import '../../elements/emby-button/paper-icon-button-light';
 import 'material-design-icons-iconfont';

src/components/apphost.js

@@ -3,7 +3,7 @@ import browser from '../scripts/browser';
 import Events from '../utils/events.ts';
 import * as htmlMediaHelper from '../components/htmlMediaHelper';
 import * as webSettings from '../scripts/settings/webSettings';
-import globalize from '../scripts/globalize';
+import globalize from '../lib/globalize';
 import profileBuilder from '../scripts/browserDeviceProfile';
 
 const appName = 'Jellyfin Web';

src/components/cardbuilder/Card/cardHelper.ts

@@ -10,7 +10,7 @@ import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api';
 import { appRouter } from 'components/router/appRouter';
 import layoutManager from 'components/layoutManager';
 import itemHelper from 'components/itemHelper';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import datetime from 'scripts/datetime';
 
 import { isUsingLiveTvNaming } from '../cardBuilderUtils';

src/components/cardbuilder/cardBuilder.js

@@ -10,7 +10,7 @@ import escapeHtml from 'escape-html';
 import browser from 'scripts/browser';
 import datetime from 'scripts/datetime';
 import dom from 'scripts/dom';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { getBackdropShape, getPortraitShape, getSquareShape } from 'utils/card';
 import imageHelper from 'utils/image';
 

src/components/channelMapper/channelMapper.js

@@ -2,7 +2,7 @@ import escapeHtml from 'escape-html';
 import dom from '../../scripts/dom';
 import dialogHelper from '../dialogHelper/dialogHelper';
 import loading from '../loading/loading';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import actionsheet from '../actionSheet/actionSheet';
 import '../../elements/emby-input/emby-input';
 import '../../elements/emby-button/paper-icon-button-light';

src/components/collectionEditor/collectionEditor.js

@@ -4,7 +4,7 @@ import dialogHelper from '../dialogHelper/dialogHelper';
 import loading from '../loading/loading';
 import layoutManager from '../layoutManager';
 import { appRouter } from '../router/appRouter';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../../elements/emby-checkbox/emby-checkbox';

src/components/common/InfoIconButton.tsx

@@ -1,7 +1,7 @@
 import React, { type FC } from 'react';
 import IconButton from '@mui/material/IconButton';
 import InfoIcon from '@mui/icons-material/Info';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 interface InfoIconButtonProps {
     className?: string;

src/components/common/MoreVertIconButton.tsx

@@ -1,7 +1,7 @@
 import React, { type FC } from 'react';
 import IconButton from '@mui/material/IconButton';
 import MoreVertIcon from '@mui/icons-material/MoreVert';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 interface MoreVertIconButtonProps {
     className?: string;

src/components/common/NoItemsMessage.tsx

@@ -1,7 +1,7 @@
 import React, { type FC } from 'react';
 import Box from '@mui/material/Box';
 import Typography from '@mui/material/Typography';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 interface NoItemsMessageProps {
     noItemsMessage?: string;

src/components/common/PlayArrowIconButton.tsx

@@ -1,7 +1,7 @@
 import React, { type FC } from 'react';
 import IconButton from '@mui/material/IconButton';
 import PlayArrowIcon from '@mui/icons-material/PlayArrow';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 interface PlayArrowIconButtonProps {
     className: string;

src/components/common/PlaylistAddIconButton.tsx

@@ -1,7 +1,7 @@
 import React, { type FC } from 'react';
 import IconButton from '@mui/material/IconButton';
 import PlaylistAddIcon from '@mui/icons-material/PlaylistAdd';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 interface PlaylistAddIconButtonProps {
     className?: string;

src/components/confirm/confirm.js

@@ -1,7 +1,7 @@
 import { appRouter } from '../router/appRouter';
 import browser from '../../scripts/browser';
 import dialog from '../dialog/dialog';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 
 function useNativeConfirm() {
     // webOS seems to block modals

src/components/dashboard/users/AccessContainer.tsx

@@ -1,5 +1,5 @@
 import React, { type FC, type PropsWithChildren } from 'react';
-import globalize from '../../../scripts/globalize';
+import globalize from '../../../lib/globalize';
 import CheckBoxElement from '../../../elements/CheckBoxElement';
 
 interface AccessContainerProps {

src/components/dashboard/users/AccessScheduleList.tsx

@@ -1,6 +1,6 @@
 import React, { FunctionComponent } from 'react';
 import datetime from '../../../scripts/datetime';
-import globalize from '../../../scripts/globalize';
+import globalize from '../../../lib/globalize';
 import IconButtonElement from '../../../elements/IconButtonElement';
 
 type AccessScheduleListProps = {

src/components/dashboard/users/LinkEditUserPreferences.tsx

@@ -1,5 +1,5 @@
 import React, { FunctionComponent } from 'react';
-import globalize from '../../../scripts/globalize';
+import globalize from 'lib/globalize';
 
 type IProps = {
     title?: string;

src/components/dashboard/users/SectionTabs.tsx

@@ -1,5 +1,5 @@
 import React, { FunctionComponent } from 'react';
-import globalize from '../../../scripts/globalize';
+import globalize from 'lib/globalize';
 
 type IProps = {
     activeTab: string;

src/components/dashboard/users/UserCardBox.tsx

@@ -2,7 +2,7 @@ import type { UserDto } from '@jellyfin/sdk/lib/generated-client';
 import React, { FunctionComponent } from 'react';
 import { formatDistanceToNow } from 'date-fns';
 import { getLocaleWithSuffix } from '../../../utils/dateFnsLocale';
-import globalize from '../../../scripts/globalize';
+import globalize from '../../../lib/globalize';
 import IconButtonElement from '../../../elements/IconButtonElement';
 import escapeHTML from 'escape-html';
 import { getDefaultBackgroundClass } from '../../cardbuilder/cardBuilderUtils';

src/components/dashboard/users/UserPasswordForm.tsx

@@ -1,6 +1,6 @@
 import React, { FunctionComponent, useCallback, useEffect, useRef } from 'react';
 import Dashboard from '../../../utils/dashboard';
-import globalize from '../../../scripts/globalize';
+import globalize from '../../../lib/globalize';
 import LibraryMenu from '../../../scripts/libraryMenu';
 import confirm from '../../confirm/confirm';
 import loading from '../../loading/loading';

src/components/dialog/dialog.js

@@ -4,7 +4,7 @@ import dialogHelper from '../dialogHelper/dialogHelper';
 import dom from '../../scripts/dom';
 import layoutManager from '../layoutManager';
 import scrollHelper from '../../scripts/scrollHelper';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import 'material-design-icons-iconfont';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';

src/components/directorybrowser/directorybrowser.js

@@ -2,7 +2,7 @@ import escapeHtml from 'escape-html';
 import loading from '../loading/loading';
 import dialogHelper from '../dialogHelper/dialogHelper';
 import dom from '../../scripts/dom';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import '../listview/listview.scss';
 import '../../elements/emby-input/emby-input';
 import '../../elements/emby-button/paper-icon-button-light';

src/components/displaySettings/displaySettings.js

@@ -5,7 +5,7 @@ import { pluginManager } from '../pluginManager';
 import { appHost } from '../apphost';
 import focusManager from '../focusManager';
 import datetime from '../../scripts/datetime';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import loading from '../loading/loading';
 import skinManager from '../../scripts/themeManager';
 import { PluginType } from '../../types/plugin.ts';

src/components/favoriteitems.js

@@ -1,5 +1,5 @@
 import dom from 'scripts/dom';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { getBackdropShape, getPortraitShape, getSquareShape } from 'utils/card';
 import { getParameterByName } from 'utils/url';
 

src/components/filterdialog/filterdialog.js

@@ -1,6 +1,6 @@
 import dom from '../../scripts/dom';
 import dialogHelper from '../dialogHelper/dialogHelper';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import Events from '../../utils/events.ts';
 import '../../elements/emby-checkbox/emby-checkbox';
 import '../../elements/emby-collapse/emby-collapse';

src/components/filtermenu/filtermenu.js

@@ -4,7 +4,7 @@ import focusManager from '../focusManager';
 import dialogHelper from '../dialogHelper/dialogHelper';
 import inputManager from '../../scripts/inputManager';
 import layoutManager from '../layoutManager';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import * as userSettings from '../../scripts/settings/userSettings';
 import '../../elements/emby-checkbox/emby-checkbox';
 import '../../elements/emby-input/emby-input';

src/components/guide/guide-settings.js

@@ -1,5 +1,5 @@
 import dialogHelper from '../dialogHelper/dialogHelper';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import * as userSettings from '../../scripts/settings/userSettings';
 import layoutManager from '../layoutManager';
 import scrollHelper from '../../scripts/scrollHelper';

src/components/guide/guide.js

@@ -1,7 +1,7 @@
 import escapeHtml from 'escape-html';
 import inputManager from '../../scripts/inputManager';
 import browser from '../../scripts/browser';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import Events from '../../utils/events.ts';
 import scrollHelper from '../../scripts/scrollHelper';
 import serverNotifications from '../../scripts/serverNotifications';

src/components/homeScreenSettings/homeScreenSettings.js

@@ -7,7 +7,7 @@ import { queryClient } from 'utils/query/queryClient';
 
 import layoutManager from '../layoutManager';
 import focusManager from '../focusManager';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import loading from '../loading/loading';
 import Events from '../../utils/events.ts';
 import homeSections from '../homesections/homesections';

src/components/homesections/homesections.js

@@ -1,6 +1,6 @@
 import layoutManager from 'components/layoutManager';
 import { getUserViewsQuery } from 'hooks/useUserViews';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { DEFAULT_SECTIONS, HomeSectionType } from 'types/homeSectionType';
 import Dashboard from 'utils/dashboard';
 import { toApi } from 'utils/jellyfin-apiclient/compat';

src/components/homesections/sections/activeRecordings.ts

@@ -3,7 +3,7 @@ import type { ApiClient } from 'jellyfin-apiclient';
 
 import ServerConnections from 'components/ServerConnections';
 import cardBuilder from 'components/cardbuilder/cardBuilder';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 
 import type { SectionContainerElement, SectionOptions } from './section';
 

src/components/homesections/sections/libraryButtons.ts

@@ -3,7 +3,7 @@ import escapeHtml from 'escape-html';
 
 import imageLoader from 'components/images/imageLoader';
 import { appRouter } from 'components/router/appRouter';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import imageHelper from 'utils/image';
 
 function getLibraryButtonsHtml(items: BaseItemDto[]) {

src/components/homesections/sections/libraryTiles.ts

@@ -2,7 +2,7 @@ import type { BaseItemDto } from '@jellyfin/sdk/lib/generated-client/models/base
 
 import cardBuilder from 'components/cardbuilder/cardBuilder';
 import imageLoader from 'components/images/imageLoader';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { getBackdropShape } from 'utils/card';
 
 import type { SectionOptions } from './section';

src/components/homesections/sections/liveTv.ts

@@ -6,7 +6,7 @@ import { appRouter } from 'components/router/appRouter';
 import cardBuilder from 'components/cardbuilder/cardBuilder';
 import layoutManager from 'components/layoutManager';
 import ServerConnections from 'components/ServerConnections';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import { getBackdropShape } from 'utils/card';
 
 import type { SectionContainerElement, SectionOptions } from './section';

src/components/homesections/sections/nextUp.ts

@@ -5,7 +5,7 @@ import cardBuilder from 'components/cardbuilder/cardBuilder';
 import layoutManager from 'components/layoutManager';
 import { appRouter } from 'components/router/appRouter';
 import ServerConnections from 'components/ServerConnections';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import type { UserSettings } from 'scripts/settings/userSettings';
 import { getBackdropShape } from 'utils/card';
 

src/components/homesections/sections/recentlyAdded.ts

@@ -7,7 +7,7 @@ import type { ApiClient } from 'jellyfin-apiclient';
 
 import layoutManager from 'components/layoutManager';
 import { appRouter } from 'components/router/appRouter';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import ServerConnections from 'components/ServerConnections';
 import cardBuilder from 'components/cardbuilder/cardBuilder';
 import { getBackdropShape, getPortraitShape, getSquareShape } from 'utils/card';

src/components/homesections/sections/resume.ts

@@ -4,7 +4,7 @@ import type { ApiClient } from 'jellyfin-apiclient';
 
 import ServerConnections from 'components/ServerConnections';
 import cardBuilder from 'components/cardbuilder/cardBuilder';
-import globalize from 'scripts/globalize';
+import globalize from 'lib/globalize';
 import type { UserSettings } from 'scripts/settings/userSettings';
 import { getBackdropShape, getPortraitShape } from 'utils/card';
 

src/components/imageDownloader/imageDownloader.js

@@ -6,7 +6,7 @@ import imageLoader from '../images/imageLoader';
 import browser from '../../scripts/browser';
 import layoutManager from '../layoutManager';
 import scrollHelper from '../../scripts/scrollHelper';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import '../../elements/emby-checkbox/emby-checkbox';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../../elements/emby-button/emby-button';

src/components/imageOptionsEditor/imageOptionsEditor.js

@@ -4,7 +4,7 @@
  * @module components/imageOptionsEditor/imageOptionsEditor
  */
 
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import dom from '../../scripts/dom';
 import dialogHelper from '../dialogHelper/dialogHelper';
 import '../../elements/emby-checkbox/emby-checkbox';

src/components/imageUploader/imageUploader.js

@@ -9,7 +9,7 @@ import dom from '../../scripts/dom';
 import loading from '../loading/loading';
 import scrollHelper from '../../scripts/scrollHelper';
 import layoutManager from '../layoutManager';
-import globalize from '../../scripts/globalize';
+import globalize from '../../lib/globalize';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-select/emby-select';
 import '../formdialog.scss';