From b45fd8a98f8b328e7ec9af8e857471e2dc9e5d92 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Mon, 19 Dec 2022 01:42:25 -0800 Subject: [PATCH 01/25] Update node --- .nvmrc | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.nvmrc b/.nvmrc index 817ba4bf..0828ab79 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v13 \ No newline at end of file +v18 \ No newline at end of file diff --git a/package.json b/package.json index 69e0732d..325b2fe1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "engines": { - "node": "14.x" + "node": "18.x" }, "dependencies": { "@emotion/core": "^10.0.22", From 03d143b09ad943f6454972f31584e592d97d634e Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Mon, 19 Dec 2022 01:57:26 -0800 Subject: [PATCH 02/25] Remove script --- pages/_app.tsx | 14 -------------- src/components/Page.tsx | 19 ------------------- src/lib/gtag.ts | 20 -------------------- src/lib/reloadTwitterScript.ts | 12 ------------ 4 files changed, 65 deletions(-) delete mode 100644 src/lib/gtag.ts delete mode 100644 src/lib/reloadTwitterScript.ts diff --git a/pages/_app.tsx b/pages/_app.tsx index 9fe9417e..25057146 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,20 +1,6 @@ import React from 'react' import App from 'next/app' -import Router from 'next/router' -import { pageview } from 'src/lib/gtag' import GlobalState from 'src/components/GlobalState' -import reloadTwitterScript from 'src/lib/reloadTwitterScript' -import locale from 'src/lib/locale' - -Router.events.on('routeChangeStart', () => { - reloadTwitterScript() -}) - -if (locale === 'jp') { - Router.events.on('routeChangeComplete', (path: string) => { - pageview(path) - }) -} export default class MyApp extends App { public render() { diff --git a/src/components/Page.tsx b/src/components/Page.tsx index 3b0b9a2b..d49e2fac 100644 --- a/src/components/Page.tsx +++ b/src/components/Page.tsx @@ -2,7 +2,6 @@ import Head from 'next/head' import React from 'react' import Favicon from 'src/components/Favicon' import GlobalStyles from 'src/components/GlobalStyles' -import { GA_TRACKING_ID_JP } from 'src/lib/gtag' import locale, { ogLocale } from 'src/lib/locale' const Page = ({ children }: { children: React.ReactNode }) => ( @@ -28,24 +27,6 @@ const Page = ({ children }: { children: React.ReactNode }) => ( - {locale === 'jp' && ( - <> -