From ac3069dfe71ba0909af9b7e15a4597d23013540b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Thu, 26 Feb 2026 21:40:23 +0100 Subject: [PATCH] nicolium: move stuff around and rename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- packages/pl-fe/src/actions/frontend-config.ts | 6 +++--- packages/pl-fe/src/build-config.ts | 2 +- packages/pl-fe/src/components/parsed-mfm.tsx | 2 +- .../init/{pl-fe-head.tsx => nicolium-head.tsx} | 4 ++-- .../init/{pl-fe-load.tsx => nicolium-load.tsx} | 6 +++--- .../{pl-fe-mount.tsx => nicolium-mount.tsx} | 4 ++-- .../pl-fe/src/init/{pl-fe.tsx => nicolium.tsx} | 18 +++++++++--------- packages/pl-fe/src/{ => init}/ready.ts | 0 packages/pl-fe/src/main.tsx | 6 +++--- packages/pl-fe/src/styles/mfm.scss | 2 +- packages/pl-fe/src/utils/tailwind.ts | 4 ++-- 11 files changed, 27 insertions(+), 27 deletions(-) rename packages/pl-fe/src/init/{pl-fe-head.tsx => nicolium-head.tsx} (97%) rename packages/pl-fe/src/init/{pl-fe-load.tsx => nicolium-load.tsx} (94%) rename packages/pl-fe/src/init/{pl-fe-mount.tsx => nicolium-mount.tsx} (82%) rename packages/pl-fe/src/init/{pl-fe.tsx => nicolium.tsx} (73%) rename packages/pl-fe/src/{ => init}/ready.ts (100%) diff --git a/packages/pl-fe/src/actions/frontend-config.ts b/packages/pl-fe/src/actions/frontend-config.ts index e66c2274f..d9cebfc6d 100644 --- a/packages/pl-fe/src/actions/frontend-config.ts +++ b/packages/pl-fe/src/actions/frontend-config.ts @@ -47,11 +47,11 @@ const fetchFrontendConfig = dispatch(importFrontendConfig(data[key], host)); return data[key]; } else { - return dispatch(fetchPlFeJson(host)); + return dispatch(fetchFrontendConfigJson(host)); } }); } else { - return dispatch(fetchPlFeJson(host)); + return dispatch(fetchFrontendConfigJson(host)); } }; @@ -69,7 +69,7 @@ const loadFrontendConfig = () => async (dispatch: AppDispatch, getState: () => R } }; -const fetchPlFeJson = (host: string | null) => (dispatch: AppDispatch) => +const fetchFrontendConfigJson = (host: string | null) => (dispatch: AppDispatch) => staticFetch('/instance/pl-fe.json') .then(({ json: data }) => { if (!isObject(data)) throw 'pl-fe.json fetch failed'; diff --git a/packages/pl-fe/src/build-config.ts b/packages/pl-fe/src/build-config.ts index f796f27ce..53b7d638a 100644 --- a/packages/pl-fe/src/build-config.ts +++ b/packages/pl-fe/src/build-config.ts @@ -28,6 +28,6 @@ const env = compileTime(() => { const { NODE_ENV, BACKEND_URL, FE_SUBDIRECTORY, WITH_LANDING_PAGE, BANNER_HTML } = env; -export type PlFeEnv = typeof env; +export type FrontendEnv = typeof env; export { NODE_ENV, BACKEND_URL, FE_SUBDIRECTORY, WITH_LANDING_PAGE, BANNER_HTML }; diff --git a/packages/pl-fe/src/components/parsed-mfm.tsx b/packages/pl-fe/src/components/parsed-mfm.tsx index d57edd1b8..cb0162015 100644 --- a/packages/pl-fe/src/components/parsed-mfm.tsx +++ b/packages/pl-fe/src/components/parsed-mfm.tsx @@ -546,7 +546,7 @@ const ParsedMfm: React.FC = React.memo(({ text, emojis, mentions, sp .flat(Infinity); return ( - + {genEl(rootAst, 1)} ); diff --git a/packages/pl-fe/src/init/pl-fe-head.tsx b/packages/pl-fe/src/init/nicolium-head.tsx similarity index 97% rename from packages/pl-fe/src/init/pl-fe-head.tsx rename to packages/pl-fe/src/init/nicolium-head.tsx index 73dc2eefa..a610f1b48 100644 --- a/packages/pl-fe/src/init/pl-fe-head.tsx +++ b/packages/pl-fe/src/init/nicolium-head.tsx @@ -13,7 +13,7 @@ import { useSettings } from '@/stores/settings'; const Helmet = React.lazy(() => import('@/components/helmet')); /** Injects metadata into site head with Helmet. */ -const PlFeHead = () => { +const NicoliumHead = () => { const locale = useLocale(); const direction = useLocaleDirection(locale); const { @@ -95,4 +95,4 @@ const PlFeHead = () => { ); }; -export { PlFeHead as default }; +export { NicoliumHead as default }; diff --git a/packages/pl-fe/src/init/pl-fe-load.tsx b/packages/pl-fe/src/init/nicolium-load.tsx similarity index 94% rename from packages/pl-fe/src/init/pl-fe-load.tsx rename to packages/pl-fe/src/init/nicolium-load.tsx index 6ed9ebbe5..70e744995 100644 --- a/packages/pl-fe/src/init/pl-fe-load.tsx +++ b/packages/pl-fe/src/init/nicolium-load.tsx @@ -24,12 +24,12 @@ const loadInitial = () => async (dispatch: AppDispatch) => { await dispatch(loadFrontendConfig()); }; -interface IPlFeLoad { +interface INicoliumLoad { children: React.ReactNode; } /** Initial data loader. */ -const PlFeLoad: React.FC = ({ children }) => { +const NicoliumLoad: React.FC = ({ children }) => { const dispatch = useAppDispatch(); const me = useAppSelector((state) => state.me); @@ -77,4 +77,4 @@ const PlFeLoad: React.FC = ({ children }) => { ); }; -export { PlFeLoad as default }; +export { NicoliumLoad as default }; diff --git a/packages/pl-fe/src/init/pl-fe-mount.tsx b/packages/pl-fe/src/init/nicolium-mount.tsx similarity index 82% rename from packages/pl-fe/src/init/pl-fe-mount.tsx rename to packages/pl-fe/src/init/nicolium-mount.tsx index 60a93bb89..bd5b1210d 100644 --- a/packages/pl-fe/src/init/pl-fe-mount.tsx +++ b/packages/pl-fe/src/init/nicolium-mount.tsx @@ -4,7 +4,7 @@ import LoadingScreen from '@/components/loading-screen'; import { RouterWithContext } from '@/features/ui/router'; /** Highest level node with the Redux store. */ -const PlFeMount = () => { +const NicoliumMount = () => { return ( }> @@ -12,4 +12,4 @@ const PlFeMount = () => { ); }; -export { PlFeMount as default }; +export { NicoliumMount as default }; diff --git a/packages/pl-fe/src/init/pl-fe.tsx b/packages/pl-fe/src/init/nicolium.tsx similarity index 73% rename from packages/pl-fe/src/init/pl-fe.tsx rename to packages/pl-fe/src/init/nicolium.tsx index f2abf8e8c..5772853d0 100644 --- a/packages/pl-fe/src/init/pl-fe.tsx +++ b/packages/pl-fe/src/init/nicolium.tsx @@ -10,25 +10,25 @@ import { queryClient } from '@/queries/client'; import { preload } from '../actions/preload'; import { store } from '../store'; -import PlFeHead from './pl-fe-head'; -import PlFeLoad from './pl-fe-load'; -import PlFeMount from './pl-fe-mount'; +import NicoliumHead from './nicolium-head'; +import NicoliumLoad from './nicolium-load'; +import NicoliumMount from './nicolium-mount'; // Preload happens synchronously store.dispatch(preload() as any); /** The root React node of the application. */ -const PlFe: React.FC = () => ( +const Nicolium: React.FC = () => ( <> - - - - + + + + @@ -37,4 +37,4 @@ const PlFe: React.FC = () => ( ); -export { PlFe as default }; +export { Nicolium as default }; diff --git a/packages/pl-fe/src/ready.ts b/packages/pl-fe/src/init/ready.ts similarity index 100% rename from packages/pl-fe/src/ready.ts rename to packages/pl-fe/src/init/ready.ts diff --git a/packages/pl-fe/src/main.tsx b/packages/pl-fe/src/main.tsx index 9cfd910a0..512a6e376 100644 --- a/packages/pl-fe/src/main.tsx +++ b/packages/pl-fe/src/main.tsx @@ -5,7 +5,7 @@ import React from 'react'; import { createRoot } from 'react-dom/client'; import * as BuildConfig from '@/build-config'; -import PlFe from '@/init/pl-fe'; +import Nicolium from '@/init/nicolium'; import { printConsoleWarning } from '@/utils/console'; import '@fontsource/inter/200.css'; @@ -22,7 +22,7 @@ import './styles/i18n.css'; import './styles/application.scss'; import './styles/tailwind.css'; import './precheck'; -import ready from './ready'; +import ready from './init/ready'; import { registerSW, lockSW } from './utils/sw'; if (BuildConfig.NODE_ENV === 'production') { @@ -35,5 +35,5 @@ ready(() => { const container = document.getElementById('plfe') as HTMLElement; const root = createRoot(container); - root.render(); + root.render(); }); diff --git a/packages/pl-fe/src/styles/mfm.scss b/packages/pl-fe/src/styles/mfm.scss index 703250303..e6b222c7a 100644 --- a/packages/pl-fe/src/styles/mfm.scss +++ b/packages/pl-fe/src/styles/mfm.scss @@ -1,7 +1,7 @@ // Shamelessly stolen from Sharkey // https://activitypub.software/TransFem-org/Sharkey/-/blob/develop/packages/frontend/src/style.scss -.plfe-mfm { +.⁂--mfm { ._mfm_blur_ { filter: blur(6px); transition: filter 0.3s; diff --git a/packages/pl-fe/src/utils/tailwind.ts b/packages/pl-fe/src/utils/tailwind.ts index 4c8c0bd37..c84c82fa0 100644 --- a/packages/pl-fe/src/utils/tailwind.ts +++ b/packages/pl-fe/src/utils/tailwind.ts @@ -3,7 +3,7 @@ import { generateAccent, generateNeutral } from '@/utils/theme'; import type { TailwindColorPalette } from '@/types/colors'; -type PlFeColors = Record>; +type FrontendColors = Record>; /** Check if the value is a valid hex color */ const isHex = (value: any): boolean => /^#([0-9A-F]{3}){1,2}$/i.test(value); @@ -55,7 +55,7 @@ const toTailwind = (config: { accentColor: string | null; colors: Record>; }): Record | string> => { - const colors: PlFeColors = config.colors; + const colors: FrontendColors = config.colors; const basicColors = fromBasicColors(config); return {