From 15b1f1f6d4ee74a5a429ca90651d61b0e8d8abdf Mon Sep 17 00:00:00 2001
From: Jeroen Vinke <jeroenvinke17@gmail.com>
Date: Tue, 6 Mar 2018 22:06:32 +0100
Subject: [PATCH] feat(new): switch default to webpack

---
 build/tasks/skeletons.json            | 54 ++++++++++++++-------------
 lib/commands/new/new-application.json | 30 +++++++++++----
 2 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/build/tasks/skeletons.json b/build/tasks/skeletons.json
index 918d011b4..3f2babac8 100644
--- a/build/tasks/skeletons.json
+++ b/build/tasks/skeletons.json
@@ -1,17 +1,40 @@
 [{
   "200": "skeleton-requirejs-esnext",
-  "300": "default-esnext"
+  "300": "custom",
+  "600": "requirejs",
+  "620": {
+    "id": "web",
+    "displayName": "Web"
+  }
 }, {
   "200": "skeleton-requirejs-typescript",
-  "300": "default-typescript"
+  "300": "custom",
+  "600": "requirejs",
+  "620": {
+    "id": "web",
+    "displayName": "Web"
+  },
+  "630": {
+    "id": "typescript",
+    "displayName": "TypeScript",
+    "fileExtension": ".ts"
+  }
 },{
   "200": "skeleton-systemjs-esnext",
   "300": "custom",
-  "600": "systemjs"
+  "600": "systemjs",
+  "620": {
+    "id": "web",
+    "displayName": "Web"
+  }
 }, {
   "200": "skeleton-systemjs-typescript",
   "300": "custom",
   "600": "systemjs",
+  "620": {
+    "id": "web",
+    "displayName": "Web"
+  },
   "630": {
     "id": "typescript",
     "displayName": "TypeScript",
@@ -19,31 +42,10 @@
   }
 }, {
   "200": "skeleton-webpack-esnext",
-  "300": "custom",
-  "600": "webpack",
-  "680": [{
-    "id": "karma",
-    "displayName": "Karma"
-  }, {
-    "id": "jest",
-    "displayName": "Jest"
-  }]
+  "300": "default-esnext"
 }, {
   "200": "skeleton-webpack-typescript",
-  "300": "custom",
-  "600": "webpack",
-  "630": {
-    "id": "typescript",
-    "displayName": "TypeScript",
-    "fileExtension": ".ts"
-  },
-  "680": [{
-    "id": "karma",
-    "displayName": "Karma"
-  }, {
-    "id": "jest",
-    "displayName": "Jest"
-  }]
+  "300": "default-typescript"
 }, {
   "200": "skeleton-webpack-esnext-aspnetcore",
   "300": "custom",
diff --git a/lib/commands/new/new-application.json b/lib/commands/new/new-application.json
index c463754a2..2c60a3f85 100644
--- a/lib/commands/new/new-application.json
+++ b/lib/commands/new/new-application.json
@@ -22,10 +22,13 @@
           "displayName": "None",
           "fileExtension": ".css"
         },
-        "unitTestRunner": {
+        "unitTestRunner": [{
+          "id": "jest",
+          "displayName": "Jest"
+        }, {
           "id": "karma",
           "displayName": "Karma"
-        },
+        }],
         "testFramework": {
           "id": "jasmine",
           "displayName": "Jasmine"
@@ -39,12 +42,23 @@
           "displayName": "Web"
         },
         "loader": {
-          "id": "require",
-          "displayName": "RequireJS"
+          "id": "none",
+          "displayName": "None"
         },
         "bundler": {
-          "id": "cli",
-          "displayName": "Aurelia-CLI"
+          "id": "webpack",
+          "displayName": "Webpack"
+        },
+        "build": {
+          "options": {
+            "server": "dev",
+            "extractCss": "prod",
+            "coverage": false
+          }
+        },
+        "integrationTestRunner": {
+          "id": "none",
+          "displayName": "None"
         }
       }
     },
@@ -65,12 +79,12 @@
       "options": [
         {
           "displayName": "Default ESNext",
-          "description": "A basic web-oriented setup with Babel and RequireJS for modern JavaScript development.",
+          "description": "A basic web-oriented setup with Babel and Webpack for modern JavaScript development.",
           "value": "default-esnext"
         },
         {
           "displayName": "Default TypeScript",
-          "description": "A basic web-oriented setup with TypeScript and RequireJS for modern JavaScript development.",
+          "description": "A basic web-oriented setup with TypeScript and Webpack for modern JavaScript development.",
           "value": "default-typescript"
         },
         {