From fc0bfec67b6fbb66729ffe928ae64f0db5224b9c Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 26 Nov 2024 18:27:32 +0100 Subject: [PATCH 01/19] chore(deps): use NitroSQLite, add nitro dependency and update Onyx --- package-lock.json | 537 ++++++++++++++++-- package.json | 5 +- ...ve-quick-sqlite+8.1.0+001+bridgeless.patch | 41 -- 3 files changed, 506 insertions(+), 77 deletions(-) delete mode 100644 patches/react-native-quick-sqlite+8.1.0+001+bridgeless.patch diff --git a/package-lock.json b/package-lock.json index 605020a65895..fae18af314f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,7 +95,9 @@ "react-native-launch-arguments": "^4.0.2", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", - "react-native-onyx": "2.0.81", + "react-native-nitro-modules": "^0.17.0", + "react-native-nitro-sqlite": "^9.0.1", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#3b624bb8a0a328ec258b785d41081e462435711a", "react-native-pager-view": "6.5.0", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", @@ -103,7 +105,6 @@ "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#da50d2c5c54e268499047f9cc98b8df4196c1ddf", "react-native-plaid-link-sdk": "11.11.0", "react-native-qrcode-svg": "6.3.11", - "react-native-quick-sqlite": "git+https://github.com/margelo/react-native-nitro-sqlite#99f34ebefa91698945f3ed26622e002bd79489e0", "react-native-reanimated": "3.16.1", "react-native-release-profiler": "^0.2.1", "react-native-render-html": "6.3.1", @@ -3037,7 +3038,7 @@ }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "0.3.9" @@ -3048,7 +3049,7 @@ }, "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { "version": "0.3.9", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", @@ -10723,6 +10724,12 @@ "@sinonjs/commons": "^2.0.0" } }, + "node_modules/@sqltools/formatter": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.5.tgz", + "integrity": "sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==", + "license": "MIT" + }, "node_modules/@storybook/addon-a11y": { "version": "8.1.10", "dev": true, @@ -15492,22 +15499,22 @@ }, "node_modules/@tsconfig/node10": { "version": "1.0.9", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/@tsconfig/node12": { "version": "1.0.11", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/@tsconfig/node14": { "version": "1.0.3", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/@tsconfig/node16": { "version": "1.0.4", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/@turf/along": { @@ -17614,6 +17621,15 @@ "dev": true, "license": "MIT" }, + "node_modules/app-root-path": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz", + "integrity": "sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==", + "license": "MIT", + "engines": { + "node": ">= 6.0.0" + } + }, "node_modules/appdirsjs": { "version": "1.2.7", "license": "MIT" @@ -17747,7 +17763,7 @@ }, "node_modules/arg": { "version": "4.1.3", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/argparse": { @@ -20009,6 +20025,97 @@ "node": ">=8" } }, + "node_modules/cli-highlight": { + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz", + "integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==", + "license": "ISC", + "dependencies": { + "chalk": "^4.0.0", + "highlight.js": "^10.7.1", + "mz": "^2.4.0", + "parse5": "^5.1.1", + "parse5-htmlparser2-tree-adapter": "^6.0.0", + "yargs": "^16.0.0" + }, + "bin": { + "highlight": "bin/highlight" + }, + "engines": { + "node": ">=8.0.0", + "npm": ">=5.0.0" + } + }, + "node_modules/cli-highlight/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/cli-highlight/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/cli-highlight/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/cli-highlight/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/cli-highlight/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cli-highlight/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/cli-spinners": { "version": "2.9.2", "license": "MIT", @@ -20919,7 +21026,7 @@ }, "node_modules/create-require": { "version": "1.1.1", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/create-storybook": { @@ -21836,7 +21943,7 @@ }, "node_modules/diff": { "version": "4.0.2", - "dev": true, + "devOptional": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" @@ -26259,6 +26366,15 @@ "node": ">=8" } }, + "node_modules/highlight.js": { + "version": "10.7.3", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", + "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==", + "license": "BSD-3-Clause", + "engines": { + "node": "*" + } + }, "node_modules/hoist-non-react-statics": { "version": "3.3.2", "license": "BSD-3-Clause", @@ -31041,7 +31157,7 @@ }, "node_modules/make-error": { "version": "1.3.6", - "dev": true, + "devOptional": true, "license": "ISC" }, "node_modules/make-event-props": { @@ -33333,6 +33449,27 @@ "node": ">=4.0.0" } }, + "node_modules/parse5": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", + "license": "MIT" + }, + "node_modules/parse5-htmlparser2-tree-adapter": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", + "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", + "license": "MIT", + "dependencies": { + "parse5": "^6.0.1" + } + }, + "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", + "license": "MIT" + }, "node_modules/parseurl": { "version": "1.3.3", "license": "MIT", @@ -35764,10 +35901,332 @@ "react-native": ">=0.65.0" } }, + "node_modules/react-native-nitro-modules": { + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/react-native-nitro-modules/-/react-native-nitro-modules-0.17.0.tgz", + "integrity": "sha512-o2FtLcBxjidLcJjlM8hGEqVwzJfzZ2ak1vRBeewcEdE1aOahC2seuNBaR/Nokmcog8E4QHFhaNBahEPfIqU+1w==", + "hasInstallScript": true, + "license": "MIT", + "peerDependencies": { + "react": "*", + "react-native": "*" + } + }, + "node_modules/react-native-nitro-sqlite": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/react-native-nitro-sqlite/-/react-native-nitro-sqlite-9.0.1.tgz", + "integrity": "sha512-uV2DzE4UoB19XRI+nuFPIW0cFW26tfDLi/QNkNBuR387m+9HKAuRze6KV/Y8AOQlDkS9sdkLMUYlGwqQPAmqdQ==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "typeorm": "^0.3.20" + }, + "peerDependencies": { + "react": ">=17.0.0", + "react-native": ">=0.74.0", + "react-native-nitro-modules": "*" + } + }, + "node_modules/react-native-nitro-sqlite/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/react-native-nitro-sqlite/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/react-native-nitro-sqlite/node_modules/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, + "node_modules/react-native-nitro-sqlite/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/react-native-nitro-sqlite/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/react-native-nitro-sqlite/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/react-native-nitro-sqlite/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/react-native-nitro-sqlite/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/react-native-nitro-sqlite/node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/react-native-nitro-sqlite/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/react-native-nitro-sqlite/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/react-native-nitro-sqlite/node_modules/mkdirp": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz", + "integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==", + "license": "MIT", + "bin": { + "mkdirp": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/react-native-nitro-sqlite/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/react-native-nitro-sqlite/node_modules/typeorm": { + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.20.tgz", + "integrity": "sha512-sJ0T08dV5eoZroaq9uPKBoNcGslHBR4E4y+EBHs//SiGbblGe7IeduP/IH4ddCcj0qp3PHwDwGnuvqEAnKlq/Q==", + "license": "MIT", + "dependencies": { + "@sqltools/formatter": "^1.2.5", + "app-root-path": "^3.1.0", + "buffer": "^6.0.3", + "chalk": "^4.1.2", + "cli-highlight": "^2.1.11", + "dayjs": "^1.11.9", + "debug": "^4.3.4", + "dotenv": "^16.0.3", + "glob": "^10.3.10", + "mkdirp": "^2.1.3", + "reflect-metadata": "^0.2.1", + "sha.js": "^2.4.11", + "tslib": "^2.5.0", + "uuid": "^9.0.0", + "yargs": "^17.6.2" + }, + "bin": { + "typeorm": "cli.js", + "typeorm-ts-node-commonjs": "cli-ts-node-commonjs.js", + "typeorm-ts-node-esm": "cli-ts-node-esm.js" + }, + "engines": { + "node": ">=16.13.0" + }, + "funding": { + "url": "https://opencollective.com/typeorm" + }, + "peerDependencies": { + "@google-cloud/spanner": "^5.18.0", + "@sap/hana-client": "^2.12.25", + "better-sqlite3": "^7.1.2 || ^8.0.0 || ^9.0.0", + "hdb-pool": "^0.1.6", + "ioredis": "^5.0.4", + "mongodb": "^5.8.0", + "mssql": "^9.1.1 || ^10.0.1", + "mysql2": "^2.2.5 || ^3.0.1", + "oracledb": "^6.3.0", + "pg": "^8.5.1", + "pg-native": "^3.0.0", + "pg-query-stream": "^4.0.0", + "redis": "^3.1.1 || ^4.0.0", + "sql.js": "^1.4.0", + "sqlite3": "^5.0.3", + "ts-node": "^10.7.0", + "typeorm-aurora-data-api-driver": "^2.0.0" + }, + "peerDependenciesMeta": { + "@google-cloud/spanner": { + "optional": true + }, + "@sap/hana-client": { + "optional": true + }, + "better-sqlite3": { + "optional": true + }, + "hdb-pool": { + "optional": true + }, + "ioredis": { + "optional": true + }, + "mongodb": { + "optional": true + }, + "mssql": { + "optional": true + }, + "mysql2": { + "optional": true + }, + "oracledb": { + "optional": true + }, + "pg": { + "optional": true + }, + "pg-native": { + "optional": true + }, + "pg-query-stream": { + "optional": true + }, + "redis": { + "optional": true + }, + "sql.js": { + "optional": true + }, + "sqlite3": { + "optional": true + }, + "ts-node": { + "optional": true + }, + "typeorm-aurora-data-api-driver": { + "optional": true + } + } + }, + "node_modules/react-native-nitro-sqlite/node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/react-native-onyx": { - "version": "2.0.81", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-2.0.81.tgz", - "integrity": "sha512-EwBqruX4lLnlk3KyZp4bst/voekLJFus7UhtvKmDuqR2Iz/FremwE04JW6YxGyc7C6KpbQrCFdWg/oF9ptRAtg==", + "version": "2.0.82", + "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#3b624bb8a0a328ec258b785d41081e462435711a", + "integrity": "sha512-8mVfyfUm6wUwzU0Ghsz8lbxQIOFnn1uBuekFNhpaML/i62IzMDkapNH53nUGM4Nbf6zbjGfDZF4Z3Hg8GMX6NQ==", "license": "MIT", "dependencies": { "ascii-table": "0.0.9", @@ -35786,9 +36245,10 @@ "idb-keyval": "^6.2.1", "react": ">=18.1.0", "react-dom": ">=18.1.0", + "react-native": ">=0.74.0", "react-native-device-info": "^10.3.0", - "react-native-performance": "^5.1.0", - "react-native-quick-sqlite": "^8.0.0-beta.2" + "react-native-nitro-sqlite": "^9.0.1", + "react-native-performance": "^5.1.0" }, "peerDependenciesMeta": { "idb-keyval": { @@ -35797,10 +36257,10 @@ "react-native-device-info": { "optional": true }, - "react-native-performance": { + "react-native-nitro-sqlite": { "optional": true }, - "react-native-quick-sqlite": { + "react-native-performance": { "optional": true } } @@ -35883,16 +36343,6 @@ "react-native-svg": ">=13.2.0" } }, - "node_modules/react-native-quick-sqlite": { - "version": "8.1.0", - "resolved": "git+ssh://git@github.com/margelo/react-native-nitro-sqlite.git#99f34ebefa91698945f3ed26622e002bd79489e0", - "integrity": "sha512-7uuHmOEnc6SOAVoAdvkQhvaYhUZMORM75qo+v6PZoH6Qk21j5CmrcxJE3gNh0FhMfxK73hQ3ZtugC/NI2jVhrw==", - "license": "MIT", - "peerDependencies": { - "react": "*", - "react-native": "*" - } - }, "node_modules/react-native-reanimated": { "version": "3.16.1", "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.16.1.tgz", @@ -37480,6 +37930,12 @@ "@babel/runtime": "^7.9.2" } }, + "node_modules/reflect-metadata": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz", + "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==", + "license": "Apache-2.0" + }, "node_modules/reflect.getprototypeof": { "version": "1.0.3", "dev": true, @@ -38333,6 +38789,19 @@ "version": "1.2.0", "license": "ISC" }, + "node_modules/sha.js": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "license": "(MIT AND BSD-3-Clause)", + "dependencies": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + }, + "bin": { + "sha.js": "bin.js" + } + }, "node_modules/shallow-clone": { "version": "3.0.1", "license": "MIT", @@ -40149,7 +40618,7 @@ }, "node_modules/ts-node": { "version": "10.9.2", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@cspotcode/source-map-support": "^0.8.0", @@ -40191,7 +40660,7 @@ }, "node_modules/ts-node/node_modules/acorn": { "version": "8.11.3", - "dev": true, + "devOptional": true, "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -40202,7 +40671,7 @@ }, "node_modules/ts-node/node_modules/acorn-walk": { "version": "8.3.2", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.4.0" @@ -41003,7 +41472,7 @@ }, "node_modules/v8-compile-cache-lib": { "version": "3.0.1", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/v8-to-istanbul": { @@ -42185,7 +42654,7 @@ }, "node_modules/yn": { "version": "3.1.1", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=6" diff --git a/package.json b/package.json index 889e35a6ae71..6ec8f4ac47bc 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,9 @@ "react-native-launch-arguments": "^4.0.2", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", - "react-native-onyx": "2.0.81", + "react-native-nitro-modules": "^0.17.0", + "react-native-nitro-sqlite": "^9.0.1", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#3b624bb8a0a328ec258b785d41081e462435711a", "react-native-pager-view": "6.5.0", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", @@ -160,7 +162,6 @@ "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#da50d2c5c54e268499047f9cc98b8df4196c1ddf", "react-native-plaid-link-sdk": "11.11.0", "react-native-qrcode-svg": "6.3.11", - "react-native-quick-sqlite": "git+https://github.com/margelo/react-native-nitro-sqlite#99f34ebefa91698945f3ed26622e002bd79489e0", "react-native-reanimated": "3.16.1", "react-native-release-profiler": "^0.2.1", "react-native-render-html": "6.3.1", diff --git a/patches/react-native-quick-sqlite+8.1.0+001+bridgeless.patch b/patches/react-native-quick-sqlite+8.1.0+001+bridgeless.patch deleted file mode 100644 index 8f8a13d684e5..000000000000 --- a/patches/react-native-quick-sqlite+8.1.0+001+bridgeless.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/node_modules/react-native-quick-sqlite/ios/QuickSQLite.mm b/node_modules/react-native-quick-sqlite/ios/QuickSQLite.mm -index 519f31a..308f746 100644 ---- a/node_modules/react-native-quick-sqlite/ios/QuickSQLite.mm -+++ b/node_modules/react-native-quick-sqlite/ios/QuickSQLite.mm -@@ -12,12 +12,12 @@ @implementation QuickSQLite - - RCT_EXPORT_MODULE(QuickSQLite) - -+@synthesize bridge = _bridge; - - RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) { - NSLog(@"Installing QuickSQLite module..."); - -- RCTBridge *bridge = [RCTBridge currentBridge]; -- RCTCxxBridge *cxxBridge = (RCTCxxBridge *)bridge; -+ RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge; - if (cxxBridge == nil) { - return @false; - } -@@ -29,7 +29,7 @@ @implementation QuickSQLite - return @false; - } - auto &runtime = *jsiRuntime; -- auto callInvoker = bridge.jsCallInvoker; -+ auto callInvoker = cxxBridge.jsCallInvoker; - - // Get appGroupID value from Info.plist using key "AppGroup" - NSString *appGroupID = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"ReactNativeQuickSQLite_AppGroup"]; -diff --git a/node_modules/react-native-quick-sqlite/src/index.ts b/node_modules/react-native-quick-sqlite/src/index.ts -index b3e7fc7..7d8930a 100644 ---- a/node_modules/react-native-quick-sqlite/src/index.ts -+++ b/node_modules/react-native-quick-sqlite/src/index.ts -@@ -15,7 +15,7 @@ if (global.__QuickSQLiteProxy == null) { - } - - // Check if we are running on-device (JSI) -- if (global.nativeCallSyncHook == null || QuickSQLiteModule.install == null) { -+ if ((!global.nativeCallSyncHook && !global.RN$Bridgeless) || QuickSQLiteModule.install == null) { - throw new Error( - 'Failed to install react-native-quick-sqlite: React Native is not running on-device. QuickSQLite can only be used when synchronous method invocations (JSI) are possible. If you are using a remote debugger (e.g. Chrome), switch to an on-device debugger (e.g. Flipper) instead.' - ); From 30bc2f35fc8feb424c80695b2bf7522da6d3aef1 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 26 Nov 2024 18:32:41 +0100 Subject: [PATCH 02/19] chore: update pods --- ios/Podfile.lock | 76 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 25 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 21633b432c12..f5cdadb5ae92 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -287,6 +287,27 @@ PODS: - nanopb/encode (= 2.30908.0) - nanopb/decode (2.30908.0) - nanopb/encode (2.30908.0) + - NitroModules (0.17.0): + - DoubleConversion + - glog + - hermes-engine + - RCT-Folly (= 2024.01.01.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-ImageManager + - React-NativeModulesApple + - React-RCTFabric + - React-rendererdebug + - React-utils + - ReactCodegen + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - Yoga - Onfido (29.7.2) - onfido-react-native-sdk (10.6.0): - DoubleConversion @@ -1873,27 +1894,6 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - react-native-quick-sqlite (8.1.0): - - DoubleConversion - - glog - - hermes-engine - - RCT-Folly (= 2024.01.01.00) - - RCTRequired - - RCTTypeSafety - - React-Core - - React-debug - - React-Fabric - - React-featureflags - - React-graphics - - React-ImageManager - - React-NativeModulesApple - - React-RCTFabric - - React-rendererdebug - - React-utils - - ReactCodegen - - ReactCommon/turbomodule/bridging - - ReactCommon/turbomodule/core - - Yoga - react-native-release-profiler (0.2.1): - DoubleConversion - glog @@ -2461,6 +2461,28 @@ PODS: - ReactCommon/turbomodule/core - Turf - Yoga + - RNNitroSQLite (9.0.1): + - DoubleConversion + - glog + - hermes-engine + - NitroModules + - RCT-Folly (= 2024.01.01.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-ImageManager + - React-NativeModulesApple + - React-RCTFabric + - React-rendererdebug + - React-utils + - ReactCodegen + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - Yoga - RNPermissions (3.10.1): - DoubleConversion - glog @@ -2759,6 +2781,7 @@ DEPENDENCIES: - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`) - lottie-react-native (from `../node_modules/lottie-react-native`) + - NitroModules (from `../node_modules/react-native-nitro-modules`) - "onfido-react-native-sdk (from `../node_modules/@onfido/react-native-sdk`)" - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) @@ -2807,7 +2830,6 @@ DEPENDENCIES: - react-native-pdf (from `../node_modules/react-native-pdf`) - react-native-performance (from `../node_modules/react-native-performance`) - react-native-plaid-link-sdk (from `../node_modules/react-native-plaid-link-sdk`) - - react-native-quick-sqlite (from `../node_modules/react-native-quick-sqlite`) - react-native-release-profiler (from `../node_modules/react-native-release-profiler`) - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) - react-native-view-shot (from `../node_modules/react-native-view-shot`) @@ -2853,6 +2875,7 @@ DEPENDENCIES: - "RNLiveMarkdown (from `../node_modules/@expensify/react-native-live-markdown`)" - RNLocalize (from `../node_modules/react-native-localize`) - "rnmapbox-maps (from `../node_modules/@rnmapbox/maps`)" + - RNNitroSQLite (from `../node_modules/react-native-nitro-sqlite`) - RNPermissions (from `../node_modules/react-native-permissions`) - RNReactNativeHapticFeedback (from `../node_modules/react-native-haptic-feedback`) - RNReanimated (from `../node_modules/react-native-reanimated`) @@ -2940,6 +2963,8 @@ EXTERNAL SOURCES: :tag: hermes-2024-08-15-RNv0.75.1-4b3bf912cc0f705b51b71ce1a5b8bd79b93a451b lottie-react-native: :path: "../node_modules/lottie-react-native" + NitroModules: + :path: "../node_modules/react-native-nitro-modules" onfido-react-native-sdk: :path: "../node_modules/@onfido/react-native-sdk" RCT-Folly: @@ -3032,8 +3057,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-performance" react-native-plaid-link-sdk: :path: "../node_modules/react-native-plaid-link-sdk" - react-native-quick-sqlite: - :path: "../node_modules/react-native-quick-sqlite" react-native-release-profiler: :path: "../node_modules/react-native-release-profiler" react-native-safe-area-context: @@ -3124,6 +3147,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-localize" rnmapbox-maps: :path: "../node_modules/@rnmapbox/maps" + RNNitroSQLite: + :path: "../node_modules/react-native-nitro-sqlite" RNPermissions: :path: "../node_modules/react-native-permissions" RNReactNativeHapticFeedback: @@ -3193,6 +3218,7 @@ SPEC CHECKSUMS: MapboxMaps: e76b14f52c54c40b76ddecd04f40448e6f35a864 MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6 nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 + NitroModules: 119541aaf2162753c635912a987d0da7f429c131 Onfido: f3af62ea1c9a419589c133e3e511e5d2c4f3f8af onfido-react-native-sdk: 4ccfdeb10f9ccb4a5799d2555cdbc2a068a42c0d Plaid: c32f22ffce5ec67c9e6147eaf6c4d7d5f8086d89 @@ -3243,7 +3269,6 @@ SPEC CHECKSUMS: react-native-pdf: dd6ae39a93607a80919bef9f3499e840c693989d react-native-performance: 3c608307be10964f8a97d3af462f37125b6d8fa5 react-native-plaid-link-sdk: f91a22b45b7c3d4cd6c47273200dc57df35068b0 - react-native-quick-sqlite: 7c793c9f5834e756b336257a8d8b8239b7ceb451 react-native-release-profiler: 131ec5e4145d900b2be2a8d6641e2ce0dd784259 react-native-safe-area-context: 38fdd9b3c5561de7cabae64bd0cd2ce05d2768a1 react-native-view-shot: 6b7ed61d77d88580fed10954d45fad0eb2d47688 @@ -3289,6 +3314,7 @@ SPEC CHECKSUMS: RNLiveMarkdown: 8338447b39fcd86596c74b9e0e9509e365a2dd3b RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81 rnmapbox-maps: 460d6ff97ae49c7d5708c3212c6521697c36a0c4 + RNNitroSQLite: baa56030b3fe4626331355c4121bafbb1733a72b RNPermissions: 0b1429b55af59d1d08b75a8be2459f65a8ac3f28 RNReactNativeHapticFeedback: 73756a3477a5a622fa16862a3ab0d0fc5e5edff5 RNReanimated: 2d728bad3a69119be89c3431ee0ccda026ecffdc From 2b8984b000e0aa0a198d1f0c7a5911b7d04924db Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 26 Nov 2024 18:32:54 +0100 Subject: [PATCH 03/19] fix: make necessary changes for NitroSQLite --- src/libs/ExportOnyxState/index.native.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libs/ExportOnyxState/index.native.ts b/src/libs/ExportOnyxState/index.native.ts index 2ad9af0bf54c..c0934c038434 100644 --- a/src/libs/ExportOnyxState/index.native.ts +++ b/src/libs/ExportOnyxState/index.native.ts @@ -1,5 +1,6 @@ import RNFS from 'react-native-fs'; -import {open} from 'react-native-quick-sqlite'; +import {open} from 'react-native-nitro-sqlite'; +import type {OnyxSQLiteKeyValuePair} from 'react-native-onyx'; import Share from 'react-native-share'; import CONST from '@src/CONST'; import ExportOnyxState from './common'; @@ -9,11 +10,11 @@ const readFromOnyxDatabase = () => const db = open({name: CONST.DEFAULT_DB_NAME}); const query = `SELECT * FROM ${CONST.DEFAULT_TABLE_NAME}`; - db.executeAsync(query, []).then(({rows}) => { + db.executeAsync(query, []).then(({rows}) => { // eslint-disable-next-line no-underscore-dangle const result = rows?._array.reduce>((acc, row) => { // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access - acc[row?.record_key] = JSON.parse(row?.valueJSON as string) as unknown; + acc[row?.record_key] = JSON.parse(row?.valueJSON) as unknown; return acc; }, {}); resolve(result); From 4d0a2ba9463cff3ef7f8c7c1c1606591aa3b9b72 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 26 Nov 2024 20:26:51 +0100 Subject: [PATCH 04/19] fix: downgrade nitro --- ios/Podfile.lock | 4 ++-- package-lock.json | 8 ++++---- package.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f5cdadb5ae92..469c2019655d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -287,7 +287,7 @@ PODS: - nanopb/encode (= 2.30908.0) - nanopb/decode (2.30908.0) - nanopb/encode (2.30908.0) - - NitroModules (0.17.0): + - NitroModules (0.16.2): - DoubleConversion - glog - hermes-engine @@ -3218,7 +3218,7 @@ SPEC CHECKSUMS: MapboxMaps: e76b14f52c54c40b76ddecd04f40448e6f35a864 MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6 nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 - NitroModules: 119541aaf2162753c635912a987d0da7f429c131 + NitroModules: d39b4b0dda052a156469fb1082307bab590cf151 Onfido: f3af62ea1c9a419589c133e3e511e5d2c4f3f8af onfido-react-native-sdk: 4ccfdeb10f9ccb4a5799d2555cdbc2a068a42c0d Plaid: c32f22ffce5ec67c9e6147eaf6c4d7d5f8086d89 diff --git a/package-lock.json b/package-lock.json index fae18af314f2..c8183cc54baf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,7 +95,7 @@ "react-native-launch-arguments": "^4.0.2", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", - "react-native-nitro-modules": "^0.17.0", + "react-native-nitro-modules": "^0.16.1", "react-native-nitro-sqlite": "^9.0.1", "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#3b624bb8a0a328ec258b785d41081e462435711a", "react-native-pager-view": "6.5.0", @@ -35902,9 +35902,9 @@ } }, "node_modules/react-native-nitro-modules": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/react-native-nitro-modules/-/react-native-nitro-modules-0.17.0.tgz", - "integrity": "sha512-o2FtLcBxjidLcJjlM8hGEqVwzJfzZ2ak1vRBeewcEdE1aOahC2seuNBaR/Nokmcog8E4QHFhaNBahEPfIqU+1w==", + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/react-native-nitro-modules/-/react-native-nitro-modules-0.16.2.tgz", + "integrity": "sha512-5/Sxs1je8q0GY6FH0p8iMvZdZmmuQU0d0s8A7pQRSTL0nYopNVh/WVSsEqjtS7Bv52uqJhBObK2S9p2sUV/++Q==", "hasInstallScript": true, "license": "MIT", "peerDependencies": { diff --git a/package.json b/package.json index 6ec8f4ac47bc..48c0046cf440 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,7 @@ "react-native-launch-arguments": "^4.0.2", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", - "react-native-nitro-modules": "^0.17.0", + "react-native-nitro-modules": "^0.16.1", "react-native-nitro-sqlite": "^9.0.1", "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#3b624bb8a0a328ec258b785d41081e462435711a", "react-native-pager-view": "6.5.0", From ea3068ee7cb0cab104b4cc9930ad6dca5d96278c Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 26 Nov 2024 20:35:37 +0100 Subject: [PATCH 05/19] chore(deps): update nitro to 0.16.2 --- package-lock.json | 12 ++++++++---- package.json | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index c8183cc54baf..bfb98befd175 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,9 +95,9 @@ "react-native-launch-arguments": "^4.0.2", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", - "react-native-nitro-modules": "^0.16.1", + "react-native-nitro-modules": "^0.16.2", "react-native-nitro-sqlite": "^9.0.1", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#3b624bb8a0a328ec258b785d41081e462435711a", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#54fdc81fa484383ec54b72198845d9fdf1550de7", "react-native-pager-view": "6.5.0", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", @@ -36225,8 +36225,8 @@ }, "node_modules/react-native-onyx": { "version": "2.0.82", - "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#3b624bb8a0a328ec258b785d41081e462435711a", - "integrity": "sha512-8mVfyfUm6wUwzU0Ghsz8lbxQIOFnn1uBuekFNhpaML/i62IzMDkapNH53nUGM4Nbf6zbjGfDZF4Z3Hg8GMX6NQ==", + "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#54fdc81fa484383ec54b72198845d9fdf1550de7", + "integrity": "sha512-qSrAQvykRzOQcsRIbAsXyPIJF8hyYs5rXzB+b+U/v0J97e0CzTAMGi3veXRlRUcpHdtaDAEHDilZDorCFS3XsQ==", "license": "MIT", "dependencies": { "ascii-table": "0.0.9", @@ -36247,6 +36247,7 @@ "react-dom": ">=18.1.0", "react-native": ">=0.74.0", "react-native-device-info": "^10.3.0", + "react-native-nitro-modules": "^0.16.2", "react-native-nitro-sqlite": "^9.0.1", "react-native-performance": "^5.1.0" }, @@ -36257,6 +36258,9 @@ "react-native-device-info": { "optional": true }, + "react-native-nitro-modules": { + "optional": true + }, "react-native-nitro-sqlite": { "optional": true }, diff --git a/package.json b/package.json index 48c0046cf440..4ddde4e7283b 100644 --- a/package.json +++ b/package.json @@ -152,9 +152,9 @@ "react-native-launch-arguments": "^4.0.2", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", - "react-native-nitro-modules": "^0.16.1", + "react-native-nitro-modules": "^0.16.2", "react-native-nitro-sqlite": "^9.0.1", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#3b624bb8a0a328ec258b785d41081e462435711a", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#54fdc81fa484383ec54b72198845d9fdf1550de7", "react-native-pager-view": "6.5.0", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", From 9b585496833cb06f76d599487396d1716bf1a6b6 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Wed, 11 Dec 2024 17:21:11 +0100 Subject: [PATCH 06/19] upgrade onyx dep --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index fb359fe0a95e..63502e4ffbbe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -97,7 +97,7 @@ "react-native-modal": "^13.0.0", "react-native-nitro-modules": "^0.16.2", "react-native-nitro-sqlite": "^9.0.1", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#54fdc81fa484383ec54b72198845d9fdf1550de7", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#b41c879d9d274f23abecf7557bd71b43473d9dca", "react-native-pager-view": "6.5.1", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", @@ -32609,9 +32609,9 @@ } }, "node_modules/react-native-onyx": { - "version": "2.0.82", - "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#54fdc81fa484383ec54b72198845d9fdf1550de7", - "integrity": "sha512-qSrAQvykRzOQcsRIbAsXyPIJF8hyYs5rXzB+b+U/v0J97e0CzTAMGi3veXRlRUcpHdtaDAEHDilZDorCFS3XsQ==", + "version": "2.0.85", + "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#b41c879d9d274f23abecf7557bd71b43473d9dca", + "integrity": "sha512-2WzLZhEXatu2ej20bnAOEZUy+/YdWUlEGYQxAuLmScGlhIiuui011NUFMpQS6KJrtmtroFIUJEbYofDS8xstfA==", "license": "MIT", "dependencies": { "ascii-table": "0.0.9", diff --git a/package.json b/package.json index c764dd43a792..ea80a2692139 100644 --- a/package.json +++ b/package.json @@ -160,7 +160,7 @@ "react-native-modal": "^13.0.0", "react-native-nitro-modules": "^0.16.2", "react-native-nitro-sqlite": "^9.0.1", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#54fdc81fa484383ec54b72198845d9fdf1550de7", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#b41c879d9d274f23abecf7557bd71b43473d9dca", "react-native-pager-view": "6.5.1", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", From b85d3dce6c1f538c6c66463a76943c675984d0ea Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 17 Dec 2024 13:18:40 +0100 Subject: [PATCH 07/19] deps: update onyx --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 922342b0f15f..04032b47de77 100644 --- a/package-lock.json +++ b/package-lock.json @@ -97,7 +97,7 @@ "react-native-modal": "^13.0.0", "react-native-nitro-modules": "^0.16.2", "react-native-nitro-sqlite": "^9.0.1", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#b41c879d9d274f23abecf7557bd71b43473d9dca", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#26d555e8556700d1d6d2b3288b8a673e0ea86423", "react-native-pager-view": "6.5.1", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", @@ -32633,9 +32633,9 @@ } }, "node_modules/react-native-onyx": { - "version": "2.0.85", - "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#b41c879d9d274f23abecf7557bd71b43473d9dca", - "integrity": "sha512-2WzLZhEXatu2ej20bnAOEZUy+/YdWUlEGYQxAuLmScGlhIiuui011NUFMpQS6KJrtmtroFIUJEbYofDS8xstfA==", + "version": "2.0.86", + "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#26d555e8556700d1d6d2b3288b8a673e0ea86423", + "integrity": "sha512-+59NJFP2X7vWEL5ZwRi22h6loOb0U1J80yX3lw6VvbelYRgyPNVoZNRJilrKGhECW8hLwE1OSJCqpNk/q7td7g==", "license": "MIT", "dependencies": { "ascii-table": "0.0.9", diff --git a/package.json b/package.json index 73dc22054210..03f1c02b5b6d 100644 --- a/package.json +++ b/package.json @@ -160,7 +160,7 @@ "react-native-modal": "^13.0.0", "react-native-nitro-modules": "^0.16.2", "react-native-nitro-sqlite": "^9.0.1", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#b41c879d9d274f23abecf7557bd71b43473d9dca", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#26d555e8556700d1d6d2b3288b8a673e0ea86423", "react-native-pager-view": "6.5.1", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", From fe9eb48c41fc7849ad09052d1e43a34763337bbc Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Thu, 27 Feb 2025 16:06:03 +0100 Subject: [PATCH 08/19] fix: QuickSQLite patch not needed anymore --- .../react-native-quick-sqlite+8.1.0+002+rn76.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 patches/react-native-quick-sqlite+8.1.0+002+rn76.patch diff --git a/patches/react-native-quick-sqlite+8.1.0+002+rn76.patch b/patches/react-native-quick-sqlite+8.1.0+002+rn76.patch deleted file mode 100644 index 61c60f33ceed..000000000000 --- a/patches/react-native-quick-sqlite+8.1.0+002+rn76.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/node_modules/react-native-quick-sqlite/android/CMakeLists.txt b/node_modules/react-native-quick-sqlite/android/CMakeLists.txt -index 6013234..3ca272f 100644 ---- a/node_modules/react-native-quick-sqlite/android/CMakeLists.txt -+++ b/node_modules/react-native-quick-sqlite/android/CMakeLists.txt -@@ -52,7 +52,6 @@ target_link_libraries( - ${LOG_LIB} - fbjni::fbjni - ReactAndroid::jsi -- ReactAndroid::turbomodulejsijni -- ReactAndroid::react_nativemodule_core -+ ReactAndroid::reactnative - android - ) From f51182a6f41ed57f2c6fd009c452afa3fc2f72bf Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Thu, 27 Feb 2025 16:07:47 +0100 Subject: [PATCH 09/19] fix: update onyx + Nitro + NitroSQLite --- package-lock.json | 34 +++++++++++++++++----------------- package.json | 6 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index def602239459..c108ad30fed2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -102,9 +102,9 @@ "react-native-launch-arguments": "^4.0.2", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", - "react-native-nitro-modules": "^0.16.2", - "react-native-nitro-sqlite": "^9.0.1", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#26d555e8556700d1d6d2b3288b8a673e0ea86423", + "react-native-nitro-modules": "^0.24.1", + "react-native-nitro-sqlite": "^9.1.4", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#a16c7d2d6dbc43a9a018dd19ef009963a8f8c675", "react-native-pager-view": "6.5.1", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", @@ -32617,9 +32617,9 @@ } }, "node_modules/react-native-nitro-modules": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/react-native-nitro-modules/-/react-native-nitro-modules-0.16.2.tgz", - "integrity": "sha512-5/Sxs1je8q0GY6FH0p8iMvZdZmmuQU0d0s8A7pQRSTL0nYopNVh/WVSsEqjtS7Bv52uqJhBObK2S9p2sUV/++Q==", + "version": "0.24.1", + "resolved": "https://registry.npmjs.org/react-native-nitro-modules/-/react-native-nitro-modules-0.24.1.tgz", + "integrity": "sha512-wA04fykLsIObAd/2h0mfl3CGZ7Iqtj9CjnHD9j+yAnMCcYDWYlCV8MICmicWgN6eg4yjrEUDsrfFAYWgCFiCBw==", "hasInstallScript": true, "license": "MIT", "peerDependencies": { @@ -32628,9 +32628,9 @@ } }, "node_modules/react-native-nitro-sqlite": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/react-native-nitro-sqlite/-/react-native-nitro-sqlite-9.0.1.tgz", - "integrity": "sha512-uV2DzE4UoB19XRI+nuFPIW0cFW26tfDLi/QNkNBuR387m+9HKAuRze6KV/Y8AOQlDkS9sdkLMUYlGwqQPAmqdQ==", + "version": "9.1.4", + "resolved": "https://registry.npmjs.org/react-native-nitro-sqlite/-/react-native-nitro-sqlite-9.1.4.tgz", + "integrity": "sha512-DimB9UTrpko+mQUQEtiSr52lvmn2JWUOlHuKpwlQszTVnRju8R50rhYrpqjJwtoRhV3BkScb5jSHTOpJj6iMXg==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -32638,8 +32638,8 @@ }, "peerDependencies": { "react": ">=17.0.0", - "react-native": ">=0.74.0", - "react-native-nitro-modules": "*" + "react-native": ">=0.75.0", + "react-native-nitro-modules": ">=0.24.1" } }, "node_modules/react-native-nitro-sqlite/node_modules/ansi-styles": { @@ -32939,9 +32939,9 @@ } }, "node_modules/react-native-onyx": { - "version": "2.0.86", - "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#26d555e8556700d1d6d2b3288b8a673e0ea86423", - "integrity": "sha512-+59NJFP2X7vWEL5ZwRi22h6loOb0U1J80yX3lw6VvbelYRgyPNVoZNRJilrKGhECW8hLwE1OSJCqpNk/q7td7g==", + "version": "2.0.94", + "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#a16c7d2d6dbc43a9a018dd19ef009963a8f8c675", + "integrity": "sha512-p5hlByD5jL9CfjVwuAMJnODg2QyO7FN/xBCLm6vsngRj8T8IKWY+5sypiGqNUjlRBkNvKEIUsFn1GfZgBChf7A==", "license": "MIT", "dependencies": { "ascii-table": "0.0.9", @@ -32960,10 +32960,10 @@ "idb-keyval": "^6.2.1", "react": ">=18.1.0", "react-dom": ">=18.1.0", - "react-native": ">=0.74.0", + "react-native": ">=0.75.0", "react-native-device-info": "^10.3.0", - "react-native-nitro-modules": "^0.16.2", - "react-native-nitro-sqlite": "^9.0.1", + "react-native-nitro-modules": ">=0.24.1", + "react-native-nitro-sqlite": "^9.1.4", "react-native-performance": "^5.1.0" }, "peerDependenciesMeta": { diff --git a/package.json b/package.json index f92dd3fb73a4..6a13552277e6 100644 --- a/package.json +++ b/package.json @@ -169,9 +169,9 @@ "react-native-launch-arguments": "^4.0.2", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", - "react-native-nitro-modules": "^0.16.2", - "react-native-nitro-sqlite": "^9.0.1", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#26d555e8556700d1d6d2b3288b8a673e0ea86423", + "react-native-nitro-modules": "^0.24.1", + "react-native-nitro-sqlite": "^9.1.4", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#a16c7d2d6dbc43a9a018dd19ef009963a8f8c675", "react-native-pager-view": "6.5.1", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", From af4fa71c6e160eb3dc0928bf56d922e335ba0bf5 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Wed, 5 Mar 2025 16:48:04 +0100 Subject: [PATCH 10/19] update onyx --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index c108ad30fed2..03469f8aa09e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -104,7 +104,7 @@ "react-native-modal": "^13.0.0", "react-native-nitro-modules": "^0.24.1", "react-native-nitro-sqlite": "^9.1.4", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#a16c7d2d6dbc43a9a018dd19ef009963a8f8c675", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#c89bd6d6c837d693f074ec55a3d264080d59b610", "react-native-pager-view": "6.5.1", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", @@ -32940,8 +32940,8 @@ }, "node_modules/react-native-onyx": { "version": "2.0.94", - "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#a16c7d2d6dbc43a9a018dd19ef009963a8f8c675", - "integrity": "sha512-p5hlByD5jL9CfjVwuAMJnODg2QyO7FN/xBCLm6vsngRj8T8IKWY+5sypiGqNUjlRBkNvKEIUsFn1GfZgBChf7A==", + "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#c89bd6d6c837d693f074ec55a3d264080d59b610", + "integrity": "sha512-1wJvygse9Jl3z+Ofya7w0YsPW33/63Jkrbhjpn6/cAHnaTwHv4t+wwtWA5RkriwlY9z6yN9IrKj5gThfjyymgw==", "license": "MIT", "dependencies": { "ascii-table": "0.0.9", diff --git a/package.json b/package.json index 6a13552277e6..8b6fa270d6b6 100644 --- a/package.json +++ b/package.json @@ -171,7 +171,7 @@ "react-native-modal": "^13.0.0", "react-native-nitro-modules": "^0.24.1", "react-native-nitro-sqlite": "^9.1.4", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#a16c7d2d6dbc43a9a018dd19ef009963a8f8c675", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#c89bd6d6c837d693f074ec55a3d264080d59b610", "react-native-pager-view": "6.5.1", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", From ad19ce8a5fac1d9d2521fecbdf47504eb6cfca47 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Wed, 5 Mar 2025 17:27:57 +0100 Subject: [PATCH 11/19] chore(deps): update NitroSQLite version --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 03469f8aa09e..74d0471217f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -103,7 +103,7 @@ "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", "react-native-nitro-modules": "^0.24.1", - "react-native-nitro-sqlite": "^9.1.4", + "react-native-nitro-sqlite": "^9.1.7", "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#c89bd6d6c837d693f074ec55a3d264080d59b610", "react-native-pager-view": "6.5.1", "react-native-pdf": "6.7.3", @@ -32628,9 +32628,9 @@ } }, "node_modules/react-native-nitro-sqlite": { - "version": "9.1.4", - "resolved": "https://registry.npmjs.org/react-native-nitro-sqlite/-/react-native-nitro-sqlite-9.1.4.tgz", - "integrity": "sha512-DimB9UTrpko+mQUQEtiSr52lvmn2JWUOlHuKpwlQszTVnRju8R50rhYrpqjJwtoRhV3BkScb5jSHTOpJj6iMXg==", + "version": "9.1.7", + "resolved": "https://registry.npmjs.org/react-native-nitro-sqlite/-/react-native-nitro-sqlite-9.1.7.tgz", + "integrity": "sha512-pqC/xmhadCwIB5qvlvv9Cll2OUGCD5XGMg+wFUT2tZSgMeForDWqOEERJz8Urz87Niebx0Egi08GCxEU656hjA==", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 8b6fa270d6b6..808687dfb100 100644 --- a/package.json +++ b/package.json @@ -170,7 +170,7 @@ "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", "react-native-nitro-modules": "^0.24.1", - "react-native-nitro-sqlite": "^9.1.4", + "react-native-nitro-sqlite": "^9.1.7", "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#c89bd6d6c837d693f074ec55a3d264080d59b610", "react-native-pager-view": "6.5.1", "react-native-pdf": "6.7.3", From 8bbfafbc0b3ac33230221032000776eb7971a627 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Mon, 7 Apr 2025 14:07:21 +0200 Subject: [PATCH 12/19] update onyx --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index e470b81f7b3e..867e2a49ebe7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -105,7 +105,7 @@ "react-native-modal": "^13.0.0", "react-native-nitro-modules": "^0.24.1", "react-native-nitro-sqlite": "^9.1.7", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#c89bd6d6c837d693f074ec55a3d264080d59b610", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#c2058abb9b1c25569f683dd86494d9056fa8d9b6", "react-native-pager-view": "6.5.2", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", @@ -35213,9 +35213,9 @@ } }, "node_modules/react-native-onyx": { - "version": "2.0.94", - "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#c89bd6d6c837d693f074ec55a3d264080d59b610", - "integrity": "sha512-1wJvygse9Jl3z+Ofya7w0YsPW33/63Jkrbhjpn6/cAHnaTwHv4t+wwtWA5RkriwlY9z6yN9IrKj5gThfjyymgw==", + "version": "2.0.99", + "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#c2058abb9b1c25569f683dd86494d9056fa8d9b6", + "integrity": "sha512-+T7GWzpwQOh/sg36m7f5s4Zn2WYsZYo4s5S/x1OSN2XbaJJtvLa4h1xWoKIAhb4o6KN45DdCqgoQ7AbL1jofLQ==", "license": "MIT", "dependencies": { "ascii-table": "0.0.9", diff --git a/package.json b/package.json index b9561fcea137..cfecdd1abdcc 100644 --- a/package.json +++ b/package.json @@ -172,7 +172,7 @@ "react-native-modal": "^13.0.0", "react-native-nitro-modules": "^0.24.1", "react-native-nitro-sqlite": "^9.1.7", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#c89bd6d6c837d693f074ec55a3d264080d59b610", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#c2058abb9b1c25569f683dd86494d9056fa8d9b6", "react-native-pager-view": "6.5.2", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", From 3fdd007f50aba9c45148e43a043f4ff2d180cab3 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Mon, 14 Apr 2025 17:35:11 +0200 Subject: [PATCH 13/19] update onyx --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index e470b81f7b3e..cd13606c80d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -105,7 +105,7 @@ "react-native-modal": "^13.0.0", "react-native-nitro-modules": "^0.24.1", "react-native-nitro-sqlite": "^9.1.7", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#c89bd6d6c837d693f074ec55a3d264080d59b610", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#024f6f0260abb03d51009d6b1f7516e26b8c9376", "react-native-pager-view": "6.5.2", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", @@ -35213,9 +35213,9 @@ } }, "node_modules/react-native-onyx": { - "version": "2.0.94", - "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#c89bd6d6c837d693f074ec55a3d264080d59b610", - "integrity": "sha512-1wJvygse9Jl3z+Ofya7w0YsPW33/63Jkrbhjpn6/cAHnaTwHv4t+wwtWA5RkriwlY9z6yN9IrKj5gThfjyymgw==", + "version": "2.0.99", + "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#024f6f0260abb03d51009d6b1f7516e26b8c9376", + "integrity": "sha512-qdgirSyuQwDbicR571wo/bj09NrA8Ag6aFVc0kvJnIANmAkrX2mM3szQSLWQ3JUhdXeHC46UW5ijN9xeF77bvQ==", "license": "MIT", "dependencies": { "ascii-table": "0.0.9", diff --git a/package.json b/package.json index b9561fcea137..d3200bd6f620 100644 --- a/package.json +++ b/package.json @@ -172,7 +172,7 @@ "react-native-modal": "^13.0.0", "react-native-nitro-modules": "^0.24.1", "react-native-nitro-sqlite": "^9.1.7", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#c89bd6d6c837d693f074ec55a3d264080d59b610", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#024f6f0260abb03d51009d6b1f7516e26b8c9376", "react-native-pager-view": "6.5.2", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", From f0737f9974731abbef54502f9be5279b61ba19a0 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 15 Apr 2025 11:30:04 +0200 Subject: [PATCH 14/19] Update Podfile.lock --- ios/Podfile.lock | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index c20fd0be9df6..8fe7fd93626c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -313,19 +313,21 @@ PODS: - nanopb/encode (= 2.30908.0) - nanopb/decode (2.30908.0) - nanopb/encode (2.30908.0) - - NitroModules (0.16.2): + - NitroModules (0.24.1): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) - RCTRequired - RCTTypeSafety + - React-callinvoker - React-Core - React-debug - React-Fabric - React-featureflags - React-graphics - React-ImageManager + - React-jsi - React-NativeModulesApple - React-RCTFabric - React-rendererdebug @@ -1933,27 +1935,6 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - react-native-quick-sqlite (8.1.0): - - DoubleConversion - - glog - - hermes-engine - - RCT-Folly (= 2024.11.18.00) - - RCTRequired - - RCTTypeSafety - - React-Core - - React-debug - - React-Fabric - - React-featureflags - - React-graphics - - React-ImageManager - - React-NativeModulesApple - - React-RCTFabric - - React-rendererdebug - - React-utils - - ReactCodegen - - ReactCommon/turbomodule/bridging - - ReactCommon/turbomodule/core - - Yoga - react-native-release-profiler (0.2.1): - DoubleConversion - glog @@ -2592,7 +2573,7 @@ PODS: - ReactCommon/turbomodule/core - Turf - Yoga - - RNNitroSQLite (9.0.1): + - RNNitroSQLite (9.1.7): - DoubleConversion - glog - hermes-engine @@ -3404,7 +3385,7 @@ SPEC CHECKSUMS: MapboxMaps: 05822ab0ee74f7d626e6471572439afe35c1c116 MapboxMobileEvents: d044b9edbe0ec7df60f6c2c9634fe9a7f449266b nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 - NitroModules: d39b4b0dda052a156469fb1082307bab590cf151 + NitroModules: 32f6f1111b1c77b51e7907aa92f4de3b1a1764bc NWWebSocket: 040d22f23438cc09aaeabf537beff67699c3c76d Onfido: f3af62ea1c9a419589c133e3e511e5d2c4f3f8af onfido-react-native-sdk: 1b8abe574234b86a592d7efb4eeada715709e23b @@ -3458,7 +3439,6 @@ SPEC CHECKSUMS: react-native-pdf: e4ae1d67ffaadc6f0e1bb103036276371e446626 react-native-performance: 6171618da76fcf5aaed3eff4e841e44f3fbe05f0 react-native-plaid-link-sdk: e774d5c1d57e10b5a8759dd439bcbd9a6af17fa1 - react-native-quick-sqlite: 407d285646c6ca0674147ea2e08e48e7983409ad react-native-release-profiler: dffea1dd7929bf5cf7da5ad4697dea7d9a062377 react-native-safe-area-context: b3edb1da341e5e61f865763d9e0b6d3d34706464 react-native-view-shot: bb169342812ded991a4a0387e7d0b17cb515e62a @@ -3508,6 +3488,7 @@ SPEC CHECKSUMS: RNLiveMarkdown: e3f49ff5a70a7fb5ba515a390cae767e5e999ac9 RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81 rnmapbox-maps: 1d313fe5d7d18845b3015ffd6994e0c81afbffcd + RNNitroSQLite: db71d23c3de0f570657767ee7dae324496192d23 RNPermissions: ae4949b7250af8edc4791e440490c0f96237b329 RNReactNativeHapticFeedback: 5fdbbaedabc1698dc3bb2a72105fadf63136a451 RNReanimated: 67d8eda35002543abb656f25fa1a457ceeab6807 From c18fd4a39d4e20832fc3db01f22cbf0426e90b6e Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 15 Apr 2025 14:12:13 +0200 Subject: [PATCH 15/19] chore: fix Pods folly version --- ios/Podfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 8fe7fd93626c..d2472b082312 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -317,7 +317,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly (= 2024.01.01.00) + - RCT-Folly (= 2024.11.18.00) - RCTRequired - RCTTypeSafety - React-callinvoker @@ -2578,7 +2578,7 @@ PODS: - glog - hermes-engine - NitroModules - - RCT-Folly (= 2024.01.01.00) + - RCT-Folly (= 2024.11.18.00) - RCTRequired - RCTTypeSafety - React-Core From 083e7ef5352c34dfd9da194e0c303b9a39e2b5f8 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 15 Apr 2025 14:27:50 +0200 Subject: [PATCH 16/19] chore: update onyx --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cd13606c80d0..a3c4c5e0c78b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -105,7 +105,7 @@ "react-native-modal": "^13.0.0", "react-native-nitro-modules": "^0.24.1", "react-native-nitro-sqlite": "^9.1.7", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#024f6f0260abb03d51009d6b1f7516e26b8c9376", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#183f3cfce5945d118c8a0a42aeb57b37110a6e67", "react-native-pager-view": "6.5.2", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", @@ -35214,7 +35214,7 @@ }, "node_modules/react-native-onyx": { "version": "2.0.99", - "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#024f6f0260abb03d51009d6b1f7516e26b8c9376", + "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#183f3cfce5945d118c8a0a42aeb57b37110a6e67", "integrity": "sha512-qdgirSyuQwDbicR571wo/bj09NrA8Ag6aFVc0kvJnIANmAkrX2mM3szQSLWQ3JUhdXeHC46UW5ijN9xeF77bvQ==", "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index d3200bd6f620..46b786df8efe 100644 --- a/package.json +++ b/package.json @@ -172,7 +172,7 @@ "react-native-modal": "^13.0.0", "react-native-nitro-modules": "^0.24.1", "react-native-nitro-sqlite": "^9.1.7", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#024f6f0260abb03d51009d6b1f7516e26b8c9376", + "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#183f3cfce5945d118c8a0a42aeb57b37110a6e67", "react-native-pager-view": "6.5.2", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", From c701d7f37b91246459503a89e35cf97a610b80ba Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 6 May 2025 09:34:56 +0200 Subject: [PATCH 17/19] fix: update onyx and dependencies --- package-lock.json | 33 +++++++++------------------------ package.json | 6 +++--- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 867e2a49ebe7..ceb6adadd856 100644 --- a/package-lock.json +++ b/package-lock.json @@ -103,9 +103,9 @@ "react-native-launch-arguments": "^4.0.2", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", - "react-native-nitro-modules": "^0.24.1", - "react-native-nitro-sqlite": "^9.1.7", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#c2058abb9b1c25569f683dd86494d9056fa8d9b6", + "react-native-nitro-modules": "0.24.1", + "react-native-nitro-sqlite": "9.1.9", + "react-native-onyx": "2.0.105", "react-native-pager-view": "6.5.2", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", @@ -34902,9 +34902,9 @@ } }, "node_modules/react-native-nitro-sqlite": { - "version": "9.1.7", - "resolved": "https://registry.npmjs.org/react-native-nitro-sqlite/-/react-native-nitro-sqlite-9.1.7.tgz", - "integrity": "sha512-pqC/xmhadCwIB5qvlvv9Cll2OUGCD5XGMg+wFUT2tZSgMeForDWqOEERJz8Urz87Niebx0Egi08GCxEU656hjA==", + "version": "9.1.9", + "resolved": "https://registry.npmjs.org/react-native-nitro-sqlite/-/react-native-nitro-sqlite-9.1.9.tgz", + "integrity": "sha512-jMGNfD0a3UN/wQurCtgwSEfZHrFU0/jdIDLx/5Q+iDZJHOERu/Hl/rfrLktt81LNW56kKOwIc9veTMjZaX3oKQ==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -35027,21 +35027,6 @@ "node": ">=8" } }, - "node_modules/react-native-nitro-sqlite/node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", - "license": "BlueOak-1.0.0", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, "node_modules/react-native-nitro-sqlite/node_modules/minimatch": { "version": "9.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", @@ -35213,9 +35198,9 @@ } }, "node_modules/react-native-onyx": { - "version": "2.0.99", - "resolved": "git+ssh://git@github.com/margelo/react-native-onyx.git#c2058abb9b1c25569f683dd86494d9056fa8d9b6", - "integrity": "sha512-+T7GWzpwQOh/sg36m7f5s4Zn2WYsZYo4s5S/x1OSN2XbaJJtvLa4h1xWoKIAhb4o6KN45DdCqgoQ7AbL1jofLQ==", + "version": "2.0.105", + "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-2.0.105.tgz", + "integrity": "sha512-ZOIZAgGdPJBjvuIcVqehEEQAJVHNuv/6K+w8/upwkaQxhI/egbPVpjNOgkQhRhg7qwNSw3WNkUDx+tgvUj0v0A==", "license": "MIT", "dependencies": { "ascii-table": "0.0.9", diff --git a/package.json b/package.json index cfecdd1abdcc..a5aaddbd8dae 100644 --- a/package.json +++ b/package.json @@ -170,9 +170,9 @@ "react-native-launch-arguments": "^4.0.2", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", - "react-native-nitro-modules": "^0.24.1", - "react-native-nitro-sqlite": "^9.1.7", - "react-native-onyx": "git+https://github.com/margelo/react-native-onyx#c2058abb9b1c25569f683dd86494d9056fa8d9b6", + "react-native-nitro-modules": "0.24.1", + "react-native-nitro-sqlite": "9.1.9", + "react-native-onyx": "2.0.105", "react-native-pager-view": "6.5.2", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", From 729fcdec0f836234dbd243c6f7d3218118954b91 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 6 May 2025 09:53:19 +0200 Subject: [PATCH 18/19] Update Podfile.lock --- ios/Podfile.lock | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 1a24c4cfac3e..83846df1347a 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -314,19 +314,21 @@ PODS: - nanopb/encode (= 2.30908.0) - nanopb/decode (2.30908.0) - nanopb/encode (2.30908.0) - - NitroModules (0.16.2): + - NitroModules (0.24.1): - DoubleConversion - glog - hermes-engine - - RCT-Folly (= 2024.01.01.00) + - RCT-Folly (= 2024.11.18.00) - RCTRequired - RCTTypeSafety + - React-callinvoker - React-Core - React-debug - React-Fabric - React-featureflags - React-graphics - React-ImageManager + - React-jsi - React-NativeModulesApple - React-RCTFabric - React-rendererdebug @@ -1934,27 +1936,6 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - react-native-quick-sqlite (8.1.0): - - DoubleConversion - - glog - - hermes-engine - - RCT-Folly (= 2024.11.18.00) - - RCTRequired - - RCTTypeSafety - - React-Core - - React-debug - - React-Fabric - - React-featureflags - - React-graphics - - React-ImageManager - - React-NativeModulesApple - - React-RCTFabric - - React-rendererdebug - - React-utils - - ReactCodegen - - ReactCommon/turbomodule/bridging - - ReactCommon/turbomodule/core - - Yoga - react-native-release-profiler (0.2.1): - DoubleConversion - glog @@ -2617,12 +2598,12 @@ PODS: - ReactCommon/turbomodule/core - Turf - Yoga - - RNNitroSQLite (9.0.1): + - RNNitroSQLite (9.1.9): - DoubleConversion - glog - hermes-engine - NitroModules - - RCT-Folly (= 2024.01.01.00) + - RCT-Folly (= 2024.11.18.00) - RCTRequired - RCTTypeSafety - React-Core @@ -3437,7 +3418,7 @@ SPEC CHECKSUMS: MapboxMaps: 05822ab0ee74f7d626e6471572439afe35c1c116 MapboxMobileEvents: d044b9edbe0ec7df60f6c2c9634fe9a7f449266b nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 - NitroModules: d39b4b0dda052a156469fb1082307bab590cf151 + NitroModules: 32f6f1111b1c77b51e7907aa92f4de3b1a1764bc NWWebSocket: 040d22f23438cc09aaeabf537beff67699c3c76d Onfido: f3af62ea1c9a419589c133e3e511e5d2c4f3f8af onfido-react-native-sdk: 1b8abe574234b86a592d7efb4eeada715709e23b @@ -3491,7 +3472,6 @@ SPEC CHECKSUMS: react-native-pdf: e4ae1d67ffaadc6f0e1bb103036276371e446626 react-native-performance: 6171618da76fcf5aaed3eff4e841e44f3fbe05f0 react-native-plaid-link-sdk: e774d5c1d57e10b5a8759dd439bcbd9a6af17fa1 - react-native-quick-sqlite: 407d285646c6ca0674147ea2e08e48e7983409ad react-native-release-profiler: dffea1dd7929bf5cf7da5ad4697dea7d9a062377 react-native-safe-area-context: b3edb1da341e5e61f865763d9e0b6d3d34706464 react-native-view-shot: bb169342812ded991a4a0387e7d0b17cb515e62a @@ -3543,6 +3523,7 @@ SPEC CHECKSUMS: RNLiveMarkdown: e3f49ff5a70a7fb5ba515a390cae767e5e999ac9 RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81 rnmapbox-maps: 1d313fe5d7d18845b3015ffd6994e0c81afbffcd + RNNitroSQLite: 0243d91c6662d8a334fb4953c969b82884ac6c68 RNPermissions: ae4949b7250af8edc4791e440490c0f96237b329 RNReactNativeHapticFeedback: 5fdbbaedabc1698dc3bb2a72105fadf63136a451 RNReanimated: 67d8eda35002543abb656f25fa1a457ceeab6807 From 4955d493b30f79d0ea85305ed930c4bf21b116b6 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 6 May 2025 18:24:44 +0200 Subject: [PATCH 19/19] fix: remove namespace import --- src/libs/ExportOnyxState/index.native.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/ExportOnyxState/index.native.ts b/src/libs/ExportOnyxState/index.native.ts index e6191c71e2b3..3fd6671c33f8 100644 --- a/src/libs/ExportOnyxState/index.native.ts +++ b/src/libs/ExportOnyxState/index.native.ts @@ -3,7 +3,7 @@ import {open} from 'react-native-nitro-sqlite'; import type {OnyxSQLiteKeyValuePair} from 'react-native-onyx'; import Share from 'react-native-share'; import CONST from '@src/CONST'; -import * as ExportOnyxState from './common'; +import {maskOnyxState} from './common'; const readFromOnyxDatabase = () => new Promise((resolve) => { @@ -40,7 +40,7 @@ const shareAsFile = (value: string) => { }; export default { - maskOnyxState: ExportOnyxState.maskOnyxState, + maskOnyxState, readFromOnyxDatabase, shareAsFile, };