Skip to content

Commit ac1c1f8

Browse files
authored
Merge pull request #161 from reactjs/dev-1.0
1.0
2 parents 47f865d + f29ed4f commit ac1c1f8

36 files changed

+6999
-1578
lines changed

.babelrc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"presets": [
3-
"es2015",
4-
"react",
5-
"stage-1"
3+
["env", { "loose": true }],
4+
"react"
5+
],
6+
"plugins": [
7+
"transform-object-rest-spread",
8+
"transform-class-properties"
69
]
710
}

.eslintrc

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,15 @@
66
"node": true
77
},
88
"rules": {
9-
"react/prefer-es6-class": 0,
10-
"react/prefer-stateless-function": 0
9+
"no-plusplus": "off",
10+
"react/require-default-props": "off",
11+
"react/jsx-filename-extension": ["error", { "extensions": [".js"] }],
12+
"react/forbid-prop-types": "off",
13+
"react/sort-comp": "off",
14+
"jsx-a11y/no-static-element-interactions": "off",
15+
"import/no-extraneous-dependencies": ["error", {
16+
"devDependencies": ["**/__tests__/*-test.js"],
17+
"optionalDependencies": false
18+
}]
1119
}
1220
}

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
.idea
2-
*.iml
31
build/
42
node_modules/
53
npm-debug.log
64
lib/
7-
yarn.lock

bower.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)