Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.
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
271 changes: 271 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,271 @@
{
"extends": "eslint:recommended",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather not extend any built-in preset as they can change. We should define our own rules ourselves.

Copy link
Contributor Author

@graingert graingert Aug 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mgol eslint:recommended is a very carefully managed preset, and any changes to it are signaled via semver.

"parserOptions": {
"ecmaVersion": 8
},
"rules": {
"accessor-pairs": "error",
"array-bracket-newline": "off",
"array-bracket-spacing": "off",
"array-callback-return": "error",
"array-element-newline": "off",
"arrow-body-style": "error",
"arrow-parens": "error",
"arrow-spacing": "error",
"block-scoped-var": "off",
"block-spacing": "off",
"brace-style": "off",
"callback-return": "off",
"camelcase": "off",
"capitalized-comments": "off",
"class-methods-use-this": "error",
"comma-dangle": "off",
"comma-spacing": "off",
"comma-style": [
"error",
"last"
],
"complexity": "off",
"computed-property-spacing": "off",
"consistent-return": "off",
"consistent-this": "off",
"curly": "off",
"default-case": "off",
"dot-location": "off",
"dot-notation": "off",
"eol-last": "off",
"eqeqeq": "off",
"for-direction": "error",
"func-call-spacing": "off",
"func-name-matching": "off",
"func-names": "off",
"func-style": "off",
"generator-star-spacing": "error",
"getter-return": "error",
"global-require": "error",
"guard-for-in": "off",
"handle-callback-err": "error",
"id-blacklist": "error",
"id-length": "off",
"id-match": "error",
"indent": "off",
"indent-legacy": "off",
"init-declarations": "off",
"jsx-quotes": "error",
"key-spacing": "off",
"keyword-spacing": "off",
"line-comment-position": "off",
"linebreak-style": "off",
"lines-around-comment": "off",
"lines-around-directive": "off",
"max-depth": "error",
"max-len": "off",
"max-lines": "off",
"max-nested-callbacks": "error",
"max-params": "off",
"max-statements": "off",
"max-statements-per-line": "off",
"multiline-ternary": "off",
"new-parens": "error",
"newline-after-var": "off",
"newline-before-return": "off",
"newline-per-chained-call": "off",
"no-alert": "off",
"no-array-constructor": "error",
"no-await-in-loop": "error",
"no-bitwise": "off",
"no-buffer-constructor": "error",
"no-caller": "error",
"no-catch-shadow": "error",
"no-confusing-arrow": "error",
"no-constant-condition": [
"error",
{
"checkLoops": false
}
],
"no-continue": "off",
"no-div-regex": "error",
"no-duplicate-imports": "error",
"no-else-return": "off",
"no-empty-function": "off",
"no-eq-null": "off",
"no-eval": "error",
"no-extend-native": "off",
"no-extra-bind": "off",
"no-extra-label": "error",
"no-extra-parens": "off",
"no-floating-decimal": "error",
"no-implicit-coercion": [
"error",
{
"boolean": false,
"number": false,
"string": false
}
],
"no-implicit-globals": "off",
"no-implied-eval": "error",
"no-inline-comments": "off",
"no-inner-declarations": [
"error",
"functions"
],
"no-invalid-this": "off",
"no-iterator": "error",
"no-label-var": "error",
"no-labels": "error",
"no-lone-blocks": "error",
"no-lonely-if": "off",
"no-loop-func": "error",
"no-magic-numbers": "off",
"no-mixed-operators": "off",
"no-mixed-requires": "error",
"no-multi-assign": "off",
"no-multi-spaces": "off",
"no-multi-str": "off",
"no-multiple-empty-lines": "off",
"no-native-reassign": "error",
"no-negated-condition": "off",
"no-negated-in-lhs": "error",
"no-nested-ternary": "off",
"no-new": "error",
"no-new-func": "error",
"no-new-object": "error",
"no-new-require": "error",
"no-new-wrappers": "error",
"no-octal-escape": "error",
"no-param-reassign": "off",
"no-path-concat": "error",
"no-plusplus": "off",
"no-process-env": "error",
"no-process-exit": "error",
"no-proto": "error",
"no-prototype-builtins": "off",
"no-restricted-globals": "error",
"no-restricted-imports": "error",
"no-restricted-modules": "error",
"no-restricted-properties": "error",
"no-restricted-syntax": "error",
"no-return-assign": "off",
"no-return-await": "error",
"no-script-url": "error",
"no-self-compare": "error",
"no-sequences": "off",
"no-shadow": "off",
"no-shadow-restricted-names": "error",
"no-spaced-func": "off",
"no-sync": "error",
"no-tabs": "off",
"no-template-curly-in-string": "error",
"no-ternary": "off",
"no-throw-literal": "off",
"no-trailing-spaces": "off",
"no-undef-init": "error",
"no-undefined": "off",
"no-underscore-dangle": "off",
"no-unmodified-loop-condition": "error",
"no-unneeded-ternary": "off",
"no-unused-expressions": "off",
"no-use-before-define": "off",
"no-useless-call": "error",
"no-useless-computed-key": "error",
"no-useless-concat": "off",
"no-useless-constructor": "error",
"no-useless-rename": "error",
"no-useless-return": "error",
"no-var": "off",
"no-void": "off",
"no-warning-comments": "off",
"no-whitespace-before-property": "error",
"no-with": "error",
"nonblock-statement-body-position": [
"error",
"any"
],
"object-curly-newline": "off",
"object-curly-spacing": "off",
"object-property-newline": "off",
"object-shorthand": "off",
"one-var": "off",
"one-var-declaration-per-line": "off",
"operator-assignment": "off",
"operator-linebreak": "off",
"padded-blocks": "off",
"padding-line-between-statements": "error",
"prefer-arrow-callback": "off",
"prefer-const": "error",
"prefer-destructuring": "off",
"prefer-numeric-literals": "error",
"prefer-promise-reject-errors": "error",
"prefer-reflect": "off",
"prefer-rest-params": "off",
"prefer-spread": "off",
"prefer-template": "off",
"quote-props": "off",
"quotes": "off",
"radix": "off",
"require-await": "error",
"require-jsdoc": "off",
"rest-spread-spacing": "error",
"semi": "off",
"semi-spacing": "off",
"semi-style": "off",
"sort-imports": "error",
"sort-keys": "off",
"sort-vars": "off",
"space-before-blocks": "off",
"space-before-function-paren": "off",
"space-in-parens": "off",
"space-infix-ops": "off",
"space-unary-ops": "off",
"spaced-comment": "off",
"strict": "off",
"switch-colon-spacing": "off",
"symbol-description": "error",
"template-curly-spacing": "error",
"template-tag-spacing": "error",
"unicode-bom": [
"error",
"never"
],
"valid-jsdoc": "off",
"vars-on-top": "off",
"wrap-iife": "off",
"wrap-regex": "off",
"yield-star-spacing": "error",
"yoda": "off",
"no-unused-vars": "off",
Copy link
Contributor Author

@graingert graingert Jul 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to turn this off because there's loads of these!

"no-cond-assign": "off",
"no-unexpected-multiline": "off"
},
"env": {
"browser": true
},
"globals": {
"angular": true,
"CryptoJS": true
},
"overrides": [
{
"files": ["**/*.spec.js"],
"env": {
"jasmine": true
},
"rules": {
"no-native-reassign": "off",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what are you guys doing 🤕

"no-global-assign": "off"
},
"globals": {
"module": true,
"inject": true,
"disableAnimations": true,
"createMockStyleSheet": true,
"$mdUtil": false,
"$timeout": false,
"$animate": false,
"$material": false
}
}
]
}
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
- env: "NG_VERSION=1.5"
- env: "NG_VERSION=1.6"
- env: "NG_VERSION=snapshot"
- env: "RUN_LINT=true"
- stage: Deploy
script: ./scripts/travis-build-init.sh --sha=$TRAVIS_COMMIT
env: "MODE=release"
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"dgeni": "^0.4.1",
"dgeni-packages": "^0.13.0",
"github": "^12.0.5",
"eslint": "^4.3.0",
"github-contributors-list": "^1.2.1",
"glob": "~7.0.5",
"gulp": "^3.9.1",
Expand Down Expand Up @@ -84,6 +85,7 @@
"docs:build": "gulp docs",
"docs:watch": "gulp watch site --dev",
"test:fast": "gulp karma-fast",
"test:full": "gulp karma"
"test:full": "gulp karma",
"lint": "eslint src"
}
}
5 changes: 5 additions & 0 deletions scripts/travis-run-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ set -xe
# Ensure that scripts will run from project dir.
cd $(dirname $0)/..

