Skip to content

Commit 0c84591

Browse files
kacperkapusciakkacperkapusciak
committed
Merge current main
2 parents a7e04c3 + 66506e4 commit 0c84591

File tree

513 files changed

+30124
-5937
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

513 files changed

+30124
-5937
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# READ ME PLEASE!
1+
# READ ME PLEASE
22

3-
### TL;DR: Make sure to add your changes to versioned docs
3+
> **TL;DR: Make sure to add your changes to versioned docs**
44
55
Thanks for opening a PR!
66

‎.github/actions/setup/action.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Setup
2+
description: Setup Node.js and install dependencies
3+
4+
runs:
5+
using: composite
6+
steps:
7+
- name: Setup Node.js
8+
uses: actions/setup-node@v3
9+
with:
10+
node-version-file: .nvmrc
11+
cache: 'npm'
12+
13+
- name: Cache dependencies
14+
id: yarn-cache
15+
uses: actions/cache@v3
16+
with:
17+
path: |
18+
**/node_modules
19+
.yarn/install-state.gz
20+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
21+
restore-keys: |
22+
${{ runner.os }}-yarn-
23+
24+
- name: Install dependencies
25+
if: steps.yarn-cache.outputs.cache-hit != 'true'
26+
run: yarn install --immutable
27+
shell: bash

‎.github/workflows/autofix.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: autofix.ci
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
10+
11+
permissions:
12+
contents: read
13+
14+
jobs:
15+
autofix:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v3
20+
21+
- name: Setup
22+
uses: ./.github/actions/setup
23+
24+
- name: Fix lint issues
25+
run: yarn markdownlint-cli2-fix
26+
27+
- name: Autofix
28+
uses: autofix-ci/action@8106fde54b877517c9af2c3d68918ddeaa7bed64

‎.github/workflows/ci.yml

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build
1+
name: CI
22

33
on: [pull_request]
44

@@ -8,23 +8,14 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v1
11+
- name: Checkout
12+
uses: actions/checkout@v3
1213

13-
- name: Use Node.js 12.13
14-
uses: actions/setup-node@v1
15-
with:
16-
node-version: 12.13
14+
- name: Setup
15+
uses: ./.github/actions/setup
1716

18-
- name: Restore yarn cache
19-
id: yarn-cache
20-
uses: actions/cache@master
21-
with:
22-
path: '**/node_modules'
23-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
17+
- name: Lint markdown
18+
run: yarn markdownlint-cli2
2419

25-
- name: Install dependencies
26-
if: steps.yarn-cache.outputs.cache-hit != 'true'
27-
run: yarn install --frozen-lockfile
28-
29-
- name: Build pages
30-
run: yarn build
20+
- name: Build pages
21+
run: yarn build

‎.github/workflows/main.yml

Lines changed: 35 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -11,49 +11,38 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v1
15-
16-
- name: Use Node.js 12.13
17-
uses: actions/setup-node@v1
18-
with:
19-
node-version: 12.13
20-
21-
- name: Restore yarn cache
22-
id: yarn-cache
23-
uses: actions/cache@master
24-
with:
25-
path: '**/node_modules'
26-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
27-
28-
- name: Install dependencies
29-
if: steps.yarn-cache.outputs.cache-hit != 'true'
30-
run: yarn install --frozen-lockfile
31-
32-
# - name: Use crowdin
33-
# run: |
34-
# wget -c https://artifacts.crowdin.com/repo/deb/crowdin.deb -O crowdin.deb
35-
# sudo dpkg -i crowdin.deb
36-
37-
# - name: Sync with crowdin
38-
# env:
39-
# CROWDIN_DOCUSAURUS_PROJECT_ID: react-navigation
40-
# CROWDIN_DOCUSAURUS_API_KEY: ${{ secrets.CROWDIN_DOCUSAURUS_API_KEY }}
41-
# run: |
42-
# yarn crowdin-upload
43-
# yarn crowdin-download
44-
45-
- name: Update sponsors list
46-
env:
47-
GITHUB_TOKEN: ${{ secrets.DEPLOY_GITHUB_TOKEN }}
48-
run: yarn fetch-sponsors
49-
- name: Publish to Github pages
50-
env:
51-
GITHUB_TOKEN: ${{ secrets.DEPLOY_GITHUB_TOKEN }}
52-
GITHUB_EMAIL: ${{ secrets.DEPLOY_GITHUB_EMAIL }}
53-
GIT_USER: ${{ secrets.DEPLOY_GITHUB_USER }}
54-
CURRENT_BRANCH: $GITHUB_REF
55-
run: |
56-
git config --global user.email "$GITHUB_EMAIL"
57-
git config --global user.name "$GITHUB_ACTOR"
58-
echo "machine github.com login $GIT_USER password $GITHUB_TOKEN" > ~/.netrc
59-
yarn deploy
14+
- name: Checkout
15+
uses: actions/checkout@v3
16+
17+
- name: Setup
18+
uses: ./.github/actions/setup
19+
20+
# - name: Use crowdin
21+
# run: |
22+
# wget -c https://artifacts.crowdin.com/repo/deb/crowdin.deb -O crowdin.deb
23+
# sudo dpkg -i crowdin.deb
24+
25+
# - name: Sync with crowdin
26+
# env:
27+
# CROWDIN_DOCUSAURUS_PROJECT_ID: react-navigation
28+
# CROWDIN_DOCUSAURUS_API_KEY: ${{ secrets.CROWDIN_DOCUSAURUS_API_KEY }}
29+
# run: |
30+
# yarn crowdin-upload
31+
# yarn crowdin-download
32+
33+
- name: Update sponsors list
34+
env:
35+
GITHUB_TOKEN: ${{ secrets.DEPLOY_GITHUB_TOKEN }}
36+
run: yarn fetch-sponsors
37+
38+
- name: Publish to Github pages
39+
env:
40+
GITHUB_TOKEN: ${{ secrets.DEPLOY_GITHUB_TOKEN }}
41+
GITHUB_EMAIL: ${{ secrets.DEPLOY_GITHUB_EMAIL }}
42+
GIT_USER: ${{ secrets.DEPLOY_GITHUB_USER }}
43+
CURRENT_BRANCH: $GITHUB_REF
44+
run: |
45+
git config --global user.email "$GITHUB_EMAIL"
46+
git config --global user.name "$GITHUB_ACTOR"
47+
echo "machine github.com login $GIT_USER password $GITHUB_TOKEN" > ~/.netrc
48+
yarn deploy

