3 files changed, 27 insertions, 25 deletions
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index 6df1a1d..6ff8e1b 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -1,10 +1,10 @@
-import { MatomoProvider } from '@datapunt/matomo-tracker-react';
+import * as matomo from '@socialgouv/matomo-next';
 import { AppPropsWithLayout } from '@ts/types/app';
 import { settings } from '@utils/config';
-import { instance } from '@utils/helpers/matomo';
 import { PrismThemeProvider } from '@utils/providers/prism';
 import { ThemeProvider } from 'next-themes';
 import { useRouter } from 'next/router';
+import { useEffect } from 'react';
 import { IntlProvider } from 'react-intl';
 import '../styles/globals.scss';
 
@@ -12,25 +12,30 @@ const MyApp = ({ Component, pageProps }: AppPropsWithLayout) => {
   const { locale, defaultLocale } = useRouter();
   const appLocale: string = locale || settings.locales.defaultLocale;
 
+  useEffect(() => {
+    matomo.init({
+      url: settings.matomo.urlBase,
+      siteId: settings.matomo.siteId,
+    });
+  }, []);
+
   const getLayout = Component.getLayout ?? ((page) => page);
   return (
-    <MatomoProvider value={instance}>
-      <IntlProvider
-        locale={appLocale}
-        defaultLocale={defaultLocale}
-        messages={pageProps.translation}
+    <IntlProvider
+      locale={appLocale}
+      defaultLocale={defaultLocale}
+      messages={pageProps.translation}
+    >
+      <ThemeProvider
+        defaultTheme="system"
+        enableColorScheme={true}
+        enableSystem={true}
       >
-        <ThemeProvider
-          defaultTheme="system"
-          enableColorScheme={true}
-          enableSystem={true}
-        >
-          <PrismThemeProvider>
-            {getLayout(<Component {...pageProps} />)}
-          </PrismThemeProvider>
-        </ThemeProvider>
-      </IntlProvider>
-    </MatomoProvider>
+        <PrismThemeProvider>
+          {getLayout(<Component {...pageProps} />)}
+        </PrismThemeProvider>
+      </ThemeProvider>
+    </IntlProvider>
   );
 };
 
diff --git a/src/utils/config.ts b/src/utils/config.ts
index dc009d9..07d42a3 100644
--- a/src/utils/config.ts
+++ b/src/utils/config.ts
@@ -13,6 +13,10 @@ export const settings = {
     defaultCountry: 'FR',
     supported: ['en', 'fr'],
   },
+  matomo: {
+    urlBase: process.env.NEXT_PUBLIC_MATOMO_URL || '',
+    siteId: process.env.NEXT_PUBLIC_MATOMO_SITE_ID || '0',
+  },
   postsPerPage: 10,
   twitterId: '@ArmandPhilippot',
   url: process.env.NEXT_PUBLIC_FRONTEND_URL,
diff --git a/src/utils/helpers/matomo.ts b/src/utils/helpers/matomo.ts
deleted file mode 100644
index 6930196..0000000
--- a/src/utils/helpers/matomo.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createInstance } from '@datapunt/matomo-tracker-react';
-
-export const instance = createInstance({
-  urlBase: process.env.NEXT_PUBLIC_MATOMO_URL || '',
-  siteId: Number(process.env.NEXT_PUBLIC_MATOMO_SITE_ID) || 0,
-  linkTracking: true,
-});