diff --git a/apps/web/config/meta.jsx b/apps/web/config/meta.jsx index 4c65d64..dc4ca93 100644 --- a/apps/web/config/meta.jsx +++ b/apps/web/config/meta.jsx @@ -1,18 +1,12 @@ -import getUrls from '@/config/urls'; - -const { BASE_PATH } = getUrls(); - -function buildPath(filePath) { - return String.prototype.concat(BASE_PATH, filePath); -} +import { withBasePath } from '@/config/urls'; export const metaFavicon = ( <> - - - - - + + + + + ); diff --git a/apps/web/config/urls.ts b/apps/web/config/urls.ts index 8999d71..0a124ab 100644 --- a/apps/web/config/urls.ts +++ b/apps/web/config/urls.ts @@ -4,14 +4,13 @@ import getConfig from 'next/config'; import { isServer } from 'tools/common'; const { serverRuntimeConfig, publicRuntimeConfig } = getConfig(); +const { BASE_PATH } = publicRuntimeConfigSchema.parse(publicRuntimeConfig); + +export function withBasePath(path: string) { + return String.prototype.concat(BASE_PATH, path); +} function getUrls() { - const { BASE_PATH } = publicRuntimeConfigSchema.parse(publicRuntimeConfig); - - function withBasePath(url: string) { - return BASE_PATH + url; - } - if (isServer()) { const { URL_CRM_GRAPHQL_DIRECT, diff --git a/apps/web/pages/_document.jsx b/apps/web/pages/_document.jsx index 7ab645f..b7bf6d4 100644 --- a/apps/web/pages/_document.jsx +++ b/apps/web/pages/_document.jsx @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility */ import { metaFavicon } from '@/config/meta'; +import { withBasePath } from '@/config/urls'; import Document, { Head, Html, Main, NextScript } from 'next/document'; import { ServerStyleSheet } from 'styled-components'; import { createCache, doExtraStyle, StyleProvider } from 'ui/tools'; @@ -28,7 +29,7 @@ export default class MyDocument extends Document { styles: [ initialProps.styles, sheet.getStyleElement(), - fileName && , + fileName && , ], }; } finally {