Skip to content
This repository was archived by the owner on Mar 14, 2022. It is now read-only.

Commit b98aa33

Browse files
committed
Merge branch 'release/0.3.0'
2 parents 3cd18e0 + 0a34e4f commit b98aa33

5 files changed

Lines changed: 34 additions & 19 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ The `root` property declares the `id` of the root element for the table. It is o
8585
- [Simple react-handsontable implementation](http://codepen.io/handsoncode/pen/ygvaxv?editors=0010)
8686
- [Simple react-handsontable implementation with a single-property configuration](http://codepen.io/handsoncode/pen/pRamwZ?editors=0010)
8787
- [Interactive HotTable demo](http://codepen.io/handsoncode/pen/zNRoxb?editors=0010)
88+
- [Simple Redux implementation demo](http://codepen.io/handsoncode/pen/LWmvPX?editors=0010)
8889

8990
## License
9091
`react-handsontable` is released under the [MIT license](https://github.com/handsontable/react-handsontable/blob/master/LICENSE).

docs/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ <h2 id="examples"><a class="header-link" href="#examples"></a>Examples</h2>
7878
<li><a href="http://codepen.io/handsoncode/pen/ygvaxv?editors=0010">Simple react-handsontable implementation</a></li>
7979
<li><a href="http://codepen.io/handsoncode/pen/pRamwZ?editors=0010">Simple react-handsontable implementation with a single-property configuration</a></li>
8080
<li><a href="http://codepen.io/handsoncode/pen/zNRoxb?editors=0010">Interactive HotTable demo</a></li>
81+
<li><a href="http://codepen.io/handsoncode/pen/LWmvPX?editors=0010">Simple Redux implementation demo</a></li>
8182
</ul>
8283
<h2 id="license"><a class="header-link" href="#license"></a>License</h2>
8384
<p><code>react-handsontable</code> is released under the <a href="https://github.com/handsontable/react-handsontable/blob/master/LICENSE">MIT license</a>.

package.json

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-handsontable",
3-
"version": "0.2.1",
3+
"version": "0.3.0",
44
"description": "A Handsontable component for ReactJS.",
55
"author": "Handsoncode <hello@handsontable.com>",
66
"license": "MIT",
@@ -21,34 +21,34 @@
2121
},
2222
"main": "./dist/react-handsontable.js",
2323
"devDependencies": {
24-
"babel-core": "^6.18.2",
25-
"babel-jest": "^17.0.2",
26-
"babel-loader": "^6.2.8",
27-
"babel-preset-es2015": "^6.18.0",
28-
"babel-preset-react": "^6.16.0",
24+
"babel-core": "^6.25.0",
25+
"babel-loader": "^7.1.1",
26+
"babel-preset-es2015": "^6.24.1",
27+
"babel-preset-react": "^6.24.1",
28+
"css-loader": "^0.28.4",
29+
"expose-loader": "^0.7.3",
30+
"react": "^15.6.1",
31+
"react-dom": "^15.6.1",
32+
"style-loader": "^0.18.2",
33+
"webpack": "^3.2.0",
34+
"babel-jest": "^20.0.3",
2935
"babel-runtime": "~5.8.20",
30-
"css-loader": "^0.26.0",
3136
"cssstyle": "git://github.com/jansiegel/CSSStyleDeclaration.git",
32-
"enzyme": "^2.6.0",
33-
"enzyme-to-json": "^1.4.4",
34-
"expose-loader": "^0.7.1",
37+
"enzyme": "^2.9.1",
38+
"enzyme-to-json": "^1.5.1",
3539
"generate-release": "^0.10.2",
36-
"jest": "^17.0.3",
40+
"jest": "^20.0.4",
3741
"markdown-styles": "^3.1.9",
38-
"react": "^15.4.1",
39-
"react-addons-test-utils": "^15.4.1",
40-
"react-dom": "^15.4.1",
4142
"rimraf": "^2.5.4",
42-
"style-loader": "^0.13.1",
4343
"uglify-js": "^2.7.5",
44-
"webpack": "^2.2.1"
44+
"react-test-renderer": "^15.6.1"
4545
},
4646
"dependencies": {
4747
"zeroclipboard": "^2.3.0",
4848
"moment": "^2.17.1",
4949
"numbro": "^1.9.3",
5050
"pikaday": "^1.5.1",
51-
"handsontable": "^0.31.1"
51+
"handsontable": "^0.33.0"
5252
},
5353
"scripts": {
5454
"test": "npm run _pre-testing && jest",
@@ -73,6 +73,12 @@
7373
],
7474
"snapshotSerializers": [
7575
"<rootDir>/node_modules/enzyme-to-json/serializer"
76-
]
76+
],
77+
"globals": {
78+
"__HOT_BUILD_DATE__": "",
79+
"__HOT_PACKAGE_NAME__": "",
80+
"__HOT_VERSION__": "",
81+
"__HOT_BASE_VERSION__": ""
82+
}
7783
}
7884
}

src/react-handsontable.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react';
22
import Handsontable from 'handsontable';
33
import SettingsMapper from './settingsMapper';
4+
import 'handsontable/dist/handsontable.full.css';
45

56
/**
67
* A Handsontable-ReactJS wrapper.

webpack.config.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
const path = require('path');
2+
13
module.exports = [
24
{
35
devtool: 'source-map',
@@ -6,7 +8,7 @@ module.exports = [
68
},
79

810
output: {
9-
path: './',
11+
path: path.resolve(__dirname, './'),
1012
filename: '[name].js',
1113
library: 'HotTable',
1214
libraryTarget: 'umd',
@@ -45,6 +47,10 @@ module.exports = [
4547
query: {
4648
presets: ['react', 'es2015']
4749
}
50+
},
51+
{
52+
test: (/\.css$/),
53+
loader: "style-loader!css-loader"
4854
}
4955
]
5056
},

0 commit comments

Comments
 (0)