chore: Update tslint conf

DeviantJS · Feb 21, 2016 · a1480c9 · a1480c9
1 parent 9865b73
commit a1480c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/tools/config.ts b/tools/config.ts
@@ -48,7 +48,7 @@ export const JS_PROD_APP_BUNDLE   = 'app.js';
 export const VERSION_NPM          = '2.14.2';
 export const VERSION_NODE         = '4.0.0';
 
-export const NG2LINT_RULES        = join('node_modules', 'ng2lint', 'dist', 'src');
+export const NG2LINT_RULES        = customRules();
 
 if (ENABLE_HOT_LOADING) {
   console.log(chalk.bgRed.white.bold('The hot loader is temporary disabled.'));
@@ -133,6 +133,11 @@ function appVersion(): number|string {
   return pkg.version;
 }
 
+function customRules(): string[] {
+  var lintConf = JSON.parse(readFileSync('tslint.json').toString());
+  return lintConf.rulesDirectory;
+}
+
 function getEnvironment() {
   let base:string[] = argv['_'];
   let prodKeyword = !!base.filter(o => o.indexOf(ENVIRONMENTS.PRODUCTION) >= 0).pop();

diff --git a/tslint.json b/tslint.json
@@ -1,9 +1,10 @@
 {
+  "rulesDirectory": ["node_modules/ng2lint/dist/src"],
   "rules": {
     "class-name": true,
     "curly": false,
     "eofline": true,
-    "indent": "spaces",
+    "indent": ["spaces"],
     "max-line-length": [true, 140],
     "member-ordering": [true,
       "public-before-private",