bump cypress to 6.3.0 (#30644)

* bump cypress to 6.3.0 * fix inspect-drawer spec * fix panelEdit_base spec * fix select-focus spec * Apply suggestions from code review Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> * add be.visible assertion to new-query-variable spec to avoid flakiness * increase waits in new-query-variable spec to avoid flakiness * increase waits in new-query-variable spec by another 500 * remove be.visible assertion added before * Chore: trying to fix flakiness * skip the new-variable-query e2e test * Chore: refactor so we might avoid flakiness * Revert "skip the new-variable-query e2e test" This reverts commit 203c1875c2. Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>
2025-02-25 18:55:37 -06:00 · 2021-01-29 15:01:50 +00:00 · 2021-01-29 15:01:50 +00:00 · b8dd50c297
commit b8dd50c297
parent f62eb28f3e
6 changed files with 135 additions and 85 deletions
--- a/e2e/suite1/specs/inspect-drawer.spec.ts
+++ b/e2e/suite1/specs/inspect-drawer.spec.ts
@ -75,36 +75,36 @@ const expectDrawerTabsAndContent = () => {
        expect(li.text()).equals('Data');
      });
      e2e.components.PanelInspector.Data.content().should('be.visible');
-      e2e.components.PanelInspector.Stats.content().should('not.be.visible');
-      e2e.components.PanelInspector.Json.content().should('not.be.visible');
-      e2e.components.PanelInspector.Query.content().should('not.be.visible');
+      e2e.components.PanelInspector.Stats.content().should('not.exist');
+      e2e.components.PanelInspector.Json.content().should('not.exist');
+      e2e.components.PanelInspector.Query.content().should('not.exist');

      // other tabs should also be visible, click on each to see if we get any console errors
      e2e.components.Tab.title('Stats').should('be.visible').click();
      e2e.components.PanelInspector.Stats.content().should('be.visible');
-      e2e.components.PanelInspector.Data.content().should('not.be.visible');
-      e2e.components.PanelInspector.Json.content().should('not.be.visible');
-      e2e.components.PanelInspector.Query.content().should('not.be.visible');
+      e2e.components.PanelInspector.Data.content().should('not.exist');
+      e2e.components.PanelInspector.Json.content().should('not.exist');
+      e2e.components.PanelInspector.Query.content().should('not.exist');

      e2e.components.Tab.title('JSON').should('be.visible').click();
      e2e.components.PanelInspector.Json.content().should('be.visible');
-      e2e.components.PanelInspector.Data.content().should('not.be.visible');
-      e2e.components.PanelInspector.Stats.content().should('not.be.visible');
-      e2e.components.PanelInspector.Query.content().should('not.be.visible');
+      e2e.components.PanelInspector.Data.content().should('not.exist');
+      e2e.components.PanelInspector.Stats.content().should('not.exist');
+      e2e.components.PanelInspector.Query.content().should('not.exist');

      e2e.components.Tab.title('Query').should('be.visible').click();

      e2e.components.PanelInspector.Query.content().should('be.visible');
