Skip to content

Commit

Permalink
Merge branch 'new_version'
Browse files Browse the repository at this point in the history
  • Loading branch information
olegnn committed May 21, 2017
2 parents 50b0624 + a159cdc commit 90584dc
Show file tree
Hide file tree
Showing 49 changed files with 2,459 additions and 1,928 deletions.
14 changes: 12 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
{
"presets": ["react", "es2015", "stage-0"],
"plugins": ["add-module-exports", "transform-runtime", "babel-plugin-transform-es5-property-mutators", "transform-flow-strip-types"],
"presets": ["react", "es2015"],
"plugins": [
"babel-plugin-syntax-trailing-function-commas",
"flow-react-proptypes",
"transform-flow-strip-types",
"transform-object-rest-spread",
"transform-class-properties",
"transform-runtime",
"babel-plugin-transform-es5-property-mutators",
"babel-plugin-transform-export-extensions",
"add-module-exports"
]
}
7 changes: 6 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
dist/*
dist
gulpfile.js
index.js
flow-typed
node_modules
.git
examples/build
91 changes: 35 additions & 56 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,61 +3,12 @@
"env": {
"browser": true
},

"plugins": [
"flowtype"
],
"rules": {
"flowtype/boolean-style": [
2,
"boolean"
],
"flowtype/define-flow-type": 1,
"flowtype/delimiter-dangle": [
2,
"always"
],
"flowtype/generic-spacing": [
2,
"never"
],
"flowtype/no-weak-types": 0,
"flowtype/require-parameter-type": 0,
"flowtype/require-return-type": [
0,
"always",
{
"annotateUndefined": "never"
}
],
"flowtype/require-valid-file-annotation": 2,
"flowtype/semi": [
2,
"always"
],
"flowtype/space-after-type-colon": [
2,
"always"
],
"flowtype/space-before-generic-bracket": [
2,
"never"
],
"flowtype/space-before-type-colon": [
2,
"always"
],
"flowtype/type-id-match": [
2,
"^([A-Z][a-z0-9]+)+Type$"
],
"flowtype/union-intersection-spacing": [
2,
"always"
],
"flowtype/use-flow-type": 1,
"flowtype/valid-syntax": 1,

"flowtype/space-before-type-colon": [2, "never"],
"flowtype/space-after-type-colon": [2, "always"],
"indent": [2, 2, {"SwitchCase": 1}],
"func-names": [0],
"key-spacing": [2, {
Expand All @@ -84,16 +35,26 @@

"curly": [1, "multi"],
"one-var": [0],
"valid-jsdoc": [1],
"valid-jsdoc": [0],
"arrow-parens": [0],
"default-case": [1],
"comma-dangle": [2, {
"arrays": "always",
"objects": "always",
"imports": "always-multiline",
"exports": "always-multiline",
"functions": "always-multiline"
}],
"array-bracket-spacing": [2, "always"],


"import/no-extraneous-dependencies": [0],
"import/no-duplicates": [2],

"no-bitwise": [0],
"no-confusing-arrow": [0],
"no-console": [0],
"no-duplicate-imports": [0],
"no-mixed-operators": [0],
"no-param-reassign": ["error", { "props": false }],
"no-unused-vars": [1],
Expand All @@ -111,6 +72,17 @@
"react/jsx-no-bind": [2],
"react/prefer-es6-class": [2],
"react/prefer-stateless-function": [2],
"react/sort-comp": [2, {
order: [
'props',
'defaultProps',
'static-methods',
'lifecycle',
'everything-else',
'render'
]
}
],

"jsx-a11y/anchor-has-content": [0],
"jsx-a11y/img-has-alt": [0],
Expand All @@ -119,11 +91,18 @@
},
"settings": {
"flowtype": {
"onlyFilesWithFlowAnnotation": true,
"onlyFilesWithFlowAnnotation": false,
}
},
"extends": "airbnb",
"extends": [
"airbnb",
"plugin:flowtype/recommended"
],
"globals": {
"__PREFIX_LINKS__": true,
},
"Generator": true,
"React$Element": true,
"React$Component": true,
"React$Node": true,
"__PREFIX_LINKS__": true
}
}
8 changes: 4 additions & 4 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[ignore]
.*/__tests__/.*
.*__tests__.*
.*node_modules/documentation.*

[options]
esproposal.class_instance_fields=enable
module.system.node.resolve_dirname=node_modules
module.system.node.resolve_dirname=.
module.name_mapper='^(types)$' -> '<PROJECT_ROOT>/src/types'
esproposal.class_static_fields=enable
unsafe.enable_getters_and_setters=true

[libs]
./src/types.js
./src/object.flow
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.DS_Store
dist
node_modules
node_modules/
npm-debug.log
examples/build
examples/.DS_Store
./**/.DS_Store
yarn-error.log
yarn.lock
flow-typed/
.DS_Store
8 changes: 5 additions & 3 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ gulpfile.js
npm-debug.log
node_modules
__tests__
webpack.config.js
examples
yarn-error.log
webpack.config.dev.js
webpack.config.dist.js
yarn.lock
docs
examples
flow-typed
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016-2017 Oleg Nosov
Copyright (c) 2016-Present Oleg Nosov

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit 90584dc

Please sign in to comment.