Merge pull request #82 from lowdefy/mf-render

Mf render
2025-01-18 13:34:56 +08:00 · 2020-10-26 12:57:56 +02:00 · 2020-10-26 12:57:56 +02:00 · 72ba606c19
commit 72ba606c19
parent f3ea101b01 476f646dc3
37 changed files with 329 additions and 616 deletions
--- a/.pnp.js
+++ b/.pnp.js
--- a/.yarn/cache/@apollo-client-npm-3.2.4-640a084312-e2f2971152.zip
+++ b/.yarn/cache/@apollo-client-npm-3.2.4-640a084312-e2f2971152.zip
--- a/.yarn/cache/@octokit-plugin-request-log-npm-1.0.0-b6c4a34e91-fa9e3bd25f.zip
+++ b/.yarn/cache/@octokit-plugin-request-log-npm-1.0.0-b6c4a34e91-fa9e3bd25f.zip
--- a/.yarn/cache/@octokit-plugin-request-log-npm-1.0.2-e4bca3d662-c587973f42.zip
+++ b/.yarn/cache/@octokit-plugin-request-log-npm-1.0.2-e4bca3d662-c587973f42.zip
--- a/.yarn/cache/@types-node-npm-14.14.3-d3b9cbaf00-f77a69dfc0.zip
+++ b/.yarn/cache/@types-node-npm-14.14.3-d3b9cbaf00-f77a69dfc0.zip
--- a/.yarn/cache/buffer-npm-5.6.0-e1494693bf-e18fdf099c.zip
+++ b/.yarn/cache/buffer-npm-5.6.0-e1494693bf-e18fdf099c.zip
--- a/.yarn/cache/caniuse-lite-npm-1.0.30001151-29bf83e412-3acb52ac17.zip
+++ b/.yarn/cache/caniuse-lite-npm-1.0.30001151-29bf83e412-3acb52ac17.zip
--- a/.yarn/cache/commander-npm-6.1.0-126b786d0f-ef1e310c3f.zip
+++ b/.yarn/cache/commander-npm-6.1.0-126b786d0f-ef1e310c3f.zip
--- a/.yarn/cache/commander-npm-6.2.0-5c82761f33-c78501cd98.zip
+++ b/.yarn/cache/commander-npm-6.2.0-5c82761f33-c78501cd98.zip
--- a/.yarn/cache/electron-to-chromium-npm-1.3.583-8057eacb5c-134710b06c.zip
+++ b/.yarn/cache/electron-to-chromium-npm-1.3.583-8057eacb5c-134710b06c.zip
--- a/.yarn/cache/enhanced-resolve-npm-5.3.0-1223e7c227-36c06556c4.zip
+++ b/.yarn/cache/enhanced-resolve-npm-5.3.0-1223e7c227-36c06556c4.zip
--- a/.yarn/cache/git-url-parse-npm-11.3.0-12b198debf-86155163c8.zip
+++ b/.yarn/cache/git-url-parse-npm-11.3.0-12b198debf-86155163c8.zip
--- a/.yarn/cache/git-url-parse-npm-11.4.0-94dcb1d2ef-9c6073f0b0.zip
+++ b/.yarn/cache/git-url-parse-npm-11.4.0-94dcb1d2ef-9c6073f0b0.zip
--- a/.yarn/cache/html-to-react-npm-1.4.5-aee342e225-25cfe46827.zip
+++ b/.yarn/cache/html-to-react-npm-1.4.5-aee342e225-25cfe46827.zip
--- a/.yarn/cache/htmlparser2-npm-5.0.1-d50ebd0fbb-c3564b7d26.zip
+++ b/.yarn/cache/htmlparser2-npm-5.0.1-d50ebd0fbb-c3564b7d26.zip
--- a/.yarn/cache/jest-worker-npm-26.5.0-046e3bbfca-0cb994d9e1.zip
+++ b/.yarn/cache/jest-worker-npm-26.5.0-046e3bbfca-0cb994d9e1.zip
--- a/.yarn/cache/mini-create-react-context-npm-0.4.0-9a76d2720f-51f07df1ed.zip
+++ b/.yarn/cache/mini-create-react-context-npm-0.4.0-9a76d2720f-51f07df1ed.zip
--- a/.yarn/cache/mini-create-react-context-npm-0.4.1-06f382591b-26de37b293.zip
+++ b/.yarn/cache/mini-create-react-context-npm-0.4.1-06f382591b-26de37b293.zip
--- a/.yarn/cache/native-request-npm-1.0.8-0ae6c1b99f-bbb5ec150f.zip
+++ b/.yarn/cache/native-request-npm-1.0.8-0ae6c1b99f-bbb5ec150f.zip
--- a/.yarn/cache/pupa-npm-2.1.1-fb256825ba-b300d979e1.zip
+++ b/.yarn/cache/pupa-npm-2.1.1-fb256825ba-b300d979e1.zip
--- a/.yarn/cache/rc-trigger-npm-5.0.8-4ddff1d646-5db12ceb73.zip
+++ b/.yarn/cache/rc-trigger-npm-5.0.8-4ddff1d646-5db12ceb73.zip
--- a/.yarn/cache/react-dom-npm-17.0.0-f530a218e6-0c695ad4fc.zip
+++ b/.yarn/cache/react-dom-npm-17.0.0-f530a218e6-0c695ad4fc.zip
--- a/.yarn/cache/react-npm-17.0.0-ac51e3f61d-7dc305794d.zip
+++ b/.yarn/cache/react-npm-17.0.0-ac51e3f61d-7dc305794d.zip
--- a/.yarn/cache/scheduler-npm-0.20.0-ae1f515692-092f965d23.zip
+++ b/.yarn/cache/scheduler-npm-0.20.0-ae1f515692-092f965d23.zip
--- a/.yarn/cache/term-size-npm-2.2.1-77ce7141d0-a013f688f6.zip
+++ b/.yarn/cache/term-size-npm-2.2.1-77ce7141d0-a013f688f6.zip
--- a/.yarn/cache/terser-npm-5.3.8-5c417c2e25-3fc070378b.zip
+++ b/.yarn/cache/terser-npm-5.3.8-5c417c2e25-3fc070378b.zip
--- a/.yarn/cache/terser-webpack-plugin-npm-5.0.0-ae44994e85-806b5b9651.zip
+++ b/.yarn/cache/terser-webpack-plugin-npm-5.0.0-ae44994e85-806b5b9651.zip
--- a/.yarn/cache/terser-webpack-plugin-npm-5.0.1-e2259a3f81-23dfddfcba.zip
+++ b/.yarn/cache/terser-webpack-plugin-npm-5.0.1-e2259a3f81-23dfddfcba.zip
--- a/.yarn/cache/uglify-js-npm-3.11.3-119efc0f9d-893090b962.zip
+++ b/.yarn/cache/uglify-js-npm-3.11.3-119efc0f9d-893090b962.zip
--- a/.yarn/cache/uglify-js-npm-3.11.4-b6b4dcd893-654020b5bb.zip
+++ b/.yarn/cache/uglify-js-npm-3.11.4-b6b4dcd893-654020b5bb.zip
--- a/.yarn/cache/webpack-npm-5.1.3-ee81460ee2-4c741af383.zip
+++ b/.yarn/cache/webpack-npm-5.1.3-ee81460ee2-4c741af383.zip
--- a/.yarn/cache/webpack-sources-npm-2.1.0-569bf85c0f-3950d59661.zip
+++ b/.yarn/cache/webpack-sources-npm-2.1.0-569bf85c0f-3950d59661.zip
--- a/packages/blockTools/demo/examples/Spinner.yaml
+++ b/packages/blockTools/demo/examples/Spinner.yaml
@ -13,12 +13,6 @@
    height: 500
  description: |
    style height: 500