-      e2e.components.PanelInspector.Data.content().should('not.be.visible');
-      e2e.components.PanelInspector.Stats.content().should('not.be.visible');
-      e2e.components.PanelInspector.Json.content().should('not.be.visible');
+      e2e.components.PanelInspector.Data.content().should('not.exist');
+      e2e.components.PanelInspector.Stats.content().should('not.exist');
+      e2e.components.PanelInspector.Json.content().should('not.exist');
    });
 };

 const expectDrawerClose = () => {
  // close using close button
  e2e.components.Drawer.General.close().click();
-  e2e.components.Drawer.General.title(`Inspect: ${PANEL_UNDER_TEST}`).should('not.be.visible');
+  e2e.components.Drawer.General.title(`Inspect: ${PANEL_UNDER_TEST}`).should('not.exist');
 };

 const expectDrawerExpandAndContract = (viewPortWidth: number) => {
--- a/e2e/suite1/specs/panelEdit_base.spec.ts
+++ b/e2e/suite1/specs/panelEdit_base.spec.ts
@ -27,7 +27,7 @@ e2e.scenario({
        });
        e2e.components.QueryTab.content().should('be.visible');
        e2e.components.TransformTab.content().should('not.exist');
-        e2e.components.AlertTab.content().should('not.be.visible');
+        e2e.components.AlertTab.content().should('not.exist');

        //  Bottom pane tabs
        //  Can change to Transform tab
@ -36,8 +36,8 @@ e2e.scenario({
          expect(li.text()).equals('Transform0'); // there's no transform so therefore Transform + 0
        });
        e2e.components.Transforms.card('Merge').scrollIntoView().should('be.visible');
-        e2e.components.QueryTab.content().should('not.be.visible');
-        e2e.components.AlertTab.content().should('not.be.visible');
+        e2e.components.QueryTab.content().should('not.exist');
+        e2e.components.AlertTab.content().should('not.exist');

        //  Can change to Alerts tab (graph panel is the default vis so the alerts tab should be rendered)
        e2e.components.Tab.title('Alert').should('be.visible').click();
@ -45,7 +45,7 @@ e2e.scenario({
          expect(li.text()).equals('Alert0'); // there's no alert so therefore Alert + 0
        });
        e2e.components.AlertTab.content().should('be.visible');
-        e2e.components.QueryTab.content().should('not.be.visible');
+        e2e.components.QueryTab.content().should('not.exist');
        e2e.components.TransformTab.content().should('not.exist');

        e2e.components.Tab.title('Query').should('be.visible').click();
@ -56,18 +56,18 @@ e2e.scenario({

    // Can toggle on/off sidebar
    e2e.components.PanelEditor.OptionsPane.close().should('be.visible');
-    e2e.components.PanelEditor.OptionsPane.open().should('not.be.visible');
+    e2e.components.PanelEditor.OptionsPane.open().should('not.exist');

    // close options pane
    e2e.components.PanelEditor.OptionsPane.close().click();
    e2e.components.PanelEditor.OptionsPane.open().should('be.visible');
-    e2e.components.PanelEditor.OptionsPane.close().should('not.be.visible');
-    e2e.components.PanelEditor.OptionsPane.content().should('not.be.visible');
+    e2e.components.PanelEditor.OptionsPane.close().should('not.exist');
+    e2e.components.PanelEditor.OptionsPane.content().should('not.exist');

    // open options pane
    e2e.components.PanelEditor.OptionsPane.open().click();
    e2e.components.PanelEditor.OptionsPane.close().should('be.visible');
-    e2e.components.PanelEditor.OptionsPane.open().should('not.be.visible');
+    e2e.components.PanelEditor.OptionsPane.open().should('not.exist');
    e2e.components.PanelEditor.OptionsPane.content().should('be.visible');

    // Can change visualisation type
@ -86,7 +86,7 @@ e2e.scenario({
    });

    // Data pane should not be rendered
-    e2e.components.PanelEditor.DataPane.content().should('not.be.visible');
+    e2e.components.PanelEditor.DataPane.content().should('not.exist');

    // Change to Table panel
    e2e.components.PluginVisualization.item('Table').scrollIntoView().should('be.visible').click();
@ -103,12 +103,12 @@ e2e.scenario({
    e2e.components.PanelEditor.OptionsPane.tab('Field').click();

    e2e.components.FieldConfigEditor.content().should('be.visible');
-    e2e.components.OverridesConfigEditor.content().should('not.be.visible');
+    e2e.components.OverridesConfigEditor.content().should('not.exist');

    e2e.components.PanelEditor.OptionsPane.tab('Field').should('be.visible');
    e2e.components.PanelEditor.OptionsPane.tab('Overrides').should('be.visible').click();

    e2e.components.OverridesConfigEditor.content().should('be.visible');
-    e2e.components.FieldConfigEditor.content().should('not.be.visible');
+    e2e.components.FieldConfigEditor.content().should('not.exist');
  },
 });
--- a/e2e/suite1/specs/select-focus.spec.ts
+++ b/e2e/suite1/specs/select-focus.spec.ts
@ -17,7 +17,7 @@ e2e.scenario({

        e2e.components.Select.option().should('be.visible').first().click();

-        e2e.components.Select.input().should('be.visible').should('have.focus');
+        e2e.components.Select.input().should('exist').should('have.focus');
      });

    e2e.pages.Dashboard.Settings.General.title().click();
@ -25,7 +25,7 @@ e2e.scenario({
    e2e.components.FolderPicker.container()
      .should('be.visible')
      .within(() => {
-        e2e.components.Select.input().should('be.visible').should('not.have.focus');
+        e2e.components.Select.input().should('exist').should('not.have.focus');
      });
  },
 });
--- a/e2e/suite1/specs/variables/new-query-variable.ts
+++ b/e2e/suite1/specs/variables/new-query-variable.ts
@ -95,27 +95,34 @@ describe('Variables - Add variable', () => {
      .type('*')
      .blur();

+    e2e.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRegExInput()
+      .should('be.visible')
+      .type('/.*C.*/')
+      .blur();
+
    e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption().should('exist');

    e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().should('be.visible').click();

-    e2e().wait(500);
+    e2e().wait(1500);

    e2e.components.BackButton.backArrow().should('be.visible').click({ force: true });

    e2e.pages.Dashboard.SubMenu.submenuItemLabels('a label').should('be.visible');
-
-    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('A').eq(1).should('be.visible').click();
-
-    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownDropDown()
-      .should('be.visible')
+    e2e.pages.Dashboard.SubMenu.submenuItem()
+      .should('have.length', 4)
+      .eq(3)
      .within(() => {
-        e2e().get('.variable-option').should('have.length', 3);
-      });
+        e2e().get('.variable-link-wrapper').should('be.visible').click();
+        e2e().wait(500);
+        e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownDropDown()
+          .should('be.visible')
+          .within(() => {
+            e2e().get('.variable-option').should('have.length', 1);
+          });

-    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('A').should('be.visible');
-    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('B').should('be.visible');
-    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('C').should('be.visible');
+        e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('C').should('be.visible');
+      });
  });

  it('adding a multi value query variable', () => {
@ -142,6 +149,11 @@ describe('Variables - Add variable', () => {
      .type('*')
      .blur();

+    e2e.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsRegExInput()
+      .should('be.visible')
+      .type('/.*C.*/')
+      .blur();
+
    e2e.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsMultiSwitch()
      .click({ force: true })
      .should('be.checked');
@ -163,21 +175,21 @@ describe('Variables - Add variable', () => {

    e2e.components.BackButton.backArrow().should('be.visible').click({ force: true });

-    e2e().wait(500);
-
    e2e.pages.Dashboard.SubMenu.submenuItemLabels('a label').should('be.visible');
-
-    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('A').eq(1).should('be.visible').click();
-
-    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownDropDown()
-      .should('be.visible')
+    e2e.pages.Dashboard.SubMenu.submenuItem()
+      .should('have.length', 4)
+      .eq(3)
      .within(() => {
-        e2e().get('.variable-option').should('have.length', 4);
-      });
+        e2e().get('.variable-link-wrapper').should('be.visible').click();
+        e2e().wait(500);
+        e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownDropDown()
+          .should('be.visible')
+          .within(() => {
+            e2e().get('.variable-option').should('have.length', 2);
+          });

-    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('All').should('be.visible');
-    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('A').should('be.visible');
-    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('B').should('be.visible');
-    e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('C').should('be.visible');
+        e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('All').should('be.visible');
+        e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('C').should('be.visible');
+      });
  });
 });
