Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ rules:

# http://eslint.org/docs/rules/#nodejs
callback-return: 2
global-require: 2
handle-callback-err:
- 2
- ^(e|err|error)$
Expand Down
4 changes: 2 additions & 2 deletions rules/controller-as-route.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
return {
CallExpression: function(node) {
var routeObject = null;
Expand Down
3 changes: 2 additions & 1 deletion rules/controller-as-vm.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
*/
'use strict';

var utils = require('./utils/utils');

module.exports = function(context) {
var utils = require('./utils/utils');
var badStatements = [];
var badCaptureStatements = [];
var controllerFunctions = [];
Expand Down
3 changes: 2 additions & 1 deletion rules/controller-as.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
*/
'use strict';

var utils = require('./utils/utils');

module.exports = function(context) {
var utils = require('./utils/utils');
var badStatements = [];
var controllerFunctions = [];

Expand Down
4 changes: 2 additions & 2 deletions rules/controller-name.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
return {

CallExpression: function(node) {
Expand Down
4 changes: 2 additions & 2 deletions rules/di.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
var angularNamedObjectList = ['value', 'factory', 'service', 'provider', 'controller', 'filter', 'directive'];

function report(node, syntax) {
Expand Down
3 changes: 2 additions & 1 deletion rules/directive-name.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
*/
'use strict';

var utils = require('./utils/utils');

module.exports = function(context) {
var utils = require('./utils/utils');
if (context.settings.angular === 2) {
return {};
}
Expand Down
4 changes: 2 additions & 2 deletions rules/directive-restrict.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
var options = context.options[0] || {};
var restrictOpt = options.restrict || 'AE';
var explicitRestrict = options.explicit === 'always';
Expand Down
4 changes: 2 additions & 2 deletions rules/empty-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
function report(node, name) {
context.report(node, 'The {{ctrl}} controller is useless because empty. You can remove it from your Router configuration or in one of your view', {
ctrl: name
Expand Down
6 changes: 4 additions & 2 deletions rules/file-name.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
*/
'use strict';

var path = require('path');

var utils = require('./utils/utils');

module.exports = (function() {
var utils = require('./utils/utils');
var path = require('path');
var fileEnding = '.js';

var separators = {
Expand Down
4 changes: 2 additions & 2 deletions rules/filter-name.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
return {

CallExpression: function(node) {
Expand Down
3 changes: 2 additions & 1 deletion rules/function-type.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
*/
'use strict';

var utils = require('./utils/utils');

module.exports = function(context) {
var utils = require('./utils/utils');
var angularObjectList = ['animation', 'config', 'constant', 'controller', 'directive', 'factory', 'filter', 'provider', 'service', 'value', 'decorator'];
var configType = context.options[0] || 'anonymous';
var messageByConfigType = {
Expand Down
4 changes: 2 additions & 2 deletions rules/module-dependency-order.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
var options = context.options[0] || {};
var groupedMode = options.grouped !== false;
var moduleRegex;
Expand Down
4 changes: 2 additions & 2 deletions rules/module-getter.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
return {

ExpressionStatement: function(node) {
Expand Down
4 changes: 2 additions & 2 deletions rules/module-name.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
return {

CallExpression: function(node) {
Expand Down
3 changes: 1 addition & 2 deletions rules/module-setter.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@
*/
'use strict';

var utils = require('./utils/utils');

module.exports = function(context) {
var utils = require('./utils/utils');

return {

VariableDeclaration: function(node) {
Expand Down
4 changes: 2 additions & 2 deletions rules/no-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
return {

CallExpression: function(node) {
Expand Down
4 changes: 2 additions & 2 deletions rules/no-service-method.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
return {

CallExpression: function(node) {
Expand Down
4 changes: 2 additions & 2 deletions rules/no-services.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
var angularObjectList = ['controller', 'filter', 'directive'];
var badServices;
var map;
Expand Down
4 changes: 2 additions & 2 deletions rules/rest-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
var angularObjectList = ['controller', 'filter', 'directive', 'service', 'factory', 'provider'];
var services = ['$http', '$resource', 'Restangular'];
var message = 'You should use the same service ({{method}}) for REST API calls';
Expand Down
4 changes: 2 additions & 2 deletions rules/service-name.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
return {

CallExpression: function(node) {
Expand Down
4 changes: 2 additions & 2 deletions rules/typecheck-array.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
function recordError(node, origin) {
if (node.type === 'Literal' && node.value === '[object Array]') {
context.report(origin, 'You should use the angular.isArray method', {});
Expand Down
4 changes: 2 additions & 2 deletions rules/typecheck-date.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
function recordError(node, origin) {
if (node.type === 'Literal' && node.value === '[object Date]') {
context.report(origin, 'You should use the angular.isDate method', {});
Expand Down
4 changes: 2 additions & 2 deletions rules/typecheck-function.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
function recordError(node, origin) {
if (node.type === 'Literal' && (node.value === 'function' || node.value === '[object Function]')) {
context.report(origin, 'You should use the angular.isFunction method', {});
Expand Down
4 changes: 2 additions & 2 deletions rules/typecheck-number.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
function recordError(node, origin) {
if (node.type === 'Literal' && (node.value === 'number' || node.value === '[object Number]')) {
context.report(origin, 'You should use the angular.isNumber method', {});
Expand Down
4 changes: 2 additions & 2 deletions rules/typecheck-object.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
function recordError(node, origin) {
if (node.type === 'Literal' && (node.value === 'object' || node.value === '[object Object]')) {
context.report(origin, 'You should use the angular.isObject method', {});
Expand Down
4 changes: 2 additions & 2 deletions rules/typecheck-regexp.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
function recordError(node, origin) {
if (node.type === 'Literal' && node.value === '[object RegExp]') {
context.report(origin, 'You should use the angular.isRegexp method', {});
Expand Down
4 changes: 2 additions & 2 deletions rules/typecheck-string.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
*/
'use strict';

module.exports = function(context) {
var utils = require('./utils/utils');
var utils = require('./utils/utils');

module.exports = function(context) {
function recordError(node, origin) {
if (node.type === 'Literal' && (node.value === 'string' || node.value === '[object String]')) {
context.report(origin, 'You should use the angular.isString method', {});
Expand Down
2 changes: 1 addition & 1 deletion rules/utils/rulesConfiguration.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
function Rule(name, config) {
this.name = name;
this.config = config;
this._requireRule = require('../' + this.name);
this._requireRule = require('../' + this.name); // eslint-disable-line global-require
}

Rule.prototype = {
Expand Down
7 changes: 3 additions & 4 deletions scripts/docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
var fs = require('fs');
var parseComments = require('parse-comments');
var _ = require('lodash');
var eslintAngularIndex = require('../index.js');
var eslintAngularIndex = require('../index');
var ruleCategories = require('./ruleCategories.json');
var RuleTester = require('eslint').RuleTester;

var templates = require('./templates.js');
Expand Down Expand Up @@ -41,8 +42,6 @@ function createDocFiles(cb) {
* @param cb callback
*/
function updateReadme(readmePath, cb) {
var ruleCategories = require('./ruleCategories.json');

ruleCategories.rulesByCategory = _.groupBy(this.rules, 'category');

// filter categories without rules
Expand Down Expand Up @@ -192,7 +191,7 @@ function _createRule(ruleName) {
}

// load rule module for tests
rule.module = require('../rules/' + rule.ruleName);
rule.module = require('../rules/' + rule.ruleName); // eslint-disable-line global-require

// load examples, prepare them for the tests and group the for the template
rule.allExamples = _loadExamples(rule);
Expand Down