diff --git a/.eslintrc-webapp.json b/.eslintrc-webapp.json index 76196dfa..221956be 100644 --- a/.eslintrc-webapp.json +++ b/.eslintrc-webapp.json @@ -13,7 +13,8 @@ "parser": "babel-eslint", "plugins": [ "react", - "import" + "import", + "header" ], "env": { "browser": true, @@ -64,6 +65,7 @@ "generator-star-spacing": [2, {"before": false, "after": true}], "global-require": 2, "guard-for-in": 2, + "header/header": [2, "line", " Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.\n See LICENSE.txt for license information."], "id-blacklist": 0, "import/no-unresolved": 2, "import/order": ["error", {"newlines-between": "always-and-inside-groups", "groups": ["builtin", "external", ["internal", "parent"], "sibling", "index"]}], @@ -75,7 +77,6 @@ "linebreak-style": 2, "lines-around-comment": [2, { "beforeBlockComment": true, "beforeLineComment": true, "allowBlockStart": true, "allowBlockEnd": true }], "max-lines": [1, {"max": 450, "skipBlankLines": true, "skipComments": false}], - "max-nested-callbacks": [1, {"max":1}], "max-nested-callbacks": [2, {"max":2}], "max-statements-per-line": [2, {"max": 1}], "multiline-ternary": [1, "never"], @@ -251,7 +252,7 @@ "react/no-unused-prop-types": [1, {"skipShapeProps": true}], "react/prefer-es6-class": 2, "react/prefer-stateless-function": 0, - "react/prop-types": [2, { "ignore": ["match", "location", "history", "component"] }], + "react/prop-types": [2, { "ignore": ["location", "history", "component"] }], "react/require-default-props": 0, "react/require-optimization": 1, "react/require-render-return": 2, diff --git a/.eslintrc.json b/.eslintrc.json index f7c11e92..40b124ca 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -7,6 +7,11 @@ "import/resolver": "node" }, "rules": { + "header/header": [2, "line", [ + " Copyright (c) 2015-2016 Yuya Ochiai", + " Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.", + " See LICENSE.txt for license information." + ]], "import/no-commonjs": 2, "indent": [2, 2, {"SwitchCase": 0}], "no-console": 0, diff --git a/package.json b/package.json index 81e409a2..216acefe 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,8 @@ "check-build-config": "node -r babel-register scripts/check_build_config.js" }, "devDependencies": { - "7zip-bin": "^2.4.1", - "@storybook/react": "^3.4.1", + "7zip-bin": "^4.0.2", + "@storybook/react": "^3.4.6", "babel-core": "^6.26.3", "babel-eslint": "^8.2.3", "babel-loader": "^7.1.4", @@ -46,20 +46,21 @@ "babel-preset-env": "^1.7.0", "babel-preset-react": "^6.24.1", "chai": "^4.1.2", - "cross-env": "^5.1.3", + "cross-env": "^5.1.6", "css-loader": "^0.28.11", "devtron": "^1.4.0", "electron": "2.0.2", "electron-builder": "20.14.7", "electron-builder-squirrel-windows": "~20.14.0", "electron-connect": "^0.6.3", - "eslint": "^4.18.0", - "eslint-plugin-import": "^2.8.0", - "eslint-plugin-react": "^7.7.0", + "eslint": "^4.19.1", + "eslint-plugin-header": "^1.2.0", + "eslint-plugin-import": "^2.12.0", + "eslint-plugin-react": "^7.8.2", "file-loader": "^1.1.6", - "mocha": "^5.0.0", - "mocha-circleci-reporter": "0.0.2", - "npm-run-all": "^4.1.2", + "mocha": "^5.2.0", + "mocha-circleci-reporter": "0.0.3", + "npm-run-all": "^4.1.3", "react": "^16.2.0", "react-dom": "^16.2.0", "spectron": "~3.8.0", diff --git a/scripts/check_build_config.js b/scripts/check_build_config.js index 84bff2eb..8702c69f 100644 --- a/scripts/check_build_config.js +++ b/scripts/check_build_config.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. const buildConfig = require('../src/common/config/buildConfig'); function validateBuildConfig(config) { diff --git a/scripts/extract_dict.js b/scripts/extract_dict.js index 412c3dcc..51f62d8a 100644 --- a/scripts/extract_dict.js +++ b/scripts/extract_dict.js @@ -1,3 +1,7 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + /* eslint-disable no-process-exit */ const {spawn} = require('child_process'); diff --git a/scripts/manipulate_windows_zip.js b/scripts/manipulate_windows_zip.js index f8120541..98a1c57f 100644 --- a/scripts/manipulate_windows_zip.js +++ b/scripts/manipulate_windows_zip.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; const spawnSync = require('child_process').spawnSync; diff --git a/scripts/watch_main_and_preload.js b/scripts/watch_main_and_preload.js index f9f4bd51..ed06a796 100644 --- a/scripts/watch_main_and_preload.js +++ b/scripts/watch_main_and_preload.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. const webpack = require('webpack'); const electron = require('electron-connect').server.create({path: 'src'}); diff --git a/src/browser/components/AutoSaveIndicator.jsx b/src/browser/components/AutoSaveIndicator.jsx index c9a06032..278110a7 100644 --- a/src/browser/components/AutoSaveIndicator.jsx +++ b/src/browser/components/AutoSaveIndicator.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import React from 'react'; import PropTypes from 'prop-types'; import {Alert} from 'react-bootstrap'; diff --git a/src/browser/components/Button/Button.stories.jsx b/src/browser/components/Button/Button.stories.jsx index 5e92d205..1f935c83 100644 --- a/src/browser/components/Button/Button.stories.jsx +++ b/src/browser/components/Button/Button.stories.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import React from 'react'; import {storiesOf} from '@storybook/react'; diff --git a/src/browser/components/DestructiveConfirmModal.jsx b/src/browser/components/DestructiveConfirmModal.jsx index 1cc87054..3a1c8af5 100644 --- a/src/browser/components/DestructiveConfirmModal.jsx +++ b/src/browser/components/DestructiveConfirmModal.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import React from 'react'; import PropTypes from 'prop-types'; import {Button, Modal} from 'react-bootstrap'; diff --git a/src/browser/components/ErrorView.jsx b/src/browser/components/ErrorView.jsx index c6ef4643..51397b0f 100644 --- a/src/browser/components/ErrorView.jsx +++ b/src/browser/components/ErrorView.jsx @@ -1,3 +1,7 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + // ErrorCode: https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h import React from 'react'; diff --git a/src/browser/components/HoveringURL.jsx b/src/browser/components/HoveringURL.jsx index 23baa45a..d078b3e5 100644 --- a/src/browser/components/HoveringURL.jsx +++ b/src/browser/components/HoveringURL.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import React from 'react'; import PropTypes from 'prop-types'; diff --git a/src/browser/components/LoginModal.jsx b/src/browser/components/LoginModal.jsx index da4c9f16..feab213b 100644 --- a/src/browser/components/LoginModal.jsx +++ b/src/browser/components/LoginModal.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import React from 'react'; import PropTypes from 'prop-types'; import {findDOMNode} from 'react-dom'; diff --git a/src/browser/components/MainPage.jsx b/src/browser/components/MainPage.jsx index 9d17dcca..4ea84f4d 100644 --- a/src/browser/components/MainPage.jsx +++ b/src/browser/components/MainPage.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import url from 'url'; import React from 'react'; diff --git a/src/browser/components/MattermostView.jsx b/src/browser/components/MattermostView.jsx index 6c152729..133d8ea7 100644 --- a/src/browser/components/MattermostView.jsx +++ b/src/browser/components/MattermostView.jsx @@ -1,5 +1,10 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + /* eslint-disable react/no-set-state */ // setState() is necessary for this component + import url from 'url'; import React from 'react'; diff --git a/src/browser/components/NewTeamModal.jsx b/src/browser/components/NewTeamModal.jsx index c9ad04c4..61492092 100644 --- a/src/browser/components/NewTeamModal.jsx +++ b/src/browser/components/NewTeamModal.jsx @@ -1,3 +1,9 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +/* eslint react/no-deprecated: 1 */ + import React from 'react'; import PropTypes from 'prop-types'; import {Modal, Button, FormGroup, FormControl, ControlLabel, HelpBlock} from 'react-bootstrap'; diff --git a/src/browser/components/PermissionRequestDialog.jsx b/src/browser/components/PermissionRequestDialog.jsx index 0fc5eec4..1ca600ab 100644 --- a/src/browser/components/PermissionRequestDialog.jsx +++ b/src/browser/components/PermissionRequestDialog.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import React from 'react'; import PropTypes from 'prop-types'; import {Button, Glyphicon, Popover} from 'react-bootstrap'; diff --git a/src/browser/components/RemoveServerModal.jsx b/src/browser/components/RemoveServerModal.jsx index 2679071a..95e7b994 100644 --- a/src/browser/components/RemoveServerModal.jsx +++ b/src/browser/components/RemoveServerModal.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import React from 'react'; import PropTypes from 'prop-types'; import {Modal} from 'react-bootstrap'; diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx index 459db874..0d540183 100644 --- a/src/browser/components/SettingsPage.jsx +++ b/src/browser/components/SettingsPage.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import React from 'react'; import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; diff --git a/src/browser/components/TabBar.jsx b/src/browser/components/TabBar.jsx index 1b5f3c23..1df39088 100644 --- a/src/browser/components/TabBar.jsx +++ b/src/browser/components/TabBar.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import React from 'react'; import PropTypes from 'prop-types'; import {Glyphicon, Nav, NavItem, Overlay} from 'react-bootstrap'; diff --git a/src/browser/components/TeamList.jsx b/src/browser/components/TeamList.jsx index 0a936ee8..ff21df7b 100644 --- a/src/browser/components/TeamList.jsx +++ b/src/browser/components/TeamList.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import React from 'react'; import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; diff --git a/src/browser/components/TeamListItem.jsx b/src/browser/components/TeamListItem.jsx index 5e2d448e..f4160cb3 100644 --- a/src/browser/components/TeamListItem.jsx +++ b/src/browser/components/TeamListItem.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import React from 'react'; import PropTypes from 'prop-types'; diff --git a/src/browser/config/AppConfig.js b/src/browser/config/AppConfig.js index b569ad76..775eeeeb 100644 --- a/src/browser/config/AppConfig.js +++ b/src/browser/config/AppConfig.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import {remote} from 'electron'; import settings from '../../common/settings'; diff --git a/src/browser/index.jsx b/src/browser/index.jsx index da568923..784c3ece 100644 --- a/src/browser/index.jsx +++ b/src/browser/index.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; import './css/index.css'; diff --git a/src/browser/js/badge.js b/src/browser/js/badge.js index de2242c4..c32a21b2 100644 --- a/src/browser/js/badge.js +++ b/src/browser/js/badge.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; export function createDataURL(text) { diff --git a/src/browser/js/contextMenu.js b/src/browser/js/contextMenu.js index c4568b80..6c30dc8f 100644 --- a/src/browser/js/contextMenu.js +++ b/src/browser/js/contextMenu.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import {ipcRenderer} from 'electron'; import electronContextMenu from 'electron-context-menu'; diff --git a/src/browser/js/notification.js b/src/browser/js/notification.js index 366efa1d..797652b5 100644 --- a/src/browser/js/notification.js +++ b/src/browser/js/notification.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; const OriginalNotification = Notification; diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx index ce6a9310..7087898e 100644 --- a/src/browser/settings.jsx +++ b/src/browser/settings.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; import {remote} from 'electron'; diff --git a/src/browser/webview/mattermost.js b/src/browser/webview/mattermost.js index acd9a72a..77d1dbb7 100644 --- a/src/browser/webview/mattermost.js +++ b/src/browser/webview/mattermost.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; import {ipcRenderer, webFrame} from 'electron'; diff --git a/src/common/JsonFileManager.js b/src/common/JsonFileManager.js index a8d110bd..7d1b038a 100644 --- a/src/common/JsonFileManager.js +++ b/src/common/JsonFileManager.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import fs from 'fs'; export default class JsonFileManager { diff --git a/src/common/config/buildConfig.js b/src/common/config/buildConfig.js index c372b9f3..9962508c 100644 --- a/src/common/config/buildConfig.js +++ b/src/common/config/buildConfig.js @@ -1,3 +1,7 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + // For detailed guides, please refer to https://docs.mattermost.com/deployment/desktop-app-deployment.html /** diff --git a/src/common/config/defaultPreferences.js b/src/common/config/defaultPreferences.js index 15ce7cb3..3c0ca30b 100644 --- a/src/common/config/defaultPreferences.js +++ b/src/common/config/defaultPreferences.js @@ -1,3 +1,7 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + /** * Default user preferences. End-users can change these parameters by editing config.json * @param {number} version - Scheme version. (Not application version) diff --git a/src/common/config/pastDefaultPreferences.js b/src/common/config/pastDefaultPreferences.js index 01d2edde..20724f45 100644 --- a/src/common/config/pastDefaultPreferences.js +++ b/src/common/config/pastDefaultPreferences.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import defaultPreferences from './defaultPreferences'; const pastDefaultPreferences = { diff --git a/src/common/config/upgradePreferences.js b/src/common/config/upgradePreferences.js index c1e0e508..3e7b70fe 100644 --- a/src/common/config/upgradePreferences.js +++ b/src/common/config/upgradePreferences.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import pastDefaultPreferences from './pastDefaultPreferences'; function deepCopy(object) { diff --git a/src/common/deepmerge.js b/src/common/deepmerge.js index 905b4749..5a947f40 100644 --- a/src/common/deepmerge.js +++ b/src/common/deepmerge.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import deepmerge from 'deepmerge'; export default function deepMergeProxy(x, y, options) { diff --git a/src/common/osVersion.js b/src/common/osVersion.js index 048fc74e..978cf64e 100644 --- a/src/common/osVersion.js +++ b/src/common/osVersion.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; import os from 'os'; diff --git a/src/common/settings.js b/src/common/settings.js index 13704e31..e73dae90 100644 --- a/src/common/settings.js +++ b/src/common/settings.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; import fs from 'fs'; diff --git a/src/main.js b/src/main.js index c320af38..e6cfd1ea 100644 --- a/src/main.js +++ b/src/main.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; import os from 'os'; diff --git a/src/main/AppStateManager.js b/src/main/AppStateManager.js index c35e421d..847d3e13 100644 --- a/src/main/AppStateManager.js +++ b/src/main/AppStateManager.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import JsonFileManager from '../common/JsonFileManager'; export default class AppStateManager extends JsonFileManager { diff --git a/src/main/CriticalErrorHandler.js b/src/main/CriticalErrorHandler.js index 6789bb43..263188b8 100644 --- a/src/main/CriticalErrorHandler.js +++ b/src/main/CriticalErrorHandler.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import {spawn} from 'child_process'; import fs from 'fs'; import os from 'os'; diff --git a/src/main/PermissionManager.js b/src/main/PermissionManager.js index e78639d3..735b3c74 100644 --- a/src/main/PermissionManager.js +++ b/src/main/PermissionManager.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import fs from 'fs'; import utils from '../utils/util'; diff --git a/src/main/SpellChecker.js b/src/main/SpellChecker.js index 2ef77f36..06d44f4b 100644 --- a/src/main/SpellChecker.js +++ b/src/main/SpellChecker.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; import EventEmitter from 'events'; diff --git a/src/main/allowProtocolDialog.js b/src/main/allowProtocolDialog.js index 1fee8ed8..18308d9b 100644 --- a/src/main/allowProtocolDialog.js +++ b/src/main/allowProtocolDialog.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; import path from 'path'; diff --git a/src/main/certificateStore.js b/src/main/certificateStore.js index 069f6350..39119278 100644 --- a/src/main/certificateStore.js +++ b/src/main/certificateStore.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; import fs from 'fs'; diff --git a/src/main/cookieManager.js b/src/main/cookieManager.js index 2ac526a6..788cc4e3 100644 --- a/src/main/cookieManager.js +++ b/src/main/cookieManager.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import {app} from 'electron'; function flushCookiesStore(session) { diff --git a/src/main/downloadURL.js b/src/main/downloadURL.js index 3fa27699..199d6b5b 100644 --- a/src/main/downloadURL.js +++ b/src/main/downloadURL.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import fs from 'fs'; import path from 'path'; import zlib from 'zlib'; diff --git a/src/main/mainWindow.js b/src/main/mainWindow.js index e34ccc27..2b260789 100644 --- a/src/main/mainWindow.js +++ b/src/main/mainWindow.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import fs from 'fs'; import path from 'path'; diff --git a/src/main/menus/app.js b/src/main/menus/app.js index 8e53dd8f..6c819bf7 100644 --- a/src/main/menus/app.js +++ b/src/main/menus/app.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; import {app, dialog, Menu, shell} from 'electron'; diff --git a/src/main/menus/tray.js b/src/main/menus/tray.js index 25126f42..55bcb788 100644 --- a/src/main/menus/tray.js +++ b/src/main/menus/tray.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; import {app, Menu} from 'electron'; diff --git a/src/main/permissionRequestHandler.js b/src/main/permissionRequestHandler.js index 1424a406..63749bd3 100644 --- a/src/main/permissionRequestHandler.js +++ b/src/main/permissionRequestHandler.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import {URL} from 'url'; import {ipcMain} from 'electron'; diff --git a/src/main/squirrelStartup.js b/src/main/squirrelStartup.js index 7ee7fe76..a78b9195 100644 --- a/src/main/squirrelStartup.js +++ b/src/main/squirrelStartup.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import AutoLaunch from 'auto-launch'; import {app} from 'electron'; diff --git a/src/utils/util.js b/src/utils/util.js index e2da78a3..e016443f 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import url from 'url'; function getDomain(inputURL) { diff --git a/test/modules/environment.js b/test/modules/environment.js index c2e7be1d..79f169dc 100644 --- a/test/modules/environment.js +++ b/test/modules/environment.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; const fs = require('fs'); diff --git a/test/specs/app_test.js b/test/specs/app_test.js index 1f7be48c..6c830955 100644 --- a/test/specs/app_test.js +++ b/test/specs/app_test.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; const fs = require('fs'); diff --git a/test/specs/browser/index_test.js b/test/specs/browser/index_test.js index 8215ef66..460b47fe 100644 --- a/test/specs/browser/index_test.js +++ b/test/specs/browser/index_test.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; const fs = require('fs'); diff --git a/test/specs/browser/settings_test.js b/test/specs/browser/settings_test.js index 49651030..e275ec82 100644 --- a/test/specs/browser/settings_test.js +++ b/test/specs/browser/settings_test.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; const fs = require('fs'); diff --git a/test/specs/permisson_test.js b/test/specs/permisson_test.js index 4e804db7..ca30911a 100644 --- a/test/specs/permisson_test.js +++ b/test/specs/permisson_test.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import fs from 'fs'; import path from 'path'; diff --git a/test/specs/security_test.js b/test/specs/security_test.js index a11987c7..c1273aac 100644 --- a/test/specs/security_test.js +++ b/test/specs/security_test.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. 'use strict'; const path = require('path'); diff --git a/test/specs/settings_test.js b/test/specs/settings_test.js index 3f8f9f9b..448e102c 100644 --- a/test/specs/settings_test.js +++ b/test/specs/settings_test.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import settings from '../../src/common/settings'; import buildConfig from '../../src/common/config/buildConfig'; import defaultPreferences from '../../src/common/config/defaultPreferences'; diff --git a/test/specs/spellchecker_test.js b/test/specs/spellchecker_test.js index f02a2681..e396f167 100644 --- a/test/specs/spellchecker_test.js +++ b/test/specs/spellchecker_test.js @@ -1,3 +1,6 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import path from 'path'; import SpellChecker from '../../src/main/SpellChecker'; diff --git a/webpack.config.base.js b/webpack.config.base.js index edab4722..e4a47259 100644 --- a/webpack.config.base.js +++ b/webpack.config.base.js @@ -1,3 +1,7 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + /* eslint-disable import/no-commonjs */ 'use strict'; diff --git a/webpack.config.main.js b/webpack.config.main.js index 26564170..11e83e33 100644 --- a/webpack.config.main.js +++ b/webpack.config.main.js @@ -1,3 +1,7 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + /* eslint-disable import/no-commonjs */ 'use strict'; diff --git a/webpack.config.renderer.js b/webpack.config.renderer.js index 9629d610..973840d0 100644 --- a/webpack.config.renderer.js +++ b/webpack.config.renderer.js @@ -1,3 +1,7 @@ +// Copyright (c) 2015-2016 Yuya Ochiai +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + /* eslint-disable import/no-commonjs */ 'use strict'; diff --git a/yarn.lock b/yarn.lock index 0ff1cfda..020723d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,21 +10,13 @@ version "1.0.1" resolved "https://registry.yarnpkg.com/7zip-bin-mac/-/7zip-bin-mac-1.0.1.tgz#3e68778bbf0926adc68159427074505d47555c02" -"7zip-bin-win@~2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/7zip-bin-win/-/7zip-bin-win-2.1.1.tgz#8acfc28bb34e53a9476b46ae85a97418e6035c20" - "7zip-bin-win@~2.2.0": version "2.2.0" resolved "https://registry.yarnpkg.com/7zip-bin-win/-/7zip-bin-win-2.2.0.tgz#0b81c43e911100f3ece2ebac4f414ca95a572d5b" -"7zip-bin@^2.4.1": - version "2.4.1" - resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-2.4.1.tgz#88cf99736d35b104dab1d430c4edd1d51e58aade" - optionalDependencies: - "7zip-bin-linux" "~1.3.1" - "7zip-bin-mac" "~1.0.1" - "7zip-bin-win" "~2.1.1" +"7zip-bin@^4.0.2", "7zip-bin@~4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.0.2.tgz#6abbdc22f33cab742053777a26db2e25ca527179" "7zip-bin@~3.1.0": version "3.1.0" @@ -34,10 +26,6 @@ "7zip-bin-mac" "~1.0.1" "7zip-bin-win" "~2.2.0" -"7zip-bin@~4.0.2": - version "4.0.2" - resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.0.2.tgz#6abbdc22f33cab742053777a26db2e25ca527179" - "@babel/code-frame@7.0.0-beta.44": version "7.0.0-beta.44" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9" @@ -135,11 +123,11 @@ version "0.7.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" -"@storybook/addon-actions@3.4.1": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.4.1.tgz#6ec5dc337e4af301d2f0f8fbc0ad2dee812cfa29" +"@storybook/addon-actions@3.4.6": + version "3.4.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.4.6.tgz#70ca84a4754ea2969640428890d9a3c9369261f6" dependencies: - "@storybook/components" "3.4.1" + "@storybook/components" "3.4.6" babel-runtime "^6.26.0" deep-equal "^1.0.1" glamor "^2.20.40" @@ -150,52 +138,52 @@ react-inspector "^2.2.2" uuid "^3.2.1" -"@storybook/addon-links@3.4.1": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-3.4.1.tgz#b5c5e942b8865b2489d8d1537699316d0b154b1b" +"@storybook/addon-links@3.4.6": + version "3.4.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-3.4.6.tgz#0e167c03932ddfcbeba02215af1a420c0d3f0843" dependencies: - "@storybook/components" "3.4.1" + "@storybook/components" "3.4.6" babel-runtime "^6.26.0" global "^4.3.2" prop-types "^15.6.1" -"@storybook/addons@3.4.1": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-3.4.1.tgz#ff80dc65a87607681b811a8cc4ff92124643f5ac" +"@storybook/addons@3.4.6": + version "3.4.6" + resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-3.4.6.tgz#8275e46b8dfe7c751f2f18a431bc3339c999a2ae" -"@storybook/channel-postmessage@3.4.1": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-3.4.1.tgz#17a84b8df1613196554f0450733a0b13d0954907" +"@storybook/channel-postmessage@3.4.6": + version "3.4.6" + resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-3.4.6.tgz#acb7d6096bd060a3d224d7e753e33c22f21fabdb" dependencies: - "@storybook/channels" "3.4.1" + "@storybook/channels" "3.4.6" global "^4.3.2" json-stringify-safe "^5.0.1" -"@storybook/channels@3.4.1": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-3.4.1.tgz#13536c0211f0b49d24b63c5e7cef87b11ae43f85" +"@storybook/channels@3.4.6": + version "3.4.6" + resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-3.4.6.tgz#4147b4e171763f168cd523a3f83e7e125c9523c2" -"@storybook/client-logger@3.4.1": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-3.4.1.tgz#5b24ea0fa105f0683a5e9797a41466e4267d2c7f" +"@storybook/client-logger@3.4.6": + version "3.4.6" + resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-3.4.6.tgz#2f2b271d6825c7325f999f6b17d7ef69984faa18" -"@storybook/components@3.4.1": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@storybook/components/-/components-3.4.1.tgz#74e3bcf9590cb314a4845d2f3264aada79856c1f" +"@storybook/components@3.4.6": + version "3.4.6" + resolved "https://registry.yarnpkg.com/@storybook/components/-/components-3.4.6.tgz#34bddcfa21bddc59ef57a052d157285fab7ba003" dependencies: glamor "^2.20.40" glamorous "^4.12.1" prop-types "^15.6.1" -"@storybook/core@3.4.1": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@storybook/core/-/core-3.4.1.tgz#5ddbe754faa95c48ba272cfa30ca2e3272481aeb" +"@storybook/core@3.4.6": + version "3.4.6" + resolved "https://registry.yarnpkg.com/@storybook/core/-/core-3.4.6.tgz#3261dc89bff2c716579270da3f5cf83a374eca5c" dependencies: - "@storybook/addons" "3.4.1" - "@storybook/channel-postmessage" "3.4.1" - "@storybook/client-logger" "3.4.1" - "@storybook/node-logger" "3.4.1" - "@storybook/ui" "3.4.1" + "@storybook/addons" "3.4.6" + "@storybook/channel-postmessage" "3.4.6" + "@storybook/client-logger" "3.4.6" + "@storybook/node-logger" "3.4.6" + "@storybook/ui" "3.4.6" autoprefixer "^7.2.6" babel-runtime "^6.26.0" chalk "^2.3.2" @@ -217,7 +205,7 @@ url-loader "^0.6.2" webpack "^3.11.0" webpack-dev-middleware "^1.12.2" - webpack-hot-middleware "^2.21.2" + webpack-hot-middleware "^2.22.1" "@storybook/mantra-core@^1.7.2": version "1.7.2" @@ -227,9 +215,9 @@ "@storybook/react-simple-di" "^1.2.1" babel-runtime "6.x.x" -"@storybook/node-logger@3.4.1": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-3.4.1.tgz#d1bddbaa5bcf995b97d408e46c1c2125d04b6e58" +"@storybook/node-logger@3.4.6": + version "3.4.6" + resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-3.4.6.tgz#aed4f5bd102e033391584ef82bd3fec055659448" dependencies: npmlog "^4.1.2" @@ -265,18 +253,18 @@ dependencies: babel-runtime "^6.5.0" -"@storybook/react@^3.4.1": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@storybook/react/-/react-3.4.1.tgz#db2b1c7980d9ed084aff4e28c5017e182b04bf3d" +"@storybook/react@^3.4.6": + version "3.4.6" + resolved "https://registry.yarnpkg.com/@storybook/react/-/react-3.4.6.tgz#8bc0c1e10305d7539decb8f8c781b5970ff951ff" dependencies: - "@storybook/addon-actions" "3.4.1" - "@storybook/addon-links" "3.4.1" - "@storybook/addons" "3.4.1" - "@storybook/channel-postmessage" "3.4.1" - "@storybook/client-logger" "3.4.1" - "@storybook/core" "3.4.1" - "@storybook/node-logger" "3.4.1" - "@storybook/ui" "3.4.1" + "@storybook/addon-actions" "3.4.6" + "@storybook/addon-links" "3.4.6" + "@storybook/addons" "3.4.6" + "@storybook/channel-postmessage" "3.4.6" + "@storybook/client-logger" "3.4.6" + "@storybook/core" "3.4.6" + "@storybook/node-logger" "3.4.6" + "@storybook/ui" "3.4.6" airbnb-js-shims "^1.4.1" babel-loader "^7.1.4" babel-plugin-macros "^2.2.0" @@ -307,13 +295,13 @@ uglifyjs-webpack-plugin "^1.2.4" util-deprecate "^1.0.2" webpack "^3.11.0" - webpack-hot-middleware "^2.21.2" + webpack-hot-middleware "^2.22.1" -"@storybook/ui@3.4.1": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-3.4.1.tgz#2f0109d806d7922e45b7f4dea67584d61536df46" +"@storybook/ui@3.4.6": + version "3.4.6" + resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-3.4.6.tgz#c25c93d0843c4250b77b2a3614533a7d5790893d" dependencies: - "@storybook/components" "3.4.1" + "@storybook/components" "3.4.6" "@storybook/mantra-core" "^1.7.2" "@storybook/podda" "^1.2.3" "@storybook/react-komposer" "^2.0.3" @@ -507,9 +495,9 @@ acorn@^5.0.0: version "5.1.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.2.tgz#911cb53e036807cf0fa778dc5d370fbd864246d7" -acorn@^5.4.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102" +acorn@^5.5.0: + version "5.5.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9" address@1.0.3, address@^1.0.1: version "1.0.3" @@ -2140,9 +2128,9 @@ brorand@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" -browser-stdout@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f" +browser-stdout@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.0.8" @@ -2288,7 +2276,7 @@ builder-util@^5.11.0: stat-mode "^0.2.2" temp-file "^3.1.2" -builtin-modules@^1.0.0, builtin-modules@^1.1.1: +builtin-modules@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" @@ -2785,20 +2773,10 @@ combined-stream@^1.0.5, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" -commander@2.11.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" - -commander@2.15.x, commander@^2.15.0, commander@^2.9.0, commander@~2.15.0: +commander@2.15.1, commander@2.15.x, commander@^2.15.0, commander@^2.9.0, commander@~2.15.0: version "2.15.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" -commander@2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - dependencies: - graceful-readlink ">= 1.0.0" - commander@~2.14.1: version "2.14.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa" @@ -3030,9 +3008,9 @@ create-react-class@^15.6.2: loose-envify "^1.3.1" object-assign "^4.1.1" -cross-env@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.3.tgz#f8ae18faac87692b0a8b4d2f7000d4ec3a85dfd7" +cross-env@^5.1.6: + version "5.1.6" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.6.tgz#0dc05caf945b24e4b9e3b12871fe0e858d08b38d" dependencies: cross-spawn "^5.1.0" is-windows "^1.0.0" @@ -3045,7 +3023,7 @@ cross-spawn@5.1.0, cross-spawn@^5.0.1, cross-spawn@^5.1.0: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^6.0.5: +cross-spawn@^6.0.4, cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" dependencies: @@ -3421,15 +3399,7 @@ devtron@^1.4.0: highlight.js "^9.3.0" humanize-plus "^1.8.1" -diff@3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9" - -diff@3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75" - -diff@^3.3.1, diff@^3.5.0: +diff@3.5.0, diff@^3.3.1, diff@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" @@ -3987,31 +3957,35 @@ eslint-import-resolver-node@^0.3.1: debug "^2.6.9" resolve "^1.5.0" -eslint-module-utils@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz#abaec824177613b8a95b299639e1b6facf473449" +eslint-module-utils@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz#b270362cd88b1a48ad308976ce7fa54e98411746" dependencies: debug "^2.6.8" pkg-dir "^1.0.0" -eslint-plugin-import@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.8.0.tgz#fa1b6ef31fcb3c501c09859c1b86f1fc5b986894" +eslint-plugin-header@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-header/-/eslint-plugin-header-1.2.0.tgz#f704779c6fbc7c668f180d835de1f462b0467c37" + +eslint-plugin-import@^2.12.0: + version "2.12.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.12.0.tgz#dad31781292d6664b25317fd049d2e2b2f02205d" dependencies: - builtin-modules "^1.1.1" contains-path "^0.1.0" debug "^2.6.8" doctrine "1.5.0" eslint-import-resolver-node "^0.3.1" - eslint-module-utils "^2.1.1" + eslint-module-utils "^2.2.0" has "^1.0.1" - lodash.cond "^4.3.0" + lodash "^4.17.4" minimatch "^3.0.3" read-pkg-up "^2.0.0" + resolve "^1.6.0" -eslint-plugin-react@^7.7.0: - version "7.7.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz#f606c719dbd8a1a2b3d25c16299813878cca0160" +eslint-plugin-react@^7.8.2: + version "7.8.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.8.2.tgz#e95c9c47fece55d2303d1a67c9d01b930b88a51d" dependencies: doctrine "^2.0.2" has "^1.0.1" @@ -4029,9 +4003,9 @@ eslint-visitor-keys@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" -eslint@^4.18.0: - version "4.18.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.18.0.tgz#ebd0ba795af6dc59aa5cee17938160af5950e051" +eslint@^4.19.1: + version "4.19.1" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300" dependencies: ajv "^5.3.0" babel-code-frame "^6.22.0" @@ -4042,7 +4016,7 @@ eslint@^4.18.0: doctrine "^2.1.0" eslint-scope "^3.7.1" eslint-visitor-keys "^1.0.0" - espree "^3.5.2" + espree "^3.5.4" esquery "^1.0.0" esutils "^2.0.2" file-entry-cache "^2.0.0" @@ -4064,18 +4038,19 @@ eslint@^4.18.0: path-is-inside "^1.0.2" pluralize "^7.0.0" progress "^2.0.0" + regexpp "^1.0.1" require-uncached "^1.0.3" semver "^5.3.0" strip-ansi "^4.0.0" strip-json-comments "~2.0.1" - table "^4.0.1" + table "4.0.2" text-table "~0.2.0" -espree@^3.5.2: - version "3.5.3" - resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.3.tgz#931e0af64e7fbbed26b050a29daad1fc64799fa6" +espree@^3.5.4: + version "3.5.4" + resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7" dependencies: - acorn "^5.4.0" + acorn "^5.5.0" acorn-jsx "^3.0.0" esprima@^2.6.0: @@ -4825,17 +4800,6 @@ glob-to-regexp@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" -glob@7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.2" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@~7.1.1: version "7.1.2" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" @@ -4988,23 +4952,15 @@ graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - grouped-queue@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/grouped-queue/-/grouped-queue-0.3.3.tgz#c167d2a5319c5a0e0964ef6a25b7c2df8996c85c" dependencies: lodash "^4.17.2" -growl@1.10.3: - version "1.10.3" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f" - -growl@1.9.2: - version "1.9.2" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f" +growl@1.10.5: + version "1.10.5" + resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" gzip-size@3.0.0: version "3.0.0" @@ -5994,7 +5950,7 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" -json3@3.3.2, json3@^3.3.2: +json3@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1" @@ -6229,45 +6185,14 @@ lodash-es@^4.2.1: version "4.17.8" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.8.tgz#6fa8c8c5d337481df0bdf1c0d899d42473121e45" -lodash._baseassign@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e" - dependencies: - lodash._basecopy "^3.0.0" - lodash.keys "^3.0.0" - -lodash._basecopy@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" - -lodash._basecreate@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821" - lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" -lodash._isiterateecall@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c" - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" -lodash.cond@^4.3.0: - version "4.5.2" - resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5" - -lodash.create@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7" - dependencies: - lodash._baseassign "^3.0.0" - lodash._basecreate "^3.0.0" - lodash._isiterateecall "^3.0.0" - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -6288,7 +6213,7 @@ lodash.isplainobject@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" -lodash.keys@^3.0.0, lodash.keys@^3.1.2: +lodash.keys@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" dependencies: @@ -6670,7 +6595,7 @@ minimatch@3.0.3: dependencies: brace-expansion "^1.0.0" -minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: +minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: @@ -6739,52 +6664,38 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi dependencies: minimist "0.0.8" -mocha-circleci-reporter@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/mocha-circleci-reporter/-/mocha-circleci-reporter-0.0.2.tgz#6cbb3f1a1911ce2365e79461a156370b63790c7e" +mocha-circleci-reporter@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/mocha-circleci-reporter/-/mocha-circleci-reporter-0.0.3.tgz#5303d722cdb0390c2e03632517055c06146df6a0" dependencies: - mocha "^3.0.0" - mocha-junit-reporter "^1.12.0" + mocha "^5.1.1" + mocha-junit-reporter "^1.17.0" -mocha-junit-reporter@^1.12.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.13.0.tgz#030db8c530b244667253b03861d4cd336f7e56c8" +mocha-junit-reporter@^1.17.0: + version "1.17.0" + resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c" dependencies: debug "^2.2.0" md5 "^2.1.0" mkdirp "~0.5.1" + strip-ansi "^4.0.0" xml "^1.0.0" -mocha@^3.0.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.0.tgz#1328567d2717f997030f8006234bce9b8cd72465" +mocha@^5.1.1, mocha@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" dependencies: - browser-stdout "1.3.0" - commander "2.9.0" - debug "2.6.8" - diff "3.2.0" - escape-string-regexp "1.0.5" - glob "7.1.1" - growl "1.9.2" - json3 "3.3.2" - lodash.create "3.1.1" - mkdirp "0.5.1" - supports-color "3.1.2" - -mocha@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.0.0.tgz#cccac988b0bc5477119cba0e43de7af6d6ad8f4e" - dependencies: - browser-stdout "1.3.0" - commander "2.11.0" + browser-stdout "1.3.1" + commander "2.15.1" debug "3.1.0" - diff "3.3.1" + diff "3.5.0" escape-string-regexp "1.0.5" glob "7.1.2" - growl "1.10.3" + growl "1.10.5" he "1.1.1" + minimatch "3.0.4" mkdirp "0.5.1" - supports-color "4.4.0" + supports-color "5.4.0" move-concurrently@^1.0.1: version "1.0.1" @@ -7047,13 +6958,13 @@ npm-packlist@^1.1.6: ignore-walk "^3.0.1" npm-bundled "^1.0.1" -npm-run-all@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.2.tgz#90d62d078792d20669139e718621186656cea056" +npm-run-all@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.3.tgz#49f15b55a66bb4101664ce270cb18e7103f8f185" dependencies: ansi-styles "^3.2.0" chalk "^2.1.0" - cross-spawn "^5.1.0" + cross-spawn "^6.0.4" memorystream "^0.3.1" minimatch "^3.0.4" ps-tree "^1.1.0" @@ -8483,6 +8394,10 @@ regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" +regexpp@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab" + regexpu-core@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b" @@ -8653,6 +8568,12 @@ resolve@^1.5.0: dependencies: path-parse "^1.0.5" +resolve@^1.6.0: + version "1.7.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3" + dependencies: + path-parse "^1.0.5" + responselike@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -9433,17 +9354,11 @@ sumchecker@^2.0.1, sumchecker@^2.0.2: dependencies: debug "^2.2.0" -supports-color@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5" +supports-color@5.4.0, supports-color@^5.4.0: + version "5.4.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" dependencies: - has-flag "^1.0.0" - -supports-color@4.4.0, supports-color@^4.0.0, supports-color@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e" - dependencies: - has-flag "^2.0.0" + has-flag "^3.0.0" supports-color@^2.0.0: version "2.0.0" @@ -9455,6 +9370,12 @@ supports-color@^3.2.3, supports-color@~3.2.3: dependencies: has-flag "^1.0.0" +supports-color@^4.0.0, supports-color@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e" + dependencies: + has-flag "^2.0.0" + supports-color@^4.2.1: version "4.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" @@ -9473,12 +9394,6 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" -supports-color@^5.4.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" - dependencies: - has-flag "^3.0.0" - svg-tag-names@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/svg-tag-names/-/svg-tag-names-1.1.1.tgz#9641b29ef71025ee094c7043f7cdde7d99fbd50a" @@ -9503,7 +9418,7 @@ symbol-observable@^1.0.3, symbol-observable@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" -table@^4.0.1: +table@4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36" dependencies: @@ -10281,9 +10196,9 @@ webpack-dev-server@^3.1.4: webpack-log "^1.1.2" yargs "11.0.0" -webpack-hot-middleware@^2.21.2: - version "2.22.0" - resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.22.0.tgz#db58c9dd2bd78e7f3868cccb42a20d24b00a7ade" +webpack-hot-middleware@^2.22.1: + version "2.22.2" + resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.22.2.tgz#623b77ce591fcd4e1fb99f18167781443e50afac" dependencies: ansi-html "0.0.7" html-entities "^1.2.0"