amend health-checks to include get call for metadata

packages/health-check/src/checks/extended.js

@@ -3,6 +3,7 @@ const hasha = require("hasha");
 const { detailedDiff } = require("deep-object-diff");
 const { isEqual } = require("lodash");
 const { calculateElapsedTime, ensureValidJSON, getResponseContent } = require("../utils");
+const { parseSkylink } = require("skynet-js");
 
 // audioExampleCheck returns the result of trying to download the skylink
 // for the Example audio file on siasky.net
@@ -11,9 +12,9 @@ function audioExampleCheck(done) {
     name: "Audio Example",
     skylink: "_A2zt5SKoqwnnZU4cBF8uBycSKULXMyeg1c5ZISBr2Q3dA",
     bodyHash: "1bea1f570043f20149ae4cb4d30089d90897b15b",
+    metadata: { filename: "feel-good.mp3" },
     headers: {
       "skynet-skylink": "_A2zt5SKoqwnnZU4cBF8uBycSKULXMyeg1c5ZISBr2Q3dA",
-      "skynet-file-metadata": { filename: "feel-good.mp3" },
       "content-disposition": 'inline; filename="feel-good.mp3"',
       "content-type": "audio/mpeg",
     },
@@ -29,9 +30,7 @@ function covid19PaperCheck(done) {
     name: "Covid-19 Paper",
     skylink: "PAMZVmfutxWoG6Wnl5BRKuWLkDNZR42k_okRRvksJekA3A",
     bodyHash: "7ce20bfc4221503fd0bf909ad20c422eca125c7d",
-    headers: {
+    metadata: {
-      "skynet-skylink": "PAMZVmfutxWoG6Wnl5BRKuWLkDNZR42k_okRRvksJekA3A",
-      "skynet-file-metadata": {
       filename: "An Effective Treatment for Coronavirus (COVID-19).pdf",
       subfiles: {
         "An Effective Treatment for Coronavirus (COVID-19).pdf": {
@@ -41,6 +40,8 @@ function covid19PaperCheck(done) {
         },
       },
     },
+    headers: {
+      "skynet-skylink": "PAMZVmfutxWoG6Wnl5BRKuWLkDNZR42k_okRRvksJekA3A",
       "content-disposition": 'inline; filename="An Effective Treatment for Coronavirus (COVID-19).pdf"',
       "content-type": "application/pdf",
     },
@@ -56,9 +57,9 @@ function covid19CoroNopePaperCheck(done) {
     name: "Covid-19 CoroNope Paper",
     skylink: "bACLKGmcmX4NCp47WwOOJf0lU666VLeT5HRWpWVtqZPjEA",
     bodyHash: "0db705da1b1232f8344ed74fd38245d35a49a965",
+    metadata: { filename: "coronope.pdf" },
     headers: {
       "skynet-skylink": "bACLKGmcmX4NCp47WwOOJf0lU666VLeT5HRWpWVtqZPjEA",
-      "skynet-file-metadata": { filename: "coronope.pdf" },
       "content-disposition": 'inline; filename="coronope.pdf"',
       "content-type": "application/pdf",
     },
@@ -74,9 +75,7 @@ function dappExampleCheck(done) {
     name: "Dapp Example (UniSwap)",
     skylink: "EADWpKD0myqH2tZa6xtKebg6kNnwYnI94fl4R8UKgNrmOA",
     bodyHash: "7b74cbb5927e964db493b82cc1f8a532f1ff72f5",
-    headers: {
+    metadata: {
-      "skynet-skylink": "EADWpKD0myqH2tZa6xtKebg6kNnwYnI94fl4R8UKgNrmOA",
-      "skynet-file-metadata": {
       filename: "build",
       length: 15578459,
       subfiles: {
@@ -549,6 +548,8 @@ function dappExampleCheck(done) {
         },
       },
     },
+    headers: {
+      "skynet-skylink": "EADWpKD0myqH2tZa6xtKebg6kNnwYnI94fl4R8UKgNrmOA",
       "content-disposition": 'inline; filename="build"',
       "content-type": "text/html",
     },
@@ -567,9 +568,9 @@ function developMomentumCheck(done) {
     name: "Develop Momentum Index File",
     skylink: "EAA1fG_ip4C1Vi1Ijvsr1oyr8jpH0Bo9HXya0T3kw-elGw/",
     bodyHash: developMomentumBodyHash,
+    // metadata: developMomentumMetadata,
     headers: {
       "skynet-skylink": "EAA1fG_ip4C1Vi1Ijvsr1oyr8jpH0Bo9HXya0T3kw-elGw",
-      "skynet-file-metadata": developMomentumMetadata,
       "content-disposition": 'inline; filename="output"',
       "content-type": "text/html",
     },
@@ -582,12 +583,12 @@ function developMomentumCheck(done) {
 // for the Develop Momentum Application without the tailing slash
 function developMomentumRedirectCheck(done) {
   const linkInfo = {
-    name: "Develop Momentum Index File",
+    name: "Develop Momentum Index File - no trailing slash",
     skylink: "EAA1fG_ip4C1Vi1Ijvsr1oyr8jpH0Bo9HXya0T3kw-elGw",
     bodyHash: developMomentumBodyHash,
+    metadata: developMomentumMetadata,
     headers: {
       "skynet-skylink": "EAA1fG_ip4C1Vi1Ijvsr1oyr8jpH0Bo9HXya0T3kw-elGw",
-      "skynet-file-metadata": developMomentumMetadata,
       "content-disposition": 'inline; filename="output"',
       "content-type": "text/html",
     },
@@ -603,13 +604,13 @@ function developMomentumIndexFileCheck(done) {
     name: "Develop Momentum Index File",
     skylink: "EAA1fG_ip4C1Vi1Ijvsr1oyr8jpH0Bo9HXya0T3kw-elGw/index.html",
     bodyHash: developMomentumBodyHash,
+    // metadata: {
+    //   filename: "/index.html",
+    //   length: 4981,
+    //   subfiles: { "index.html": { filename: "index.html", contenttype: "text/html", len: 4981 } },
+    // },
     headers: {
       "skynet-skylink": "EAA1fG_ip4C1Vi1Ijvsr1oyr8jpH0Bo9HXya0T3kw-elGw",
-      "skynet-file-metadata": {
-        filename: "/index.html",
-        length: 4981,
-        subfiles: { "index.html": { filename: "index.html", contenttype: "text/html", len: 4981 } },
-      },
       "content-disposition": 'inline; filename="index.html"',
       "content-type": "text/html; charset=utf-8",
     },
@@ -625,9 +626,9 @@ function htmlExampleCheck(done) {
     name: "HTML Example",
     skylink: "PAL0w4SdA5rFCDGEutgpeQ50Om-YkBabtXVOJAkmedslKw",
     bodyHash: "ecffcfbb74e017698cad30a91a74b9ba0b046413",
+    metadata: { filename: "introduction – Sia API Documentation.html" },
     headers: {
       "skynet-skylink": "PAL0w4SdA5rFCDGEutgpeQ50Om-YkBabtXVOJAkmedslKw",
-      "skynet-file-metadata": { filename: "introduction â\x80\x93 Sia API Documentation.html" },
       "content-disposition": 'inline; filename="introduction â\x80\x93 Sia API Documentation.html"',
       "content-type": "text/html; charset=utf-8",
     },
@@ -643,9 +644,9 @@ function imageExampleCheck(done) {
     name: "Image Example",
     skylink: "IADUs8d9CQjUO34LmdaaNPK_STuZo24rpKVfYW3wPPM2uQ",
     bodyHash: "e318667a9d53a45a9d010ac4e0d120ad064279ac",
+    metadata: { filename: "sia-lm.png" },
     headers: {
       "skynet-skylink": "IADUs8d9CQjUO34LmdaaNPK_STuZo24rpKVfYW3wPPM2uQ",
-      "skynet-file-metadata": { filename: "sia-lm.png" },
       "content-disposition": 'inline; filename="sia-lm.png"',
       "content-type": "image/png",
     },
@@ -661,9 +662,9 @@ function jsonExampleCheck(done) {
     name: "JSON Example",
     skylink: "AAC0uO43g64ULpyrW0zO3bjEknSFbAhm8c-RFP21EQlmSQ",
     bodyHash: "b514603ce8acd937197712700e21259f18a857d6",
+    metadata: { filename: "consensus.json" },
     headers: {
       "skynet-skylink": "AAC0uO43g64ULpyrW0zO3bjEknSFbAhm8c-RFP21EQlmSQ",
-      "skynet-file-metadata": { filename: "consensus.json" },
       "content-disposition": 'inline; filename="consensus.json"',
       "content-type": "application/json",
     },
@@ -679,9 +680,9 @@ function pdfExampleCheck(done) {
     name: "PDF Example",
     skylink: "XABvi7JtJbQSMAcDwnUnmp2FKDPjg8_tTTFP4BwMSxVdEg",
     bodyHash: "7e079f7afc9e5bc0c1be04543e22ac552a14a8da",
+    metadata: { filename: "sia.pdf" },
     headers: {
       "skynet-skylink": "XABvi7JtJbQSMAcDwnUnmp2FKDPjg8_tTTFP4BwMSxVdEg",
-      "skynet-file-metadata": { filename: "sia.pdf" },
       "content-disposition": 'inline; filename="sia.pdf"',
       "content-type": "application/pdf",
     },
@@ -696,12 +697,12 @@ function skyBayCheck(done) {
     name: "SkyBay",
     skylink: "EABkMjXzxJRpPz0eO0Or5fy2eo-rz3prdigGwRlyNd9mwA/",
     bodyHash: "dfc0b1d3d1113254d7545d19f6118855ed9c778b",
-    headers: {
+    metadata: {
-      "skynet-skylink": "EABkMjXzxJRpPz0eO0Or5fy2eo-rz3prdigGwRlyNd9mwA",
-      "skynet-file-metadata": {
       filename: "skybay.html",
       subfiles: { "skybay.html": { filename: "skybay.html", contenttype: "text/html", len: 11655 } },
     },
+    headers: {
+      "skynet-skylink": "EABkMjXzxJRpPz0eO0Or5fy2eo-rz3prdigGwRlyNd9mwA",
       "content-disposition": 'inline; filename="skybay.html"',
       "content-type": "text/html",
     },
@@ -717,12 +718,12 @@ function skyBayRedirectCheck(done) {
     name: "SkyBay Redirect",
     skylink: "EABkMjXzxJRpPz0eO0Or5fy2eo-rz3prdigGwRlyNd9mwA",
     bodyHash: "dfc0b1d3d1113254d7545d19f6118855ed9c778b",
-    headers: {
+    metadata: {
-      "skynet-skylink": "EABkMjXzxJRpPz0eO0Or5fy2eo-rz3prdigGwRlyNd9mwA",
-      "skynet-file-metadata": {
       filename: "skybay.html",
       subfiles: { "skybay.html": { filename: "skybay.html", contenttype: "text/html", len: 11655 } },
     },
+    headers: {
+      "skynet-skylink": "EABkMjXzxJRpPz0eO0Or5fy2eo-rz3prdigGwRlyNd9mwA",
       "content-disposition": 'inline; filename="skybay.html"',
       "content-type": "text/html",
     },
@@ -737,9 +738,9 @@ function skyBinCheck(done) {
     name: "SkyBin",
     skylink: "CAAVU14pB9GRIqCrejD7rlS27HltGGiiCLICzmrBV0wVtA/",
     bodyHash: "858ff733c4cb06a80060b8a62cf303fd5a051651",
+    metadata: { filename: "skybin.html" },
     headers: {
       "skynet-skylink": "CAAVU14pB9GRIqCrejD7rlS27HltGGiiCLICzmrBV0wVtA",
-      "skynet-file-metadata": { filename: "skybin.html" },
       "content-disposition": 'inline; filename="skybin.html"',
       "content-type": "text/html; charset=utf-8",
     },
@@ -755,9 +756,9 @@ function skyBinRedirectCheck(done) {
     name: "SkyBin Redirect",
     skylink: "CAAVU14pB9GRIqCrejD7rlS27HltGGiiCLICzmrBV0wVtA",
     bodyHash: "858ff733c4cb06a80060b8a62cf303fd5a051651",
+    metadata: { filename: "skybin.html" },
     headers: {
       "skynet-skylink": "CAAVU14pB9GRIqCrejD7rlS27HltGGiiCLICzmrBV0wVtA",
-      "skynet-file-metadata": { filename: "skybin.html" },
       "content-disposition": 'inline; filename="skybin.html"',
       "content-type": "text/html; charset=utf-8",
     },
@@ -775,9 +776,9 @@ function skyGalleryCheck(done) {
     name: "SkyGallery",
     skylink: "AADW6GsQcetwDBaDYnGCSTbYjSKY743NtY1A5VRx5sj3Dg/",
     bodyHash: skyGalleryBodyHash,
+    metadata: skyGalleryMetadata,
     headers: {
       "skynet-skylink": "AADW6GsQcetwDBaDYnGCSTbYjSKY743NtY1A5VRx5sj3Dg",
-      "skynet-file-metadata": skyGalleryMetadata,
       "content-disposition": 'inline; filename="skygallery-v0.1.1-76c4c115fcb526716b2564568850f433"',
       "content-type": "text/html",
     },
@@ -793,13 +794,13 @@ function skyGalleryIndexFileCheck(done) {
     name: "SkyGallery Index File",
     skylink: "AADW6GsQcetwDBaDYnGCSTbYjSKY743NtY1A5VRx5sj3Dg/index.html",
     bodyHash: skyGalleryBodyHash,
+    // metadata: {
+    //   filename: "/index.html",
+    //   length: 2534,
+    //   subfiles: { "index.html": { filename: "index.html", contenttype: "text/html", len: 2534 } },
+    // },
     headers: {
       "skynet-skylink": "AADW6GsQcetwDBaDYnGCSTbYjSKY743NtY1A5VRx5sj3Dg",
-      "skynet-file-metadata": {
-        filename: "/index.html",
-        length: 2534,
-        subfiles: { "index.html": { filename: "index.html", contenttype: "text/html", len: 2534 } },
-      },
       "content-disposition": 'inline; filename="index.html"',
       "content-type": "text/html; charset=utf-8",
     },
@@ -815,9 +816,9 @@ function skyGalleryRedirectCheck(done) {
     name: "SkyGallery Redirect",
     skylink: "AADW6GsQcetwDBaDYnGCSTbYjSKY743NtY1A5VRx5sj3Dg",
     bodyHash: skyGalleryBodyHash,
+    metadata: skyGalleryMetadata,
     headers: {
       "skynet-skylink": "AADW6GsQcetwDBaDYnGCSTbYjSKY743NtY1A5VRx5sj3Dg",
-      "skynet-file-metadata": skyGalleryMetadata,
       "content-disposition": 'inline; filename="skygallery-v0.1.1-76c4c115fcb526716b2564568850f433"',
       "content-type": "text/html",
     },
@@ -833,9 +834,7 @@ function uncensoredLibraryCheck(done) {
     name: "Unzip The Uncensored Library Map",
     skylink: "AAC5glnZyNJ4Ieb4MhnYJGtID6qdMqEjl0or5EvEMt7bWQ",
     bodyHash: "cd0377661eefd656c8b46c497aa03112393ba893",
-    headers: {
+    metadata: {
-      "skynet-skylink": "AAC5glnZyNJ4Ieb4MhnYJGtID6qdMqEjl0or5EvEMt7bWQ",
-      "skynet-file-metadata": {
       filename: "Unzip_The_Uncensored_Library_Map.zip",
       subfiles: {
         "Unzip_The_Uncensored_Library_Map.zip": {
@@ -845,6 +844,8 @@ function uncensoredLibraryCheck(done) {
         },
       },
     },
+    headers: {
+      "skynet-skylink": "AAC5glnZyNJ4Ieb4MhnYJGtID6qdMqEjl0or5EvEMt7bWQ",
       "content-disposition": 'inline; filename="Unzip_The_Uncensored_Library_Map.zip"',
       "content-type": "application/zip",
     },
@@ -858,9 +859,7 @@ function uncensoredLibraryPressReleaseCheck(done) {
     name: "The Uncensored Library - Press Release",
     skylink: "AABHwuml_EhvyY8Gm7j1E2xGwodUNAJgX0A6-Cd22p9kNA",
     bodyHash: "da39a3ee5e6b4b0d3255bfef95601890afd80709",
-    headers: {
+    metadata: {
-      "skynet-skylink": "AABHwuml_EhvyY8Gm7j1E2xGwodUNAJgX0A6-Cd22p9kNA",
-      "skynet-file-metadata": {
       filename: "press-release-Reporters-Without-Borders-The-Uncensored-Library.zip",
       subfiles: {
         "press-release-Reporters-Without-Borders-The-Uncensored-Library.zip": {
@@ -870,6 +869,8 @@ function uncensoredLibraryPressReleaseCheck(done) {
         },
       },
     },
+    headers: {
+      "skynet-skylink": "AABHwuml_EhvyY8Gm7j1E2xGwodUNAJgX0A6-Cd22p9kNA",
       "content-disposition": 'inline; filename="press-release-Reporters-Without-Borders-The-Uncensored-Library.zip"',
       "content-type": "application/zip",
     },
@@ -884,9 +885,7 @@ function uncensoredLibraryV2Check(done) {
     name: "The Uncensored Library V2",
     skylink: "AAAs-JOsRGWgABYIo7AwTDqSX79-BxQKjDj0wiRGoRPFnw",
     bodyHash: "f2a802c2b7482825613a08853538203a53c96bd1",
-    headers: {
+    metadata: {
-      "skynet-skylink": "AAAs-JOsRGWgABYIo7AwTDqSX79-BxQKjDj0wiRGoRPFnw",
-      "skynet-file-metadata": {
       filename: "The Uncensored Library V2.zip",
       subfiles: {
         "The Uncensored Library V2.zip": {
@@ -896,6 +895,8 @@ function uncensoredLibraryV2Check(done) {
         },
       },
     },
+    headers: {
+      "skynet-skylink": "AAAs-JOsRGWgABYIo7AwTDqSX79-BxQKjDj0wiRGoRPFnw",
       "content-disposition": 'inline; filename="The Uncensored Library V2.zip"',
       "content-type": "application/zip",
     },
@@ -1020,9 +1021,9 @@ function fileEndpointCheck(done) {
     name: "File endpoint check",
     skylink: "file/XABvi7JtJbQSMAcDwnUnmp2FKDPjg8_tTTFP4BwMSxVdEg",
     bodyHash: "7e079f7afc9e5bc0c1be04543e22ac552a14a8da",
+    // metadata: { filename: "sia2.pdf" },
     headers: {
       "skynet-skylink": "XABvi7JtJbQSMAcDwnUnmp2FKDPjg8_tTTFP4BwMSxVdEg",
-      "skynet-file-metadata": { filename: "sia.pdf" },
       "content-disposition": 'attachment; filename="sia.pdf"',
       "content-type": "application/pdf",
     },
@@ -1093,6 +1094,27 @@ async function skylinkVerification(done, expected, { followRedirect = true, meth
       });
     }
 
+    if (expected.metadata && expected.skylink) {
+      const skylink = parseSkylink(expected.skylink);
+      const url = `${process.env.SKYNET_PORTAL_API}/skynet/metadata/${skylink}`;
+      try {
+        const metadata = await got(url).json();
+        if (!isEqual(expected.metadata, metadata)) {
+          entry.up = false;
+          info.metadata = { url, diff: ensureValidJSON(detailedDiff(expected.metadata, metadata)) };
+        }
+      } catch (error) {
+        entry.up = false;
+        info.metadata = {
+          url,
+          ip: error?.response?.ip ?? null,
+          statusCode: error?.response?.statusCode || error.statusCode || error.status,
+          errorMessage: error.message,
+          errorResponseContent: getResponseContent(error.response),
+        };
+      }
+    }
+
     if (Object.keys(info).length) entry.info = info; // add info only if it exists
 
     done(entry); // Return the entry information
@@ -1100,6 +1122,7 @@ async function skylinkVerification(done, expected, { followRedirect = true, meth
     done({
       ...details,
       up: false,
+      ip: error?.response?.ip ?? null,
       statusCode: error?.response?.statusCode || error.statusCode || error.status,
       errorMessage: error.message,
       errorResponseContent: getResponseContent(error.response),

yarn.lock

@@ -5124,7 +5124,7 @@ cypress-file-upload@5.0.7, cypress-file-upload@^5.0.7:
   resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.7.tgz#acf24fe08a92b2d0c892a58b56811fb933d34ea9"
   integrity sha512-cgWsWx7igxjyyVm9/VJ9ukdy69jL00I7z0lrwUWtXXLPvX4neO+8JAZ054Ax8Xf+mdV9OerenXzb9nqRoafjHA==
 
-cypress@^7.1.0, cypress@^7.2.0:
+cypress@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/cypress/-/cypress-7.2.0.tgz#6a3364e18972f898fff1fb12c1ff747939e45ddc"
   integrity sha512-lHHGay+YsffDn4M0bkkwezylBVHUpwwhtqte4LNPrFRCHy77X38+1PUe3neFb3glVTM+rbILtTN6FhO2djcOuQ==
@@ -5169,6 +5169,51 @@ cypress@^7.1.0, cypress@^7.2.0:
     url "^0.11.0"
     yauzl "^2.10.0"
 
+cypress@^7.3.0:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-7.3.0.tgz#17345b8d18681c120f033e7d8fd0f0271e9d0d51"
+  integrity sha512-aseRCH1tRVCrM6oEfja6fR/bo5l6e4SkHRRSATh27UeN4f/ANC8U7tGIulmrISJVy9xuOkOdbYKbUb2MNM+nrw==
+  dependencies:
+    "@cypress/listr-verbose-renderer" "^0.4.1"
+    "@cypress/request" "^2.88.5"
+    "@cypress/xvfb" "^1.2.4"
+    "@types/node" "^14.14.31"
+    "@types/sinonjs__fake-timers" "^6.0.2"
+    "@types/sizzle" "^2.3.2"
+    arch "^2.2.0"
+    blob-util "^2.0.2"
+    bluebird "^3.7.2"
+    cachedir "^2.3.0"
+    chalk "^4.1.0"
+    check-more-types "^2.24.0"
+    cli-table3 "~0.6.0"
+    commander "^5.1.0"
+    common-tags "^1.8.0"
+    dayjs "^1.10.4"
+    debug "4.3.2"
+    eventemitter2 "^6.4.3"
+    execa "4.1.0"
+    executable "^4.1.1"
+    extract-zip "^1.7.0"
+    fs-extra "^9.1.0"
+    getos "^3.2.1"
+    is-ci "^3.0.0"
+    is-installed-globally "~0.4.0"
+    lazy-ass "^1.6.0"
+    listr "^0.14.3"
+    lodash "^4.17.21"
+    log-symbols "^4.0.0"
+    minimist "^1.2.5"
+    ospath "^1.2.2"
+    pretty-bytes "^5.6.0"
+    ramda "~0.27.1"
+    request-progress "^3.0.0"
+    supports-color "^8.1.1"
+    tmp "~0.2.1"
+    untildify "^4.0.0"
+    url "^0.11.0"
+    yauzl "^2.10.0"
+
 d@1, d@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
@@ -7129,14 +7174,14 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-framer-motion@^4.1.13:
+framer-motion@^4.1.15:
-  version "4.1.13"
+  version "4.1.15"
-  resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-4.1.13.tgz#0a7f096113a0f80f11116c1a73da9b81523324cd"
+  resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-4.1.15.tgz#719fff59982c4f376a581ed9cd42cae9afa84a6d"
-  integrity sha512-E72PyzHXsie1IGcEFMGM3OJsVbtmpS8vcnDjh6tdeCaP7stoioZpmKZcx7c87giymAyuSSWvsGGdVnDGRzRX6g==
+  integrity sha512-47LdubDKZch0xo2COmBIf02UqsRz07H4lQ3zu28H8gK8/2OgAybNNJBGgtthN+Co9HXRfuH2pSR1/UIRlASZ7w==
   dependencies:
     framesync "5.3.0"
     hey-listen "^1.0.8"
-    popmotion "9.3.5"
+    popmotion "9.3.6"
     style-value-types "4.1.4"
     tslib "^2.1.0"
   optionalDependencies:
@@ -11957,6 +12002,11 @@ nanoid@^3.1.20, nanoid@^3.1.22:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844"
   integrity sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==
 
+nanoid@^3.1.23:
+  version "3.1.23"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
+  integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -13237,7 +13287,17 @@ polished@^4.1.2:
   dependencies:
     "@babel/runtime" "^7.13.17"
 
-popmotion@9.3.5, popmotion@^9.3.4:
+popmotion@9.3.6:
+  version "9.3.6"
+  resolved "https://registry.yarnpkg.com/popmotion/-/popmotion-9.3.6.tgz#b5236fa28f242aff3871b9e23721f093133248d1"
+  integrity sha512-ZTbXiu6zIggXzIliMi8LGxXBF5ST+wkpXGEjeTUDUOCdSQ356hij/xjeUdv0F8zCQNeqB1+PR5/BB+gC+QLAPw==
+  dependencies:
+    framesync "5.3.0"
+    hey-listen "^1.0.8"
+    style-value-types "4.1.4"
+    tslib "^2.1.0"
+
+popmotion@^9.3.4:
   version "9.3.5"
   resolved "https://registry.yarnpkg.com/popmotion/-/popmotion-9.3.5.tgz#e821aff3424a021b0f2c93922db31c55cfe64149"
   integrity sha512-Lr2rq8OP0j8D7CO2/6eO17ALeFCxjx1hfTGbMg+TLqFj+KZSGOoj6gRBVTzDINGqo6LQrORQSSSDaCL5OrB3bw==
@@ -13630,7 +13690,7 @@ postcss@8.2.13, postcss@^8.1.6, postcss@^8.2.1, postcss@^8.2.10, postcss@^8.2.6:
     nanoid "^3.1.22"
     source-map "^0.6.1"
 
-postcss@8.2.14, postcss@^8.2.14:
+postcss@8.2.14:
   version "8.2.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.14.tgz#dcf313eb8247b3ce8078d048c0e8262ca565ad2b"
   integrity sha512-+jD0ZijcvyCqPQo/m/CW0UcARpdFylq04of+Q7RKX6f/Tu+dvpUI/9Sp81+i6/vJThnOBX09Quw0ZLOVwpzX3w==
@@ -13666,6 +13726,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+postcss@^8.2.15:
+  version "8.2.15"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65"
+  integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==
+  dependencies:
+    colorette "^1.2.2"
+    nanoid "^3.1.23"
+    source-map "^0.6.1"
+
 potrace@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/potrace/-/potrace-2.1.8.tgz#50f6fba92e1e39ddef6f979b0a0f841809e0acf2"