From ba879ac50d1a9795b68f83276502c9ef9e2fa1d3 Mon Sep 17 00:00:00 2001 From: Guilherme Miranda Date: Tue, 28 Nov 2017 21:14:47 +0000 Subject: [PATCH] monorepo using yarn workspaces problem: create-react-app does not support compiling files outside 'src'. Building draft-js*-plugin everytime it changes in development is not a good flow, so holding this for now https://github.com/facebookincubator/create-react-app/issues/1107 --- .gitignore | 2 +- package.json | 24 ++------- packages/dolphino-app/package.json | 28 +++++++++++ .../dolphino-app/public}/favicon.ico | Bin .../dolphino-app/public}/index.html | 0 .../dolphino-app/public}/manifest.json | 0 {src => packages/dolphino-app/src}/App.css | 8 ++- {src => packages/dolphino-app/src}/App.js | 0 packages/dolphino-app/src/App.test.js | 8 +++ .../DolphinoEditor/DolphinoEditor.js | 4 +- .../DolphinoEditor/plugins/highlightPlugin.js | 29 +++++++++++ .../plugins/withWindowClickClose.js | 0 .../dolphino-app/src}/components/index.js | 0 {src => packages/dolphino-app/src}/index.css | 0 packages/dolphino-app/src/index.js | 8 +++ {src => packages/dolphino-app/src}/logo.svg | 0 .../src}/registerServiceWorker.js | 44 ++++++++-------- .../draft-js-color-picker-plugin/package.json | 11 ++++ .../src}/ColorPicker.js | 0 .../src}/ColorPickerButton.js | 0 .../src}/colors.js | 0 .../src}/index.js | 11 ++-- .../draft-js-prism-decorator-plugin}/index.js | 0 .../index.test.js | 0 .../package.json | 11 ++++ src/App.test.js | 8 --- src/index.js | 8 --- yarn.lock | 47 +++++++----------- 28 files changed, 156 insertions(+), 95 deletions(-) create mode 100644 packages/dolphino-app/package.json rename {public => packages/dolphino-app/public}/favicon.ico (100%) rename {public => packages/dolphino-app/public}/index.html (100%) rename {public => packages/dolphino-app/public}/manifest.json (100%) rename {src => packages/dolphino-app/src}/App.css (78%) rename {src => packages/dolphino-app/src}/App.js (100%) create mode 100644 packages/dolphino-app/src/App.test.js rename {src => packages/dolphino-app/src}/components/DolphinoEditor/DolphinoEditor.js (94%) create mode 100644 packages/dolphino-app/src/components/DolphinoEditor/plugins/highlightPlugin.js rename {src => packages/dolphino-app/src}/components/DolphinoEditor/plugins/withWindowClickClose.js (100%) rename {src => packages/dolphino-app/src}/components/index.js (100%) rename {src => packages/dolphino-app/src}/index.css (100%) create mode 100644 packages/dolphino-app/src/index.js rename {src => packages/dolphino-app/src}/logo.svg (100%) rename {src => packages/dolphino-app/src}/registerServiceWorker.js (89%) create mode 100644 packages/draft-js-color-picker-plugin/package.json rename {src/components/DolphinoEditor/plugins/color-picker-plugin => packages/draft-js-color-picker-plugin/src}/ColorPicker.js (100%) rename {src/components/DolphinoEditor/plugins/color-picker-plugin => packages/draft-js-color-picker-plugin/src}/ColorPickerButton.js (100%) rename {src/components/DolphinoEditor/plugins/color-picker-plugin => packages/draft-js-color-picker-plugin/src}/colors.js (100%) rename {src/components/DolphinoEditor/plugins/color-picker-plugin => packages/draft-js-color-picker-plugin/src}/index.js (91%) rename {src/components/DolphinoEditor/plugins/prism-plugin => packages/draft-js-prism-decorator-plugin}/index.js (100%) rename {src/components/DolphinoEditor/plugins/prism-plugin => packages/draft-js-prism-decorator-plugin}/index.test.js (100%) create mode 100644 packages/draft-js-prism-decorator-plugin/package.json delete mode 100644 src/App.test.js delete mode 100644 src/index.js diff --git a/.gitignore b/.gitignore index d30f40e..8a0a00f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # See https://help.github.com/ignore-files/ for more about ignoring files. # dependencies -/node_modules +node_modules # testing /coverage diff --git a/package.json b/package.json index 7b8c175..b217f8d 100644 --- a/package.json +++ b/package.json @@ -1,20 +1,7 @@ { - "name": "dolphino", - "version": "0.2.0", "private": true, "homepage": "https://guilhermecvm.github.io/dolphino", - "dependencies": { - "draft-js": "^0.10.4", - "draft-js-buttons": "^2.0.1", - "draft-js-markdown-plugin": "^1.1.0", - "draft-js-plugins-editor": "^2.0.1", - "draft-js-prism": "^1.0.5", - "draft-js-static-toolbar-plugin": "^2.0.1", - "prismjs": "^1.8.4", - "react": "^16.1.0", - "react-dom": "^16.1.0", - "react-scripts": "1.0.17" - }, + "workspaces": ["packages/*"], "devDependencies": { "gh-pages": "^1.0.0", "husky": "^0.14.3", @@ -23,16 +10,15 @@ "prop-types": "^15.6.0" }, "scripts": { - "start": "react-scripts start", - "build": "react-scripts build", - "test": "react-scripts test --env=jsdom", - "eject": "react-scripts eject", + "start": "yarn --cwd packages/dolphino-app start", + "build": "yarn --cwd packages/dolphino-app build", + "test": "yarn --cwd packages/dolphino-app test", "deploy": "gh-pages -d build", "predeploy": "yarn run build", "precommit": "lint-staged" }, "lint-staged": { - "src/**/*.{js,jsx,json,css}": [ + "packages/**/*.{js,jsx,json,css}": [ "prettier --single-quote --no-semi --trailing-comma es5 --write", "git add" ] diff --git a/packages/dolphino-app/package.json b/packages/dolphino-app/package.json new file mode 100644 index 0000000..79a871c --- /dev/null +++ b/packages/dolphino-app/package.json @@ -0,0 +1,28 @@ +{ + "name": "dolphino-app", + "version": "0.2.0", + "private": true, + "dependencies": { + "draft-js": "^0.10.4", + "draft-js-buttons": "^2.0.1", + "draft-js-color-picker-plugin": "^0.2.0", + "draft-js-markdown-plugin": "^1.1.0", + "draft-js-plugins-editor": "^2.0.1", + "draft-js-prism": "^1.0.5", + "draft-js-prism-decorator-plugin": "^0.2.0", + "draft-js-static-toolbar-plugin": "^2.0.1", + "prismjs": "^1.8.4", + "react": "^16.1.0", + "react-dom": "^16.1.0", + "react-scripts": "1.0.17" + }, + "devDependencies": { + "prop-types": "^15.6.0" + }, + "scripts": { + "start": "react-scripts start", + "build": "react-scripts build", + "test": "react-scripts test --env=jsdom", + "eject": "react-scripts eject" + } +} diff --git a/public/favicon.ico b/packages/dolphino-app/public/favicon.ico similarity index 100% rename from public/favicon.ico rename to packages/dolphino-app/public/favicon.ico diff --git a/public/index.html b/packages/dolphino-app/public/index.html similarity index 100% rename from public/index.html rename to packages/dolphino-app/public/index.html diff --git a/public/manifest.json b/packages/dolphino-app/public/manifest.json similarity index 100% rename from public/manifest.json rename to packages/dolphino-app/public/manifest.json diff --git a/src/App.css b/packages/dolphino-app/src/App.css similarity index 78% rename from src/App.css rename to packages/dolphino-app/src/App.css index c5c6e8a..31be39d 100644 --- a/src/App.css +++ b/packages/dolphino-app/src/App.css @@ -23,6 +23,10 @@ } @keyframes App-logo-spin { - from { transform: rotate(0deg); } - to { transform: rotate(360deg); } + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } } diff --git a/src/App.js b/packages/dolphino-app/src/App.js similarity index 100% rename from src/App.js rename to packages/dolphino-app/src/App.js diff --git a/packages/dolphino-app/src/App.test.js b/packages/dolphino-app/src/App.test.js new file mode 100644 index 0000000..76d121e --- /dev/null +++ b/packages/dolphino-app/src/App.test.js @@ -0,0 +1,8 @@ +import React from 'react' +import ReactDOM from 'react-dom' +import App from './App' + +it('renders without crashing', () => { + const div = document.createElement('div') + ReactDOM.render(, div) +}) diff --git a/src/components/DolphinoEditor/DolphinoEditor.js b/packages/dolphino-app/src/components/DolphinoEditor/DolphinoEditor.js similarity index 94% rename from src/components/DolphinoEditor/DolphinoEditor.js rename to packages/dolphino-app/src/components/DolphinoEditor/DolphinoEditor.js index adb9bf1..1f1e25c 100644 --- a/src/components/DolphinoEditor/DolphinoEditor.js +++ b/packages/dolphino-app/src/components/DolphinoEditor/DolphinoEditor.js @@ -14,8 +14,8 @@ import { import createToolbarPlugin from 'draft-js-static-toolbar-plugin' import createMarkdownPlugin from 'draft-js-markdown-plugin' import toolbarTheme from 'draft-js-static-toolbar-plugin/lib/plugin.css' -import createColorPickerPlugin from './plugins/color-picker-plugin' -import createPrismPlugin from './plugins/prism-plugin' +import createColorPickerPlugin from 'draft-js-color-picker-plugin' +import createPrismPlugin from 'draft-js-prism-decorator-plugin' const colorPickerPlugin = createColorPickerPlugin({ theme: toolbarTheme }) const toolbarPlugin = createToolbarPlugin({ diff --git a/packages/dolphino-app/src/components/DolphinoEditor/plugins/highlightPlugin.js b/packages/dolphino-app/src/components/DolphinoEditor/plugins/highlightPlugin.js new file mode 100644 index 0000000..45c2548 --- /dev/null +++ b/packages/dolphino-app/src/components/DolphinoEditor/plugins/highlightPlugin.js @@ -0,0 +1,29 @@ +import { RichUtils } from 'draft-js' + +const defaultStyle = { + background: 'blue', + padding: '0 .3em', + color: '#fff', +} + +export default (style = {}) => { + return { + customStyleMap: { + HIGHLIGHT: { + ...defaultStyle, + ...style, + }, + }, + keyBindingFn: e => { + if (e.metaKey && e.key === 'k') { + return 'highlight' + } + }, + handleKeyCommand: (command, editorState, { setEditorState }) => { + if (command === 'highlight') { + setEditorState(RichUtils.toggleInlineStyle(editorState, 'HIGHLIGHT')) + return 'handled' + } + }, + } +} diff --git a/src/components/DolphinoEditor/plugins/withWindowClickClose.js b/packages/dolphino-app/src/components/DolphinoEditor/plugins/withWindowClickClose.js similarity index 100% rename from src/components/DolphinoEditor/plugins/withWindowClickClose.js rename to packages/dolphino-app/src/components/DolphinoEditor/plugins/withWindowClickClose.js diff --git a/src/components/index.js b/packages/dolphino-app/src/components/index.js similarity index 100% rename from src/components/index.js rename to packages/dolphino-app/src/components/index.js diff --git a/src/index.css b/packages/dolphino-app/src/index.css similarity index 100% rename from src/index.css rename to packages/dolphino-app/src/index.css diff --git a/packages/dolphino-app/src/index.js b/packages/dolphino-app/src/index.js new file mode 100644 index 0000000..a582512 --- /dev/null +++ b/packages/dolphino-app/src/index.js @@ -0,0 +1,8 @@ +import React from 'react' +import ReactDOM from 'react-dom' +import './index.css' +import App from './App' +import registerServiceWorker from './registerServiceWorker' + +ReactDOM.render(, document.getElementById('root')) +registerServiceWorker() diff --git a/src/logo.svg b/packages/dolphino-app/src/logo.svg similarity index 100% rename from src/logo.svg rename to packages/dolphino-app/src/logo.svg diff --git a/src/registerServiceWorker.js b/packages/dolphino-app/src/registerServiceWorker.js similarity index 89% rename from src/registerServiceWorker.js rename to packages/dolphino-app/src/registerServiceWorker.js index 12542ba..b4a09af 100644 --- a/src/registerServiceWorker.js +++ b/packages/dolphino-app/src/registerServiceWorker.js @@ -16,30 +16,30 @@ const isLocalhost = Boolean( window.location.hostname.match( /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ ) -); +) export default function register() { if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { // The URL constructor is available in all browsers that support SW. - const publicUrl = new URL(process.env.PUBLIC_URL, window.location); + const publicUrl = new URL(process.env.PUBLIC_URL, window.location) if (publicUrl.origin !== window.location.origin) { // Our service worker won't work if PUBLIC_URL is on a different origin // from what our page is served on. This might happen if a CDN is used to // serve assets; see https://github.com/facebookincubator/create-react-app/issues/2374 - return; + return } window.addEventListener('load', () => { - const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; + const swUrl = `${process.env.PUBLIC_URL}/service-worker.js` if (isLocalhost) { // This is running on localhost. Lets check if a service worker still exists or not. - checkValidServiceWorker(swUrl); + checkValidServiceWorker(swUrl) } else { // Is not local host. Just register service worker - registerValidSW(swUrl); + registerValidSW(swUrl) } - }); + }) } } @@ -48,7 +48,7 @@ function registerValidSW(swUrl) { .register(swUrl) .then(registration => { registration.onupdatefound = () => { - const installingWorker = registration.installing; + const installingWorker = registration.installing installingWorker.onstatechange = () => { if (installingWorker.state === 'installed') { if (navigator.serviceWorker.controller) { @@ -56,20 +56,20 @@ function registerValidSW(swUrl) { // the fresh content will have been added to the cache. // It's the perfect time to display a "New content is // available; please refresh." message in your web app. - console.log('New content is available; please refresh.'); + console.log('New content is available; please refresh.') } else { // At this point, everything has been precached. // It's the perfect time to display a // "Content is cached for offline use." message. - console.log('Content is cached for offline use.'); + console.log('Content is cached for offline use.') } } - }; - }; + } + } }) .catch(error => { - console.error('Error during service worker registration:', error); - }); + console.error('Error during service worker registration:', error) + }) } function checkValidServiceWorker(swUrl) { @@ -84,25 +84,25 @@ function checkValidServiceWorker(swUrl) { // No service worker found. Probably a different app. Reload the page. navigator.serviceWorker.ready.then(registration => { registration.unregister().then(() => { - window.location.reload(); - }); - }); + window.location.reload() + }) + }) } else { // Service worker found. Proceed as normal. - registerValidSW(swUrl); + registerValidSW(swUrl) } }) .catch(() => { console.log( 'No internet connection found. App is running in offline mode.' - ); - }); + ) + }) } export function unregister() { if ('serviceWorker' in navigator) { navigator.serviceWorker.ready.then(registration => { - registration.unregister(); - }); + registration.unregister() + }) } } diff --git a/packages/draft-js-color-picker-plugin/package.json b/packages/draft-js-color-picker-plugin/package.json new file mode 100644 index 0000000..0d33d3e --- /dev/null +++ b/packages/draft-js-color-picker-plugin/package.json @@ -0,0 +1,11 @@ +{ + "name": "draft-js-color-picker-plugin", + "version": "0.2.0", + "main": "src/index.js", + "license": "MIT", + "peerDependencies": { + "draft-js": "^0.10.1", + "react": "^15.5.0 || ^16.0.0-rc", + "react-dom": "^15.5.0 || ^16.0.0-rc" + } +} diff --git a/src/components/DolphinoEditor/plugins/color-picker-plugin/ColorPicker.js b/packages/draft-js-color-picker-plugin/src/ColorPicker.js similarity index 100% rename from src/components/DolphinoEditor/plugins/color-picker-plugin/ColorPicker.js rename to packages/draft-js-color-picker-plugin/src/ColorPicker.js diff --git a/src/components/DolphinoEditor/plugins/color-picker-plugin/ColorPickerButton.js b/packages/draft-js-color-picker-plugin/src/ColorPickerButton.js similarity index 100% rename from src/components/DolphinoEditor/plugins/color-picker-plugin/ColorPickerButton.js rename to packages/draft-js-color-picker-plugin/src/ColorPickerButton.js diff --git a/src/components/DolphinoEditor/plugins/color-picker-plugin/colors.js b/packages/draft-js-color-picker-plugin/src/colors.js similarity index 100% rename from src/components/DolphinoEditor/plugins/color-picker-plugin/colors.js rename to packages/draft-js-color-picker-plugin/src/colors.js diff --git a/src/components/DolphinoEditor/plugins/color-picker-plugin/index.js b/packages/draft-js-color-picker-plugin/src/index.js similarity index 91% rename from src/components/DolphinoEditor/plugins/color-picker-plugin/index.js rename to packages/draft-js-color-picker-plugin/src/index.js index 65691d5..7500232 100644 --- a/src/components/DolphinoEditor/plugins/color-picker-plugin/index.js +++ b/packages/draft-js-color-picker-plugin/src/index.js @@ -28,11 +28,12 @@ export default (config = {}) => { const selection = editorState.getSelection() // remove previous color styles from selection in content - const nextContentState = Object.keys( - customStyleMap - ).reduce((contentState, style) => { - return Modifier.removeInlineStyle(contentState, selection, style) - }, editorState.getCurrentContent()) + const nextContentState = Object.keys(customStyleMap).reduce( + (contentState, style) => { + return Modifier.removeInlineStyle(contentState, selection, style) + }, + editorState.getCurrentContent() + ) // FIXME Try not to add to the undo stack let nextEditorState = EditorState.push( diff --git a/src/components/DolphinoEditor/plugins/prism-plugin/index.js b/packages/draft-js-prism-decorator-plugin/index.js similarity index 100% rename from src/components/DolphinoEditor/plugins/prism-plugin/index.js rename to packages/draft-js-prism-decorator-plugin/index.js diff --git a/src/components/DolphinoEditor/plugins/prism-plugin/index.test.js b/packages/draft-js-prism-decorator-plugin/index.test.js similarity index 100% rename from src/components/DolphinoEditor/plugins/prism-plugin/index.test.js rename to packages/draft-js-prism-decorator-plugin/index.test.js diff --git a/packages/draft-js-prism-decorator-plugin/package.json b/packages/draft-js-prism-decorator-plugin/package.json new file mode 100644 index 0000000..2effabd --- /dev/null +++ b/packages/draft-js-prism-decorator-plugin/package.json @@ -0,0 +1,11 @@ +{ + "name": "draft-js-prism-decorator-plugin", + "version": "0.2.0", + "main": "index.js", + "license": "MIT", + "peerDependencies": { + "draft-js": "^0.10.1", + "react": "^15.5.0 || ^16.0.0-rc", + "react-dom": "^15.5.0 || ^16.0.0-rc" + } +} diff --git a/src/App.test.js b/src/App.test.js deleted file mode 100644 index b84af98..0000000 --- a/src/App.test.js +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import App from './App'; - -it('renders without crashing', () => { - const div = document.createElement('div'); - ReactDOM.render(, div); -}); diff --git a/src/index.js b/src/index.js deleted file mode 100644 index fae3e35..0000000 --- a/src/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import './index.css'; -import App from './App'; -import registerServiceWorker from './registerServiceWorker'; - -ReactDOM.render(, document.getElementById('root')); -registerServiceWorker(); diff --git a/yarn.lock b/yarn.lock index 53e4a0c..6893692 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1179,10 +1179,10 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: electron-to-chromium "^1.2.7" browserslist@^2.1.2, browserslist@^2.5.1: - version "2.8.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.8.0.tgz#27d64028130a2e8585ca96f7c3b7730eff4de493" + version "2.9.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.9.0.tgz#706aca15c53be15610f466e348cbfa0c00a6a379" dependencies: - caniuse-lite "^1.0.30000758" + caniuse-lite "^1.0.30000760" electron-to-chromium "^1.3.27" bser@1.0.2: @@ -1279,12 +1279,12 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000760" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000760.tgz#3ea29473eb78a6ccb09f2eb73ac9e1debfec528d" + version "1.0.30000764" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000764.tgz#d73ab11ae62f6a9e2f69867d6d9c23ae3f2e5d8d" -caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000758: - version "1.0.30000760" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000760.tgz#ec720395742f1c7ec8947fd6dd2604e77a8f98ff" +caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000760: + version "1.0.30000764" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000764.tgz#97ea7472f9d3e691eede34f21983cfc219ac7842" capture-stack-trace@^1.0.0: version "1.0.0" @@ -2076,8 +2076,8 @@ draft-js-modifiers@^0.1.5: immutable "~3.7.4" draft-js-plugins-editor@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/draft-js-plugins-editor/-/draft-js-plugins-editor-2.0.1.tgz#6d5fc3b1d7fea901ee27b5ccb29d7a687973c98c" + version "2.0.3" + resolved "https://registry.yarnpkg.com/draft-js-plugins-editor/-/draft-js-plugins-editor-2.0.3.tgz#48a68068ea26fa32eb5c3783fed2decce4a1bd8e" dependencies: decorate-component-with-props "^1.0.2" find-with-regex "^1.0.2" @@ -4548,8 +4548,8 @@ log-update@^1.0.2: cli-cursor "^1.0.2" loglevel@^1.4.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.5.1.tgz#189078c94ab9053ee215a0acdbf24244ea0f6502" + version "1.6.0" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.0.tgz#ae0caa561111498c5ba13723d6fb631d24003934" longest@^1.0.1: version "1.0.1" @@ -4763,8 +4763,8 @@ mute-stream@0.0.7: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" nan@^2.3.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" + version "2.8.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" natural-compare@^1.4.0: version "1.4.0" @@ -5774,8 +5774,8 @@ react-dev-utils@^4.2.1: text-table "0.2.0" react-dom@^16.1.0: - version "16.1.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.1.0.tgz#ab6fd2a285096f388aeba51919a573d06c9bdde4" + version "16.1.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.1.1.tgz#b2e331b6d752faf1a2d31399969399a41d8d45f8" dependencies: fbjs "^0.8.16" loose-envify "^1.1.0" @@ -5829,7 +5829,7 @@ react-scripts@1.0.17: optionalDependencies: fsevents "1.1.2" -react@*: +react@*, react@^16.1.0: version "16.1.1" resolved "https://registry.yarnpkg.com/react/-/react-16.1.1.tgz#d5c4ef795507e3012282dd51261ff9c0e824fe1f" dependencies: @@ -5838,15 +5838,6 @@ react@*: object-assign "^4.1.1" prop-types "^15.6.0" -react@^16.1.0: - version "16.1.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.1.0.tgz#1c2bdac3c17fe7ee9282fa35aca6cc36387903e1" - dependencies: - fbjs "^0.8.16" - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.0" - read-all-stream@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa" @@ -6865,8 +6856,8 @@ ua-parser-js@^0.7.9: resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac" uglify-js@3.1.x, uglify-js@^3.0.13: - version "3.1.8" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.8.tgz#780d08b4f6782fe36ea5484d952362eddaf1d7b8" + version "3.1.9" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.9.tgz#dffca799308cf327ec3ac77eeacb8e196ce3b452" dependencies: commander "~2.11.0" source-map "~0.6.1"