Merge pull request #3 from tillh/upgrade-angular-and-angular-cli

Upgrade to angular 2.4.7 and angular-cli 1.0.0-beta.31

Author: 0x-r4bbit

.clang-format

@@ -1,14 +1,13 @@
-# http://editorconfig.org
+# Editor configuration, see http://editorconfig.org
 root = true
 
 [*]
 charset = utf-8
 indent_style = space
-indent_size = 2
-end_of_line = lf
+indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 
 [*.md]
-max_line_length = 0
+max_line_length = off
 trim_trailing_whitespace = false

.editorconfig

@@ -6,10 +6,21 @@
 
 # dependencies
 /node_modules
-/bower_components
 
 # IDEs and editors
 /.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
 
 # misc
 /.sass-cache

.gitignore

@@ -1,31 +1,67 @@
 {
-  "project": {
-    "version": "1.0.0-beta.5",
-    "name": "cd-demos"
-  },
-  "apps": [
-    {
-      "main": "src/main.ts",
-      "tsconfig": "src/tsconfig.json",
-      "mobile": false
+    "project": {
+        "version": "1.0.0-beta.31",
+        "name": "cd-demos"
+    },
+    "apps": [
+        {
+            "root": "src",
+            "outDir": "dist",
+            "assets": [
+                "assets",
+                "favicon.ico"
+            ],
+            "index": "index.html",
+            "main": "main.ts",
+            "polyfills": "polyfills.ts",
+            "test": "test.ts",
+            "tsconfig": "tsconfig.json",
+            "prefix": "app",
+            "styles": [
+                "styles.css"
+            ],
+            "scripts": [],
+            "environments": {
+                "source": "environments/environment.ts",
+                "dev": "environments/environment.ts",
+                "prod": "environments/environment.prod.ts"
+            }
+        }
+    ],
+    "e2e": {
+        "protractor": {
+            "config": "./protractor.conf.js"
+        }
+    },
+    "lint": [
+        {
+            "files": "src/**/*.ts",
+            "project": "src/tsconfig.json"
+        },
+        {
+            "files": "e2e/**/*.ts",
+            "project": "e2e/tsconfig.json"
+        }
+    ],
+    "test": {
+        "karma": {
+            "config": "./karma.conf.js"
+        }
+    },
+    "defaults": {
+        "styleExt": "css",
+        "prefixInterfaces": false,
+        "inline": {
+            "style": false,
+            "template": false
+        },
+        "spec": {
+            "class": false,
+            "component": true,
+            "directive": true,
+            "module": false,
+            "pipe": true,
+            "service": true
+        }
     }
-  ],
-  "addons": [],
-  "packages": [],
-  "e2e": {
-    "protractor": {
-      "config": "config/protractor.conf.js"
-    }
-  },
-  "test": {
-    "karma": {
-      "config": "config/karma.conf.js"
-    }
-  },
-  "defaults": {
-    "prefix": "app",
-    "sourceDir": "src",
-    "styleExt": "css",
-    "prefixInterfaces": false
-  }
 }