Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Upgrade to Next 14.
Mike Cao08bd9e835720
diff --git a/package.json b/package.jsonindex 782e039bf..db10755c9 100644--- a/package.json+++ b/package.json@@ -93,7 +93,7 @@"kafkajs": "^2.1.0","maxmind": "^4.3.6","moment-timezone": "^0.5.35",- "next": "13.5.6",+ "next": "14.0.4","next-basics": "^0.39.0","node-fetch": "^3.2.8","npm-run-all": "^4.1.5",diff --git a/src/app/(main)/websites/[id]/realtime/Realtime.tsx b/src/app/(main)/websites/[id]/realtime/Realtime.tsxindex 7f17190dd..ee710d737 100644--- a/src/app/(main)/websites/[id]/realtime/Realtime.tsx+++ b/src/app/(main)/websites/[id]/realtime/Realtime.tsx@@ -6,16 +6,16 @@ import { Grid, GridRow } from 'components/layout/Grid';import Page from 'components/layout/Page';import RealtimeChart from 'components/metrics/RealtimeChart';import WorldMap from 'components/metrics/WorldMap';+import useApi from 'components/hooks/useApi';+import { useWebsite } from 'components/hooks';+import { percentFilter } from 'lib/filters';+import { REALTIME_RANGE, REALTIME_INTERVAL } from 'lib/constants';+import { RealtimeData } from 'lib/types';import RealtimeLog from './RealtimeLog';import RealtimeHeader from './RealtimeHeader';import RealtimeUrls from './RealtimeUrls';import RealtimeCountries from './RealtimeCountries';import WebsiteHeader from '../WebsiteHeader';-import useApi from 'components/hooks/useApi';-import { percentFilter } from 'lib/filters';-import { REALTIME_RANGE, REALTIME_INTERVAL } from 'lib/constants';-import { useWebsite } from 'components/hooks';-import { RealtimeData } from 'lib/types';import styles from './Realtime.module.css';function mergeData(state = [], data = [], time: number) {diff --git a/src/app/Providers.tsx b/src/app/Providers.tsxindex 0abebf867..c2ddd2ff7 100644--- a/src/app/Providers.tsx+++ b/src/app/Providers.tsx@@ -1,4 +1,5 @@'use client';+import { useEffect, useState } from 'react';import { IntlProvider } from 'react-intl';import { QueryClient, QueryClientProvider } from '@tanstack/react-query';import { ReactBasicsProvider } from 'react-basics';@@ -26,14 +27,18 @@ function MessagesProvider({ children }) {}function SettingsProvider({ children }) {- const hostUrl = process.env.hostUrl || location.origin;-- const config = {- settingsUrl: '/settings/websites',- shareUrl: hostUrl,- trackingCodeUrl: hostUrl,- websitesUrl: `/websites`,- };+ const [config, setConfig] = useState({});++ useEffect(() => {+ const hostUrl = process.env.hostUrl || window?.location.origin;++ setConfig({+ settingsUrl: '/settings/websites',+ shareUrl: hostUrl,+ trackingCodeUrl: hostUrl,+ websitesUrl: `/websites`,+ });+ }, []);return <SettingsContext.Provider value={config}>{children}</SettingsContext.Provider>;}diff --git a/yarn.lock b/yarn.lockindex 1ecdaaf31..b24830a3c 100644--- a/yarn.lock+++ b/yarn.lock@@ -1771,10 +1771,10 @@"@netlify/node-cookies" "^0.1.0"urlpattern-polyfill "8.0.2"-"@next/[email protected]":- version "13.5.6"- resolved "https://registry.yarnpkg.com/@next/env/-/env-13.5.6.tgz#c1148e2e1aa166614f05161ee8f77ded467062bc"- integrity sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw==+"@next/[email protected]":+ version "14.0.4"+ resolved "https://registry.yarnpkg.com/@next/env/-/env-14.0.4.tgz#d5cda0c4a862d70ae760e58c0cd96a8899a2e49a"+ integrity sha512-irQnbMLbUNQpP1wcE5NstJtbuA/69kRfzBrpAD7Gsn8zm/CY6YQYc3HQBz8QPxwISG26tIm5afvvVbu508oBeQ=="@next/[email protected]":version "12.3.4"@@ -1783,50 +1783,50 @@dependencies:glob "7.1.7"-"@next/[email protected]":- version "13.5.6"- resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.6.tgz#b15d139d8971360fca29be3bdd703c108c9a45fb"- integrity sha512-5nvXMzKtZfvcu4BhtV0KH1oGv4XEW+B+jOfmBdpFI3C7FrB/MfujRpWYSBBO64+qbW8pkZiSyQv9eiwnn5VIQA==--"@next/[email protected]":- version "13.5.6"- resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.6.tgz#9c72ee31cc356cb65ce6860b658d807ff39f1578"- integrity sha512-6cgBfxg98oOCSr4BckWjLLgiVwlL3vlLj8hXg2b+nDgm4bC/qVXXLfpLB9FHdoDu4057hzywbxKvmYGmi7yUzA==--"@next/[email protected]":- version "13.5.6"- resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.6.tgz#59f5f66155e85380ffa26ee3d95b687a770cfeab"- integrity sha512-txagBbj1e1w47YQjcKgSU4rRVQ7uF29YpnlHV5xuVUsgCUf2FmyfJ3CPjZUvpIeXCJAoMCFAoGnbtX86BK7+sg==--"@next/[email protected]":- version "13.5.6"- resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.6.tgz#f012518228017052736a87d69bae73e587c76ce2"- integrity sha512-cGd+H8amifT86ZldVJtAKDxUqeFyLWW+v2NlBULnLAdWsiuuN8TuhVBt8ZNpCqcAuoruoSWynvMWixTFcroq+Q==--"@next/[email protected]":- version "13.5.6"- resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.6.tgz#339b867a7e9e7ee727a700b496b269033d820df4"- integrity sha512-Mc2b4xiIWKXIhBy2NBTwOxGD3nHLmq4keFk+d4/WL5fMsB8XdJRdtUlL87SqVCTSaf1BRuQQf1HvXZcy+rq3Nw==--"@next/[email protected]":- version "13.5.6"- resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.6.tgz#ae0ae84d058df758675830bcf70ca1846f1028f2"- integrity sha512-CFHvP9Qz98NruJiUnCe61O6GveKKHpJLloXbDSWRhqhkJdZD2zU5hG+gtVJR//tyW897izuHpM6Gtf6+sNgJPQ==--"@next/[email protected]":- version "13.5.6"- resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.6.tgz#a5cc0c16920485a929a17495064671374fdbc661"- integrity sha512-aFv1ejfkbS7PUa1qVPwzDHjQWQtknzAZWGTKYIAaS4NMtBlk3VyA6AYn593pqNanlicewqyl2jUhQAaFV/qXsg==--"@next/[email protected]":- version "13.5.6"- resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.6.tgz#6a2409b84a2cbf34bf92fe714896455efb4191e4"- integrity sha512-XqqpHgEIlBHvzwG8sp/JXMFkLAfGLqkbVsyN+/Ih1mR8INb6YCc2x/Mbwi6hsAgUnqQztz8cvEbHJUbSl7RHDg==--"@next/[email protected]":- version "13.5.6"- resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.6.tgz#4a3e2a206251abc729339ba85f60bc0433c2865d"- integrity sha512-Cqfe1YmOS7k+5mGu92nl5ULkzpKuxJrP3+4AEuPmrpFZ3BHxTY3TnHmU1On3bFmFFs6FbTcdF58CCUProGpIGQ==+"@next/[email protected]":+ version "14.0.4"+ resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.0.4.tgz#27b1854c2cd04eb1d5e75081a1a792ad91526618"+ integrity sha512-mF05E/5uPthWzyYDyptcwHptucf/jj09i2SXBPwNzbgBNc+XnwzrL0U6BmPjQeOL+FiB+iG1gwBeq7mlDjSRPg==++"@next/[email protected]":+ version "14.0.4"+ resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.0.4.tgz#9940c449e757d0ee50bb9e792d2600cc08a3eb3b"+ integrity sha512-IZQ3C7Bx0k2rYtrZZxKKiusMTM9WWcK5ajyhOZkYYTCc8xytmwSzR1skU7qLgVT/EY9xtXDG0WhY6fyujnI3rw==++"@next/[email protected]":+ version "14.0.4"+ resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.0.4.tgz#0eafd27c8587f68ace7b4fa80695711a8434de21"+ integrity sha512-VwwZKrBQo/MGb1VOrxJ6LrKvbpo7UbROuyMRvQKTFKhNaXjUmKTu7wxVkIuCARAfiI8JpaWAnKR+D6tzpCcM4w==++"@next/[email protected]":+ version "14.0.4"+ resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.0.4.tgz#2b0072adb213f36dada5394ea67d6e82069ae7dd"+ integrity sha512-8QftwPEW37XxXoAwsn+nXlodKWHfpMaSvt81W43Wh8dv0gkheD+30ezWMcFGHLI71KiWmHK5PSQbTQGUiidvLQ==++"@next/[email protected]":+ version "14.0.4"+ resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.0.4.tgz#68c67d20ebc8e3f6ced6ff23a4ba2a679dbcec32"+ integrity sha512-/s/Pme3VKfZAfISlYVq2hzFS8AcAIOTnoKupc/j4WlvF6GQ0VouS2Q2KEgPuO1eMBwakWPB1aYFIA4VNVh667A==++"@next/[email protected]":+ version "14.0.4"+ resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.0.4.tgz#67cd81b42fb2caf313f7992fcf6d978af55a1247"+ integrity sha512-m8z/6Fyal4L9Bnlxde5g2Mfa1Z7dasMQyhEhskDATpqr+Y0mjOBZcXQ7G5U+vgL22cI4T7MfvgtrM2jdopqWaw==++"@next/[email protected]":+ version "14.0.4"+ resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.0.4.tgz#be06585906b195d755ceda28f33c633e1443f1a3"+ integrity sha512-7Wv4PRiWIAWbm5XrGz3D8HUkCVDMMz9igffZG4NB1p4u1KoItwx9qjATHz88kwCEal/HXmbShucaslXCQXUM5w==++"@next/[email protected]":+ version "14.0.4"+ resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.0.4.tgz#e76cabefa9f2d891599c3d85928475bd8d3f6600"+ integrity sha512-zLeNEAPULsl0phfGb4kdzF/cAVIfaC7hY+kt0/d+y9mzcZHsMS3hAS829WbJ31DkSlVKQeHEjZHIdhN+Pg7Gyg==++"@next/[email protected]":+ version "14.0.4"+ resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.0.4.tgz#e74892f1a9ccf41d3bf5979ad6d3d77c07b9cba1"+ integrity sha512-yEh2+R8qDlDCjxVpzOTEpBLQTEFAcP2A8fUFLaWNap9GitYKkKv1//y2S6XY6zsR4rCOPRpU7plYDR+az2n30A=="@nodelib/[email protected]":version "2.1.5"@@ -4949,7 +4949,7 @@ gopd@^1.0.1:dependencies:get-intrinsic "^1.1.3"-graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:+graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.2, graceful-fs@^4.2.4:version "4.2.11"resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==@@ -6330,28 +6330,29 @@ next-basics@^0.39.0:jsonwebtoken "^9.0.0"pure-rand "^6.0.2"- version "13.5.6"- resolved "https://registry.yarnpkg.com/next/-/next-13.5.6.tgz#e964b5853272236c37ce0dd2c68302973cf010b1"- integrity sha512-Y2wTcTbO4WwEsVb4A8VSnOsG1I9ok+h74q0ZdxkwM3EODqrs4pasq7O0iUxbcS9VtWMicG7f3+HAj0r1+NtKSw==+ version "14.0.4"+ resolved "https://registry.yarnpkg.com/next/-/next-14.0.4.tgz#bf00b6f835b20d10a5057838fa2dfced1d0d84dc"+ integrity sha512-qbwypnM7327SadwFtxXnQdGiKpkuhaRLE2uq62/nRul9cj9KhQ5LhHmlziTNqUidZotw/Q1I9OjirBROdUJNgA==dependencies:- "@next/env" "13.5.6"+ "@next/env" "14.0.4""@swc/helpers" "0.5.2"busboy "1.6.0"caniuse-lite "^1.0.30001406"+ graceful-fs "^4.2.11"postcss "8.4.31"styled-jsx "5.1.1"watchpack "2.4.0"optionalDependencies:- "@next/swc-darwin-arm64" "13.5.6"- "@next/swc-darwin-x64" "13.5.6"- "@next/swc-linux-arm64-gnu" "13.5.6"- "@next/swc-linux-arm64-musl" "13.5.6"- "@next/swc-linux-x64-gnu" "13.5.6"- "@next/swc-linux-x64-musl" "13.5.6"- "@next/swc-win32-arm64-msvc" "13.5.6"- "@next/swc-win32-ia32-msvc" "13.5.6"- "@next/swc-win32-x64-msvc" "13.5.6"+ "@next/swc-darwin-arm64" "14.0.4"+ "@next/swc-darwin-x64" "14.0.4"+ "@next/swc-linux-arm64-gnu" "14.0.4"+ "@next/swc-linux-arm64-musl" "14.0.4"+ "@next/swc-linux-x64-gnu" "14.0.4"+ "@next/swc-linux-x64-musl" "14.0.4"+ "@next/swc-win32-arm64-msvc" "14.0.4"+ "@next/swc-win32-ia32-msvc" "14.0.4"+ "@next/swc-win32-x64-msvc" "14.0.4"nice-try@^1.0.4:version "1.0.5"