--- a/packages/grafana-e2e/package.json
+++ b/packages/grafana-e2e/package.json
@ -49,7 +49,7 @@
    "@mochajs/json-file-reporter": "^1.2.0",
    "blink-diff": "1.0.13",
    "commander": "5.0.0",
-    "cypress": "^4.12.1",
+    "cypress": "^6.3.0",
    "cypress-file-upload": "^4.0.7",
    "execa": "4.0.0",
    "resolve-as-bin": "2.1.0",
--- a/yarn.lock
+++ b/yarn.lock
@ -9062,6 +9062,11 @@ blink-diff@1.0.13:
    preceptor-core "~0.10.0"
    promise "6.0.0"

+blob-util@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"
+  integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==
+
 bluebird@3.7.1, bluebird@^3.5.5:
  version "3.7.1"
  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz#df70e302b471d7473489acf26a93d63b53f874de"
@ -9996,7 +10001,7 @@ cli-spinners@^2.2.0:
  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.2.0.tgz#e8b988d9206c692302d8ee834e7a85c0144d8f77"
  integrity sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==

-cli-table3@0.6.0:
+cli-table3@0.6.0, cli-table3@~0.6.0:
  version "0.6.0"
  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.0.tgz#b7b1bc65ca8e7b5cef9124e13dc2b21e2ce4faee"
  integrity sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ==
@ -10006,16 +10011,6 @@ cli-table3@0.6.0:
  optionalDependencies:
    colors "^1.1.2"

-cli-table3@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
-  integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==
-  dependencies:
-    object-assign "^4.1.0"
-    string-width "^2.1.1"
-  optionalDependencies:
-    colors "^1.1.2"
-
 cli-truncate@^0.2.1:
  version "0.2.1"
  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
@ -10280,6 +10275,11 @@ commander@^4.1.1:
  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==

+commander@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
+  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
+
 commander@~2.19.0:
  version "2.19.0"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@ -11151,10 +11151,10 @@ cypress-file-upload@^4.0.7:
  dependencies:
    mime "^2.4.4"

