diff --git a/src/MusicStore.Spa/Gruntfile.js b/src/MusicStore.Spa/Gruntfile.js index 759e8173b4..ed0c4c28ac 100644 --- a/src/MusicStore.Spa/Gruntfile.js +++ b/src/MusicStore.Spa/Gruntfile.js @@ -5,15 +5,7 @@ module.exports = function (grunt) { grunt.initConfig({ - staticFilePattern: "**/*.{js,css,map,html,htm,ico,jpg,jpeg,png,gif,eot,svg,ttf,woff}", - tslint: { - options: { - configuration: grunt.file.readJSON("grunt/tslint-rules.json") - }, - files: { - src: ["Client/**/*.ts", "!**/*.ng.ts"] - } - } + staticFilePattern: "**/*.{js,css,map,html,htm,ico,jpg,jpeg,png,gif,eot,svg,ttf,woff}" }); grunt.registerTask("ts", ["tslint", "tsng", "typescript:dev", "clean:tsng"]); diff --git a/src/MusicStore.Spa/grunt/clean.json b/src/MusicStore.Spa/grunt/clean.json index f645f3acf6..72e6e7eafe 100644 --- a/src/MusicStore.Spa/grunt/clean.json +++ b/src/MusicStore.Spa/grunt/clean.json @@ -1,6 +1,6 @@ { "options": { "force": true }, - "bower": ["wwwroot/*", "!wwwroot/bin"], - "assets": ["wwwroot/*", "!wwwroot/bin"], - "tsng": ["client/**/*.ng.ts"] + "bower": [ "wwwroot/*", "!wwwroot/bin" ], + "assets": [ "wwwroot/*", "!wwwroot/bin" ], + "tsng": [ "client/**/*.ng.ts" ] } \ No newline at end of file diff --git a/src/MusicStore.Spa/grunt/tslint-rules.json b/src/MusicStore.Spa/grunt/tslint-rules.json deleted file mode 100644 index 975f4ff5c5..0000000000 --- a/src/MusicStore.Spa/grunt/tslint-rules.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "rules": { - "class-name": true, - "curly": true, - "eofline": false, - "forin": true, - "indent": [true, 4], - "label-position": true, - "label-undefined": true, - "max-line-length": [true, 140], - "no-arg": true, - "no-bitwise": true, - "no-console": [true, - "debug", - "info", - "time", - "timeEnd", - "trace" - ], - "no-construct": true, - "no-debugger": true, - "no-duplicate-key": true, - "no-duplicate-variable": true, - "no-empty": true, - "no-eval": true, - "no-string-literal": true, - "no-trailing-whitespace": true, - "no-unreachable": true, - "one-line": [true, - "check-open-brace", - "check-catch", - "check-else", - "check-whitespace" - ], - "quotemark": [true, "double"], - "radix": true, - "semicolon": true, - "triple-equals": [true, "allow-null-check"], - "variable-name": false, - "whitespace": [true, - "check-branch", - "check-decl", - "check-operator", - "check-separator", - "check-type" - ] - } -} \ No newline at end of file diff --git a/src/MusicStore.Spa/grunt/tslint.json b/src/MusicStore.Spa/grunt/tslint.json new file mode 100644 index 0000000000..8a800932be --- /dev/null +++ b/src/MusicStore.Spa/grunt/tslint.json @@ -0,0 +1,58 @@ +{ + "options": { + "configuration": { + "rules": { + "class-name": true, + "curly": true, + "eofline": false, + "forin": true, + "indent": [ true, 4 ], + "label-position": true, + "label-undefined": true, + "max-line-length": [ true, 140 ], + "no-arg": true, + "no-bitwise": true, + "no-console": [ + true, + "debug", + "info", + "time", + "timeEnd", + "trace" + ], + "no-construct": true, + "no-debugger": true, + "no-duplicate-key": true, + "no-duplicate-variable": true, + "no-empty": true, + "no-eval": true, + "no-string-literal": true, + "no-trailing-whitespace": true, + "no-unreachable": true, + "one-line": [ + true, + "check-open-brace", + "check-catch", + "check-else", + "check-whitespace" + ], + "quotemark": [ true, "double" ], + "radix": true, + "semicolon": true, + "triple-equals": [ true, "allow-null-check" ], + "variable-name": false, + "whitespace": [ + true, + "check-branch", + "check-decl", + "check-operator", + "check-separator", + "check-type" + ] + } + } + }, + "files": { + "src": [ "Client/**/*.ts", "!**/*.ng.ts" ] + } +} \ No newline at end of file