Skip to content

Commit

Permalink
Merge pull request #518 from FormidableLabs/chore/various-misc-updates
Browse files Browse the repository at this point in the history
Minor updates. Switch eslint to real JS for node resolution.
  • Loading branch information
boygirl authored Mar 15, 2017
2 parents 75f6962 + 245157a commit 448a1a5
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "./node_modules/builder-victory-component/config/babel/.babelrc"
"extends": "builder-victory-component/config/babel/.babelrc"
}
2 changes: 0 additions & 2 deletions .eslintrc

This file was deleted.

6 changes: 6 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
var path = require("path");
var base = path.dirname(require.resolve("builder-victory-component/package.json"));

module.exports = {
extends: path.join(base, "config/eslint/.eslintrc-source")
};
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@ dist
lib
node_modules
npm-debug.log*
yarn.lock
yarn-error.log*
2 changes: 0 additions & 2 deletions test/.eslintrc

This file was deleted.

6 changes: 6 additions & 0 deletions test/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
var path = require("path");
var base = path.dirname(require.resolve("builder-victory-component/package.json"));

module.exports = {
extends: path.join(base, "config/eslint/.eslintrc-test")
};

0 comments on commit 448a1a5

Please sign in to comment.