Skip to content
This repository was archived by the owner on Nov 11, 2017. It is now read-only.

Commit 13b67a0

Browse files
committed
Remove JSHint and JSCS support
1 parent 4cdf184 commit 13b67a0

28 files changed

+3
-60
lines changed

lib/config/build-config.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
'use strict';
22

3-
// To create fast production builds (without minification, JSCS, or JSHint)
3+
// To create fast production builds (without minification and ESLint)
44
// run the following:
55
//
6-
// DISABLE_JSHINT=true DISABLE_JSCS=true DISABLE_MIN=true ember serve --environment=production
6+
// DISABLE_ESLINT=true DISABLE_MIN=true ember serve --environment=production
77

88
var env = process.env.EMBER_ENV || 'development';
99
var isDevelopment = env === 'development';
1010

1111
var disableESLint = !!process.env.DISABLE_ESLINT || false;
12-
var disableJSHint = !!process.env.DISABLE_JSHINT || false;
13-
var disableJSCS = !!process.env.DISABLE_JSCS || false;
1412
var disableMin = !!process.env.DISABLE_MIN || false;
1513
var enableDocs = !!process.env.ENABLE_DOCS || false;
1614

@@ -30,8 +28,6 @@ if (!isDevelopment && !disableMin) {
3028
module.exports = {
3129
isDevelopment: isDevelopment,
3230
disableESLint: disableESLint,
33-
disableJSHint: disableJSHint,
34-
disableJSCS: disableJSCS,
3531
disableMin: disableMin,
3632
enableDocs: enableDocs,
3733
enableTreeDebugging: enableTreeDebugging,

lib/get-es6-package.js

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,19 @@ module.exports = getES6Package;
55

66
var Funnel = require('broccoli-funnel');
77
var mergeTrees = require('broccoli-merge-trees');
8-
var jshintTree = require('broccoli-jshint');
98
var ESLintTree = require('broccoli-lint-eslint');
10-
var jscsTree = require('./jscs-tree');
119

1210
var config = require('./config/build-config');
1311
var packageDependencyTree = require('./get-package-dependency-tree');
1412
var htmlbarsTemplatePrecompiler = require('./utils/htmlbars-template-precompiler');
1513
var glimmerTemplatePrecompiler = require('./utils/glimmer-template-precompiler');
1614

1715
var disableESLint = config.disableESLint;
18-
var disableJSHint = config.disableJSHint;
19-
var disableJSCS = config.disableJSCS;
2016

2117
function getES6Package(packages, packageName, opts) {
2218
var pkg = packages[packageName];
2319
var options = opts || {};
2420
var jsRegExp = /js$/;
25-
var configPath = options.configPath || '';
2621

2722
var libTree;
2823

@@ -94,12 +89,6 @@ function getES6Package(packages, packageName, opts) {
9489
},
9590
});
9691

97-
var libJSCSTree = jscsTree(libTree, {
98-
configPath: configPath
99-
});
100-
101-
var libJSHintTree = jshintTree(libTree);
102-
10392
var libESLintTree = new ESLintTree(libTree, { testGenerator: 'qunit' });
10493

10594
if (pkg.hasTemplates) {
@@ -125,10 +114,6 @@ function getES6Package(packages, packageName, opts) {
125114
destDir: '/' + packageName + '/tests'
126115
});
127116

128-
var testJSCSTree = jscsTree(testTree, {
129-
configPath: configPath
130-
});
131-
var testJSHintTree = jshintTree(testTree);
132117
var testESLintTree = new ESLintTree(testTree, { testGenerator: 'qunit' });
133118

134119
/*
@@ -140,16 +125,6 @@ function getES6Package(packages, packageName, opts) {
140125
testTrees.push(libESLintTree);
141126
testTrees.push(testESLintTree);
142127
}
143-
144-
if (!disableJSHint) {
145-
testTrees.push(libJSHintTree);
146-
testTrees.push(testJSHintTree);
147-
}
148-
149-
if (!disableJSCS) {
150-
testTrees.push(libJSCSTree);
151-
testTrees.push(testJSCSTree);
152-
}
153128
testTrees.push(testTree);
154129

155130
testTrees = testTrees.length > 0 ? mergeTrees(testTrees, { overwrite: true }) : testTree;

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
"broccoli-concat": "^2.0.0",
4040
"broccoli-file-creator": "^1.0.0",
4141
"broccoli-funnel": "^1.0.1",
42-
"broccoli-jscs": "^1.4.1",
43-
"broccoli-jshint": "^1.1.0",
4442
"broccoli-kitchen-sink-helpers": "^0.2.6",
4543
"broccoli-lint-eslint": "^2.3.0",
4644
"broccoli-merge-trees": "^1.1.1",

tests/config/build-config-test.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ describe('build config', function() {
99
expect(buildConfig).to.deep.equal({
1010
isDevelopment: true,
1111
disableESLint: false,
12-
disableJSHint: false,
13-
disableJSCS: false,
1412
disableMin: false,
1513
enableDocs: false,
1614
enableTreeDebugging: false,

tests/expected/packages/ember-metal-tests-tree/ember-metal.jscs-test.js

Whitespace-only changes.

tests/expected/packages/ember-metal-tests-tree/ember-metal.jshint.js

Whitespace-only changes.

tests/expected/packages/ember-metal-tests-tree/ember-metal/alias.jscs-test.js

Whitespace-only changes.

tests/expected/packages/ember-metal-tests-tree/ember-metal/alias.jshint.js

Whitespace-only changes.

tests/expected/packages/ember-metal-tests-tree/ember-metal/array.jscs-test.js

Whitespace-only changes.

tests/expected/packages/ember-metal-tests-tree/ember-metal/array.jshint.js

Whitespace-only changes.

0 commit comments

Comments
 (0)