From 733617c743e97c7fa434e741806c00e0e370f499 Mon Sep 17 00:00:00 2001 From: Carlos Kelly Date: Mon, 13 Jan 2020 18:34:58 -0600 Subject: [PATCH 1/6] Upgrade React Live to v2 (#800) * Upgrade React Live to v2 * Fix Code Pane test --- package.json | 2 +- .../__snapshots__/code-pane.test.js.snap | 121 +- .../component-playground.test.js.snap | 4446 +++++++++++------ src/components/code-pane.test.js | 6 +- src/components/component-playground.js | 14 +- yarn.lock | 113 +- 6 files changed, 3019 insertions(+), 1683 deletions(-) diff --git a/package.json b/package.json index 058c7772d..483c781c3 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "normalize.css": "^8.0.1", "prismjs": "^1.17.1", "react-emotion": "^8.0.8", - "react-live": "^1.6", + "react-live": "^2.2.2", "react-redux": "^5.1.1", "react-transition-group": "1.2.1", "react-typography": "^0.16.18", diff --git a/src/components/__snapshots__/code-pane.test.js.snap b/src/components/__snapshots__/code-pane.test.js.snap index a2867b204..6d4e3dc9a 100644 --- a/src/components/__snapshots__/code-pane.test.js.snap +++ b/src/components/__snapshots__/code-pane.test.js.snap @@ -1,38 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[` should render correctly. 1`] = ` - - -
- - - - 
const myButton = (
-        <CustomButton
-          style={{ background: '#f00' }}
-          onClick={this.action}
-        >
-         Click Me
-        </CustomButton>
-      );
-    ",
-                }
-              }
-              spellCheck="false"
-            />
-          
-        
-      
-
- - + contentEditable={false} + language="jsx" + onClick={[Function]} + onKeyDown={[Function]} + onKeyUp={[Function]} + prismTheme="dark;" + syntaxStyles={Object {}} + /> + `; diff --git a/src/components/__snapshots__/component-playground.test.js.snap b/src/components/__snapshots__/component-playground.test.js.snap index a3c7cf3c4..87ffab0c0 100644 --- a/src/components/__snapshots__/component-playground.test.js.snap +++ b/src/components/__snapshots__/component-playground.test.js.snap @@ -1,9 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[` Should render the dark theme correctly 1`] = ` -
+Array [
@@ -30,7 +28,7 @@ exports[` Should render the dark theme correctly 1`] = `
-
+ ,
@@ -38,7 +36,7 @@ exports[` Should render the dark theme correctly 1`] = ` class="css-1fc71w4 e177gi4f5" >

Should render the dark theme correctly 1`] = `
- 
-        
           /**
  * Sample React Component
  * Output domContainerNode is 'mountNode'
  */
-        
-        
-
-
-        
-          const
-        
-         styles 
-        
-          =
-        
-         
-        
-          {
-        
-        
-  heading
-        
-          :
-        
-         
-        
-          {
-        
-        
-    fontSize
-        
-          :
-        
-         
-        
-          "2.25rem"
-        
-        
-          ,
-        
-        
-    fontWeight
-        
-          :
-        
-         
-        
-          "bold"
-        
-        
-  
-        
-          }
-        
-        
-          ,
-        
-        
-  copy
-        
-          :
-        
-         
-        
-          {
-        
-        
-    fontSize
-        
-          :
-        
-         
-        
-          "1.5rem"
-        
-        
-  
-        
-          }
-        
-        
 
-        
-          }
-        
-        
+const styles = {
+  heading: {
+    fontSize: "2.25rem",
+    fontWeight: "bold"
+  },
+  copy: {
+    fontSize: "1.5rem"
+  }
+}
 
+const HelloWorld = ({ name }) => (
+  <div>
+    <h1 style={styles.heading}>
+      Create Live Code Examples in {name}!
+    </h1>
+    <p style={styles.copy}>
+      Supports Light and Dark Syntax Themes
+    </p>
+  </div>
+)
 
-        
-          const
-        
-         HelloWorld 
-        
-          =
-        
-         
-        
-          (
-        
-        
-          {
-        
-         name 
-        
-          }
-        
-        
-          )
-        
-         
-        
-          =
-        
-        
-          >
-        
-         
-        
-          (
-        
-        
-  
-        
+        
-
-

-
-`; - -exports[` Should render the light theme correctly 1`] = ` -
-
-
- Live Preview -
-
- Source Code - -
-
-
-
-
-
-

- Create Live Code Examples in Spectacle! -

-

- Supports Light and Dark Syntax Themes -

-
-
-
-
- 
-        
-          /**
- * Sample React Component
- * Output domContainerNode is 'mountNode'
- */
-        
-        
-
-
-        
-          const
-        
-         styles 
-        
-          =
-        
-         
-        
-          {
-        
-        
-  heading
-        
-          :
-        
-         
-        
-          {
-        
-        
-    fontSize
-        
-          :
-        
-         
-        
-          "2.25rem"
-        
-        
-          ,
-        
-        
-    fontWeight
-        
-          :
-        
-         
-        
-          "bold"
-        
-        
-  
-        
-          }
-        
-        
-          ,
-        
-        
-  copy
-        
-          :
-        
-         
-        
-          {
-        
-        
-    fontSize
-        
-          :
-        
-         
-        
-          "1.5rem"
-        
-        
-  
-        
-          }
-        
-        
-
-        
-          }
-        
-        
-
-
-        
-          const
-        
-         HelloWorld 
-        
-          =
-        
-         
-        
-          (
-        
-        
-          {
-        
-         name 
-        
-          }
-        
-        
-          )
-        
-         
-        
-          =
-        
-        
-          >
-        
-         
-        
-          (
-        
-        
-  
-        
-          
+              "bold"
+            
+            
+
+
+ + + - < + } - div - - - > - - - - - - - < + , - h1 - - - - style - - +
+
- = + copy - { + : - styles - . + - heading - } + { - - - > - - - - Create Live Code Examples - - in - - - - { - - name - - } - - - ! - - - - - +
+
- </ + fontSize - h1 - - - > - - - - - - - < + : - p - - - - style - - - = + - { + "1.5rem" - styles +
+
+ - . + - copy } - - - > - - - - Supports Light and Dark Syntax Themes - - - +
+
+ - </ + } - p - - - > - - - - - - +
+
+ +
+
+ + + const + + + + + + HelloWorld + + + + + + = + + + + + + ( + + + { + + + name + + + } + + + ) + + + + + + => + + + + + + ( + + +
+
+ + + + + < + + + div + + + > + + +
+
+ + + + + < + + + h1 + + + + + + style + + + = + + + { + + + styles + + + . + + + heading + + + } + + + > + + +
+
+ + Create Live Code Examples + + + in + + + + + + { + + + name + + + } + + + ! + + +
+
+ + + + + </ + + + h1 + + + > + + +
+
+ + + + + < + + + p + + + + + + style + + + = + + + { + + + styles + + + . + + + copy + + + } + + + > + + +
+
+ + Supports Light and Dark Syntax Themes + +
+
+ + + + + </ + + + p + + + > + + +
+
+ + + + + </ + + + div + + + > + + +
+
+ + + ) + + +
+
+ +
+
+ + + render + + + ( + + + < + + + HelloWorld + + + + + + name + + + = + + + " + + + Spectacle + + + " + + + + + + /> + + + ) + +
+ +
+
+
, +] +`; + +exports[` Should render the light theme correctly 1`] = ` +Array [ +
+
+ Live Preview +
+
+ Source Code + +
+
, +
+
+
+
+

+ Create Live Code Examples in Spectacle! +

+

+ Supports Light and Dark Syntax Themes +

+
+
+
+
+
+ + +
+
+
, +] +`; + +exports[` Should render with a custom background color 1`] = ` +Array [ +
+
+ Live Preview +
+
+ Source Code + +
+
, +
+
+
+
+

+ Create Live Code Examples in Spectacle! +

+

+ Supports Light and Dark Syntax Themes +

+
+
+
+
+
+ + -
-
-
-`; - -exports[` Should render with a custom background color 1`] = ` -
-
-
- Live Preview -
-
- Source Code - -
-
-
-
-
-
-

- Create Live Code Examples in Spectacle! -

-

+ ! + + +

+
- Supports Light and Dark Syntax Themes -

-
-
-
-
- 
-        
-          /**
- * Sample React Component
- * Output domContainerNode is 'mountNode'
- */
-        
-        
-
-
-        
-          const
-        
-         styles 
-        
-          =
-        
-         
-        
-          {
-        
-        
-  heading
-        
-          :
-        
-         
-        
-          {
-        
-        
-    fontSize
-        
-          :
-        
-         
-        
-          "2.25rem"
-        
-        
-          ,
-        
-        
-    fontWeight
-        
-          :
-        
-         
-        
-          "bold"
-        
-        
-  
-        
-          }
-        
-        
-          ,
-        
-        
-  copy
-        
-          :
-        
-         
-        
-          {
-        
-        
-    fontSize
-        
-          :
-        
-         
-        
-          "1.5rem"
-        
-        
-  
-        
-          }
-        
-        
-
-        
-          }
-        
-        
-
-
-        
-          const
-        
-         HelloWorld 
-        
-          =
-        
-         
-        
-          (
-        
-        
-          {
-        
-         name 
-        
-          }
-        
-        
-          )
-        
-         
-        
-          =
-        
-        
-          >
-        
-         
-        
-          (
-        
-        
-  
-        
-          
+                  
+            
+            
+              </
+            
+            
+              h1
+            
+            
+              >
+            
+            
+
+
+ + + < - div - - - > - - - - - - + p + + + + + + style + + + = + + + { + + + styles + + + . + + + copy + + + } + + + > + + +
+
+ + Supports Light and Dark Syntax Themes + +
+
+ + + + </ + + + p + + - < + > - h1 - - - - style - - +
+
- = + - { + </ - styles - . + div - heading - } + > - - - > - - - - Create Live Code Examples - - in - - - - { - - name - - } - - - ! - - - - - +
+
+ - </ + ) - h1 - - - > - - - - - - +
+
+
+
+ + - < + render - p - - - - style - - - = + ( - { + < - styles - . + HelloWorld - copy - } + - - - > - - - - Supports Light and Dark Syntax Themes - - - - </ + name - p - - - > - - - - - - - </ + = - div - - - > - - - - - - ) - - - - - - render - - - ( - - - - < + " - HelloWorld - - - - name - - - = + Spectacle " - Spectacle + + + + + /> + - " + ) - - - - /> - - - - ) - - +
+ +
- - + , +] `; exports[` Should render with a custom code block 1`] = ` -
+Array [
@@ -1626,7 +2944,7 @@ exports[` Should render with a custom code block 1`] = `
-
+ ,
@@ -1634,234 +2952,336 @@ exports[` Should render with a custom code block 1`] = ` class="css-1fc71w4 e177gi4f5" >
-
ReferenceError: mountNode is not defined -
+
- 
-        
-          const
-        
-         Button 
-        
-          =
-        
-         
-        
-          (
-        
-        
-          {
-        
-         title 
-        
-          }
-        
-        
-          )
-        
-         
-        
-          =
-        
-        
-          >
-        
-         
-        
-          (
-        
-        
-          
+          const Button = ({ title }) => (<button type="button">{ title }</button>);
+      render(<Button title="My Button" />, mountNode);
+        
+        
+            
+              My Button
+            
+            
+              "
+            
+            
+               
+            
+            
+              />
+            
+            
+              ,
+            
+            
+               mountNode
+            
+            
+              )
+            
+            
+              ;
+            
+
+ +
- - + , +] `; diff --git a/src/components/code-pane.test.js b/src/components/code-pane.test.js index e0243b966..d95ee68c6 100644 --- a/src/components/code-pane.test.js +++ b/src/components/code-pane.test.js @@ -1,5 +1,5 @@ import React from 'react'; -import { mount } from 'enzyme'; +import { shallow } from 'enzyme'; import CodePane from './code-pane'; describe('', () => { @@ -20,7 +20,9 @@ describe('', () => { ); `; - const wrapper = mount(, { context }); + const wrapper = shallow(, { + context + }); expect(wrapper).toMatchSnapshot(); }); }); diff --git a/src/components/component-playground.js b/src/components/component-playground.js index 97cc331c8..80a4bfebb 100644 --- a/src/components/component-playground.js +++ b/src/components/component-playground.js @@ -156,13 +156,23 @@ class ComponentPlayground extends Component { static getDerivedStateFromProps(nextProps, prevState) { const updatedState = {}; - if (nextProps.code !== prevState.code) { + if ( + typeof nextProps.code !== 'undefined' && + nextProps.code !== prevState.code + ) { const code = (nextProps.code || defaultCode).trim(); updatedState.code = code; + } else { + updatedState.code = prevState.code; } - if (nextProps.scope !== prevState.scope) { + if ( + typeof nextProps.scope !== 'undefined' && + nextProps.scope !== prevState.scope + ) { const scope = getEnhancedScope(nextProps.scope); updatedState.scope = scope; + } else { + updatedState.scope = prevState.scope; } return isEmpty(updatedState) ? null : updatedState; } diff --git a/yarn.lock b/yarn.lock index 9489ef20d..08613f116 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1016,11 +1016,6 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" -acorn-dynamic-import@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" - integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw== - acorn-globals@^4.1.0: version "4.3.4" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7" @@ -1036,11 +1031,6 @@ acorn-jsx@^3.0.0: dependencies: acorn "^3.0.4" -acorn-jsx@^5.0.1: - version "5.0.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.2.tgz#84b68ea44b373c4f8686023a551f61a21b7c4a4f" - integrity sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw== - acorn-walk@^6.0.1: version "6.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c" @@ -1056,7 +1046,7 @@ acorn@^5.5.0, acorn@^5.5.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== -acorn@^6.0.1, acorn@^6.1.1, acorn@^6.2.1: +acorn@^6.0.1, acorn@^6.2.1: version "6.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e" integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA== @@ -1806,19 +1796,17 @@ bser@^2.0.0: dependencies: node-int64 "^0.4.0" -buble@^0.19.3: - version "0.19.8" - resolved "https://registry.yarnpkg.com/buble/-/buble-0.19.8.tgz#d642f0081afab66dccd897d7b6360d94030b9d3d" - integrity sha512-IoGZzrUTY5fKXVkgGHw3QeXFMUNBFv+9l8a4QJKG1JhG3nCMHTdEX1DCOg8568E2Q9qvAQIiSokv6Jsgx8p2cA== +buble@0.19.6: + version "0.19.6" + resolved "https://registry.yarnpkg.com/buble/-/buble-0.19.6.tgz#915909b6bd5b11ee03b1c885ec914a8b974d34d3" + integrity sha512-9kViM6nJA1Q548Jrd06x0geh+BG2ru2+RMDkIHHgJY/8AcyCs34lTHwra9BX7YdPrZXd5aarkpr/SY8bmPgPdg== dependencies: - acorn "^6.1.1" - acorn-dynamic-import "^4.0.0" - acorn-jsx "^5.0.1" - chalk "^2.4.2" - magic-string "^0.25.3" + chalk "^2.4.1" + magic-string "^0.25.1" minimist "^1.2.0" - os-homedir "^2.0.0" - regexpu-core "^4.5.4" + os-homedir "^1.0.1" + regexpu-core "^4.2.0" + vlq "^1.0.0" buffer-from@^1.0.0: version "1.1.1" @@ -2111,15 +2099,6 @@ cli-width@^2.0.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= -clipboard@^1.5.5: - version "1.7.1" - resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-1.7.1.tgz#360d6d6946e99a7a1fef395e42ba92b5e9b5a16b" - integrity sha1-Ng1taUbpmnof7zleQrqStem1oWs= - dependencies: - good-listener "^1.2.2" - select "^1.1.2" - tiny-emitter "^2.0.0" - clipboard@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.4.tgz#836dafd66cf0fea5d71ce5d5b0bf6e958009112d" @@ -2401,10 +2380,10 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -create-react-context@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.3.tgz#9ec140a6914a22ef04b8b09b7771de89567cb6f3" - integrity sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag== +create-react-context@0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.2.tgz#9836542f9aaa22868cd7d4a6f82667df38019dca" + integrity sha512-KkpaLARMhsTsgp0d2NA/R94F/eDLbhXERdIq3LvX2biCAXcDvHYoOqHfWCHf1+OLj+HKBotLG3KqaOOf+C1C+A== dependencies: fbjs "^0.8.0" gud "^1.0.0" @@ -5841,10 +5820,10 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" -magic-string@^0.25.3: - version "0.25.3" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.3.tgz#34b8d2a2c7fec9d9bdf9929a3fd81d271ef35be9" - integrity sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA== +magic-string@^0.25.1: + version "0.25.6" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.6.tgz#5586387d1242f919c6d223579cc938bf1420795e" + integrity sha512-3a5LOMSGoCTH5rbqobC2HuDNRtE2glHZ8J7pK+QZYppyWA36yuNpsX994rIY2nCuyP7CZYy7lQq/X2jygiZ89g== dependencies: sourcemap-codec "^1.4.4" @@ -6636,16 +6615,11 @@ os-browserify@^0.3.0: resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= -os-homedir@^1.0.0: +os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= -os-homedir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-2.0.0.tgz#a0c76bb001a8392a503cbd46e7e650b3423a923c" - integrity sha512-saRNz0DSC5C/I++gFIaJTXoFJMRwiP5zHar5vV3xQ2TkgEw6hDCcU5F272JjUylpiVgBrZNQHnfjkLabTfb92Q== - os-locale@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" @@ -7081,12 +7055,10 @@ pretty-format@^23.6.0: ansi-regex "^3.0.0" ansi-styles "^3.2.0" -prismjs@1.6: - version "1.6.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.6.0.tgz#118d95fb7a66dba2272e343b345f5236659db365" - integrity sha1-EY2V+3pm26InLjQ7NF9SNmWds2U= - optionalDependencies: - clipboard "^1.5.5" +prism-react-renderer@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.0.2.tgz#3bb9a6a42f76fc049b03266298c7068fdd4b7ea9" + integrity sha512-0++pJyRfu4v2OxI/Us/5RLui9ESDkTiLkVCtKuPZYdpB8UQWJpnJQhPrWab053XtsKW3oM0sD69uJ6N9exm1Ag== prismjs@^1.17.1: version "1.17.1" @@ -7384,18 +7356,19 @@ react-lifecycles-compat@^3.0.0: resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== -react-live@^1.6: - version "1.12.0" - resolved "https://registry.yarnpkg.com/react-live/-/react-live-1.12.0.tgz#2876d4e913331002b66dfa73cf58051376bc2518" - integrity sha512-zFEpY01fJORF0IiyONqvjwPLBBDp155Ive6tU8ZmetmT2p4XWUKHstnlu4Cayia+n7iu58Owytztu43yvSin8g== +react-live@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/react-live/-/react-live-2.2.2.tgz#834edf1c11204e49fa7468166316b2e70da1a6b0" + integrity sha512-kJYAzKnPsR4oXleAX9lLsJA330BhTmSWHhr3ienZA2E/0eFDRodGl3I7sge8pp1vjc2K5Aaz73KpFUnV7Lq/DQ== dependencies: - buble "^0.19.3" + buble "0.19.6" core-js "^2.4.1" - create-react-context "^0.2.3" + create-react-context "0.2.2" dom-iterator "^1.0.0" - prismjs "1.6" + prism-react-renderer "^1.0.1" prop-types "^15.5.8" - unescape "^0.2.0" + react-simple-code-editor "^0.10.0" + unescape "^1.0.1" react-redux@^5.1.1: version "5.1.1" @@ -7410,6 +7383,11 @@ react-redux@^5.1.1: react-is "^16.6.0" react-lifecycles-compat "^3.0.0" +react-simple-code-editor@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/react-simple-code-editor/-/react-simple-code-editor-0.10.0.tgz#73e7ac550a928069715482aeb33ccba36efe2373" + integrity sha512-bL5W5mAxSW6+cLwqqVWY47Silqgy2DKDTR4hDBrLrUqC5BXc29YVx17l2IZk5v36VcDEq1Bszu2oHm1qBwKqBA== + react-test-renderer@^16.0.0-0, react-test-renderer@^16.7.0: version "16.9.0" resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.9.0.tgz#7ed657a374af47af88f66f33a3ef99c9610c8ae9" @@ -7635,7 +7613,7 @@ regexpp@^1.0.1: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab" integrity sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw== -regexpu-core@^4.5.4, regexpu-core@^4.6.0: +regexpu-core@^4.2.0, regexpu-core@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6" integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg== @@ -8970,10 +8948,12 @@ uglify-js@^3.1.4: commander "~2.20.0" source-map "~0.6.1" -unescape@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/unescape/-/unescape-0.2.0.tgz#b78b9b60c86f1629df181bf53eee3bc8d6367ddf" - integrity sha1-t4ubYMhvFinfGBv1Pu47yNY2fd8= +unescape@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/unescape/-/unescape-1.0.1.tgz#956e430f61cad8a4d57d82c518f5e6cc5d0dda96" + integrity sha512-O0+af1Gs50lyH1nUu3ZyYS1cRh01Q/kUKatTOkSs7jukXE6/NebucDVxyiDsA9AQ4JC1V1jUH9EO8JX2nMDgGQ== + dependencies: + extend-shallow "^2.0.1" unicode-canonical-property-names-ecmascript@^1.0.4: version "1.0.4" @@ -9187,6 +9167,11 @@ victory-core@^33.0.6: prop-types "^15.5.8" react-fast-compare "^2.0.0" +vlq@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/vlq/-/vlq-1.0.1.tgz#c003f6e7c0b4c1edd623fd6ee50bbc0d6a1de468" + integrity sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w== + vm-browserify@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019" From fa3a54fb7905f55b633a6dec28740a61985bf831 Mon Sep 17 00:00:00 2001 From: Kylie Stewart Date: Mon, 13 Jan 2020 17:37:56 -0700 Subject: [PATCH 2/6] 5.8.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 483c781c3..a9fbe1855 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "spectacle", - "version": "5.7.2", + "version": "5.8.0", "description": "ReactJS Powered Presentation Framework", "main": "lib/index.js", "module": "es/index.js", From a6cfe7d2c38142e29e4fa799659e53884989ac78 Mon Sep 17 00:00:00 2001 From: Kylie Stewart Date: Thu, 16 Jan 2020 11:05:43 -0700 Subject: [PATCH 3/6] Add correct sub-dir to Readme link paths, fixes #801 (#803) --- README.md | 92 +++++++++++++++++++++++++++---------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index a10423b5c..db30422ae 100644 --- a/README.md +++ b/README.md @@ -11,52 +11,52 @@ Have a question about Spectacle? Submit an issue in this repository using the "Q ## Contents -- [Getting Started](./docs/getting-started.md) - - [Classic Spectacle](./docs/getting-started.md#classic-spectacle) - - [Spectacle MDX](./docs/getting-started.md#spectacle-mdx) - - [One Page](./docs/getting-started.md#one-page) -- [Basic Concepts](./docs/basic-concepts.md) - - [Main file](./docs/basic-concepts.md#main-file) - - [Themes](./docs/basic-concepts.md#themes) - - [createTheme(colors, fonts)](./docs/basic-concepts.md#createthemecolors-fonts) - - [Development](./docs/basic-concepts.md#development) - - [Build & Deployment](./docs/basic-concepts.md#build--deployment) - - [Presenting](./docs/basic-concepts.md#presenting) - - [Controls](./docs/basic-concepts.md#controls) - - [Fullscreen](./docs/basic-concepts.md#fullscreen) - - [PDF Export](./docs/basic-concepts.md#pdf-export) -- [Tag API](./docs/tag-api.md) - - [Main Tags](./docs/tag-api.md#main-tags) - - [Deck](./docs/tag-api.md#deck) - - [Slide (Base)](./docs/tag-api.md#slide-base) - - [Notes](./docs/tag-api.md#notes) - - [MarkdownSlides](./docs/tag-api.md#markdown-slides) - - [Layout Tags](./docs/tag-api.md#layout-tags) - - [Layout](./docs/tag-api.md#layout) - - [Fit](./docs/tag-api.md#fit) - - [Fill](./docs/tag-api.md#fill) - - [Markdown Tag](./docs/tag-api.md#markdown-tag) - - [Markdown](./docs/tag-api.md#markdown) - - [Magic Tag](./docs/tag-api.md#magic-tag) - - [Magic](./docs/tag-api.md#magic) - - [Element Tags](./docs/tag-api.md#element-tags) - - [Appear](./docs/tag-api.md#appear) - - [Anim](./docs/tag-api.md#anim) - - [BlockQuote, Quote and Cite (Base)](./docs/tag-api.md#blockquote-quote-and-cite-base) - - [CodePane (Base)](./docs/tag-api.md#codepane-base) - - [Code (Base)](./docs/tag-api.md#code-base) - - [ComponentPlayground](./docs/tag-api.md#component-playground) - - [GoToAction (Base)](./docs/tag-api.md#go-to-action) - - [Heading (Base)](./docs/tag-api.md#heading-base) - - [Image (Base)](./docs/tag-api.md#image-base) - - [Link (Base)](./docs/tag-api.md#link-base) - - [List & ListItem (Base)](./docs/tag-api.md#list--listitem-base) - - [S (Base)](./docs/tag-api.md#s-base) - - [Table, TableRow, TableBody, TableHeader, TableHeaderItem and TableItem (Base)](./docs/tag-api.md#table-tablerow-tableheaderitem-and-tableitem-base) - - [Text (Base)](./docs/tag-api.md#text-base) - - [Typeface](./docs/tag-api.md#typeface) - - [Base Props](./docs/tag-api.md#base-props) -- [Third Party Extensions](./docs/extensions.md) +- [Getting Started](./docs/content/getting-started.md) + - [Classic Spectacle](./docs/content/getting-started.md#classic-spectacle) + - [Spectacle MDX](./docs/content/getting-started.md#spectacle-mdx) + - [One Page](./docs/content/getting-started.md#one-page) +- [Basic Concepts](./docs/content/basic-concepts.md) + - [Main file](./docs/content/basic-concepts.md#main-file) + - [Themes](./docs/content/basic-concepts.md#themes) + - [createTheme(colors, fonts)](./docs/content/basic-concepts.md#createthemecolors-fonts) + - [Development](./docs/content/basic-concepts.md#development) + - [Build & Deployment](./docs/content/basic-concepts.md#build--deployment) + - [Presenting](./docs/content/basic-concepts.md#presenting) + - [Controls](./docs/content/basic-concepts.md#controls) + - [Fullscreen](./docs/content/basic-concepts.md#fullscreen) + - [PDF Export](./docs/content/basic-concepts.md#pdf-export) +- [Tag API](./docs/content/tag-api.md) + - [Main Tags](./docs/content/tag-api.md#main-tags) + - [Deck](./docs/content/tag-api.md#deck) + - [Slide (Base)](./docs/content/tag-api.md#slide-base) + - [Notes](./docs/content/tag-api.md#notes) + - [MarkdownSlides](./docs/content/tag-api.md#markdown-slides) + - [Layout Tags](./docs/content/tag-api.md#layout-tags) + - [Layout](./docs/content/tag-api.md#layout) + - [Fit](./docs/content/tag-api.md#fit) + - [Fill](./docs/content/tag-api.md#fill) + - [Markdown Tag](./docs/content/tag-api.md#markdown-tag) + - [Markdown](./docs/content/tag-api.md#markdown) + - [Magic Tag](./docs/content/tag-api.md#magic-tag) + - [Magic](./docs/content/tag-api.md#magic) + - [Element Tags](./docs/content/tag-api.md#element-tags) + - [Appear](./docs/content/tag-api.md#appear) + - [Anim](./docs/content/tag-api.md#anim) + - [BlockQuote, Quote and Cite (Base)](./docs/content/tag-api.md#blockquote-quote-and-cite-base) + - [CodePane (Base)](./docs/content/tag-api.md#codepane-base) + - [Code (Base)](./docs/content/tag-api.md#code-base) + - [ComponentPlayground](./docs/content/tag-api.md#component-playground) + - [GoToAction (Base)](./docs/content/tag-api.md#go-to-action) + - [Heading (Base)](./docs/content/tag-api.md#heading-base) + - [Image (Base)](./docs/content/tag-api.md#image-base) + - [Link (Base)](./docs/content/tag-api.md#link-base) + - [List & ListItem (Base)](./docs/content/tag-api.md#list--listitem-base) + - [S (Base)](./docs/content/tag-api.md#s-base) + - [Table, TableRow, TableBody, TableHeader, TableHeaderItem and TableItem (Base)](./docs/content/tag-api.md#table-tablerow-tableheaderitem-and-tableitem-base) + - [Text (Base)](./docs/content/tag-api.md#text-base) + - [Typeface](./docs/content/tag-api.md#typeface) + - [Base Props](./docs/content/tag-api.md#base-props) +- [Third Party Extensions](./docs/content/extensions.md) - [FAQ](#faq) - [Maintenance Status](#maintenance-status) From 3bc0a04ea063d07c4631910a2201aa8c4c4793d4 Mon Sep 17 00:00:00 2001 From: Ryan Roemer Date: Tue, 28 Jan 2020 16:06:55 -0800 Subject: [PATCH 4/6] Infra: Switch to spectacle-ci AWS user. (#822) - We are switching to specific AWS users for each lander (with tighter permissions) - This is against `master` to verify the deploy. Will merge into `task/rewrite` when I'm done. - Update travis keys. We'll need to merge to verify. - Minor other fixes. --- .travis.yml | 6 +++--- docs/README.md | 4 ++-- docs/scripts/deploy/aws.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index be90ba3fb..8a7f78d80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,11 +20,11 @@ env: # SURGE_TOKEN - secure: "OiWkbcAfO3UwfwF3+QfZ4qC+ZZXhRnJ3HqafSXixleO2D3fbqc/loVYPgamkjb6gurFDlBzHvNo33Ykv7/ItJmMHAzNyaHOi65Dt3Ax2vCnpOZLv+7pgQ4kP3BDV0zdqpRLlCYj1NuoeAV/i1g5dlWt1q9VlT/G9uitvUlAMfL5OaeyVha7kZGaEM11AOxf6bCQfFhNvUM3c4qz2NXSI/vXtSyKMEoL1Z04VECq1ce/NqvTh9T2dfm7Lvc9ULhUOZF0ChOtc8R50XeCJvIR8SguEwY82O3gG3xiUKlDAUbcZGZK9cmtIoB5I0rZ4JXZDTsZSFEYSB8IuzqHvBzyETFwsBvKXjVuGGaObKOp/jzUetJSTGKhCxzKy56tCoepXc16JvLEjG1Eg8azU6KchMrDSf0+bRu27Yj3tb8UDz16gmCxeuJr37zgh7fR4A4rvQ8t4xIgX9dxE1/aWMOO5gOlcJlFnDpVeKVGM+EAkBMEIU6tnk9Vw0Zc/NrpFy0oaL6vfsd2cfnR4RErEyUQAWuYCt6ZKe6xIpbO6wHBgoCJXsXa1mdgAeR74nUJR86fHAe4OL8ibc8/KC4QcsftxKiFM3LAfsqGOEVklTlbD5yEhTH/2aF7z/EmYZwnTzq/7yA22m23dFPGXT043bIsGzVbNwwybtkBxrP4gFp/Mjao=" - # **Production**: AWS (`formidable-com`, "spectacle CI" keys) + # **Production**: AWS (`spectacle-ci`, "CI" keys) # AWS_ACCESS_KEY_ID - - secure: "RLNlvBN+kTJbblGyX/lAMJ8yLOPab8+pYTBpoFKJKiDUT9N+krPbUy9Hk/Qhsb5aIvFg21z3JjG8gTwYQDJc32oI61whQp71IHB96SPpx0//jUuCldnn0L+dKtNq0IrY8N7Smg2vrEkfocRd2FiEB8G6rnQEYc5HF+tIn94kcoynwbXKRiyoCofGdh9UrTVXUQ+fTu3lFMjGc/v5AWcOkvoOT84IX/Rhn+g/Z0Xur4vZ+SfOML/ue79W5gMowsclQdGnLSBJHqH1svDgwB1h6SiwZljT/nGotcbicafO1ft7O9j0jlJi3yewqjouoGCLBj/gVTeqEg+9g9+mGt1odAw4UAs5opjKjXPML7k4fmM2TPCRf6suhv9R4o4VrZHjuPFb4K0qKaqxo+BYJSjdjA1IKV4AsPV16FdpHx9VgcN59X4ngmYvjVry9NBxNj0dmRgh5XcukBs3kznGdVLrNWVFauTd6Zn7KSvrvvIhL5eI9FTWCriYkMnXF3MLDfenHLOGHgtmUxq2Vdpw+JO8metRAQzIT7yOu2EdoXF+BffS+dwN7MPJVXAdwtpCYMqlMOLGkkoywXYOW8oydl1sJpe/Q9t2n8+PplYEcUmQY4E19m7RcHwgYKi8NdCatiqPSuaNH9vsKY6N3SCoFyou2DJ6IY+269ORT0ghgS5Frcw=" + - secure: "WkiLFFTXdyLOguGxaHul2a6DG+kts4qa9MOVR0NqI9T5D9jpudjNEuLV/zRPIhn3Zvhc5eZxh8Wt3W9S2cM3OXz8r1i32nc8IMPBq2FlwWowMCGT7fLkDZCJ70sF6njsowatqCgohzX+PokgZD2GRy7D3gu3zPFpZYmvCo35ppI6CbrLjHf0kP1F5Dzds5nJCRM0ikOWD3aIcPLlXH0LrLvyAfkbsFZLBUlRcwECKxynQ8B7PJCxIQM1fLWUNIsTudxDXAcKZCHvZg9ll7GbtmBIjW65deO2WRok3jqDGTQXz8Slga+gA3eN3or9dG5sVdML41u2xu31YXJIeORu6sjhul53T8Ef+AEwMohH0QLCPQzPZPiZL9Vx747dLPUwbNxX9H5TGUhMHvuAh8dVDsJg6qXtykLJJ/yZuPy60ST6ZeMBUfqOGwTx9m4sojr86Q7qHgrciiYYFt54FoNk8NH4tc73Khb+zw5cGsqAUSFY1O6vXy2ORVyIjkzX/61gokkM9JIp1Q4mU9urUuJh9tIxK5VyhjsWEelVNPs6c7IgDJXmbSzezqjL+8GjoSeGnwdiOESN4BBXkmK7Or2D2MU2tvyVn9Owl8H8zPulU/LPLJBFHQ1Ns9wyEnsGz8R+zwJmtonbkpcMGoxuSi2vn6Wq04StNutRgW9oUfsk1Cs=" # AWS_SECRET_ACCESS_KEY - - secure: "wUfSmPq9nED4o5/Krbaf8SOsDy5GCgM141dfLCbx2LA90yrQcg+8LJ0nbRg6Me78PCHAlqmB4lQgunmwuke27fhljJuRNLGZfLAqjNBBDWXxDUi6HU9h1DXTIY4dJJpYVcZ+7PQDKlI+yNoFw3qiDjNpgRBmUb+md2MylhB2xLhrYz438fZjkHEojfnN0X6jpOwSjjuAERz771QoUEZRN3gm3MauLTTyOZW+wMVdAaFVCeIZeYdU8pK8SWRFWF9lCUcRcUUddhdydUl0AvUa2QtkG2lp/fDOSDFn6HBoKznl1JkYwQd1AH5zRReBOwqdlCvFGg1GYgBNLRIZ8LyTsqQ+Im5k9wwA5F2z7EMDpug2fAenRH4r6TIqpWqU2AHbizFotjeIgzwkv3yC3HYZ3hpzsjwKUMJ2QUriFu7ZvzOQOAaLhvVMWXcRlhE5nEssyZXT/VDPgFyIc3MPBS1V3Riy00OCSzOskG4wajsVDTHj9T3tUDjo3kTFI2b4kRonCwVKIERu+oSfW2lWdjnktud4G7Ua22uMvoOWCAVLcdXGs7s+zbTF6Rt26RibqtK8CcUkO0s4qqOBV49KbkYQPcZvfRkMbRyrLtpsANGImRN33Jh0+TV6X8b6FLM5JmRBt/Wpyo1uhxkdJ/IKZMgiu1OfeeXiugr9seeXBKE2r0I=" + - secure: "TW1h3Zy+pK5awk7flJV4YvWtWyJykAc/hM4OG3uXSnJBHKEttfE3R7Hu5HnrhNvcbj1G7gQW7aPA0/1DSq4pvGNWUo77wbeNVcRuuweJM+5/va94DcX8RVMcR13Czl8xtT5I5HSUgQ/VshzUWq6pI6VFKdNu0HwZ+NBV+bk8Si6F6GHMD6IfzmdvTjPoAg58R1maW1WcBcxYrhZ+I8b66mYlQrMPzy46o0YL5uP3ypXXceKdXtGiFLrtZJYzaOxa4T9xByStYxxNT/vb0GqATc8Qw4c3t7LspsIR4J3aJF9U52rGHlE/r5sxA1Uupofw3ahpl2R1uNP/ue2oHU5QC5Fl525btXkNKBP/FlpeVtYM0nh+TN5CbvTsIy7l88wec6zagFLRKdg6XKfNIR4OO0vBDy68582Ha/TgbYoWlVRaCcB0/sAiANoP7Wmx0uojzJlW0QaYk2NV+tYncujewAJHpdabrXRlooh/yWOhNgMHEJVKjGm6ZppeU24cGI64xxmCfL3gOJbyJyAOSXF76h9OU2MD0X2BIauLRg8uRnD6ALspuMmXiI3EQcKhe1XXY/IGz7lMXlO8sXKxeyUjnPxvRyNwumoU1gOYGGCiv5NRQfqzL+nrsjLKiV6P+zzvIuStX1eLJD+c0DDM2B7Bjs5O0AEAxX700FtM5HiQhzs=" before_install: # Add `aws` CLI tool. diff --git a/docs/README.md b/docs/README.md index 910e10ad1..ec685e701 100644 --- a/docs/README.md +++ b/docs/README.md @@ -82,12 +82,12 @@ First, install the AWS CLI: $ brew install awscli ``` -Then, set up `aws-vault` with the AWS access and secret keys for `spectacle` CI in the `AWS IAM (formidable-com)` entry in the IC vault: +Then, set up `aws-vault` with the AWS access and secret keys for "CI" in the `AWS IAM (spectacle-ci)` entry in the IC vault: ```sh $ brew cask install aws-vault $ aws-vault add fmd-spectacle-ci -# Enter AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY values for "spectacle CI" +# Enter AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY values for AWS `spectacle-ci` user titled "CI" ``` Then build for production and deploy with dry run to check things: diff --git a/docs/scripts/deploy/aws.js b/docs/scripts/deploy/aws.js index a4f8ac550..6c7d65c96 100644 --- a/docs/scripts/deploy/aws.js +++ b/docs/scripts/deploy/aws.js @@ -23,7 +23,7 @@ const EXECA_OPTS = { }; const { log } = console; -const logMsg = msg => log(chalk`[{cyan deploy/surge}] ${msg}`); +const logMsg = msg => log(chalk`[{cyan deploy/aws}] ${msg}`); const main = async ({ isDryRun }) => { logMsg(chalk`Uploading files to {cyan ${DEST}}`); From 04a805fc30dac67ffc4e7a273b8edc238ee3e54c Mon Sep 17 00:00:00 2001 From: Ryan Roemer Date: Tue, 28 Jan 2020 16:36:50 -0800 Subject: [PATCH 5/6] Update yarn.lock --- yarn.lock | 266 +++++++++++------------------------------------------- 1 file changed, 52 insertions(+), 214 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4713c123a..258ea0106 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1150,9 +1150,9 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "13.5.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.5.1.tgz#6fae50892d1841f4b38b298e2f78fb68c5960cb9" - integrity sha512-Jj2W7VWQ2uM83f8Ls5ON9adxN98MvyJsMSASYFuSvrov8RMRY64Ayay7KV35ph1TSGIJ2gG9ZVDdEq3c3zaydA== + version "13.1.8" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.1.8.tgz#1d590429fe8187a02707720ecf38a6fe46ce294b" + integrity sha512-6XzyyNM9EKQW4HKuzbo/CkOIjn/evtCmsU+MUM1xDfJ+3/rNjBttM1NgN7AOQvN6tP1Sl1D1PIKMreTArnxM9A== "@types/stack-utils@^1.0.1": version "1.0.1" @@ -1165,9 +1165,9 @@ integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== "@types/yargs@^13.0.0": - version "13.0.7" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.7.tgz#658d8578a444670a41cc9c338d5e0e0a9910fd9e" - integrity sha512-Sg9kNeJz+V+W+0fugcVhHC+mNHnydDR1RJrW5Qn2jVrDQARF8wfPVqIqwEzZp+bneuEBIm2ClsJ1/je42ZBzSg== + version "13.0.5" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.5.tgz#18121bfd39dc12f280cee58f92c5b21d32041908" + integrity sha512-CF/+sxTO7FOwbIRL4wMv0ZYLCRfMid2HQpzDRyViH7kSpfoAFiMdGqKIxb1PxWfjtQXQhnQuD33lvRHNwr809Q== dependencies: "@types/yargs-parser" "*" @@ -1459,19 +1459,11 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -aproba@^1.0.3, aproba@^1.1.1: +aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -1697,9 +1689,9 @@ babel-plugin-jest-hoist@^24.9.0: "@types/babel__traverse" "^7.0.6" "babel-plugin-styled-components@>= 1": - version "1.10.7" - resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.10.7.tgz#3494e77914e9989b33cc2d7b3b29527a949d635c" - integrity sha512-MBMHGcIA22996n9hZRf/UJLVVgkEOITuR2SvjHLb5dSTUyR4ZRGn+ngITapes36FI3WLxZHfRhkA1ffHxihOrg== + version "1.10.6" + resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.10.6.tgz#f8782953751115faf09a9f92431436912c34006b" + integrity sha512-gyQj/Zf1kQti66100PhrCRjI5ldjaze9O0M3emXRPAN80Zsf8+e1thpTpaXJXVHXtaM4/+dJEgZHyS9Its+8SA== dependencies: "@babel/helper-annotate-as-pure" "^7.0.0" "@babel/helper-module-imports" "^7.0.0" @@ -1920,11 +1912,11 @@ browserify-zlib@^0.2.0: pako "~1.0.5" browserslist@^4.8.2, browserslist@^4.8.3: - version "4.8.5" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.5.tgz#691af4e327ac877b25e7a3f7ee869c4ef36cdea3" - integrity sha512-4LMHuicxkabIB+n9874jZX/az1IaZ5a+EUuvD7KFOu9x/Bd5YHyO0DIz2ls/Kl8g0ItS4X/ilEgf4T1Br0lgSg== + version "4.8.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.4.tgz#b0cf2470ce928ce86b546217f70825577bb01c3a" + integrity sha512-3qv/Ar3nRnRTpwGD+LZc7F4YHDBb3NAEIn+DesNa8TcBhyxf8eDqYwTOa70kiWXwvFjQQz+abbykJcyOlfBfNg== dependencies: - caniuse-lite "^1.0.30001022" + caniuse-lite "^1.0.30001021" electron-to-chromium "^1.3.338" node-releases "^1.1.46" @@ -2045,10 +2037,10 @@ camelize@^1.0.0: resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b" integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs= -caniuse-lite@^1.0.30001022: - version "1.0.30001023" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001023.tgz#b82155827f3f5009077bdd2df3d8968bcbcc6fc4" - integrity sha512-C5TDMiYG11EOhVOA62W1p3UsJ2z4DsHtMBQtjzp3ZsUglcQn62WOUgW0y795c7A5uZ+GCEIvzkMatLIlAsbNTA== +caniuse-lite@^1.0.30001021: + version "1.0.30001022" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001022.tgz#9eeffe580c3a8f110b7b1742dcf06a395885e4c6" + integrity sha512-FjwPPtt/I07KyLPkBQ0g7/XuZg6oUkYBVnPHNj3VHJbOjmmJ/GdSo/GUY6MwINEQvjhP6WZVbX8Tvms8xh0D5A== capture-exit@^2.0.0: version "2.0.0" @@ -2154,9 +2146,9 @@ class-utils@^0.3.5: static-extend "^0.1.1" clean-css@4.2.x: - version "4.2.3" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" - integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== + version "4.2.1" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17" + integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g== dependencies: source-map "~0.6.0" @@ -2302,11 +2294,6 @@ console-browserify@^1.1.0: resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -2499,7 +2486,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@^3.0.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2535,11 +2522,6 @@ deep-equal@^1.0.1: object-keys "^1.1.1" regexp.prototype.flags "^1.2.0" -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -2600,11 +2582,6 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -2628,11 +2605,6 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detect-newline@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" @@ -2788,9 +2760,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.338: - version "1.3.341" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.341.tgz#ad4c039bf621715a12dd814a95a7d89ec80b092c" - integrity sha512-iezlV55/tan1rvdvt7yg7VHRSkt+sKfzQ16wTDqTbQqtl4+pSUkKPXpQHDvEt0c7gKcUHHwUbffOgXz6bn096g== + version "1.3.338" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.338.tgz#4f33745aed599dfa0fd7b388bf754c164e915168" + integrity sha512-wlmfixuHEc9CkfOKgcqdtzBmRW4NStM9ptl5oPILY2UDyHuSXb3Yit+yLVyLObTgGuMMU36hhnfs2GDJId7ctA== elliptic@^6.0.0: version "6.5.2" @@ -3440,9 +3412,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.10.0.tgz#01f5263aee921c6a54fb91667f08f4155ce169eb" - integrity sha512-4eyLK6s6lH32nOvLLwlIOnr9zrL8Sm+OvW4pVTJNoXeGzYIkHVf+pADQi+OJ0E67hiuSLezPVPyBcIZO50TmmQ== + version "1.9.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.9.0.tgz#8d5bcdc65b7108fe1508649c79c12d732dcedb4f" + integrity sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A== dependencies: debug "^3.0.0" @@ -3490,13 +3462,6 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - fs-readdir-recursive@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" @@ -3549,20 +3514,6 @@ functions-have-names@^1.2.0: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz#a981ac397fa0c9964551402cdc5533d7a4d52f91" integrity sha512-j48B/ZI7VKs3sgeI2cZp7WXWmZXu7Iq5pl5/vptV5N2mq+DGFuS/ulaDjtaoLpYzuD6u8UgrUKHfgo7fDTSiBA== -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - gensync@^1.0.0-beta.1: version "1.0.0-beta.1" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" @@ -3719,11 +3670,6 @@ has-symbols@^1.0.0, has-symbols@^1.0.1: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -3963,7 +3909,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3980,13 +3926,6 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== - dependencies: - minimatch "^3.0.4" - ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -4041,7 +3980,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@^1.3.4, ini@^1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -4950,9 +4889,9 @@ leven@^3.1.0: integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== levenary@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77" - integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.0.tgz#fc146fe75f32dc483a0a2c64aef720f602cd6210" + integrity sha512-VHcwhO0UTpUW7rLPN2/OiWJdgA1e9BqEDALhrgCe/F+uUJnep6CoUsTzMeP8Rh0NGr9uKquXxqe7lwLZo509nQ== dependencies: leven "^3.1.0" @@ -5265,21 +5204,6 @@ minimist@^1.1.1, minimist@^1.2.0: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -5304,7 +5228,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@^0.5.0, mkdirp@^0.5.1: +mkdirp@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= @@ -5399,15 +5323,6 @@ nearley@^2.7.10: randexp "0.4.6" semver "^5.4.1" -needle@^2.2.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" - integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -5485,26 +5400,10 @@ node-notifier@^5.4.2: shellwords "^0.1.1" which "^1.3.0" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-releases@^1.1.46: - version "1.1.47" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.47.tgz#c59ef739a1fd7ecbd9f0b7cf5b7871e8a8b591e4" - integrity sha512-k4xjVPx5FpwBUj0Gw7uvFOTF4Ep8Hok1I6qjwL3pLfwe7Y0REQSAqOwwv9TWBCUtMHxcXfY4PgRLRozcChvTcA== + version "1.1.46" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.46.tgz#6b262afef1bdc9a950a96df2e77e0d2290f484bf" + integrity sha512-YOjdx+Uoh9FbRO7yVYbnbt1puRWPQMemR3SutLeyv2XfxKs1ihpe0OLAUwBPEP2ImNH/PZC7SEiC6j32dwRZ7g== dependencies: semver "^6.3.0" @@ -5543,27 +5442,6 @@ normalize-path@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -npm-bundled@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" - integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== - dependencies: - npm-normalize-package-bin "^1.0.1" - -npm-normalize-package-bin@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" - integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== - -npm-packlist@^1.1.6: - version "1.4.8" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" - integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - npm-normalize-package-bin "^1.0.1" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -5571,16 +5449,6 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npmlog@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - nth-check@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" @@ -5603,7 +5471,7 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.0.1, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -6297,16 +6165,6 @@ raw-loader@^4.0.0: loader-utils "^1.2.3" schema-utils "^2.5.0" -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - react-dom@^16.9.0: version "16.12.0" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11" @@ -6366,7 +6224,7 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -6612,9 +6470,9 @@ resolve@1.1.7: integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.3.2: - version "1.15.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz#1b7ca96073ebb52e741ffd799f6b39ea462c67f5" - integrity sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw== + version "1.14.2" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz#dbf31d0fa98b1f29aa5169783b9c290cb865fea2" + integrity sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ== dependencies: path-parse "^1.0.6" @@ -6643,7 +6501,7 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3: +rimraf@^2.5.4, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -6651,9 +6509,9 @@ rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3: glob "^7.1.3" rimraf@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.1.tgz#48d3d4cb46c80d388ab26cd61b1b466ae9ae225a" - integrity sha512-IQ4ikL8SjBiEDZfk+DFVwqRK8md24RWMEJkdSlgNLkyyAImcjf8SWvU1qFMDOb4igBClbTQ/ugPqXcRwdFTxZw== + version "3.0.0" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b" + integrity sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg== dependencies: glob "^7.1.3" @@ -6778,7 +6636,7 @@ selfsigned@^1.10.7: dependencies: node-forge "0.9.0" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -6840,7 +6698,7 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" -set-blocking@^2.0.0, set-blocking@~2.0.0: +set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= @@ -7173,7 +7031,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: +string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -7260,7 +7118,7 @@ strip-eof@^1.0.0: resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= -strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: +strip-json-comments@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= @@ -7352,19 +7210,6 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tar@^4.4.2: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" @@ -7974,13 +7819,6 @@ which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1: dependencies: isexe "^2.0.0" -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== - dependencies: - string-width "^1.0.2 || 2" - wonka@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/wonka/-/wonka-3.2.2.tgz#4d5c79fee2e6042066ba7aa86bd2f180487cc0c3" @@ -8065,7 +7903,7 @@ xtend@^4.0.0, xtend@~4.0.1: resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== @@ -8135,4 +7973,4 @@ yargs@^13.3.0: string-width "^3.0.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^13.1.1" + yargs-parser "^13.1.1" \ No newline at end of file From 0d8f605ce86621efa33451f73b5c19086590b2e4 Mon Sep 17 00:00:00 2001 From: Ryan Roemer Date: Tue, 28 Jan 2020 16:37:13 -0800 Subject: [PATCH 6/6] Newline --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 258ea0106..b70af4f3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7973,4 +7973,4 @@ yargs@^13.3.0: string-width "^3.0.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^13.1.1" \ No newline at end of file + yargs-parser "^13.1.1"