Skip to content

Commit

Permalink
Auto merge of emberjs#14786 - Turbo87:bye-bye-jshint, r=stefanpenner
Browse files Browse the repository at this point in the history
Remove remaining JSHint/JSCS code and directives

/cc @rwjblue @stefanpenner
  • Loading branch information
homu committed Jan 5, 2017
2 parents 24f47eb + 1b3e916 commit 7dbf597
Show file tree
Hide file tree
Showing 36 changed files with 39 additions and 220 deletions.
91 changes: 0 additions & 91 deletions .jscsrc

This file was deleted.

57 changes: 0 additions & 57 deletions .jshintrc

This file was deleted.

12 changes: 6 additions & 6 deletions bin/run-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ function generateBuiltTests() {
// ember-testing/ember-debug are stripped from prod/min.
var common = 'skipPackage=container,ember-testing,ember-debug';
testFunctions.push(function() {
return run(common + '&nojshint=true');
return run(common + '&nolint=true');
});
testFunctions.push(function() {
return run(common + '&dist=min&prod=true');
Expand All @@ -125,22 +125,22 @@ function generateBuiltTests() {

function generateOldJQueryTests() {
testFunctions.push(function() {
return run('jquery=1.8.3&nojshint=true');
return run('jquery=1.8.3&nolint=true');
});
testFunctions.push(function() {
return run('jquery=1.10.2&nojshint=true');
return run('jquery=1.10.2&nolint=true');
});
testFunctions.push(function() {
return run('jquery=2.2.4&nojshint=true');
return run('jquery=2.2.4&nolint=true');
});
}

function generateExtendPrototypeTests() {
testFunctions.push(function() {
return run('extendprototypes=true&nojshint=true');
return run('extendprototypes=true&nolint=true');
});
testFunctions.push(function() {
return run('extendprototypes=true&nojshint=true&enableoptionalfeatures=true');
return run('extendprototypes=true&nolint=true&enableoptionalfeatures=true');
});
}

Expand Down
2 changes: 1 addition & 1 deletion blueprints/-addon-import.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

var stringUtil = require('ember-cli-string-utils');
var path = require('path');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/acceptance-test/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

var testInfo = require('ember-cli-test-info');
var pathUtil = require('ember-cli-path-utils');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/component-addon/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

var stringUtil = require('ember-cli-string-utils');
var validComponentName = require('ember-cli-valid-component-name');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/component-test/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

var path = require('path');
var testInfo = require('ember-cli-test-info');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/component/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

var stringUtil = require('ember-cli-string-utils');
var pathUtil = require('ember-cli-path-utils');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/controller-test/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

var testInfo = require('ember-cli-test-info');
var useTestFrameworkDetector = require('../test-framework-detector');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/controller/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

module.exports = {
description: 'Generates a controller.'
Expand Down
2 changes: 1 addition & 1 deletion blueprints/helper-addon/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/*jshint node:true*/
/* eslint-env node */

module.exports = require('../-addon-import');
2 changes: 1 addition & 1 deletion blueprints/helper-test/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

var testInfo = require('ember-cli-test-info');
var stringUtils = require('ember-cli-string-utils');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/helper/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
/*jshint node:true*/
/* eslint-env node */
var normalizeEntityName = require('ember-cli-normalize-entity-name');

module.exports = {
Expand Down
2 changes: 1 addition & 1 deletion blueprints/initializer-addon/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/*jshint node:true*/
/* eslint-env node */

module.exports = require('../-addon-import');
2 changes: 1 addition & 1 deletion blueprints/initializer-test/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

var testInfo = require('ember-cli-test-info');
var stringUtils = require('ember-cli-string-utils');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/initializer/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

module.exports = {
description: 'Generates an initializer.'
Expand Down
2 changes: 1 addition & 1 deletion blueprints/instance-initializer-addon/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/*jshint node:true*/
/* eslint-env node */

module.exports = require('../-addon-import');
2 changes: 1 addition & 1 deletion blueprints/instance-initializer-test/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

var testInfo = require('ember-cli-test-info');
var stringUtils = require('ember-cli-string-utils');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/instance-initializer/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

module.exports = {
description: 'Generates an instance initializer.'
Expand Down
2 changes: 1 addition & 1 deletion blueprints/mixin-test/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

var testInfo = require('ember-cli-test-info');
var useTestFrameworkDetector = require('../test-framework-detector');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/mixin/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

module.exports = {
description: 'Generates a mixin.'
Expand Down
2 changes: 1 addition & 1 deletion blueprints/route-addon/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

var stringUtil = require('ember-cli-string-utils');
var path = require('path');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/route-test/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

var testInfo = require('ember-cli-test-info');
var useTestFrameworkDetector = require('../test-framework-detector');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/route/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

var fs = require('fs-extra');
var path = require('path');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/service-test/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

var testInfo = require('ember-cli-test-info');
var useTestFrameworkDetector = require('../test-framework-detector');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/service/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

module.exports = {
description: 'Generates a service.'
Expand Down
2 changes: 1 addition & 1 deletion blueprints/template/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

module.exports = {
description: 'Generates a template.'
Expand Down
2 changes: 1 addition & 1 deletion blueprints/test-helper/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

module.exports = {
description: 'Generates a test helper.'
Expand Down
2 changes: 1 addition & 1 deletion blueprints/util-test/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

var testInfo = require('ember-cli-test-info');
var stringUtils = require('ember-cli-string-utils');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/util/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */

module.exports = {
description: 'Generates a simple utility module/function.'
Expand Down
2 changes: 1 addition & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
/* jshint node: true */
/* eslint-env node */

// To create fast production builds (without ES3 support, minification, derequire, or JSHint)
// run the following:
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* jshint node: true */
/* eslint-env node */
'use strict';
var path = require('path');
var resolve = require('resolve');
Expand Down
3 changes: 0 additions & 3 deletions server/.jshintrc

This file was deleted.

30 changes: 0 additions & 30 deletions tests/.jshintrc

This file was deleted.

Loading

0 comments on commit 7dbf597

Please sign in to comment.