-cypress@^4.12.1:
-  version "4.12.1"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-4.12.1.tgz#0ead1b9f4c0917d69d8b57f996b6e01fe693b6ec"
-  integrity sha512-9SGIPEmqU8vuRA6xst2CMTYd9sCFCxKSzrHt0wr+w2iAQMCIIsXsQ5Gplns1sT6LDbZcmLv6uehabAOl3fhc9Q==
+cypress@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-6.3.0.tgz#e27bba01d7e493265700e1e85333dca0b0127ede"
+  integrity sha512-Ec6TAFOxdSB2HPINNJ1f7z75pENXcfCaQkz+A9j0eGSvusFJ2NNErq650DexCbNJAnCQkPqXB4XPH9kXnSQnUA==
  dependencies:
    "@cypress/listr-verbose-renderer" "^0.4.1"
    "@cypress/request" "^2.88.5"
@ -11162,34 +11162,35 @@ cypress@^4.12.1:
    "@types/sinonjs__fake-timers" "^6.0.1"
    "@types/sizzle" "^2.3.2"
    arch "^2.1.2"
+    blob-util "2.0.2"
    bluebird "^3.7.2"
    cachedir "^2.3.0"
-    chalk "^2.4.2"
+    chalk "^4.1.0"
    check-more-types "^2.24.0"
-    cli-table3 "~0.5.1"
-    commander "^4.1.1"
+    cli-table3 "~0.6.0"
+    commander "^5.1.0"
    common-tags "^1.8.0"
    debug "^4.1.1"
    eventemitter2 "^6.4.2"
-    execa "^1.0.0"
+    execa "^4.0.2"
    executable "^4.1.1"
    extract-zip "^1.7.0"
-    fs-extra "^8.1.0"
+    fs-extra "^9.0.1"
    getos "^3.2.1"
    is-ci "^2.0.0"
    is-installed-globally "^0.3.2"
    lazy-ass "^1.6.0"
    listr "^0.14.3"
    lodash "^4.17.19"
-    log-symbols "^3.0.0"
+    log-symbols "^4.0.0"
    minimist "^1.2.5"
    moment "^2.27.0"
    ospath "^1.2.2"
-    pretty-bytes "^5.3.0"
+    pretty-bytes "^5.4.1"
    ramda "~0.26.1"
    request-progress "^3.0.0"
-    supports-color "^7.1.0"
-    tmp "~0.1.0"
+    supports-color "^7.2.0"
+    tmp "~0.2.1"
    untildify "^4.0.0"
    url "^0.11.0"
    yauzl "^2.10.0"
@ -13257,6 +13258,21 @@ execa@^4.0.0:
    signal-exit "^3.0.2"
    strip-final-newline "^2.0.0"

+execa@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 executable@^4.1.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
@ -14014,6 +14030,16 @@ fs-extra@^9.0.0:
    jsonfile "^6.0.1"
    universalify "^1.0.0"

+fs-extra@^9.0.1:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
+  dependencies:
+    at-least-node "^1.0.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-extra@~7.0.1:
  version "7.0.1"
  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
@ -17765,6 +17791,13 @@ log-symbols@^3.0.0:
  dependencies:
    chalk "^2.4.2"

+log-symbols@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
+  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
+  dependencies:
+    chalk "^4.0.0"
+
 log-update@^2.3.0:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
@ -21010,10 +21043,10 @@ prettier@~2.0.5:
  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
  integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==

-pretty-bytes@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2"
-  integrity sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==
+pretty-bytes@^5.4.1:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.5.0.tgz#0cecda50a74a941589498011cf23275aa82b339e"
+  integrity sha512-p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA==

 pretty-error@^2.0.2:
  version "2.1.1"
@ -24862,7 +24895,7 @@ supports-color@^7.0.0:
  dependencies:
    has-flag "^4.0.0"

-supports-color@^7.1.0:
+supports-color@^7.1.0, supports-color@^7.2.0:
  version "7.2.0"
  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
@ -25297,12 +25330,12 @@ tmp@^0.0.33:
  dependencies:
    os-tmpdir "~1.0.2"

-tmp@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
-  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
+tmp@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
  dependencies:
-    rimraf "^2.6.3"
+    rimraf "^3.0.0"

 tmpl@1.0.x:
  version "1.0.4"
@ -25954,6 +25987,11 @@ universalify@^1.0.0:
  resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
  integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==

+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
 unpipe@1.0.0, unpipe@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"