Skip to content

Commit

Permalink
Moving eslint configuration to it's own eslintrc. Updating eslint and…
Browse files Browse the repository at this point in the history
… relevant dependencies. (nfl#211)
  • Loading branch information
cwelch5 authored Dec 4, 2016
1 parent f25a7a9 commit f415315
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 20 deletions.
12 changes: 12 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"extends": "nfl",
"env": {
"browser": true,
"mocha": true,
"es6": true
},
"globals": {
"expect": false,
"sinon": false
}
}
24 changes: 5 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@
"babel-preset-stage-0": "6.16.0",
"chai": "3.5.0",
"cross-env": "3.0.0",
"eslint": "3.6.1",
"eslint-config-nfl": "10.0.0",
"eslint": "3.11.1",
"eslint-config-nfl": "11.0.0",
"eslint-plugin-import": "1.16.0",
"eslint-plugin-jsx-a11y": "2.2.2",
"eslint-plugin-mocha": "4.5.1",
"eslint-plugin-react": "6.3.0",
"eslint-plugin-jsx-a11y": "3.0.1",
"eslint-plugin-mocha": "4.7.0",
"eslint-plugin-react": "6.7.1",
"estraverse": "4.2.0",
"estraverse-fb": "1.3.1",
"isparta-loader": "2.0.0",
Expand Down Expand Up @@ -81,19 +81,5 @@
"compile:commonjs": "cross-env BABEL_ENV=commonjs babel src --out-dir lib",
"compile:es": "cross-env BABEL_ENV=es babel src --out-dir es --ignore test.js",
"prepublish": "npm run compile"
},
"eslintConfig": {
"extends": [
"nfl"
],
"env": {
"browser": true,
"mocha": true,
"es6": true
},
"globals": {
"expect": false,
"sinon": false
}
}
}
2 changes: 1 addition & 1 deletion src/test/HelmetTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -1875,7 +1875,7 @@ describe("Helmet", () => {
expect(attrs).to.exist;

const markup = ReactServer.renderToStaticMarkup(
<html {...attrs} />
<html lang="en" {...attrs} />
);

expect(markup)
Expand Down

0 comments on commit f415315

Please sign in to comment.