From: Gustavo Martin Morcuende <gu.martinm@gmail.com>
Date: Sun, 13 Sep 2015 12:17:13 +0000 (+0200)
Subject: update to node v4.0.0
X-Git-Url: https://git.gumartinm.name/?a=commitdiff_plain;h=21cffd716c03a76b1097022c7d4b5c2ca9448c7f;p=JavaScriptForFun

update to node v4.0.0
---

diff --git a/angularjs/showcase/README.md b/angularjs/showcase/README.md
index b97eefc..351aa83 100644
--- a/angularjs/showcase/README.md
+++ b/angularjs/showcase/README.md
@@ -1,3 +1,3 @@
-npm link gulp-my-tasks
-
-npm install
+* npm link gulp-my-tasks
+* npm install
+* protractor doesn't work with node v4.0.0. Fall back to v0.12.7 when using protractor
diff --git a/angularjs/showcase/bower.json b/angularjs/showcase/bower.json
index 62c45f1..03d612e 100644
--- a/angularjs/showcase/bower.json
+++ b/angularjs/showcase/bower.json
@@ -16,24 +16,20 @@
     "server.js"
   ],
   "dependencies": {
-    "angular": "~1.4.4",
-    "angular-bootstrap": "~0.13.3",
-    "angular-translate": "2.7.2",
+    "angular": "~1.4.5",
+    "angular-bootstrap": "~0.13.4",
+    "angular-translate": "~2.7.2",
     "angular-ui-router": "~0.2.15",
-    "oclazyload": "~0.5.2",
-    "bootstrap": "~3.3.4",
-    "font-awesome": "~4.3.0"
+    "oclazyload": "~1.0.5",
+    "bootstrap": "~4.0.0-alpha",
+    "font-awesome": "~4.4.0"
   },
   "devDependencies": {
-    "angular-mocks": "~1.4.4"
-  },
-  "resolutions": {
-    "angular": "1.4.4"
+    "angular-mocks": "~1.4.5"
   },
   "overrides": {
     "bootstrap": {
       "main": [
-        "less/bootstrap.less",
         "dist/css/bootstrap.css",
         "dist/js/bootstrap.js"
       ]
diff --git a/angularjs/showcase/karma.conf.js b/angularjs/showcase/karma.conf.js
index a635bb4..9866ad6 100644
--- a/angularjs/showcase/karma.conf.js
+++ b/angularjs/showcase/karma.conf.js
@@ -26,7 +26,7 @@ module.exports = function(config) {
       'bower_components/angular-bootstrap/ui-bootstrap-tpls.js',
       'bower_components/angular-translate/angular-translate.js',
       'bower_components/angular-ui-router/release/angular-ui-router.js',
-      'bower_components/oclazyload/dist/ocLazyLoad.min.js',
+      'bower_components/oclazyload/dist/ocLazyLoad.js',
       'bower_components/jquery/dist/jquery.js',
       'bower_components/bootstrap/dist/js/bootstrap.js',
       'bower_components/angular-mocks/angular-mocks.js',
diff --git a/angularjs/showcase/src/showcase/index.html b/angularjs/showcase/src/showcase/index.html
index 03a242d..3bdea52 100644
--- a/angularjs/showcase/src/showcase/index.html
+++ b/angularjs/showcase/src/showcase/index.html
@@ -22,7 +22,6 @@
     <!-- build:css(.) styles/lib.min.css -->
     <!-- bower:css -->
     <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.css" />
-    <link rel="stylesheet" href="/bower_components/font-awesome/css/font-awesome.css" />
     <!-- endbower -->
     <!-- endbuild -->
 
@@ -41,7 +40,7 @@
     <script src="/bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
     <script src="/bower_components/angular-translate/angular-translate.js"></script>
     <script src="/bower_components/angular-ui-router/release/angular-ui-router.js"></script>
-    <script src="/bower_components/oclazyload/dist/ocLazyLoad.min.js"></script>
+    <script src="/bower_components/oclazyload/dist/ocLazyLoad.js"></script>
     <script src="/bower_components/jquery/dist/jquery.js"></script>
     <script src="/bower_components/bootstrap/dist/js/bootstrap.js"></script>
     <!-- endbower -->
@@ -51,12 +50,12 @@
     <!-- Custom JavaScript -->
     <!-- build:js(.) js/app.min.js -->
     <!-- inject:js -->
-    <script src="/src/showcase/app/widgets/widgets.module.js"></script>
-    <script src="/src/showcase/app/widgets/example-controller.directive.js"></script>
-    <script src="/src/showcase/app/widgets/example-controller-as.directive.js"></script>
     <script src="/src/showcase/app/welcome/welcome.module.js"></script>
     <script src="/src/showcase/app/welcome/welcome.route.js"></script>
     <script src="/src/showcase/app/welcome/welcome.controller.js"></script>
+    <script src="/src/showcase/app/widgets/widgets.module.js"></script>
+    <script src="/src/showcase/app/widgets/example-controller.directive.js"></script>
+    <script src="/src/showcase/app/widgets/example-controller-as.directive.js"></script>
     <script src="/src/showcase/app/cars/cars.module.js"></script>
     <script src="/src/showcase/app/cars/cars.service.js"></script>
     <script src="/src/showcase/app/cars/cars.route.js"></script>
diff --git a/gulp/gulp-my-tasks/package.json b/gulp/gulp-my-tasks/package.json
index 16cbd2b..ab4a842 100644
--- a/gulp/gulp-my-tasks/package.json
+++ b/gulp/gulp-my-tasks/package.json
@@ -33,7 +33,7 @@
     "gulp-ngdocs": "~0.2.13",
     "gulp-nodemon": "~2.0.3",
     "gulp-order": "~1.1.1",
-    "gulp-print": "~1.1.0",
+    "gulp-print": "~1.1.1",
     "gulp-rev": "~5.1.0",
     "gulp-rev-replace": "~0.4.2",
     "gulp-task-listing": "~1.0.1",
@@ -43,9 +43,9 @@
     "gulp-watch": "~4.3.5",
     "jshint-stylish": "~2.0.1",
     "karma": "~0.13.9",
-    "karma-coverage": "~0.5.0",
+    "karma-coverage": "~0.5.2",
     "karma-jasmine": "~0.3.6",
-    "karma-junit-reporter": "~0.3.3",
+    "karma-junit-reporter": "~0.3.4",
     "karma-phantomjs-launcher": "~0.2.1",
     "morgan": "~1.6.1",
     "serve-favicon": "~2.3.0",