Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions karma.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
const path = require('path');
/*global process,module,__dirname*/

const srcPath = path.join(__dirname, 'src');
const testPath = path.join(__dirname, 'test');
'use strict';

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';
Expand Down
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/SketchFieldTest.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* global expect */
/* global expect, describe,it */
/* eslint no-console: 0 */
/* eslint-env node, mocha */
'use strict';
Expand Down