Skip to content

Commit

Permalink
Remove jscs from the project
Browse files Browse the repository at this point in the history
  • Loading branch information
scottnonnenberg-signal committed May 23, 2018
1 parent cfe0bd0 commit ec3e368
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 335 deletions.
31 changes: 1 addition & 30 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,31 +152,6 @@ module.exports = function(grunt) {
files: [{ expand: true, dest: 'dist/', src: ['<%= dist.src %>'] }],
},
},
jscs: {
all: {
src: [
'Gruntfile',
'js/**/*.js',
'!js/components.js',
'!js/libsignal-protocol-worker.js',
'!js/libtextsecure.js',
'!js/modules/**/*.js',
'!js/models/conversations.js',
'!js/models/messages.js',
'!js/views/conversation_search_view.js',
'!js/views/conversation_view.js',
'!js/views/debug_log_view.js',
'!js/views/file_input_view.js',
'!js/views/message_view.js',
'!js/Mp3LameEncoder.min.js',
'!js/WebAudioRecorderMp3.js',
'test/**/*.js',
'!test/blanket_mocha.js',
'!test/modules/**/*.js',
'!test/test.js',
],
},
},
watch: {
dist: {
files: ['<%= dist.src %>', '<%= dist.res %>'],
Expand All @@ -198,10 +173,6 @@ module.exports = function(grunt) {
files: ['<%= jshint.files %>'],
tasks: ['jshint'],
},
style: {
files: ['<%= jscs.all.src %>'],
tasks: ['jscs'],
},
transpile: {
files: ['./ts/**/*.ts'],
tasks: ['exec:transpile'],
Expand Down Expand Up @@ -507,7 +478,7 @@ module.exports = function(grunt) {

grunt.registerTask('tx', ['exec:tx-pull', 'locale-patch']);
grunt.registerTask('dev', ['default', 'watch']);
grunt.registerTask('lint', ['jshint', 'jscs']);
grunt.registerTask('lint', ['jshint']);
grunt.registerTask('test', ['unit-tests', 'lib-unit-tests']);
grunt.registerTask('copy_dist', ['gitinfo', 'copy:res', 'copy:src']);
grunt.registerTask('date', ['gitinfo', 'getExpireTime']);
Expand Down
2 changes: 0 additions & 2 deletions js/models/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
// to propagate. We don't want the unset key in the db so our unread index stays
// small.
/* eslint-disable */
/* jscs:disable */
fetch(options) {
options = options ? _.clone(options) : {};
if (options.parse === void 0) options.parse = true;
Expand All @@ -95,7 +94,6 @@
};
return this.sync('read', this, options);
},
/* jscs:enable */
/* eslint-enable */
/* eslint-disable more/no-then */
getNameForNumber(number) {
Expand Down
2 changes: 0 additions & 2 deletions js/reliable_trigger.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
// And of course, we update the protoypes of Backbone.Model/Backbone.View as well as
// Backbone.Events itself

// jscs:disable

var arr = [];

var slice = arr.slice;
Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"test-node": "mocha --recursive test/app test/modules ts/test",
"test-node-coverage": "nyc --reporter=lcov --reporter=text mocha --recursive test/app test/modules ts/test",
"eslint": "eslint .",
"jscs": "yarn grunt jscs",
"jshint": "yarn grunt jshint",
"lint": "yarn format --list-different && yarn lint-windows",
"lint-windows": "yarn eslint && yarn grunt lint && yarn tslint",
Expand Down Expand Up @@ -128,7 +127,6 @@
"grunt-contrib-watch": "^1.0.0",
"grunt-exec": "^3.0.0",
"grunt-gitinfo": "^0.1.7",
"grunt-jscs": "^3.0.1",
"grunt-sass": "^2.0.0",
"mocha": "^4.1.0",
"mocha-testcheck": "^1.0.0-rc.0",
Expand Down

0 comments on commit ec3e368

Please sign in to comment.