fix: scripts: remove double scripts injection (#5486)

Author: skshetry

gatsby-config.js

@@ -17,6 +17,10 @@ const keywords = [
   'models management'
 ]
 
+const siteUrl = process.env.HEROKU_APP_NAME
+  ? `https://${process.env.HEROKU_APP_NAME}.herokuapp.com/`
+  : 'https://doc.dvc.org'
+
 const plugins = [
   {
     resolve: '@dvcorg/gatsby-theme',
@@ -104,6 +108,23 @@ const plugins = [
   }
 ]
 
+// keep usercentrics plugin before plausible
+let usercentricsSettingsId = process.env.GATSBY_USERCENTRICS_SETTINGS_ID
+if (usercentricsSettingsId) {
+  plugins.push({
+    resolve: 'gatsby-plugin-usercentrics',
+    options: { settingsId: usercentricsSettingsId }
+  })
+}
+plugins.push({
+  resolve: 'gatsby-plugin-plausible',
+  options: {
+    domain: new URL(siteUrl).hostname,
+    apiEndpoint: '/pl/api/event',
+    scriptSrc: '/pl/js/plausible.outbound-links.js'
+  }
+})
+
 if (process.env.GATSBY_GTM_ID) {
   plugins.push({
     resolve: `gatsby-plugin-google-tagmanager`,
@@ -139,9 +160,7 @@ module.exports = {
     description,
     author: 'Iterative',
     keywords,
-    siteUrl: process.env.HEROKU_APP_NAME
-      ? `https://${process.env.HEROKU_APP_NAME}.herokuapp.com/`
-      : 'https://doc.dvc.org',
+    siteUrl,
     title
   },
   developMiddleware: app => {

gatsby-ssr.js

@@ -1 +1,2 @@
+/* eslint-env node */
 export { wrapPageElement } from './gatsby-shared'

package.json

@@ -76,7 +76,6 @@
     "react": "18.3.1",
     "react-collapse": "5.1.1",
     "react-dom": "18.3.1",
-    "react-helmet": "6.1.0",
     "react-instantsearch-dom": "6.40.4",
     "serve-handler": "6.1.6",
     "tailwind-merge": "3.3.1",
@@ -98,7 +97,6 @@
     "@types/promise-polyfill": "6.0.6",
     "@types/react": "18.3.26",
     "@types/react-collapse": "5.0.4",
-    "@types/react-helmet": "6.1.11",
     "@types/react-instantsearch-dom": "6.12.9",
     "@types/react-popover": "0.5.8",
     "babel-jest": "30.2.0",
@@ -113,7 +111,6 @@
     "eslint-plugin-prettier": "5.5.4",
     "eslint-plugin-react": "7.37.5",
     "eslint-plugin-react-hooks": "5.2.0",
-    "gatsby-plugin-react-helmet": "6.15.0",
     "gatsby-plugin-webpack-bundle-analyser-v2": "1.1.32",
     "gatsby-source-filesystem": "5.15.0",
     "globals": "16.4.0",

packages/gatsby-theme/gatsby-config.js

@@ -19,9 +19,6 @@ const imageMaxWidth = 700
 
 module.exports = ({
   simpleLinkerTerms,
-  plausibleSrc = '/pl/js/plausible.outbound-links.js',
-  plausibleAPI = '/pl/api/event',
-  plausibleDomain,
   postCssPlugins = [
     require('tailwindcss/nesting')(require('postcss-nested')),
     autoprefixer,
@@ -41,7 +38,6 @@ module.exports = ({
         postCssPlugins
       }
     },
-    'gatsby-plugin-react-helmet',
     'gatsby-plugin-sitemap',
     glossaryInstanceName && {
       resolve: 'gatsby-source-filesystem',
@@ -166,10 +162,7 @@ module.exports = ({
     author: 'Iterative',
     titleTemplate: '',
     twitterUsername: '',
-    imageAlt: '',
-    plausibleSrc,
-    plausibleAPI,
-    plausibleDomain
+    imageAlt: ''
   },
   trailingSlash: 'never',
   jsxRuntime: 'automatic'

packages/gatsby-theme/gatsby-node.js

@@ -38,9 +38,6 @@ exports.pluginOptionsSchema = ({ Joi }) => {
     argsLinkerPath: Joi.alternatives()
       .try(Joi.string(), Joi.array().items(Joi.string()))
       .default(defaults.argsLinkerPath),
-    plausibleSrc: [Joi.string().optional(), Joi.allow(null)],
-    plausibleAPI: [Joi.string().optional(), Joi.allow(null)],
-    plausibleDomain: [Joi.string().optional(), Joi.allow(null)],
     sentry: Joi.boolean().default(defaults.sentry)
   })
 }
@@ -78,10 +75,7 @@ exports.createSchemaCustomization = async api => {
       fields: {
         author: 'String',
         siteUrl: 'String',
-        titleTemplate: 'String',
-        plausibleSrc: 'String',
-        plausibleDomain: 'String',
-        plausibleAPI: 'String'
+        titleTemplate: 'String'
       }
     })
   ])

packages/gatsby-theme/gatsby-ssr.js

@@ -21,7 +21,6 @@
     "gatsby-plugin-image": "3.15.0",
     "gatsby-plugin-manifest": "5.15.0",
     "gatsby-plugin-postcss": "6.15.0",
-    "gatsby-plugin-react-helmet": "6.15.0",
     "gatsby-plugin-sharp": "5.15.0",
     "gatsby-plugin-sitemap": "6.15.0",
     "gatsby-plugin-svgr": "3.0.0-beta.0",
@@ -50,7 +49,6 @@
     "promise-polyfill": "8.3.0",
     "react-collapse": "5.1.1",
     "react-collapsible": "2.10.0",
-    "react-helmet": "6.1.0",
     "react-intersection-observer": "9.16.0",
     "rehype-parse": "9.0.1",
     "rehype-react": "7.2.0",
@@ -73,7 +71,6 @@
     "@types/isomorphic-fetch": "0.0.39",
     "@types/promise-polyfill": "6.0.6",
     "@types/react-collapse": "5.0.4",
-    "@types/react-helmet": "6.1.11",
     "@types/unist": "3.0.3",
     "stylelint": "16.25.0",
     "typescript": "5.9.3"

packages/gatsby-theme/package.json

@@ -1,5 +1,4 @@
 import cn from 'classnames'
-import { PageProps } from 'gatsby'
 import { ReactNode, useEffect } from 'react'
 
 import 'reset-css'
@@ -8,7 +7,6 @@ import './fonts.css'
 import { handleFirstTab } from '../../utils/front/accessibility'
 import LayoutFooter from '../LayoutFooter'
 import LayoutHeader from '../LayoutHeader'
-import SEO from '../SEO'
 
 import { useRedirects } from './utils'
 
@@ -23,16 +21,14 @@ export interface ILayoutModifiable {
 }
 
 export interface ILayoutComponentProps extends ILayoutModifiable {
-  location: PageProps['location']
   className?: string
   children?: ReactNode
 }
 
 const MainLayout = ({
   className,
   children,
-  modifiers = [],
-  location
+  modifiers = []
 }: ILayoutComponentProps) => {
   useRedirects()
 
@@ -55,7 +51,6 @@ const MainLayout = ({
         'items-center'
       )}
     >
-      <SEO pathname={location.pathname} />
       <LayoutHeader modifiers={modifiers} />
       <main
         className={cn(

packages/gatsby-theme/src/components/MainLayout/index.tsx

@@ -1,50 +1,40 @@
 import { IGatsbyImageData } from 'gatsby-plugin-image'
 import { useMemo } from 'react'
-import { Helmet } from 'react-helmet'
 
 import useSiteMeta from '../../queries/useSiteMeta'
 
-import { buildMetadata, MetaProps, LinkProps } from './helper'
+import { buildMetadata } from './helper'
 
 export interface IPaginatorPageInfo {
   currentPage: number
   nextPage?: string
   previousPage?: string
 }
 
-interface ISEOProps {
+export interface ISEOProps {
   title?: string
   defaultMetaTitle?: boolean
-  skipTitleTemplate?: boolean
   description?: string
   keywords?: string
   imageAlt?: string
   image?: IGatsbyImageData | string
   imageHeight?: number
   imageWidth?: number
-  meta?: MetaProps[]
-  link?: LinkProps[]
   canonicalUrl?: string
   pathname?: string
   pageInfo?: IPaginatorPageInfo
   children?: React.ReactNode
 }
 
-const GATSBY_USERCENTRICS_SETTINGS_ID =
-  process.env.GATSBY_USERCENTRICS_SETTINGS_ID
-
 const SEO: React.FC<ISEOProps> = ({
   title,
   defaultMetaTitle,
-  skipTitleTemplate,
   description,
   keywords,
   image = '/social-share.png',
   imageAlt = '',
   imageHeight = 630,
   imageWidth = 1200,
-  meta = [],
-  link = [],
   canonicalUrl,
   pathname,
   pageInfo,
@@ -84,63 +74,19 @@ const SEO: React.FC<ISEOProps> = ({
     imageHeight,
     pathname
   ])
-
+  const canonical = canonicalUrl || fullUrl
   return (
-    /* @ts-expect-error react-helmet types incompatible with React types */
-    <Helmet
-      htmlAttributes={{
-        lang: 'en'
-      }}
-      defaultTitle={siteMeta.title}
-      title={pageTitle}
-      titleTemplate={
-        skipTitleTemplate
-          ? ''
-          : siteMeta.titleTemplate || `%s | ${siteMeta.title}`
-      }
-      meta={[...prebuildMeta, ...meta]}
-      link={[
-        ...(canonicalUrl
-          ? [
-              {
-                rel: 'canonical',
-                href: canonicalUrl
-              }
-            ]
-          : pathname
-            ? [
-                {
-                  rel: 'canonical',
-                  href: fullUrl
-                }
-              ]
-            : []),
-        ...link
-      ]}
-    >
-      {GATSBY_USERCENTRICS_SETTINGS_ID && (
-        <script src="https://web.cmp.usercentrics.eu/modules/autoblocker.js" />
-      )}
-      {GATSBY_USERCENTRICS_SETTINGS_ID && (
-        <script
-          id="usercentrics-cmp"
-          src="https://web.cmp.usercentrics.eu/ui/loader.js"
-          data-settings-id={GATSBY_USERCENTRICS_SETTINGS_ID}
-          async
-        />
-      )}
-      {siteMeta.plausibleSrc ? (
-        <script
-          defer
-          data-domain={
-            siteMeta.plausibleDomain || new URL(siteMeta.siteUrl).hostname
-          }
-          data-api={siteMeta.plausibleAPI || undefined}
-          src={siteMeta.plausibleSrc}
-        />
-      ) : null}
+    <>
+      <html lang="en" />
+      {canonical && <link rel="canonical" href={canonical} />}
+      <title>
+        {pageTitle ? `${pageTitle} | ${siteMeta.title}` : siteMeta.title}
+      </title>
+      {prebuildMeta.map((m, i) => (
+        <meta key={i} {...m} />
+      ))}
       {children}
-    </Helmet>
+    </>
   )
 }
 

packages/gatsby-theme/src/components/SEO/index.tsx

@@ -7,9 +7,6 @@ interface ISiteMeta {
   siteUrl: string
   titleTemplate: string
   imageAlt?: string
-  plausibleDomain: string | null
-  plausibleSrc: string | null
-  plausibleAPI: string | null
   twitterUsername?: string
 }
 
@@ -26,9 +23,6 @@ export default function useSiteMeta(): ISiteMeta {
           siteUrl
           titleTemplate
           imageAlt
-          plausibleDomain
-          plausibleSrc
-          plausibleAPI
           twitterUsername
         }
       }