diff --git a/NOTICE.txt b/NOTICE.txt index 1bdb441d..98d476f5 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -436,65 +436,27 @@ rendering paths, by Facebook, Inc. * LICENSE: -BSD License +MIT License -For React software +Copyright (c) 2013-present, Facebook, Inc. -Copyright (c) 2013-2015, Facebook, Inc. -All rights reserved. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - * Neither the name Facebook nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -The licensor of the React software also provides the following: - -Additional Grant of Patent Rights Version 2 - -"Software" means the React software distributed by Facebook, Inc. -Facebook, Inc. ("Facebook") hereby grants to each recipient of the Software -("you") a perpetual, worldwide, royalty-free, non-exclusive, irrevocable -(subject to the termination provision below) license under any Necessary -Claims, to make, have made, use, sell, offer to sell, import, and otherwise -transfer the Software. For avoidance of doubt, no license is granted under -Facebook's rights in any patent claims that are infringed by (i) modifications -to the Software made by you or any third party or (ii) the Software in -combination with any software or other technology. - -The license granted hereunder will terminate, automatically and without notice, -if you (or any of your subsidiaries, corporate affiliates or agents) initiate -directly or indirectly, or take a direct financial interest in, any Patent -Assertion: (i) against Facebook or any of its subsidiaries or corporate -affiliates, (ii) against any party if such Patent Assertion arises in whole or -in part from any software, technology, product or service of Facebook or any of -its subsidiaries or corporate affiliates, or (iii) against any party relating -to the Software. Notwithstanding the foregoing, if Facebook or any of its -subsidiaries or corporate affiliates files a lawsuit alleging patent -infringement against you in the first instance, and you respond by filing a -patent infringement counterclaim in that lawsuit against that party that is -unrelated to the Software, the license granted hereunder will not terminate -under section (i) of this paragraph due to such counterclaim. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. --- diff --git a/package.json b/package.json index d90e13ad..78b6c712 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "electron": "1.8.2", "electron-builder": "17.4.0", "electron-builder-squirrel-windows": "17.4.0", - "electron-connect": "^0.6.1", + "electron-connect": "^0.6.3", "eslint": "^4.18.0", "eslint-plugin-import": "^2.8.0", "eslint-plugin-react": "^7.7.0", diff --git a/src/browser/components/MainPage.jsx b/src/browser/components/MainPage.jsx index 16005dea..8a190527 100644 --- a/src/browser/components/MainPage.jsx +++ b/src/browser/components/MainPage.jsx @@ -3,7 +3,7 @@ const url = require('url'); const React = require('react'); const PropTypes = require('prop-types'); const createReactClass = require('create-react-class'); -const ReactCSSTransitionGroup = require('react-transition-group/CSSTransitionGroup'); +const {CSSTransition, TransitionGroup} = require('react-transition-group'); const {Grid, Row} = require('react-bootstrap'); const {ipcRenderer, remote} = require('electron'); @@ -363,18 +363,20 @@ const MainPage = createReactClass({ { tabsRow } { viewsRow } - + { (this.state.targetURL === '') ? null : - } - + + + + } +
{ modal }
diff --git a/src/browser/css/index.css b/src/browser/css/index.css index dbc1b374..e2287735 100644 --- a/src/browser/css/index.css +++ b/src/browser/css/index.css @@ -9,11 +9,11 @@ transition: opacity 300ms ease-in-out; } -.hovering-leave { +.hovering-exit { opacity: 1; } -.hovering-leave.hovering-leave-active { +.hovering-exit.hovering-exit-active { opacity: 0.01; transition: opacity 500ms ease-in-out; } diff --git a/src/package.json b/src/package.json index 8ff89017..d38369a0 100644 --- a/src/package.json +++ b/src/package.json @@ -9,18 +9,18 @@ "homepage": "https://about.mattermost.com", "license": "Apache-2.0", "dependencies": { - "auto-launch": "^5.0.1", + "auto-launch": "^5.0.5", "bootstrap": "^3.3.7", - "create-react-class": "^15.6.2", + "create-react-class": "^15.6.3", "electron-context-menu": "^0.9.0", - "electron-devtools-installer": "^2.2.1", + "electron-devtools-installer": "^2.2.3", "electron-is-dev": "^0.3.0", "electron-squirrel-startup": "^1.0.0", "prop-types": "^15.6.0", - "react": "^15.6.2", - "react-bootstrap": "~0.31.5", - "react-dom": "^15.6.2", - "react-transition-group": "^1.2.1", + "react": "^16.2.0", + "react-bootstrap": "~0.32.1", + "react-dom": "^16.2.0", + "react-transition-group": "^2.2.1", "simple-spellchecker": "git://github.com/jfmdev/simple-spellchecker.git#723062952a0290c6285aeaf02f14d9c74c41cadb", "underscore": "^1.8.3", "yargs": "^3.32.0" diff --git a/src/yarn.lock b/src/yarn.lock index a6362ec0..0ce3a614 100644 --- a/src/yarn.lock +++ b/src/yarn.lock @@ -18,15 +18,15 @@ asap@~2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" -auto-launch@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/auto-launch/-/auto-launch-5.0.1.tgz#2015a8a30384abe0e7f98cbdca8145cf154753ae" +auto-launch@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/auto-launch/-/auto-launch-5.0.5.tgz#d14bd002b1ef642f85e991a6195ff5300c8ad3c0" dependencies: applescript "^1.0.0" mkdirp "^0.5.1" path-is-absolute "^1.0.0" untildify "^3.0.2" - winreg "1.2.2" + winreg "1.2.4" babel-runtime@^6.11.6: version "6.26.0" @@ -107,17 +107,9 @@ core-js@^2.4.0: version "2.5.1" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b" -create-react-class@^15.6.0: - version "15.6.0" - resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.0.tgz#ab448497c26566e1e29413e883207d57cfe7bed4" - dependencies: - fbjs "^0.8.9" - loose-envify "^1.3.1" - object-assign "^4.1.1" - -create-react-class@^15.6.2: - version "15.6.2" - resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a" +create-react-class@^15.6.3: + version "15.6.3" + resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036" dependencies: fbjs "^0.8.9" loose-envify "^1.3.1" @@ -152,9 +144,9 @@ electron-context-menu@^0.9.0: electron-dl "^1.2.0" electron-is-dev "^0.1.1" -electron-devtools-installer@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-2.2.1.tgz#0beb73ccbf65cbc4d09e706cebda638f839b8c55" +electron-devtools-installer@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-2.2.3.tgz#58b9a4ec507377bc46e091cd43714188e0c369be" dependencies: "7zip" "0.0.6" cross-unzip "0.0.2" @@ -399,14 +391,14 @@ prop-types-extra@^1.0.1: dependencies: warning "^3.0.0" -prop-types@^15.5.10, prop-types@^15.5.6: +prop-types@^15.5.10: version "15.5.10" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154" dependencies: fbjs "^0.8.9" loose-envify "^1.3.1" -prop-types@^15.6.0: +prop-types@^15.5.8, prop-types@^15.6.0: version "15.6.0" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" dependencies: @@ -418,9 +410,9 @@ pupa@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/pupa/-/pupa-1.0.0.tgz#9a9568a5af7e657b8462a6e9d5328743560ceff6" -react-bootstrap@~0.31.5: - version "0.31.5" - resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-0.31.5.tgz#57040fa8b1274e1e074803c21a1b895fdabea05a" +react-bootstrap@~0.32.1: + version "0.32.1" + resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-0.32.1.tgz#60624c1b48a39d773ef6cce6421a4f33ecc166bb" dependencies: babel-runtime "^6.11.6" classnames "^2.2.5" @@ -429,48 +421,57 @@ react-bootstrap@~0.31.5: keycode "^2.1.2" prop-types "^15.5.10" prop-types-extra "^1.0.1" - react-overlays "^0.7.4" + react-overlays "^0.8.0" + react-prop-types "^0.4.0" + react-transition-group "^2.0.0" uncontrollable "^4.1.0" warning "^3.0.0" -react-dom@^15.6.2: - version "15.6.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730" +react-dom@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044" dependencies: - fbjs "^0.8.9" + fbjs "^0.8.16" loose-envify "^1.1.0" - object-assign "^4.1.0" - prop-types "^15.5.10" + object-assign "^4.1.1" + prop-types "^15.6.0" -react-overlays@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.7.4.tgz#ef2ec652c3444ab8aa014262b18f662068e56d5c" +react-overlays@^0.8.0: + version "0.8.3" + resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.8.3.tgz#fad65eea5b24301cca192a169f5dddb0b20d3ac5" dependencies: classnames "^2.2.5" dom-helpers "^3.2.1" prop-types "^15.5.10" prop-types-extra "^1.0.1" + react-transition-group "^2.2.0" warning "^3.0.0" -react-transition-group@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6" +react-prop-types@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/react-prop-types/-/react-prop-types-0.4.0.tgz#f99b0bfb4006929c9af2051e7c1414a5c75b93d0" + dependencies: + warning "^3.0.0" + +react-transition-group@^2.0.0, react-transition-group@^2.2.0, react-transition-group@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.2.1.tgz#e9fb677b79e6455fd391b03823afe84849df4a10" dependencies: chain-function "^1.0.0" + classnames "^2.2.5" dom-helpers "^3.2.0" loose-envify "^1.3.1" - prop-types "^15.5.6" + prop-types "^15.5.8" warning "^3.0.0" -react@^15.6.2: - version "15.6.2" - resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72" +react@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba" dependencies: - create-react-class "^15.6.0" - fbjs "^0.8.9" + fbjs "^0.8.16" loose-envify "^1.1.0" - object-assign "^4.1.0" - prop-types "^15.5.10" + object-assign "^4.1.1" + prop-types "^15.6.0" regenerator-runtime@^0.11.0: version "0.11.0" @@ -581,9 +582,9 @@ window-size@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" -winreg@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.2.tgz#8509afa3b71c5bbd110a6d7c6247ec67736c598f" +winreg@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz#ba065629b7a925130e15779108cf540990e98d1b" wrap-ansi@^2.0.0: version "2.1.0" diff --git a/test/specs/browser/settings_test.js b/test/specs/browser/settings_test.js index a9a2f6e3..ab8031f6 100644 --- a/test/specs/browser/settings_test.js +++ b/test/specs/browser/settings_test.js @@ -95,7 +95,7 @@ describe('browser/settings.html', function desc() { return this.app.client. loadSettingsPage(). click('h4=example'). - pause(100). + pause(1000). waitUntilWindowLoaded(). getUrl().then((url) => { url.should.match(/\/index.html(\?.+)?$/); @@ -109,7 +109,7 @@ describe('browser/settings.html', function desc() { loadSettingsPage(). click('h4=github'). - pause(100). + pause(1000). waitUntilWindowLoaded(). getUrl().then((url) => { url.should.match(/\/index.html(\?.+)?$/); diff --git a/yarn.lock b/yarn.lock index c52dd110..567f1736 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2209,9 +2209,9 @@ electron-chromedriver@~1.8.0: electron-download "^4.1.0" extract-zip "^1.6.5" -electron-connect@^0.6.1: - version "0.6.2" - resolved "https://registry.yarnpkg.com/electron-connect/-/electron-connect-0.6.2.tgz#83dc042ef26e2b6b3e1d0f44ec89ec4140646bc3" +electron-connect@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/electron-connect/-/electron-connect-0.6.3.tgz#2e0d361cb1c2b0b88e9bd385732882578b055b6d" dependencies: cross-spawn "^5.1.0" lodash "^4.17.4"