- id: message
-  type: Spinner
-  description: |
-    message: loading
-  properties:
-    message: loading
 - id: shaded
  type: Spinner
  description: |
--- a/packages/blockTools/src/Spinner/Spinner.js
+++ b/packages/blockTools/src/Spinner/Spinner.js
@ -34,11 +34,18 @@ const Loading = ({ properties, methods }) => {
          color={properties.color}
          barColor={properties.barColor || (properties.shaded === true ? '#f1f1f1' : '#fff')}
        />
-        {properties.message && (
-          <div className={methods.makeCssClass([{ textAlign: 'center' }, properties.style])}>
-            {properties.message}
-          </div>
-        )}
+        <div
+          className={methods.makeCssClass({
+            textAlign: 'center',
+            color: '#bfbfbf',
+            fontSize: 12,
+            paddingTop: 2,
+            fontFamily:
+              '-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"',
+          })}
+        >
+          Lowdefy
+        </div>
      </div>
    </div>
  );
--- a/packages/blockTools/tests/snapshots/Spinner.test.js.snap
+++ b/packages/blockTools/tests/snapshots/Spinner.test.js.snap
@ -54,6 +54,11 @@ exports[`default 1`] = `
        />
      </g>
    </svg>
+    <div
+      className="{\\"style\\":{\\"textAlign\\":\\"center\\",\\"color\\":\\"#bfbfbf\\",\\"fontSize\\":12,\\"paddingTop\\":2,\\"fontFamily\\":\\"-apple-system,BlinkMacSystemFont,\\\\\\"Segoe UI\\\\\\",Roboto,\\\\\\"Helvetica Neue\\\\\\",Arial,\\\\\\"Noto Sans\\\\\\",sans-serif,\\\\\\"Apple Color Emoji\\\\\\",\\\\\\"Segoe UI Emoji\\\\\\",\\\\\\"Segoe UI Symbol\\\\\\",\\\\\\"Noto Color Emoji\\\\\\"\\"}}"
+    >
+      Lowdefy
+    </div>
  </div>
 </div>
 `;
@ -61,64 +66,6 @@ exports[`default 1`] = `
 exports[`height100 1`] = `
 <div
  className="{\\"style\\":{\\"height\\":100,\\"display\\":\\"flex\\",\\"alignItems\\":\\"center\\",\\"justifyContent\\":\\"center\\",\\"background\\":false}}"
