Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
ammichael committed Mar 2, 2020
2 parents 56f99cb + 85f591d commit 36452fb
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 28 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
lib
node_modules
*.d.ts
18 changes: 18 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# OSX
#
.DS_Store
# node.js
#
node_modules/
npm-debug.log

# IDE
.idea
.vscode

dist/**/*.ts.map
dist/**/*.js.map

__tests__/
src/
example/
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.d.ts
4 changes: 4 additions & 0 deletions .watchmanconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"root_dirs": ["dist", "index*.js"],
"ignore_dirs": [".git", "*/node_modules", ".vscode"]
}
25 changes: 13 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"pretty": "prettier --config ./.prettierrc.js --write \"src/**/*.js\"",
"lint": "tsc && eslint 'src/**/*.{js,ts,tsx}' --fix",
"test": "jest",
"build": "tsc",
"build": "rm -rf dist && tsc",
"prepublish": "yarn build",
"postversion": "git push && git push --tags",
"version:patch": "npm version patch",
Expand Down Expand Up @@ -73,7 +73,8 @@
"react-native-typography": "^1.4.1",
"react-native-vector-icons": "^6.6.0",
"react-spring": "^8.0.27",
"styled-components": "^5.0.1"
"styled-components": "^5.0.1",
"tslib": "^1.11.1"
},
"devDependencies": {
"@babel/core": "^7.8.6",
Expand All @@ -88,13 +89,13 @@
"@types/numeral": "^0.0.26",
"@types/react": "^16.9.19",
"@types/react-native": "^0.61.10",
"@types/react-native-check-box": "^2.1.0",
"@types/react-native-check-box": "^2.1.1",
"@types/react-native-datepicker": "^1.7.0",
"@types/react-native-vector-icons": "^6.4.5",
"@types/styled-components": "^5.0.1",
"@types/yup": "^0.26.30",
"@typescript-eslint/eslint-plugin": "^2.19.0",
"@typescript-eslint/parser": "^2.19.0",
"@types/yup": "^0.26.32",
"@typescript-eslint/eslint-plugin": "^2.21.0",
"@typescript-eslint/parser": "^2.21.0",
"babel-jest": "^25.1.0",
"babel-plugin-module-resolver": "^4.0.0",
"babel-preset-react-native": "^4.0.1",
Expand All @@ -108,19 +109,19 @@
"eslint-import-resolver-typescript": "^2.0.0",
"eslint-plugin-import": "^2.20.0",
"eslint-plugin-jest": "^23.6.0",
"eslint-plugin-json": "^2.0.1",
"eslint-plugin-json": "^2.1.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-react": "^7.18.0",
"eslint-plugin-react-hooks": "^2.3.0",
"eslint-plugin-react": "^7.18.3",
"eslint-plugin-react-hooks": "^2.5.0",
"eslint-plugin-react-native": "^3.8.1",
"eslint-plugin-sonarjs": "^0.5.0",
"husky": "^4.2.1",
"husky": "^4.2.3",
"jest": "^25.1.0",
"jest-environment-node": "^25.1.0",
"lint-staged": "^10.0.7",
"lint-staged": "^10.0.8",
"ts-jest": "^25.2.1",
"typescript": "^3.7.5"
"typescript": "^3.8.3"
}
}
11 changes: 6 additions & 5 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@
"compilerOptions": {
/* Basic Options */
"target": "es6",
"module": "commonjs",
"lib": ["es2017", "es7", "es6"],
"module": "es6",
"lib": ["es6"],
"types": ["react-native", "jest"],
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"outDir": "dist",
"importHelpers": true,
"resolveJsonModule": true,
"jsx": "react-native",
"noEmit": false,
"baseUrl": ".",
// "noEmit": false,
"skipLibCheck": true,
/* Strict Type-Checking Options */
"strict": true,
Expand All @@ -30,8 +32,7 @@
/* Module Resolution Options */
"moduleResolution": "node",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"baseUrl": "."
"esModuleInterop": true
},
"compileOnSave": true,
"include": ["src"],
Expand Down
22 changes: 11 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@
dependencies:
"@types/react" "*"

"@types/react-native-check-box@^2.1.0":
"@types/react-native-check-box@^2.1.1":
version "2.1.1"
resolved "https://registry.yarnpkg.com/@types/react-native-check-box/-/react-native-check-box-2.1.1.tgz#93485710818dcea0222dd14e98db1d120ecd534d"
integrity sha512-lE+caBD90+wWD8BFgL0qXmVTbqN2KL9gR+mXf37yZD4zsY0gAOhxziRA1NFRKMZSUnEGoopRvKUMxpLiAZiKAg==
Expand Down Expand Up @@ -788,7 +788,7 @@
dependencies:
"@types/yargs-parser" "*"

