Skip to content

Commit

Permalink
fix(): Fixes the project build by addressing some issues introduced b…
Browse files Browse the repository at this point in the history
…y the eslint upgrade.

Fixes the project build by addressing some issues introduced by the eslint upgrade.
  • Loading branch information
ctrlplusb committed Aug 25, 2016
1 parent 4670cc9 commit 106d593
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"no-confusing-arrow": 0,
"prefer-arrow-callback": 0,
"quotes": [2, "backtick", "avoid-escape"],
"space-infix-ops": 0
"space-infix-ops": 0,
"react/jsx-filename-extension": 0
}
}
2 changes: 1 addition & 1 deletion lib/react-component-queries.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
},
"homepage": "https://github.com/ctrlplusb/react-component-queries#readme",
"devDependencies": {
"babel-cli": "6.11.4",
"babel-core": "6.13.2",
"babel-cli": "6.14.0",
"babel-core": "6.14.0",
"babel-eslint": "6.1.2",
"babel-loader": "6.2.5",
"babel-plugin-rewire": "1.0.0-rc-2",
"babel-preset-es2015": "6.13.2",
"babel-preset-es2015": "6.14.0",
"babel-preset-react": "6.11.1",
"babel-preset-stage-1": "6.13.0",
"babel-register": "6.11.6",
"babel-register": "6.14.0",
"chai": "3.5.0",
"codecov.io": "0.1.6",
"commitizen": "2.8.6",
Expand All @@ -51,7 +51,7 @@
"eslint-loader": "1.5.0",
"eslint-plugin-import": "1.14.0",
"eslint-plugin-jsx-a11y": "2.1.0",
"eslint-plugin-mocha": "4.3.0",
"eslint-plugin-mocha": "4.4.0",
"eslint-plugin-react": "6.1.2",
"express": "4.14.0",
"ghooks": "1.3.2",
Expand Down
4 changes: 3 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
export default from './ComponentQueries';
import ComponentQueries from './ComponentQueries';

export default ComponentQueries;
10 changes: 5 additions & 5 deletions test/ComponentQueries.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ describeWithDOM(`Given the ComponentQueries library`, () => {
let sizeMeConfig;

beforeEach(() => {
ComponentQueries = require(`../src/index.js`).default;
ComponentQueries = require(`../src/ComponentQueries.js`).default;

// Set up our mocks.
const ComponentQueriesRewireAPI = ComponentQueries.__RewireAPI__;
Expand Down Expand Up @@ -85,7 +85,7 @@ describeWithDOM(`Given the ComponentQueries library`, () => {
monitorWidth: false,
refreshRate: 200
}
})(() => <div></div>);
})(() => <div />);

expect(sizeMeConfig).to.eql({
monitorHeight: true,
Expand Down Expand Up @@ -134,7 +134,7 @@ describeWithDOM(`Given the ComponentQueries library`, () => {

const ComponentQueriedComponent = ComponentQueries(
({ height }) => { actualHeight = height; return {}; }
)(() => <div></div>);
)(() => <div />);

// Initial render
mount(<ComponentQueriedComponent size={{ width: 100, height: 100 }} />);
Expand All @@ -147,7 +147,7 @@ describeWithDOM(`Given the ComponentQueries library`, () => {
const ComponentQueriedComponent = ComponentQueries(
({ width }) => width <= 100 ? { foo: `bar` } : {},
({ width }) => width <= 100 ? { foo: `baz` } : {},
)((props) => { receivedProps = props; return <div></div>; });
)((props) => { receivedProps = props; return <div />; });

// Initial render with duplicate query result.
const mounted = mount(
Expand All @@ -170,7 +170,7 @@ describeWithDOM(`Given the ComponentQueries library`, () => {
],
conflictResolver: (x, y, key) =>
key === `foo` ? x.concat(` `, y) : y
})((props) => { receivedProps = props; return <div></div>; });
})((props) => { receivedProps = props; return <div />; });

// Initial render duplicate prop
const mounted = mount(
Expand Down

0 comments on commit 106d593

Please sign in to comment.