->
-  <div
-    style={
-      Object {
-        "height": 50,
-        "margin": "auto",
-        "width": 50,
-      }
-    }
-  >
-    <svg
-      height="100%"
-      version="1.1"
-      viewBox="0 0 94 91"
-      width="100%"
-    >
-      <g>
-        <path
-          d="M94,18.634c0,-10.284 -8.35,-18.634 -18.634,-18.634l-56.732,0c-10.284,0 -18.634,8.35 -18.634,18.634l0,53.732c0,10.284 8.35,18.634 18.634,18.634l56.732,0c10.284,0 18.634,-8.35 18.634,-18.634l0,-53.732Z"
-          style={
-            Object {
-              "fill": "#bfbfbf",
-            }
-          }
-        />
-        <rect
-          className="loading-bar"
-          height={59}
-          style={
-            Object {
-              "fill": "#fff",
-            }
-          }
-          width={30}
-          x={16}
-          y={15}
-        />
-        <rect
-          className="loading-bar-sm"
-          height={25}
-          style={
-            Object {
-              "fill": "#fff",
-            }
-          }
-          width={25}
-          x={53}
-          y={52}
-        />
-      </g>
-    </svg>
-  </div>
-</div>
-`;
-
-exports[`message 1`] = `
-<div
-  className="{\\"style\\":{\\"height\\":\\"100%\\",\\"display\\":\\"flex\\",\\"alignItems\\":\\"center\\",\\"justifyContent\\":\\"center\\",\\"background\\":false}}"
 >
  <div
    style={
@ -171,9 +118,9 @@ exports[`message 1`] = `
      </g>
    </svg>
    <div
-      className="{\\"style\\":[{\\"textAlign\\":\\"center\\"},null]}"
+      className="{\\"style\\":{\\"textAlign\\":\\"center\\",\\"color\\":\\"#bfbfbf\\",\\"fontSize\\":12,\\"paddingTop\\":2,\\"fontFamily\\":\\"-apple-system,BlinkMacSystemFont,\\\\\\"Segoe UI\\\\\\",Roboto,\\\\\\"Helvetica Neue\\\\\\",Arial,\\\\\\"Noto Sans\\\\\\",sans-serif,\\\\\\"Apple Color Emoji\\\\\\",\\\\\\"Segoe UI Emoji\\\\\\",\\\\\\"Segoe UI Symbol\\\\\\",\\\\\\"Noto Color Emoji\\\\\\"\\"}}"
    >
-      loading
+      Lowdefy
    </div>
  </div>
 </div>
@ -233,6 +180,11 @@ exports[`shaded 1`] = `
        />
      </g>
    </svg>
+    <div
+      className="{\\"style\\":{\\"textAlign\\":\\"center\\",\\"color\\":\\"#bfbfbf\\",\\"fontSize\\":12,\\"paddingTop\\":2,\\"fontFamily\\":\\"-apple-system,BlinkMacSystemFont,\\\\\\"Segoe UI\\\\\\",Roboto,\\\\\\"Helvetica Neue\\\\\\",Arial,\\\\\\"Noto Sans\\\\\\",sans-serif,\\\\\\"Apple Color Emoji\\\\\\",\\\\\\"Segoe UI Emoji\\\\\\",\\\\\\"Segoe UI Symbol\\\\\\",\\\\\\"Noto Color Emoji\\\\\\"\\"}}"
+    >
+      Lowdefy
+    </div>
  </div>
 </div>
 `;
@ -291,6 +243,11 @@ exports[`styleheight 1`] = `
        />
      </g>
    </svg>
+    <div
+      className="{\\"style\\":{\\"textAlign\\":\\"center\\",\\"color\\":\\"#bfbfbf\\",\\"fontSize\\":12,\\"paddingTop\\":2,\\"fontFamily\\":\\"-apple-system,BlinkMacSystemFont,\\\\\\"Segoe UI\\\\\\",Roboto,\\\\\\"Helvetica Neue\\\\\\",Arial,\\\\\\"Noto Sans\\\\\\",sans-serif,\\\\\\"Apple Color Emoji\\\\\\",\\\\\\"Segoe UI Emoji\\\\\\",\\\\\\"Segoe UI Symbol\\\\\\",\\\\\\"Noto Color Emoji\\\\\\"\\"}}"
+    >
+      Lowdefy
+    </div>
  </div>
 </div>
 `;
--- a/packages/renderer/src/page/block/LoadBlock.js
+++ b/packages/renderer/src/page/block/LoadBlock.js
@ -24,9 +24,9 @@ import loadComponent from '../../utils/loadComponent';
 const Components = {};

 const LoadBlock = ({ meta, render }) => {
-  const typeId = `${meta.scope}:${meta.module}`;
+  const typeId = `${meta.moduleFederation.scope}:${meta.moduleFederation.module}`;
  const { ready, failed } = useDynamicScript({
-    url: meta.url,
+    url: meta.moduleFederation.remoteEntryUrl,
  });
  if (!Components[typeId]) {
    if (!ready) {
@ -36,9 +36,11 @@ const LoadBlock = ({ meta, render }) => {
    }
    if (failed) {
      // TODO
-      return <h2>Failed to load dynamic script: {meta.url}</h2>;
+      return <h2>Failed to load dynamic script: {meta.moduleFederation.remoteEntryUrl}</h2>;
    }
-    Components[typeId] = lazy(loadComponent(meta.scope, meta.module));
+    Components[typeId] = lazy(
+      loadComponent(meta.moduleFederation.scope, meta.moduleFederation.module)
+    );
  }
  return render(Components[typeId]);
 };
--- a/yarn.lock
+++ b/yarn.lock
@ -60,7 +60,7 @@ __metadata:
  languageName: node
  linkType: hard

-"@apollo/client@npm:3.2.5":
+"@apollo/client@npm:3.2.5, @apollo/client@npm:^3.0.0-beta.23":
  version: 3.2.5
  resolution: "@apollo/client@npm:3.2.5"
  dependencies:
@ -90,37 +90,6 @@ __metadata:
  languageName: node
  linkType: hard

-"@apollo/client@npm:^3.0.0-beta.23":
-  version: 3.2.4
-  resolution: "@apollo/client@npm:3.2.4"
-  dependencies:
-    "@graphql-typed-document-node/core": ^3.0.0
-    "@types/zen-observable": ^0.8.0
-    "@wry/context": ^0.5.2
-    "@wry/equality": ^0.2.0
-    fast-json-stable-stringify: ^2.0.0
-    graphql-tag: ^2.11.0
-    hoist-non-react-statics: ^3.3.2
-    optimism: ^0.13.0
-    prop-types: ^15.7.2
-    symbol-observable: ^2.0.0
-    terser: ^5.2.0
-    ts-invariant: ^0.4.4
-    tslib: ^1.10.0
-    zen-observable: ^0.8.14
-  peerDependencies:
-    graphql: ^14.0.0 || ^15.0.0
-    react: ^16.8.0
-    subscriptions-transport-ws: ^0.9.0
-  peerDependenciesMeta:
-    react:
-      optional: true
-    subscriptions-transport-ws:
-      optional: true
-  checksum: e2f29711525e7e20d29416866c3a91b0bd6b92afaae6e86fad929a9ab3ad30d915fcf2b561110e39294bef90146b26a3f72852fb4f404abf9d02a13bd9240c4f
-  languageName: node
-  linkType: hard
-
 "@apollo/link-context@npm:2.0.0-beta.3":
  version: 2.0.0-beta.3
  resolution: "@apollo/link-context@npm:2.0.0-beta.3"
@ -1471,7 +1440,7 @@ __metadata:
  languageName: node
  linkType: hard

-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.10.4, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.10.4, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.8.4":
  version: 7.12.1
  resolution: "@babel/runtime@npm:7.12.1"
  dependencies:
@ -3131,9 +3100,11 @@ __metadata:
  linkType: hard

 "@octokit/plugin-request-log@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@octokit/plugin-request-log@npm:1.0.0"
-  checksum: fa9e3bd25fb1ec89b28ac0fa11bfc70f4d105ec603c958444a83ff0a6e5076aa1cdc6279e6344e79cac118cf8a0eae26b277e57c9dc08b7ec12aab16d196c66f
+  version: 1.0.2
+  resolution: "@octokit/plugin-request-log@npm:1.0.2"
+  peerDependencies:
+    "@octokit/core": ">=3"
+  checksum: c587973f425491fb6b9bf74dd9e3f4bbcf6d814d7a4833d262eed554c0764db1461d7b6719159eb3176edd60e9fc54bf31d5e4fad9c0af6f81fb742e59c1d394
  languageName: node
  linkType: hard

@ -3719,9 +3690,9 @@ __metadata:
  linkType: hard

 "@types/node@npm:*, @types/node@npm:>= 8":
-  version: 14.14.2
-  resolution: "@types/node@npm:14.14.2"
-  checksum: e6ad786008ec81e010525beb09067f31cc55a3a02120a7e383e21309c1422a0d4a56059c1da46716509e36dbd4d2c607790f3fd715275a09b9f3ffb2cf3b243e
+  version: 14.14.3
+  resolution: "@types/node@npm:14.14.3"
+  checksum: f77a69dfc0edb74007883f339636f7d79b891219389311ff6d756a966ca1025557c84c68643f738e897385d2e57e9124cc8261fcf080d378398ab60babaffd57
  languageName: node
  linkType: hard

@ -4370,7 +4341,7 @@ __metadata:
  languageName: node
  linkType: hard

-"acorn@npm:^8.0.3, acorn@npm:^8.0.4":
+"acorn@npm:^8.0.4":
  version: 8.0.4
  resolution: "acorn@npm:8.0.4"
  bin:
@ -5384,7 +5355,7 @@ __metadata:
  languageName: node
  linkType: hard

-"base64-js@npm:^1.0.2, base64-js@npm:^1.3.1":
+"base64-js@npm:^1.3.1":
  version: 1.3.1
  resolution: "base64-js@npm:1.3.1"
  checksum: 8a0cc69d7c7c0ab75c164d3e2eccc3dd65fbaba17bcf440aab54636afd31255287ac3cd16a111e98d741c4a6e0b5631774b0c32818355089e645df3ae96a49bb
@ -5598,7 +5569,7 @@ __metadata:
  languageName: node
  linkType: hard

-"browserslist@npm:^4.12.0, browserslist@npm:^4.14.3, browserslist@npm:^4.14.5, browserslist@npm:^4.8.5":
+"browserslist@npm:^4.12.0, browserslist@npm:^4.14.5, browserslist@npm:^4.8.5":
  version: 4.14.5
  resolution: "browserslist@npm:4.14.5"
  dependencies:
@ -5642,7 +5613,7 @@ __metadata:
  languageName: node
  linkType: hard

-"buffer@npm:5.6.1":
+"buffer@npm:5.6.1, buffer@npm:^5.5.0":
  version: 5.6.1
  resolution: "buffer@npm:5.6.1"
  dependencies:
@ -5652,16 +5623,6 @@ __metadata:
  languageName: node
  linkType: hard

-"buffer@npm:^5.5.0":
-  version: 5.6.0
-  resolution: "buffer@npm:5.6.0"
-  dependencies:
-    base64-js: ^1.0.2
-    ieee754: ^1.1.4
-  checksum: e18fdf099c25cae354d673c7deee0391978bde5a47b785cf81e118c75853f0f36838b0a5ea5ee7adf8c02eedb9664292608efdcac9945f4f4f514d14054656f7
-  languageName: node
-  linkType: hard
-
 "builtins@npm:^1.0.3":
  version: 1.0.3
  resolution: "builtins@npm:1.0.3"
@ -5902,9 +5863,9 @@ __metadata:
  linkType: hard

 "caniuse-lite@npm:^1.0.30001135":
-  version: 1.0.30001150
-  resolution: "caniuse-lite@npm:1.0.30001150"
-  checksum: ff8944b2ca6db465e9e878be38f66efad7f4a8cf06aea7c3d463b428649266f75b84dddd130fd3fd46841e160cfac3cfedbe40f3434f428ceaaa709ef6b8b2b1
+  version: 1.0.30001151
+  resolution: "caniuse-lite@npm:1.0.30001151"
+  checksum: 3acb52ac17034d7abe4468e66293c9e5597cb5f123bd8f86ea3b87e758112ac4259fdbc35f8f4cbf5477e385dd975f11031bfbf26f4cec64d64a0c567a430b58
  languageName: node
  linkType: hard

@ -6341,9 +6302,9 @@ __metadata:
  linkType: hard

 "commander@npm:^6.0.0":
-  version: 6.1.0
-  resolution: "commander@npm:6.1.0"
-  checksum: ef1e310c3f430b84f8818ec9c6e5ce1b84909616eb2c1b1a79f646bc25fbca156eccf2ecf19f07e77a08dc519728d53d1300f94f3b2ad93de65add66044dfce6
+  version: 6.2.0
+  resolution: "commander@npm:6.2.0"
+  checksum: c78501cd98e6ad66839004adc27940f5fc1a0102b306fbbc177965101d586cf6dd2e01bdffd64f99f2d4862101f24e602e3e4baa641b6f6a11c01ec5c900e412
  languageName: node
  linkType: hard

@ -7522,9 +7483,9 @@ __metadata:
  linkType: hard

 "electron-to-chromium@npm:^1.3.571":
-  version: 1.3.582
-  resolution: "electron-to-chromium@npm:1.3.582"
-  checksum: 6cfe5f32b8f9397c0664b2082c8868cdfccc562849fc24a93e9eddb2e15182c708030f9860e1e68a7add533e8e97b1bd614b41f9b54e41b115950660fc695c6d
+  version: 1.3.583
+  resolution: "electron-to-chromium@npm:1.3.583"
+  checksum: 134710b06cdd0a722bba5efe502beb914bae9285cd3140c5824f043984b2595e64d6cb893675d8b185cf8bef46cc8f39c72a9f1c78237e31def0c64e076e532f
  languageName: node
  linkType: hard

@ -7597,16 +7558,6 @@ __metadata:
  languageName: node
  linkType: hard

-"enhanced-resolve@npm:^5.2.0":
-  version: 5.3.0
-  resolution: "enhanced-resolve@npm:5.3.0"
-  dependencies:
-    graceful-fs: ^4.2.4
-    tapable: ^2.0.0
-  checksum: 36c06556c43b6fd731ec43c79f67f12cf231f3748d36288dd6728d1a30032d600d97a70cbb4b14dad168837cd1b9a065fc23e5436c0e9c5d37e911278e640348
-  languageName: node
-  linkType: hard
-
 "enhanced-resolve@npm:^5.3.0":
  version: 5.3.1
  resolution: "enhanced-resolve@npm:5.3.1"
@ -7999,7 +7950,7 @@ __metadata:
  languageName: node
  linkType: hard

-"eslint-scope@npm:^5.1.0, eslint-scope@npm:^5.1.1":
+"eslint-scope@npm:^5.1.1":
  version: 5.1.1
  resolution: "eslint-scope@npm:5.1.1"
  dependencies:
@ -9016,11 +8967,11 @@ fsevents@^1.2.7:
  linkType: hard

 "git-url-parse@npm:^11.1.2":
-  version: 11.3.0
-  resolution: "git-url-parse@npm:11.3.0"
+  version: 11.4.0
+  resolution: "git-url-parse@npm:11.4.0"
  dependencies:
    git-up: ^4.0.0
-  checksum: 86155163c8e33c0268d2741c65bc01eecf82c6d9818759de65993b04ca2baa7009a6a77dd1dfdb527510e24dac558f3cb4d134e41a88d0374c2fd39b0676ef84
+  checksum: 9c6073f0b03576dd80810433bf5b6f8bc83a96aa73a9f897315c5cbb1420c0ff8db5aeed9ddf472bdf0135a3ce2d8f36cd269d10d58f84c93f21b33d54034c4c
  languageName: node
  linkType: hard

@ -9539,16 +9490,16 @@ fsevents@^1.2.7:
  linkType: hard

 "html-to-react@npm:^1.3.4":
-  version: 1.4.4
-  resolution: "html-to-react@npm:1.4.4"
+  version: 1.4.5
+  resolution: "html-to-react@npm:1.4.5"
  dependencies:
    domhandler: ^3.3.0
    htmlparser2: ^5.0
    lodash.camelcase: ^4.3.0
    ramda: ^0.27.1
  peerDependencies:
-    react: ^16.0
-  checksum: c8d927b2d91adc16ffd271d36ba4f80c7e16bdc66bb59336fe3f2dfcb4df38ac9338aa918381f72ac1601de8bf2719d45ece61b78d1971646b913eae9005ca3d
+    react: ^16.0 || ^17.0
+  checksum: 25cfe46827361e1f17c3509d2631ccdbfbb3999b92cb05244479ffa99937a58377927b3adb1bedec44f6e370f08c74e502818dfed7462ebf419b9b446f4b058d
  languageName: node
  linkType: hard

@ -9586,16 +9537,14 @@ fsevents@^1.2.7:
  linkType: hard

 "htmlparser2@npm:^5.0":
-  version: 5.0.0
-  resolution: "htmlparser2@npm:5.0.0"
+  version: 5.0.1
+  resolution: "htmlparser2@npm:5.0.1"
  dependencies:
    domelementtype: ^2.0.1
    domhandler: ^3.3.0
    domutils: ^2.4.2
    entities: ^2.0.0
-  peerDependencies:
-    "@types/node": ^14.0.5
-  checksum: b01077f9210b82437c5fb5426aaf1de4c82b334fba9f271994426e8834708a71d90532890d9c209cf25902d336d2e8b0854d1fb3c684e7244e8b300999063df0
+  checksum: c3564b7d26b5e894ee9aae9132ddf23ce79c4d31881b75aef14224b5d89c2e17dc638fa77c0a576e0fcc4c73cc608890bc63b4452f79d7960d2b4af836247fc0
  languageName: node
  linkType: hard

@ -9774,7 +9723,7 @@ fsevents@^1.2.7:
  languageName: node
  linkType: hard

-"ieee754@npm:^1.1.13, ieee754@npm:^1.1.4":
+"ieee754@npm:^1.1.13":
  version: 1.1.13
  resolution: "ieee754@npm:1.1.13"
  checksum: 9ef12932e8aeae1c614f314783b3770fac5daae7ae92ebffcda97da58efd77c0289181093666f6048e02c566ceeec4d0edf3b04b57ce8e0b57e9b3814a870469
@ -11092,17 +11041,6 @@ fsevents@^1.2.7:
  languageName: node
  linkType: hard

-"jest-worker@npm:^26.5.0":
-  version: 26.5.0
-  resolution: "jest-worker@npm:26.5.0"
-  dependencies:
-    "@types/node": "*"
-    merge-stream: ^2.0.0
-    supports-color: ^7.0.0
-  checksum: 0cb994d9e144712589fd5cbf948c27d6a11a871f1fecb65c99d50799e35c7e21fda2d0a74c0245eddf4884e40c1f638b02cd2c5c4c3eeb1ee07b64da3cb0fb3a
-  languageName: node
-  linkType: hard
-
 "jest-worker@npm:^26.6.1":
  version: 26.6.1
  resolution: "jest-worker@npm:26.6.1"
@ -12238,15 +12176,15 @@ fsevents@^1.2.7:
  linkType: hard

 "mini-create-react-context@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "mini-create-react-context@npm:0.4.0"
+  version: 0.4.1
+  resolution: "mini-create-react-context@npm:0.4.1"
  dependencies:
-    "@babel/runtime": ^7.5.5
+    "@babel/runtime": ^7.12.1
    tiny-warning: ^1.0.3
  peerDependencies:
    prop-types: ^15.0.0
-    react: ^0.14.0 || ^15.0.0 || ^16.0.0
-  checksum: 51f07df1ed473597e997a6be181262cc06a68e6f29e1ff4d7c6f0a201cfb191e840e504fad1e417cbe622cb3575354fb29cde3327443ce428e09927520078ab2
+    react: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+  checksum: 26de37b293ecf37c3f858e7dfe545e652a0c177373985ec6059a54b22f1083c28b0c5b3a13910ad4bd61636a603db6f4c085752b56e007907799c9df9767f754
  languageName: node
  linkType: hard

@ -12552,9 +12490,9 @@ fsevents@^1.2.7:
  linkType: hard

 "native-request@npm:^1.0.5":
-  version: 1.0.7
-  resolution: "native-request@npm:1.0.7"
-  checksum: 14ed09afe0ca2953ec76f46897ac0630dca0e5bd21db94c8c106ac22766408a8a4a296efe563db3809f0c2218392c50d0a3639df79bfde87bb7df43dc8fcbd74
+  version: 1.0.8
+  resolution: "native-request@npm:1.0.8"
+  checksum: bbb5ec150fe3bec61e76f8170641e0519348bb7de5b1c67fc757c5ca61dc7c539a0984d00c3d89e0b8b8e1fe6d6e52aed144eb725bc0a8693d4dc1633e15cb7a
  languageName: node
  linkType: hard

@ -14168,11 +14106,11 @@ fsevents@^1.2.7:
  linkType: hard

 "pupa@npm:^2.0.1":
-  version: 2.1.0
-  resolution: "pupa@npm:2.1.0"
+  version: 2.1.1
+  resolution: "pupa@npm:2.1.1"
  dependencies:
    escape-goat: ^2.0.0
-  checksum: 1b4374e7ada1f2e666915d942a98de94819dc018e8dba82aba83e98572954d32b616045e84e28825fcc8b7b485f354c92a8531109ecd62812d8f7f9cff7db227
+  checksum: b300d979e1bcc388b0aabe723e9bd7f6598f02a10e66b693b9dde6249f68ad95e93804a1511dbbafd172e404b837d60c49ebdd152e3e94909dc282ca4ba285e8
  languageName: node
  linkType: hard

@ -14758,15 +14696,15 @@ fsevents@^1.2.7:
  linkType: hard

 "rc-trigger@npm:^5.0.4":
-  version: 5.0.7
-  resolution: "rc-trigger@npm:5.0.7"
+  version: 5.0.8
+  resolution: "rc-trigger@npm:5.0.8"
  dependencies:
    "@babel/runtime": ^7.11.2
    classnames: ^2.2.6
    rc-align: ^4.0.0
    rc-motion: ^2.0.0
    rc-util: ^5.3.4
-  checksum: 49c76fe9b0f83898706e1de4ef9500ed79e2c3d5d64eccfd907a82c39aeade2d715f056181c45ca945188981875f7747de2bac331d14429c96fb36b6d04175c4
+  checksum: 5db12ceb73c544cb1edd9d4ce1bb29f88c759c0d7e134cf172e141e11c682b72f40af10ed337f32bd866178f129a8c20612d8b490e12953a3cd5d457b2df5794
  languageName: node
  linkType: hard

@ -14844,20 +14782,7 @@ fsevents@^1.2.7:
  languageName: node
  linkType: hard

-"react-dom@npm:*":
-  version: 17.0.0
-  resolution: "react-dom@npm:17.0.0"
-  dependencies:
-    loose-envify: ^1.1.0
-    object-assign: ^4.1.1
-    scheduler: ^0.20.0
-  peerDependencies:
-    react: 17.0.0
-  checksum: 0c695ad4fc43d506e49199441806d84632ae714e21efbd1708cefa2fd2fc3a321b9b19e6f9d6fcf0277aa3d4998563821bb443107761ee58c36e419c95e6629d
-  languageName: node
-  linkType: hard
-
-"react-dom@npm:17.0.1":
+"react-dom@npm:*, react-dom@npm:17.0.1":
  version: 17.0.1
  resolution: "react-dom@npm:17.0.1"
  dependencies:
@ -14891,20 +14816,20 @@ fsevents@^1.2.7:
  languageName: node
  linkType: hard

-"react-is@npm:^16.12.0, react-is@npm:^16.12.0 || ^17.0.0, react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0, react-is@npm:^16.8.1, react-is@npm:^16.8.6":
-  version: 16.13.1
-  resolution: "react-is@npm:16.13.1"
-  checksum: 11bcf1267a314a522615f626f3ce3727a3a24cdbf61c4d452add3550a7875326669631326cfb1ba3e92b6f72244c32ffecf93ad21c0cad8455d3e169d0e3f060
-  languageName: node
-  linkType: hard
-
-"react-is@npm:^17.0.1":
+"react-is@npm:^16.12.0 || ^17.0.0, react-is@npm:^17.0.1":
  version: 17.0.1
  resolution: "react-is@npm:17.0.1"
  checksum: 5a83dfc78e7adcb93d632bf367b0733db650e3abd2e9c57c33b87e50d201212c1884b0d7bcf13e692f1556189fa1b87f9f3e0ba10fe858fd6aebe83ed4fcd1ea
  languageName: node
  linkType: hard

+"react-is@npm:^16.12.0, react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0, react-is@npm:^16.8.1, react-is@npm:^16.8.6":
+  version: 16.13.1
+  resolution: "react-is@npm:16.13.1"
+  checksum: 11bcf1267a314a522615f626f3ce3727a3a24cdbf61c4d452add3550a7875326669631326cfb1ba3e92b6f72244c32ffecf93ad21c0cad8455d3e169d0e3f060
+  languageName: node
+  linkType: hard
+
 "react-lifecycles-compat@npm:^3.0.4":
  version: 3.0.4
  resolution: "react-lifecycles-compat@npm:3.0.4"
@ -15032,17 +14957,7 @@ fsevents@^1.2.7:
  languageName: node
  linkType: hard

-"react@npm:*":
-  version: 17.0.0
-  resolution: "react@npm:17.0.0"
-  dependencies:
-    loose-envify: ^1.1.0
-    object-assign: ^4.1.1
-  checksum: 7dc305794dfcd4b7b20ba0a0e320b701544487fffb3dc64b31712c04989b36fc73fbe7e23b31913d811f5e7030385b468db2c25109608dd5402e5ff94dcbc68f
-  languageName: node
-  linkType: hard
-
-"react@npm:17.0.1":
+"react@npm:*, react@npm:17.0.1":
  version: 17.0.1
  resolution: "react@npm:17.0.1"
  dependencies:
@ -15850,16 +15765,6 @@ fsevents@^1.2.7:
  languageName: node
  linkType: hard

-"scheduler@npm:^0.20.0":
-  version: 0.20.0
-  resolution: "scheduler@npm:0.20.0"
-  dependencies:
-    loose-envify: ^1.1.0
-    object-assign: ^4.1.1
-  checksum: 092f965d23704e280a79ac4919afbed96548228c58b338e9e6a6ba1e3e48a9ff3db059ac756b071d4112350d07bf3c58a3fe45d88ba44f4616b443f2ee2a4469
-  languageName: node
-  linkType: hard
-
 "scheduler@npm:^0.20.1":
  version: 0.20.1
  resolution: "scheduler@npm:0.20.1"
@ -17044,9 +16949,9 @@ fsevents@^1.2.7:
  linkType: hard

 "term-size@npm:^2.1.0":
-  version: 2.2.0
-  resolution: "term-size@npm:2.2.0"
-  checksum: 02307492dfe602234355d55f23f4ce0125ad2dea428a63337e031bc97d2f7832b12c66eb64853f4dc30bdfc05377bc161da8659ecc30303a1ac616a619f284bb
+  version: 2.2.1
+  resolution: "term-size@npm:2.2.1"
+  checksum: a013f688f6fc1b6410be3b2f7a04c3a9169e97186949b0bc33cc7c1943b0c88d9a943f81e518d9227cb817803e7a18c702f2971eafd6d8659ce4a1df94094246
  languageName: node
  linkType: hard

@ -17061,18 +16966,18 @@ fsevents@^1.2.7:
  linkType: hard

 "terser-webpack-plugin@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "terser-webpack-plugin@npm:5.0.0"
+  version: 5.0.1
+  resolution: "terser-webpack-plugin@npm:5.0.1"
  dependencies:
-    jest-worker: ^26.5.0
+    jest-worker: ^26.6.1
    p-limit: ^3.0.2
    schema-utils: ^3.0.0
    serialize-javascript: ^5.0.1
    source-map: ^0.6.1
-    terser: ^5.3.5
+    terser: ^5.3.8
  peerDependencies:
    webpack: ^5.1.0
-  checksum: 806b5b9651ebb7893b093ca199b291350d1528fae5c3e7671a3b685810d6c3c6607d9bb0cb5950cb4dfdf013f5675a3849861fd352c653cc7644909a67f27c4b
+  checksum: 23dfddfcbaa72b0eb4ee2f2af56ec1d72498f4cf4b17a29712cfa4edd7ce5e4dbc7577f1c69835d32ce104672d77559b0b401a0534f67706f0919cf275e47ace
  languageName: node
  linkType: hard

@ -17089,16 +16994,16 @@ fsevents@^1.2.7:
  languageName: node
  linkType: hard

-"terser@npm:^5.2.0, terser@npm:^5.3.5":
-  version: 5.3.7
-  resolution: "terser@npm:5.3.7"
+"terser@npm:^5.3.8":
+  version: 5.3.8
+  resolution: "terser@npm:5.3.8"
  dependencies:
    commander: ^2.20.0
    source-map: ~0.7.2
    source-map-support: ~0.5.19
  bin:
    terser: bin/terser
-  checksum: eefdf0b666209cb8214b9c388fbe5d83ae3ee663ef5c1a1db4ca521b01b6e80991d90cd51e2ed2dba245bb55ca7f625d8c0bae08e0124f656339df57e018ac03
+  checksum: 3fc070378ba9981d8088a4012060f16428a97dc8f98d5a731b2ab51b8c9bc8cb651ca068aef499faad863584ae4d4883872c4f51db053bc2575c2e0bc11ab411
  languageName: node
  linkType: hard

@ -17528,11 +17433,11 @@ fsevents@^1.2.7:
  linkType: hard

 "uglify-js@npm:^3.1.4":
-  version: 3.11.3
-  resolution: "uglify-js@npm:3.11.3"
+  version: 3.11.4
+  resolution: "uglify-js@npm:3.11.4"
  bin:
    uglifyjs: bin/uglifyjs
-  checksum: 893090b962e6f1026c818a5b442e0ff84838560c4d91ab56dea154d51e1a531dfb34ec775e44c603d3ea40a25fe5374e679bd042afaf790372c8fabf3aa84694
+  checksum: 654020b5bb2e53ef99b91603396dee47fc24930909a207590f04a93699c1df0f951e85c1c486aec44859b1ca255430681b46f13bd36f81e0113e57c370bf93d0
  languageName: node
  linkType: hard

@ -18190,53 +18095,16 @@ fsevents@^1.2.7:
  linkType: hard

 "webpack-sources@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "webpack-sources@npm:2.0.1"
+  version: 2.1.0
+  resolution: "webpack-sources@npm:2.1.0"
  dependencies:
    source-list-map: ^2.0.1
    source-map: ^0.6.1
-  checksum: fde296d7e3603afab2d832dec6b0d76ad4dcf2f2b9b0a06da92bdde7004cf62fad685cdda84a57abe5c97f975b529cc9a35e7a419c2c9b56074bcbdcad15036a
+  checksum: 3950d59661b33ecbfaa0dc4d96a118f2d5e6f9f1b3a24ba5cdb0575758745698035949beac486f52a9e9a69bd94dce5f5a138125632117b1ab708220929e9cda
  languageName: node
  linkType: hard

-"webpack@npm:*":
-  version: 5.1.3
-  resolution: "webpack@npm:5.1.3"
-  dependencies:
-    "@types/eslint-scope": ^3.7.0
-    "@types/estree": ^0.0.45
-    "@webassemblyjs/ast": 1.9.0
-    "@webassemblyjs/helper-module-context": 1.9.0
-    "@webassemblyjs/wasm-edit": 1.9.0
-    "@webassemblyjs/wasm-parser": 1.9.0
-    acorn: ^8.0.3
-    browserslist: ^4.14.3
-    chrome-trace-event: ^1.0.2
-    enhanced-resolve: ^5.2.0
-    eslint-scope: ^5.1.0
-    events: ^3.2.0
-    glob-to-regexp: ^0.4.1
-    graceful-fs: ^4.2.4
-    json-parse-better-errors: ^1.0.2
-    loader-runner: ^4.1.0
-    mime-types: ^2.1.27
-    neo-async: ^2.6.2
-    pkg-dir: ^4.2.0
-    schema-utils: ^3.0.0
-    tapable: ^2.0.0
-    terser-webpack-plugin: ^5.0.0
-    watchpack: ^2.0.0
-    webpack-sources: ^2.0.1
-  peerDependenciesMeta:
-    webpack-cli:
-      optional: true
-  bin:
-    webpack: bin/webpack.js
-  checksum: 4c741af3831bb216b8a51a3a5586f134318a0106fd38b6bbafdd609b65cb1e594d7ae58daa794b8de5bb5b1dcbf0b98b3f8e9fde848f95d5f2971657d57d581e
-  languageName: node
-  linkType: hard
-
-"webpack@npm:5.2.0":
+"webpack@npm:*, webpack@npm:5.2.0":
  version: 5.2.0
  resolution: "webpack@npm:5.2.0"
  dependencies: