@graphcommerce/lingui-next 2.1.6 → 2.1.9

package/CHANGELOG.md

@@ -1,5 +1,58 @@
 # Change Log
 
+## 2.1.9
+
+### Patch Changes
+
+- [#1490](https://github.com/graphcommerce-org/graphcommerce/pull/1490) [`d311ef48b`](https://github.com/graphcommerce-org/graphcommerce/commit/d311ef48bb3e97806d992af5516d6b7f183ec9cb) Thanks [@paales](https://github.com/paales)! - upgraded packages
+
+## 2.1.8
+
+### Patch Changes
+
+- [#1451](https://github.com/graphcommerce-org/graphcommerce/pull/1451) [`f698ff85d`](https://github.com/graphcommerce-org/graphcommerce/commit/f698ff85df6bb0922288471bb3c81856091b8061) Thanks [@paales](https://github.com/paales)! - Removed all occurences of @lingui/macro and moved to @lingui/macro / @lingui/core in preparation to move to swc.
+
+  Since we've removed @lingui/macro, all occurences need to be replaced with @lingui/core and @lingui/react.
+
+  All occurences of `<Trans>` and `t` need to be replaced:
+
+  ```tsx
+  import { Trans, t } from '@lingui/macro'
+
+  function MyComponent() {
+    const foo = 'bar'
+    return (
+      <div aria-label={t`Account ${foo}`}>
+        <Trans>My Translation {foo}</Trans>
+      </div>
+    )
+  }
+  ```
+
+  Needs to be replaced with:
+
+  ```tsx
+  import { Trans } from '@lingui/react'
+  import { i18n } from '@lingui/core'
+
+  function MyComponent() {
+    const foo = 'bar'
+    return (
+      <div aria-label={i18n._(/* i18n */ `Account {foo}`, { foo })}>
+        <Trans key='My Translation {foo}' values={{ foo }}></Trans>
+      </div>
+    )
+  }
+  ```
+
+  [More examples for Trans](https://lingui.js.org/ref/macro.html#examples-of-jsx-macros) and [more examples for `t`](https://lingui.js.org/ref/macro.html#examples-of-js-macros)
+
+## 2.1.7
+
+### Patch Changes
+
+- [#1426](https://github.com/graphcommerce-org/graphcommerce/pull/1426) [`100f4c38c`](https://github.com/graphcommerce-org/graphcommerce/commit/100f4c38c8fcda4bc6e0425e38028b550b60adc2) Thanks [@paales](https://github.com/paales)! - Upgrade packages
+
 ## 2.1.6
 
 ### Patch Changes

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/lingui-next",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "2.1.6",
+  "version": "2.1.9",
   "sideEffects": false,
   "scripts": {
     "dev": "tsc -W"
@@ -15,22 +15,23 @@
     }
   },
   "dependencies": {
-    "@lingui/core": "^3.13.2",
-    "@lingui/react": "^3.13.2",
+    "@lingui/core": "^3.13.3",
+    "@lingui/react": "^3.13.3",
     "babel-plugin-macros": "^3.1.0"
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^4.1.5",
+    "@graphcommerce/eslint-config-pwa": "^4.1.8",
     "@graphcommerce/prettier-config-pwa": "^4.0.6",
-    "@graphcommerce/typescript-config-pwa": "^4.0.2",
-    "@playwright/test": "^1.21.1",
-    "@lingui/conf": "^3.13.2"
+    "@graphcommerce/typescript-config-pwa": "^4.0.3",
+    "@lingui/conf": "^3.13.2",
+    "@playwright/test": "^1.21.1"
   },
   "peerDependencies": {
-    "@lingui/macro": "^3.13.2",
-    "next": "12.1.2",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "make-plural": "^6.2.2"
+    "@lingui/react": "^3.13.2",
+    "@lingui/core": "^3.13.2",
+    "make-plural": "^6.2.2",
+    "next": "^12.1.2",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   }
 }

package/utils/withLingui.tsx

@@ -1,11 +1,13 @@
 import { i18n } from '@lingui/core'
 // eslint-disable-next-line @next/next/no-document-import-in-page
-import { DocumentContext } from 'next/document'
+import { DocumentContext, DocumentInitialProps } from 'next/document'
 // eslint-disable-next-line @next/next/no-document-import-in-page
 import type NextDocument from 'next/document'
 import React from 'react'
 import { MessageLoader } from '../types'
 
+export type LinguiDocumentProps = { linguiScriptTag: React.ReactNode }
+
 export function withLingui(
   Document: typeof NextDocument,
   load: MessageLoader,
@@ -23,10 +25,9 @@ export function withLingui(
         i18n.load(locale, messages)
         i18n.activate(locale)
 
-        return {
+        const props: DocumentInitialProps & LinguiDocumentProps = {
           ...initial,
-          head: [
-            ...(React.Children.toArray(initial.head) as Array<JSX.Element | null>),
+          linguiScriptTag: (
             <script
               key='lingui'
               type='application/json'
@@ -34,9 +35,10 @@ export function withLingui(
               lang={locale}
               // eslint-disable-next-line react/no-danger
               dangerouslySetInnerHTML={{ __html: JSON.stringify(messages) }}
-            />,
-          ],
+            />
+          ),
         }
+        return props
       } catch (e) {
         if (process.env.NODE_ENV !== 'production') console.error(e)
         return initial