From 82951ed7ff6828ab2898cb3aa69a5c9bb2e3a07b Mon Sep 17 00:00:00 2001 From: Francesco Sansalvadore Date: Tue, 9 May 2023 08:56:03 +0200 Subject: [PATCH] chore: remove browser-session-tabs --- apps/docs/package.json | 1 - apps/docs/pages/_app.tsx | 11 -------- apps/www/lib/telemetry.ts | 2 -- apps/www/package.json | 1 - apps/www/pages/_app.tsx | 11 -------- package-lock.json | 37 -------------------------- packages/common/hooks/index.ts | 2 +- studio/components/ui/PageTelemetry.tsx | 2 -- studio/lib/telemetry.ts | 3 --- studio/package.json | 1 - studio/pages/_app.tsx | 10 ------- 11 files changed, 1 insertion(+), 80 deletions(-) diff --git a/apps/docs/package.json b/apps/docs/package.json index 7f8438339e1..0eb29301d62 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -56,7 +56,6 @@ "@supabase/supabase-js": "^2.13.0", "algoliasearch": "^4.14.2", "babel": "^6.23.0", - "browser-session-tabs": "^3.0.0", "clsx": "^1.2.1", "common": "*", "config": "*", diff --git a/apps/docs/pages/_app.tsx b/apps/docs/pages/_app.tsx index 7234e438f59..7c3519884b8 100644 --- a/apps/docs/pages/_app.tsx +++ b/apps/docs/pages/_app.tsx @@ -12,8 +12,6 @@ import Favicons from '~/components/Favicons' import SiteLayout from '~/layouts/SiteLayout' import { API_URL, IS_PLATFORM, LOCAL_SUPABASE } from '~/lib/constants' import { post } from '~/lib/fetchWrappers' -import { BrowserTabTracker } from 'browser-session-tabs' -import { v4 as uuidv4 } from 'uuid' import '../styles/ch.scss' import '../styles/main.scss?v=1.0.0' import '../styles/new-docs.scss' @@ -35,19 +33,10 @@ function MyApp({ Component, pageProps }: AppPropsWithLayout) { ga: { screen_resolution: telemetryProps?.screenResolution, language: telemetryProps?.language, - session_id: BrowserTabTracker.sessionId, }, }) } - useEffect(() => { - // Generate browser session id for anon tracking - BrowserTabTracker.initialize({ - storageKey: 'supabase.browser.session', - sessionIdGenerator: () => uuidv4(), - }) - }, []) - useEffect(() => { function handleRouteChange(url: string) { /* diff --git a/apps/www/lib/telemetry.ts b/apps/www/lib/telemetry.ts index 579e3a14f5b..a880edb6f5b 100644 --- a/apps/www/lib/telemetry.ts +++ b/apps/www/lib/telemetry.ts @@ -1,6 +1,5 @@ import { post } from '~/lib/fetchWrapper' import { API_URL, IS_PROD, IS_PREVIEW } from 'lib/constants' -import { BrowserTabTracker } from 'browser-session-tabs' import { NextRouter } from 'next/router' export interface TelemetryEvent { @@ -34,7 +33,6 @@ const sendEvent = (event: TelemetryEvent, gaProps: TelemetryProps, router: NextR ga: { screen_resolution: gaProps?.screenResolution, language: gaProps?.language, - session_id: BrowserTabTracker.sessionId, }, }) } diff --git a/apps/www/package.json b/apps/www/package.json index 8242300daea..cadcf99b872 100644 --- a/apps/www/package.json +++ b/apps/www/package.json @@ -20,7 +20,6 @@ "@next/mdx": "^12.3.2", "@supabase/auth-ui-react": "^0.1.6", "@supabase/supabase-js": "^2.13.0", - "browser-session-tabs": "^3.0.0", "classnames": "^2.3.1", "cobe": "^0.6.2", "common": "*", diff --git a/apps/www/pages/_app.tsx b/apps/www/pages/_app.tsx index 1b5db4d340b..7329be0174e 100644 --- a/apps/www/pages/_app.tsx +++ b/apps/www/pages/_app.tsx @@ -7,8 +7,6 @@ import Meta from '~/components/Favicons' import '../styles/index.css' import { post } from '~/lib/fetchWrapper' import { AuthProvider, ThemeProvider, useTelemetryProps } from 'common' -import { BrowserTabTracker } from 'browser-session-tabs' -import { v4 as uuidv4 } from 'uuid' import Head from 'next/head' export default function MyApp({ Component, pageProps }: AppProps) { @@ -23,19 +21,10 @@ export default function MyApp({ Component, pageProps }: AppProps) { ga: { screen_resolution: telemetryProps?.screenResolution, language: telemetryProps?.language, - session_id: BrowserTabTracker.sessionId, }, }) } - useEffect(() => { - // Generate browser session id for anon tracking - BrowserTabTracker.initialize({ - storageKey: 'supabase.browser.session', - sessionIdGenerator: () => uuidv4(), - }) - }, []) - useEffect(() => { function handleRouteChange(url: string) { handlePageTelemetry(url) diff --git a/package-lock.json b/package-lock.json index 4b3477ab38d..9ed78cb140f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,6 @@ "@supabase/supabase-js": "^2.13.0", "algoliasearch": "^4.14.2", "babel": "^6.23.0", - "browser-session-tabs": "^3.0.0", "clsx": "^1.2.1", "common": "*", "config": "*", @@ -674,7 +673,6 @@ "@next/mdx": "^12.3.2", "@supabase/auth-ui-react": "^0.1.6", "@supabase/supabase-js": "^2.13.0", - "browser-session-tabs": "^3.0.0", "classnames": "^2.3.1", "cobe": "^0.6.2", "common": "*", @@ -12809,22 +12807,6 @@ "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", "dev": true }, - "node_modules/browser-session-tabs": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/browser-session-tabs/-/browser-session-tabs-3.0.0.tgz", - "integrity": "sha512-HBJWkCbcDYFL+hlSGld54SF1SgaiSXnw9vaTPdDeOxT9HCTFt3hVdArIroQ3HDhh9vhqkbl6TkMjTFok0ZfwIA==", - "dependencies": { - "js-cookie": "^3.0.1" - } - }, - "node_modules/browser-session-tabs/node_modules/js-cookie": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz", - "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==", - "engines": { - "node": ">=14" - } - }, "node_modules/browserify-aes": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", @@ -39207,7 +39189,6 @@ "analytics-node": "^3.5.0", "awesome-debounce-promise": "^2.1.0", "blueimp-md5": "^2.19.0", - "browser-session-tabs": "^3.0.0", "clipboard": "^2.0.8", "clsx": "^1.2.1", "common": "*", @@ -48929,21 +48910,6 @@ "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", "dev": true }, - "browser-session-tabs": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/browser-session-tabs/-/browser-session-tabs-3.0.0.tgz", - "integrity": "sha512-HBJWkCbcDYFL+hlSGld54SF1SgaiSXnw9vaTPdDeOxT9HCTFt3hVdArIroQ3HDhh9vhqkbl6TkMjTFok0ZfwIA==", - "requires": { - "js-cookie": "^3.0.1" - }, - "dependencies": { - "js-cookie": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz", - "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==" - } - } - }, "browserify-aes": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", @@ -51572,7 +51538,6 @@ "@types/react": "17.0.39", "algoliasearch": "^4.14.2", "babel": "^6.23.0", - "browser-session-tabs": "^3.0.0", "clsx": "^1.2.1", "common": "*", "config": "*", @@ -66456,7 +66421,6 @@ "aws-sdk": "^2.1354.0", "babel-loader": "^8.2.3", "blueimp-md5": "^2.19.0", - "browser-session-tabs": "^3.0.0", "clipboard": "^2.0.8", "clsx": "^1.2.1", "common": "*", @@ -69909,7 +69873,6 @@ "@types/react-dom": "^17.0.11", "@types/react-syntax-highlighter": "^13.5.2", "autoprefixer": "^10.4.12", - "browser-session-tabs": "^3.0.0", "classnames": "^2.3.1", "cobe": "^0.6.2", "common": "*", diff --git a/packages/common/hooks/index.ts b/packages/common/hooks/index.ts index 1d07190bbf5..65b5a76ec98 100644 --- a/packages/common/hooks/index.ts +++ b/packages/common/hooks/index.ts @@ -1,3 +1,3 @@ export * from './useBreakpoint' export * from './useParams' -export * from './useGoogleAnalyticsProps' +export * from './useTelemetryProps' diff --git a/studio/components/ui/PageTelemetry.tsx b/studio/components/ui/PageTelemetry.tsx index eeda65b6071..f6de24e69b6 100644 --- a/studio/components/ui/PageTelemetry.tsx +++ b/studio/components/ui/PageTelemetry.tsx @@ -1,4 +1,3 @@ -import { BrowserTabTracker } from 'browser-session-tabs' import { useTelemetryProps } from 'common' import { post } from 'lib/common/fetch' import { API_URL, IS_PLATFORM } from 'lib/constants' @@ -74,7 +73,6 @@ const PageTelemetry: FC = ({ children }) => { ga: { screen_resolution: telemetryProps?.screenResolution, language: telemetryProps?.language, - session_id: BrowserTabTracker.sessionId, }, }) } diff --git a/studio/lib/telemetry.ts b/studio/lib/telemetry.ts index 8b75269c02a..9cf951fc0c6 100644 --- a/studio/lib/telemetry.ts +++ b/studio/lib/telemetry.ts @@ -1,7 +1,6 @@ import { post } from 'lib/common/fetch' import { API_URL, IS_PLATFORM } from 'lib/constants' import { User } from 'types' -import { BrowserTabTracker } from 'browser-session-tabs' import { NextRouter } from 'next/router' export interface TelemetryProps { @@ -34,7 +33,6 @@ const sendEvent = ( ga: { screen_resolution: gaProps?.screenResolution, language: gaProps?.language, - session_id: BrowserTabTracker.sessionId, }, }) } @@ -51,7 +49,6 @@ const sendIdentify = (user: User, gaProps?: TelemetryProps) => { ga: { screen_resolution: gaProps?.screenResolution, language: gaProps?.language, - session_id: BrowserTabTracker.sessionId, }, }) } diff --git a/studio/package.json b/studio/package.json index e85e5682e10..2f845d6011e 100644 --- a/studio/package.json +++ b/studio/package.json @@ -41,7 +41,6 @@ "analytics-node": "^3.5.0", "awesome-debounce-promise": "^2.1.0", "blueimp-md5": "^2.19.0", - "browser-session-tabs": "^3.0.0", "clipboard": "^2.0.8", "clsx": "^1.2.1", "common": "*", diff --git a/studio/pages/_app.tsx b/studio/pages/_app.tsx index c35c5c382ae..8a9144cf26f 100644 --- a/studio/pages/_app.tsx +++ b/studio/pages/_app.tsx @@ -50,8 +50,6 @@ import Favicons from 'components/head/Favicons' import { IS_PLATFORM } from 'lib/constants' import { SessionContextProvider } from '@supabase/auth-helpers-react' import { createClient } from '@supabase/supabase-js' -import { BrowserTabTracker } from 'browser-session-tabs' -import { v4 as uuidv4 } from 'uuid' dayjs.extend(customParseFormat) dayjs.extend(utc) @@ -76,14 +74,6 @@ function CustomApp({ Component, pageProps }: AppPropsWithLayout) { const getSavingState = () => rootStore.content.savingState - useEffect(() => { - // Generate browser session id for anon tracking - BrowserTabTracker.initialize({ - storageKey: 'supabase.browser.session', - sessionIdGenerator: () => uuidv4(), - }) - }, []) - // prompt the user if they try and leave with unsaved content store changes useEffect(() => { const warningText = 'You have unsaved changes - are you sure you wish to leave this page?'