Skip to content

Commit 8e3f8c5

Browse files
committed
Merge remote-tracking branch 'upstream/master' into textinput-adornment
2 parents a6119b6 + 4f592d2 commit 8e3f8c5

Some content is hidden

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

69 files changed

+4068
-1363
lines changed

.circleci/config.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ workflows:
124124
branches:
125125
ignore: master
126126
- deploy-docs:
127-
requires:
128-
- install-dependencies
129127
filters:
130128
branches:
131129
only: master

.circleci/deploy-docs.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ rm -f dist/*.{html,css,js,json,map} || :
2929
rmdir dist/* || :
3030

3131
# Run our build script.
32+
yarn
3233
yarn build
3334

3435
# Build the docs for 1.0

.github/workflows/triage.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Triage
2+
on:
3+
issues:
4+
types: [labeled]
5+
6+
jobs:
7+
needs-more-info:
8+
runs-on: ubuntu-latest
9+
if: github.event.label.name == 'needs more info'
10+
steps:
11+
- uses: actions/checkout@master
12+
- uses: actions/github@v1.0.0
13+
env:
14+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
with:
16+
args: comment "Hey! Thanks for opening the issue. Can you provide more information about the issue? Please fill the issue template when opening the issue without deleting any section. We need all the information we can, to be able to help. Make sure to at least provide - Current behaviour, Expected behaviour, A way to reproduce the issue with minimal code (link to [snack.expo.io](https://snack.expo.io)) or a repo on GitHub, and the information about your environment (such as the platform of the device, versions of all the packages etc.)."
17+
18+
needs-repro:
19+
runs-on: ubuntu-latest
20+
if: github.event.label.name == 'needs repro'
21+
steps:
22+
- uses: actions/checkout@master
23+
- uses: actions/github@v1.0.0
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
with:
27+
args: comment "Hey! Thanks for opening the issue. Can you provide a minimal repro which demonstrates the issue? Posting a snippet of your code in the issue is useful, but it's not usually straightforward to run. A repro will help us debug the issue faster. Please try to keep the repro as small as possible. The easiest way to provide a repro is on [snack.expo.io](https://snack.expo.io). If it's not possible to repro it on [snack.expo.io](https://snack.expo.io), then you can also provide the repro in a GitHub repository."

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
# VSCode
66
.vscode/
7+
.history/
78
jsconfig.json
89

910
# Xcode

CONTRIBUTING.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Code of Conduct
44

5-
We want this community to be friendly and respectful to each other. Please read [the full text](/CODE_OF_CONDUCT.md) so that you can understand what actions will and will not be tolerated.
5+
We want this community to be friendly and respectful to each other. Please read [the full text](https://callstack.com/code-of-conduct/?utm_source=github.com&utm_medium=referral&utm_campaign=react-native-paper&utm_term=code-of-conduct) so that you can understand what actions will and will not be tolerated.
66

77
## Our Development Process
88

@@ -32,19 +32,18 @@ Our pre-commit hooks verify that your commit message matches this format when co
3232

3333
### Linting and tests
3434

35-
We use `flow` for type checking, `eslint` with `prettier` for linting and formatting the code, and `jest` for testing. Our pre-commit hooks verify that the linter and tests pass when commiting. You can also run the following commands manually:
35+
We use `typescript` for type checking, `eslint` with `prettier` for linting and formatting the code, and `jest` for testing. Our pre-commit hooks verify that the linter and tests pass when commiting. You can also run the following commands manually:
3636

37-
* `yarn flow`: run flow on all files.
38-
* `yarn typescript`: run tests for typescript definitions.
39-
* `yarn lint`: lint files with eslint and prettier.
40-
* `yarn test`: run unit tests with jest.
37+
* `yarn typescript`: type-check files with `tsc`.
38+
* `yarn lint`: lint files with `eslint` and `prettier`.
39+
* `yarn test`: run unit tests with `jest`.
4140

4241
### Sending a pull request
4342

4443
When you're sending a pull request:
4544

4645
* Prefer small pull requests focused on one change.
47-
* Verify that `flow`, `eslint` and all tests are passing.
46+
* Verify that `typescript`, `eslint` and all tests are passing.
4847
* Preview the documentation to make sure it looks good.
4948
* Follow the pull request template when opening a pull request.
5049

@@ -65,7 +64,7 @@ To run the example on web, run `yarn example web` in the project root.
6564

6665
### Working on documentation
6766

68-
The documentation is automatically generated from the [flowtype](https://flowtype.org) annotations in the components. You can add comments above the type annotations to add descriptions. To preview the generated documentation, run `yarn docs start` in the project root.
67+
The documentation is automatically generated from the [TypeScript](https://www.typescriptlang.org/) annotations in the components. You can add comments above the type annotations to add descriptions. To preview the generated documentation, run `yarn docs start` in the project root.
6968

7069
### Publishing a release
7170

docs/assets/styles.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ a:hover {
5252

5353
@font-face {
5454
font-family: 'MaterialCommunityIcons';
55-
src: url('../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf')
55+
src: url('../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf')
5656
format('truetype');
5757
}

docs/package.json

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,21 @@
1313
},
1414
"dependencies": {
1515
"color": "^3.1.2",
16-
"component-docs": "^0.20.3",
17-
"linaria": "^1.2.4"
16+
"component-docs": "^0.20.5",
17+
"linaria": "^1.2.4",
18+
"react-native-vector-icons": "^6.6.0"
1819
},
1920
"devDependencies": {
21+
"@babel/core": "^7.8.4",
2022
"@babel/node": "^7.6.3",
21-
"@babel/plugin-proposal-class-properties": "^7.5.5",
22-
"@babel/preset-env": "^7.6.3",
23-
"@babel/preset-flow": "^7.0.0",
24-
"@babel/preset-react": "^7.6.3",
25-
"@babel/preset-typescript": "^7.6.0",
23+
"@babel/plugin-proposal-class-properties": "^7.8.3",
24+
"@babel/preset-env": "^7.8.4",
25+
"@babel/preset-flow": "^7.8.3",
26+
"@babel/preset-react": "^7.8.3",
27+
"@babel/preset-typescript": "^7.8.3",
2628
"del-cli": "^3.0.0",
2729
"file-loader": "^4.2.0",
2830
"metro-react-native-babel-preset": "^0.56.0",
29-
"url-loader": "^2.2.0"
31+
"url-loader": "^4.1.0"
3032
}
3133
}

docs/pages/5.react-native-web.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ yarn add --dev react-app-rewired
3030
module.exports = function override(config, env) {
3131
config.module.rules.push({
3232
test: /\.js$/,
33-
exclude: /node_modules[/\\](?!react-native-paper|react-native-vector-icons|react-native-safe-area-view)/,
33+
exclude: /node_modules[/\\](?!react-native-vector-icons|react-native-safe-area-view)/,
3434
use: {
3535
loader: "babel-loader",
3636
options: {
@@ -42,7 +42,8 @@ module.exports = function override(config, env) {
4242
presets: [
4343
["@babel/preset-env", { useBuiltIns: "usage" }],
4444
"@babel/preset-react",
45-
"@babel/preset-flow"
45+
"@babel/preset-flow",
46+
"@babel/preset-typescript"
4647
],
4748
plugins: [
4849
"@babel/plugin-proposal-class-properties",
@@ -167,15 +168,15 @@ Next, we want to tell `babel-loader` to compile `react-native-paper` and `react-
167168
First install the required dependencies:
168169

169170
```sh
170-
yarn add --dev babel-loader @babel/preset-env @babel/preset-react @babel/preset-flow @babel/plugin-proposal-class-properties @babel/plugin-proposal-object-rest-spread
171+
yarn add --dev babel-loader @babel/preset-env @babel/preset-react @babel/preset-flow @babel/preset-typescript @babel/plugin-proposal-class-properties @babel/plugin-proposal-object-rest-spread
171172
```
172173

173174
Now, add the following in the `module.rules` array in your webpack config:
174175

175176
```js
176177
{
177178
test: /\.js$/,
178-
exclude: /node_modules[/\\](?!react-native-paper|react-native-vector-icons|react-native-safe-area-view)/,
179+
exclude: /node_modules[/\\](?!react-native-vector-icons|react-native-safe-area-view)/,
179180
use: {
180181
loader: 'babel-loader',
181182
options: {
@@ -188,6 +189,7 @@ Now, add the following in the `module.rules` array in your webpack config:
188189
['@babel/preset-env', { useBuiltIns: 'usage' }],
189190
'@babel/preset-react',
190191
'@babel/preset-flow',
192+
"@babel/preset-typescript"
191193
],
192194
plugins: [
193195
'@babel/plugin-proposal-class-properties',

0 commit comments

Comments
 (0)