📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
added www to non-www redirects
Blue Mousefc498183aa75
diff --git a/app/root.tsx b/app/root.tsxindex b5d478da2..72a2e2fb9 100644--- a/app/root.tsx+++ b/app/root.tsx@@ -1,7 +1,7 @@import type {LinksFunction, LoaderArgs, V2_MetaFunction, HeadersFunction,} from '@remix-run/node'-import { json } from '@remix-run/node'+import { json, redirect } from '@remix-run/node'import { useState } from 'react'import {Links,@@ -15,7 +15,7 @@ import {} from '@remix-run/react'import { store } from 'redux/store'import {- whitelist, isBrowser, CONTACT_EMAIL, LS_THEME_SETTING,+ whitelist, isBrowser, CONTACT_EMAIL, LS_THEME_SETTING, isSelfhosted,} from 'redux/constants'import {getCookie, generateCookieString,@@ -24,6 +24,7 @@ import { ExclamationTriangleIcon, ChevronDownIcon, ChevronUpIcon } from '@heroicimport { Provider } from 'react-redux'import clsx from 'clsx'import _map from 'lodash/map'+import _replace from 'lodash/replace'// @ts-ignoreimport { transitions, positions, Provider as AlertProvider } from '@blaumaus/react-alert'import BillboardCss from 'billboard.js/dist/billboard.min.css'@@ -35,7 +36,7 @@ import { useTranslation } from 'react-i18next'import AppWrapper from 'App'import { detectLanguage } from 'i18n'import {- detectTheme, getPageMeta, isAuthenticated,+ detectTheme, getPageMeta, isAuthenticated, isWWW,} from 'utils/server'import mainCss from 'styles/index.css'@@ -181,6 +182,12 @@ export function ErrorBoundary() {export async function loader({ request }: LoaderArgs) {const { url } = request+ const urlObject = new URL(url)++ if (!isSelfhosted && isWWW(urlObject)) {+ redirect(_replace(urlObject.href, 'www.', ''), 301)+ }+const locale = detectLanguage(request)const [theme, storeThemeToCookie] = detectTheme(request)const isAuthed = isAuthenticated(request)diff --git a/app/utils/server.ts b/app/utils/server.tsindex 0caec60ce..752e575e0 100644--- a/app/utils/server.ts+++ b/app/utils/server.ts@@ -1,5 +1,6 @@import routes from 'routesPath'import _includes from 'lodash/includes'+import _startsWith from 'lodash/startsWith'import { TITLE_SUFFIX, SUPPORTED_THEMES, ThemeType } from 'redux/constants'export const hasAuthCookies = (request: Request) => {@@ -75,6 +76,10 @@ export function isAuthenticated(request: Request): boolean {return !!getAccessToken(request)}+export function isWWW(url: URL): boolean {+ return _startsWith(url.hostname, 'www.')+}+interface IPageMeta {title: string}