Skip to content

Commit

Permalink
Merge pull request #4 from soulchainer/update_to_Neutrino_V6
Browse files Browse the repository at this point in the history
Upgrade to Neutrino V6
  • Loading branch information
guzart authored Aug 16, 2017
2 parents 2a30910 + 2dc0e1b commit 4d48679
Show file tree
Hide file tree
Showing 4 changed files with 507 additions and 340 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ config, following the [Airbnb styleguide](/~https://github.com/airbnb/javascript).

* Node.js v6.9+
* Yarn or npm client
* Neutrino v5, Neutrino build preset
* Neutrino v6, Neutrino build preset

## Installation

Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const merge = require('deepmerge');
const eslint = require('neutrino-middleware-eslint');

module.exports = (neutrino, options) => {
module.exports = (neutrino, options = {}) => {
neutrino.use(eslint, merge({
eslint: {
baseConfig: {
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@
},
"homepage": "/~https://github.com/guzart/neutrino-preset-airbnb#readme",
"dependencies": {
"deepmerge": "^1.3.2",
"eslint": "^3.18.0",
"eslint-config-airbnb": "^14.1.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^4.0.0",
"eslint-plugin-react": "^6.10.3",
"neutrino-middleware-eslint": "^5.0.0"
"deepmerge": "^1.4.3",
"eslint": "^3.19.0",
"eslint-config-airbnb": "^15.0.1",
"eslint-plugin-import": "^2.3.0",
"eslint-plugin-jsx-a11y": "^5.0.3",
"eslint-plugin-react": "^7.1.0",
"neutrino-middleware-eslint": "^6.0.0"
},
"peerDependencies": {
"neutrino": "^5.0.0"
"neutrino": "^6.0.0"
},
"devDependencies": {
"ava": "^0.18.2",
"neutrino": "^5.0.0",
"ava": "^0.19.1",
"neutrino": "^6.0.0",
"standard-version": "^4.0.0",
"webpack": "^2.3.2"
"webpack": "^2.6.1"
}
}
Loading

0 comments on commit 4d48679

Please sign in to comment.