Merge pull request #3015 from Automattic/fix/eslint-no-lodash-import

Framework: Introduce custom ESLint rules, including Lodash import restrictions

.eslintrc.js

@@ -12,7 +12,8 @@ module.exports = {
 		'modules': true
 	},
 	'plugins': [
-		'eslint-plugin-react'
+		'eslint-plugin-react',
+		'eslint-plugin-wpcalypso'
 	],
 	'rules': {
 		'brace-style': [ 1, '1tbs' ],
@@ -89,6 +90,8 @@ module.exports = {
 		'valid-jsdoc': [ 1, { 'requireReturn': false } ],
 		// Common top-of-file requires, expressions between external, interal
 		'vars-on-top': 1,
-		'yoda': 0
+		'yoda': 0,
+		// Custom rules
+		"wpcalypso/no-lodash-import": 2
 	}
 };

client/lib/user/support-user-interop.js

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { compose } from 'lodash';
+import compose from 'lodash/function/compose';
 
 /**
  * Internal dependencies
@@ -43,7 +43,7 @@ export default function( reduxStore ) {
 	// update the wpcom API interceptor accordingly.
 	reduxStore.subscribe( () => {
 		const state = reduxStore.getState();
-		
+
 		if ( wpcom.setSupportUserToken( getSupportUser( state ), getSupportToken( state ) ) ) {
 			onTokenChange();
 		}

client/my-sites/exporter/index.jsx

@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { connect } from 'react-redux';
-import { compose } from 'lodash';
+import compose from 'lodash/function/compose';
 
 /**
  * Internal dependencies

client/my-sites/exporter/spinner-button.jsx

@@ -2,7 +2,7 @@
  * External dependencies
  */
 import React, { PropTypes } from 'react';
-import { omit } from 'lodash';
+import omit from 'lodash/object/omit';
 
 /**
  * Internal dependencies

client/state/notices/actions.js

@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import uniqueId from 'lodash/utility/uniqueId';
+
 /**
  * Internal dependencies
  */
@@ -7,8 +12,6 @@ import {
 	SET_ROUTE
 } from 'state/action-types';
 
-import { uniqueId } from 'lodash';
-
 export function removeNotice( noticeId ) {
 	return {
 		noticeId: noticeId,

docs/coding-guidelines/javascript.md

@@ -979,7 +979,7 @@ More about:
 
 ## ESLint
 
-To help encourages folks to follow the coding standards, there is a [ESLint](http://eslint.org/) configuration file ```.eslintrc``` that configures ESLint to detect code that doesn't follow the guidelines. ESLint also catches basic syntax errors, and natively supports both ES6 and JSX. It can be extended by plugins, such as [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react), which we use in our configuration.
+To help encourages folks to follow the coding standards, there is a [ESLint](http://eslint.org/) configuration file ```.eslintrc``` that configures ESLint to detect code that doesn't follow the guidelines. ESLint also catches basic syntax errors, and natively supports both ES6 and JSX. It can be extended by plugins, such as [`eslint-plugin-wpcalypso`](https://github.com/yannickcr/eslint-plugin-wpcalypso), which we use in our configuration.
 
 There are [integrations](http://eslint.org/docs/user-guide/integrations) for many editors that will automatically detect the configuration file and run the checks.
 
@@ -1044,7 +1044,7 @@ If you are using Sublime Text, you can use the `SublimeLinter-eslint` plugin to
 Before following these instructions, you'll want to globally install ESLint and related dependencies by running the following command in your terminal:
 
 ```bash
-npm install -g eslint eslint-plugin-react babel-eslint
+npm install -g eslint eslint-plugin-wpcalypso eslint-plugin-react babel-eslint
 ```
 
 #### Identifying Spaces with Sublime Text

package.json

@@ -129,6 +129,7 @@
     "esformatter-special-bangs": "1.0.1",
     "eslint": "1.10.3",
     "eslint-plugin-react": "3.11.3",
+    "eslint-plugin-wpcalypso": "1.0.0",
     "jsdom": "7.2.0",
     "localStorage": "1.0.2",
     "lodash-deep": "1.5.3",

server/i18nlint/i18nlint.js

@@ -10,8 +10,8 @@ var fs = require( 'fs' ),
 	preProcessXGettextJSMatch = require( '../i18n/preprocess-xgettextjs-match.js' ),
 	SourceMapConsumer = require( 'source-map' ).SourceMapConsumer,
 	tokenize = require( '../../client/lib/interpolate-components/tokenize.js' ),
-	contains = require( 'lodash' ).contains,
-	flow = require( 'lodash' ).flow;
+	contains = require( 'lodash/collection/contains' ),
+	flow = require( 'lodash/function/flow' );
 
 /*
  * Module variables