Skip to content

Commit 1783f6f

Browse files
committed
Merge branch 'master' of https://github.com/tbolis/react-sketch
2 parents 8785534 + 43e0326 commit 1783f6f

File tree

4 files changed

+1905
-367
lines changed

4 files changed

+1905
-367
lines changed

.npmignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ docs/
88
.gitignore
99
.karma.config.js
1010
webpack.*
11+
yarn.lock
12+
package.lock
1113

1214

1315
### Linux template
@@ -168,7 +170,6 @@ build/Release
168170
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
169171
node_modules
170172

171-
lib/
172173
build/
173174

174175
### Windows template

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
language: node_js
22
node_js:
3+
- "9"
34
- "8"
45
- "7"
56
- "6"
7+
cache:
8+
yarn: true
9+
directories:
10+
- node_modules
611
env:
712
- CXX=g++-4.8
813
addons:

package.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-sketch",
3-
"version": "0.4.0",
3+
"version": "0.4.4",
44
"description": "Sketch Element for React based applications, backed-up by fabricjs as its core",
55
"keywords": [
66
"react",
@@ -37,12 +37,12 @@
3737
"posttest": "npm run lint"
3838
},
3939
"engines": {
40-
"node": ">= 6 <9.0.0"
40+
"node": ">= 6"
4141
},
4242
"devDependencies": {
4343
"babel-cli": "^6.26.0",
4444
"babel-core": "^6.26.0",
45-
"babel-eslint": "^8.0.2",
45+
"babel-eslint": "^8.2.1",
4646
"babel-loader": "^7.1.2",
4747
"babel-plugin-react-transform": "^3.0.0",
4848
"babel-plugin-transform-object-assign": "^6.22.0",
@@ -54,16 +54,16 @@
5454
"babel-preset-stage-0": "^6.24.1",
5555
"babel-runtime": "^6.26.0",
5656
"chai": "^4.1.2",
57-
"css-loader": "^0.28.7",
58-
"enzyme": "^3.2.0",
59-
"enzyme-adapter-react-16": "^1.1.0",
60-
"eslint": "^4.11.0",
57+
"css-loader": "^0.28.9",
58+
"enzyme": "^3.3.0",
59+
"enzyme-adapter-react-16": "^1.1.1",
60+
"eslint": "^4.16.0",
6161
"eslint-loader": "^1.9.0",
62-
"eslint-plugin-react": "^7.4.0",
63-
"fabric": "1.7.20",
62+
"eslint-plugin-react": "^7.6.1",
63+
"fabric": "1.7.22",
6464
"flexboxgrid": "^6.3.1",
6565
"html-webpack-plugin": "^2.30.1",
66-
"karma": "^1.7.1",
66+
"karma": "^2.0.0",
6767
"karma-babel-preprocessor": "^7.0.0",
6868
"karma-chai": "^0.1.0",
6969
"karma-coverage": "^1.1.1",
@@ -73,29 +73,29 @@
7373
"karma-phantomjs-launcher": "^1.0.4",
7474
"karma-phantomjs-shim": "^1.5.0",
7575
"karma-sourcemap-loader": "^0.3.7",
76-
"karma-webpack": "^2.0.6",
77-
"material-ui": "^0.19.4",
78-
"mocha": "^4.0.1",
76+
"karma-webpack": "^2.0.9",
77+
"material-ui": "^0.20.0",
78+
"mocha": "^5.0.0",
7979
"my-local-ip": "^1.0.0",
8080
"open": "0.0.5",
8181
"open-browser-webpack-plugin": "0.0.5",
82-
"phantomjs-prebuilt": "^2.1.16",
83-
"postcss-loader": "^2.0.8",
82+
"postcss-loader": "^2.1.0",
8483
"react-color": "^2.13.8",
8584
"react-hot-loader": "^3.1",
8685
"react-tap-event-plugin": "^3.0.2",
87-
"react-test-renderer": "^16.1.1",
86+
"react-test-renderer": "^16.2.0",
8887
"react-transform-hmr": "^1.0.4",
8988
"rimraf": "^2.6.2",
90-
"style-loader": "^0.19.0",
91-
"webpack": "^3.8.1",
92-
"webpack-dev-server": "^2.9.4",
89+
"style-loader": "^0.20.1",
90+
"webpack": "^3.10.0",
91+
"webpack-dev-server": "^2.11.1",
9392
"weinre": "^2.0.0-pre-I0Z7U9OV"
9493
},
9594
"dependencies": {
95+
"phantomjs-prebuilt": "2.1.7",
9696
"prop-types": "^15.6.0",
97-
"react": "^16.1.1",
98-
"react-dom": "^16.1.1",
99-
"react-dropzone": "4.2.1"
97+
"react": "^16.2.0",
98+
"react-dom": "^16.2.0",
99+
"react-dropzone": "4.2.7"
100100
}
101101
}

0 commit comments

Comments
 (0)