Skip to content

Commit

Permalink
Merge pull request #26 from georgeOsdDev/patch/ncu
Browse files Browse the repository at this point in the history
Update dependencies, add yarn.lock
  • Loading branch information
georgeOsdDev committed Jan 22, 2018
2 parents 52a7554 + 1ca2293 commit e146215
Show file tree
Hide file tree
Showing 8 changed files with 5,626 additions and 31 deletions.
5 changes: 2 additions & 3 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"presets": [
"es2015",
"stage-2",
"react",
"env",
"react"
]
}
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- "0.10"
- "node"
before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
## Change Log

### Ver 0.4.0 (Next Release)
### Ver 0.4.1

* #23, #25 [Support React 16.x](https://github.com/georgeOsdDev/react-fileupload-progress/pull/25)

### Ver 0.4.0

* #15 [peer dependency versioning issue?](https://github.com/georgeOsdDev/react-fileupload-progress/pull/15)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ React.render(<App/>, document.getElementById('out'));
See also [example](https://github.com/georgeOsdDev/react-fileupload-progress/tree/develop/example)

```bash
npm install
npm install # or yarn
npm run start:example
```

Expand Down
9 changes: 3 additions & 6 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,14 @@ module.exports = function(config) {

browserify: {
transform: [
['browserify-istanbul', {
instrumenter: require('isparta')
}],
['babelify',
{
compact: false,
presets: [
'es2015',
'stage-2',
'env',
'react',
]
],
plugins: ['istanbul']
}
],
]
Expand Down
37 changes: 20 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,21 @@
"devDependencies": {
"babel-cli": "^6.14.0",
"babel-core": "^6.14.0",
"babel-eslint": "^6.1.2",
"babel-loader": "^6.2.5",
"babel-eslint": "^8.2.1",
"babel-loader": "^7.1.2",
"babel-preset-env": "^1.6.1",
"babel-preset-es2015": "^6.14.0",
"babel-preset-react": "^6.11.1",
"babel-preset-stage-2": "^6.13.0",
"babelify": "^7.3.0",
"browserify": "^13.1.0",
"browserify-istanbul": "^2.0.0",
"chai": "^3.5.0",
"eslint": "^3.5.0",
"eslint-config-airbnb": "^11.1.0",
"eslint-plugin-react": "^6.3.0",
"babelify": "^8.0.0",
"browserify": "^15.2.0",
"browserify-istanbul": "^3.0.1",
"chai": "^4.1.2",
"eslint": "^4.16.0",
"eslint-config-airbnb": "^16.1.0",
"eslint-plugin-react": "^7.5.1",
"express": "^4.14.0",
"isparta": "^4.0.0",
"karma": "^1.3.0",
"karma": "^2.0.0",
"karma-browserify": "^5.1.0",
"karma-chai": "^0.1.0",
"karma-chrome-launcher": "^2.0.0",
Expand All @@ -53,17 +53,21 @@
"karma-firefox-launcher": "^1.0.0",
"karma-mocha": "^1.1.1",
"karma-safari-launcher": "^1.0.0",
"karma-spec-reporter": "0.0.26",
"mocha": "^3.0.2",
"karma-spec-reporter": "0.0.32",
"mocha": "^5.0.0",
"multer": "^1.2.0",
"react": "^16.2.0",
"react-addons-test-utils": "^15.6.2",
"react-dom": "^16.2.0",
"rimraf": "^2.5.4",
"sinon": "^1.17.6",
"sinon": "^4.2.0",
"watchify": "^3.7.0"
},
"dependencies": {
"babel-plugin-istanbul": "^4.1.5",
"object-assign": "^4.1.0",
"prop-types": "^15.5.10",
"sinon": "^1.17.6"
"sinon": "^4.2.0"
},
"peerDependencies": {
"react": "15.x || 16.x",
Expand All @@ -76,8 +80,7 @@
{
"compact": false,
"presets": [
"es2015",
"stage-2",
"env",
"react"
]
}
Expand Down
4 changes: 2 additions & 2 deletions test/components/FileUploadProgress_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ describe('Test of FileUploadProgress', () => {

describe('onError handler', () => {
it('should handle xhr error event', () => {
requests[0].dispatchEvent(new sinon.Event('error', false, false, this));
requests[0].dispatchEvent(new Event('error', {}));

expect(onErrorSpy.calledOnce).to.be.equal(true);
let event = onErrorSpy.args[0][0];
Expand Down Expand Up @@ -395,7 +395,7 @@ describe('Test of FileUploadProgress', () => {
it('pass hasError parameter to custom renderer', (done) => {
let form = TestUtils.findRenderedDOMComponentWithTag(component, 'form');
TestUtils.Simulate.submit(form);
requests[0].dispatchEvent(new sinon.Event('error', false, false, this));
requests[0].dispatchEvent(new Event('error', {}));

let customProgress = TestUtils.scryRenderedDOMComponentsWithClass(component, 'customProgress');
expect(customProgress.length).to.be.eql(1);
Expand Down
Loading

0 comments on commit e146215

Please sign in to comment.