From ac9e4d0a0c2fc51598a2befe8e5d950b7e0c58d8 Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Sat, 9 Nov 2019 23:28:19 +0000
Subject: [PATCH 01/18] pass entire rootSchema to findSchemaDefinition, not
 just definitions

---
 src/components/Form.js   | 13 +++++----
 src/utils.js             |  5 ++--
 src/validate.js          |  2 +-
 test/SchemaField_test.js |  3 +-
 test/utils_test.js       | 62 ++++++++++++++++++++--------------------
 5 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/src/components/Form.js b/src/components/Form.js
index c438fca30a..732362dbe0 100644
--- a/src/components/Form.js
+++ b/src/components/Form.js
@@ -60,7 +60,7 @@ export default class Form extends Component {
     const edit = typeof inputFormData !== "undefined";
     const liveValidate = props.liveValidate || this.props.liveValidate;
     const mustValidate = edit && !props.noValidate && liveValidate;
-    const { definitions } = schema;
+    const definitions = schema;
     const formData = getDefaultFormState(schema, inputFormData, definitions);
     const retrievedSchema = retrieveSchema(schema, definitions, formData);
     const customFormats = props.customFormats;
@@ -185,13 +185,13 @@ export default class Form extends Component {
     if (this.props.omitExtraData === true && this.props.liveOmit === true) {
       const retrievedSchema = retrieveSchema(
         this.state.schema,
-        this.state.schema.definitions,
+        this.state.schema,
         formData
       );
       const pathSchema = toPathSchema(
         retrievedSchema,
         "",
-        this.state.schema.definitions,
+        this.state.schema,
         formData
       );
 
@@ -250,13 +250,13 @@ export default class Form extends Component {
     if (this.props.omitExtraData === true) {
       const retrievedSchema = retrieveSchema(
         this.state.schema,
-        this.state.schema.definitions,
+        this.state.schema,
         newFormData
       );
       const pathSchema = toPathSchema(
         retrievedSchema,
         "",
-        this.state.schema.definitions,
+        this.state.schema,
         newFormData
       );
 
@@ -316,7 +316,8 @@ export default class Form extends Component {
       ArrayFieldTemplate: this.props.ArrayFieldTemplate,
       ObjectFieldTemplate: this.props.ObjectFieldTemplate,
       FieldTemplate: this.props.FieldTemplate,
-      definitions: this.props.schema.definitions || {},
+      // TODO: fix this. this is a backwards incompatible change.
+      definitions: this.props.schema || {},
       formContext: this.props.formContext || {},
     };
   }
diff --git a/src/utils.js b/src/utils.js
index beebef36fd..983f10e911 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -542,8 +542,9 @@ export function optionsList(schema) {
   }
 }
 
-function findSchemaDefinition($ref, definitions = {}) {
+function findSchemaDefinition($ref, rootSchema = {}) {
   // Extract and use the referenced definition if we have it.
+  const definitions = rootSchema.definitions || {};
   const match = /^#\/definitions\/(.*)$/.exec($ref);
   if (match && match[1]) {
     const parts = match[1].split("/");
@@ -551,7 +552,7 @@ function findSchemaDefinition($ref, definitions = {}) {
     for (let part of parts) {
       part = part.replace(/~1/g, "/").replace(/~0/g, "~");
       while (current.hasOwnProperty("$ref")) {
-        current = findSchemaDefinition(current.$ref, definitions);
+        current = findSchemaDefinition(current.$ref, rootSchema);
       }
       if (current.hasOwnProperty(part)) {
         current = current[part];
diff --git a/src/validate.js b/src/validate.js
index e70aebfee1..0d44e68cf9 100644
--- a/src/validate.js
+++ b/src/validate.js
@@ -173,7 +173,7 @@ export default function validateFormData(
   customFormats = {}
 ) {
   // Include form data with undefined values, which is required for validation.
-  const { definitions } = schema;
+  const definitions = schema;
   formData = getDefaultFormState(schema, formData, definitions, true);
 
   const newMetaSchemas = !deepEquals(formerMetaSchema, additionalMetaSchemas);
diff --git a/test/SchemaField_test.js b/test/SchemaField_test.js
index e94adea6df..647b1adb29 100644
--- a/test/SchemaField_test.js
+++ b/test/SchemaField_test.js
@@ -116,7 +116,8 @@ describe("SchemaField", () => {
 
       const { registry } = receivedProps;
       expect(registry.widgets).eql(getDefaultRegistry().widgets);
-      expect(registry.definitions).eql({});
+      // TODO: change this later
+      expect(registry.definitions).eql(schema);
       expect(registry.fields).to.be.an("object");
       expect(registry.fields.SchemaField).eql(SchemaField);
       expect(registry.fields.TitleField).eql(TitleField);
diff --git a/test/utils_test.js b/test/utils_test.js
index d79762470e..1e42f4abf4 100644
--- a/test/utils_test.js
+++ b/test/utils_test.js
@@ -538,7 +538,7 @@ describe("utils", () => {
           default: { foo: 42 },
         };
 
-        expect(getDefaultFormState(schema, undefined, schema.definitions)).eql({
+        expect(getDefaultFormState(schema, undefined, schema)).eql({
           foo: 42,
         });
       });
@@ -1298,7 +1298,7 @@ describe("utils", () => {
         const definitions = {
           FooItem: { type: "string", enum: ["foo"] },
         };
-        expect(isMultiSelect(schema, definitions)).to.be.true;
+        expect(isMultiSelect(schema, {definitions})).to.be.true;
       });
     });
 
@@ -1633,7 +1633,7 @@ describe("utils", () => {
       };
       const definitions = { address };
 
-      expect(retrieveSchema(schema, definitions)).eql(address);
+      expect(retrieveSchema(schema, {definitions})).eql(address);
     });
 
     it("should 'resolve' escaped JSON Pointers", () => {
@@ -1641,7 +1641,7 @@ describe("utils", () => {
       const address = { type: "string" };
       const definitions = { "a~complex/name": address };
 
-      expect(retrieveSchema(schema, definitions)).eql(address);
+      expect(retrieveSchema(schema, {definitions})).eql(address);
     });
 
     it("should 'resolve' and stub out a schema which contains an `additionalProperties` with a definition", () => {
@@ -1665,7 +1665,7 @@ describe("utils", () => {
       const definitions = { components: { schemas: { address } } };
       const formData = { newKey: {} };
 
-      expect(retrieveSchema(schema, definitions, formData)).eql({
+      expect(retrieveSchema(schema, {definitions}, formData)).eql({
         ...schema,
         properties: {
           newKey: {
@@ -1691,7 +1691,7 @@ describe("utils", () => {
       const definitions = { number };
       const formData = { newKey: {} };
 
-      expect(retrieveSchema(schema, definitions, formData)).eql({
+      expect(retrieveSchema(schema, {definitions}, formData)).eql({
         ...schema,
         properties: {
           newKey: {
@@ -1713,7 +1713,7 @@ describe("utils", () => {
       };
       const definitions = { address };
 
-      expect(retrieveSchema(schema, definitions)).eql({
+      expect(retrieveSchema(schema, {definitions})).eql({
         ...address,
         title: "foo",
       });
@@ -1735,7 +1735,7 @@ describe("utils", () => {
           };
           const definitions = {};
           const formData = {};
-          expect(retrieveSchema(schema, definitions, formData)).eql({
+          expect(retrieveSchema(schema, {definitions}, formData)).eql({
             type: "object",
             properties: {
               a: { type: "string" },
@@ -1761,7 +1761,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = { a: "1" };
-            expect(retrieveSchema(schema, definitions, formData)).eql({
+            expect(retrieveSchema(schema, {definitions}, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string" },
@@ -1787,7 +1787,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = { a: "1" };
-            expect(retrieveSchema(schema, definitions, formData)).eql({
+            expect(retrieveSchema(schema, {definitions}, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string" },
@@ -1819,7 +1819,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = {};
-            expect(retrieveSchema(schema, definitions, formData)).eql({
+            expect(retrieveSchema(schema, {definitions}, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string" },
@@ -1845,7 +1845,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = { a: "1" };
-            expect(retrieveSchema(schema, definitions, formData)).eql({
+            expect(retrieveSchema(schema, {definitions}, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string" },
@@ -1872,7 +1872,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = { a: "1" };
-            expect(retrieveSchema(schema, definitions, formData)).eql({
+            expect(retrieveSchema(schema, {definitions}, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string" },
@@ -1901,7 +1901,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = { a: "FOO" };
-            expect(retrieveSchema(schema, definitions, formData)).eql({
+            expect(retrieveSchema(schema, {definitions}, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string", enum: ["FOO"] },
@@ -1933,7 +1933,7 @@ describe("utils", () => {
               },
             };
             const formData = { a: "1" };
-            expect(retrieveSchema(schema, definitions, formData)).eql({
+            expect(retrieveSchema(schema, {definitions}, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string" },
@@ -1974,7 +1974,7 @@ describe("utils", () => {
               },
             };
             const formData = { a: "typeB" };
-            expect(retrieveSchema(schema, definitions, formData)).eql({
+            expect(retrieveSchema(schema, {definitions}, formData)).eql({
               type: "object",
               properties: {
                 a: { enum: ["typeA", "typeB"] },
@@ -2014,7 +2014,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = {};
-            expect(retrieveSchema(schema, definitions, formData)).eql({
+            expect(retrieveSchema(schema, {definitions}, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string" },
@@ -2051,7 +2051,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = { a: "int" };
-            expect(retrieveSchema(schema, definitions, formData)).eql({
+            expect(retrieveSchema(schema, {definitions}, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string", enum: ["int", "bool"] },
@@ -2087,7 +2087,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = { a: "bool" };
-            expect(retrieveSchema(schema, definitions, formData)).eql({
+            expect(retrieveSchema(schema, {definitions}, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string", enum: ["int", "bool"] },
@@ -2173,7 +2173,7 @@ describe("utils", () => {
                 employee_accounts: false,
                 update_absences: "BOTH",
               };
-              expect(retrieveSchema(schema, definitions, formData)).eql({
+              expect(retrieveSchema(schema, {definitions}, formData)).eql({
                 type: "object",
                 properties: {
                   employee_accounts: {
@@ -2189,7 +2189,7 @@ describe("utils", () => {
                 employee_accounts: true,
                 update_absences: "BOTH",
               };
-              expect(retrieveSchema(schema, definitions, formData)).eql({
+              expect(retrieveSchema(schema, {definitions}, formData)).eql({
                 type: "object",
                 properties: {
                   employee_accounts: {
@@ -2248,7 +2248,7 @@ describe("utils", () => {
               },
             };
             const formData = { a: "bool" };
-            expect(retrieveSchema(schema, definitions, formData)).eql({
+            expect(retrieveSchema(schema, {definitions}, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string", enum: ["int", "bool"] },
@@ -2461,7 +2461,7 @@ describe("utils", () => {
         $ref: "#/definitions/testdef",
       };
 
-      expect(toIdSchema(schema, undefined, schema.definitions)).eql({
+      expect(toIdSchema(schema, undefined, schema)).eql({
         $id: "root",
         foo: { $id: "root_foo" },
         bar: { $id: "root_bar" },
@@ -2486,7 +2486,7 @@ describe("utils", () => {
         foo: "test",
       };
 
-      expect(toIdSchema(schema, undefined, schema.definitions, formData)).eql({
+      expect(toIdSchema(schema, undefined, schema, formData)).eql({
         $id: "root",
         foo: { $id: "root_foo" },
         bar: { $id: "root_bar" },
@@ -2518,7 +2518,7 @@ describe("utils", () => {
         },
       };
 
-      expect(toIdSchema(schema, undefined, schema.definitions, formData)).eql({
+      expect(toIdSchema(schema, undefined, schema, formData)).eql({
         $id: "root",
         obj: {
           $id: "root_obj",
@@ -2545,7 +2545,7 @@ describe("utils", () => {
 
       const formData = {};
 
-      expect(toIdSchema(schema, undefined, schema.definitions, formData)).eql({
+      expect(toIdSchema(schema, undefined, schema, formData)).eql({
         $id: "root",
         foo: { $id: "root_foo" },
       });
@@ -2565,7 +2565,7 @@ describe("utils", () => {
         $ref: "#/definitions/testdef",
       };
 
-      expect(toIdSchema(schema, undefined, schema.definitions, {}, "rjsf")).eql(
+      expect(toIdSchema(schema, undefined, schema, {}, "rjsf")).eql(
         {
           $id: "rjsf",
           foo: { $id: "rjsf_foo" },
@@ -2666,7 +2666,7 @@ describe("utils", () => {
         ],
       };
 
-      expect(toPathSchema(schema, "", schema.definitions, formData)).eql({
+      expect(toPathSchema(schema, "", schema, formData)).eql({
         $name: "",
         list: {
           $name: "list",
@@ -2740,7 +2740,7 @@ describe("utils", () => {
         },
       };
 
-      expect(toPathSchema(schema, "", schema.definitions, formData)).eql({
+      expect(toPathSchema(schema, "", schema, formData)).eql({
         $name: "",
         billing_address: {
           $name: "billing_address",
@@ -2803,7 +2803,7 @@ describe("utils", () => {
         ],
       };
 
-      expect(toPathSchema(schema, "", schema.definitions, formData)).eql({
+      expect(toPathSchema(schema, "", schema, formData)).eql({
         $name: "",
         address_list: {
           $name: "address_list",
@@ -3021,7 +3021,7 @@ describe("utils", () => {
         ],
       };
 
-      expect(toPathSchema(schema, "", schema.definitions, formData)).eql({
+      expect(toPathSchema(schema, "", schema, formData)).eql({
         $name: "",
         defaultsAndMinItems: {
           $name: "defaultsAndMinItems",

From faf8021cc73c9e9664ae1e79c0617a1b7d9738f2 Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Sat, 9 Nov 2019 23:57:00 +0000
Subject: [PATCH 02/18] use jsonpointer to handle non-"#/definitions"
 definitions

---
 package.json       |  1 +
 src/utils.js       | 35 +++++++++++++----------------------
 test/Form_test.js  |  6 +++---
 test/utils_test.js | 21 +++++++++++++++++++++
 4 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index 8cf3dfa73a..364cf632dd 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "@babel/runtime-corejs2": "^7.4.5",
     "ajv": "^6.7.0",
     "core-js": "^2.5.7",
+    "jsonpointer": "^4.0.1",
     "lodash": "^4.17.15",
     "prop-types": "^15.7.2",
     "react-app-polyfill": "^1.0.4",
diff --git a/src/utils.js b/src/utils.js
index 983f10e911..3959422256 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -3,6 +3,7 @@ import * as ReactIs from "react-is";
 import fill from "core-js/library/fn/array/fill";
 import validateFormData, { isValid } from "./validate";
 import { union } from "lodash";
+import jsonpointer from "jsonpointer";
 
 export const ADDITIONAL_PROPERTY_FLAG = "__additional_property";
 
@@ -543,29 +544,19 @@ export function optionsList(schema) {
 }
 
 function findSchemaDefinition($ref, rootSchema = {}) {
-  // Extract and use the referenced definition if we have it.
-  const definitions = rootSchema.definitions || {};
-  const match = /^#\/definitions\/(.*)$/.exec($ref);
-  if (match && match[1]) {
-    const parts = match[1].split("/");
-    let current = definitions;
-    for (let part of parts) {
-      part = part.replace(/~1/g, "/").replace(/~0/g, "~");
-      while (current.hasOwnProperty("$ref")) {
-        current = findSchemaDefinition(current.$ref, rootSchema);
-      }
-      if (current.hasOwnProperty(part)) {
-        current = current[part];
-      } else {
-        // No matching definition found, that's an error (bogus schema?)
-        throw new Error(`Could not find a definition for ${$ref}.`);
-      }
-    }
-    return current;
+  const origRef = $ref;
+  if ($ref.startsWith("#/definitions")) {
+    // Backwards compatibility with old #/definitions syntax.
+    $ref = $ref.substring(1);
   }
-
-  // No matching definition found, that's an error (bogus schema?)
-  throw new Error(`Could not find a definition for ${$ref}.`);
+  const current = jsonpointer.get(rootSchema, $ref);
+  if (current === undefined) {
+    throw new Error(`Could not find a definition for ${origRef}.`);
+  }
+  if (current.hasOwnProperty("$ref")) {
+    return findSchemaDefinition(current.$ref, rootSchema);
+  }
+  return current;
 }
 
 // In the case where we have to implicitly create a schema, it is useful to know what type to use
diff --git a/test/Form_test.js b/test/Form_test.js
index 79292e29f3..889ec7d513 100644
--- a/test/Form_test.js
+++ b/test/Form_test.js
@@ -618,8 +618,8 @@ describeRepeated("Form common", createFormComponent => {
 
       expect(node.querySelectorAll("input[type=text]")).to.have.length.of(1);
     });
-
-    it("should handle recursive references to deep schema definitions", () => {
+    // TODO: should these two tests be skipped? should we deprecate this functionality?
+    it.skip("should handle recursive references to deep schema definitions", () => {
       const schema = {
         definitions: {
           testdef: {
@@ -643,7 +643,7 @@ describeRepeated("Form common", createFormComponent => {
       expect(node.querySelectorAll("input[type=text]")).to.have.length.of(1);
     });
 
-    it("should handle multiple recursive references to deep schema definitions", () => {
+    it.skip("should handle multiple recursive references to deep schema definitions", () => {
       const schema = {
         definitions: {
           testdef: {
diff --git a/test/utils_test.js b/test/utils_test.js
index 1e42f4abf4..20da0e66ee 100644
--- a/test/utils_test.js
+++ b/test/utils_test.js
@@ -1636,6 +1636,27 @@ describe("utils", () => {
       expect(retrieveSchema(schema, {definitions})).eql(address);
     });
 
+    it("should 'resolve' a schema which contains definitions not in `#/definitions`", () => {
+      const address = {
+        type: "object",
+        properties: {
+          street_address: { type: "string" },
+          city: { type: "string" },
+          state: { type: "string" },
+        },
+        required: ["street_address", "city", "state"],
+      };
+      const schema = {
+        $ref: "/components/schemas/address",
+        components: { schemas: { address } }
+      };
+
+      expect(retrieveSchema(schema, schema)).eql({
+        components: { schemas: { address } },
+        ...address
+      });
+    });
+
     it("should 'resolve' escaped JSON Pointers", () => {
       const schema = { $ref: "#/definitions/a~0complex~1name" };
       const address = { type: "string" };

From 512aa1a976066d17c5161a14d72e5ac6eb5ddc6d Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Mon, 25 Nov 2019 02:14:37 +0000
Subject: [PATCH 03/18] revert package-lock

---
 package-lock.json | 434 +++++++++++++++++++++++-----------------------
 1 file changed, 217 insertions(+), 217 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fe8a38a29a..defd4f1b73 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,7 +7,7 @@
     "@evocateur/libnpmaccess": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz",
-      "integrity": "sha1-7Pf2zmsATp+UKwmNkiAL5KSxyEU=",
+      "integrity": "sha512-KSCAHwNWro0CF2ukxufCitT9K5LjL/KuMmNzSu8wuwN2rjyKHD8+cmOsiybK+W5hdnwc5M1SmRlVCaMHQo+3rg==",
       "requires": {
         "@evocateur/npm-registry-fetch": "^4.0.0",
         "aproba": "^2.0.0",
@@ -19,7 +19,7 @@
         "aproba": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-          "integrity": "sha1-UlILiuW1aSFbNU78DKo/4eRaitw="
+          "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
         },
         "get-stream": {
           "version": "4.1.0",
@@ -43,7 +43,7 @@
     "@evocateur/libnpmpublish": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/@evocateur/libnpmpublish/-/libnpmpublish-1.2.2.tgz",
-      "integrity": "sha1-Vd8J0tyhNq+6nIjHWconIZjbnxo=",
+      "integrity": "sha512-MJrrk9ct1FeY9zRlyeoyMieBjGDG9ihyyD9/Ft6MMrTxql9NyoEx2hw9casTIP4CdqEVu+3nQ2nXxoJ8RCXyFg==",
       "requires": {
         "@evocateur/npm-registry-fetch": "^4.0.0",
         "aproba": "^2.0.0",
@@ -96,7 +96,7 @@
     "@evocateur/npm-registry-fetch": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@evocateur/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz",
-      "integrity": "sha1-jEw4dm2NMtMgD8sKg/BktXNl7WY=",
+      "integrity": "sha512-k1WGfKRQyhJpIr+P17O5vLIo2ko1PFLKwoetatdduUSt/aQ4J2sJrJwwatdI5Z3SiYk/mRH9S3JpdmMFd/IK4g==",
       "requires": {
         "JSONStream": "^1.3.4",
         "bluebird": "^3.5.1",
@@ -118,14 +118,14 @@
         "yallist": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha1-27fa+b/YusmrRev2ArjLrQ1dCP0="
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
         }
       }
     },
     "@evocateur/pacote": {
       "version": "9.6.5",
       "resolved": "https://registry.npmjs.org/@evocateur/pacote/-/pacote-9.6.5.tgz",
-      "integrity": "sha1-M94yuiELbxfCDrq01JfvxnVfSuU=",
+      "integrity": "sha512-EI552lf0aG2nOV8NnZpTxNo2PcXKPmDbF9K8eCBFQdIZwHNGN/mi815fxtmUMa2wTa1yndotICIDt/V0vpEx2w==",
       "requires": {
         "@evocateur/npm-registry-fetch": "^4.0.0",
         "bluebird": "^3.5.3",
@@ -193,7 +193,7 @@
         "get-stream": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha1-wbJVV189wh1Zv8ec09K0axw6VLU=",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
           "requires": {
             "pump": "^3.0.0"
           }
@@ -219,7 +219,7 @@
         "lru-cache": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha1-HaJ+ZxAnGUdpXa9oSOhH8B2EuSA=",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
           "requires": {
             "yallist": "^3.0.2"
           }
@@ -285,7 +285,7 @@
         "safe-buffer": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-          "integrity": "sha1-t02uxJsRSPiMZLaNSbHoFcHy9Rk="
+          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
         },
         "semver": {
           "version": "5.7.1",
@@ -315,7 +315,7 @@
     "@lerna/add": {
       "version": "3.18.4",
       "resolved": "https://registry.npmjs.org/@lerna/add/-/add-3.18.4.tgz",
-      "integrity": "sha1-DZfHW2T+vBCpo4VGowGfDywksOY=",
+      "integrity": "sha512-R+9RmYrSbcmnmaFL2aB0HJtTq95ePEa0FMS4r4NnA7Xw07l5buVBPOfxv6P8kFrVvIcNpaa7S0Eo/KkbycMhKA==",
       "requires": {
         "@evocateur/pacote": "^9.6.3",
         "@lerna/bootstrap": "3.18.4",
@@ -332,19 +332,19 @@
         "p-map": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-          "integrity": "sha1-MQko/u+cnsxltosXaTAYpmXOoXU="
+          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="
         },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0="
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
         }
       }
     },
     "@lerna/bootstrap": {
       "version": "3.18.4",
       "resolved": "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.18.4.tgz",
-      "integrity": "sha1-tTQIADWOSRbp0rpyjSZqI/3XZlw=",
+      "integrity": "sha512-mvqMyionPSqhbeGhoUQYEBTgbJ47LkONHfQ1AKBET0fJOjIZf6x0pWC17KvfCjsiE017325ySLKDH23z1Kb9ww==",
       "requires": {
         "@lerna/command": "3.18.0",
         "@lerna/filter-options": "3.18.4",
@@ -386,7 +386,7 @@
     "@lerna/changed": {
       "version": "3.18.4",
       "resolved": "https://registry.npmjs.org/@lerna/changed/-/changed-3.18.4.tgz",
-      "integrity": "sha1-JFOtezVFVU6qNlNHoikEKRi23sw=",
+      "integrity": "sha512-Ui4UsneDk9gCuJRfTpR5js+Ctt9Je+j+3Q4z7H7HhBn6WeWDTp6FBGJZ7SfrBCdQ47EKK27Mr95LbJ4I77xFfQ==",
       "requires": {
         "@lerna/collect-updates": "3.18.0",
         "@lerna/command": "3.18.0",
@@ -397,7 +397,7 @@
     "@lerna/check-working-tree": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.16.5.tgz",
-      "integrity": "sha1-tPiuYbtFI1Yd+5+PjYdN1Gu0S6o=",
+      "integrity": "sha512-xWjVBcuhvB8+UmCSb5tKVLB5OuzSpw96WEhS2uz6hkWVa/Euh1A0/HJwn2cemyK47wUrCQXtczBUiqnq9yX5VQ==",
       "requires": {
         "@lerna/collect-uncommitted": "3.16.5",
         "@lerna/describe-ref": "3.16.5",
@@ -407,7 +407,7 @@
     "@lerna/child-process": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/child-process/-/child-process-3.16.5.tgz",
-      "integrity": "sha1-OPo8GAZKpKwHVK2AEUd2p7NqabI=",
+      "integrity": "sha512-vdcI7mzei9ERRV4oO8Y1LHBZ3A5+ampRKg1wq5nutLsUA4mEBN6H7JqjWOMY9xZemv6+kATm2ofjJ3lW5TszQg==",
       "requires": {
         "chalk": "^2.3.1",
         "execa": "^1.0.0",
@@ -435,7 +435,7 @@
         "cross-spawn": {
           "version": "6.0.5",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "requires": {
             "nice-try": "^1.0.4",
             "path-key": "^2.0.1",
@@ -493,7 +493,7 @@
     "@lerna/clean": {
       "version": "3.18.4",
       "resolved": "https://registry.npmjs.org/@lerna/clean/-/clean-3.18.4.tgz",
-      "integrity": "sha1-cEs0Xf7EYQgj1mcON/mYQZbViHQ=",
+      "integrity": "sha512-puuL0sBHIv3Tvq8cdu3kCGfRpdsXuaDGIRha33GVmRPfMBi2GN8nPPysVyWmP99PfgfafO6eT5R3jqXjvASAZA==",
       "requires": {
         "@lerna/command": "3.18.0",
         "@lerna/filter-options": "3.18.4",
@@ -515,7 +515,7 @@
     "@lerna/cli": {
       "version": "3.18.0",
       "resolved": "https://registry.npmjs.org/@lerna/cli/-/cli-3.18.0.tgz",
-      "integrity": "sha1-K2+GBb7imcatplvC5LPte/cVrzo=",
+      "integrity": "sha512-AwDyfGx7fxJgeaZllEuyJ9LZ6Tdv9yqRD9RX762yCJu+PCAFvB9bp6OYuRSGli7QQgM0CuOYnSg4xVNOmuGKDA==",
       "requires": {
         "@lerna/global-options": "3.13.0",
         "dedent": "^0.7.0",
@@ -526,7 +526,7 @@
     "@lerna/collect-uncommitted": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-3.16.5.tgz",
-      "integrity": "sha1-pJTWGqwxzceuxLvlLJZVAnQTLmM=",
+      "integrity": "sha512-ZgqnGwpDZiWyzIQVZtQaj9tRizsL4dUOhuOStWgTAw1EMe47cvAY2kL709DzxFhjr6JpJSjXV5rZEAeU3VE0Hg==",
       "requires": {
         "@lerna/child-process": "3.16.5",
         "chalk": "^2.3.1",
@@ -570,7 +570,7 @@
     "@lerna/collect-updates": {
       "version": "3.18.0",
       "resolved": "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.18.0.tgz",
-      "integrity": "sha1-YIbGTfMkSZPMCn+PwN3WoBAwCKY=",
+      "integrity": "sha512-LJMKgWsE/var1RSvpKDIxS8eJ7POADEc0HM3FQiTpEczhP6aZfv9x3wlDjaHpZm9MxJyQilqxZcasRANmRcNgw==",
       "requires": {
         "@lerna/child-process": "3.16.5",
         "@lerna/describe-ref": "3.16.5",
@@ -582,7 +582,7 @@
     "@lerna/command": {
       "version": "3.18.0",
       "resolved": "https://registry.npmjs.org/@lerna/command/-/command-3.18.0.tgz",
-      "integrity": "sha1-HkA5kySmnSaniWnVnPYOGbLxP8M=",
+      "integrity": "sha512-JQ0TGzuZc9Ky8xtwtSLywuvmkU8X62NTUT3rMNrUykIkOxBaO+tE0O98u2yo/9BYOeTRji9IsjKZEl5i9Qt0xQ==",
       "requires": {
         "@lerna/child-process": "3.16.5",
         "@lerna/package-graph": "3.18.0",
@@ -599,7 +599,7 @@
         "ci-info": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-          "integrity": "sha1-Z6npZL4xpR4V5QENWObxKDQAL0Y="
+          "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
         },
         "cross-spawn": {
           "version": "6.0.5",
@@ -616,7 +616,7 @@
         "execa": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha1-xiNqW7TfbW8V6I5/AXeYIWdJ3dg=",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
           "requires": {
             "cross-spawn": "^6.0.0",
             "get-stream": "^4.0.0",
@@ -638,7 +638,7 @@
         "is-ci": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-          "integrity": "sha1-a8YzQYGBDgS1wis9WJ/cpVAmQEw=",
+          "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
           "requires": {
             "ci-info": "^2.0.0"
           }
@@ -657,7 +657,7 @@
     "@lerna/conventional-commits": {
       "version": "3.16.4",
       "resolved": "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.16.4.tgz",
-      "integrity": "sha1-v0ZPEbL2U02tIE2wBDDhZRs0agQ=",
+      "integrity": "sha512-QSZJ0bC9n6FVaf+7KDIq5zMv8WnHXnwhyL5jG1Nyh3SgOg9q2uflqh7YsYB+G6FwaRfnPaKosh6obijpYg0llA==",
       "requires": {
         "@lerna/validation-error": "3.13.0",
         "conventional-changelog-angular": "^5.0.3",
@@ -704,7 +704,7 @@
     "@lerna/create": {
       "version": "3.18.0",
       "resolved": "https://registry.npmjs.org/@lerna/create/-/create-3.18.0.tgz",
-      "integrity": "sha1-eLpK9eztZhlEoSudfahVPAlsOQ0=",
+      "integrity": "sha512-y9oS7ND5T13c+cCTJHa2Y9in02ppzyjsNynVWFuS40eIzZ3z058d9+3qSBt1nkbbQlVyfLoP6+bZPsjyzap5ig==",
       "requires": {
         "@evocateur/pacote": "^9.6.3",
         "@lerna/child-process": "3.16.5",
@@ -785,12 +785,12 @@
         "webidl-conversions": {
           "version": "4.0.2",
           "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-          "integrity": "sha1-qFWYCx8LazWbodXZ+zmulB+qY60="
+          "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
         },
         "whatwg-url": {
           "version": "7.1.0",
           "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
-          "integrity": "sha1-wsSS8eymEpiO/T0iZr4bn8YXDQY=",
+          "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
           "requires": {
             "lodash.sortby": "^4.7.0",
             "tr46": "^1.0.1",
@@ -802,7 +802,7 @@
     "@lerna/create-symlink": {
       "version": "3.16.2",
       "resolved": "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.16.2.tgz",
-      "integrity": "sha1-QSy45Zpy9afZRj5ORyGtIHAUmWc=",
+      "integrity": "sha512-pzXIJp6av15P325sgiIRpsPXLFmkisLhMBCy4764d+7yjf2bzrJ4gkWVMhsv4AdF0NN3OyZ5jjzzTtLNqfR+Jw==",
       "requires": {
         "@zkochan/cmd-shim": "^3.1.0",
         "fs-extra": "^8.1.0",
@@ -812,7 +812,7 @@
     "@lerna/describe-ref": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.16.5.tgz",
-      "integrity": "sha1-ozjCWq7YN9PccLinLER8XGY0asA=",
+      "integrity": "sha512-c01+4gUF0saOOtDBzbLMFOTJDHTKbDFNErEY6q6i9QaXuzy9LNN62z+Hw4acAAZuJQhrVWncVathcmkkjvSVGw==",
       "requires": {
         "@lerna/child-process": "3.16.5",
         "npmlog": "^4.1.2"
@@ -821,7 +821,7 @@
     "@lerna/diff": {
       "version": "3.18.0",
       "resolved": "https://registry.npmjs.org/@lerna/diff/-/diff-3.18.0.tgz",
-      "integrity": "sha1-ljj/S0biqLDU6/VM8vJnrC+P2yk=",
+      "integrity": "sha512-3iLNlpurc2nV9k22w8ini2Zjm2UPo3xtQgWyqdA6eJjvge0+5AlNAWfPoV6cV+Hc1xDbJD2YDSFpZPJ1ZGilRw==",
       "requires": {
         "@lerna/child-process": "3.16.5",
         "@lerna/command": "3.18.0",
@@ -832,7 +832,7 @@
     "@lerna/exec": {
       "version": "3.18.4",
       "resolved": "https://registry.npmjs.org/@lerna/exec/-/exec-3.18.4.tgz",
-      "integrity": "sha1-f3IqvDxwdN/+aqSLynEXHgY1+Eo=",
+      "integrity": "sha512-BpBFxyCQXcfess9Nmj/OwQ9e1IhzPzNxqF5JK7dPIjko5oBn5Hm2EWVAcgUGSHKPZGLiOWPu3Wx/C92NtDBS1w==",
       "requires": {
         "@lerna/child-process": "3.16.5",
         "@lerna/command": "3.18.0",
@@ -852,7 +852,7 @@
     "@lerna/filter-options": {
       "version": "3.18.4",
       "resolved": "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.18.4.tgz",
-      "integrity": "sha1-9UdqfuIWmr7SetQzIi6SED9W+fE=",
+      "integrity": "sha512-4giVQD6tauRwweO/322LP2gfVDOVrt/xN4khkXyfkJDfcsZziFXq+668otD9KSLL8Ps+To4Fah3XbK0MoNuEvA==",
       "requires": {
         "@lerna/collect-updates": "3.18.0",
         "@lerna/filter-packages": "3.18.0",
@@ -864,7 +864,7 @@
     "@lerna/filter-packages": {
       "version": "3.18.0",
       "resolved": "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.18.0.tgz",
-      "integrity": "sha1-ano3bShSCNsDqClYz7gXLhebTnA=",
+      "integrity": "sha512-6/0pMM04bCHNATIOkouuYmPg6KH3VkPCIgTfQmdkPJTullERyEQfNUKikrefjxo1vHOoCACDpy65JYyKiAbdwQ==",
       "requires": {
         "@lerna/validation-error": "3.13.0",
         "multimatch": "^3.0.0",
@@ -874,7 +874,7 @@
     "@lerna/get-npm-exec-opts": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.13.0.tgz",
-      "integrity": "sha1-0bVSywCIGZ/D5+Em+RTjmgjfnqU=",
+      "integrity": "sha512-Y0xWL0rg3boVyJk6An/vurKzubyJKtrxYv2sj4bB8Mc5zZ3tqtv0ccbOkmkXKqbzvNNF7VeUt1OJ3DRgtC/QZw==",
       "requires": {
         "npmlog": "^4.1.2"
       }
@@ -882,7 +882,7 @@
     "@lerna/get-packed": {
       "version": "3.16.0",
       "resolved": "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-3.16.0.tgz",
-      "integrity": "sha1-GzFrcG3O6Gx7qlXlCwh5WUR4Uv8=",
+      "integrity": "sha512-AjsFiaJzo1GCPnJUJZiTW6J1EihrPkc2y3nMu6m3uWFxoleklsSCyImumzVZJssxMi3CPpztj8LmADLedl9kXw==",
       "requires": {
         "fs-extra": "^8.1.0",
         "ssri": "^6.0.1",
@@ -902,7 +902,7 @@
     "@lerna/github-client": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/github-client/-/github-client-3.16.5.tgz",
-      "integrity": "sha1-LrAjXDv3p+XZLXPgmzdhqyHzXC4=",
+      "integrity": "sha512-rHQdn8Dv/CJrO3VouOP66zAcJzrHsm+wFuZ4uGAai2At2NkgKH+tpNhQy2H1PSC0Ezj9LxvdaHYrUzULqVK5Hw==",
       "requires": {
         "@lerna/child-process": "3.16.5",
         "@octokit/plugin-enterprise-rest": "^3.6.1",
@@ -914,7 +914,7 @@
     "@lerna/gitlab-client": {
       "version": "3.15.0",
       "resolved": "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-3.15.0.tgz",
-      "integrity": "sha1-kfTsjGl7WsV/fyW9UP5lnSSqlqY=",
+      "integrity": "sha512-OsBvRSejHXUBMgwWQqNoioB8sgzL/Pf1pOUhHKtkiMl6aAWjklaaq5HPMvTIsZPfS6DJ9L5OK2GGZuooP/5c8Q==",
       "requires": {
         "node-fetch": "^2.5.0",
         "npmlog": "^4.1.2",
@@ -959,12 +959,12 @@
     "@lerna/global-options": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@lerna/global-options/-/global-options-3.13.0.tgz",
-      "integrity": "sha1-IXZiKQ2watnPLEnY4xAO4o6uuuE="
+      "integrity": "sha512-SlZvh1gVRRzYLVluz9fryY1nJpZ0FHDGB66U9tFfvnnxmueckRQxLopn3tXj3NU1kc3QANT2I5BsQkOqZ4TEFQ=="
     },
     "@lerna/has-npm-version": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-3.16.5.tgz",
-      "integrity": "sha1-q4OVbyEdiSPqav6bl5s4zHOxUyY=",
+      "integrity": "sha512-WL7LycR9bkftyqbYop5rEGJ9sRFIV55tSGmbN1HLrF9idwOCD7CLrT64t235t3t4O5gehDnwKI5h2U3oxTrF8Q==",
       "requires": {
         "@lerna/child-process": "3.16.5",
         "semver": "^6.2.0"
@@ -980,7 +980,7 @@
     "@lerna/import": {
       "version": "3.18.0",
       "resolved": "https://registry.npmjs.org/@lerna/import/-/import-3.18.0.tgz",
-      "integrity": "sha1-xrEks0agl+bA8/HtSSGieNGLyAs=",
+      "integrity": "sha512-2pYIkkBTZsEdccfc+dPsKZeSw3tBzKSyl0b2lGrfmNX2Y41qqOzsJCyI1WO1uvEIP8aOaLy4hPpqRIBe4ee7hw==",
       "requires": {
         "@lerna/child-process": "3.16.5",
         "@lerna/command": "3.18.0",
@@ -995,7 +995,7 @@
     "@lerna/init": {
       "version": "3.18.0",
       "resolved": "https://registry.npmjs.org/@lerna/init/-/init-3.18.0.tgz",
-      "integrity": "sha1-sjuRcMzh9GMBcN10To7nV4XqiY0=",
+      "integrity": "sha512-/vHpmXkMlSaJaq25v5K13mcs/2L7E32O6dSsEkHaZCDRiV2BOqsZng9jjbE/4ynfsWfLLlU9ZcydwG72C3I+mQ==",
       "requires": {
         "@lerna/child-process": "3.16.5",
         "@lerna/command": "3.18.0",
@@ -1014,7 +1014,7 @@
     "@lerna/link": {
       "version": "3.18.0",
       "resolved": "https://registry.npmjs.org/@lerna/link/-/link-3.18.0.tgz",
-      "integrity": "sha1-vHLcYu9Nj7hCsyhoh5gPmLdkeB0=",
+      "integrity": "sha512-FbbIpH0EpsC+dpAbvxCoF3cn7F1MAyJjEa5Lh3XkDGATOlinMFuKCbmX0NLpOPQZ5zghvrui97cx+jz5F2IlHw==",
       "requires": {
         "@lerna/command": "3.18.0",
         "@lerna/package-graph": "3.18.0",
@@ -1033,7 +1033,7 @@
     "@lerna/list": {
       "version": "3.18.4",
       "resolved": "https://registry.npmjs.org/@lerna/list/-/list-3.18.4.tgz",
-      "integrity": "sha1-QyDyYs2y31S1ez7w2pNcVo4w8ek=",
+      "integrity": "sha512-bgtlhAwhjHOTLq0iIuPs30abeuLbwZvVB60Ym8kPp+chh939obKU3vy2KMyX+Gpxf8pzuQG+k986YXcUBvXVsw==",
       "requires": {
         "@lerna/command": "3.18.0",
         "@lerna/filter-options": "3.18.4",
@@ -1044,7 +1044,7 @@
     "@lerna/listable": {
       "version": "3.18.4",
       "resolved": "https://registry.npmjs.org/@lerna/listable/-/listable-3.18.4.tgz",
-      "integrity": "sha1-RdFK1OugDX2nHeuoOTEr7XjgJoA=",
+      "integrity": "sha512-EKSsnST5k3dZfw+UTwBH1/sHQ1YfgjYjGxXCabyn55mMgc2GjoDekODMYzZ1TNF2NNy6RgIZ24X2JI8G22nZUw==",
       "requires": {
         "@lerna/query-graph": "3.18.0",
         "chalk": "^2.3.1",
@@ -1087,7 +1087,7 @@
     "@lerna/log-packed": {
       "version": "3.16.0",
       "resolved": "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-3.16.0.tgz",
-      "integrity": "sha1-+DmRBB7neySVY04URwtCJZ/SvBY=",
+      "integrity": "sha512-Fp+McSNBV/P2mnLUYTaSlG8GSmpXM7krKWcllqElGxvAqv6chk2K3c2k80MeVB4WvJ9tRjUUf+i7HUTiQ9/ckQ==",
       "requires": {
         "byte-size": "^5.0.1",
         "columnify": "^1.5.4",
@@ -1098,7 +1098,7 @@
     "@lerna/npm-conf": {
       "version": "3.16.0",
       "resolved": "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.16.0.tgz",
-      "integrity": "sha1-HBComuL2wu6WliVXc4aFMA03aCc=",
+      "integrity": "sha512-HbO3DUrTkCAn2iQ9+FF/eisDpWY5POQAOF1m7q//CZjdC2HSW3UYbKEGsSisFxSfaF9Z4jtrV+F/wX6qWs3CuA==",
       "requires": {
         "config-chain": "^1.1.11",
         "pify": "^4.0.1"
@@ -1114,7 +1114,7 @@
     "@lerna/npm-dist-tag": {
       "version": "3.18.1",
       "resolved": "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.18.1.tgz",
-      "integrity": "sha1-1N2C6pLkHpYLcRf4MQLrzXoj5RE=",
+      "integrity": "sha512-vWkZh2T/O9OjPLDrba0BTWO7ug/C3sCwjw7Qyk1aEbxMBXB/eEJPqirwJTWT+EtRJQYB01ky3K8ZFOhElVyjLw==",
       "requires": {
         "@evocateur/npm-registry-fetch": "^4.0.0",
         "@lerna/otplease": "3.16.0",
@@ -1126,7 +1126,7 @@
     "@lerna/npm-install": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.16.5.tgz",
-      "integrity": "sha1-1r/cFvgShdpmUVrkeSTW4njWN9M=",
+      "integrity": "sha512-hfiKk8Eku6rB9uApqsalHHTHY+mOrrHeWEs+gtg7+meQZMTS3kzv4oVp5cBZigndQr3knTLjwthT/FX4KvseFg==",
       "requires": {
         "@lerna/child-process": "3.16.5",
         "@lerna/get-npm-exec-opts": "3.13.0",
@@ -1140,7 +1140,7 @@
     "@lerna/npm-publish": {
       "version": "3.16.2",
       "resolved": "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.16.2.tgz",
-      "integrity": "sha1-qFC1RzlEbEqnZqDOq/qSg7sL5nY=",
+      "integrity": "sha512-tGMb9vfTxP57vUV5svkBQxd5Tzc+imZbu9ZYf8Mtwe0+HYfDjNiiHLIQw7G95w4YRdc5KsCE8sQ0uSj+f2soIg==",
       "requires": {
         "@evocateur/libnpmpublish": "^1.2.2",
         "@lerna/otplease": "3.16.0",
@@ -1163,7 +1163,7 @@
     "@lerna/npm-run-script": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.16.5.tgz",
-      "integrity": "sha1-nC7IJFOibAtG7cC7fBWBbIIfXBU=",
+      "integrity": "sha512-1asRi+LjmVn3pMjEdpqKJZFT/3ZNpb+VVeJMwrJaV/3DivdNg7XlPK9LTrORuKU4PSvhdEZvJmSlxCKyDpiXsQ==",
       "requires": {
         "@lerna/child-process": "3.16.5",
         "@lerna/get-npm-exec-opts": "3.13.0",
@@ -1173,7 +1173,7 @@
     "@lerna/otplease": {
       "version": "3.16.0",
       "resolved": "https://registry.npmjs.org/@lerna/otplease/-/otplease-3.16.0.tgz",
-      "integrity": "sha1-3mauxPPoNaRl176oS1ikq2WQoPo=",
+      "integrity": "sha512-uqZ15wYOHC+/V0WnD2iTLXARjvx3vNrpiIeyIvVlDB7rWse9mL4egex/QSgZ+lDx1OID7l2kgvcUD9cFpbqB7Q==",
       "requires": {
         "@lerna/prompt": "3.13.0",
         "figgy-pudding": "^3.5.1"
@@ -1182,7 +1182,7 @@
     "@lerna/output": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@lerna/output/-/output-3.13.0.tgz",
-      "integrity": "sha1-Pe18yQiyephyIopjDZUK7a56SYk=",
+      "integrity": "sha512-7ZnQ9nvUDu/WD+bNsypmPG5MwZBwu86iRoiW6C1WBuXXDxM5cnIAC1m2WxHeFnjyMrYlRXM9PzOQ9VDD+C15Rg==",
       "requires": {
         "npmlog": "^4.1.2"
       }
@@ -1190,7 +1190,7 @@
     "@lerna/pack-directory": {
       "version": "3.16.4",
       "resolved": "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.16.4.tgz",
-      "integrity": "sha1-Pq5fkb31rP4DhFEO1T+t3EwHRpM=",
+      "integrity": "sha512-uxSF0HZeGyKaaVHz5FroDY9A5NDDiCibrbYR6+khmrhZtY0Bgn6hWq8Gswl9iIlymA+VzCbshWIMX4o2O8C8ng==",
       "requires": {
         "@lerna/get-packed": "3.16.0",
         "@lerna/package": "3.16.0",
@@ -1205,7 +1205,7 @@
     "@lerna/package": {
       "version": "3.16.0",
       "resolved": "https://registry.npmjs.org/@lerna/package/-/package-3.16.0.tgz",
-      "integrity": "sha1-fgpG5Gl+2LipwU1Zx/iQ4NOLoTw=",
+      "integrity": "sha512-2lHBWpaxcBoiNVbtyLtPUuTYEaB/Z+eEqRS9duxpZs6D+mTTZMNy6/5vpEVSCBmzvdYpyqhqaYjjSLvjjr5Riw==",
       "requires": {
         "load-json-file": "^5.3.0",
         "npm-package-arg": "^6.1.0",
@@ -1248,7 +1248,7 @@
     "@lerna/package-graph": {
       "version": "3.18.0",
       "resolved": "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.18.0.tgz",
-      "integrity": "sha1-60LRRASlWyayRyCBYV4msIF82Ro=",
+      "integrity": "sha512-BLYDHO5ihPh20i3zoXfLZ5ZWDCrPuGANgVhl7k5pCmRj90LCvT+C7V3zrw70fErGAfvkcYepMqxD+oBrAYwquQ==",
       "requires": {
         "@lerna/prerelease-id-from-version": "3.16.0",
         "@lerna/validation-error": "3.13.0",
@@ -1267,7 +1267,7 @@
     "@lerna/prerelease-id-from-version": {
       "version": "3.16.0",
       "resolved": "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-3.16.0.tgz",
-      "integrity": "sha1-skv6eJ9eG6q5FNewi6rpt719g6E=",
+      "integrity": "sha512-qZyeUyrE59uOK8rKdGn7jQz+9uOpAaF/3hbslJVFL1NqF9ELDTqjCPXivuejMX/lN4OgD6BugTO4cR7UTq/sZA==",
       "requires": {
         "semver": "^6.2.0"
       },
@@ -1282,7 +1282,7 @@
     "@lerna/project": {
       "version": "3.18.0",
       "resolved": "https://registry.npmjs.org/@lerna/project/-/project-3.18.0.tgz",
-      "integrity": "sha1-Vv7uAdrrQsA8vfDtiioQy84y9nA=",
+      "integrity": "sha512-+LDwvdAp0BurOAWmeHE3uuticsq9hNxBI0+FMHiIai8jrygpJGahaQrBYWpwbshbQyVLeQgx3+YJdW2TbEdFWA==",
       "requires": {
         "@lerna/package": "3.16.0",
         "@lerna/validation-error": "3.13.0",
@@ -1301,7 +1301,7 @@
         "cosmiconfig": {
           "version": "5.2.1",
           "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-          "integrity": "sha1-BA9yaAnFked6F8CjYmykW08Wixo=",
+          "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
           "requires": {
             "import-fresh": "^2.0.0",
             "is-directory": "^0.3.1",
@@ -1325,7 +1325,7 @@
         "globby": {
           "version": "9.2.0",
           "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
-          "integrity": "sha1-/QKacGxwPSm90XD0tts6P3p8tj0=",
+          "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
           "requires": {
             "@types/glob": "^7.1.1",
             "array-union": "^1.0.2",
@@ -1345,12 +1345,12 @@
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw="
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
         },
         "load-json-file": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
-          "integrity": "sha1-TTweAfocA+p4pgrHr5MsnOU0A/M=",
+          "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
           "requires": {
             "graceful-fs": "^4.1.15",
             "parse-json": "^4.0.0",
@@ -1381,14 +1381,14 @@
         "resolve-from": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY="
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
         }
       }
     },
     "@lerna/prompt": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.13.0.tgz",
-      "integrity": "sha1-U1cUYrs/U5nMHKbTNaQR/gk0JqU=",
+      "integrity": "sha512-P+lWSFokdyvYpkwC3it9cE0IF2U5yy2mOUbGvvE4iDb9K7TyXGE+7lwtx2thtPvBAfIb7O13POMkv7df03HJeA==",
       "requires": {
         "inquirer": "^6.2.0",
         "npmlog": "^4.1.2"
@@ -1402,7 +1402,7 @@
         "ansi-regex": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc="
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
         },
         "ansi-styles": {
           "version": "3.2.1",
@@ -1425,12 +1425,12 @@
         "chardet": {
           "version": "0.7.0",
           "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-          "integrity": "sha1-kAlISfCTfy7twkJdDSip5fDLrZ4="
+          "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
         },
         "external-editor": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-          "integrity": "sha1-ywP3QL764D6k0oPK7SdBqD8zVJU=",
+          "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
           "requires": {
             "chardet": "^0.7.0",
             "iconv-lite": "^0.4.24",
@@ -1453,7 +1453,7 @@
         "inquirer": {
           "version": "6.5.2",
           "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
-          "integrity": "sha1-rVCUI3XQNtMn/1KMCL1fqwiZKMo=",
+          "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
           "requires": {
             "ansi-escapes": "^3.2.0",
             "chalk": "^2.4.2",
@@ -1473,7 +1473,7 @@
         "rxjs": {
           "version": "6.5.3",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
-          "integrity": "sha1-UQ4mMX9NuRp+sd532d2boKSJmjo=",
+          "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
           "requires": {
             "tslib": "^1.9.0"
           }
@@ -1481,7 +1481,7 @@
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "requires": {
             "ansi-regex": "^4.1.0"
           }
@@ -1499,7 +1499,7 @@
     "@lerna/publish": {
       "version": "3.18.4",
       "resolved": "https://registry.npmjs.org/@lerna/publish/-/publish-3.18.4.tgz",
-      "integrity": "sha1-Lz3p0ArmPsibVBEZnouslkRbnxc=",
+      "integrity": "sha512-Q+MqM5DUZvk+uT6hdEyO3khXET6LwED0YEuCu8fRwtHad03HkZ9i8PtTY5h8Sn6D6RCyCOlHTuf8O0KKAUy3ow==",
       "requires": {
         "@evocateur/libnpmaccess": "^3.1.2",
         "@evocateur/npm-registry-fetch": "^4.0.0",
@@ -1548,7 +1548,7 @@
     "@lerna/pulse-till-done": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-3.13.0.tgz",
-      "integrity": "sha1-yOnOW6+vENkwpn1+0My12Vj+ARA=",
+      "integrity": "sha512-1SOHpy7ZNTPulzIbargrgaJX387csN7cF1cLOGZiJQA6VqnS5eWs2CIrG8i8wmaUavj2QlQ5oEbRMVVXSsGrzA==",
       "requires": {
         "npmlog": "^4.1.2"
       }
@@ -1556,7 +1556,7 @@
     "@lerna/query-graph": {
       "version": "3.18.0",
       "resolved": "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-3.18.0.tgz",
-      "integrity": "sha1-Q4AaLxuAoOoL/Z1C1HBgUyajA10=",
+      "integrity": "sha512-fgUhLx6V0jDuKZaKj562jkuuhrfVcjl5sscdfttJ8dXNVADfDz76nzzwLY0ZU7/0m69jDedohn5Fx5p7hDEVEg==",
       "requires": {
         "@lerna/package-graph": "3.18.0",
         "figgy-pudding": "^3.5.1"
@@ -1565,7 +1565,7 @@
     "@lerna/resolve-symlink": {
       "version": "3.16.0",
       "resolved": "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.16.0.tgz",
-      "integrity": "sha1-N/xwlfq9vPMXwm63Tg0L3o79I4Y=",
+      "integrity": "sha512-Ibj5e7njVHNJ/NOqT4HlEgPFPtPLWsO7iu59AM5bJDcAJcR96mLZ7KGVIsS2tvaO7akMEJvt2P+ErwCdloG3jQ==",
       "requires": {
         "fs-extra": "^8.1.0",
         "npmlog": "^4.1.2",
@@ -1575,7 +1575,7 @@
     "@lerna/rimraf-dir": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.16.5.tgz",
-      "integrity": "sha1-BDFqtf/SkJZXqvOI6lAsuMLyCgk=",
+      "integrity": "sha512-bQlKmO0pXUsXoF8lOLknhyQjOZsCc0bosQDoX4lujBXSWxHVTg1VxURtWf2lUjz/ACsJVDfvHZbDm8kyBk5okA==",
       "requires": {
         "@lerna/child-process": "3.16.5",
         "npmlog": "^4.1.2",
@@ -1593,7 +1593,7 @@
     "@lerna/run": {
       "version": "3.18.4",
       "resolved": "https://registry.npmjs.org/@lerna/run/-/run-3.18.4.tgz",
-      "integrity": "sha1-w6s7/+TwmHYcIQoyFVgvO1sNcic=",
+      "integrity": "sha512-u2ZNO2fVk5kVEpbpn4DLJZZxZ08LFnIFuaXJMAhxvOgvm12ZF2rabA9kZc3NXp5+DedG5nHHgyoyLVVbStKzBA==",
       "requires": {
         "@lerna/command": "3.18.0",
         "@lerna/filter-options": "3.18.4",
@@ -1615,7 +1615,7 @@
     "@lerna/run-lifecycle": {
       "version": "3.16.2",
       "resolved": "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.16.2.tgz",
-      "integrity": "sha1-Z7KI+OqWTbnqT7H7x3FdW7sLzgA=",
+      "integrity": "sha512-RqFoznE8rDpyyF0rOJy3+KjZCeTkO8y/OB9orPauR7G2xQ7PTdCpgo7EO6ZNdz3Al+k1BydClZz/j78gNCmL2A==",
       "requires": {
         "@lerna/npm-conf": "3.16.0",
         "figgy-pudding": "^3.5.1",
@@ -1626,7 +1626,7 @@
     "@lerna/run-topologically": {
       "version": "3.18.0",
       "resolved": "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-3.18.0.tgz",
-      "integrity": "sha1-lQhgRVPPvroQbNhLcR+t4XlH+Uo=",
+      "integrity": "sha512-lrfEewwuUMC3ioxf9Z9NdHUakN6ihekcPfdYbzR2slmdbjYKmIA5srkWdrK8NwOpQCAuekpOovH2s8X3FGEopg==",
       "requires": {
         "@lerna/query-graph": "3.18.0",
         "figgy-pudding": "^3.5.1",
@@ -1636,7 +1636,7 @@
     "@lerna/symlink-binary": {
       "version": "3.17.0",
       "resolved": "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.17.0.tgz",
-      "integrity": "sha1-j4AxswmGOBSIPT8AmHf4Ljiu9Fo=",
+      "integrity": "sha512-RLpy9UY6+3nT5J+5jkM5MZyMmjNHxZIZvXLV+Q3MXrf7Eaa1hNqyynyj4RO95fxbS+EZc4XVSk25DGFQbcRNSQ==",
       "requires": {
         "@lerna/create-symlink": "3.16.2",
         "@lerna/package": "3.16.0",
@@ -1654,7 +1654,7 @@
     "@lerna/symlink-dependencies": {
       "version": "3.17.0",
       "resolved": "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.17.0.tgz",
-      "integrity": "sha1-SNY2DphYZaDlbNi1GzCKUmMIeEo=",
+      "integrity": "sha512-KmjU5YT1bpt6coOmdFueTJ7DFJL4H1w5eF8yAQ2zsGNTtZ+i5SGFBWpb9AQaw168dydc3s4eu0W0Sirda+F59Q==",
       "requires": {
         "@lerna/create-symlink": "3.16.2",
         "@lerna/resolve-symlink": "3.16.0",
@@ -1675,12 +1675,12 @@
     "@lerna/timer": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@lerna/timer/-/timer-3.13.0.tgz",
-      "integrity": "sha1-vNCQRVHbFuCDZNbBjl4hYPyHB4E="
+      "integrity": "sha512-RHWrDl8U4XNPqY5MQHkToWS9jHPnkLZEt5VD+uunCKTfzlxGnRCr3/zVr8VGy/uENMYpVP3wJa4RKGY6M0vkRw=="
     },
     "@lerna/validation-error": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-3.13.0.tgz",
-      "integrity": "sha1-yGuPB8WrlTn3db2KVJdukm83WcM=",
+      "integrity": "sha512-SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA==",
       "requires": {
         "npmlog": "^4.1.2"
       }
@@ -1688,7 +1688,7 @@
     "@lerna/version": {
       "version": "3.18.4",
       "resolved": "https://registry.npmjs.org/@lerna/version/-/version-3.18.4.tgz",
-      "integrity": "sha1-SCYaimnRsVq0CnzGQAOBxOSA7Gs=",
+      "integrity": "sha512-+gR9H89qSP8iqzNi4tRVQUbWlFMOlhbY6+5TXkP72Ibb/z87O+C46DBqizSMVaPQYdSYjS1c9Xfa1oOhEWxGaw==",
       "requires": {
         "@lerna/check-working-tree": "3.16.5",
         "@lerna/child-process": "3.16.5",
@@ -1795,7 +1795,7 @@
     "@lerna/write-log-file": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-3.13.0.tgz",
-      "integrity": "sha1-t42eTPwTSai+ZNkTJMTIGZ6CKiY=",
+      "integrity": "sha512-RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A==",
       "requires": {
         "npmlog": "^4.1.2",
         "write-file-atomic": "^2.3.0"
@@ -1804,7 +1804,7 @@
     "@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-      "integrity": "sha1-UkryQNGjYFJ7cwR17PoTRKpUDd4=",
+      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
       "requires": {
         "call-me-maybe": "^1.0.1",
         "glob-to-regexp": "^0.3.0"
@@ -1813,12 +1813,12 @@
     "@nodelib/fs.stat": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-      "integrity": "sha1-K1o6s/kYzKSKjHVMCBaOPwPrphs="
+      "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
     },
     "@octokit/endpoint": {
       "version": "5.5.1",
       "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.1.tgz",
-      "integrity": "sha1-LuqB4RDKdU/y3hHHkVTMq0rhaz8=",
+      "integrity": "sha512-nBFhRUb5YzVTCX/iAK1MgQ4uWo89Gu0TH00qQHoYRCsE12dWcG1OiLd7v2EIo2+tpUKPMOQ62QFy9hy9Vg2ULg==",
       "requires": {
         "@octokit/types": "^2.0.0",
         "is-plain-object": "^3.0.0",
@@ -1836,19 +1836,19 @@
         "isobject": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz",
-          "integrity": "sha1-PxyRVec7GSAiqAgZus0DQ3EWl7A="
+          "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA=="
         }
       }
     },
     "@octokit/plugin-enterprise-rest": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-3.6.2.tgz",
-      "integrity": "sha1-dN4lvvIeAYK0+gOoZ4zQCk5n5WE="
+      "integrity": "sha512-3wF5eueS5OHQYuAEudkpN+xVeUsg8vYEMMenEzLphUZ7PRZ8OJtDcsreL3ad9zxXmBbaFWzLmFcdob5CLyZftA=="
     },
     "@octokit/request": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.3.1.tgz",
-      "integrity": "sha1-OhrOReb4ixvkdJxdqWOzo7Si8SA=",
+      "integrity": "sha512-5/X0AL1ZgoU32fAepTfEoggFinO3rxsMLtzhlUX+RctLrusn/CApJuGFCd0v7GMFhF+8UiCsTTfsu7Fh1HnEJg==",
       "requires": {
         "@octokit/endpoint": "^5.5.0",
         "@octokit/request-error": "^1.0.1",
@@ -1863,7 +1863,7 @@
         "is-plain-object": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz",
-          "integrity": "sha1-R7/F2htdUNZBEIBsGZNZSC51qSg=",
+          "integrity": "sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg==",
           "requires": {
             "isobject": "^4.0.0"
           }
@@ -1876,14 +1876,14 @@
         "node-fetch": {
           "version": "2.6.0",
           "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-          "integrity": "sha1-5jNFY4bUqlWGP2dqerDaqP3ssP0="
+          "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
         }
       }
     },
     "@octokit/request-error": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.0.tgz",
-      "integrity": "sha1-pk0qnXoTVVVwzXlyLeSk12Nxuqo=",
+      "integrity": "sha512-DNBhROBYjjV/I9n7A8kVkmQNkqFAMem90dSxqvPq57e2hBr7mNTX98y3R2zDpqMQHVRpBDjsvsfIGgBzy+4PAg==",
       "requires": {
         "@octokit/types": "^2.0.0",
         "deprecation": "^2.0.0",
@@ -1893,7 +1893,7 @@
     "@octokit/rest": {
       "version": "16.34.1",
       "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.34.1.tgz",
-      "integrity": "sha1-4otaVzyi8VuwAvkLwBACCEXtnAE=",
+      "integrity": "sha512-JUoS12cdktf1fv86rgrjC/RvYLuL+o7p57W7zX1x7ANFJ7OvdV8emvUNkFlcidEaOkYrxK3SoWgQFt3FhNmabA==",
       "requires": {
         "@octokit/request": "^5.2.0",
         "@octokit/request-error": "^1.0.2",
@@ -1912,7 +1912,7 @@
     "@octokit/types": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.0.1.tgz",
-      "integrity": "sha1-DK8DZOAQKWJlYhWTrJo39A73Xa0=",
+      "integrity": "sha512-YDYgV6nCzdGdOm7wy43Ce8SQ3M5DMKegB8E5sTB/1xrxOdo2yS/KgUgML2N2ZGD621mkbdrAglwTyA4NDOlFFA==",
       "requires": {
         "@types/node": ">= 8"
       }
@@ -1920,12 +1920,12 @@
     "@types/events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
-      "integrity": "sha1-KGLz9Yqaf3w+eNefEw3U1xwlwqc="
+      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="
     },
     "@types/glob": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
-      "integrity": "sha1-qlmhxuP7xCHgfM0xqUTDDrpSFXU=",
+      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
       "requires": {
         "@types/events": "*",
         "@types/minimatch": "*",
@@ -1935,7 +1935,7 @@
     "@types/minimatch": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-      "integrity": "sha1-PcoOPzOyAPx9ETnAzZbBJoyt/Z0="
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
     },
     "@types/node": {
       "version": "12.6.8",
@@ -1945,7 +1945,7 @@
     "@zkochan/cmd-shim": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-3.1.0.tgz",
-      "integrity": "sha1-KrjtgfW7VFKoXyV1jrm4aBmC/S4=",
+      "integrity": "sha512-o8l0+x7C7sMZU3v9GuJIAU10qQLtwR1dtRQIOmlNMtyaqhmpXOzx1HWiYoWfmmf9HHZoAkXpc9TM9PQYF9d4Jg==",
       "requires": {
         "is-windows": "^1.0.0",
         "mkdirp-promise": "^5.0.1",
@@ -1955,7 +1955,7 @@
     "JSONStream": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha1-MgjB8I06TZkmGrZPkjArwV4RHKA=",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
       "requires": {
         "jsonparse": "^1.2.0",
         "through": ">=2.2.7 <3"
@@ -1964,12 +1964,12 @@
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
     "agent-base": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-      "integrity": "sha1-gWXwHENgCbzK0LHRIvBe13Dvxu4=",
+      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
       "requires": {
         "es6-promisify": "^5.0.0"
       }
@@ -1977,7 +1977,7 @@
     "agentkeepalive": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
-      "integrity": "sha1-oROSTdP6JKC8O3gQjEUMKr7gD2c=",
+      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
       "requires": {
         "humanize-ms": "^1.2.1"
       }
@@ -2000,7 +2000,7 @@
     "are-we-there-yet": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "requires": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -2032,7 +2032,7 @@
     "array-differ": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-2.1.0.tgz",
-      "integrity": "sha1-S5wcPxS5BnVwgpJXaeirkE9IAbE="
+      "integrity": "sha512-KbUpJgx909ZscOc/7CLATBFam7P1Z1QRQInvgT0UztM9Q72aGKCunKASAl7WNW0tnPmPyEMeMhdsfWhfmW037w=="
     },
     "array-find-index": {
       "version": "1.0.2",
@@ -2189,7 +2189,7 @@
     "before-after-hook": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.0.tgz",
-      "integrity": "sha1-tsA0h/ROJCAN0wyl5qGXnF0vtjU="
+      "integrity": "sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A=="
     },
     "bluebird": {
       "version": "3.5.2",
@@ -2208,7 +2208,7 @@
     "braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "requires": {
         "arr-flatten": "^1.1.0",
         "array-unique": "^0.3.2",
@@ -2260,7 +2260,7 @@
     "byte-size": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-5.0.1.tgz",
-      "integrity": "sha1-S2UQOaXs2Wdn5xo9ftOA5IvtQZE="
+      "integrity": "sha512-/XuKeqWocKsYa/cBY1YbSJSWWqTi4cFgr9S6OyM7PBaPbr9zvNGwWP33vt0uqGhwDdN+y3yhbXVILEUpnwEWGw=="
     },
     "cache-base": {
       "version": "1.0.1",
@@ -2308,7 +2308,7 @@
     "camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA="
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
     },
     "camelcase-keys": {
       "version": "4.2.0",
@@ -2379,7 +2379,7 @@
     "cliui": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha1-3u/P2y6AB4SqNPRvoI4GhRx7u8U=",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
       "requires": {
         "string-width": "^3.1.0",
         "strip-ansi": "^5.2.0",
@@ -2389,7 +2389,7 @@
         "ansi-regex": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc="
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
         },
         "ansi-styles": {
           "version": "3.2.1",
@@ -2402,12 +2402,12 @@
         "emoji-regex": {
           "version": "7.0.3",
           "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY="
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
         },
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha1-InZ74htirxCBV0MG9prFG2IgOWE=",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "requires": {
             "emoji-regex": "^7.0.1",
             "is-fullwidth-code-point": "^2.0.0",
@@ -2417,7 +2417,7 @@
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "requires": {
             "ansi-regex": "^4.1.0"
           }
@@ -2531,7 +2531,7 @@
     "config-chain": {
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
-      "integrity": "sha1-D96NCRIA616AjK8l/mGMAvSOTvo=",
+      "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
       "requires": {
         "ini": "^1.3.4",
         "proto-list": "~1.2.1"
@@ -2545,7 +2545,7 @@
     "conventional-changelog-angular": {
       "version": "5.0.5",
       "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.5.tgz",
-      "integrity": "sha1-abVBvPPlOKhXix5fuqvpvY9XK1c=",
+      "integrity": "sha512-RrkdWnL/TVyWV1ayWmSsrWorsTDqjL/VwG5ZSEneBQrd65ONcfeA1cW7FLtNweQyMiKOyriCMTKRSlk18DjTrw==",
       "requires": {
         "compare-func": "^1.3.1",
         "q": "^1.5.1"
@@ -2554,7 +2554,7 @@
     "conventional-changelog-core": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-3.2.3.tgz",
-      "integrity": "sha1-sxQQhW9DHIRwhqfctNLKGEp9iPs=",
+      "integrity": "sha512-LMMX1JlxPIq/Ez5aYAYS5CpuwbOk6QFp8O4HLAcZxe3vxoCtABkhfjetk8IYdRB9CDQGwJFLR3Dr55Za6XKgUQ==",
       "requires": {
         "conventional-changelog-writer": "^4.0.6",
         "conventional-commits-parser": "^3.0.3",
@@ -2634,7 +2634,7 @@
         "through2": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
-          "integrity": "sha1-OSducTwzAu3544jdnIEt07glvVo=",
+          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
           "requires": {
             "readable-stream": "2 || 3"
           }
@@ -2644,12 +2644,12 @@
     "conventional-changelog-preset-loader": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.2.0.tgz",
-      "integrity": "sha1-Vx4rPXtT1lWHvqnu3243+qXbT8w="
+      "integrity": "sha512-zXB+5vF7D5Y3Cb/rJfSyCCvFphCVmF8mFqOdncX3BmjZwAtGAPfYrBcT225udilCKvBbHgyzgxqz2GWDB5xShQ=="
     },
     "conventional-changelog-writer": {
       "version": "4.0.9",
       "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.9.tgz",
-      "integrity": "sha1-RKxMSBIbyQ5xyylH4eoabCIszX8=",
+      "integrity": "sha512-2Y3QfiAM37WvDMjkVNaRtZgxVzWKj73HE61YQ/95T53yle+CRwTVSl6Gbv/lWVKXeZcM5af9n9TDVf0k7Xh+cw==",
       "requires": {
         "compare-func": "^1.3.1",
         "conventional-commits-filter": "^2.0.2",
@@ -2681,7 +2681,7 @@
     "conventional-commits-filter": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz",
-      "integrity": "sha1-8SL4n7zVu4Hiry/KwCVNBi0QOcE=",
+      "integrity": "sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==",
       "requires": {
         "lodash.ismatch": "^4.4.0",
         "modify-values": "^1.0.0"
@@ -2690,7 +2690,7 @@
     "conventional-commits-parser": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.5.tgz",
-      "integrity": "sha1-30cdbLP2/s/RNWrHLgtXfb2uCpw=",
+      "integrity": "sha512-qVz9+5JwdJzsbt7JbJ6P7NOXBGt8CyLFJYSjKAuPSgO+5UGfcsbk9EMR+lI8Unlvx6qwIc2YDJlrGIfay2ehNA==",
       "requires": {
         "JSONStream": "^1.0.4",
         "is-text-path": "^2.0.0",
@@ -2714,7 +2714,7 @@
     "conventional-recommended-bump": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-5.0.1.tgz",
-      "integrity": "sha1-WvY5A5R7bgied3Z2ActZLKuxBro=",
+      "integrity": "sha512-RVdt0elRcCxL90IrNP0fYCpq1uGt2MALko0eyeQ+zQuDVWtMGAy9ng6yYn3kax42lCj9+XBxQ8ZN6S9bdKxDhQ==",
       "requires": {
         "concat-stream": "^2.0.0",
         "conventional-changelog-preset-loader": "^2.1.1",
@@ -2729,7 +2729,7 @@
         "concat-stream": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
-          "integrity": "sha1-QUz1r3kKSMYKub5FJ9VtXkETPLE=",
+          "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
           "requires": {
             "buffer-from": "^1.0.0",
             "inherits": "^2.0.3",
@@ -2740,7 +2740,7 @@
         "readable-stream": {
           "version": "3.4.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
-          "integrity": "sha1-pRwmdUZY4KPCHb9ZFjvUW6b0R/w=",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -2804,7 +2804,7 @@
     "dateformat": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-      "integrity": "sha1-puN0maTZqc+F71hyBE1ikByYia4="
+      "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="
     },
     "debug": {
       "version": "2.6.9",
@@ -2927,7 +2927,7 @@
     "deprecation": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
-      "integrity": "sha1-Y2jL20Cr8zc7UlrIfkomDDpwCRk="
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
     },
     "detect-indent": {
       "version": "5.0.0",
@@ -2946,7 +2946,7 @@
     "dir-glob": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
-      "integrity": "sha1-+gnwaUFTyJGLGLoN6vrpR2n8UMQ=",
+      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
       "requires": {
         "path-type": "^3.0.0"
       },
@@ -2954,7 +2954,7 @@
         "path-type": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha1-zvMdyOCho7sNEFwM2Xzzv0f0428=",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
           "requires": {
             "pify": "^3.0.0"
           }
@@ -2969,7 +2969,7 @@
     "dot-prop": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-      "integrity": "sha1-HxngwuGqDjJ5fEl5nyg3rGr2nFc=",
+      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
       "requires": {
         "is-obj": "^1.0.0"
       }
@@ -3058,7 +3058,7 @@
     "es6-promise": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha1-TrIVlMlyvEBVPSduUQU5FD21Pgo="
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
     },
     "es6-promisify": {
       "version": "5.0.0",
@@ -3081,7 +3081,7 @@
     "eventemitter3": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
-      "integrity": "sha1-LT1I+cNGaY/Og6hdfWZOmFNd9uc="
+      "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="
     },
     "expand-brackets": {
       "version": "2.1.4",
@@ -3142,7 +3142,7 @@
     "extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "requires": {
         "array-unique": "^0.3.2",
         "define-property": "^1.0.0",
@@ -3173,7 +3173,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -3181,7 +3181,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -3189,7 +3189,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -3211,7 +3211,7 @@
     "fast-glob": {
       "version": "2.2.7",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
-      "integrity": "sha1-aVOFfDr6R1//ku5gFdUtpwpM050=",
+      "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
       "requires": {
         "@mrmlnc/readdir-enhanced": "^2.2.1",
         "@nodelib/fs.stat": "^1.1.2",
@@ -3250,7 +3250,7 @@
     "figgy-pudding": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-      "integrity": "sha1-hiRwESkBxyeg5JWoB0S9W6odZ5A="
+      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w=="
     },
     "figures": {
       "version": "2.0.0",
@@ -3344,7 +3344,7 @@
     "fs-extra": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha1-SdQ8RaiM2Wd2aMt74bRu/bjS4cA=",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "requires": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^4.0.0",
@@ -3425,7 +3425,7 @@
     "genfun": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
-      "integrity": "sha1-ndlxCgaQClxKW/V6yl2k5S/nZTc="
+      "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA=="
     },
     "get-pkg-repo": {
       "version": "1.4.0",
@@ -3556,7 +3556,7 @@
     "get-port": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/get-port/-/get-port-4.2.0.tgz",
-      "integrity": "sha1-43Nosehjt2KcQ8WjI2Jflc8ksRk="
+      "integrity": "sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw=="
     },
     "get-stdin": {
       "version": "4.0.1",
@@ -3579,7 +3579,7 @@
     "git-raw-commits": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.0.tgz",
-      "integrity": "sha1-2Srd90RAwUvMXIPszj+3+KeRGLU=",
+      "integrity": "sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==",
       "requires": {
         "dargs": "^4.0.1",
         "lodash.template": "^4.0.2",
@@ -3600,7 +3600,7 @@
     "git-semver-tags": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-2.0.3.tgz",
-      "integrity": "sha1-SJiKcYrPWTgA+ZYiqVKnfEBb+jQ=",
+      "integrity": "sha512-tj4FD4ww2RX2ae//jSrXZzrocla9db5h0V7ikPl1P/WwoZar9epdUhwR7XHXSgc+ZkNq72BEEerqQuicoEQfzA==",
       "requires": {
         "meow": "^4.0.0",
         "semver": "^6.0.0"
@@ -3616,7 +3616,7 @@
     "git-up": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/git-up/-/git-up-4.0.1.tgz",
-      "integrity": "sha1-yy7whmU2QOch0gQv4xBIV9iQB8A=",
+      "integrity": "sha512-LFTZZrBlrCrGCG07/dm1aCjjpL1z9L3+5aEeI9SBhAqSc+kiA9Or1bgZhQFNppJX6h/f5McrvJt1mQXTFm6Qrw==",
       "requires": {
         "is-ssh": "^1.3.0",
         "parse-url": "^5.0.0"
@@ -3625,7 +3625,7 @@
     "git-url-parse": {
       "version": "11.1.2",
       "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.1.2.tgz",
-      "integrity": "sha1-r/Gol8NsyTaZJwWHvqPby7uV3mc=",
+      "integrity": "sha512-gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ==",
       "requires": {
         "git-up": "^4.0.0"
       }
@@ -3672,7 +3672,7 @@
     "handlebars": {
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.1.tgz",
-      "integrity": "sha1-igHDgsGAJyJg0H8tGqOudFcVx7o=",
+      "integrity": "sha512-C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA==",
       "requires": {
         "neo-async": "^2.6.0",
         "optimist": "^0.6.1",
@@ -3688,7 +3688,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -3804,12 +3804,12 @@
     "http-cache-semantics": {
       "version": "3.8.1",
       "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-      "integrity": "sha1-ObDhat2bYFvwqe89nar0hDtMrNI="
+      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="
     },
     "http-proxy-agent": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-      "integrity": "sha1-5IIb7vWyFCogJr1zkm/lN2McVAU=",
+      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
       "requires": {
         "agent-base": "4",
         "debug": "3.1.0"
@@ -3818,7 +3818,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "requires": {
             "ms": "2.0.0"
           }
@@ -3838,7 +3838,7 @@
     "https-proxy-agent": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-      "integrity": "sha1-TuenN6vZJniik9mzShr00NCMeHs=",
+      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
       "requires": {
         "agent-base": "^4.3.0",
         "debug": "^3.1.0"
@@ -3847,7 +3847,7 @@
         "debug": {
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "requires": {
             "ms": "^2.1.1"
           }
@@ -3855,7 +3855,7 @@
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         }
       }
     },
@@ -3883,7 +3883,7 @@
     "ignore-walk": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
-      "integrity": "sha1-AX4kRxhL/q3nwjjkrv3R6PlbHjc=",
+      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
       "requires": {
         "minimatch": "^3.0.4"
       }
@@ -3990,7 +3990,7 @@
     "infer-owner": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha1-xM78qo5RBRwqQLos6KPScpWvlGc="
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
     },
     "inflight": {
       "version": "1.0.6",
@@ -4009,12 +4009,12 @@
     "ini": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc="
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
     },
     "init-package-json": {
       "version": "1.10.3",
       "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz",
-      "integrity": "sha1-Rf/i9hCoyhNPK9HbVjeyNQcPbL4=",
+      "integrity": "sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==",
       "requires": {
         "glob": "^7.1.1",
         "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
@@ -4123,7 +4123,7 @@
     "is-glob": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha1-dWfb6fL14kZ7x3q4PEopSCQHpdw=",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
       "requires": {
         "is-extglob": "^2.1.1"
       }
@@ -4177,7 +4177,7 @@
     "is-ssh": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.1.tgz",
-      "integrity": "sha1-80moyt0k5lKYA3pSLPdSDy6BoPM=",
+      "integrity": "sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg==",
       "requires": {
         "protocols": "^1.1.0"
       }
@@ -4195,7 +4195,7 @@
     "is-text-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz",
-      "integrity": "sha1-skhOK3IKYz/rLoW2fcGT/3LHVjY=",
+      "integrity": "sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==",
       "requires": {
         "text-extensions": "^2.0.0"
       }
@@ -4300,7 +4300,7 @@
     "lerna": {
       "version": "3.18.4",
       "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.18.4.tgz",
-      "integrity": "sha1-EyhYyruPyDkzQd3du72F3QyoKnk=",
+      "integrity": "sha512-DiU53cvMxaU07Bj2HwBwUQ2O3c/ORNq/QwKj1vGJH4vSkZSTUxPryp2baSNlt8PmnLNXOVpw0vOTRkEF+6n/cA==",
       "requires": {
         "@lerna/add": "3.18.4",
         "@lerna/bootstrap": "3.18.4",
@@ -4375,7 +4375,7 @@
     "lodash.template": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha1-+XYZXPPzR9DV9SSDVp/oAxzM6Ks=",
+      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
       "requires": {
         "lodash._reinterpolate": "^3.0.0",
         "lodash.templatesettings": "^4.0.0"
@@ -4384,7 +4384,7 @@
     "lodash.templatesettings": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha1-5IExDwSdPPbUfpEq0JMTsVTw+zM=",
+      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
       "requires": {
         "lodash._reinterpolate": "^3.0.0"
       }
@@ -4406,7 +4406,7 @@
     "macos-release": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz",
-      "integrity": "sha1-6xkwsDbAgArevM1fF7xMEt6Ltx8="
+      "integrity": "sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA=="
     },
     "make-dir": {
       "version": "1.3.0",
@@ -4426,7 +4426,7 @@
     "make-fetch-happen": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.1.tgz",
-      "integrity": "sha1-+sZUAKtfepwAGGKj6bD0F/CEAXU=",
+      "integrity": "sha512-b4dfaMvUDR67zxUq1+GN7Ke9rH5WvGRmoHuMH7l+gmUCR2tCXFP6mpeJ9Dp+jB6z8mShRopSf1vLRBhRs8Cu5w==",
       "requires": {
         "agentkeepalive": "^3.4.1",
         "cacache": "^12.0.0",
@@ -4569,7 +4569,7 @@
     "meow": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
-      "integrity": "sha1-1IWY9vSxRy81v2MXqVlFrONH+XU=",
+      "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
       "requires": {
         "camelcase-keys": "^4.0.0",
         "decamelize-keys": "^1.0.0",
@@ -4652,12 +4652,12 @@
     "merge2": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
-      "integrity": "sha1-WzZu6DsvFYLEj4fkfPGpNSEDyoE="
+      "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw=="
     },
     "micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "requires": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
@@ -4715,7 +4715,7 @@
     "minimist-options": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
-      "integrity": "sha1-+6TIGRM54T7PTWG+sD8HAQPz2VQ=",
+      "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
       "requires": {
         "arrify": "^1.0.1",
         "is-plain-obj": "^1.1.0"
@@ -4783,7 +4783,7 @@
     "modify-values": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
-      "integrity": "sha1-s5OfpgVUZHTj4+PGPWS9Q7TuYCI="
+      "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw=="
     },
     "move-concurrently": {
       "version": "1.0.1",
@@ -4806,7 +4806,7 @@
     "multimatch": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-3.0.0.tgz",
-      "integrity": "sha1-DiU0zGvCONmrZ+G5zV/Nhabb9ws=",
+      "integrity": "sha512-22foS/gqQfANZ3o+W7ST2x25ueHDVNWl/b9OlGcLpy/iKxjCpvcNCM51YCenUi7Mt/jAjjqv8JwZRs8YP5sRjA==",
       "requires": {
         "array-differ": "^2.0.3",
         "array-union": "^1.0.2",
@@ -4822,7 +4822,7 @@
     "mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-      "integrity": "sha1-lQCAV6Vsr63CvGPd5/n/aVWUjjI=",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
       "requires": {
         "any-promise": "^1.0.0",
         "object-assign": "^4.0.1",
@@ -4872,7 +4872,7 @@
     "node-fetch-npm": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz",
-      "integrity": "sha1-cljJBGGC3KNFtCCO2pGNrzNpf/c=",
+      "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==",
       "requires": {
         "encoding": "^0.1.11",
         "json-parse-better-errors": "^1.0.0",
@@ -4882,7 +4882,7 @@
     "node-gyp": {
       "version": "5.0.5",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.5.tgz",
-      "integrity": "sha1-9s8dokbrjEKwl9fNTWw84jpBY68=",
+      "integrity": "sha512-WABl9s4/mqQdZneZHVWVG4TVr6QQJZUC6PAx47ITSk9lreZ1n+7Z9mMAIbA3vnO4J9W20P7LhCxtzfWsAD/KDw==",
       "requires": {
         "env-paths": "^1.0.0",
         "glob": "^7.0.3",
@@ -4926,12 +4926,12 @@
     "npm-bundled": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
-      "integrity": "sha1-57qarc75YrthJI+RchzZMrP+a90="
+      "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="
     },
     "npm-lifecycle": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.4.tgz",
-      "integrity": "sha1-3ml1x9jfZfUVDbEQtXzOSYsLYEw=",
+      "integrity": "sha512-tgs1PaucZwkxECGKhC/stbEgFyc3TGh2TJcg2CDr6jbvQRdteHNhmMeljRzpe4wgFAXQADoy1cSqqi7mtiAa5A==",
       "requires": {
         "byline": "^5.0.0",
         "graceful-fs": "^4.1.15",
@@ -4958,7 +4958,7 @@
     "npm-package-arg": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-      "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
+      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
       "requires": {
         "hosted-git-info": "^2.7.1",
         "osenv": "^0.1.5",
@@ -4981,7 +4981,7 @@
     "npm-packlist": {
       "version": "1.4.6",
       "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.6.tgz",
-      "integrity": "sha1-U7o+0R+FIwefFFc3bdN57k6kL/Q=",
+      "integrity": "sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg==",
       "requires": {
         "ignore-walk": "^3.0.1",
         "npm-bundled": "^1.0.1"
@@ -4990,7 +4990,7 @@
     "npm-pick-manifest": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz",
-      "integrity": "sha1-9Nnl/UviFT5fTl+be+jcQZqZq7c=",
+      "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
       "requires": {
         "figgy-pudding": "^3.5.1",
         "npm-package-arg": "^6.0.0",
@@ -5008,7 +5008,7 @@
     "npmlog": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "requires": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
@@ -5098,7 +5098,7 @@
     "octokit-pagination-methods": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz",
-      "integrity": "sha1-z0cu3J1VEFX573P25CtNu0yAvqQ="
+      "integrity": "sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="
     },
     "once": {
       "version": "1.4.0",
@@ -5140,7 +5140,7 @@
     "os-name": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
-      "integrity": "sha1-3sGdlmKW4c1i1wGlpm7h3ernCAE=",
+      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
       "requires": {
         "macos-release": "^2.2.0",
         "windows-release": "^3.1.0"
@@ -5154,7 +5154,7 @@
     "osenv": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "requires": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.0"
@@ -5197,7 +5197,7 @@
     "p-queue": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-4.0.0.tgz",
-      "integrity": "sha1-7Q7uh5iSftbywvX1t3/bIGGl00Y=",
+      "integrity": "sha512-3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg==",
       "requires": {
         "eventemitter3": "^3.1.0"
       }
@@ -5246,7 +5246,7 @@
     "parse-path": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-4.0.1.tgz",
-      "integrity": "sha1-DsdpcElJd4yzuO2l6ZTDIHOhrf8=",
+      "integrity": "sha512-d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA==",
       "requires": {
         "is-ssh": "^1.3.0",
         "protocols": "^1.4.0"
@@ -5255,7 +5255,7 @@
     "parse-url": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-5.0.1.tgz",
-      "integrity": "sha1-mcQIT8Eb4UFB76QbPRF6lvy5Un8=",
+      "integrity": "sha512-flNUPP27r3vJpROi0/R3/2efgKkyXqnXwyP1KQ2U0SfFRgdizOdWfvrrvJg1LuOoxs7GQhmxJlq23IpQ/BkByg==",
       "requires": {
         "is-ssh": "^1.3.0",
         "normalize-url": "^3.3.0",
@@ -5266,7 +5266,7 @@
         "normalize-url": {
           "version": "3.3.0",
           "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-          "integrity": "sha1-suHE3E98bVd0PfczpPWXjRhlBVk="
+          "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="
         }
       }
     },
@@ -5329,7 +5329,7 @@
     "prettier": {
       "version": "1.19.1",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
-      "integrity": "sha1-99f1/4qc2HKnvkyhQglZVqYHl8s="
+      "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="
     },
     "process-nextick-args": {
       "version": "2.0.0",
@@ -5366,12 +5366,12 @@
     "protocols": {
       "version": "1.4.7",
       "resolved": "https://registry.npmjs.org/protocols/-/protocols-1.4.7.tgz",
-      "integrity": "sha1-lfeIpPDpebKR/+/PVjatET0DfTI="
+      "integrity": "sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg=="
     },
     "protoduck": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz",
-      "integrity": "sha1-A8NlnKGAB7aaUP2Cp+vMUWJhFR8=",
+      "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
       "requires": {
         "genfun": "^5.0.0"
       }
@@ -5426,7 +5426,7 @@
     "read-cmd-shim": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz",
-      "integrity": "sha1-h+Q+ulAJi6WjLQzrWDq45DuWHBY=",
+      "integrity": "sha512-v5yCqQ/7okKoZZkBQUAfTsQ3sVJtXdNfbPnI5cceppoxEVLYA3k+VtV2omkeo8MS94JCy4fSiUwlRBAwCVRPUA==",
       "requires": {
         "graceful-fs": "^4.1.2"
       }
@@ -5434,7 +5434,7 @@
     "read-package-json": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz",
-      "integrity": "sha1-49QubDXqWugg2aA6sMcpEhf8UdU=",
+      "integrity": "sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A==",
       "requires": {
         "glob": "^7.1.1",
         "graceful-fs": "^4.1.2",
@@ -5453,7 +5453,7 @@
     "read-package-tree": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
-      "integrity": "sha1-oyy2TH8x64pvMe8G+c7fdAaP5jY=",
+      "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
       "requires": {
         "read-package-json": "^2.0.0",
         "readdir-scoped-modules": "^1.0.0",
@@ -5477,7 +5477,7 @@
     "readdir-scoped-modules": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
-      "integrity": "sha1-jUVAe0+HCg3K68DihnDRjnRRQwk=",
+      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
       "requires": {
         "debuglog": "^1.0.1",
         "dezalgo": "^1.0.0",
@@ -5693,7 +5693,7 @@
     "slash": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-      "integrity": "sha1-3lUoUaF1nfOo8gZTVEL17E3eq0Q="
+      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="
     },
     "slide": {
       "version": "1.1.6",
@@ -5703,7 +5703,7 @@
     "smart-buffer": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
-      "integrity": "sha1-kWBcJdkWUvRmHqacz0XxszHKIbo="
+      "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw=="
     },
     "snapdragon": {
       "version": "0.8.2",
@@ -5805,7 +5805,7 @@
     "socks": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
-      "integrity": "sha1-ARKfCl1TTSuJdxLtis6rfuZdeOM=",
+      "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
       "requires": {
         "ip": "1.1.5",
         "smart-buffer": "^4.1.0"
@@ -5814,7 +5814,7 @@
     "socks-proxy-agent": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
-      "integrity": "sha1-PImR8xRbJ5nnDhG9X7yLGWMRY4Y=",
+      "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
       "requires": {
         "agent-base": "~4.2.1",
         "socks": "~2.3.2"
@@ -5823,7 +5823,7 @@
         "agent-base": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
-          "integrity": "sha1-2J5ZmfeXh1Z0wH2H8mD8Qeg+jKk=",
+          "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
           "requires": {
             "es6-promisify": "^5.0.0"
           }
@@ -5883,7 +5883,7 @@
     "split": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-      "integrity": "sha1-YFvZvjA6pZ+zX5Ip++oN3snqB9k=",
+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
       "requires": {
         "through": "2"
       }
@@ -5899,7 +5899,7 @@
     "split2": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
-      "integrity": "sha1-GGsldbz4PoW30YRldWI47k7kJJM=",
+      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
       "requires": {
         "through2": "^2.0.2"
       }
@@ -6015,7 +6015,7 @@
     "strong-log-transformer": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz",
-      "integrity": "sha1-D17XjTJeBCGsb5D38Q5pHWrjrhA=",
+      "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==",
       "requires": {
         "duplexer": "^0.1.1",
         "minimist": "^1.2.0",
@@ -6078,7 +6078,7 @@
     "text-extensions": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-2.0.0.tgz",
-      "integrity": "sha1-Q+q9G0lUgvrkor9l5fVsKfaSIPY="
+      "integrity": "sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ=="
     },
     "thenify": {
       "version": "3.3.0",
@@ -6196,7 +6196,7 @@
     "type-fest": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-      "integrity": "sha1-Y9ANIE4FlHT+Xht8ARESu9HcKeE="
+      "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="
     },
     "typedarray": {
       "version": "0.0.6",
@@ -6206,7 +6206,7 @@
     "uglify-js": {
       "version": "3.6.8",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.8.tgz",
-      "integrity": "sha1-Xty8+dScuwQD3En4Vv6BUw1lFF4=",
+      "integrity": "sha512-XhHJ3S3ZyMwP8kY1Gkugqx3CJh2C3O0y8NPiSxtm1tyD/pktLAkFZsFGpuNfTZddKDQ/bbDBLAd2YyA1pbi8HQ==",
       "optional": true,
       "requires": {
         "commander": "~2.20.3",
@@ -6267,7 +6267,7 @@
     "universal-user-agent": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.0.tgz",
-      "integrity": "sha1-J9ouyH4ydpYZ9ooUmWRl6hy53xY=",
+      "integrity": "sha512-eM8knLpev67iBDizr/YtqkJsF3GK8gzDc6st/WKzrTuPtcsOKW/0IdL4cnMBsU69pOx0otavLWBDGTwg+dB0aA==",
       "requires": {
         "os-name": "^3.1.0"
       }
@@ -6275,7 +6275,7 @@
     "universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY="
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
     },
     "unset-value": {
       "version": "1.0.0",
@@ -6397,7 +6397,7 @@
     "wide-align": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "requires": {
         "string-width": "^1.0.2 || 2"
       }
@@ -6405,7 +6405,7 @@
     "windows-release": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.2.0.tgz",
-      "integrity": "sha1-gSLa1a/DA9gzQiOAaAp5zfqReF8=",
+      "integrity": "sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==",
       "requires": {
         "execa": "^1.0.0"
       },
@@ -6463,7 +6463,7 @@
     "write-file-atomic": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-      "integrity": "sha1-H9Lprh3z51uNjDZ0Q8aS1MqB9IE=",
+      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
       "requires": {
         "graceful-fs": "^4.1.11",
         "imurmurhash": "^0.1.4",
@@ -6473,7 +6473,7 @@
     "write-json-file": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz",
-      "integrity": "sha1-Zbvcns2KFFjhWVJ3DMut/P9f5io=",
+      "integrity": "sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==",
       "requires": {
         "detect-indent": "^5.0.0",
         "graceful-fs": "^4.1.15",
@@ -6520,7 +6520,7 @@
     "write-pkg": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-3.2.0.tgz",
-      "integrity": "sha1-DheP6Xgg04mokovHlTXb5ows/yE=",
+      "integrity": "sha512-tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw==",
       "requires": {
         "sort-keys": "^2.0.0",
         "write-json-file": "^2.2.0"
@@ -6580,12 +6580,12 @@
         "ansi-regex": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc="
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
         },
         "emoji-regex": {
           "version": "7.0.3",
           "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY="
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
         },
         "find-up": {
           "version": "3.0.0",
@@ -6643,7 +6643,7 @@
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha1-InZ74htirxCBV0MG9prFG2IgOWE=",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "requires": {
             "emoji-regex": "^7.0.1",
             "is-fullwidth-code-point": "^2.0.0",
@@ -6653,7 +6653,7 @@
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "requires": {
             "ansi-regex": "^4.1.0"
           }

From b95402064aa6e195c3b12b2e3931c77d7ab05867 Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Mon, 25 Nov 2019 02:26:41 +0000
Subject: [PATCH 04/18] make sure json pointers are URI fragment encoded

---
 packages/core/src/utils.js       |  8 +++++---
 packages/core/test/utils_test.js | 29 ++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/utils.js b/packages/core/src/utils.js
index 413ef2a4a8..1a6d003c89 100644
--- a/packages/core/src/utils.js
+++ b/packages/core/src/utils.js
@@ -539,9 +539,11 @@ export function optionsList(schema) {
 
 function findSchemaDefinition($ref, rootSchema = {}) {
   const origRef = $ref;
-  if ($ref.startsWith("#/definitions")) {
-    // Backwards compatibility with old #/definitions syntax.
-    $ref = $ref.substring(1);
+  if ($ref.startsWith("#")) {
+    // Decode URI fragment representation.
+    $ref = decodeURIComponent($ref.substring(1));
+  } else {
+    throw new Error(`Could not find a definition for ${origRef}.`);
   }
   const current = jsonpointer.get(rootSchema, $ref);
   if (current === undefined) {
diff --git a/packages/core/test/utils_test.js b/packages/core/test/utils_test.js
index 20da0e66ee..63ca881f73 100644
--- a/packages/core/test/utils_test.js
+++ b/packages/core/test/utils_test.js
@@ -1647,7 +1647,7 @@ describe("utils", () => {
         required: ["street_address", "city", "state"],
       };
       const schema = {
-        $ref: "/components/schemas/address",
+        $ref: "#/components/schemas/address",
         components: { schemas: { address } }
       };
 
@@ -1657,6 +1657,33 @@ describe("utils", () => {
       });
     });
 
+    it("should give an error when JSON pointer is not in a URI encoded format", () => {
+      const address = {
+        type: "object",
+        properties: {
+          street_address: { type: "string" },
+          city: { type: "string" },
+          state: { type: "string" },
+        },
+        required: ["street_address", "city", "state"],
+      };
+      const schema = {
+        $ref: "/components/schemas/address",
+        components: { schemas: { address } }
+      };
+
+      expect(() => retrieveSchema(schema, schema)).to.throw("Could not find a definition");
+    });
+
+    it("should give an error when JSON pointer does not point to anything", () => {
+      const schema = {
+        $ref: "#/components/schemas/address",
+        components: { schemas: { } }
+      };
+
+      expect(() => retrieveSchema(schema, schema)).to.throw("Could not find a definition");
+    });
+
     it("should 'resolve' escaped JSON Pointers", () => {
       const schema = { $ref: "#/definitions/a~0complex~1name" };
       const address = { type: "string" };

From f932a7af50260c56ba812128012c7ebc4c06d323 Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Mon, 25 Nov 2019 21:11:34 +0000
Subject: [PATCH 05/18] replace "definitions" with "rootSchema"  variable

---
 packages/core/src/components/Form.js          |  14 +-
 .../core/src/components/fields/ArrayField.js  |  32 ++---
 .../src/components/fields/MultiSchemaField.js |  10 +-
 .../core/src/components/fields/ObjectField.js |   6 +-
 .../core/src/components/fields/SchemaField.js |  10 +-
 packages/core/src/types.js                    |   2 +-
 packages/core/src/utils.js                    | 125 +++++++++---------
 packages/core/src/validate.js                 |   4 +-
 packages/core/test/anyOf_test.js              |   2 +-
 .../ArrayFieldTemplate/ArrayFieldTemplate.tsx |   2 +-
 10 files changed, 103 insertions(+), 104 deletions(-)

diff --git a/packages/core/src/components/Form.js b/packages/core/src/components/Form.js
index 1a90b13ef9..b7468f32d7 100644
--- a/packages/core/src/components/Form.js
+++ b/packages/core/src/components/Form.js
@@ -60,9 +60,9 @@ export default class Form extends Component {
     const edit = typeof inputFormData !== "undefined";
     const liveValidate = props.liveValidate || this.props.liveValidate;
     const mustValidate = edit && !props.noValidate && liveValidate;
-    const definitions = schema;
-    const formData = getDefaultFormState(schema, inputFormData, definitions);
-    const retrievedSchema = retrieveSchema(schema, definitions, formData);
+    const rootSchema = schema;
+    const formData = getDefaultFormState(schema, inputFormData, rootSchema);
+    const retrievedSchema = retrieveSchema(schema, rootSchema, formData);
     const customFormats = props.customFormats;
     const additionalMetaSchemas = props.additionalMetaSchemas;
     let { errors, errorSchema } = mustValidate
@@ -78,7 +78,7 @@ export default class Form extends Component {
     const idSchema = toIdSchema(
       retrievedSchema,
       uiSchema["ui:rootFieldId"],
-      definitions,
+      rootSchema,
       formData,
       props.idPrefix
     );
@@ -105,8 +105,8 @@ export default class Form extends Component {
     customFormats = this.props.customFormats
   ) {
     const { validate, transformErrors } = this.props;
-    const { definitions } = this.getRegistry();
-    const resolvedSchema = retrieveSchema(schema, definitions, formData);
+    const { rootSchema } = this.getRegistry();
+    const resolvedSchema = retrieveSchema(schema, rootSchema, formData);
     return validateFormData(
       formData,
       resolvedSchema,
@@ -317,7 +317,7 @@ export default class Form extends Component {
       ObjectFieldTemplate: this.props.ObjectFieldTemplate,
       FieldTemplate: this.props.FieldTemplate,
       // TODO: fix this. this is a backwards incompatible change.
-      definitions: this.props.schema || {},
+      rootSchema: this.props.schema || {},
       formContext: this.props.formContext || {},
     };
   }
diff --git a/packages/core/src/components/fields/ArrayField.js b/packages/core/src/components/fields/ArrayField.js
index 9dc2ee2aa9..dfb86221ca 100644
--- a/packages/core/src/components/fields/ArrayField.js
+++ b/packages/core/src/components/fields/ArrayField.js
@@ -270,12 +270,12 @@ class ArrayField extends Component {
 
   _getNewFormDataRow = () => {
     const { schema, registry = getDefaultRegistry() } = this.props;
-    const { definitions } = registry;
+    const { rootSchema } = registry;
     let itemSchema = schema.items;
     if (isFixedItems(schema) && allowAdditionalItems(schema)) {
       itemSchema = schema.additionalItems;
     }
-    return getDefaultFormState(itemSchema, undefined, definitions);
+    return getDefaultFormState(itemSchema, undefined, rootSchema);
   };
 
   onAddClick = event => {
@@ -425,7 +425,7 @@ class ArrayField extends Component {
       idSchema,
       registry = getDefaultRegistry(),
     } = this.props;
-    const { definitions } = registry;
+    const { rootSchema } = registry;
     if (!schema.hasOwnProperty("items")) {
       return (
         <UnsupportedField
@@ -438,10 +438,10 @@ class ArrayField extends Component {
     if (isFixedItems(schema)) {
       return this.renderFixedArray();
     }
-    if (isFilesArray(schema, uiSchema, definitions)) {
+    if (isFilesArray(schema, uiSchema, rootSchema)) {
       return this.renderFiles();
     }
-    if (isMultiSelect(schema, definitions)) {
+    if (isMultiSelect(schema, rootSchema)) {
       return this.renderMultiSelect();
     }
     return this.renderNormalArray();
@@ -466,20 +466,20 @@ class ArrayField extends Component {
       rawErrors,
     } = this.props;
     const title = schema.title === undefined ? name : schema.title;
-    const { ArrayFieldTemplate, definitions, fields, formContext } = registry;
+    const { ArrayFieldTemplate, rootSchema, fields, formContext } = registry;
     const { TitleField, DescriptionField } = fields;
-    const itemsSchema = retrieveSchema(schema.items, definitions);
+    const itemsSchema = retrieveSchema(schema.items, rootSchema);
     const arrayProps = {
       canAdd: this.canAddItem(formData),
       items: this.state.keyedFormData.map((keyedItem, index) => {
         const { key, item } = keyedItem;
-        const itemSchema = retrieveSchema(schema.items, definitions, item);
+        const itemSchema = retrieveSchema(schema.items, rootSchema, item);
         const itemErrorSchema = errorSchema ? errorSchema[index] : undefined;
         const itemIdPrefix = idSchema.$id + "_" + index;
         const itemIdSchema = toIdSchema(
           itemSchema,
           itemIdPrefix,
-          definitions,
+          rootSchema,
           item,
           idPrefix
         );
@@ -541,8 +541,8 @@ class ArrayField extends Component {
       rawErrors,
     } = this.props;
     const items = this.props.formData;
-    const { widgets, definitions, formContext } = registry;
-    const itemsSchema = retrieveSchema(schema.items, definitions, formData);
+    const { widgets, rootSchema, formContext } = registry;
+    const itemsSchema = retrieveSchema(schema.items, rootSchema, formData);
     const enumOptions = optionsList(itemsSchema);
     const { widget = "select", ...options } = {
       ...getUiOptions(uiSchema),
@@ -631,13 +631,13 @@ class ArrayField extends Component {
     } = this.props;
     const title = schema.title || name;
     let items = this.props.formData;
-    const { ArrayFieldTemplate, definitions, fields, formContext } = registry;
+    const { ArrayFieldTemplate, rootSchema, fields, formContext } = registry;
     const { TitleField } = fields;
     const itemSchemas = schema.items.map((item, index) =>
-      retrieveSchema(item, definitions, formData[index])
+      retrieveSchema(item, rootSchema, formData[index])
     );
     const additionalSchema = allowAdditionalItems(schema)
-      ? retrieveSchema(schema.additionalItems, definitions, formData)
+      ? retrieveSchema(schema.additionalItems, rootSchema, formData)
       : null;
 
     if (!items || items.length < itemSchemas.length) {
@@ -657,13 +657,13 @@ class ArrayField extends Component {
         const { key, item } = keyedItem;
         const additional = index >= itemSchemas.length;
         const itemSchema = additional
-          ? retrieveSchema(schema.additionalItems, definitions, item)
+          ? retrieveSchema(schema.additionalItems, rootSchema, item)
           : itemSchemas[index];
         const itemIdPrefix = idSchema.$id + "_" + index;
         const itemIdSchema = toIdSchema(
           itemSchema,
           itemIdPrefix,
-          definitions,
+          rootSchema,
           item,
           idPrefix
         );
diff --git a/packages/core/src/components/fields/MultiSchemaField.js b/packages/core/src/components/fields/MultiSchemaField.js
index fb4e53729b..babc701119 100644
--- a/packages/core/src/components/fields/MultiSchemaField.js
+++ b/packages/core/src/components/fields/MultiSchemaField.js
@@ -43,9 +43,9 @@ class AnyOfField extends Component {
   }
 
   getMatchingOption(formData, options) {
-    const { definitions } = this.props.registry;
+    const { rootSchema } = this.props.registry;
 
-    let option = getMatchingOption(formData, options, definitions);
+    let option = getMatchingOption(formData, options, rootSchema);
     if (option !== 0) {
       return option;
     }
@@ -57,10 +57,10 @@ class AnyOfField extends Component {
   onOptionChange = option => {
     const selectedOption = parseInt(option, 10);
     const { formData, onChange, options, registry } = this.props;
-    const { definitions } = registry;
+    const { rootSchema } = registry;
     const newOption = retrieveSchema(
       options[selectedOption],
-      definitions,
+      rootSchema,
       formData
     );
 
@@ -89,7 +89,7 @@ class AnyOfField extends Component {
     }
     // Call getDefaultFormState to make sure defaults are populated on change.
     onChange(
-      getDefaultFormState(options[selectedOption], newFormData, definitions)
+      getDefaultFormState(options[selectedOption], newFormData, rootSchema)
     );
 
     this.setState({
diff --git a/packages/core/src/components/fields/ObjectField.js b/packages/core/src/components/fields/ObjectField.js
index ba15449f2f..c154dc188d 100644
--- a/packages/core/src/components/fields/ObjectField.js
+++ b/packages/core/src/components/fields/ObjectField.js
@@ -180,7 +180,7 @@ class ObjectField extends Component {
       const { registry = getDefaultRegistry() } = this.props;
       const refSchema = retrieveSchema(
         { $ref: schema.additionalProperties["$ref"] },
-        registry.definitions,
+        registry.rootSchema,
         this.props.formData
       );
 
@@ -210,9 +210,9 @@ class ObjectField extends Component {
       registry = getDefaultRegistry(),
     } = this.props;
 
-    const { definitions, fields, formContext } = registry;
+    const { rootSchema, fields, formContext } = registry;
     const { SchemaField, TitleField, DescriptionField } = fields;
-    const schema = retrieveSchema(this.props.schema, definitions, formData);
+    const schema = retrieveSchema(this.props.schema, rootSchema, formData);
 
     // If this schema has a title defined, but the user has set a new key/label, retain their input.
     let title;
diff --git a/packages/core/src/components/fields/SchemaField.js b/packages/core/src/components/fields/SchemaField.js
index 689774cc72..6309793fc6 100644
--- a/packages/core/src/components/fields/SchemaField.js
+++ b/packages/core/src/components/fields/SchemaField.js
@@ -237,13 +237,13 @@ function SchemaFieldRender(props) {
     registry = getDefaultRegistry(),
     wasPropertyKeyModified = false,
   } = props;
-  const { definitions, fields, formContext } = registry;
+  const { rootSchema, fields, formContext } = registry;
   const FieldTemplate =
     uiSchema["ui:FieldTemplate"] || registry.FieldTemplate || DefaultTemplate;
   let idSchema = props.idSchema;
-  const schema = retrieveSchema(props.schema, definitions, formData);
+  const schema = retrieveSchema(props.schema, rootSchema, formData);
   idSchema = mergeObjects(
-    toIdSchema(schema, null, definitions, formData, idPrefix),
+    toIdSchema(schema, null, rootSchema, formData, idPrefix),
     idSchema
   );
   const FieldComponent = getFieldComponent(schema, uiSchema, idSchema, fields);
@@ -264,8 +264,8 @@ function SchemaFieldRender(props) {
   let { label: displayLabel = true } = uiOptions;
   if (schema.type === "array") {
     displayLabel =
-      isMultiSelect(schema, definitions) ||
-      isFilesArray(schema, uiSchema, definitions);
+      isMultiSelect(schema, rootSchema) ||
+      isFilesArray(schema, uiSchema, rootSchema);
   }
   if (schema.type === "object") {
     displayLabel = false;
diff --git a/packages/core/src/types.js b/packages/core/src/types.js
index 1393b17e91..db411b4716 100644
--- a/packages/core/src/types.js
+++ b/packages/core/src/types.js
@@ -4,7 +4,7 @@ export const registry = PropTypes.shape({
   ArrayFieldTemplate: PropTypes.elementType,
   FieldTemplate: PropTypes.elementType,
   ObjectFieldTemplate: PropTypes.elementType,
-  definitions: PropTypes.object.isRequired,
+  rootSchema: PropTypes.object.isRequired,
   fields: PropTypes.objectOf(PropTypes.elementType).isRequired,
   formContext: PropTypes.object.isRequired,
   widgets: PropTypes.objectOf(
diff --git a/packages/core/src/utils.js b/packages/core/src/utils.js
index 1a6d003c89..1dec8f0724 100644
--- a/packages/core/src/utils.js
+++ b/packages/core/src/utils.js
@@ -63,7 +63,7 @@ export function getDefaultRegistry() {
   return {
     fields: require("./components/fields").default,
     widgets: require("./components/widgets").default,
-    definitions: {},
+    rootSchema: {},
     formContext: {},
   };
 }
@@ -154,7 +154,7 @@ export function hasWidget(schema, widget, registeredWidgets = {}) {
 function computeDefaults(
   schema,
   parentDefaults,
-  definitions,
+  rootSchema,
   rawFormData = {},
   includeUndefinedValues = false
 ) {
@@ -170,20 +170,20 @@ function computeDefaults(
     defaults = schema.default;
   } else if ("$ref" in schema) {
     // Use referenced schema defaults for this node.
-    const refSchema = findSchemaDefinition(schema.$ref, definitions);
+    const refSchema = findSchemaDefinition(schema.$ref, rootSchema);
     return computeDefaults(
       refSchema,
       defaults,
-      definitions,
+      rootSchema,
       formData,
       includeUndefinedValues
     );
   } else if ("dependencies" in schema) {
-    const resolvedSchema = resolveDependencies(schema, definitions, formData);
+    const resolvedSchema = resolveDependencies(schema, rootSchema, formData);
     return computeDefaults(
       resolvedSchema,
       defaults,
-      definitions,
+      rootSchema,
       formData,
       includeUndefinedValues
     );
@@ -192,17 +192,17 @@ function computeDefaults(
       computeDefaults(
         itemSchema,
         Array.isArray(parentDefaults) ? parentDefaults[idx] : undefined,
-        definitions,
+        rootSchema,
         formData,
         includeUndefinedValues
       )
     );
   } else if ("oneOf" in schema) {
     schema =
-      schema.oneOf[getMatchingOption(undefined, schema.oneOf, definitions)];
+      schema.oneOf[getMatchingOption(undefined, schema.oneOf, rootSchema)];
   } else if ("anyOf" in schema) {
     schema =
-      schema.anyOf[getMatchingOption(undefined, schema.anyOf, definitions)];
+      schema.anyOf[getMatchingOption(undefined, schema.anyOf, rootSchema)];
   }
 
   // Not defaults defined for this node, fallback to generic typed ones.
@@ -219,7 +219,7 @@ function computeDefaults(
         let computedDefault = computeDefaults(
           schema.properties[key],
           (defaults || {})[key],
-          definitions,
+          rootSchema,
           (formData || {})[key],
           includeUndefinedValues
         );
@@ -236,7 +236,7 @@ function computeDefaults(
           return computeDefaults(
             schema.items[idx] || schema.additionalItems || {},
             item,
-            definitions
+            rootSchema
           );
         });
       }
@@ -247,13 +247,13 @@ function computeDefaults(
           return computeDefaults(
             schema.items,
             (defaults || {})[idx],
-            definitions,
+            rootSchema,
             item
           );
         });
       }
       if (schema.minItems) {
-        if (!isMultiSelect(schema, definitions)) {
+        if (!isMultiSelect(schema, rootSchema)) {
           const defaultsLength = defaults ? defaults.length : 0;
           if (schema.minItems > defaultsLength) {
             const defaultEntries = defaults || [];
@@ -263,7 +263,7 @@ function computeDefaults(
               : schema.items;
             const fillerEntries = fill(
               new Array(schema.minItems - defaultsLength),
-              computeDefaults(fillerSchema, fillerSchema.defaults, definitions)
+              computeDefaults(fillerSchema, fillerSchema.defaults, rootSchema)
             );
             // then fill up the rest with either the item default or empty, up to minItems
 
@@ -280,17 +280,17 @@ function computeDefaults(
 export function getDefaultFormState(
   _schema,
   formData,
-  definitions = {},
+  rootSchema = {},
   includeUndefinedValues = false
 ) {
   if (!isObject(_schema)) {
     throw new Error("Invalid schema: " + _schema);
   }
-  const schema = retrieveSchema(_schema, definitions, formData);
+  const schema = retrieveSchema(_schema, rootSchema, formData);
   const defaults = computeDefaults(
     schema,
     _schema.default,
-    definitions,
+    rootSchema,
     formData,
     includeUndefinedValues
   );
@@ -478,8 +478,8 @@ export function toConstant(schema) {
   }
 }
 
-export function isSelect(_schema, definitions = {}) {
-  const schema = retrieveSchema(_schema, definitions);
+export function isSelect(_schema, rootSchema = {}) {
+  const schema = retrieveSchema(_schema, rootSchema);
   const altSchemas = schema.oneOf || schema.anyOf;
   if (Array.isArray(schema.enum)) {
     return true;
@@ -489,18 +489,18 @@ export function isSelect(_schema, definitions = {}) {
   return false;
 }
 
-export function isMultiSelect(schema, definitions = {}) {
+export function isMultiSelect(schema, rootSchema = {}) {
   if (!schema.uniqueItems || !schema.items) {
     return false;
   }
-  return isSelect(schema.items, definitions);
+  return isSelect(schema.items, rootSchema);
 }
 
-export function isFilesArray(schema, uiSchema, definitions = {}) {
+export function isFilesArray(schema, uiSchema, rootSchema = {}) {
   if (uiSchema["ui:widget"] === "files") {
     return true;
   } else if (schema.items) {
-    const itemsSchema = retrieveSchema(schema.items, definitions);
+    const itemsSchema = retrieveSchema(schema.items, rootSchema);
     return itemsSchema.type === "string" && itemsSchema.format === "data-url";
   }
   return false;
@@ -578,7 +578,7 @@ export const guessType = function guessType(value) {
 // This function will create new "properties" items for each key in our formData
 export function stubExistingAdditionalProperties(
   schema,
-  definitions = {},
+  rootSchema = {},
   formData = {}
 ) {
   // Clone the schema so we don't ruin the consumer's original
@@ -597,7 +597,7 @@ export function stubExistingAdditionalProperties(
     if (schema.additionalProperties.hasOwnProperty("$ref")) {
       additionalProperties = retrieveSchema(
         { $ref: schema.additionalProperties["$ref"] },
-        definitions,
+        rootSchema,
         formData
       );
     } else if (schema.additionalProperties.hasOwnProperty("type")) {
@@ -615,71 +615,71 @@ export function stubExistingAdditionalProperties(
   return schema;
 }
 
-export function resolveSchema(schema, definitions = {}, formData = {}) {
+export function resolveSchema(schema, rootSchema = {}, formData = {}) {
   if (schema.hasOwnProperty("$ref")) {
-    return resolveReference(schema, definitions, formData);
+    return resolveReference(schema, rootSchema, formData);
   } else if (schema.hasOwnProperty("dependencies")) {
-    const resolvedSchema = resolveDependencies(schema, definitions, formData);
-    return retrieveSchema(resolvedSchema, definitions, formData);
+    const resolvedSchema = resolveDependencies(schema, rootSchema, formData);
+    return retrieveSchema(resolvedSchema, rootSchema, formData);
   } else {
     // No $ref or dependencies attribute found, returning the original schema.
     return schema;
   }
 }
 
-function resolveReference(schema, definitions, formData) {
+function resolveReference(schema, rootSchema, formData) {
   // Retrieve the referenced schema definition.
-  const $refSchema = findSchemaDefinition(schema.$ref, definitions);
+  const $refSchema = findSchemaDefinition(schema.$ref, rootSchema);
   // Drop the $ref property of the source schema.
   const { $ref, ...localSchema } = schema;
   // Update referenced schema definition with local schema properties.
   return retrieveSchema(
     { ...$refSchema, ...localSchema },
-    definitions,
+    rootSchema,
     formData
   );
 }
 
-export function retrieveSchema(schema, definitions = {}, formData = {}) {
-  const resolvedSchema = resolveSchema(schema, definitions, formData);
+export function retrieveSchema(schema, rootSchema = {}, formData = {}) {
+  const resolvedSchema = resolveSchema(schema, rootSchema, formData);
   const hasAdditionalProperties =
     resolvedSchema.hasOwnProperty("additionalProperties") &&
     resolvedSchema.additionalProperties !== false;
   if (hasAdditionalProperties) {
     return stubExistingAdditionalProperties(
       resolvedSchema,
-      definitions,
+      rootSchema,
       formData
     );
   }
   return resolvedSchema;
 }
 
-function resolveDependencies(schema, definitions, formData) {
+function resolveDependencies(schema, rootSchema, formData) {
   // Drop the dependencies from the source schema.
   let { dependencies = {}, ...resolvedSchema } = schema;
   if ("oneOf" in resolvedSchema) {
     resolvedSchema =
       resolvedSchema.oneOf[
-        getMatchingOption(formData, resolvedSchema.oneOf, definitions)
+        getMatchingOption(formData, resolvedSchema.oneOf, rootSchema)
       ];
   } else if ("anyOf" in resolvedSchema) {
     resolvedSchema =
       resolvedSchema.anyOf[
-        getMatchingOption(formData, resolvedSchema.anyOf, definitions)
+        getMatchingOption(formData, resolvedSchema.anyOf, rootSchema)
       ];
   }
   return processDependencies(
     dependencies,
     resolvedSchema,
-    definitions,
+    rootSchema,
     formData
   );
 }
 function processDependencies(
   dependencies,
   resolvedSchema,
-  definitions,
+  rootSchema,
   formData
 ) {
   // Process dependencies updating the local schema properties as appropriate.
@@ -704,7 +704,7 @@ function processDependencies(
     } else if (isObject(dependencyValue)) {
       resolvedSchema = withDependentSchema(
         resolvedSchema,
-        definitions,
+        rootSchema,
         formData,
         dependencyKey,
         dependencyValue
@@ -713,7 +713,7 @@ function processDependencies(
     return processDependencies(
       remainingDependencies,
       resolvedSchema,
-      definitions,
+      rootSchema,
       formData
     );
   }
@@ -732,14 +732,14 @@ function withDependentProperties(schema, additionallyRequired) {
 
 function withDependentSchema(
   schema,
-  definitions,
+  rootSchema,
   formData,
   dependencyKey,
   dependencyValue
 ) {
   let { oneOf, ...dependentSchema } = retrieveSchema(
     dependencyValue,
-    definitions,
+    rootSchema,
     formData
   );
   schema = mergeSchemas(schema, dependentSchema);
@@ -752,12 +752,12 @@ function withDependentSchema(
   // Resolve $refs inside oneOf.
   const resolvedOneOf = oneOf.map(subschema =>
     subschema.hasOwnProperty("$ref")
-      ? resolveReference(subschema, definitions, formData)
+      ? resolveReference(subschema, rootSchema, formData)
       : subschema
   );
   return withExactlyOneSubschema(
     schema,
-    definitions,
+    rootSchema,
     formData,
     dependencyKey,
     resolvedOneOf
@@ -766,7 +766,7 @@ function withDependentSchema(
 
 function withExactlyOneSubschema(
   schema,
-  definitions,
+  rootSchema,
   formData,
   dependencyKey,
   oneOf
@@ -801,7 +801,7 @@ function withExactlyOneSubschema(
   const dependentSchema = { ...subschema, properties: dependentSubschema };
   return mergeSchemas(
     schema,
-    retrieveSchema(dependentSchema, definitions, formData)
+    retrieveSchema(dependentSchema, rootSchema, formData)
   );
 }
 
@@ -924,7 +924,7 @@ export function shouldRender(comp, nextProps, nextState) {
 export function toIdSchema(
   schema,
   id,
-  definitions,
+  rootSchema,
   formData = {},
   idPrefix = "root"
 ) {
@@ -932,11 +932,11 @@ export function toIdSchema(
     $id: id || idPrefix,
   };
   if ("$ref" in schema || "dependencies" in schema) {
-    const _schema = retrieveSchema(schema, definitions, formData);
-    return toIdSchema(_schema, id, definitions, formData, idPrefix);
+    const _schema = retrieveSchema(schema, rootSchema, formData);
+    return toIdSchema(_schema, id, rootSchema, formData, idPrefix);
   }
   if ("items" in schema && !schema.items.$ref) {
-    return toIdSchema(schema.items, id, definitions, formData, idPrefix);
+    return toIdSchema(schema.items, id, rootSchema, formData, idPrefix);
   }
   if (schema.type !== "object") {
     return idSchema;
@@ -947,7 +947,7 @@ export function toIdSchema(
     idSchema[name] = toIdSchema(
       field,
       fieldId,
-      definitions,
+      rootSchema,
       // It's possible that formData is not an object -- this can happen if an
       // array item has just been added, but not populated with data yet
       (formData || {})[name],
@@ -957,20 +957,20 @@ export function toIdSchema(
   return idSchema;
 }
 
-export function toPathSchema(schema, name = "", definitions, formData = {}) {
+export function toPathSchema(schema, name = "", rootSchema, formData = {}) {
   const pathSchema = {
     $name: name.replace(/^\./, ""),
   };
   if ("$ref" in schema || "dependencies" in schema) {
-    const _schema = retrieveSchema(schema, definitions, formData);
-    return toPathSchema(_schema, name, definitions, formData);
+    const _schema = retrieveSchema(schema, rootSchema, formData);
+    return toPathSchema(_schema, name, rootSchema, formData);
   }
   if (schema.hasOwnProperty("items") && Array.isArray(formData)) {
     formData.forEach((element, i) => {
       pathSchema[i] = toPathSchema(
         schema.items,
         `${name}.${i}`,
-        definitions,
+        rootSchema,
         element
       );
     });
@@ -979,7 +979,7 @@ export function toPathSchema(schema, name = "", definitions, formData = {}) {
       pathSchema[property] = toPathSchema(
         schema.properties[property],
         `${name}.${property}`,
-        definitions,
+        rootSchema,
         // It's possible that formData is not an object -- this can happen if an
         // array item has just been added, but not populated with data yet
         (formData || {})[property]
@@ -1078,14 +1078,13 @@ export function rangeSpec(schema) {
   return spec;
 }
 
-export function getMatchingOption(formData, options, definitions) {
+export function getMatchingOption(formData, options, rootSchema) {
+  console.log("GMO", rootSchema, formData, options);
   for (let i = 0; i < options.length; i++) {
-    // Assign the definitions to the option, otherwise the match can fail if
+    // Assign the definitions from the rootSchema to the option, otherwise the match can fail if
     // the new option uses a $ref
     const option = Object.assign(
-      {
-        definitions,
-      },
+      rootSchema,
       options[i]
     );
 
diff --git a/packages/core/src/validate.js b/packages/core/src/validate.js
index 0d44e68cf9..73046208df 100644
--- a/packages/core/src/validate.js
+++ b/packages/core/src/validate.js
@@ -173,8 +173,8 @@ export default function validateFormData(
   customFormats = {}
 ) {
   // Include form data with undefined values, which is required for validation.
-  const definitions = schema;
-  formData = getDefaultFormState(schema, formData, definitions, true);
+  const rootSchema = schema;
+  formData = getDefaultFormState(schema, formData, rootSchema, true);
 
   const newMetaSchemas = !deepEquals(formerMetaSchema, additionalMetaSchemas);
   const newFormats = !deepEquals(formerCustomFormats, customFormats);
diff --git a/packages/core/test/anyOf_test.js b/packages/core/test/anyOf_test.js
index c1815962ad..e263850716 100644
--- a/packages/core/test/anyOf_test.js
+++ b/packages/core/test/anyOf_test.js
@@ -663,7 +663,7 @@ describe("anyOf", () => {
       expect(node.querySelectorAll("input#root_foo")).to.have.length.of(1);
     });
 
-    it("should not change the selected option when switching order of items for anyOf inside array items", () => {
+    it.only("should not change the selected option when switching order of items for anyOf inside array items", () => {
       const schema = {
         type: "object",
         properties: {
diff --git a/packages/material-ui/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx b/packages/material-ui/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx
index 86dc772ed2..66387c5691 100644
--- a/packages/material-ui/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx
+++ b/packages/material-ui/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx
@@ -17,7 +17,7 @@ import IconButton from '../IconButton/IconButton';
 const ArrayFieldTemplate = (props: ArrayFieldTemplateProps) => {
   const { schema, registry = getDefaultRegistry() } = props;
 
-  if (isMultiSelect(schema, registry.definitions)) {
+  if (isMultiSelect(schema, registry.rootSchema)) {
     return <DefaultFixedArrayFieldTemplate {...props} />;
   } else {
     return <DefaultNormalArrayFieldTemplate {...props} />;

From f9ac12958a8bd93a342f6750c0d63bf37800a379 Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Mon, 25 Nov 2019 21:23:45 +0000
Subject: [PATCH 06/18] Fix getMatchingOption logic

---
 packages/core/src/utils.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/core/src/utils.js b/packages/core/src/utils.js
index 1dec8f0724..3666a08371 100644
--- a/packages/core/src/utils.js
+++ b/packages/core/src/utils.js
@@ -1081,12 +1081,7 @@ export function rangeSpec(schema) {
 export function getMatchingOption(formData, options, rootSchema) {
   console.log("GMO", rootSchema, formData, options);
   for (let i = 0; i < options.length; i++) {
-    // Assign the definitions from the rootSchema to the option, otherwise the match can fail if
-    // the new option uses a $ref
-    const option = Object.assign(
-      rootSchema,
-      options[i]
-    );
+    const option = options[i];
 
     // If the schema describes an object then we need to add slightly more
     // strict matching to the schema, because unless the schema uses the

From a4131cf6fe5cf88af0d180ec7da282fec4d5169d Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Mon, 25 Nov 2019 21:23:56 +0000
Subject: [PATCH 07/18] fix tests

---
 packages/core/test/SchemaField_test.js | 2 +-
 packages/core/test/anyOf_test.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/test/SchemaField_test.js b/packages/core/test/SchemaField_test.js
index 647b1adb29..6e8095b792 100644
--- a/packages/core/test/SchemaField_test.js
+++ b/packages/core/test/SchemaField_test.js
@@ -117,7 +117,7 @@ describe("SchemaField", () => {
       const { registry } = receivedProps;
       expect(registry.widgets).eql(getDefaultRegistry().widgets);
       // TODO: change this later
-      expect(registry.definitions).eql(schema);
+      expect(registry.rootSchema).eql(schema);
       expect(registry.fields).to.be.an("object");
       expect(registry.fields.SchemaField).eql(SchemaField);
       expect(registry.fields.TitleField).eql(TitleField);
diff --git a/packages/core/test/anyOf_test.js b/packages/core/test/anyOf_test.js
index e263850716..c1815962ad 100644
--- a/packages/core/test/anyOf_test.js
+++ b/packages/core/test/anyOf_test.js
@@ -663,7 +663,7 @@ describe("anyOf", () => {
       expect(node.querySelectorAll("input#root_foo")).to.have.length.of(1);
     });
 
-    it.only("should not change the selected option when switching order of items for anyOf inside array items", () => {
+    it("should not change the selected option when switching order of items for anyOf inside array items", () => {
       const schema = {
         type: "object",
         properties: {

From f0d29212d3612eb4c27e3d3b441475c63ec79926 Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Mon, 25 Nov 2019 21:24:23 +0000
Subject: [PATCH 08/18] remove console log

---
 packages/core/src/utils.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/core/src/utils.js b/packages/core/src/utils.js
index 3666a08371..60712287c3 100644
--- a/packages/core/src/utils.js
+++ b/packages/core/src/utils.js
@@ -1079,7 +1079,6 @@ export function rangeSpec(schema) {
 }
 
 export function getMatchingOption(formData, options, rootSchema) {
-  console.log("GMO", rootSchema, formData, options);
   for (let i = 0; i < options.length; i++) {
     const option = options[i];
 

From 6d35b3aa3b23542c863b09e452d72e408565ff97 Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Sat, 7 Dec 2019 18:41:07 +0000
Subject: [PATCH 09/18] Fix tests

---
 packages/core/test/utils_test.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/core/test/utils_test.js b/packages/core/test/utils_test.js
index 976ce72e22..53d2b8e7cd 100644
--- a/packages/core/test/utils_test.js
+++ b/packages/core/test/utils_test.js
@@ -2326,7 +2326,7 @@ describe("utils", () => {
         };
         const definitions = {};
         const formData = {};
-        expect(retrieveSchema(schema, definitions, formData)).eql({
+        expect(retrieveSchema(schema, {definitions}, formData)).eql({
           type: "string",
         });
       });
@@ -2337,7 +2337,7 @@ describe("utils", () => {
         };
         const definitions = {};
         const formData = {};
-        expect(retrieveSchema(schema, definitions, formData)).eql({});
+        expect(retrieveSchema(schema, {definitions}, formData)).eql({});
         expect(
           console.warn.calledWithMatch(/could not merge subschemas in allOf/)
         ).to.be.true;
@@ -2351,7 +2351,7 @@ describe("utils", () => {
           "2": { minLength: 5 },
         };
         const formData = {};
-        expect(retrieveSchema(schema, definitions, formData)).eql({
+        expect(retrieveSchema(schema, {definitions}, formData)).eql({
           type: "string",
           minLength: 5,
         });
@@ -2371,7 +2371,7 @@ describe("utils", () => {
         };
         const definitions = {};
         const formData = {};
-        expect(retrieveSchema(schema, definitions, formData)).eql({
+        expect(retrieveSchema(schema, {definitions}, formData)).eql({
           type: "string",
           minLength: 4,
           maxLength: 5,

From 6dc3fc162d0af1ae3dac93be168fd11db2016a0b Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Sat, 7 Dec 2019 18:43:38 +0000
Subject: [PATCH 10/18] prettier

---
 packages/core/test/utils_test.js | 78 ++++++++++++++++----------------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/packages/core/test/utils_test.js b/packages/core/test/utils_test.js
index 53d2b8e7cd..d6a629e3b6 100644
--- a/packages/core/test/utils_test.js
+++ b/packages/core/test/utils_test.js
@@ -1309,7 +1309,7 @@ describe("utils", () => {
         const definitions = {
           FooItem: { type: "string", enum: ["foo"] },
         };
-        expect(isMultiSelect(schema, {definitions})).to.be.true;
+        expect(isMultiSelect(schema, { definitions })).to.be.true;
       });
     });
 
@@ -1644,7 +1644,7 @@ describe("utils", () => {
       };
       const definitions = { address };
 
-      expect(retrieveSchema(schema, {definitions})).eql(address);
+      expect(retrieveSchema(schema, { definitions })).eql(address);
     });
 
     it("should 'resolve' a schema which contains definitions not in `#/definitions`", () => {
@@ -1659,12 +1659,12 @@ describe("utils", () => {
       };
       const schema = {
         $ref: "#/components/schemas/address",
-        components: { schemas: { address } }
+        components: { schemas: { address } },
       };
 
       expect(retrieveSchema(schema, schema)).eql({
         components: { schemas: { address } },
-        ...address
+        ...address,
       });
     });
 
@@ -1680,19 +1680,23 @@ describe("utils", () => {
       };
       const schema = {
         $ref: "/components/schemas/address",
-        components: { schemas: { address } }
+        components: { schemas: { address } },
       };
 
-      expect(() => retrieveSchema(schema, schema)).to.throw("Could not find a definition");
+      expect(() => retrieveSchema(schema, schema)).to.throw(
+        "Could not find a definition"
+      );
     });
 
     it("should give an error when JSON pointer does not point to anything", () => {
       const schema = {
         $ref: "#/components/schemas/address",
-        components: { schemas: { } }
+        components: { schemas: {} },
       };
 
-      expect(() => retrieveSchema(schema, schema)).to.throw("Could not find a definition");
+      expect(() => retrieveSchema(schema, schema)).to.throw(
+        "Could not find a definition"
+      );
     });
 
     it("should 'resolve' escaped JSON Pointers", () => {
@@ -1700,7 +1704,7 @@ describe("utils", () => {
       const address = { type: "string" };
       const definitions = { "a~complex/name": address };
 
-      expect(retrieveSchema(schema, {definitions})).eql(address);
+      expect(retrieveSchema(schema, { definitions })).eql(address);
     });
 
     it("should 'resolve' and stub out a schema which contains an `additionalProperties` with a definition", () => {
@@ -1724,7 +1728,7 @@ describe("utils", () => {
       const definitions = { components: { schemas: { address } } };
       const formData = { newKey: {} };
 
-      expect(retrieveSchema(schema, {definitions}, formData)).eql({
+      expect(retrieveSchema(schema, { definitions }, formData)).eql({
         ...schema,
         properties: {
           newKey: {
@@ -1750,7 +1754,7 @@ describe("utils", () => {
       const definitions = { number };
       const formData = { newKey: {} };
 
-      expect(retrieveSchema(schema, {definitions}, formData)).eql({
+      expect(retrieveSchema(schema, { definitions }, formData)).eql({
         ...schema,
         properties: {
           newKey: {
@@ -1772,7 +1776,7 @@ describe("utils", () => {
       };
       const definitions = { address };
 
-      expect(retrieveSchema(schema, {definitions})).eql({
+      expect(retrieveSchema(schema, { definitions })).eql({
         ...address,
         title: "foo",
       });
@@ -1794,7 +1798,7 @@ describe("utils", () => {
           };
           const definitions = {};
           const formData = {};
-          expect(retrieveSchema(schema, {definitions}, formData)).eql({
+          expect(retrieveSchema(schema, { definitions }, formData)).eql({
             type: "object",
             properties: {
               a: { type: "string" },
@@ -1820,7 +1824,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = { a: "1" };
-            expect(retrieveSchema(schema, {definitions}, formData)).eql({
+            expect(retrieveSchema(schema, { definitions }, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string" },
@@ -1846,7 +1850,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = { a: "1" };
-            expect(retrieveSchema(schema, {definitions}, formData)).eql({
+            expect(retrieveSchema(schema, { definitions }, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string" },
@@ -1878,7 +1882,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = {};
-            expect(retrieveSchema(schema, {definitions}, formData)).eql({
+            expect(retrieveSchema(schema, { definitions }, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string" },
@@ -1904,7 +1908,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = { a: "1" };
-            expect(retrieveSchema(schema, {definitions}, formData)).eql({
+            expect(retrieveSchema(schema, { definitions }, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string" },
@@ -1931,7 +1935,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = { a: "1" };
-            expect(retrieveSchema(schema, {definitions}, formData)).eql({
+            expect(retrieveSchema(schema, { definitions }, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string" },
@@ -1960,7 +1964,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = { a: "FOO" };
-            expect(retrieveSchema(schema, {definitions}, formData)).eql({
+            expect(retrieveSchema(schema, { definitions }, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string", enum: ["FOO"] },
@@ -1992,7 +1996,7 @@ describe("utils", () => {
               },
             };
             const formData = { a: "1" };
-            expect(retrieveSchema(schema, {definitions}, formData)).eql({
+            expect(retrieveSchema(schema, { definitions }, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string" },
@@ -2033,7 +2037,7 @@ describe("utils", () => {
               },
             };
             const formData = { a: "typeB" };
-            expect(retrieveSchema(schema, {definitions}, formData)).eql({
+            expect(retrieveSchema(schema, { definitions }, formData)).eql({
               type: "object",
               properties: {
                 a: { enum: ["typeA", "typeB"] },
@@ -2073,7 +2077,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = {};
-            expect(retrieveSchema(schema, {definitions}, formData)).eql({
+            expect(retrieveSchema(schema, { definitions }, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string" },
@@ -2110,7 +2114,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = { a: "int" };
-            expect(retrieveSchema(schema, {definitions}, formData)).eql({
+            expect(retrieveSchema(schema, { definitions }, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string", enum: ["int", "bool"] },
@@ -2146,7 +2150,7 @@ describe("utils", () => {
             };
             const definitions = {};
             const formData = { a: "bool" };
-            expect(retrieveSchema(schema, {definitions}, formData)).eql({
+            expect(retrieveSchema(schema, { definitions }, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string", enum: ["int", "bool"] },
@@ -2232,7 +2236,7 @@ describe("utils", () => {
                 employee_accounts: false,
                 update_absences: "BOTH",
               };
-              expect(retrieveSchema(schema, {definitions}, formData)).eql({
+              expect(retrieveSchema(schema, { definitions }, formData)).eql({
                 type: "object",
                 properties: {
                   employee_accounts: {
@@ -2248,7 +2252,7 @@ describe("utils", () => {
                 employee_accounts: true,
                 update_absences: "BOTH",
               };
-              expect(retrieveSchema(schema, {definitions}, formData)).eql({
+              expect(retrieveSchema(schema, { definitions }, formData)).eql({
                 type: "object",
                 properties: {
                   employee_accounts: {
@@ -2307,7 +2311,7 @@ describe("utils", () => {
               },
             };
             const formData = { a: "bool" };
-            expect(retrieveSchema(schema, {definitions}, formData)).eql({
+            expect(retrieveSchema(schema, { definitions }, formData)).eql({
               type: "object",
               properties: {
                 a: { type: "string", enum: ["int", "bool"] },
@@ -2326,7 +2330,7 @@ describe("utils", () => {
         };
         const definitions = {};
         const formData = {};
-        expect(retrieveSchema(schema, {definitions}, formData)).eql({
+        expect(retrieveSchema(schema, { definitions }, formData)).eql({
           type: "string",
         });
       });
@@ -2337,7 +2341,7 @@ describe("utils", () => {
         };
         const definitions = {};
         const formData = {};
-        expect(retrieveSchema(schema, {definitions}, formData)).eql({});
+        expect(retrieveSchema(schema, { definitions }, formData)).eql({});
         expect(
           console.warn.calledWithMatch(/could not merge subschemas in allOf/)
         ).to.be.true;
@@ -2351,7 +2355,7 @@ describe("utils", () => {
           "2": { minLength: 5 },
         };
         const formData = {};
-        expect(retrieveSchema(schema, {definitions}, formData)).eql({
+        expect(retrieveSchema(schema, { definitions }, formData)).eql({
           type: "string",
           minLength: 5,
         });
@@ -2371,7 +2375,7 @@ describe("utils", () => {
         };
         const definitions = {};
         const formData = {};
-        expect(retrieveSchema(schema, {definitions}, formData)).eql({
+        expect(retrieveSchema(schema, { definitions }, formData)).eql({
           type: "string",
           minLength: 4,
           maxLength: 5,
@@ -2685,13 +2689,11 @@ describe("utils", () => {
         $ref: "#/definitions/testdef",
       };
 
-      expect(toIdSchema(schema, undefined, schema, {}, "rjsf")).eql(
-        {
-          $id: "rjsf",
-          foo: { $id: "rjsf_foo" },
-          bar: { $id: "rjsf_bar" },
-        }
-      );
+      expect(toIdSchema(schema, undefined, schema, {}, "rjsf")).eql({
+        $id: "rjsf",
+        foo: { $id: "rjsf_foo" },
+        bar: { $id: "rjsf_bar" },
+      });
     });
 
     it("should handle null form data for object schemas", () => {

From 9ab2d8da867f103c1fe50f937652a7966831703b Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Sat, 7 Dec 2019 18:49:56 +0000
Subject: [PATCH 11/18] Remove support for recursive references to deep schema
 definitions

---
 packages/core/test/Form_test.js | 51 ---------------------------------
 1 file changed, 51 deletions(-)

diff --git a/packages/core/test/Form_test.js b/packages/core/test/Form_test.js
index d3f113e048..44552c597a 100644
--- a/packages/core/test/Form_test.js
+++ b/packages/core/test/Form_test.js
@@ -618,57 +618,6 @@ describeRepeated("Form common", createFormComponent => {
 
       expect(node.querySelectorAll("input[type=text]")).to.have.length.of(1);
     });
-    // TODO: should these two tests be skipped? should we deprecate this functionality?
-    it.skip("should handle recursive references to deep schema definitions", () => {
-      const schema = {
-        definitions: {
-          testdef: {
-            $ref: "#/definitions/testdefref",
-          },
-          testdefref: {
-            type: "object",
-            properties: {
-              bar: { type: "string" },
-            },
-          },
-        },
-        type: "object",
-        properties: {
-          foo: { $ref: "#/definitions/testdef/properties/bar" },
-        },
-      };
-
-      const { node } = createFormComponent({ schema });
-
-      expect(node.querySelectorAll("input[type=text]")).to.have.length.of(1);
-    });
-
-    it.skip("should handle multiple recursive references to deep schema definitions", () => {
-      const schema = {
-        definitions: {
-          testdef: {
-            $ref: "#/definitions/testdefref1",
-          },
-          testdefref1: {
-            $ref: "#/definitions/testdefref2",
-          },
-          testdefref2: {
-            type: "object",
-            properties: {
-              bar: { type: "string" },
-            },
-          },
-        },
-        type: "object",
-        properties: {
-          foo: { $ref: "#/definitions/testdef/properties/bar" },
-        },
-      };
-
-      const { node } = createFormComponent({ schema });
-
-      expect(node.querySelectorAll("input[type=text]")).to.have.length.of(1);
-    });
 
     it("should priorize definition over schema type property", () => {
       // Refs bug #140

From e0d72e93cae068afcc0ab7556aa05276d3e1ba68 Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Sat, 7 Dec 2019 19:00:09 +0000
Subject: [PATCH 12/18] update docs for registry and definitions

---
 packages/core/docs/advanced-customization.md | 7 ++++---
 packages/core/docs/definitions.md            | 5 +----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/core/docs/advanced-customization.md b/packages/core/docs/advanced-customization.md
index c4821b2de6..470dd5a72c 100644
--- a/packages/core/docs/advanced-customization.md
+++ b/packages/core/docs/advanced-customization.md
@@ -514,12 +514,13 @@ A field component will always be passed the following props:
 
 #### The `registry` object
 
-The `registry` is an object containing the registered custom fields and widgets as well as root schema definitions.
+The `registry` is an object containing the registered custom fields and widgets as well as the root schema definitions.
 
  - `fields`: The [custom registered fields](#custom-field-components). By default this object contains the standard `SchemaField`, `TitleField` and `DescriptionField` components;
  - `widgets`: The [custom registered widgets](#custom-widget-components), if any;
- - `definitions`: The root schema [definitions](#schema-definitions-and-references), if any.
- - `formContext`: The [formContext](#the-formcontext-object) object.
+ - `rootSchema`: The root schema, which can contain referenced [definitions](#schema-definitions-and-references);
+ - `formContext`: The [formContext](#the-formcontext-object) object;
+ - `definitions` (deprecated since v2): Equal to `rootSchema.definitions`.
 
 The registry is passed down the component tree, so you can access it from your custom field and `SchemaField` components.
 
diff --git a/packages/core/docs/definitions.md b/packages/core/docs/definitions.md
index 65b89ed284..42072b6898 100644
--- a/packages/core/docs/definitions.md
+++ b/packages/core/docs/definitions.md
@@ -23,7 +23,4 @@ This library partially supports [inline schema definition dereferencing]( http:/
 }
 ```
 
-*(Sample schema courtesy of the [Space Telescope Science Institute](http://spacetelescope.github.io/understanding-json-schema/structuring.html))*
-
-Note that it only supports local definition referencing; we do not plan on fetching foreign schemas over HTTP anytime soon. Basically, you can only reference a definition from the very schema object defining it.
-
+Note that this library only supports local definition referencing. The value in the `$ref` keyword should be a [JSON Pointer](https://tools.ietf.org/html/rfc6901) in URI fragment identifier format.
\ No newline at end of file

From dece5b85539013643071179ff2c30fc2dd42cf62 Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Sat, 7 Dec 2019 19:06:10 +0000
Subject: [PATCH 13/18] add `definitions` back to registry

---
 packages/core/src/components/Form.js   | 4 ++--
 packages/core/src/utils.js             | 1 +
 packages/core/test/SchemaField_test.js | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/components/Form.js b/packages/core/src/components/Form.js
index b7468f32d7..477ed8a869 100644
--- a/packages/core/src/components/Form.js
+++ b/packages/core/src/components/Form.js
@@ -316,8 +316,8 @@ export default class Form extends Component {
       ArrayFieldTemplate: this.props.ArrayFieldTemplate,
       ObjectFieldTemplate: this.props.ObjectFieldTemplate,
       FieldTemplate: this.props.FieldTemplate,
-      // TODO: fix this. this is a backwards incompatible change.
-      rootSchema: this.props.schema || {},
+      definitions: this.props.schema.definitions || {},
+      rootSchema: this.props.schema,
       formContext: this.props.formContext || {},
     };
   }
diff --git a/packages/core/src/utils.js b/packages/core/src/utils.js
index 5606f5241b..4388cabcb5 100644
--- a/packages/core/src/utils.js
+++ b/packages/core/src/utils.js
@@ -64,6 +64,7 @@ export function getDefaultRegistry() {
   return {
     fields: require("./components/fields").default,
     widgets: require("./components/widgets").default,
+    definitions: {},
     rootSchema: {},
     formContext: {},
   };
diff --git a/packages/core/test/SchemaField_test.js b/packages/core/test/SchemaField_test.js
index 6e8095b792..172ff1c122 100644
--- a/packages/core/test/SchemaField_test.js
+++ b/packages/core/test/SchemaField_test.js
@@ -117,6 +117,7 @@ describe("SchemaField", () => {
       const { registry } = receivedProps;
       expect(registry.widgets).eql(getDefaultRegistry().widgets);
       // TODO: change this later
+      expect(registry.definitions).eql(schema.definitions);
       expect(registry.rootSchema).eql(schema);
       expect(registry.fields).to.be.an("object");
       expect(registry.fields.SchemaField).eql(SchemaField);

From 464d0cf2daa50bf3036ac438cf0bcde1cc0a5bfa Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Sat, 7 Dec 2019 19:10:09 +0000
Subject: [PATCH 14/18] Fix mui form tests

---
 .../material-ui/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/material-ui/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx b/packages/material-ui/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx
index 66387c5691..da721de12c 100644
--- a/packages/material-ui/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx
+++ b/packages/material-ui/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx
@@ -17,7 +17,8 @@ import IconButton from '../IconButton/IconButton';
 const ArrayFieldTemplate = (props: ArrayFieldTemplateProps) => {
   const { schema, registry = getDefaultRegistry() } = props;
 
-  if (isMultiSelect(schema, registry.rootSchema)) {
+  // TODO: update types so we don't have to cast registry as any
+  if (isMultiSelect(schema, (registry as any).rootSchema)) {
     return <DefaultFixedArrayFieldTemplate {...props} />;
   } else {
     return <DefaultNormalArrayFieldTemplate {...props} />;

From 2374ba155a2a6140f1d6533634c86931f18e9e17 Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Sat, 7 Dec 2019 19:12:54 +0000
Subject: [PATCH 15/18] Add a general registry test

---
 packages/core/test/SchemaField_test.js | 75 ++++++++++++++++++++++----
 1 file changed, 64 insertions(+), 11 deletions(-)

diff --git a/packages/core/test/SchemaField_test.js b/packages/core/test/SchemaField_test.js
index 172ff1c122..b0e7a01454 100644
--- a/packages/core/test/SchemaField_test.js
+++ b/packages/core/test/SchemaField_test.js
@@ -20,6 +20,66 @@ describe("SchemaField", () => {
     sandbox.restore();
   });
 
+  describe("registry", () => {
+    it("should provide expected registry as prop", () => {
+      let receivedProps;
+      const schema = {
+        "type": "object",
+        "definitions": {
+          "a": {"type": "string"}
+        }
+      };
+      createFormComponent({
+        schema,
+        uiSchema: {
+          "ui:field": props => {
+            receivedProps = props;
+            return null;  
+          }
+        },
+      });
+
+      const { registry } = receivedProps;
+      expect(registry).eql({
+        widgets: getDefaultRegistry().widgets,
+        fields: getDefaultRegistry().fields,
+        definitions: schema.definitions,
+        rootSchema: schema,
+        ArrayFieldTemplate: undefined,
+        FieldTemplate: undefined,
+        ObjectFieldTemplate: undefined,
+        formContext: {}
+      });
+    });
+    it("should set definitions to empty object if it is undefined", () => {
+      let receivedProps;
+      const schema = {
+        "type": "object"
+      };
+      createFormComponent({
+        schema,
+        uiSchema: {
+          "ui:field": props => {
+            receivedProps = props;
+            return null;  
+          }
+        },
+      });
+
+      const { registry } = receivedProps;
+      expect(registry).eql({
+        widgets: getDefaultRegistry().widgets,
+        fields: getDefaultRegistry().fields,
+        definitions: {},
+        rootSchema: schema,
+        ArrayFieldTemplate: undefined,
+        FieldTemplate: undefined,
+        ObjectFieldTemplate: undefined,
+        formContext: {}
+      });
+    });
+  })
+
   describe("Unsupported field", () => {
     it("should warn on invalid field type", () => {
       const { node } = createFormComponent({
@@ -102,22 +162,15 @@ describe("SchemaField", () => {
       createFormComponent({
         schema,
         uiSchema: {
-          "ui:field": class extends React.Component {
-            constructor(props) {
-              super(props);
-              receivedProps = props;
-            }
-            render() {
-              return null;
-            }
-          },
+          "ui:field": props => {
+            receivedProps = props;
+            return null;  
+          }
         },
       });
 
       const { registry } = receivedProps;
       expect(registry.widgets).eql(getDefaultRegistry().widgets);
-      // TODO: change this later
-      expect(registry.definitions).eql(schema.definitions);
       expect(registry.rootSchema).eql(schema);
       expect(registry.fields).to.be.an("object");
       expect(registry.fields.SchemaField).eql(SchemaField);

From 5956ca39da772a8d65da024d9fa6a71ae443ba7e Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Sat, 7 Dec 2019 19:33:12 +0000
Subject: [PATCH 16/18] update proptypes of registry

---
 packages/core/src/types.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/types.js b/packages/core/src/types.js
index db411b4716..eb2f17c466 100644
--- a/packages/core/src/types.js
+++ b/packages/core/src/types.js
@@ -4,7 +4,8 @@ export const registry = PropTypes.shape({
   ArrayFieldTemplate: PropTypes.elementType,
   FieldTemplate: PropTypes.elementType,
   ObjectFieldTemplate: PropTypes.elementType,
-  rootSchema: PropTypes.object.isRequired,
+  definitions: PropTypes.object.isRequired,
+  rootSchema: PropTypes.object,
   fields: PropTypes.objectOf(PropTypes.elementType).isRequired,
   formContext: PropTypes.object.isRequired,
   widgets: PropTypes.objectOf(

From 39e2d66e38f636e8c4f51bd515489c6ae4e8fe32 Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Sun, 22 Dec 2019 08:29:27 +0000
Subject: [PATCH 17/18] fix eslint issues

---
 packages/core/test/SchemaField_test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/test/SchemaField_test.js b/packages/core/test/SchemaField_test.js
index b0e7a01454..7b2b386d29 100644
--- a/packages/core/test/SchemaField_test.js
+++ b/packages/core/test/SchemaField_test.js
@@ -26,7 +26,7 @@ describe("SchemaField", () => {
       const schema = {
         "type": "object",
         "definitions": {
-          "a": {"type": "string"}
+          "a": { "type": "string" }
         }
       };
       createFormComponent({
@@ -78,7 +78,7 @@ describe("SchemaField", () => {
         formContext: {}
       });
     });
-  })
+  });
 
   describe("Unsupported field", () => {
     it("should warn on invalid field type", () => {

From 810ce140606b73a005aa4a472c3c233c72ea5ccb Mon Sep 17 00:00:00 2001
From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Mon, 23 Dec 2019 14:03:25 +0000
Subject: [PATCH 18/18] fix formatting

---
 packages/core/test/SchemaField_test.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/core/test/SchemaField_test.js b/packages/core/test/SchemaField_test.js
index 7b2b386d29..c685993f6b 100644
--- a/packages/core/test/SchemaField_test.js
+++ b/packages/core/test/SchemaField_test.js
@@ -24,18 +24,18 @@ describe("SchemaField", () => {
     it("should provide expected registry as prop", () => {
       let receivedProps;
       const schema = {
-        "type": "object",
-        "definitions": {
-          "a": { "type": "string" }
-        }
+        type: "object",
+        definitions: {
+          a: { type: "string" },
+        },
       };
       createFormComponent({
         schema,
         uiSchema: {
           "ui:field": props => {
             receivedProps = props;
-            return null;  
-          }
+            return null;
+          },
         },
       });
 
@@ -48,21 +48,21 @@ describe("SchemaField", () => {
         ArrayFieldTemplate: undefined,
         FieldTemplate: undefined,
         ObjectFieldTemplate: undefined,
-        formContext: {}
+        formContext: {},
       });
     });
     it("should set definitions to empty object if it is undefined", () => {
       let receivedProps;
       const schema = {
-        "type": "object"
+        type: "object",
       };
       createFormComponent({
         schema,
         uiSchema: {
           "ui:field": props => {
             receivedProps = props;
-            return null;  
-          }
+            return null;
+          },
         },
       });
 
@@ -75,7 +75,7 @@ describe("SchemaField", () => {
         ArrayFieldTemplate: undefined,
         FieldTemplate: undefined,
         ObjectFieldTemplate: undefined,
-        formContext: {}
+        formContext: {},
       });
     });
   });
@@ -164,8 +164,8 @@ describe("SchemaField", () => {
         uiSchema: {
           "ui:field": props => {
             receivedProps = props;
-            return null;  
-          }
+            return null;
+          },
         },
       });