From aa2eb63352c6e53e8d41c7efad639d2cf0e1a3c8 Mon Sep 17 00:00:00 2001
From: Jan Amann <jan@amann.work>
Date: Tue, 26 Nov 2024 08:58:37 +0100
Subject: [PATCH] ci: Turbo --affected (#1574)

---
 .github/workflows/main.yml                                | 1 +
 docs/src/components/Analytics.tsx                         | 5 -----
 docs/src/pages/_app.tsx                                   | 4 ++--
 packages/next-intl/src/server/react-client/index.test.tsx | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 docs/src/components/Analytics.tsx

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d3f2d73f4..09e61d078 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,6 +11,7 @@ jobs:
     env:
       TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
       TURBO_TEAM: ${{ vars.TURBO_TEAM }}
+      TURBO_SCM_BASE: ${{ github.event_name == 'pull_request' && (github.event.pull_request.base.sha || github.event.before) }}
     steps:
       # General setup
       - uses: actions/checkout@v4
diff --git a/docs/src/components/Analytics.tsx b/docs/src/components/Analytics.tsx
deleted file mode 100644
index 3b273eb1c..000000000
--- a/docs/src/components/Analytics.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import {Analytics as VercelAnalytics} from '@vercel/analytics/react';
-
-export default function Analytics() {
-  return <VercelAnalytics />;
-}
diff --git a/docs/src/pages/_app.tsx b/docs/src/pages/_app.tsx
index 668af4bc7..49a9ae482 100644
--- a/docs/src/pages/_app.tsx
+++ b/docs/src/pages/_app.tsx
@@ -1,8 +1,8 @@
+import {Analytics} from '@vercel/analytics/next';
 import {SpeedInsights} from '@vercel/speed-insights/next';
 import {AppProps} from 'next/app';
 import {Inter} from 'next/font/google';
 import {ReactNode} from 'react';
-import Analytics from '@/components/Analytics';
 import 'nextra-theme-docs/style.css';
 import '../styles.css';
 
@@ -17,8 +17,8 @@ export default function App({Component, pageProps}: Props) {
   return (
     <div className={inter.className}>
       {getLayout(<Component {...pageProps} />)}
-      <Analytics />
       <SpeedInsights />
+      <Analytics />
     </div>
   );
 }
diff --git a/packages/next-intl/src/server/react-client/index.test.tsx b/packages/next-intl/src/server/react-client/index.test.tsx
index de0a04679..786560db4 100644
--- a/packages/next-intl/src/server/react-client/index.test.tsx
+++ b/packages/next-intl/src/server/react-client/index.test.tsx
@@ -15,7 +15,7 @@ describe('getRequestConfig', () => {
       messages: {hello: 'Hello ' + locale}
     }));
     expect(() =>
-      getConfig({locale: 'en', requestLocale: Promise.resolve('en')})
+      getConfig({requestLocale: Promise.resolve('en'), locale: 'en'})
     ).toThrow('`getRequestConfig` is not supported in Client Components.');
   });
 });