Merge pull request #45 from tuld01061/hotfix/dependencies-update

georgeOsdDev · web-flow · commit de352f173e00 · 2018-12-17T13:20:18.000+09:00
Update dependencies
diff --git a/.babelrc b/.babelrc
@@ -1,6 +1,6 @@
 {
   "presets": [
-    "env",
-    "react"
+    "@babel/preset-env",
+    "@babel/preset-react"
   ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Change Log
 
+### Ver 0.5.0
+
+* Update `Babel` from 6.x to 7.x 
+* Update other dependencies
+
 ### Ver 0.4.0
 
 * [add service worker registration prop](https://github.com/georgeOsdDev/react-web-notification/pull/41)
diff --git a/karma.conf.js b/karma.conf.js
@@ -40,8 +40,8 @@ module.exports = function(config) {
           {
             'compact': false,
             'presets': [
-              'env',
-              'react'
+              "@babel/preset-env",
+              "@babel/preset-react"
             ]
           }
         ]
diff --git a/lib/components/Notification.js b/lib/components/Notification.js
@@ -1,24 +1,33 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _react = _interopRequireDefault(require("react"));
 
-var _react = require('react');
-
-var _react2 = _interopRequireDefault(_react);
-
-var _propTypes = require('prop-types');
+var _propTypes = require("prop-types");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
 var PERMISSION_GRANTED = 'granted';
 var PERMISSION_DENIED = 'denied';
@@ -29,20 +38,26 @@ var seqGen = function seqGen() {
     return i++;
   };
 };
+
 var seq = seqGen();
 
-var Notification = function (_React$Component) {
+var Notification =
+/*#__PURE__*/
+function (_React$Component) {
   _inherits(Notification, _React$Component);
 
   function Notification(props) {
-    _classCallCheck(this, Notification);
+    var _this;
 
-    var _this = _possibleConstructorReturn(this, (Notification.__proto__ || Object.getPrototypeOf(Notification)).call(this, props));
+    _classCallCheck(this, Notification);
 
+    _this = _possibleConstructorReturn(this, _getPrototypeOf(Notification).call(this, props));
     var supported = false;
     var granted = false;
+
     if ('Notification' in window && window.Notification) {
       supported = true;
+
       if (window.Notification.permission === PERMISSION_GRANTED) {
         granted = true;
       }
@@ -51,32 +66,33 @@ var Notification = function (_React$Component) {
     _this.state = {
       supported: supported,
       granted: granted
-    };
-    // Do not save Notification instance in state
+    }; // Do not save Notification instance in state
+
     _this.notifications = {};
     _this.windowFocus = true;
-    _this.onWindowFocus = _this._onWindowFocus.bind(_this);
-    _this.onWindowBlur = _this._onWindowBlur.bind(_this);
+    _this.onWindowFocus = _this._onWindowFocus.bind(_assertThisInitialized(_assertThisInitialized(_this)));
+    _this.onWindowBlur = _this._onWindowBlur.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     return _this;
   }
 
   _createClass(Notification, [{
-    key: '_onWindowFocus',
+    key: "_onWindowFocus",
     value: function _onWindowFocus() {
       this.windowFocus = true;
     }
   }, {
-    key: '_onWindowBlur',
+    key: "_onWindowBlur",
     value: function _onWindowBlur() {
       this.windowFocus = false;
     }
   }, {
-    key: '_askPermission',
+    key: "_askPermission",
     value: function _askPermission() {
       var _this2 = this;
 
       window.Notification.requestPermission(function (permission) {
         var result = permission === PERMISSION_GRANTED;
+
         _this2.setState({
           granted: result
         }, function () {
@@ -89,7 +105,7 @@ var Notification = function (_React$Component) {
       });
     }
   }, {
-    key: 'componentDidMount',
+    key: "componentDidMount",
     value: function componentDidMount() {
       if (this.props.disableActiveWindow) {
         window.addEventListener('focus', this.onWindowFocus);
@@ -113,22 +129,23 @@ var Notification = function (_React$Component) {
       }
     }
   }, {
-    key: 'componentWillUnmount',
+    key: "componentWillUnmount",
     value: function componentWillUnmount() {
       if (this.props.disableActiveWindow) {
         window.removeEventListener('focus', this.onWindowFocus);
         window.removeEventListener('blur', this.onWindowBlur);
       }
     }
   }, {
-    key: 'render',
+    key: "render",
     value: function render() {
       var _this3 = this;
 
       var doNotShowOnActiveWindow = this.props.disableActiveWindow && this.windowFocus;
-      if (!this.props.ignore && this.props.title && this.state.supported && this.state.granted && !doNotShowOnActiveWindow) {
 
+      if (!this.props.ignore && this.props.title && this.state.supported && this.state.granted && !doNotShowOnActiveWindow) {
         var opt = this.props.options;
+
         if (typeof opt.tag !== 'string') {
           opt.tag = 'web-notification-' + seq();
         }
@@ -139,50 +156,59 @@ var Notification = function (_React$Component) {
             this.notifications[opt.tag] = {};
           } else {
             var n = new window.Notification(this.props.title, opt);
+
             n.onshow = function (e) {
               _this3.props.onShow(e, opt.tag);
+
               setTimeout(function () {
                 _this3.close(n);
               }, _this3.props.timeout);
             };
+
             n.onclick = function (e) {
               _this3.props.onClick(e, opt.tag);
             };
+
             n.onclose = function (e) {
               _this3.props.onClose(e, opt.tag);
             };
+
             n.onerror = function (e) {
               _this3.props.onError(e, opt.tag);
             };
 
             this.notifications[opt.tag] = n;
           }
         }
-      }
-
-      // return null cause
+      } // return null cause
       // Error: Invariant Violation: Notification.render(): A valid ReactComponent must be returned. You may have returned undefined, an array or some other invalid object.
-      return _react2.default.createElement('input', { type: 'hidden', name: 'dummy-for-react-web-notification', style: { display: 'none' } });
+
+
+      return _react.default.createElement("input", {
+        type: "hidden",
+        name: "dummy-for-react-web-notification",
+        style: {
+          display: 'none'
+        }
+      });
     }
   }, {
-    key: 'close',
+    key: "close",
     value: function close(n) {
       if (n && typeof n.close === 'function') {
         n.close();
       }
-    }
-
-    // for debug
+    } // for debug
 
   }, {
-    key: '_getNotificationInstance',
+    key: "_getNotificationInstance",
     value: function _getNotificationInstance(tag) {
       return this.notifications[tag];
     }
   }]);
 
   return Notification;
-}(_react2.default.Component);
+}(_react.default.Component);
 
 Notification.propTypes = {
   ignore: _propTypes.bool,
@@ -200,7 +226,6 @@ Notification.propTypes = {
   options: _propTypes.object,
   swRegistration: _propTypes.object
 };
-
 Notification.defaultProps = {
   ignore: false,
   disableActiveWindow: false,
@@ -216,5 +241,5 @@ Notification.defaultProps = {
   options: {},
   swRegistration: null
 };
-
-exports.default = Notification;
+var _default = Notification;
+exports.default = _default;
diff --git a/package.json b/package.json
@@ -29,37 +29,37 @@
   },
   "homepage": "https://github.com/georgeosddev/react-web-notification",
   "devDependencies": {
-    "babel-cli": "^6.3.17",
-    "babel-core": "^6.3.21",
-    "babel-eslint": "^8.0.2",
-    "babel-preset-env": "^1.6.1",
-    "babel-preset-react": "^6.3.13",
-    "babelify": "^8.0.0",
-    "browser-sync": "^2.10.1",
-    "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",
+    "@babel/cli": "^7.2.0",
+    "@babel/core": "^7.2.2",
+    "@babel/preset-env": "^7.2.0",
+    "@babel/preset-react": "^7.0.0",
+    "babel-eslint": "^10.0.1",
+    "babelify": "^10.0.0",
+    "browser-sync": "^2.26.3",
+    "browserify": "^16.2.3",
+    "chai": "^4.2.0",
+    "eslint": "^5.10.0",
+    "eslint-plugin-react": "^7.11.1",
+    "karma": "^3.1.3",
+    "karma-browserify": "^6.0.0",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^2.2.0",
-    "karma-cli": "1.0.1",
-    "karma-firefox-launcher": "^1.0.1",
+    "karma-cli": "2.0.0",
+    "karma-firefox-launcher": "^1.1.0",
     "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": "^0.14.3 || ^15.0.1 || ^16.2.0",
-    "react-addons-test-utils": "^0.14.3 || ^15.0.1",
-    "react-dom": "^0.14.3 || ^15.0.1 || ^16.2.0",
-    "rimraf": "^2.4.4",
-    "sinon": "^4.1.2",
-    "watchify": "^3.6.1"
+    "karma-spec-reporter": "0.0.32",
+    "mocha": "^5.2.0",
+    "prop-types": "^15.6.2",
+    "react": "^16.6.3",
+    "react-addons-test-utils": "^15.6.2",
+    "react-dom": "^16.6.3",
+    "rimraf": "^2.6.2",
+    "sinon": "^7.2.2",
+    "watchify": "^3.11.0"
   },
   "peerDependencies": {
-    "react": "^0.14.3 || ^15.0.1 || ^16.2.0"
+    "react": "^16.6.3"
   },
   "browserify": {
     "transform": [
@@ -68,8 +68,8 @@
         {
           "compact": false,
           "presets": [
-            "env",
-            "react"
+            "@babel/preset-env",
+            "@babel/preset-react"
           ]
         }
       ]
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`		`- "env",`
`4`		`- "react"`
	`3`	`+ "@babel/preset-env",`
	`4`	`+ "@babel/preset-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`		`- 'env',`
`44`		`- 'react'`
	`43`	`+ "@babel/preset-env",`
	`44`	`+ "@babel/preset-react"`
`45`	`45`	`]`
`46`	`46`	`}`
`47`	`47`	`]`