Merge remote-tracking branch 'upstream/master' into pop-to-root

Author: programmarchy

karma.conf.js

@@ -16,7 +16,7 @@ module.exports = function(config) {
       'spec/helpers.js',
       'node_modules/react/dist/react-with-addons.js',
       'node_modules/sinon/pkg/sinon.js',
-      'spec/**/*.spec.{jsx,js}'
+      'spec/**/*.spec.+(jsx|js)'
     ],
 
     // list of files to exclude
@@ -25,7 +25,7 @@ module.exports = function(config) {
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
     preprocessors: {
-      'spec/**/*.spec.{jsx,js}': ['webpack']
+      'spec/**/*.spec.+(jsx|js)': ['webpack']
     },
 
     // test results reporter to use

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-controller",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "React view manager similar to UINavigationController",
   "keywords": [
     "react",
@@ -24,25 +24,27 @@
     "react": "^0.13.0"
   },
   "dependencies": {
-    "classnames": "^1.2.0",
-    "rebound": "0.0.12"
+    "classnames": "^2.1.3",
+    "rebound": "0.0.13"
   },
   "devDependencies": {
-    "babel": "^4.7.16",
-    "babel-loader": "^4.2.0",
-    "chai": "^2.2.0",
-    "karma": "^0.12.31",
+    "babel": "^5.8.23",
+    "babel-core": "^5.8.25",
+    "babel-loader": "^5.3.2",
+    "chai": "^3.3.0",
+    "karma": "^0.13.10",
     "karma-chai": "^0.1.0",
-    "karma-chrome-launcher": "^0.1.7",
-    "karma-mocha": "^0.1.10",
-    "karma-phantomjs-launcher": "^0.1.4",
-    "karma-spec-reporter": "0.0.18",
-    "karma-webpack": "^1.5.0",
-    "minimist": "^1.1.1",
-    "mocha": "^2.2.1",
-    "react": "0.13.1",
-    "sinon": "^1.14.1",
-    "webpack": "^1.7.3",
-    "webpack-dev-server": "^1.7.0"
+    "karma-chrome-launcher": "^0.2.0",
+    "karma-mocha": "^0.2.0",
+    "karma-phantomjs-launcher": "^0.2.1",
+    "karma-spec-reporter": "0.0.20",
+    "karma-webpack": "^1.7.0",
+    "minimist": "^1.2.0",
+    "mocha": "^2.3.3",
+    "phantomjs": "^1.9.18",
+    "react": "0.13.3",
+    "sinon": "^1.17.1",
+    "webpack": "^1.12.2",
+    "webpack-dev-server": "^1.12.0"
   }
 }