Skip to content

Update AlignDepsAlert.tsx #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Comment on lines +35 to +42
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you just commented them out temporarely or it's intentional to have it commented here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i wanted to see if i can just get this running or not. not a permanent thing!


- 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]
Expand Down
1 change: 0 additions & 1 deletion .node-version

This file was deleted.

22 changes: 22 additions & 0 deletions src/components/common/AlignDepsAlert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,28 @@ import Markdown from './Markdown'

const AlignDepsAlert = () => (
<>
<Markdown>
\*\*Diffs on `.xcodeproj/project.pbxproj` files\*\*
<br />
- 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.
<br />
- 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.
<br />
- 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!
<br />
Explainer video:{' '}
<a href="https://youtu.be/fmh_ZGHh_eg?t=1368">
https://youtu.be/fmh_ZGHh_eg?t=1368
</a>
</Markdown>
<br />
<br />
<Markdown>
You can use the following command to kick off the upgrade: `npx
@rnx-kit/align-deps --requirements react-native@[major.minor]`.
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down