From 045160264e7f9cbae7bde57b2f4cb24fd8ebaf8d Mon Sep 17 00:00:00 2001 From: Samuel Newman Date: Mon, 23 Feb 2026 22:02:23 +0200 Subject: [PATCH] bump lingui, rm patch --- package.json | 8 +-- patches/@lingui+cli+5.9.1.patch | 20 -------- yarn.lock | 90 ++++++++++++++++----------------- 3 files changed, 49 insertions(+), 69 deletions(-) delete mode 100644 patches/@lingui+cli+5.9.1.patch diff --git a/package.json b/package.json index 79dcd7229a..b54140bbac 100644 --- a/package.json +++ b/package.json @@ -97,8 +97,8 @@ "@growthbook/growthbook-react": "^1.6.5", "@haileyok/bluesky-video": "0.3.2", "@ipld/dag-cbor": "^9.2.0", - "@lingui/core": "^5.9.1", - "@lingui/react": "^5.9.1", + "@lingui/core": "^5.9.2", + "@lingui/react": "^5.9.2", "@mattermost/react-native-paste-input": "mattermost/react-native-paste-input", "@miblanchard/react-native-slider": "^2.6.0", "@mozzius/expo-dynamic-app-icon": "^1.8.0", @@ -237,8 +237,8 @@ "@babel/runtime": "^7.26.0", "@eslint/js": "^9.39.2", "@expo/config-plugins": "~54.0.1", - "@lingui/babel-plugin-lingui-macro": "^5.9.1", - "@lingui/cli": "^5.9.1", + "@lingui/babel-plugin-lingui-macro": "^5.9.2", + "@lingui/cli": "^5.9.2", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15", "@react-native/babel-preset": "0.81.5", "@react-native/eslint-config": "^0.81.5", diff --git a/patches/@lingui+cli+5.9.1.patch b/patches/@lingui+cli+5.9.1.patch deleted file mode 100644 index c70fcce4a3..0000000000 --- a/patches/@lingui+cli+5.9.1.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/node_modules/@lingui/cli/dist/api/catalog.js b/node_modules/@lingui/cli/dist/api/catalog.js -index 191b281..4af924e 100644 ---- a/node_modules/@lingui/cli/dist/api/catalog.js -+++ b/node_modules/@lingui/cli/dist/api/catalog.js -@@ -234,10 +234,12 @@ async function writeCompiled(path, locale, compiledCatalog, namespace) { - await (0, utils_1.writeFile)(filename, compiledCatalog); - return filename; - } -+ -+// hardcoded en-US locale to have consistent sorting -+// @see https://github.com/lingui/js-lingui/pull/1808 -+const collator = new Intl.Collator("en-US"); -+ - const orderByMessage = (a, b) => { -- // hardcoded en-US locale to have consistent sorting -- // @see https://github.com/lingui/js-lingui/pull/1808 -- const collator = new Intl.Collator("en-US"); - const aMsg = a.entry.message || ""; - const bMsg = b.entry.message || ""; - const aCtxt = a.entry.context || ""; diff --git a/yarn.lock b/yarn.lock index 4abbcef314..e0214c0a98 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5435,39 +5435,39 @@ resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== -"@lingui/babel-plugin-extract-messages@5.9.1": - version "5.9.1" - resolved "https://registry.yarnpkg.com/@lingui/babel-plugin-extract-messages/-/babel-plugin-extract-messages-5.9.1.tgz#15a918c123e78713dc9ead65fdf3eaaf69cc94a8" - integrity sha512-py1sAFZmbByl90PpChOehmSXohtw/wyq5l2mLfzhxNfxkhMfiC8hc9E3rK2PXJEhFUa4ocoQO4ANb2blXP41JA== +"@lingui/babel-plugin-extract-messages@5.9.2": + version "5.9.2" + resolved "https://registry.yarnpkg.com/@lingui/babel-plugin-extract-messages/-/babel-plugin-extract-messages-5.9.2.tgz#c593eb9d9ea4f5cd575a47192298d111c71ad933" + integrity sha512-x9HxUUZgnzF5nTsRwCyJxL/csll/psQCeiTiUPMqE1qC9Mq3ZFPygHDUgijIwOCSDnILHM581Fjar/Njvpnnow== -"@lingui/babel-plugin-lingui-macro@5.9.1", "@lingui/babel-plugin-lingui-macro@^5.9.1": - version "5.9.1" - resolved "https://registry.yarnpkg.com/@lingui/babel-plugin-lingui-macro/-/babel-plugin-lingui-macro-5.9.1.tgz#a96377d656110e04929baec8013fdf7f0fb33dcb" - integrity sha512-XcnOZc0unn8ldRc/YDr0AeCUr1nM7195Ja9EKk/+y32imn45smaKP9zvU9jsi7hSH/djtwePyHh6gjYsmvB/Sg== +"@lingui/babel-plugin-lingui-macro@5.9.2", "@lingui/babel-plugin-lingui-macro@^5.9.2": + version "5.9.2" + resolved "https://registry.yarnpkg.com/@lingui/babel-plugin-lingui-macro/-/babel-plugin-lingui-macro-5.9.2.tgz#c0fb29dcbbc26203cf71a812a08a72ee947e8a37" + integrity sha512-xy5MNUvtoAlZwQtfby3B9Dnjmnf3w4Xe+jeLEQvB1wOxz/pYMNGxCWgekUQyihlxvFFRKmMyA88EByqAyvGEug== dependencies: "@babel/core" "^7.20.12" "@babel/runtime" "^7.20.13" "@babel/types" "^7.20.7" - "@lingui/conf" "5.9.1" - "@lingui/core" "5.9.1" - "@lingui/message-utils" "5.9.1" + "@lingui/conf" "5.9.2" + "@lingui/core" "5.9.2" + "@lingui/message-utils" "5.9.2" -"@lingui/cli@^5.9.1": - version "5.9.1" - resolved "https://registry.yarnpkg.com/@lingui/cli/-/cli-5.9.1.tgz#7f6c4b6bce3184b78262bb6d3db892abe8af6f36" - integrity sha512-CF0r2qB9b2DpcwTzysjaeE3VTypJXfRXyQOu98Ro1dEaBYiqW9/ss6MG3FqtQ4OwUhGd3RoMhsWD2ydsFyhi2w== +"@lingui/cli@^5.9.2": + version "5.9.2" + resolved "https://registry.yarnpkg.com/@lingui/cli/-/cli-5.9.2.tgz#bba3b20387e7110d21e59fe6327b2f3885987268" + integrity sha512-jGmIB/hKparFvuyspcn3UTjnQEdOrlnBwkQH3xip0LRCyQNjd1sALi27HDyYQAqVINTfk3sDmLbKixYvJhPl1Q== dependencies: "@babel/core" "^7.21.0" "@babel/generator" "^7.21.1" "@babel/parser" "^7.22.0" "@babel/runtime" "^7.21.0" "@babel/types" "^7.21.2" - "@lingui/babel-plugin-extract-messages" "5.9.1" - "@lingui/babel-plugin-lingui-macro" "5.9.1" - "@lingui/conf" "5.9.1" - "@lingui/core" "5.9.1" - "@lingui/format-po" "5.9.1" - "@lingui/message-utils" "5.9.1" + "@lingui/babel-plugin-extract-messages" "5.9.2" + "@lingui/babel-plugin-lingui-macro" "5.9.2" + "@lingui/conf" "5.9.2" + "@lingui/core" "5.9.2" + "@lingui/format-po" "5.9.2" + "@lingui/message-utils" "5.9.2" chokidar "3.5.1" cli-table "^0.3.11" commander "^10.0.0" @@ -5485,10 +5485,10 @@ source-map "^0.7.6" threads "^1.7.0" -"@lingui/conf@5.9.1": - version "5.9.1" - resolved "https://registry.yarnpkg.com/@lingui/conf/-/conf-5.9.1.tgz#6c82387ec3ea0a3527bf706b4e57b1cd1fcd5ed1" - integrity sha512-Dr1CV4P3INJZZzvLcksgML4kusHQS3pJyONcZt40l/T74LOETUSk2cxFW5epizWU46FpN2ThusvC2yb0L8o1jA== +"@lingui/conf@5.9.2": + version "5.9.2" + resolved "https://registry.yarnpkg.com/@lingui/conf/-/conf-5.9.2.tgz#858208121c7540d0d7629d727fc078a6c383912a" + integrity sha512-tkobrx4HIJDWgYO/qUOJgwOVB5QX+FdQHmk9wetzlhgf0BSc52OCGYeG//oKHteJB0dnr2XYicnTuUtoVwr3+g== dependencies: "@babel/runtime" "^7.20.13" cosmiconfig "^8.0.0" @@ -5496,39 +5496,39 @@ jiti "^2.5.1" picocolors "^1.1.1" -"@lingui/core@5.9.1", "@lingui/core@^5.9.1": - version "5.9.1" - resolved "https://registry.yarnpkg.com/@lingui/core/-/core-5.9.1.tgz#58b2ede38406fd1062a93815d628c197ed81663b" - integrity sha512-gnrh3YMo3yGI7NrYvVL5vtIap2fPahl2OAR0P9Fl/eW6GFPUGhhjIcxqxAg48/Nd4lTAzBCGwPCP+u2DzAIzEA== +"@lingui/core@5.9.2", "@lingui/core@^5.9.2": + version "5.9.2" + resolved "https://registry.yarnpkg.com/@lingui/core/-/core-5.9.2.tgz#63b58a68e1f85970078a8bc3edc92e1d22221763" + integrity sha512-2K2lIEiUJ9VNTZU0igiRUubIUvcHu8TEuS4uRrrA5f2DGgCtHD5o7rw6OO9cM1RxZFCC5rpRwIMDeXHrc44W3g== dependencies: "@babel/runtime" "^7.20.13" - "@lingui/message-utils" "5.9.1" + "@lingui/message-utils" "5.9.2" -"@lingui/format-po@5.9.1": - version "5.9.1" - resolved "https://registry.yarnpkg.com/@lingui/format-po/-/format-po-5.9.1.tgz#882f8ba09e5f1276547ffbcbfb3f13a7ec20d01a" - integrity sha512-UrjFoRuhv5Yj7Tx2OsoxXDmKSEJ8m7xNJUO965WZ1XoI/Y3UHyv3FL+FK1rCP+kuwmjWnvUx+HNsQusvbK7glA== +"@lingui/format-po@5.9.2": + version "5.9.2" + resolved "https://registry.yarnpkg.com/@lingui/format-po/-/format-po-5.9.2.tgz#0eb1a32b149a8d3d81989375178cd4a863b59069" + integrity sha512-PMlJERgG0/rCYqMuBDQdsAuEEUxbqe1apwwDJxIniN9vZpwl+4jDZhDQ6J9CwjlaUPe7rCfOm/B79N88ELwTQQ== dependencies: - "@lingui/conf" "5.9.1" - "@lingui/message-utils" "5.9.1" + "@lingui/conf" "5.9.2" + "@lingui/message-utils" "5.9.2" date-fns "^3.6.0" pofile "^1.1.4" -"@lingui/message-utils@5.9.1": - version "5.9.1" - resolved "https://registry.yarnpkg.com/@lingui/message-utils/-/message-utils-5.9.1.tgz#d8bf6466666e788e91f883ffc3ea8e150a80045a" - integrity sha512-2hj2PqHQU7hI+2+JiViOPmeTmms/8Xl1i/AWd59hwaf+lbqDFKc8CmeZNeAvrM+D7FeYgX1/mDoQvWAkLZNYjQ== +"@lingui/message-utils@5.9.2": + version "5.9.2" + resolved "https://registry.yarnpkg.com/@lingui/message-utils/-/message-utils-5.9.2.tgz#ab4c4cba9eccb29349a65335dc812cf5291778d9" + integrity sha512-PQA+bP4TBX7F5nmrEm9eDk+xddepjO7okI6bsOQ+6LIw1eJMvh9w/Xt3AoKTgzBCwd1ZwyqzBOelrX6sa6y+fg== dependencies: "@messageformat/parser" "^5.0.0" js-sha256 "^0.10.1" -"@lingui/react@^5.9.1": - version "5.9.1" - resolved "https://registry.yarnpkg.com/@lingui/react/-/react-5.9.1.tgz#5b9848c4aa26e60be0879660e33352e43d4aad82" - integrity sha512-wpQ3HjAteTv2hO3749yL8uNL7GQk8pXnylbi0xuZ/QSp6FWXb52glWFadSphqW3LB6voAVsW6mFvkiXUuuiGEg== +"@lingui/react@^5.9.2": + version "5.9.2" + resolved "https://registry.yarnpkg.com/@lingui/react/-/react-5.9.2.tgz#0037fbfa8bad8990d850f866bc9d0fd89f55907b" + integrity sha512-rvDBlz9s1AftAgkJnH/5u3YKlAouRZUsUpSoIajFqkXNEcnIcljFH2Lp7i4nQ7XQ4vpOjzpSH03cggvoo4fWKg== dependencies: "@babel/runtime" "^7.20.13" - "@lingui/core" "5.9.1" + "@lingui/core" "5.9.2" "@mattermost/react-native-paste-input@mattermost/react-native-paste-input": version "0.8.1"