From 8130964cd593aaec44d4e637c06b3d74e1acce00 Mon Sep 17 00:00:00 2001
From: Adam Bullmer <psycodrumfreak@gmail.com>
Date: Thu, 30 Mar 2017 01:45:37 -0500
Subject: [PATCH] Bump version to match angular-bro-app release - Includes
 basic eslintrc file - Removes jscs and jshint scaffolded files

---
 generators/app/index.js               |  9 ++-----
 generators/app/templates/.eslintrc    | 39 +++++++++++++++++++++++++++
 generators/app/templates/.jscsrc      | 17 ------------
 generators/app/templates/.jshintrc    | 15 -----------
 generators/app/templates/package.json |  2 +-
 package.json                          |  2 +-
 6 files changed, 43 insertions(+), 41 deletions(-)
 create mode 100644 generators/app/templates/.eslintrc
 delete mode 100644 generators/app/templates/.jscsrc
 delete mode 100644 generators/app/templates/.jshintrc

diff --git a/generators/app/index.js b/generators/app/index.js
index c60900c..8cbb2e2 100644
--- a/generators/app/index.js
+++ b/generators/app/index.js
@@ -32,13 +32,8 @@ module.exports = generators.Base.extend({
     writing: {
         root: function () {
             this.fs.copy(
-                this.templatePath('.jscsrc'),
-                this.destinationPath('.jscsrc')
-            );
-
-            this.fs.copy(
-                this.templatePath('.jshintrc'),
-                this.destinationPath('.jshintrc')
+                this.templatePath('.eslintrc'),
+                this.destinationPath('.eslintrc')
             );
 
             this.fs.copyTpl(
diff --git a/generators/app/templates/.eslintrc b/generators/app/templates/.eslintrc
new file mode 100644
index 0000000..7b89940
--- /dev/null
+++ b/generators/app/templates/.eslintrc
@@ -0,0 +1,39 @@
+{
+  "parserOptions": {
+    "ecmaVersion": 7,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "globalReturn": false,
+      "impliedStrict": true
+    }
+  },
+  "env": {
+    "browser": true,
+    "jasmine": true,
+    "node": true
+  },
+  "globals": {},
+  "rules": {
+    "curly": [
+      "error",
+      "all"
+    ],
+    "eqeqeq": "error",
+    "no-undef": "error",
+    "no-unused-vars": "error",
+    "no-debugger": "off",
+    "no-mixed-spaces-and-tabs": "error",
+    "no-trailing-spaces": "error",
+    "indent": [
+      "error",
+      4,
+      {
+        "SwitchCase": 1
+      }
+    ],
+    "linebreak-style": [
+      "error",
+      "unix"
+    ]
+  }
+}
diff --git a/generators/app/templates/.jscsrc b/generators/app/templates/.jscsrc
deleted file mode 100644
index 89faa8b..0000000
--- a/generators/app/templates/.jscsrc
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "disallowMixedSpacesAndTabs": true,
-    "disallowTrailingWhitespace": true,
-    "validateIndentation": 4,
-    "validateLineBreaks": "LF",
-    "requireCurlyBraces": [
-        "if",
-        "else",
-        "for",
-        "while",
-        "do",
-        "try",
-        "catch",
-        "function",
-        "switch"
-    ]
-}
diff --git a/generators/app/templates/.jshintrc b/generators/app/templates/.jshintrc
deleted file mode 100644
index fa921b0..0000000
--- a/generators/app/templates/.jshintrc
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "curly"         : true,
-    "eqeqeq"        : true,
-    "esversion"     : 6,
-    "futurehostile" : true,
-    "undef"         : true,
-    "unused"        : true,
-
-    "debug"         : false,
-
-    "browser"       : true,
-    "devel"         : false,
-    "node"          : true,
-    "jasmine"       : true
-}
diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json
index c346d1d..8729175 100644
--- a/generators/app/templates/package.json
+++ b/generators/app/templates/package.json
@@ -10,7 +10,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "angular-bro-app": "0.9.0",
+    "angular-bro-app": "0.10.0",
     "broccoli": "0.16.9",
     "grunt": "^1.0.1",
     "grunt-broccoli": "^0.4.1",
diff --git a/package.json b/package.json
index 1644531..0f1d1e6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-angular-bro",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Angular app scaffolding and build chain",
   "main": "generators/app/index.js",
   "files": [