Skip to content
Closed
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@
"no-caller": 1, // disallow use of arguments.caller or arguments.callee
"no-div-regex": 1, // disallow division operators explicitly at beginning of regular expression (off by default)
"no-else-return": 0, // disallow else after a return in an if (off by default)
"no-empty-label": 1, // disallow use of labels for anything other then loops and switches
"no-eq-null": 0, // disallow comparisons to null without a type-checking operator (off by default)
"no-eval": 1, // disallow use of eval()
"no-extend-native": 1, // disallow adding to native types
Expand Down Expand Up @@ -182,6 +181,8 @@
// These rules are purely matters of style and are quite subjective.

"key-spacing": 0,
"keyword-spacing": 1, // enforce spacing before and after keywords
"jsx-quotes": [1, "prefer-double"],
"comma-spacing": 0,
"no-multi-spaces": 0,
"brace-style": 0, // enforce one true brace style (off by default)
Expand All @@ -205,11 +206,9 @@
"quote-props": 0, // require quotes around object literal property names (off by default)
"semi": 1, // require or disallow use of semicolons instead of ASI
"sort-vars": 0, // sort variables within the same declaration block (off by default)
"space-after-keywords": 1, // require a space after certain keywords (off by default)
"space-in-brackets": 0, // require or disallow spaces inside brackets (off by default)
"space-in-parens": 0, // require or disallow spaces inside parentheses (off by default)
"space-infix-ops": 1, // require spaces around operators
"space-return-throw-case": 1, // require a space after return, throw, and case
"space-unary-ops": [1, { "words": true, "nonwords": false }], // require or disallow spaces before/after unary operators (words on by default, nonwords off by default)
"max-nested-callbacks": 0, // specify the maximum depth callbacks can be nested (off by default)
"one-var": 0, // allow just one var statement per function (off by default)
Expand All @@ -227,7 +226,6 @@

"react/display-name": 0,
"react/jsx-boolean-value": 0,
"react/jsx-quotes": [1, "double", "avoid-escape"],
"react/jsx-no-undef": 1,
"react/jsx-sort-props": 0,
"react/jsx-uses-react": 0,
Expand Down
17 changes: 11 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@
"parse",
"react-transform-hmr"
],
"platforms": ["ios", "android"]
"platforms": [
"ios",
"android"
]
},
"modulePathIgnorePatterns": [
"/node_modules/(?!react|fbjs|react-native|parse|react-transform-hmr|core-js|promise)/",
Expand Down Expand Up @@ -109,8 +112,9 @@
"npm-shrinkwrap.json"
],
"scripts": {
"test": "NODE_ENV=test jest",
"lint": "eslint Examples/ Libraries/",
"test": "NODE_ENV=test node_modules/jest-cli/bin/jest.js",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this shouldn't be necessary? npm install creates a .bin folder in node_modules with a jest executable. npm run adds this to the $PATH.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cpojer My bad. For some reason it didn't work for me last time I tried. Will update the PR.

"flow": "node_modules/flow-bin/cli.js check .",
"lint": "node_modules/eslint/bin/eslint.js Examples/ Libraries/",
"start": "/usr/bin/env bash -c './packager/packager.sh \"$@\" || true' --"
},
"bin": {
Expand Down Expand Up @@ -172,10 +176,11 @@
"yeoman-generator": "^0.20.3"
},
"devDependencies": {
"babel-eslint": "^5.0.0",
"eslint": "^2.2.0",
"eslint-plugin-react": "^4.1.0",
"flow-bin": "^0.21.0",
"jest-cli": "0.9.0-fb2",
"babel-eslint": "4.1.4",
"eslint": "1.3.1",
"eslint-plugin-react": "3.3.1",
"portfinder": "0.4.0"
}
}