‎.github/workflows/rebase.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎.markdownlint-cli2.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
globs:
2+
- '**/*.md'
3+
ignores:
4+
- node_modules
5+
- versioned_docs/version-1.x
6+
- versioned_docs/version-2.x
7+
- versioned_docs/version-3.x
8+
- versioned_docs/version-4.x

‎.markdownlint.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
default: true
2+
3+
# Disable checks for line length
4+
MD013: false
5+
6+
# Disable checks for inline HTML
7+
MD033: false

‎.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
16.19.1

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<h2 align="center"><a href="https://reactnavigation.org/"> <img src="static/img/react_navigation_header.png" width="400" /> </a></h2>
2-
1+
<h1 align="center"><a href="https://reactnavigation.org/"> <img src="static/img/react_navigation_header.png" width="400" /> </a></h1>
32

43
Want to help improve the documentation? That would be so very much appreciated. Some information on that below.
54

@@ -52,4 +51,5 @@ yarn deploy
5251
```
5352

5453
## License
55-
[MIT License](LICENSE)
54+
55+
[MIT License](LICENSE)

‎blog/2018-04-06-react-navigation-2.0-rc.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ Exactly two months after the release of React Navigation 1.0, we are close to an
1111

1212
<!--truncate-->
1313

14-
```
14+
```sh
1515
yarn add react-navigation@^2.0.0-rc.1
1616
```
1717

18-
The documentation for 2.0 is available at https://reactnavigation.org/
18+
The documentation for 2.0 is available at <https://reactnavigation.org/>
1919

2020
We’re bumping the major version because some of the changes in this release are backwards incompatible. That said, this should be a fairly easy upgrade. We are improving React Navigation incrementally because we don't want to leave developers feeling stranded in an old version. If you use React Navigation in a conventional way and don't have any custom navigators, I can't imagine this update would take you more than an hour.
2121

@@ -63,7 +63,7 @@ The following APIs are deprecated and will be removed in 3.0.
6363

6464
### XNavigator is now named createXNavigator
6565

66-
```
66+
```js
6767
import { createStackNavigator } from ‘react-navigation’;
6868
createStackNavigator({routeName: Screen});
6969
```
@@ -77,5 +77,5 @@ This change was made to improve the ease of learning and understanding the libra
7777
## New feature highlights
7878

7979
- State persistence - automatically save state and reload it when the app restarts. See [state persistence docs](docs/state-persistence)
80-
- Transitions between screens in stack with headers and without headers now animates as expected on iOS. https://github.com/react-navigation/react-navigation/pull/3821. Thanks [skevy](https://github.com/skevy)!
80+
- Transitions between screens in stack with headers and without headers now animates as expected on iOS. <https://github.com/react-navigation/react-navigation/pull/3821>. Thanks [skevy](https://github.com/skevy)!
8181
- As mentioned above, `createMaterialBottomNavigator` is a new navigator type that provides the material design bottom tab bar pattern.

‎blog/2018-05-07-react-navigation-2.0.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author_image_url: https://avatars0.githubusercontent.com/u/90494?s=200&v=4
77
tags: [release, announcement]
88
---
99

10-
The documentation is now live at https://reactnavigation.org, and v1 lives [here](/docs/1.x/getting-started).
10+
The documentation is now live at <https://reactnavigation.org>, and v1 lives [here](/docs/1.x/getting-started).
1111

1212
<!--truncate-->
1313

@@ -63,7 +63,7 @@ Given that we only exposed generic helpers (`navigate`, `goBack`) and helpers sp
6363

6464
One of the big improvements you get from this is that you can now add your own helpers to the `navigation` prop! Read more in [RFC 6](https://github.com/react-navigation/rfcs/blob/master/text/0006-action-creators.md) and in [pull 3392](https://github.com/react-navigation/react-navigation/pull/3392).
6565

66-
### NavigationActions no longer have `toString()` implementations ([related](https://github.com/react-navigation/react-navigation/issues/4072))
66+
### NavigationActions no longer have `toString()` implementations ([related](https://github.com/react-navigation/react-navigation/issues/4072))
6767

6868
This change was intended to simplify the implementation of actions. We may go back on this, however, and apologize in advance if this thrasing causes you trouble.
6969

@@ -73,7 +73,7 @@ If you are using `NavigationActions.push` or other stack-specific actions, you
7373

7474
## Deprecations
7575

76-
### XNavigator(...) is now createXNavigator(...)
76+
### XNavigator(...) is now createXNavigator(...)
7777

7878
`StackNavigator`, `TabNavigator` and `DrawerNavigator` are now deprecated in favour of `createStackNavigator`, `createTabNavigator`, and `createDrawerNavigator`, which are functionally identical but more clearly communicate that they are functions and that they return a component. The `XNavigator` style will removed in 3.0.
7979

0 commit comments

Comments
 (0)