Skip to content

Commit 80c26cd

Browse files
committed
fix: flow 0.70 errors
Merge branch 'master' of https://github.com/jedwards1211/react-library-skeleton
2 parents a6d20cf + 222a828 commit 80c26cd

File tree

9 files changed

+430
-166
lines changed

9 files changed

+430
-166
lines changed

.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"extends": [
33
"@jedwards1211/eslint-config-react", "@jedwards1211/eslint-config-flow"
4-
]
4+
],
5+
"parser": "babel-eslint"
56
}

.npmignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.babelrc
22
.eslintrc
3-
.flowconfig
43
.nyc_output
54
.storybook
65
.travis.yml
@@ -10,3 +9,10 @@ test
109
stories
1110
scripts
1211
storybook-static
12+
.eslintcache
13+
.idea
14+
solano.yml
15+
renovate.json
16+
commitlint.config.js
17+
flow-typed
18+

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ script:
1414
- yarn run prepublishOnly
1515
after_success:
1616
- npm run codecov
17-
- npm-run travis-deploy-once "npm run semantic-release"
17+
- npm run travis-deploy-once "npm run semantic-release"
1818
branches:
1919
except:
2020
- /^v\d+\.\d+\.\d+$/

commitlint.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = {extends: ['@commitlint/config-conventional']}
1+
module.exports = {extends: ['@jedwards1211/commitlint-config']}

package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,10 @@
6060
"devDependencies": {
6161
"@commitlint/cli": "^6.0.2",
6262
"@commitlint/config-conventional": "^6.0.2",
63-
"@jedwards1211/eslint-config": "^1.0.0",
63+
"@jedwards1211/commitlint-config": "^1.0.0",
64+
"@jedwards1211/eslint-config": "^2.0.0",
6465
"@jedwards1211/eslint-config-flow": "^1.0.0",
65-
"@jedwards1211/eslint-config-react": "^3.0.0",
66+
"@jedwards1211/eslint-config-react": "^4.0.0",
6667
"@storybook/react": "^3.3.8",
6768
"@storybook/storybook-deployer": "^2.2.0",
6869
"babel-cli": "^6.26.0",
@@ -89,21 +90,22 @@
8990
"eslint-plugin-react": "^7.5.1",
9091
"eslint-watch": "^3.1.3",
9192
"flow-bin": "^0.63.1",
93+
"flow-bin": "^0.70.0",
9294
"flow-copy-source": "^1.2.1",
9395
"flow-watch": "^1.1.0",
9496
"get-node-dimensions": "^1.2.0",
9597
"husky": "^0.14.3",
9698
"istanbul": "^0.4.5",
9799
"jsdom": "^11.5.1",
98100
"jsdom-global": "^3.0.2",
99-
"mocha": "^4.1.0",
101+
"mocha": "^5.0.0",
100102
"nyc": "^11.4.1",
101103
"react": "^16.2.0",
102104
"react-dom": "^16.2.0",
103105
"react-hot-loader": "^3.1.3",
104106
"react-transition-context": "^2.0.0",
105107
"rimraf": "^2.6.0",
106-
"semantic-release": "^12.2.2",
108+
"semantic-release": "^15.1.4",
107109
"sinon": "^4.1.4",
108110
"travis-deploy-once": "^4.3.1"
109111
},

renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
":renovatePrefix",
88
":updateNotScheduled",
99
":preserveSemverRanges",
10-
":semanticPrefixFix",
10+
":semanticPrefixFixDepsChoreOthers",
1111
":automergeDisabled",
1212
"group:monorepos"
1313
],

solano.yml

Lines changed: 49 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,57 @@
1-
nodejs:
2-
version:
3-
SPLIT:
4-
- 8
5-
- 7
6-
- 6
1+
plan:
2+
- node_6
3+
- node_7
4+
- node_8
5+
profiles:
6+
node_6:
7+
nodejs:
8+
version: '6.11.5'
9+
node_7:
10+
nodejs:
11+
version: '7.10.1'
12+
node_8:
13+
nodejs:
14+
version: '8.9.0'
15+
16+
tool_config:
17+
git:
18+
version: '2.0.3'
719

820
environment:
921
'CI': 'true'
1022

1123
hooks:
12-
pre_setup: yarn install --ignore-engines --check-files --frozen-lockfile
13-
post_build: npm run codecov && npm run semantic-release
24+
pre_setup: |
25+
set -o errexit -o pipefail # Exit on error
26+
# Install yarn if it isn't already present
27+
if [ ! -d $HOME/.yarn ]; then
28+
wget https://yarnpkg.com/install.sh -O $TMPDIR/yarn-install.sh
29+
chmod +x $TMPDIR/yarn-install.sh
30+
bash $TMPDIR/yarn-install.sh --version 1.5.1
31+
fi
32+
mkdir -p $HOME/bin # Automatically in $PATH on workers
33+
ln -fs $HOME/.yarn/bin/yarn $HOME/bin/yarn
34+
yarn config set registry "https://registry.npmjs.org/"
35+
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> $HOME/.npmrc
36+
echo "registry=https://registry.npmjs.org/" >> $HOME/.npmrc
37+
yarn install --ignore-engines --check-files --frozen-lockfile
38+
post_build: |
39+
# Only deploy if all tests have passed
40+
if [[ "passed" != "$TDDIUM_BUILD_STATUS" ]]; then
41+
echo "\$TDDIUM_BUILD_STATUS = $TDDIUM_BUILD_STATUS"
42+
echo "Will only deploy on passed builds"
43+
exit
44+
fi
45+
# Only deploy on 'node_8' profile
46+
if [[ "node_8" != "$SOLANO_PROFILE_NAME" ]]; then
47+
echo "Will only deploy on 'node_8' profile"
48+
exit
49+
fi
50+
eval `ssh-agent`
51+
ssh-add ~/.ssh/ci_repo_key
52+
# fetch tags
53+
git fetch origin 'refs/tags/*:refs/tags/*' -v
54+
npm run codecov && npm run semantic-release
1455
1556
tests:
1657
- yarn run prepublishOnly

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export default class ViewSlider extends React.Component<Props, State> {
165165
const {fillParent, prefixer, keepViewsMounted} = this.props
166166
const {activeView, transitioning} = this.state
167167

168-
const style = {...viewStyle}
168+
const style: Object = {...viewStyle}
169169
if (fillParent) {
170170
Object.assign(style, fillStyle)
171171
style.overflow = 'auto'

0 commit comments

Comments
 (0)