Skip to content

Commit

Permalink
Merge branch 'master' into docs/reducer-comparison-fn-link
Browse files Browse the repository at this point in the history
  • Loading branch information
helderberto committed Feb 11, 2020
2 parents 5ff80d7 + 5e5ec49 commit 88f8f6e
Show file tree
Hide file tree
Showing 134 changed files with 15,697 additions and 31,876 deletions.
21 changes: 20 additions & 1 deletion .all-contributorsrc
Expand Up @@ -327,7 +327,26 @@
"code",
"doc"
]
},
{
"login": "helderburato",
"name": "Helder Burato Berto",
"avatar_url": "https://avatars3.githubusercontent.com/u/862575?v=4",
"profile": "https://helder.dev",
"contributions": [
"doc"
]
},
{
"login": "ankeetmaini",
"name": "Ankeet Maini",
"avatar_url": "https://avatars1.githubusercontent.com/u/6652823?v=4",
"profile": "http://ankeetmaini.github.io/",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7
"contributorsPerLine": 7,
"skipCi": true
}
4 changes: 0 additions & 4 deletions .babelrc

This file was deleted.

10 changes: 6 additions & 4 deletions .circleci/config.yml
Expand Up @@ -15,18 +15,19 @@ jobs:
- run:
working_directory: ~/rgommezz/react-native-offline
command: nvm install 9.10.0 && nvm alias default 9.10.0
- run: npm i
# Restore the dependency cache
- restore_cache:
keys:
# This branch if available
- v1-dep-{{ .Branch }}-
- v3-dep-{{ .Branch }}-
# Default branch if not
- v1-dep-master-
- v3-dep-master-
# Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly
- v1-dep-
- v3-dep-
# Save dependency cache
- save_cache:
key: v1-dep-{{ .Branch }}-{{ epoch }}
key: v3-dep-{{ .Branch }}-{{ epoch }}
paths:
# This is a broad list of cache paths to include many possible development environments
# You can probably delete some of these entries
Expand All @@ -41,6 +42,7 @@ jobs:
- ./node_modules
# Test
- run: npm run lint
- run: npm run ts
- run: npm run test:coverage
# Teardown
# Save test results
Expand Down
1 change: 1 addition & 0 deletions .eslintignore
@@ -1,3 +1,4 @@
node_modules/
coverage/
flow-typed/
test/__snapshots__/
48 changes: 21 additions & 27 deletions .eslintrc
@@ -1,18 +1,21 @@
{
"extends": [
"airbnb",
"plugin:flowtype/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"prettier",
"prettier/flowtype",
"prettier/react"
],
"parser": "babel-eslint",
"plugins": [
"flowtype",
"react",
"prettier"
"prettier/react",
"prettier/@typescript-eslint"
],
"settings": {
"import/resolver": {
"node": {
"extensions": [".js", ".jsx", ".ts", ".tsx"]
}
}
},
"parser": "@typescript-eslint/parser",
"plugins": ["react", "@typescript-eslint", "prettier"],
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
Expand All @@ -37,28 +40,19 @@
"import/extensions": 0,
"no-use-before-define": 0,
"import/no-extraneous-dependencies": 0,
"import/prefer-default-export": 0,
"global-require": 0,
"prefer-promise-reject-errors": 0,
"react/prop-types": 0,
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
"react/jsx-filename-extension": 0,
"react/require-default-props": 0,
"flowtype/boolean-style": [
2,
"boolean"
],
"flowtype/no-weak-types": 1,
"flowtype/require-parameter-type": 0,
"flowtype/require-return-type": [
0,
"always",
{
"annotateUndefined": "never"
}
],
"flowtype/require-valid-file-annotation": 2,
"flowtype/use-flow-type": 1,
"flowtype/valid-syntax": 1,
"react/display-name": 0
"react/display-name": 0,
"react/sort-comp": 0,
"react/destructuring-assignment": 0,
"@typescript-eslint/no-use-before-define": 0,
"no-return-assign": 0,
"no-undef": 0,
"@typescript-eslint/ban-ts-ignore": 1
},
"globals": {
"jest": true
Expand Down
95 changes: 0 additions & 95 deletions .flowconfig

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -4,6 +4,8 @@ npm-debug.log

#jest
coverage/
.jest/
dist/

# OSX
#
Expand Down
6 changes: 6 additions & 0 deletions .prettierrc.json
@@ -0,0 +1,6 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": true
}

0 comments on commit 88f8f6e

Please sign in to comment.