From 659edad0cb4b11f56794265ed0eaeb4af9e4ab2b Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 11 May 2016 15:59:58 +0300 Subject: [PATCH 1/3] Maintenance, updating to latest library versions --- karma.config.js | 4 ++++ package.json | 48 ++++++++++++++++++++--------------------- test/SketchFieldTest.js | 2 +- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/karma.config.js b/karma.config.js index a7545d31..7ba05255 100644 --- a/karma.config.js +++ b/karma.config.js @@ -1,3 +1,7 @@ +/*global process,module,__dirname*/ + +'use strict'; + const path = require('path'); const srcPath = path.join(__dirname, 'src'); diff --git a/package.json b/package.json index e8dc26e0..9e09946e 100644 --- a/package.json +++ b/package.json @@ -39,53 +39,53 @@ "node": ">0.4.0 <1.0.0" }, "peerDependencies": { - "react": "^15.0.1", - "react-dom": "^15.0.1" + "react": "^15.0.2", + "react-dom": "^15.0.2" }, "devDependencies": { - "babel-cli": "^6.7.7", - "babel-core": "^6.7.7", + "babel-cli": "^6.8.0", + "babel-core": "^6.8.0", "babel-eslint": "^6.0.4", "babel-loader": "^6.2.4", - "babel-plugin-transform-object-assign": "^6.5.0", - "babel-plugin-transform-react-display-name": "^6.5.0", - "babel-plugin-transform-runtime": "^6.7.5", - "babel-preset-react-hmre": "^1.0.1", - "babel-polyfill": "^6.7.4", + "babel-plugin-transform-object-assign": "^6.8.0", + "babel-plugin-transform-react-display-name": "^6.8.0", + "babel-plugin-transform-runtime": "^6.8.0", + "babel-preset-react-hmre": "^1.1.1", + "babel-polyfill": "^6.8.0", "babel-preset-es2015": "^6.6.0", "babel-preset-es2015-loose": "^7.0.0", "babel-preset-react": "^6.5.0", "babel-preset-stage-0": "^6.5.0", - "canvas": "^1.3.12", + "canvas": "^1.3.15", "chai": "^3.5.0", - "core-js": "^2.3.0", + "core-js": "^2.4.0", "css-loader": "^0.23.1", - "eslint": "^2.8.0", + "eslint": "^2.9.0", "eslint-loader": "^1.3.0", - "eslint-plugin-react": "^5.0.1", - "fabric": "^1.6.0", + "eslint-plugin-react": "^5.1.1", + "fabric": "^1.6.1", "flexboxgrid": "^6.3.0", - "html-webpack-plugin": "^2.16.0", + "html-webpack-plugin": "^2.16.1", "karma": "^0.13.22", "karma-babel-preprocessor": "^6.0.1", "karma-chai": "^0.1.0", - "karma-coverage": "^0.5.5", - "karma-mocha": "^0.2.2", - "karma-mocha-reporter": "^2.0.2", + "karma-coverage": "^1.0.0", + "karma-mocha": "^1.0.1", + "karma-mocha-reporter": "^2.0.3", "karma-phantomjs-launcher": "^1.0.0", - "karma-phantomjs-shim": "^1.3.0", + "karma-phantomjs-shim": "^1.4.0", "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^1.7.0", - "material-ui": "^0.14.4", + "material-ui": "^0.15.0", "mocha": "^2.4.5", "open": "0.0.5", "open-browser-webpack-plugin": "0.0.2", "phantomjs": "^2.1.7", "phantomjs-prebuilt": "^2.1.7", - "react": "^15.0.1", - "react-addons-test-utils": "^15.0.1", - "react-color": "^2.0.0", - "react-dom": "latest", + "react": "^15.0.2", + "react-addons-test-utils": "^15.0.2", + "react-color": "^2.1.0", + "react-dom": "^15.0.2", "react-hot-loader": "^1.3.0", "react-tap-event-plugin": "latest", "rimraf": "^2.5.2", diff --git a/test/SketchFieldTest.js b/test/SketchFieldTest.js index 03ada82f..d484f328 100644 --- a/test/SketchFieldTest.js +++ b/test/SketchFieldTest.js @@ -1,4 +1,4 @@ -/* global expect */ +/* global expect, describe,it */ /* eslint no-console: 0 */ /* eslint-env node, mocha */ 'use strict'; From 9ae0d78ede098dc77e3d88075cb8b1bd5732374e Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 11 May 2016 16:20:54 +0300 Subject: [PATCH 2/3] Correcting error Invalid config file! for node version 0.12.x /home/travis/build/tbolis/react-sketch/karma.config.js:5 const path = require('path'); ^^^^^ --- karma.config.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/karma.config.js b/karma.config.js index 7ba05255..4fc69f15 100644 --- a/karma.config.js +++ b/karma.config.js @@ -2,10 +2,9 @@ 'use strict'; -const path = require('path'); - -const srcPath = path.join(__dirname, 'src'); -const testPath = path.join(__dirname, 'test'); +var path = require('path'); +var srcPath = path.join(__dirname, 'src'); +var testPath = path.join(__dirname, 'test'); // Set environment to testing process.env.NODE_ENV = 'testing'; From df1ffd31e57c9cbdd08056dfeaaf88f9d779f77e Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 11 May 2016 17:11:29 +0300 Subject: [PATCH 3/3] updating version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9e09946e..72468921 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-sketch", - "version": "0.2.3", + "version": "0.2.4", "description": "Sketch Element for React based applications, backed-up by fabricjs as its core", "keywords": [ "react",