if [[ -n "$RUN_LINT" ]]; then
npm run lint
exit
fi

# When Travis CI specifies an AngularJS version, try to install those for tests.
if [[ -n "$NG_VERSION" ]]; then
./scripts/fetch-angular-version.sh "$NG_VERSION"
Expand Down
4 changes: 2 additions & 2 deletions src/components/autocomplete/js/highlightController.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ MdHighlightCtrl.prototype.createRegex = function(term, flags) {
if (flags.indexOf('^') >= 0) startFlag = '^';
if (flags.indexOf('$') >= 0) endFlag = '$';

return new RegExp(startFlag + regexTerm + endFlag, flags.replace(/[$\^]/g, ''));
return new RegExp(startFlag + regexTerm + endFlag, flags.replace(/[$^]/g, ''));
};

/** Sanitizes a regex by removing all common RegExp identifiers */
MdHighlightCtrl.prototype.sanitizeRegex = function(term) {
return term && term.toString().replace(/[\\\^\$\*\+\?\.\(\)\|\{}\[\]]/g, '\\$&');
return term && term.toString().replace(/[\\^$*+?.()|{}[\]]/g, '\\$&');
};
1 change: 0 additions & 1 deletion src/components/datepicker/_demoMomentJs/script.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
angular.module('datepickerMomentJs', ['ngMaterial'])
.config(function($mdDateLocaleProvider) {
console.log(window.moment ? 'moment loaded' : 'not loaded');
//moment.locale('fr');
//$mdDateLocaleProvider.months = moment.months();
//$mdDateLocaleProvider.months = moment.monthsShort();
Expand Down
1 change: 1 addition & 0 deletions src/components/datepicker/js/calendar.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,7 @@ describe('md-calendar', function() {
expect(nextMonth.querySelectorAll('tr').length).toBe(1);

var dates = nextMonth.querySelectorAll('.md-calendar-date');
var date;
for (var i = 0; i < dates.length; i++) {
date = dates[i];
if (date.textContent) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/datepicker/js/dateLocaleProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@

// Looks for three chunks of content (either numbers or text) separated
// by delimiters.
var re = /^(([a-zA-Z]{3,}|[0-9]{1,4})([ \.,]+|[\/\-])){2}([a-zA-Z]{3,}|[0-9]{1,4})$/;
var re = /^(([a-zA-Z]{3,}|[0-9]{1,4})([ .,]+|[/-])){2}([a-zA-Z]{3,}|[0-9]{1,4})$/;
return re.test(dateString);
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/dialog/dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ function MdDialogProvider($$interimElementProvider) {

// For navigation $destroy events, do a quick, non-animated removal,
// but for normal closes (from clicks, etc) animate the removal
return !!options.$destroy ? detachAndClean() : animateRemoval().then( detachAndClean );
return options.$destroy ? detachAndClean() : animateRemoval().then( detachAndClean );

/**
* For normal closes, animate the removal.
Expand Down Expand Up @@ -1048,7 +1048,7 @@ function MdDialogProvider($$interimElementProvider) {
*/
options.hideBackdrop = function hideBackdrop($destroy) {
if (options.backdrop) {
if ( !!$destroy ) options.backdrop.remove();
if ( $destroy ) options.backdrop.remove();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ESLint says that !! should be replaced by Boolean($destroy) for this rule. Is there a reason that you don't think that guidance applies here and in the other instances of this replacement in the PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was autofixed. It's because there's no need to coerce with if ( ... )

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also no-implicit-coercion is not enabled in eslint:recommended https://eslint.org/docs/rules/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the rule that applied in this location: https://eslint.org/docs/rules/no-extra-boolean-cast

else $animate.leave(options.backdrop);
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/dialog/dialog.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ describe('$mdDialog', function() {

function onShowing(scope, element, options) {
showing = true;
container = angular.element(parent[0].querySelector('.md-dialog-container'));
var container = angular.element(parent[0].querySelector('.md-dialog-container'));
expect(container.length).toBe(0);
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/gridList/grid-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -316,10 +316,10 @@ function GridListDirective($interpolate, $mdConstant, $mdGridLayout, $mdMedia) {
var vGutterShare = (rowCount - 1) / rowCount;

// Percent of the available vertical space that one row takes up.
var vShare = (1 / rowCount) * 100;
vShare = (1 / rowCount) * 100;

// Base vertical size of a row.
var vUnit = UNIT({share: vShare, gutterShare: vGutterShare, gutter: gutter});
vUnit = UNIT({share: vShare, gutterShare: vGutterShare, gutter: gutter});

style.top = POSITION({unit: vUnit, offset: position.row, gutter: gutter});
style.height = DIMENSION({unit: vUnit, span: spans.row, gutter: gutter});
Expand Down
2 changes: 1 addition & 1 deletion src/components/icon/icon.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ describe('MdIcon directive', function() {
return style
.replace(/ng-scope|ng-isolate-scope|md-default-theme/gi,'')
.replace(/\s\s+/g,' ')
.replace(/\s+\"/g,'"')
.replace(/\s+"/g,'"')
.trim();
}

Expand Down
Loading