From 7a81d941fa2d96d3b32a8d90a3b8685d466e1694 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 4 Sep 2015 12:11:34 +0930 Subject: [PATCH] Clean up editorconfig, eslint, npm dependencies --- framework/core/.editorconfig | 13 ------------- framework/core/.eslintrc | 5 +++++ framework/core/stubs/extension/.editorconfig | 13 ------------- framework/core/stubs/extension/.eslintrc | 5 +++++ .../core/stubs/extension/js/admin/package.json | 2 +- .../core/stubs/extension/js/forum/package.json | 2 +- 6 files changed, 12 insertions(+), 28 deletions(-) diff --git a/framework/core/.editorconfig b/framework/core/.editorconfig index 5612a5e74..87694ddab 100644 --- a/framework/core/.editorconfig +++ b/framework/core/.editorconfig @@ -12,21 +12,8 @@ insert_final_newline = true indent_style = space indent_size = 2 -[*.js] -indent_style = space -indent_size = 2 - -[*.{css,less}] -indent_style = space -indent_size = 2 - -[*.html] -indent_style = space -indent_size = 2 - [*.{diff,md}] trim_trailing_whitespace = false [*.php] -indent_style = space indent_size = 4 diff --git a/framework/core/.eslintrc b/framework/core/.eslintrc index 778c29256..9e89e6ba6 100644 --- a/framework/core/.eslintrc +++ b/framework/core/.eslintrc @@ -27,7 +27,12 @@ "$": true, "moment": true }, + "plugins": [ + "react" + ], "rules": { + "react/jsx-uses-vars": 1, + /** * Strict mode */ diff --git a/framework/core/stubs/extension/.editorconfig b/framework/core/stubs/extension/.editorconfig index 5612a5e74..87694ddab 100644 --- a/framework/core/stubs/extension/.editorconfig +++ b/framework/core/stubs/extension/.editorconfig @@ -12,21 +12,8 @@ insert_final_newline = true indent_style = space indent_size = 2 -[*.js] -indent_style = space -indent_size = 2 - -[*.{css,less}] -indent_style = space -indent_size = 2 - -[*.html] -indent_style = space -indent_size = 2 - [*.{diff,md}] trim_trailing_whitespace = false [*.php] -indent_style = space indent_size = 4 diff --git a/framework/core/stubs/extension/.eslintrc b/framework/core/stubs/extension/.eslintrc index 778c29256..9e89e6ba6 100644 --- a/framework/core/stubs/extension/.eslintrc +++ b/framework/core/stubs/extension/.eslintrc @@ -27,7 +27,12 @@ "$": true, "moment": true }, + "plugins": [ + "react" + ], "rules": { + "react/jsx-uses-vars": 1, + /** * Strict mode */ diff --git a/framework/core/stubs/extension/js/admin/package.json b/framework/core/stubs/extension/js/admin/package.json index 3e0ef919d..62ea6c691 100644 --- a/framework/core/stubs/extension/js/admin/package.json +++ b/framework/core/stubs/extension/js/admin/package.json @@ -2,6 +2,6 @@ "private": true, "devDependencies": { "gulp": "^3.8.11", - "flarum-gulp": "git+https://github.com/flarum/gulp.git" + "flarum-gulp": "^0.1.0" } } diff --git a/framework/core/stubs/extension/js/forum/package.json b/framework/core/stubs/extension/js/forum/package.json index 3e0ef919d..62ea6c691 100644 --- a/framework/core/stubs/extension/js/forum/package.json +++ b/framework/core/stubs/extension/js/forum/package.json @@ -2,6 +2,6 @@ "private": true, "devDependencies": { "gulp": "^3.8.11", - "flarum-gulp": "git+https://github.com/flarum/gulp.git" + "flarum-gulp": "^0.1.0" } }