diff --git a/.eslintrc b/.eslintrc index 99b2760d..5c4b0e8f 100644 --- a/.eslintrc +++ b/.eslintrc @@ -6,7 +6,10 @@ "plugin:import/warnings", "plugin:flowtype/recommended" ], - "plugins": ["prettier", "flowtype"], + "plugins": [ + "prettier", + "flowtype" + ], "rules": { "eqeqeq": 2, "no-unused-vars": 2, @@ -19,7 +22,9 @@ "import/no-unresolved": [ "error", { - "ignore": ["slate-drop-or-paste-images"] + "ignore": [ + "slate-drop-or-paste-images" + ] } ], // Flow @@ -30,8 +35,14 @@ "annotationStyle": "line" } ], - "flowtype/space-after-type-colon": [2, "always"], - "flowtype/space-before-type-colon": [2, "never"], + "flowtype/space-after-type-colon": [ + 2, + "always" + ], + "flowtype/space-before-type-colon": [ + 2, + "never" + ], // Enforce that code is formatted with prettier. "prettier/prettier": [ "error", @@ -43,7 +54,14 @@ ] }, "settings": { - "import/resolver": "webpack", + "import/resolver": { + "node": { + "paths": [ + "app", + "." + ] + } + }, "flowtype": { "onlyFilesWithFlowAnnotation": false } @@ -60,4 +78,4 @@ "afterAll": true, "Bugsnag": true } -} +} \ No newline at end of file diff --git a/app/components/DocumentList/DocumentList.js b/app/components/DocumentList/DocumentList.js index f44f7f79..a53a2de4 100644 --- a/app/components/DocumentList/DocumentList.js +++ b/app/components/DocumentList/DocumentList.js @@ -2,7 +2,7 @@ import React from 'react'; import Document from 'models/Document'; import DocumentPreview from 'components/DocumentPreview'; -import ArrowKeyNavigation from 'boundless-arrow-key-navigation/build'; +import ArrowKeyNavigation from 'boundless-arrow-key-navigation'; class DocumentList extends React.Component { props: { diff --git a/app/components/Editor/Editor.js b/app/components/Editor/Editor.js index c09a1417..41d5627f 100644 --- a/app/components/Editor/Editor.js +++ b/app/components/Editor/Editor.js @@ -24,12 +24,12 @@ import styled from 'styled-components'; type Props = { text: string, onChange: Change => *, - onSave: (redirect?: boolean) => *, - onCancel: () => void, - onImageUploadStart: () => void, - onImageUploadStop: () => void, - emoji ?: string, - readOnly: boolean, + onSave: (redirect?: boolean) => *, + onCancel: () => void, + onImageUploadStart: () => void, + onImageUploadStop: () => void, + emoji?: string, + readOnly: boolean, }; @observer @@ -216,13 +216,13 @@ class MarkdownEditor extends Component { }; } -const MaxWidth = styled(Flex) ` +const MaxWidth = styled(Flex)` margin: 0 60px; max-width: 46em; height: 100%; `; -const Header = styled(Flex) ` +const Header = styled(Flex)` height: 60px; flex-shrink: 0; align-items: flex-end; @@ -233,7 +233,7 @@ const Header = styled(Flex) ` } `; -const StyledEditor = styled(Editor) ` +const StyledEditor = styled(Editor)` font-weight: 400; font-size: 1em; line-height: 1.7em; diff --git a/app/components/Editor/components/Toolbar/Toolbar.js b/app/components/Editor/components/Toolbar/Toolbar.js index 27dd6651..227e6a59 100644 --- a/app/components/Editor/components/Toolbar/Toolbar.js +++ b/app/components/Editor/components/Toolbar/Toolbar.js @@ -6,7 +6,6 @@ import { Portal } from 'react-portal'; import { Editor, findDOMNode } from 'slate-react'; import { Node, Value } from 'slate'; import styled from 'styled-components'; -import _ from 'lodash'; import FormattingToolbar from './components/FormattingToolbar'; import LinkToolbar from './components/LinkToolbar'; diff --git a/app/components/Editor/components/Toolbar/components/LinkToolbar.js b/app/components/Editor/components/Toolbar/components/LinkToolbar.js index 4a92f42b..9a396668 100644 --- a/app/components/Editor/components/Toolbar/components/LinkToolbar.js +++ b/app/components/Editor/components/Toolbar/components/LinkToolbar.js @@ -7,7 +7,7 @@ import { withRouter } from 'react-router-dom'; import { Node } from 'slate'; import { Editor } from 'slate-react'; import styled from 'styled-components'; -import ArrowKeyNavigation from 'boundless-arrow-key-navigation/build'; +import ArrowKeyNavigation from 'boundless-arrow-key-navigation'; import ToolbarButton from './ToolbarButton'; import DocumentResult from './DocumentResult'; import DocumentsStore from 'stores/DocumentsStore'; diff --git a/app/components/ErrorBoundary/ErrorBoundary.js b/app/components/ErrorBoundary/ErrorBoundary.js index f34df8fa..6da0c7b3 100644 --- a/app/components/ErrorBoundary/ErrorBoundary.js +++ b/app/components/ErrorBoundary/ErrorBoundary.js @@ -32,7 +32,12 @@ class ErrorBoundary extends Component { return ( -

🛸 Something unexpected happened

+

+ + 🛸 + {' '} + Something unexpected happened +

An unrecoverable error occurred{window.Bugsnag || (true && ' and our engineers have been notified')}. Please try{' '} diff --git a/app/components/Sidebar/components/Collections.js b/app/components/Sidebar/components/Collections.js index 0ad66df5..a4fdbcd0 100644 --- a/app/components/Sidebar/components/Collections.js +++ b/app/components/Sidebar/components/Collections.js @@ -166,6 +166,7 @@ const DocumentLink = observer( activeDocumentRef, prefetchDocument, depth, + history, }: DocumentLinkProps) => { const isActiveDocument = activeDocument && activeDocument.id === document.id; diff --git a/app/models/Collection.js b/app/models/Collection.js index 1516e77f..ba7e6468 100644 --- a/app/models/Collection.js +++ b/app/models/Collection.js @@ -1,7 +1,6 @@ // @flow import { extendObservable, action, computed, runInAction } from 'mobx'; import invariant from 'invariant'; -import _ from 'lodash'; import BaseModel from 'models/BaseModel'; import { client } from 'utils/ApiClient'; diff --git a/app/scenes/Document/Document.js b/app/scenes/Document/Document.js index eea6bcf2..7634110f 100644 --- a/app/scenes/Document/Document.js +++ b/app/scenes/Document/Document.js @@ -25,7 +25,6 @@ import DocumentsStore from 'stores/DocumentsStore'; import CollectionsStore from 'stores/CollectionsStore'; import DocumentMenu from 'menus/DocumentMenu'; import SaveAction from './components/SaveAction'; -import type EditorType from 'components/Editor'; import LoadingPlaceholder from 'components/LoadingPlaceholder'; import LoadingIndicator from 'components/LoadingIndicator'; import Collaborators from 'components/Collaborators'; @@ -238,77 +237,77 @@ class DocumentScene extends Component { ) : ( - - {this.isEditing && ( - - )} - + {this.isEditing && ( + - - {!isNew && - !this.isEditing && } - - {this.isEditing ? ( - - ) : ( - Edit - )} - - {this.isEditing && ( - - Discard - + )} + + + {!isNew && + !this.isEditing && } + + {this.isEditing ? ( + + ) : ( + Edit )} + + {this.isEditing && ( + + Discard + + )} + {!this.isEditing && ( + + + + )} + {!this.isEditing && } + {!this.isEditing && ( - - - + + + )} - {!this.isEditing && } - - {!this.isEditing && ( - - - - )} - - - - )} + + + + )} ); } } -const Container = styled(Flex) ` +const Container = styled(Flex)` position: relative; `; -const LoadingState = styled(LoadingPlaceholder) ` +const LoadingState = styled(LoadingPlaceholder)` margin: 90px 0; `; diff --git a/app/scenes/Document/components/DocumentMove/DocumentMove.js b/app/scenes/Document/components/DocumentMove/DocumentMove.js index 435d559c..d993b8d2 100644 --- a/app/scenes/Document/components/DocumentMove/DocumentMove.js +++ b/app/scenes/Document/components/DocumentMove/DocumentMove.js @@ -5,7 +5,7 @@ import { observable, computed } from 'mobx'; import { observer, inject } from 'mobx-react'; import { withRouter } from 'react-router-dom'; import { Search } from 'js-search'; -import ArrowKeyNavigation from 'boundless-arrow-key-navigation/build'; +import ArrowKeyNavigation from 'boundless-arrow-key-navigation'; import _ from 'lodash'; import styled from 'styled-components'; import { size } from 'shared/styles/constants'; diff --git a/app/scenes/Document/components/DocumentMove/components/PathToDocument.js b/app/scenes/Document/components/DocumentMove/components/PathToDocument.js index a8586951..e6bcab84 100644 --- a/app/scenes/Document/components/DocumentMove/components/PathToDocument.js +++ b/app/scenes/Document/components/DocumentMove/components/PathToDocument.js @@ -2,7 +2,6 @@ import React from 'react'; import { observer } from 'mobx-react'; import invariant from 'invariant'; -import _ from 'lodash'; import styled from 'styled-components'; import { color } from 'shared/styles/constants'; diff --git a/app/scenes/Search/Search.js b/app/scenes/Search/Search.js index 3ba16b93..8766e378 100644 --- a/app/scenes/Search/Search.js +++ b/app/scenes/Search/Search.js @@ -13,7 +13,7 @@ import DocumentsStore, { import { withRouter } from 'react-router-dom'; import { searchUrl } from 'utils/routeHelpers'; import styled from 'styled-components'; -import ArrowKeyNavigation from 'boundless-arrow-key-navigation/build'; +import ArrowKeyNavigation from 'boundless-arrow-key-navigation'; import Empty from 'components/Empty'; import Flex from 'shared/components/Flex'; diff --git a/package.json b/package.json index 351032bb..6b55a3d2 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "main": "index.js", "scripts": { "clean": "rimraf dist", - "build:webpack": "NODE_ENV=production webpack --config config/webpack.prod.js", - "build:analyze": "NODE_ENV=production webpack --config config/webpack.prod.js --json > stats.json", + "build:webpack": "NODE_ENV=production webpack --config webpack.config.prod.js", + "build:analyze": "NODE_ENV=production webpack --config webpack.config.prod.js --json > stats.json", "build": "npm run clean && npm run build:webpack", "start": "NODE_ENV=production node index.js", "dev": "NODE_ENV=development nodemon --watch server index.js", @@ -49,7 +49,7 @@ ], "setupFiles": [ "raf/polyfill", - "/config/setupJest.js", + "/setupJest.js", "/__mocks__/window.js" ] }, @@ -92,10 +92,9 @@ "emoji-regex": "^6.5.1", "eslint": "^4.14.0", "eslint-config-react-app": "^2.0.1", - "eslint-import-resolver-webpack": "^0.8.3", "eslint-plugin-flowtype": "^2.40.1", "eslint-plugin-import": "^2.8.0", - "eslint-plugin-jsx-a11y": "^6.0.3", + "eslint-plugin-jsx-a11y": "5.1.1", "eslint-plugin-prettier": "^2.4.0", "eslint-plugin-react": "^7.5.1", "exports-loader": "^0.6.4", @@ -203,4 +202,4 @@ "raf": "^3.4.0", "react-test-renderer": "^16.1.0" } -} +} \ No newline at end of file diff --git a/server/index.js b/server/index.js index 3813b4e1..dd5c13a7 100644 --- a/server/index.js +++ b/server/index.js @@ -21,7 +21,7 @@ if (process.env.NODE_ENV === 'development') { const webpack = require('webpack'); const devMiddleware = require('koa-webpack-dev-middleware'); const hotMiddleware = require('koa-webpack-hot-middleware'); - const config = require('../config/webpack.dev'); + const config = require('../webpack.config.dev'); const compile = webpack(config); /* eslint-enable global-require */ diff --git a/config/setupJest.js b/setupJest.js similarity index 100% rename from config/setupJest.js rename to setupJest.js diff --git a/config/webpack.dev.js b/webpack.config.dev.js similarity index 92% rename from config/webpack.dev.js rename to webpack.config.dev.js index 42a0689c..94519629 100644 --- a/config/webpack.dev.js +++ b/webpack.config.dev.js @@ -3,7 +3,7 @@ var webpack = require('webpack'); var HtmlWebpackPlugin = require('html-webpack-plugin'); var ExtractTextPlugin = require('extract-text-webpack-plugin'); -const commonWebpackConfig = require('./webpack.base'); +const commonWebpackConfig = require('./webpack.config'); const developmentWebpackConfig = Object.assign(commonWebpackConfig, { cache: true, diff --git a/config/webpack.base.js b/webpack.config.js similarity index 90% rename from config/webpack.base.js rename to webpack.config.js index 44962f5b..6910b2e8 100644 --- a/config/webpack.base.js +++ b/webpack.config.js @@ -32,8 +32,8 @@ module.exports = { test: /\.js$/, loader: 'babel-loader', include: [ - path.join(__dirname, '../app'), - path.join(__dirname, '../shared'), + path.join(__dirname, 'app'), + path.join(__dirname, 'shared'), ], }, { test: /\.json$/, loader: 'json-loader' }, @@ -57,11 +57,12 @@ module.exports = { }, resolve: { modules: [ - path.resolve(__dirname, '../app'), + path.resolve(__dirname, 'app'), 'node_modules' ], alias: { - shared: path.resolve(__dirname, '../shared'), + shared: path.resolve(__dirname, 'shared'), + 'boundless-arrow-key-navigation': 'boundless-arrow-key-navigation/build', 'boundless-utils-omit-keys': 'boundless-utils-omit-keys/build', 'boundless-utils-uuid': 'boundless-utils-uuid/build' } diff --git a/config/webpack.prod.js b/webpack.config.prod.js similarity index 95% rename from config/webpack.prod.js rename to webpack.config.prod.js index 799b5c18..2b550542 100644 --- a/config/webpack.prod.js +++ b/webpack.config.prod.js @@ -4,7 +4,7 @@ var webpack = require('webpack'); var HtmlWebpackPlugin = require('html-webpack-plugin'); var ExtractTextPlugin = require('extract-text-webpack-plugin'); -commonWebpackConfig = require('./webpack.base'); +commonWebpackConfig = require('./webpack.config'); productionWebpackConfig = Object.assign(commonWebpackConfig, { cache: true, diff --git a/yarn.lock b/yarn.lock index 43ce308c..87ec8595 100644 --- a/yarn.lock +++ b/yarn.lock @@ -311,10 +311,6 @@ array-find-index@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" -array-find@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-find/-/array-find-1.0.0.tgz#6c8e286d11ed768327f8e62ecee87353ca3e78b8" - array-includes@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" @@ -1361,12 +1357,6 @@ browserify-sign@^4.0.0: inherits "^2.0.1" parse-asn1 "^5.0.0" -browserify-zlib@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d" - dependencies: - pako "~0.2.0" - browserify-zlib@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" @@ -2775,14 +2765,6 @@ enhanced-resolve@^3.4.0: object-assign "^4.0.1" tapable "^0.2.7" -enhanced-resolve@~0.9.0: - version "0.9.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz#4d6e689b3725f86090927ccc86cd9f1635b89e2e" - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.2.0" - tapable "^0.1.8" - entities@^1.1.1, entities@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" @@ -2982,22 +2964,6 @@ eslint-import-resolver-node@^0.3.1: debug "^2.6.8" resolve "^1.2.0" -eslint-import-resolver-webpack@^0.8.3: - version "0.8.3" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.8.3.tgz#ad61e28df378a474459d953f246fd43f92675385" - dependencies: - array-find "^1.0.0" - debug "^2.6.8" - enhanced-resolve "~0.9.0" - find-root "^0.1.1" - has "^1.0.1" - interpret "^1.0.0" - is-absolute "^0.2.3" - lodash.get "^3.7.0" - node-libs-browser "^1.0.0" - resolve "^1.2.0" - semver "^5.3.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" @@ -3026,9 +2992,9 @@ eslint-plugin-import@^2.8.0: minimatch "^3.0.3" read-pkg-up "^2.0.0" -eslint-plugin-jsx-a11y@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.0.3.tgz#54583d1ae442483162e040e13cc31865465100e5" +eslint-plugin-jsx-a11y@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-5.1.1.tgz#5c96bb5186ca14e94db1095ff59b3e2bd94069b1" dependencies: aria-query "^0.7.0" array-includes "^3.0.3" @@ -3036,7 +3002,7 @@ eslint-plugin-jsx-a11y@^6.0.3: axobject-query "^0.1.0" damerau-levenshtein "^1.0.0" emoji-regex "^6.1.0" - jsx-ast-utils "^2.0.0" + jsx-ast-utils "^1.4.0" eslint-plugin-prettier@^2.4.0: version "2.4.0" @@ -3488,10 +3454,6 @@ find-index@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4" -find-root@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/find-root/-/find-root-0.1.2.tgz#98d2267cff1916ccaf2743b3a0eea81d79d7dcd1" - find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -4374,10 +4336,6 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" -https-browserify@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82" - https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" @@ -5463,6 +5421,10 @@ jstransform@~3.0.0: esprima-fb "~3001.1.0-dev-harmony-fb" source-map "0.1.31" +jsx-ast-utils@^1.4.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1" + jsx-ast-utils@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f" @@ -5859,10 +5821,6 @@ lodash._basefor@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/lodash._basefor/-/lodash._basefor-3.0.3.tgz#7550b4e9218ef09fad24343b612021c79b4c20c2" -lodash._baseget@^3.0.0: - version "3.7.2" - resolved "https://registry.yarnpkg.com/lodash._baseget/-/lodash._baseget-3.7.2.tgz#1b6ae1d5facf3c25532350a13c1197cb8bb674f4" - lodash._basetostring@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5" @@ -5907,12 +5865,6 @@ lodash._root@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" -lodash._topath@^3.0.0: - version "3.8.1" - resolved "https://registry.yarnpkg.com/lodash._topath/-/lodash._topath-3.8.1.tgz#3ec5e2606014f4cb97f755fe6914edd8bfc00eac" - dependencies: - lodash.isarray "^3.0.0" - lodash.assign@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa" @@ -5993,13 +5945,6 @@ lodash.foreach@^4.3.0, lodash.foreach@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" -lodash.get@^3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-3.7.0.tgz#3ce68ae2c91683b281cc5394128303cbf75e691f" - dependencies: - lodash._baseget "^3.0.0" - lodash._topath "^3.0.0" - lodash.isarguments@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" @@ -6311,10 +6256,6 @@ memoizee@^0.4.3: next-tick "1" timers-ext "^0.1.2" -memory-fs@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290" - memory-fs@^0.4.0, memory-fs@~0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" @@ -6641,34 +6582,6 @@ node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" -node-libs-browser@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-1.1.1.tgz#2a38243abedd7dffcd07a97c9aca5668975a6fea" - dependencies: - assert "^1.1.1" - browserify-zlib "^0.1.4" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^1.0.0" - https-browserify "0.0.1" - os-browserify "^0.2.0" - path-browserify "0.0.0" - process "^0.11.0" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.0.5" - stream-browserify "^2.0.1" - stream-http "^2.3.1" - string_decoder "^0.10.25" - timers-browserify "^1.4.2" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.10.3" - vm-browserify "0.0.4" - node-libs-browser@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df" @@ -7041,10 +6954,6 @@ ordered-read-streams@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126" -os-browserify@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f" - os-browserify@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" @@ -7129,10 +7038,6 @@ packet-reader@0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz#cd62e60af8d7fea8a705ec4ff990871c46871f27" -pako@~0.2.0: - version "0.2.9" - resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" - pako@~1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258" @@ -7709,7 +7614,7 @@ process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" -process@^0.11.0, process@^0.11.10, process@~0.11.0: +process@^0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" @@ -8115,7 +8020,7 @@ readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0 isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.3.3: +readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" dependencies: @@ -9079,7 +8984,7 @@ stream-counter@~0.2.0: dependencies: readable-stream "~1.1.8" -stream-http@^2.3.1, stream-http@^2.7.2: +stream-http@^2.7.2: version "2.7.2" resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad" dependencies: @@ -9141,16 +9046,16 @@ string-width@^2.0.0, string-width@^2.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string_decoder@^0.10.25, string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - string_decoder@^1.0.0, string_decoder@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" dependencies: safe-buffer "~5.1.0" +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + stringstream@~0.0.4, stringstream@~0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" @@ -9303,10 +9208,6 @@ table@^4.0.1: slice-ansi "0.0.4" string-width "^2.0.0" -tapable@^0.1.8: - version "0.1.10" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4" - tapable@^0.2.7: version "0.2.8" resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22" @@ -9414,12 +9315,6 @@ timed-out@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" -timers-browserify@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d" - dependencies: - process "~0.11.0" - timers-browserify@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.4.tgz#96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6"