update to latest lingui, remove copy of Trans

next.config.js

@@ -14,7 +14,7 @@ class LinguiTransRscResolver {
             ...request,
             request: request.context.issuerLayer === 'rsc'
               // RSC Version without Context
-              ? path.resolve('./src/i18n/Trans.tsx')
+              ? path.resolve('./src/i18n/rsc-trans.tsx')
               // Regular version
               : '@lingui/react',
           };

package.json

@@ -9,9 +9,9 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@lingui/core": "^4.3.0",
-    "@lingui/macro": "^4.3.0",
-    "@lingui/react": "^4.3.0",
+    "@lingui/core": "^4.4.2",
+    "@lingui/macro": "^4.4.2",
+    "@lingui/react": "^4.4.2",
     "@lingui/swc-plugin": "^4.0.4",
     "@types/node": "20.4.5",
     "@types/react": "18.2.17",
@@ -24,6 +24,6 @@
     "typescript": "5.1.6"
   },
   "devDependencies": {
-    "@lingui/loader": "^4.3.0"
+    "@lingui/loader": "^4.4.2"
   }
 }

src/app/[locale]/page.tsx

@@ -22,16 +22,14 @@ export default async function Home({ params }) {
     i18n,
   );
 
-
-
   return (
     <main className={styles.main}>
       <div className={styles.description}>
         <Trans>Plural Test: How many developers?</Trans>
 
         <LinguiProvider {...i18nSetupData}>
           <ClientComponent></ClientComponent>
-          {/*<Switcher></Switcher>*/}
+          <Switcher></Switcher>
         </LinguiProvider>
 
         <p>

src/i18n/rsc-trans.tsx

@@ -0,0 +1,14 @@
+import React from "react"
+
+import { getI18n } from './locale';
+import { TransNoContext, TransProps } from '@lingui/react/server';
+
+export function Trans(props: TransProps): React.ReactElement<any, any> | null {
+  const i18n = getI18n()
+
+  if (!i18n) {
+    throw new Error('Lingui for RSC is not initialized. Use `setI18n()` first in root of your RSC tree.');
+  }
+
+  return <TransNoContext {...props} lingui={{ i18n }}/>
+}