Revert "fix(@angular/cli): fix skip e2e"

This reverts commit 4aa17b2.

Author: hansl

packages/@angular/cli/blueprints/ng/files/angular-cli.json

@@ -28,22 +28,22 @@
         "prod": "environments/environment.prod.ts"
       }
     }
-  ],<% if(e2e) { %>
+  ],
   "e2e": {
     "protractor": {
       "config": "./protractor.conf.js"
     }
-  },<% } %>
+  },
   "lint": [
     {
       "project": "<%= sourceDir %>/tsconfig.app.json"
     },
     {
       "project": "<%= sourceDir %>/tsconfig.spec.json"
-    }<% if(e2e) { %>,
+    },
     {
       "project": "e2e/tsconfig.e2e.json"
-    }<% } %>
+    }
   ],
   "test": {
     "karma": {

packages/@angular/cli/blueprints/ng/files/package.json

@@ -7,8 +7,8 @@
     "start": "ng serve",
     "build": "ng build",
     "test": "ng test",
-    "lint": "ng lint"<% if(e2e) { %>,
-    "e2e": "ng e2e"<% } %>
+    "lint": "ng lint",
+    "e2e": "ng e2e"
   },
   "private": true,
   "dependencies": {

packages/@angular/cli/blueprints/ng/index.ts

@@ -84,7 +84,6 @@ export default Blueprint.extend({
       fileList = fileList
         .filter(p => p.indexOf('protractor.conf.js') < 0)
         .filter(p => p.indexOf('app.po.ts') < 0)
-        .filter(p => p.indexOf('tsconfig.e2e.json') < 0)
         .filter(p => p.indexOf('app.e2e-spec.ts') < 0);
     }
 

packages/@angular/cli/commands/e2e.ts

@@ -89,9 +89,7 @@ const E2eCommand = Command.extend({
     if (!commandOptions.config) {
       const e2eConfig = CliConfig.fromProject().config.e2e;
 
-      if (!e2eConfig) {
-        throw new SilentError('No e2e config found in .angular-cli.json.');
-      } else if (!e2eConfig.protractor.config) {
+      if (!e2eConfig.protractor.config) {
         throw new SilentError('No protractor config found in .angular-cli.json.');
       }