diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c91ab729..3cc9ed03 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -32,23 +32,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] 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 4ebe9555..4d4dbf8f 100644 --- a/src/components/common/AlignDepsAlert.tsx +++ b/src/components/common/AlignDepsAlert.tsx @@ -3,6 +3,28 @@ 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]`. 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"