Skip to content

Commit

Permalink
enable eslint for entire repo and clean up revealed messes
Browse files Browse the repository at this point in the history
  • Loading branch information
ef4 committed Dec 17, 2017
1 parent 1c58c8d commit 9e086c1
Show file tree
Hide file tree
Showing 70 changed files with 126 additions and 179 deletions.
46 changes: 46 additions & 0 deletions .eslintrc-browser.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 6,
sourceType: 'module',
},
extends: 'eslint:recommended',
plugins: [
"ember-internal"
],
env: {
qunit: true,
},
globals: {
'expectAssertion': true,
'expectDeprecation': true,
'expectNoDeprecation': true,
'expectWarning': true,
'expectNoWarning': true,
'ignoreAssertion': true,
'ignoreDeprecation': true,

// A safe subset of "browser:true":
'window': true,
'document': true,
'setTimeout': true,
'clearTimeout': true,
'setInterval': true,
'clearInterval': true,
'console': true,

'Set': true,
'Symbol': true,
'WeakMap': true,
},
rules: {
'ember-internal/require-yuidoc-access': 'error',
'ember-internal/no-const-outside-module-scope': 'error',

'semi': 'error',

// temporarily disabled
'no-unused-vars': 'off',
'comma-dangle': 'off',
},
};
20 changes: 20 additions & 0 deletions .eslintrc-node.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 8,
sourceType: 'module',
},
extends: 'eslint:recommended',
plugins: [
"ember-internal"
],
env: {
mocha: true,
node: true,
qunit: true
},
globals: {
Map: false,
Set: false
}
};
47 changes: 1 addition & 46 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,46 +1 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 6,
sourceType: 'module',
},
extends: 'eslint:recommended',
plugins: [
"ember-internal"
],
env: {
qunit: true,
},
globals: {
'expectAssertion': true,
'expectDeprecation': true,
'expectNoDeprecation': true,
'expectWarning': true,
'expectNoWarning': true,
'ignoreAssertion': true,
'ignoreDeprecation': true,

// A safe subset of "browser:true":
'window': true,
'document': true,
'setTimeout': true,
'clearTimeout': true,
'setInterval': true,
'clearInterval': true,
'console': true,

'Set': true,
'Symbol': true,
'WeakMap': true,
},
rules: {
'ember-internal/require-yuidoc-access': 'error',
'ember-internal/no-const-outside-module-scope': 'error',

'semi': 'error',

// temporarily disabled
'no-unused-vars': 'off',
'comma-dangle': 'off',
},
};
module.exports = require('./.eslintrc-node');
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,4 @@ env:
- TEST_SUITE=blueprints
- TEST_SUITE=travis-browsers DISABLE_JSCS=true DISABLE_JSHINT=true
- TEST_SUITE=each-package-tests BUILD_TYPE=alpha PUBLISH=true

2 changes: 1 addition & 1 deletion bin/feature-flag-yuidoc-filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function updateClassReferencesInNamespaces(data) {
}
}