"@types/yup@^0.26.30":
"@types/yup@^0.26.32":
version "0.26.32"
resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.32.tgz#bd356fb405f3d641eff963854edf7ad854a8e829"
integrity sha512-55WFAq8lNYXdRzSP1cenMFFXtPRe7PWsqn5y9ibqKHOQZ/cSLErkcnB1LE89M7W2TSXVDFtx+T7eFePkGoB+xw==
Expand All @@ -804,7 +804,7 @@
regexpp "^2.0.1"
tsutils "^3.7.0"

"@typescript-eslint/eslint-plugin@^2.19.0":
"@typescript-eslint/eslint-plugin@^2.21.0":
version "2.21.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.21.0.tgz#a34de84a0791cae0357c4dda805c5b4e8203b6c6"
integrity sha512-b5jjjDMxzcjh/Sbjuo7WyhrQmVJg0WipTHQgXh5Xwx10uYm6nPWqN1WGOsaNq4HR3Zh4wUx4IRQdDkCHwyewyw==
Expand Down Expand Up @@ -843,7 +843,7 @@
"@typescript-eslint/typescript-estree" "1.13.0"
eslint-visitor-keys "^1.0.0"

"@typescript-eslint/parser@^2.19.0", "@typescript-eslint/parser@^2.3.0":
"@typescript-eslint/parser@^2.21.0", "@typescript-eslint/parser@^2.3.0":
version "2.21.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.21.0.tgz#4f200995517c3d5fc5ef51b17527bc948992e438"
integrity sha512-VrmbdrrrvvI6cPPOG7uOgGUFXNYTiSbnRq8ZMyuGa4+qmXJXVLEEz78hKuqupvkpwJQNk1Ucz1TenrRP90gmBg==
Expand Down Expand Up @@ -2589,7 +2589,7 @@ eslint-plugin-jest@^23.6.0:
dependencies:
"@typescript-eslint/experimental-utils" "^2.5.0"

eslint-plugin-json@^2.0.1:
eslint-plugin-json@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-json/-/eslint-plugin-json-2.1.0.tgz#2829174f58148e229227c479c402f2875be04935"
integrity sha512-Qxy3JQVRb/Qh1RdJsg+LXhMLPGp8rTiEktpgKZPMOwJTTXe56zLCrazfdPZIDctETVbR/YFk0y1dSsVcKXu6Jg==
Expand Down Expand Up @@ -2632,7 +2632,7 @@ eslint-plugin-promise@^4.2.1:
resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a"
integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==

eslint-plugin-react-hooks@^2.0.1, eslint-plugin-react-hooks@^2.3.0:
eslint-plugin-react-hooks@^2.0.1, eslint-plugin-react-hooks@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.0.tgz#c50ab7ca5945ce6d1cf8248d9e185c80b54171b6"
integrity sha512-bzvdX47Jx847bgAYf0FPX3u1oxU+mKU8tqrpj4UX9A96SbAmj/HVEefEy6rJUog5u8QIlOPTKZcBpGn5kkKfAQ==
Expand Down Expand Up @@ -2664,7 +2664,7 @@ [email protected]:
prop-types "^15.7.2"
resolve "^1.12.0"

eslint-plugin-react@^7.18.0:
eslint-plugin-react@^7.18.3:
version "7.18.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.3.tgz#8be671b7f6be095098e79d27ac32f9580f599bc8"
integrity sha512-Bt56LNHAQCoou88s8ViKRjMB2+36XRejCQ1VoLj716KI1MoE99HpTVvIThJ0rvFmG4E4Gsq+UgToEjn+j044Bg==
Expand Down Expand Up @@ -3339,7 +3339,7 @@ human-signals@^1.1.1:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==

husky@^4.2.1:
husky@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.3.tgz#3b18d2ee5febe99e27f2983500202daffbc3151e"
integrity sha512-VxTsSTRwYveKXN4SaH1/FefRJYCtx+wx04sSVcOpD7N2zjoHxa+cEJ07Qg5NmV3HAK+IRKOyNVpi2YBIVccIfQ==
Expand Down Expand Up @@ -4288,7 +4288,7 @@ lines-and-columns@^1.1.6:
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=

lint-staged@^10.0.7:
lint-staged@^10.0.8:
version "10.0.8"
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.0.8.tgz#0f7849cdc336061f25f5d4fcbcfa385701ff4739"
integrity sha512-Oa9eS4DJqvQMVdywXfEor6F4vP+21fPHF8LUXgBbVWUSWBddjqsvO6Bv1LwMChmgQZZqwUvgJSHlu8HFHAPZmA==
Expand Down Expand Up @@ -6409,7 +6409,7 @@ tsconfig-paths@^3.9.0:
minimist "^1.2.0"
strip-bom "^3.0.0"

tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0:
version "1.11.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
Expand Down Expand Up @@ -6462,7 +6462,7 @@ typedarray-to-buffer@^3.1.5:
dependencies:
is-typedarray "^1.0.0"

typescript@^3.7.5:
typescript@^3.8.3:
version "3.8.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
Expand Down

0 comments on commit 36452fb

Please sign in to comment.