Skip to content

Commit 85feb4a

Browse files
committed
Merge pull request #1366 from DaftMonk/fix-jscs
Update JSCS, add esnext option, rename to .jscsrc
2 parents e37306f + 42a4b8f commit 85feb4a

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

Diff for: app/templates/.jscs.json renamed to app/templates/.jscsrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"esnext": true,
23
"maximumLineLength": {
34
"value": 100,
45
"allowComments": true,

Diff for: app/templates/Gruntfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ module.exports = function (grunt) {
165165

166166
jscs: {
167167
options: {
168-
config: ".jscs.json"
168+
config: ".jscsrc"
169169
},
170170
main: {
171171
files: {

Diff for: app/templates/_package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"karma-babel-preprocessor": "^5.2.1",<% } %>
5656
"grunt-babel": "~5.0.0",
5757
"grunt-google-cdn": "~0.4.0",
58-
"grunt-jscs": "^2.0.0",
58+
"grunt-jscs": "^2.1.0",
5959
"grunt-newer": "^1.1.1",
6060
"grunt-ng-annotate": "^1.0.1",
6161
"grunt-ng-constant": "^1.1.0",

Diff for: test/test-file-creation.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ describe('angular-fullstack generator', function () {
212212
'.gitattributes',
213213
'.gitignore',
214214
'.travis.yml',
215-
'.jscs.json',
215+
'.jscsrc',
216216
'.yo-rc.json',
217217
'Gruntfile.js',
218218
'package.json',

0 commit comments

Comments
 (0)