Skip to content

Commit

Permalink
Merge pull request #70 from OrigenStudio/develop
Browse files Browse the repository at this point in the history
rc-7 !
  • Loading branch information
PolGuixe authored Aug 10, 2018
2 parents 9a5f409 + a971057 commit 189ed08
Show file tree
Hide file tree
Showing 45 changed files with 11,051 additions and 350 deletions.
7 changes: 1 addition & 6 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
{
"presets": [
"es2015",
"stage-2",
"react",
"flow",
]
"presets": ["es2015", "stage-2", "react", "flow"]
}
78 changes: 0 additions & 78 deletions .eslintrc

This file was deleted.

11 changes: 11 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module.exports = {
extends: 'airbnb',
parser: 'babel-eslint',
plugins: ['flowtype'],
globals: {
graphql: true,
},
rules: {
'react/prefer-stateless-function': 'warning',
},
};
3 changes: 3 additions & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
[include]

[libs]
flow-typed

[lints]

[options]
suppress_comment= \\(.\\|\n\\)*\\$FlowIgnore

1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"semi": true,
"singleQuote": true,
"trailingComma": "es5",
"prettier.eslintIntegration": true
Expand Down
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ notifications:
slack:
on_pull_requests: false
template:
- "::::::::::::::::::::::::::::::::::::::::::::"
- "········· MATERIAL-UI-LAYOUT ·········"
- " -------------------- "
- "MATERIAL-UI-LAYOUT"
- "------------------"
- "Build <%{build_url}|#%{build_number}> (<%{compare_url}|%{commit}>) of %{repository_slug}@%{branch} by %{author} %{result} in %{duration}"
- "::::::::::::::::::::::::::::::::::::::::::::"
rooms:
- origen-studio:pZY8AyN5fUuPPLw7lR6UN72v#p-open-source
Expand Down
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"prettier.eslintIntegration": true,
// Path to flow binary. On Windows use '\\' as directory separator
"flow.pathToFlow": "${workspaceRoot}/node_modules/.bin/flow",
}
Loading

0 comments on commit 189ed08

Please sign in to comment.