Merge branch 'master' of https://github.com/erikvullings/skeleton-navigation into erikvullings-master

EisenbergEffect · EisenbergEffect · commit fc44d3329b52 · 2016-07-07T16:05:26.000-04:00
diff --git a/skeleton-typescript-webpack/favicon.ico b/skeleton-typescript-webpack/favicon.ico
diff --git a/skeleton-typescript/.gitignore b/skeleton-typescript/.gitignore
@@ -8,3 +8,4 @@ build/reports
 coverage
 test/e2e/dist
 /typings
+/export
diff --git a/skeleton-typescript/build/bundles.js b/skeleton-typescript/build/bundles.js
@@ -29,8 +29,7 @@ module.exports = {
         "aurelia-logging-console",
         "bootstrap",
         "bootstrap/css/bootstrap.css!text",
-        "fetch",
-        "jquery"
+        "fetch"
       ],
       "options": {
         "inject": true,
diff --git a/skeleton-typescript/build/export.js b/skeleton-typescript/build/export.js
@@ -7,6 +7,7 @@ module.exports = {
     'config.js',
     'favicon.ico',
     'LICENSE',
+    "jspm_packages/npm/bluebird@3.4.1/js/browser/bluebird.min.js", 
     'jspm_packages/system.js',
     'jspm_packages/system-polyfills.js',
     'jspm_packages/system-csp-production.js',
diff --git a/skeleton-typescript/config.js b/skeleton-typescript/config.js
@@ -27,6 +27,7 @@ System.config({
     "aurelia-templating-binding": "npm:aurelia-templating-binding@1.0.0-rc.1.0.0",
     "aurelia-templating-resources": "npm:aurelia-templating-resources@1.0.0-rc.1.0.0",
     "aurelia-templating-router": "npm:aurelia-templating-router@1.0.0-rc.1.0.0",
+    "bluebird": "npm:bluebird@3.4.1",
     "bootstrap": "github:twbs/bootstrap@3.3.6",
     "fetch": "github:github/fetch@1.0.0",
     "font-awesome": "npm:font-awesome@4.6.3",
@@ -47,7 +48,7 @@ System.config({
       "vm-browserify": "npm:vm-browserify@0.0.4"
     },
     "github:twbs/bootstrap@3.3.6": {
-      "jquery": "npm:jquery@3.0.0"
+      "jquery": "npm:jquery@2.2.4"
     },
     "npm:assert@1.4.1": {
       "assert": "github:jspm/nodelibs-assert@0.1.0",
@@ -174,6 +175,9 @@ System.config({
       "aurelia-path": "npm:aurelia-path@1.0.0-rc.1.0.0",
       "aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-rc.1.0.0"
     },
+    "npm:bluebird@3.4.1": {
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
     "npm:buffer@3.6.0": {
       "base64-js": "npm:base64-js@0.0.8",
       "child_process": "github:jspm/nodelibs-child_process@0.1.0",
@@ -188,9 +192,6 @@ System.config({
     "npm:inherits@2.0.1": {
       "util": "github:jspm/nodelibs-util@0.1.0"
     },
-    "npm:jquery@3.0.0": {
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
     "npm:process@0.11.5": {
       "assert": "github:jspm/nodelibs-assert@0.1.0",
       "fs": "github:jspm/nodelibs-fs@0.1.2",
diff --git a/skeleton-typescript/gulpfile.js b/skeleton-typescript/gulpfile.js
@@ -1,3 +1,7 @@
+var gulp = require('gulp');
+
 // all gulp tasks are located in the ./build/tasks directory
 // gulp configuration is in files in ./build directory
 require('require-dir')('build/tasks');
+
+gulp.task('default', ['watch']);
diff --git a/skeleton-typescript/index.html b/skeleton-typescript/index.html
@@ -16,6 +16,7 @@
       <i class="fa fa-spinner fa-spin"></i>
     </div>
 
+    <script src="jspm_packages/npm/bluebird@3.4.1/js/browser/bluebird.min.js"></script> 
     <script src="jspm_packages/system.js"></script>
     <script src="config.js"></script>
     <script>
diff --git a/skeleton-typescript/package.json b/skeleton-typescript/package.json
@@ -74,6 +74,7 @@
       "aurelia-templating-binding": "npm:aurelia-templating-binding@^1.0.0-rc.1.0.0",
       "aurelia-templating-resources": "npm:aurelia-templating-resources@^1.0.0-rc.1.0.0",
       "aurelia-templating-router": "npm:aurelia-templating-router@^1.0.0-rc.1.0.0",
+      "bluebird": "npm:bluebird@3.4.1",
       "bootstrap": "github:twbs/bootstrap@^3.3.6",
       "fetch": "github:github/fetch@^1.0.0",
       "font-awesome": "npm:font-awesome@4.6.3",

-Original file line number
+Diff line change
     "aurelia-templating-binding": "npm:[email protected]",
     "aurelia-templating-resources": "npm:[email protected]",
     "aurelia-templating-router": "npm:[email protected]",
 +    "bluebird": "npm:[email protected]",
     "bootstrap": "github:twbs/[email protected]",
     "fetch": "github:github/[email protected]",
     "font-awesome": "npm:[email protected]",
       "vm-browserify": "npm:[email protected]"
     },
     "github:twbs/[email protected]": {
 -      "jquery": "npm:jquery@3.0.0"
 +      "jquery": "npm:jquery@2.2.4"
     },
     "npm:[email protected]": {
       "assert": "github:jspm/[email protected]",
       "aurelia-path": "npm:[email protected]",
       "aurelia-task-queue": "npm:[email protected]"
     },
 +    "npm:[email protected]": {
 +      "process": "github:jspm/[email protected]"
 +    },
     "npm:[email protected]": {
       "base64-js": "npm:[email protected]",
       "child_process": "github:jspm/[email protected]",
     "npm:[email protected]": {
       "util": "github:jspm/[email protected]"
     },
 -    "npm:[email protected]": {
 -      "process": "github:jspm/[email protected]"
 -    },
     "npm:[email protected]": {
       "assert": "github:jspm/[email protected]",
       "fs": "github:jspm/[email protected]",