Merge branch 'main' into chore/observability

vrcprl · web-flow · commit e345e29f4b14 · 2025-12-11T20:05:03.000-08:00
diff --git a/.changeset/quiet-clowns-bake.md b/.changeset/quiet-clowns-bake.md
@@ -0,0 +1,5 @@
+---
+"lingo.dev": patch
+---
+
+fix language header for PO files
diff --git a/demo/adonisjs/CHANGELOG.md b/demo/adonisjs/CHANGELOG.md
@@ -1,5 +1,12 @@
 # adonis
 
+## 0.0.55
+
+### Patch Changes
+
+- Updated dependencies [[`d7ccd60`](https://github.com/lingodotdev/lingo.dev/commit/d7ccd6000cd980333e7ac4b63da4e2ba624c3de4)]:
+  - lingo.dev@0.117.15
+
 ## 0.0.54
 
 ### Patch Changes
diff --git a/demo/adonisjs/package.json b/demo/adonisjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adonis",
-  "version": "0.0.54",
+  "version": "0.0.55",
   "private": true,
   "type": "module",
   "license": "UNLICENSED",
@@ -63,8 +63,8 @@
     "@vinejs/vine": "3.0.1",
     "edge.js": "6.3.0",
     "lingo.dev": "workspace:*",
-    "react": "19.2.1",
-    "react-dom": "19.2.1",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
     "reflect-metadata": "0.2.2"
   },
   "hotHook": {
diff --git a/demo/next-app/CHANGELOG.md b/demo/next-app/CHANGELOG.md
@@ -1,5 +1,12 @@
 # next-app
 
+## 0.2.107
+
+### Patch Changes
+
+- Updated dependencies [[`d7ccd60`](https://github.com/lingodotdev/lingo.dev/commit/d7ccd6000cd980333e7ac4b63da4e2ba624c3de4)]:
+  - lingo.dev@0.117.15
+
 ## 0.2.106
 
 ### Patch Changes
diff --git a/demo/next-app/package.json b/demo/next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next-app",
-  "version": "0.2.106",
+  "version": "0.2.107",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -11,8 +11,8 @@
   "dependencies": {
     "lingo.dev": "workspace:*",
     "next": "15.3.6",
-    "react": "19.2.1",
-    "react-dom": "19.2.1"
+    "react": "19.2.3",
+    "react-dom": "19.2.3"
   },
   "devDependencies": {
     "@eslint/eslintrc": "3",
diff --git a/demo/react-router-app/CHANGELOG.md b/demo/react-router-app/CHANGELOG.md
@@ -1,5 +1,12 @@
 # react-router-app
 
+## 1.0.16
+
+### Patch Changes
+
+- Updated dependencies [[`d7ccd60`](https://github.com/lingodotdev/lingo.dev/commit/d7ccd6000cd980333e7ac4b63da4e2ba624c3de4)]:
+  - lingo.dev@0.117.15
+
 ## 1.0.15
 
 ### Patch Changes
diff --git a/demo/react-router-app/package.json b/demo/react-router-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-app",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "private": true,
   "type": "module",
   "scripts": {
@@ -14,8 +14,8 @@
     "@react-router/serve": "7.9.6",
     "isbot": "5.1.32",
     "lingo.dev": "workspace:*",
-    "react": "19.2.1",
-    "react-dom": "19.2.1",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
     "react-router": "7.9.6"
   },
   "devDependencies": {
diff --git a/demo/vite-project/package.json b/demo/vite-project/package.json
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@vitejs/plugin-react": "4.4.1",
-    "react": "19.2.1",
-    "react-dom": "19.2.1"
+    "react": "19.2.3",
+    "react-dom": "19.2.3"
   },
   "devDependencies": {
     "@eslint/js": "9.39.1",
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,14 @@
 # lingo.dev
 
+## 0.117.15
+
+### Patch Changes
+
+- [`d7ccd60`](https://github.com/lingodotdev/lingo.dev/commit/d7ccd6000cd980333e7ac4b63da4e2ba624c3de4) Thanks [@vrcprl](https://github.com/vrcprl)! - chore: update React to 19.2.3 to fix CVE-2025-55184 (DoS) and CVE-2025-55183 (source code exposure)
+
+- Updated dependencies [[`d7ccd60`](https://github.com/lingodotdev/lingo.dev/commit/d7ccd6000cd980333e7ac4b63da4e2ba624c3de4)]:
+  - @lingo.dev/_react@0.7.4
+
 ## 0.117.14
 
 ### Patch Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lingo.dev",
-  "version": "0.117.14",
+  "version": "0.117.15",
   "description": "Lingo.dev CLI",
   "private": false,
   "repository": {
@@ -207,7 +207,7 @@
     "plist": "3.1.0",
     "posthog-node": "5.14.0",
     "prettier": "3.6.2",
-    "react": "19.2.1",
+    "react": "19.2.3",
     "rehype-stringify": "10.0.1",
     "remark-disable-tokenizers": "1.1.1",
     "remark-frontmatter": "5.0.0",
diff --git a/packages/cli/src/cli/loaders/po/index.spec.ts b/packages/cli/src/cli/loaders/po/index.spec.ts
@@ -367,6 +367,45 @@ msgstr "[upd] Apple"
     const result = await loader.push("en", updatedData);
     expect(result).toEqual(expectedOutput);
   });
+
+  it("should preserve existing Language header when pushing translations with metadata in first section", async () => {
+    const loader = createLoader();
+    const sourceInput = `msgid ""
+msgstr ""
+"Language: en\\n"
+"Content-Type: text/plain; charset=utf-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"X-Generator: next-intl\\n"
+#: hello.py:1
+msgid "Hello world"
+msgstr "Hello world"`;
+
+    const targetInput = `msgid ""
+msgstr ""
+"Language: es\\n"
+"Content-Type: text/plain; charset=utf-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"X-Generator: next-intl\\n"
+#: hello.py:1
+msgid "Hello world"
+msgstr ""`;
+
+    await loader.pull("en", sourceInput);
+    await loader.pull("es", targetInput);
+
+    const updatedData = {
+      "Hello world": {
+        singular: "Hola mundo",
+        plural: null,
+      },
+    };
+
+    const result = await loader.push("es", updatedData);
+
+    expect(result).toContain('"Language: es\\n"');
+    expect(result).not.toContain('"Language: en\\n"');
+    expect(result).toContain('msgstr "Hola mundo"');
+  });
 });
 
 function createLoader(params: PoLoaderParams = { multiline: false }) {
diff --git a/packages/cli/src/cli/loaders/po/index.ts b/packages/cli/src/cli/loaders/po/index.ts
@@ -63,25 +63,32 @@ export function createPoDataLoader(
           const contextKey = _.keys(sectionPo.translations)[0];
           const entries = sectionPo.translations[contextKey];
           const msgid = Object.keys(entries).find((key) => entries[key].msgid);
-          if (!msgid) {
-            // If the section is empty, try to find it in the current sections
-            const currentSection = currentSections.find((cs) => {
-              const csPo = gettextParser.po.parse(cs);
-              const csContextKey = _.keys(csPo.translations)[0];
-              const csEntries = csPo.translations[csContextKey];
-              const csMsgid = Object.keys(csEntries).find(
-                (key) => csEntries[key].msgid,
-              );
-              return csMsgid === msgid;
-            });
+          
+          // If the section is empty, try to find it in the current sections
+          const currentSection = currentSections.find((cs) => {
+            const csPo = gettextParser.po.parse(cs);
+            const csContextKey = _.keys(csPo.translations)[0];
+            const csEntries = csPo.translations[csContextKey];
+            const csMsgid = Object.keys(csEntries).find(
+              (key) => csEntries[key].msgid,
+            );
+            return csMsgid === msgid;
+          });
 
+          if (!msgid) {
             if (currentSection) {
               return currentSection;
             }
             return section;
           }
           if (data[msgid]) {
+            // Preserve headers from the target file
+            const headers = currentSection
+              ? gettextParser.po.parse(currentSection).headers
+              : sectionPo.headers;
+
             const updatedPo = _.merge({}, sectionPo, {
+              headers,
               translations: {
                 [contextKey]: {
                   [msgid]: {
diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @lingo.dev/\_react
 
+## 0.7.4
+
+### Patch Changes
+
+- [`d7ccd60`](https://github.com/lingodotdev/lingo.dev/commit/d7ccd6000cd980333e7ac4b63da4e2ba624c3de4) Thanks [@vrcprl](https://github.com/vrcprl)! - chore: update React to 19.2.3 to fix CVE-2025-55184 (DoS) and CVE-2025-55183 (source code exposure)
+
 ## 0.7.3
 
 ### Patch Changes
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lingo.dev/_react",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "Lingo.dev React Kit",
   "private": false,
   "repository": {
@@ -55,8 +55,8 @@
     "@vitejs/plugin-react": "4.4.1",
     "chokidar-cli": "3.0.0",
     "next": "15.2.6",
-    "react": "19.2.1",
-    "react-dom": "19.2.1",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
     "tsup": "8.5.1",
     "typescript": "5.9.3",
     "unbuild": "3.6.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"lingo.dev": patch
 +---
++
 +fix language header for PO files