module.exports = function (data, options) {
module.exports = function (data) {
var featuresToFilter = gatherFeatures();
data.classes = gatherClassesToDocument(data, featuresToFilter);
updateClassReferencesInNamespaces(data);
Expand Down
2 changes: 2 additions & 0 deletions bin/run-node-tests.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env node

/* eslint-disable no-console */

global.QUnit = require('qunitjs');

// Adds test reporting.
Expand Down
2 changes: 2 additions & 0 deletions bin/run-sauce-tests.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env node

/* eslint-disable no-console */

var RSVP = require('rsvp');
var spawn = require('child_process').spawn;

Expand Down
23 changes: 14 additions & 9 deletions bin/run-tests.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/usr/bin/env node

/* eslint-disable no-console */

var RSVP = require('rsvp');
var spawn = require('child_process').spawn;
var chalk = require('chalk');
var FEATURES = require('../broccoli/features');
var getPackages = require('../lib/packages');
Expand Down Expand Up @@ -40,6 +41,9 @@ function runInBrowser(url, retries, resolve, reject) {

puppeteer.launch().then(function(browser) {
browser.newPage().then(function(page) {
/* globals window */
var crashed;

page.on('console', function(msg) {
console.log(msg.text);

Expand Down Expand Up @@ -131,15 +135,13 @@ function runInBrowser(url, retries, resolve, reject) {
page.exposeFunction('callPhantom', function(message) {
if (message && message.name === 'QUnit.done') {
result = message.data;
failed = !result || !result.total || result.failed;
var failed = !result || !result.total || result.failed;

if (!result.total) {
console.error('No tests were executed. Are you loading tests asynchronously?');
}

var code = failed ? 1 : 0;
var crashed = false;

result.code = code;

if (!crashed && code === 0) {
Expand Down Expand Up @@ -245,21 +247,24 @@ switch (process.env.TEST_SUITE) {
case 'node':
console.log('suite: node');
require('./run-node-tests');
return;
process.exit(0);
break;
case 'blueprints':
console.log('suite: blueprints');
require('../node-tests/nodetest-runner');
server.close();
return;
process.exit(0);
break;
case 'travis-browsers':
console.log('suite: travis-browsers');
require('./run-travis-browser-tests');
return;

process.exit(0);
break;
case 'sauce':
console.log('suite: sauce');
require('./run-sauce-tests');
return;
process.exit(0);
break;
default:
console.log('suite: default (generate each package)');
generateEachPackageTests();
Expand Down
2 changes: 2 additions & 0 deletions bin/run-travis-browser-tests.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env node

/* eslint-disable no-console */

var RSVP = require('rsvp');
var spawn = require('child_process').spawn;

Expand Down
2 changes: 0 additions & 2 deletions blueprints/-addon-import.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

var stringUtil = require('ember-cli-string-utils');
var path = require('path');
var inflector = require('inflection');
Expand Down
2 changes: 0 additions & 2 deletions blueprints/acceptance-test/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

const path = require('path');
const testInfo = require('ember-cli-test-info');
const pathUtil = require('ember-cli-path-utils');
Expand Down
2 changes: 0 additions & 2 deletions blueprints/component-addon/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

const path = require('path');
const stringUtil = require('ember-cli-string-utils');
const validComponentName = require('ember-cli-valid-component-name');
Expand Down
2 changes: 0 additions & 2 deletions blueprints/component-test/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

const path = require('path');
const testInfo = require('ember-cli-test-info');
const stringUtil = require('ember-cli-string-utils');
Expand Down
2 changes: 0 additions & 2 deletions blueprints/component/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

const path = require('path');
const stringUtil = require('ember-cli-string-utils');
const pathUtil = require('ember-cli-path-utils');
Expand Down
2 changes: 0 additions & 2 deletions blueprints/controller-test/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

const stringUtil = require('ember-cli-string-utils');
const testInfo = require('ember-cli-test-info');

Expand Down
2 changes: 0 additions & 2 deletions blueprints/controller/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

module.exports = {
description: 'Generates a controller.'
};
2 changes: 0 additions & 2 deletions blueprints/helper-addon/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

/* eslint-env node */

module.exports = require('../-addon-import');
2 changes: 0 additions & 2 deletions blueprints/helper-test/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

const testInfo = require('ember-cli-test-info');
const stringUtils = require('ember-cli-string-utils');
const isPackageMissing = require('ember-cli-is-package-missing');
Expand Down
2 changes: 0 additions & 2 deletions blueprints/helper/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

const normalizeEntityName = require('ember-cli-normalize-entity-name');

module.exports = {
Expand Down
2 changes: 0 additions & 2 deletions blueprints/initializer-addon/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

/* eslint-env node */

module.exports = require('../-addon-import');
2 changes: 0 additions & 2 deletions blueprints/initializer-test/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

const testInfo = require('ember-cli-test-info');
const stringUtils = require('ember-cli-string-utils');

Expand Down
2 changes: 0 additions & 2 deletions blueprints/initializer/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

module.exports = {
description: 'Generates an initializer.'
};
2 changes: 0 additions & 2 deletions blueprints/instance-initializer-addon/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

/* eslint-env node */

module.exports = require('../-addon-import');
2 changes: 0 additions & 2 deletions blueprints/instance-initializer-test/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

const testInfo = require('ember-cli-test-info');
const stringUtils = require('ember-cli-string-utils');

Expand Down
2 changes: 0 additions & 2 deletions blueprints/instance-initializer/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

module.exports = {
description: 'Generates an instance initializer.'
};
2 changes: 0 additions & 2 deletions blueprints/mixin-test/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

const testInfo = require('ember-cli-test-info');
const useTestFrameworkDetector = require('../test-framework-detector');

Expand Down
2 changes: 0 additions & 2 deletions blueprints/mixin/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

module.exports = {
description: 'Generates a mixin.'
};
2 changes: 0 additions & 2 deletions blueprints/route-addon/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

const path = require('path');
const stringUtil = require('ember-cli-string-utils');
const inflector = require('inflection');
Expand Down
2 changes: 0 additions & 2 deletions blueprints/route-test/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

const testInfo = require('ember-cli-test-info');
const path = require('path');
const stringUtil = require('ember-cli-string-utils');
Expand Down
2 changes: 0 additions & 2 deletions blueprints/route/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

const fs = require('fs');
const path = require('path');
const chalk = require('chalk');
Expand Down
2 changes: 0 additions & 2 deletions blueprints/service-test/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

const testInfo = require('ember-cli-test-info');

const useTestFrameworkDetector = require('../test-framework-detector');
Expand Down
2 changes: 0 additions & 2 deletions blueprints/service/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

/* eslint-env node */

module.exports = {
description: 'Generates a service.'
};
Loading

0 comments on commit 9e086c1

Please sign in to comment.