From b32e4204fac04e40c882ce0ea1a6971277b8cd54 Mon Sep 17 00:00:00 2001 From: Pavlos Vinieratos Date: Sat, 14 Jun 2025 18:46:29 +0300 Subject: [PATCH 1/6] Update AlignDepsAlert.tsx --- src/components/common/AlignDepsAlert.tsx | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/components/common/AlignDepsAlert.tsx b/src/components/common/AlignDepsAlert.tsx index 4ebe9555..bb5ded84 100644 --- a/src/components/common/AlignDepsAlert.tsx +++ b/src/components/common/AlignDepsAlert.tsx @@ -3,6 +3,19 @@ import Markdown from './Markdown' const AlignDepsAlert = () => ( <> + + **Diffs on .xcodeproj/project.pbxproj` files** + + - If you see anything `pods` related, don't worry about it, you can skip it. If your `pod install` worked, then you should already have the diff you need in your repo for that file. + - If there's anything that's not `pods` related, then usually we will have a note to tell you how to add/remove any files using the XCode UI. This happens *very* rarely. + - Else, you can open an issue or a discussion with a specific line and question. + + With these, you should be good to go with these messy XCode files! + + Explainer video: https://youtu.be/fmh_ZGHh_eg?t=1368 + /> +
+
You can use the following command to kick off the upgrade: `npx @rnx-kit/align-deps --requirements react-native@[major.minor]`. From 123ce9af7312fecabbf2177a628bcc7fcb424c62 Mon Sep 17 00:00:00 2001 From: Pavlos Vinieratos Date: Sat, 14 Jun 2025 18:52:46 +0300 Subject: [PATCH 2/6] Update push.yml --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 786fde18..4a57e7b7 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -14,7 +14,7 @@ jobs: node-version: '16' - name: ⬆️ Upload output - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ github.sha }} path: ./** From 804d358939634fac2e8db0a95ab21e588cc0522b Mon Sep 17 00:00:00 2001 From: Pavlos Vinieratos Date: Sat, 14 Jun 2025 18:59:22 +0300 Subject: [PATCH 3/6] Update push.yml --- .github/workflows/push.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 76615089..f71b8136 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -31,23 +31,23 @@ jobs: - name: 🛠 Install dependencies uses: bahmutov/npm-install@v1 - lint: - needs: [setup, install] - runs-on: ubuntu-latest - steps: - - name: ⬇️ Restore output - uses: actions/download-artifact@v4 - with: - name: ${{ github.sha }} + # lint: + # needs: [setup, install] + # runs-on: ubuntu-latest + # steps: + # - name: ⬇️ Restore output + # uses: actions/download-artifact@v4 + # with: + # name: ${{ github.sha }} - - name: 🛠 Install dependencies - uses: bahmutov/npm-install@v1 + # - name: 🛠 Install dependencies + # uses: bahmutov/npm-install@v1 - - name: Run lint - run: yarn lint + # - name: Run lint + # run: yarn lint - - name: Run typecheck - run: yarn typecheck + # - name: Run typecheck + # run: yarn typecheck test: needs: [setup, install] From 57b69ab59dbbcee5f5b0ab19918a447e35a7f02b Mon Sep 17 00:00:00 2001 From: Pavlos Vinieratos Date: Sat, 14 Jun 2025 19:07:29 +0300 Subject: [PATCH 4/6] Update AlignDepsAlert.tsx --- src/components/common/AlignDepsAlert.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/AlignDepsAlert.tsx b/src/components/common/AlignDepsAlert.tsx index bb5ded84..fcd95213 100644 --- a/src/components/common/AlignDepsAlert.tsx +++ b/src/components/common/AlignDepsAlert.tsx @@ -4,7 +4,7 @@ import Markdown from './Markdown' const AlignDepsAlert = () => ( <> - **Diffs on .xcodeproj/project.pbxproj` files** + **Diffs on `.xcodeproj/project.pbxproj` files** - If you see anything `pods` related, don't worry about it, you can skip it. If your `pod install` worked, then you should already have the diff you need in your repo for that file. - If there's anything that's not `pods` related, then usually we will have a note to tell you how to add/remove any files using the XCode UI. This happens *very* rarely. From c9b3a021fab2c3684b1a599fa14c8b7738ecda46 Mon Sep 17 00:00:00 2001 From: Pavlos Vinieratos Date: Sat, 14 Jun 2025 19:16:07 +0300 Subject: [PATCH 5/6] Update AlignDepsAlert.tsx --- src/components/common/AlignDepsAlert.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/AlignDepsAlert.tsx b/src/components/common/AlignDepsAlert.tsx index fcd95213..e9b06b1c 100644 --- a/src/components/common/AlignDepsAlert.tsx +++ b/src/components/common/AlignDepsAlert.tsx @@ -13,7 +13,7 @@ const AlignDepsAlert = () => ( With these, you should be good to go with these messy XCode files! Explainer video: https://youtu.be/fmh_ZGHh_eg?t=1368 - /> +

From eacb3c784b008e9539b57b3c3410c2a4f50e4a07 Mon Sep 17 00:00:00 2001 From: Pavlos Vinieratos Date: Sat, 14 Jun 2025 19:28:45 +0300 Subject: [PATCH 6/6] fis --- .node-version | 1 - src/components/common/AlignDepsAlert.tsx | 27 ++++++++++++++++-------- yarn.lock | 6 +++--- 3 files changed, 21 insertions(+), 13 deletions(-) delete mode 100644 .node-version diff --git a/.node-version b/.node-version deleted file mode 100644 index 8b3ed1b2..00000000 --- a/.node-version +++ /dev/null @@ -1 +0,0 @@ -16.19.1 diff --git a/src/components/common/AlignDepsAlert.tsx b/src/components/common/AlignDepsAlert.tsx index e9b06b1c..4d4dbf8f 100644 --- a/src/components/common/AlignDepsAlert.tsx +++ b/src/components/common/AlignDepsAlert.tsx @@ -4,15 +4,24 @@ import Markdown from './Markdown' const AlignDepsAlert = () => ( <> - **Diffs on `.xcodeproj/project.pbxproj` files** - - - If you see anything `pods` related, don't worry about it, you can skip it. If your `pod install` worked, then you should already have the diff you need in your repo for that file. - - If there's anything that's not `pods` related, then usually we will have a note to tell you how to add/remove any files using the XCode UI. This happens *very* rarely. - - Else, you can open an issue or a discussion with a specific line and question. - - With these, you should be good to go with these messy XCode files! - - Explainer video: https://youtu.be/fmh_ZGHh_eg?t=1368 + \*\*Diffs on `.xcodeproj/project.pbxproj` files\*\* +
+ - If you see anything `pods` related, don't worry about it, you can skip + it. If your `pod install` worked, then you should already have the diff + you need in your repo for that file. +
+ - If there's anything that's not `pods` related, then usually we will have + a note to tell you how to add/remove any files using the XCode UI. This + happens *very* rarely. +
+ - Else, you can open an issue or a discussion with a specific line and + question. With these, you should be good to go with these messy XCode + files! +
+ Explainer video:{' '} + + https://youtu.be/fmh_ZGHh_eg?t=1368 +

diff --git a/yarn.lock b/yarn.lock index 7e806bcf..a083b74a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3832,9 +3832,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001580: - version "1.0.30001583" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001583.tgz" - integrity sha512-acWTYaha8xfhA/Du/z4sNZjHUWjkiuoAi2LM+T/aL+kemKQgPT1xBb/YKjlQ0Qo8gvbHsGNplrEJ+9G3gL7i4Q== + version "1.0.30001723" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001723.tgz" + integrity sha512-1R/elMjtehrFejxwmexeXAtae5UO9iSyFn6G/I806CYC/BLyyBk1EPhrKBkWhy6wM6Xnm47dSJQec+tLJ39WHw== case-sensitive-paths-webpack-plugin@^2.4.0: version "2.4.0"