Skip to content

Commit

Permalink
Merge pull request #720 from algolia/style/lint-with-plugin
Browse files Browse the repository at this point in the history
refactor(import): force usage of import and export ES6 keywords (+extension)
  • Loading branch information
Vincent Voyer committed Dec 8, 2015
2 parents 128fdd8 + 035846a commit 0aa5b63
Show file tree
Hide file tree
Showing 69 changed files with 335 additions and 327 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ dist/
dist-es5-module/
docs/
dev/app.js
scripts/karma.conf.js
6 changes: 5 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"extends": "algolia",
"rules": {
"no-var": 2
"no-var": 2,
"algolia/relative-require": 2,
"algolia/force-import-root": 2,
"algolia/no-require": 1,
"algolia/no-module-exports": 2
}
}
2 changes: 1 addition & 1 deletion dev/app.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// force using index because package 'main' is dist-es5-module/
var instantsearch = require('../index');
var instantsearch = require('../index.js');

var search = instantsearch({
appId: 'latency',
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require('./src/lib/main');
export default require('./src/lib/main.js');
8 changes: 6 additions & 2 deletions npm-shrinkwrap.json

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

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"doctoc": "^0.15.0",
"eslint": "^1.7.3",
"eslint-config-airbnb": "^0.1.0",
"eslint-config-algolia": "^4.2.0",
"eslint-config-algolia": "^4.5.0",
"eslint-plugin-algolia": "^1.5.0",
"eslint-plugin-react": "^3.6.3",
"expect": "^1.13.0",
"expect-jsx": "^2.1.0",
Expand Down
14 changes: 7 additions & 7 deletions scripts/bump-package-version.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
let fs = require('fs');
let path = require('path');
import fs from 'fs';
import path from 'path';

let mversion = require('mversion');
import mversion from 'mversion';

import semver from 'semver';
import currentVersion from '../src/lib/version.js';

if (!process.env.VERSION) {
throw new Error('release: Usage is VERSION=MAJOR.MINOR.PATCH npm run release');
}

let semver = require('semver');
let currentVersion = require('../src/lib/version');
let newVersion = process.env.VERSION;

if (!semver.valid(newVersion)) {
Expand All @@ -24,7 +24,7 @@ console.log('Releasing ' + newVersion);
console.log('..Updating src/lib/version.js');

let versionFile = path.join(__dirname, '../src/lib/version.js');
let newContent = "module.exports = '" + newVersion + "';\n";
let newContent = "export default '" + newVersion + "';\n";
fs.writeFileSync(versionFile, newContent);

console.log('..Updating package.json, npm-shrinwrap.json');
Expand Down
14 changes: 7 additions & 7 deletions scripts/docs/gen-widget-doc.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
let jsdoc2md = require('jsdoc-to-markdown');
let dmd = require('dmd');
let fs = require('fs');
let util = require('util');
let path = require('path');
let rimraf = require('rimraf');
let mkdirp = require('mkdirp');
import jsdoc2md from 'jsdoc-to-markdown';
import dmd from 'dmd';
import fs from 'fs';
import util from 'util';
import path from 'path';
import rimraf from 'rimraf';
import mkdirp from 'mkdirp';

/* paths used by this script */
let p = {
Expand Down
10 changes: 4 additions & 6 deletions src/components/ClearAll/ClearAll.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
let React = require('react');

let Template = require('../Template');

let {isSpecialClick} = require('../../lib/utils');
import React from 'react';
import Template from '../Template.js';
import {isSpecialClick} from '../../lib/utils.js';

class ClearAll extends React.Component {
handleClick(e) {
Expand Down Expand Up @@ -46,4 +44,4 @@ ClearAll.propTypes = {
url: React.PropTypes.string.isRequired
};

module.exports = ClearAll;
export default ClearAll;
12 changes: 6 additions & 6 deletions src/components/CurrentRefinedValues/CurrentRefinedValues.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
let React = require('react');
import React from 'react';

let Template = require('../Template.js');
import Template from '../Template.js';

let {isSpecialClick} = require('../../lib/utils.js');
let map = require('lodash/collection/map');
let cloneDeep = require('lodash/lang/cloneDeep');
import {isSpecialClick} from '../../lib/utils.js';
import map from 'lodash/collection/map';
import cloneDeep from 'lodash/lang/cloneDeep';

class CurrentRefinedValues extends React.Component {
_clearAllElement(position, requestedPosition) {
Expand Down Expand Up @@ -129,4 +129,4 @@ CurrentRefinedValues.propTypes = {
templateProps: React.PropTypes.object.isRequired
};

module.exports = CurrentRefinedValues;
export default CurrentRefinedValues;
8 changes: 4 additions & 4 deletions src/components/Hits.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let React = require('react');
let map = require('lodash/collection/map');
import React from 'react';
import map from 'lodash/collection/map';

let Template = require('./Template');
import Template from './Template.js';

class Hits extends React.Component {
renderWithResults() {
Expand Down Expand Up @@ -54,4 +54,4 @@ Hits.defaultProps = {
results: {hits: []}
};

module.exports = Hits;
export default Hits;
16 changes: 8 additions & 8 deletions src/components/Pagination/Pagination.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
let React = require('react');
let forEach = require('lodash/collection/forEach');
let defaultsDeep = require('lodash/object/defaultsDeep');
let {isSpecialClick} = require('../../lib/utils');
import React from 'react';
import forEach from 'lodash/collection/forEach';
import defaultsDeep from 'lodash/object/defaultsDeep';
import {isSpecialClick} from '../../lib/utils.js';

let Paginator = require('./Paginator');
let PaginationLink = require('./PaginationLink');
import Paginator from './Paginator.js';
import PaginationLink from './PaginationLink.js';

let cx = require('classnames');
import cx from 'classnames';

class Pagination extends React.Component {
constructor(props) {
Expand Down Expand Up @@ -168,4 +168,4 @@ Pagination.defaultProps = {
nbPages: 0
};

module.exports = Pagination;
export default Pagination;
4 changes: 2 additions & 2 deletions src/components/Pagination/PaginationLink.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let React = require('react');
import React from 'react';

class PaginationLink extends React.Component {
render() {
Expand Down Expand Up @@ -35,4 +35,4 @@ PaginationLink.propTypes = {
url: React.PropTypes.string
};

module.exports = PaginationLink;
export default PaginationLink;
4 changes: 2 additions & 2 deletions src/components/Pagination/Paginator.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let range = require('lodash/utility/range');
import range from 'lodash/utility/range';

class Paginator {
constructor(params) {
Expand Down Expand Up @@ -47,4 +47,4 @@ class Paginator {
}
}

module.exports = Paginator;
export default Paginator;
4 changes: 2 additions & 2 deletions src/components/PoweredBy/PoweredBy.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let React = require('react');
import React from 'react';

class PoweredBy extends React.Component {
render() {
Expand All @@ -18,4 +18,4 @@ PoweredBy.propTypes = {
})
};

module.exports = PoweredBy;
export default PoweredBy;
10 changes: 5 additions & 5 deletions src/components/PriceRanges/PriceRanges.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
let React = require('react');
import React from 'react';

let Template = require('../Template');
let PriceRangesForm = require('./PriceRangesForm');
let cx = require('classnames');
import Template from '../Template.js';
import PriceRangesForm from './PriceRangesForm.js';
import cx from 'classnames';

class PriceRanges extends React.Component {
getForm() {
Expand Down Expand Up @@ -94,4 +94,4 @@ PriceRanges.defaultProps = {
cssClasses: {}
};

module.exports = PriceRanges;
export default PriceRanges;
4 changes: 2 additions & 2 deletions src/components/PriceRanges/PriceRangesForm.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let React = require('react');
import React from 'react';

class PriceRangesForm extends React.Component {
getInput(type) {
Expand Down Expand Up @@ -55,5 +55,5 @@ PriceRangesForm.defaultProps = {
};


module.exports = PriceRangesForm;
export default PriceRangesForm;

12 changes: 5 additions & 7 deletions src/components/RefinementList/RefinementList.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
let React = require('react');
import React from 'react';
import cx from 'classnames';
import {isSpecialClick} from '../../lib/utils.js';

let cx = require('classnames');

let Template = require('../Template');

let {isSpecialClick} = require('../../lib/utils');
import Template from '../Template.js';

class RefinementList extends React.Component {
refine(value) {
Expand Down Expand Up @@ -140,4 +138,4 @@ RefinementList.defaultProps = {
attributeNameKey: 'name'
};

module.exports = RefinementList;
export default RefinementList;
4 changes: 2 additions & 2 deletions src/components/Selector.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let React = require('react');
import React from 'react';

class Selector extends React.Component {
handleChange(event) {
Expand Down Expand Up @@ -51,4 +51,4 @@ Selector.propTypes = {
setValue: React.PropTypes.func.isRequired
};

module.exports = Selector;
export default Selector;
6 changes: 3 additions & 3 deletions src/components/Slider/Slider.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
let React = require('react');
import React from 'react';

let Nouislider = require('react-nouislider');
import Nouislider from 'react-nouislider';

let cssPrefix = 'ais-range-slider--';

Expand Down Expand Up @@ -58,4 +58,4 @@ Slider.propTypes = {
])
};

module.exports = Slider;
export default Slider;
2 changes: 1 addition & 1 deletion src/components/Slider/__tests__/Slider-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('Slider', () => {
renderer = createRenderer();

// need to be required AFTER jsdom has initialized global.window/navigator
Slider = require('../Slider');
Slider = require('../Slider.js');
Nouislider = require('react-nouislider');
});

Expand Down
6 changes: 3 additions & 3 deletions src/components/Stats/Stats.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
let React = require('react');
import React from 'react';

let Template = require('../Template');
import Template from '../Template.js';

class Stats extends React.Component {
render() {
Expand Down Expand Up @@ -36,4 +36,4 @@ Stats.propTypes = {
templateProps: React.PropTypes.object.isRequired
};

module.exports = Stats;
export default Stats;
12 changes: 6 additions & 6 deletions src/components/Template.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
let React = require('react');
let mapValues = require('lodash/object/mapValues');
let curry = require('lodash/function/curry');
let cloneDeep = require('lodash/lang/cloneDeep');
let hogan = require('hogan.js');
import React from 'react';
import mapValues from 'lodash/object/mapValues';
import curry from 'lodash/function/curry';
import cloneDeep from 'lodash/lang/cloneDeep';
import hogan from 'hogan.js';

class Template extends React.Component {
render() {
Expand Down Expand Up @@ -122,4 +122,4 @@ function transformHelpersToHogan(helpers, compileOptions, data) {
});
}

module.exports = Template;
export default Template;
4 changes: 2 additions & 2 deletions src/decorators/__tests__/TestComponent.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let React = require('react');
import React from 'react';

// This component is only used in tests, as a placeholder
class TestComponent extends React.Component {
Expand All @@ -8,4 +8,4 @@ class TestComponent extends React.Component {
}


module.exports = TestComponent;
export default TestComponent;
6 changes: 3 additions & 3 deletions src/decorators/autoHideContainer.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Issue with eslint + high-order components like decorators
/* eslint react/prop-types: 0 */

let React = require('react');
let ReactDOM = require('react-dom');
import React from 'react';
import ReactDOM from 'react-dom';

function autoHideContainer(ComposedComponent) {
class AutoHide extends React.Component {
Expand Down Expand Up @@ -38,4 +38,4 @@ function autoHideContainer(ComposedComponent) {
return AutoHide;
}

module.exports = autoHideContainer;
export default autoHideContainer;
8 changes: 4 additions & 4 deletions src/decorators/headerFooter.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Issue with eslint + high-order components like decorators
/* eslint react/prop-types: 0 */

let React = require('react');
import React from 'react';

let cx = require('classnames');
import cx from 'classnames';

let Template = require('../components/Template');
import Template from '../components/Template.js';

function headerFooter(ComposedComponent) {
class HeaderFooter extends React.Component {
Expand Down Expand Up @@ -65,4 +65,4 @@ function headerFooter(ComposedComponent) {
return HeaderFooter;
}

module.exports = headerFooter;
export default headerFooter;
Loading

0 comments on commit 0aa5b63

Please sign in to comment.