From 2276c862ba4e7b84622775afab9aa8b898ad423e Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Tue, 7 May 2024 12:52:27 -0600 Subject: [PATCH 1/3] Use latest React 20 in order to fix npm install issues on CI/CD --- package-lock.json | 14 +++++++------- package.json | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index cdc8a6c1b04b..29e1a86a5a38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -78,7 +78,7 @@ "react-content-loader": "^7.0.0", "react-dom": "18.1.0", "react-error-boundary": "^4.0.11", - "react-fast-pdf": "^1.0.12", + "react-fast-pdf": "git+https://github.com/Expensify/react-fast-pdf#b70e79ddfcf7e09b3a1df6339ad272c521d30bc7", "react-map-gl": "^7.1.3", "react-native": "0.73.4", "react-native-android-location-enabler": "^2.0.1", @@ -248,8 +248,8 @@ "yaml": "^2.2.1" }, "engines": { - "node": "20.10.0", - "npm": "10.2.3" + "node": "20.13.0", + "npm": "10.5.2" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -31060,15 +31060,15 @@ }, "node_modules/react-fast-pdf": { "version": "1.0.12", - "resolved": "https://registry.npmjs.org/react-fast-pdf/-/react-fast-pdf-1.0.12.tgz", - "integrity": "sha512-RSIYTwQVKWFqZKtmtzd4JU/FnsqdGPBtHu/N6xl7TsauAFnEouUJNjmC7Rg/pd010OX1UvyraQKdBIZ5Pf2q0A==", + "resolved": "git+ssh://git@github.com/Expensify/react-fast-pdf.git#b70e79ddfcf7e09b3a1df6339ad272c521d30bc7", + "integrity": "sha512-fuVEOmNh214tmnk1cQRmRoDTiBVsQNBDoQtJvHqDeQ5M3D/kEJqrUdbqs3j5xIS0KLpLKw9jf+Taas4ePoFPSA==", "dependencies": { "react-pdf": "^7.7.0", "react-window": "^1.8.10" }, "engines": { - "node": "20.10.0", - "npm": "10.2.3" + "node": ">=20.10.0", + "npm": ">=10.2.3" }, "peerDependencies": { "lodash": "4.x", diff --git a/package.json b/package.json index 1aabe53b5480..538a1cd0a3b3 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "react-content-loader": "^7.0.0", "react-dom": "18.1.0", "react-error-boundary": "^4.0.11", - "react-fast-pdf": "^1.0.12", + "react-fast-pdf": "git+https://github.com/Expensify/react-fast-pdf#b70e79ddfcf7e09b3a1df6339ad272c521d30bc7", "react-map-gl": "^7.1.3", "react-native": "0.73.4", "react-native-android-location-enabler": "^2.0.1", @@ -327,7 +327,7 @@ ] }, "engines": { - "node": "20.10.0", - "npm": "10.2.3" + "node": "20.13.0", + "npm": "10.5.2" } } From 9cf388d2755423945e39ecc6979251e734fc55ce Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Tue, 7 May 2024 13:20:32 -0600 Subject: [PATCH 2/3] Update nvmrc --- .nvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nvmrc b/.nvmrc index d5a159609d09..62d44807d084 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.10.0 +20.13.0 From 6e750a668233a6ef4ec46f076b55f6d448920a63 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Wed, 8 May 2024 08:42:45 -0600 Subject: [PATCH 3/3] Use published version of library --- 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 29e1a86a5a38..700bf07c74e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -78,7 +78,7 @@ "react-content-loader": "^7.0.0", "react-dom": "18.1.0", "react-error-boundary": "^4.0.11", - "react-fast-pdf": "git+https://github.com/Expensify/react-fast-pdf#b70e79ddfcf7e09b3a1df6339ad272c521d30bc7", + "react-fast-pdf": "1.0.13", "react-map-gl": "^7.1.3", "react-native": "0.73.4", "react-native-android-location-enabler": "^2.0.1", @@ -31059,9 +31059,9 @@ } }, "node_modules/react-fast-pdf": { - "version": "1.0.12", - "resolved": "git+ssh://git@github.com/Expensify/react-fast-pdf.git#b70e79ddfcf7e09b3a1df6339ad272c521d30bc7", - "integrity": "sha512-fuVEOmNh214tmnk1cQRmRoDTiBVsQNBDoQtJvHqDeQ5M3D/kEJqrUdbqs3j5xIS0KLpLKw9jf+Taas4ePoFPSA==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/react-fast-pdf/-/react-fast-pdf-1.0.13.tgz", + "integrity": "sha512-rF7NQZ26rJAI8ysRJaG71dl2c7AIq48ibbn7xCyF3lEZ/yOjA8BeR0utRwDjaHGtswQscgETboilhaaH5UtIYg==", "dependencies": { "react-pdf": "^7.7.0", "react-window": "^1.8.10" diff --git a/package.json b/package.json index 538a1cd0a3b3..027bda31f528 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "react-content-loader": "^7.0.0", "react-dom": "18.1.0", "react-error-boundary": "^4.0.11", - "react-fast-pdf": "git+https://github.com/Expensify/react-fast-pdf#b70e79ddfcf7e09b3a1df6339ad272c521d30bc7", + "react-fast-pdf": "1.0.13", "react-map-gl": "^7.1.3", "react-native": "0.73.4", "react-native-android-location-enabler": "^2.0.1",