Merge pull request #34 from georgeOsdDev/develop

georgeOsdDev · web-flow · commit 7e12893510bd · 2017-11-30T17:25:56.000+09:00
Fix #31, Update dependencies
diff --git a/.babelrc b/.babelrc
@@ -1,6 +1,6 @@
 {
   "presets": [
-    "es2015",
+    "env",
     "react"
   ]
-}
+}
diff --git a/.travis.yml b/.travis.yml
@@ -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"
+  - "sh -e /etc/init.d/xvfb start"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ### Ver 0.3.0 (Next Release)
 
+* [Update React and dependencies](https://github.com/georgeOsdDev/react-web-notification/issues/31)
+
 ### Ver 0.2.4
 
 * [#28 Use prop-types package instead of accessing PropTypes](https://github.com/georgeOsdDev/react-web-notification/issues/28), thanks @AlexNisnevich
diff --git a/karma.conf.js b/karma.conf.js
@@ -40,8 +40,8 @@ module.exports = function(config) {
           {
             'compact': false,
             'presets': [
-              'react',
-              'es2015'
+              'env',
+              'react'
             ]
           }
         ]
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-web-notification",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "description": "React component with HTML5 Web Notification API",
   "main": "./lib/components/Notification.js",
   "scripts": {
@@ -31,37 +31,37 @@
   "devDependencies": {
     "babel-cli": "^6.3.17",
     "babel-core": "^6.3.21",
-    "babel-eslint": "^5.0.0-beta6",
-    "babel-preset-es2015": "^6.3.13",
+    "babel-eslint": "^8.0.2",
     "babel-preset-react": "^6.3.13",
-    "babelify": "^7.2.0",
+    "babelify": "^8.0.0",
     "browser-sync": "^2.10.1",
-    "browserify": "^12.0.1",
-    "chai": "^3.4.1",
-    "eslint": "^1.10.3",
-    "eslint-plugin-react": "^3.12.0",
-    "karma": "^0.13.15",
-    "karma-browserify": "^4.4.2",
+    "browserify": "^14.5.0",
+    "chai": "^4.1.2",
+    "eslint": "^4.12.1",
+    "eslint-plugin-react": "^7.5.1",
+    "karma": "^1.7.1",
+    "karma-browserify": "^5.1.2",
     "karma-chai": "^0.1.0",
-    "karma-chrome-launcher": "^0.2.2",
-    "karma-cli": "0.1.1",
-    "karma-firefox-launcher": "^0.1.7",
-    "karma-mocha": "^0.2.1",
-    "karma-safari-launcher": "^0.1.1",
-    "karma-spec-reporter": "0.0.23",
-    "mocha": "^2.3.4",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-cli": "1.0.1",
+    "karma-firefox-launcher": "^1.0.1",
+    "karma-mocha": "^1.3.0",
+    "karma-safari-launcher": "^1.0.0",
+    "karma-spec-reporter": "0.0.31",
+    "mocha": "^4.0.1",
     "prop-types": "^15.5.8",
     "react-addons-test-utils": "^0.14.3 || ^15.0.1",
-    "react-dom": "^0.14.3 || ^15.0.1",
+    "react-dom": "^16.2.0",
     "rimraf": "^2.4.4",
-    "sinon": "^1.17.2",
+    "sinon": "^4.1.2",
     "watchify": "^3.6.1"
   },
   "dependencies": {
-    "react": "^0.14.3 || ^15.0.1"
+    "babel-preset-env": "^1.6.1",
+    "react": "^16.2.0"
   },
   "peerDependencies": {
-    "react": "^0.14.3 || ^15.0.1"
+    "react": "^16.2.0"
   },
   "browserify": {
     "transform": [
@@ -70,7 +70,7 @@
         {
           "compact": false,
           "presets": [
-            "es2015",
+            "env",
             "react"
           ]
         }
diff --git a/src/components/Notification.js b/src/components/Notification.js
@@ -1,5 +1,3 @@
-'use strict';
-
 import React from 'react';
 import { bool, func, number, object, string } from 'prop-types';
 
diff --git a/test/components/Notification_spec.js b/test/components/Notification_spec.js
@@ -1,8 +1,6 @@
-'use strict';
-
 import React from 'react';
 import ReactDom from 'react-dom';
-import TestUtils from 'react-addons-test-utils';
+import ReactTestUtils from 'react-dom/test-utils';
 
 import chai from 'chai';
 import sinon from 'sinon';
@@ -24,7 +22,7 @@ describe('Test of Notification', () => {
 
   describe('Notification component', () => {
     it('should have default properties', function () {
-      component = TestUtils.renderIntoDocument(<Notification title='test'/>);
+      component = ReactTestUtils.renderIntoDocument(<Notification title='test'/>);
       expect(component.props.ignore).to.be.eql(false);
       expect(component.props.disableActiveWindow).to.be.eql(false);
       expect(component.props.askAgain).to.be.eql(false);
@@ -40,8 +38,8 @@ describe('Test of Notification', () => {
     });
 
     it('should render dummy hidden tag', function () {
-      component = TestUtils.renderIntoDocument(<Notification title='test'/>);
-      const el = TestUtils.scryRenderedDOMComponentsWithTag(component, 'input');
+      component = ReactTestUtils.renderIntoDocument(<Notification title='test'/>);
+      const el = ReactTestUtils.scryRenderedDOMComponentsWithTag(component, 'input');
       expect(el.length).to.be.eql(1);
       expect(ReactDom.findDOMNode(el[0]).type).to.be.eql('hidden');
     });
@@ -64,7 +62,7 @@ describe('Test of Notification', () => {
 
       it('should call notSupported prop', () => {
         let spy = sinon.spy();
-        component = TestUtils.renderIntoDocument(<Notification title='test' notSupported={spy}/>);
+        component = ReactTestUtils.renderIntoDocument(<Notification title='test' notSupported={spy}/>);
         expect(spy.calledOnce).to.be.eql(true);
         expect(stub.called).to.be.eql(false);
       });
@@ -79,10 +77,10 @@ describe('Test of Notification', () => {
             before(() => {
               spy1 = sinon.spy();
               spy2 = sinon.spy();
-              stub = sinon.stub(window.Notification, 'requestPermission', function(cb){
+              stub = sinon.stub(window.Notification, 'requestPermission').callsFake(function(cb){
                 return cb(PERMISSION_DENIED);
               });
-              component = TestUtils.renderIntoDocument(<Notification title='test' notSupported={spy1} onPermissionDenied={spy2}/>);
+              component = ReactTestUtils.renderIntoDocument(<Notification title='test' notSupported={spy1} onPermissionDenied={spy2}/>);
             });
 
             after(() => {
@@ -107,11 +105,13 @@ describe('Test of Notification', () => {
             before(() => {
               spy1 = sinon.spy();
               spy2 = sinon.spy();
-              stub1 = sinon.stub(window.Notification, 'permission', { get: function () { return PERMISSION_DENIED; } });
-              stub2 = sinon.stub(window.Notification, 'requestPermission', function(cb){
+              stub1 = sinon.stub(window.Notification, 'permission').get(function getterFn() {
+                return PERMISSION_DENIED;
+              });
+              stub2 = sinon.stub(window.Notification, 'requestPermission').callsFake(function(cb){
                 return cb(PERMISSION_DENIED);
               });
-              component = TestUtils.renderIntoDocument(<Notification title='test' notSupported={spy1} onPermissionDenied={spy2}/>);
+              component = ReactTestUtils.renderIntoDocument(<Notification title='test' notSupported={spy1} onPermissionDenied={spy2}/>);
             });
 
             after(() => {
@@ -138,11 +138,13 @@ describe('Test of Notification', () => {
               spy1 = sinon.spy();
               spy2 = sinon.spy();
               spy3 = sinon.spy();
-              stub1 = sinon.stub(window.Notification, 'permission', { get: function () { return PERMISSION_DENIED; } });
-              stub2 = sinon.stub(window.Notification, 'requestPermission', function(cb){
+              stub1 = sinon.stub(window.Notification, 'permission').get(function getterFn() {
+                return PERMISSION_DENIED;
+              });
+              stub2 = sinon.stub(window.Notification, 'requestPermission').callsFake(function(cb){
                 return cb(PERMISSION_GRANTED);
               });
-              component = TestUtils.renderIntoDocument(<Notification title='test' notSupported={spy1} onPermissionDenied={spy2} onPermissionGranted={spy3} askAgain={true}/>);
+              component = ReactTestUtils.renderIntoDocument(<Notification title='test' notSupported={spy1} onPermissionDenied={spy2} onPermissionGranted={spy3} askAgain={true}/>);
             });
 
             after(() => {
@@ -165,7 +167,7 @@ describe('Test of Notification', () => {
         describe('When Notification is granted', () => {
           let stub;
           before(() => {
-            stub = sinon.stub(window.Notification, 'requestPermission', function(cb){
+            stub = sinon.stub(window.Notification, 'requestPermission').callsFake(function(cb){
               return cb(PERMISSION_GRANTED);
             });
           });
@@ -180,7 +182,7 @@ describe('Test of Notification', () => {
               spy1 = sinon.spy();
               spy2 = sinon.spy();
               spy3 = sinon.spy();
-              component = TestUtils.renderIntoDocument(<Notification title='test' notSupported={spy1} onPermissionDenied={spy2} onPermissionGranted={spy3}/>);
+              component = ReactTestUtils.renderIntoDocument(<Notification title='test' notSupported={spy1} onPermissionDenied={spy2} onPermissionGranted={spy3}/>);
             });
 
             it('should call window.Notification.requestPermission', () => {
@@ -218,7 +220,7 @@ describe('Test of Notification', () => {
               onErrorSpy = sinon.spy();
 
               it('does not trigger Notification', () => {
-                component = TestUtils.renderIntoDocument(<Notification title='test' ignore={true} onShow={onShowSpy} onClick={onClickSpy} onClose={onCloseSpy} onError={onErrorSpy} />);
+                component = ReactTestUtils.renderIntoDocument(<Notification title='test' ignore={true} onShow={onShowSpy} onClick={onClickSpy} onClose={onCloseSpy} onError={onErrorSpy} />);
                 expect(stubConstructor.calledWithNew()).to.be.eql(false);
                 expect(onShowSpy.called).to.be.eql(false);
                 expect(onClickSpy.called).to.be.eql(false);
@@ -242,7 +244,7 @@ describe('Test of Notification', () => {
               onErrorSpy = sinon.spy();
 
               it('trigger Notification with specified title and options', () => {
-                component = TestUtils.renderIntoDocument(<Notification title={MY_TITLE} options={MY_OPTIONS} ignore={false} onShow={onShowSpy} onClick={onClickSpy} onClose={onCloseSpy} onError={onErrorSpy} />);
+                component = ReactTestUtils.renderIntoDocument(<Notification title={MY_TITLE} options={MY_OPTIONS} ignore={false} onShow={onShowSpy} onClick={onClickSpy} onClose={onCloseSpy} onError={onErrorSpy} />);
                 expect(stubConstructor.calledWithNew()).to.be.eql(true);
                 expect(stubConstructor.calledWith(MY_TITLE, MY_OPTIONS)).to.be.eql(true);
               });
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"presets": [`
`3`		`- "es2015",`
	`3`	`+ "env",`
`4`	`4`	`"react"`
`5`	`5`	`]`
`6`		`-}`
	`6`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ module.exports = function(config) {`
`40`	`40`	`{`
`41`	`41`	`'compact': false,`
`42`	`42`	`'presets': [`
`43`		`- 'react',`
`44`		`- 'es2015'`
	`43`	`+ 'env',`
	`44`	`+ 'react'`
`45`	`45`	`]`
`46`	`46`	`}`
`47`	`47`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-'use strict';`
`2`		`-`
`3`	`1`	`import React from 'react';`
`4`	`2`	`import { bool, func, number, object, string } from 'prop-types';`
`5`	`3`