Compare commits

...

4 Commits

Author SHA1 Message Date
Chris b3abd3159d 1.3.1 2016-01-29 13:54:38 +01:00
Chris f56a70b13d Fix: Removed karma-phantomjs-shim from packages list and karma (it is no longer needed in phantomjs 2) 2016-01-29 13:54:28 +01:00
Chris 1a12e83eb0 1.3.0 2016-01-29 13:32:49 +01:00
Chris d0720735be Updated phantomjs to 2.0 2016-01-29 13:32:39 +01:00
3 changed files with 12 additions and 5 deletions
+8
View File
@@ -1,5 +1,13 @@
# react-webpack-template - Changelog # react-webpack-template - Changelog
## 1.3.1:
1. Removed karma-phantomjs-shim (with PhantomJS 2 there is no need for shims anymore)
## 1.3.0:
1. Updated phantomjs to 2.0
## 1.2.1: ## 1.2.1:
1. Updated lodash to latest stable version 1. Updated lodash to latest stable version
+1 -1
View File
@@ -9,7 +9,7 @@ module.exports = function(config) {
], ],
port: 8080, port: 8080,
captureTimeout: 60000, captureTimeout: 60000,
frameworks: [ 'phantomjs-shim', 'mocha', 'chai' ], frameworks: [ 'mocha', 'chai' ],
client: { client: {
mocha: {} mocha: {}
}, },
+3 -4
View File
@@ -1,6 +1,6 @@
{ {
"name": "react-webpack-template", "name": "react-webpack-template",
"version": "1.2.1", "version": "1.3.1",
"description": "A base skeleton template for react and webpack without task runners", "description": "A base skeleton template for react and webpack without task runners",
"main": "server.js", "main": "server.js",
"scripts": { "scripts": {
@@ -56,8 +56,7 @@
"karma-coverage": "^0.5.3", "karma-coverage": "^0.5.3",
"karma-mocha": "^0.2.0", "karma-mocha": "^0.2.0",
"karma-mocha-reporter": "^1.1.1", "karma-mocha-reporter": "^1.1.1",
"karma-phantomjs-launcher": "^0.2.1", "karma-phantomjs-launcher": "^1.0.0",
"karma-phantomjs-shim": "^1.1.1",
"karma-sourcemap-loader": "^0.3.5", "karma-sourcemap-loader": "^0.3.5",
"karma-webpack": "^1.7.0", "karma-webpack": "^1.7.0",
"lodash": "^4.0.0", "lodash": "^4.0.0",
@@ -65,7 +64,7 @@
"mocha": "^2.2.5", "mocha": "^2.2.5",
"null-loader": "^0.1.1", "null-loader": "^0.1.1",
"open": "0.0.5", "open": "0.0.5",
"phantomjs": "^1.9.18", "phantomjs-prebuilt": "^2.0.0",
"react-addons-test-utils": "^0.14.0", "react-addons-test-utils": "^0.14.0",
"react-hot-loader": "^1.2.9", "react-hot-loader": "^1.2.9",
"rimraf": "^2.4.3", "rimraf": "^2.4.3",