From 1879066fdb2b6d116cb9e9068cdcfbae4580dc8e Mon Sep 17 00:00:00 2001
From: elevatebart <ledouxb@gmail.com>
Date: Wed, 18 May 2022 14:32:43 -0500
Subject: [PATCH 01/13] refactor: try removing the safelist

---
 .../frontend-shared/.windicss/safelist.ts     | 27 -------------------
 packages/frontend-shared/windi.config.ts      |  2 --
 2 files changed, 29 deletions(-)
 delete mode 100644 packages/frontend-shared/.windicss/safelist.ts

diff --git a/packages/frontend-shared/.windicss/safelist.ts b/packages/frontend-shared/.windicss/safelist.ts
deleted file mode 100644
index eb8fedc5cb26..000000000000
--- a/packages/frontend-shared/.windicss/safelist.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * WindiCSS will strip out any styles that aren't used.
- * We do a lot of dynamic stuff, and we're not too concerned
- * ith bundle size, so this is a pretty greedy list
- */
-import { colors } from './colors'
-import { map, reduce, kebabCase } from 'lodash'
-
-const textSafelist = ['xs', 'sm', 'lg', 'xl', '2xl', '3xl', '4xl', '5xl', '6xl'].map((v) => `text-${v}`).join(' ')
-const colorSafelist = reduce(colors, (acc, variants, colorName) => {
-  const name = kebabCase(colorName)
-
-  return `${acc}
-    ${map(variants, (_: string, k: string) => {
-    if (k === 'DEFAULT') return ``
-
-    return `
-    icon-light-${name}-${k}
-    icon-dark-${name}-${k}
-    bg-${name}-${k}
-    text-${name}-${k}
-    before:bg-${name}-${k}
-    before:text-${name}-${k}`
-  }).join(' ')}`
-}, '')
-
-export const safelist = `${textSafelist} ${colorSafelist}`
diff --git a/packages/frontend-shared/windi.config.ts b/packages/frontend-shared/windi.config.ts
index 629004480957..385d98ab2c54 100644
--- a/packages/frontend-shared/windi.config.ts
+++ b/packages/frontend-shared/windi.config.ts
@@ -1,7 +1,6 @@
 import { defineConfig } from 'windicss/helpers'
 import InteractionVariants from '@windicss/plugin-interaction-variants'
 import { IconDuotoneColorsPlugin } from './.windicss/icon-color-plugins'
-import { safelist } from './.windicss/safelist'
 import { colors } from './.windicss/colors'
 import { shortcuts } from './.windicss/shortcuts'
 import path from 'path'
@@ -28,7 +27,6 @@ export const defaultConfig: FullConfig = {
       },
     },
   },
-  safelist,
   variants: {
     // What's hocus?
     // Hocus is a portmanteau of hover + focus. This is useful because

From 74ee30ddeb98596ab088e77b848cbd2f68f78faa Mon Sep 17 00:00:00 2001
From: elevatebart <ledouxb@gmail.com>
Date: Wed, 18 May 2022 16:03:04 -0500
Subject: [PATCH 02/13] fix open browser bugs

---
 packages/launchpad/src/setup/OpenBrowserList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/launchpad/src/setup/OpenBrowserList.vue b/packages/launchpad/src/setup/OpenBrowserList.vue
index c148501549e1..420c854abcc7 100644
--- a/packages/launchpad/src/setup/OpenBrowserList.vue
+++ b/packages/launchpad/src/setup/OpenBrowserList.vue
@@ -53,8 +53,8 @@
             >
           </div>
           <div
-            class="font-medium pt-2 text-indigo-600 text-18px leading-28px"
-            :class="{ 'text-jade-600': checked, 'text-gray-500': browser.disabled || !browser.isVersionSupported }"
+            class="font-medium pt-2 text-18px leading-28px"
+            :class="checked ? 'text-jade-600' : ( browser.disabled || !browser.isVersionSupported ) ? 'text-gray-500' : 'text-indigo-600'"
           >
             {{ browser.displayName }}
           </div>

From c23cf6fdccbe205ccf15b436ad4f6b4c151b67ab Mon Sep 17 00:00:00 2001
From: elevatebart <ledouxb@gmail.com>
Date: Thu, 19 May 2022 09:30:18 -0500
Subject: [PATCH 03/13] add ts in windi observed files

---
 packages/frontend-shared/windi.config.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/frontend-shared/windi.config.ts b/packages/frontend-shared/windi.config.ts
index 385d98ab2c54..2b40b16436a8 100644
--- a/packages/frontend-shared/windi.config.ts
+++ b/packages/frontend-shared/windi.config.ts
@@ -44,9 +44,9 @@ export const defaultConfig: FullConfig = {
     include: [
       'index.html',
       '**/*.{vue,html,tsx}',
-      path.resolve(__dirname, '../frontend-shared/**/*.{vue,html,tsx,svg}'),
-      path.resolve(__dirname, '../app/**/*.{vue,html,tsx,svg}'),
-      path.resolve(__dirname, '../launchpad/**/*.{vue,html,tsx,svg}'),
+      path.resolve(__dirname, '../frontend-shared/**/*.{vue,html,tsx,ts,svg}'),
+      path.resolve(__dirname, '../app/**/*.{vue,html,tsx,ts,svg}'),
+      path.resolve(__dirname, '../launchpad/**/*.{vue,html,tsx,ts,svg}'),
     ],
     exclude: ['node_modules/**/*', '.git/**/*'],
   },

From 7f7b337763179c7622fa6d7ab04fb1652d4b948b Mon Sep 17 00:00:00 2001
From: elevatebart <ledouxb@gmail.com>
Date: Thu, 19 May 2022 09:41:18 -0500
Subject: [PATCH 04/13] resolve typescript issue

---
 packages/frontend-shared/src/gql-components/topnav/TopNav.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/frontend-shared/src/gql-components/topnav/TopNav.vue b/packages/frontend-shared/src/gql-components/topnav/TopNav.vue
index 50f2483519f7..fcd4eb48bef5 100644
--- a/packages/frontend-shared/src/gql-components/topnav/TopNav.vue
+++ b/packages/frontend-shared/src/gql-components/topnav/TopNav.vue
@@ -106,11 +106,12 @@
   >
     <template #heading="{ open }">
       <img
+        v-if="props.gql?.currentProject?.activeBrowser?.displayName"
         class="w-16px filter group-hocus:grayscale-0"
         data-cy="top-nav-active-browser-icon"
         :alt="props.gql?.currentProject?.activeBrowser?.displayName"
         :class="open ? 'grayscale-0' : 'grayscale'"
-        :src="allBrowsersIcons[props.gql?.currentProject?.activeBrowser?.displayName] || allBrowsersIcons.generic"
+        :src="allBrowsersIcons[props.gql.currentProject.activeBrowser.displayName] || allBrowsersIcons.generic"
       >
       <span
         data-cy="top-nav-active-browser"

From c593ac36972d567c3074c9242ae26e78e6127000 Mon Sep 17 00:00:00 2001
From: elevatebart <ledouxb@gmail.com>
Date: Thu, 19 May 2022 09:41:41 -0500
Subject: [PATCH 05/13] remove markdown code class

---
 packages/frontend-shared/src/composables/useMarkdown.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend-shared/src/composables/useMarkdown.ts b/packages/frontend-shared/src/composables/useMarkdown.ts
index 5c7ea7eec26c..23f6776f53c7 100644
--- a/packages/frontend-shared/src/composables/useMarkdown.ts
+++ b/packages/frontend-shared/src/composables/useMarkdown.ts
@@ -41,7 +41,7 @@ const defaultClasses = {
   h6: ['font-medium', 'text-xs', 'mb-3'],
   p: ['my-3 first:mt-0 text-sm mb-4'],
   pre: ['rounded p-3 bg-white mb-2'],
-  code: [`font-medium rounded text-sm px-4px py-2px bg-red-100`],
+  code: ['font-medium rounded text-sm px-4px py-2px'],
   a: ['text-blue-500', 'hover:underline text-sm'],
   ul: ['list-disc pl-6 my-3 text-sm'],
   ol: ['list-decimal pl-6 my-3 text-sm'],

From afa1dfdc1ea1f2fd1abcac332798d54c7c0af546 Mon Sep 17 00:00:00 2001
From: elevatebart <ledouxb@gmail.com>
Date: Thu, 19 May 2022 09:44:53 -0500
Subject: [PATCH 06/13] fix automation disconnected button color

---
 packages/app/src/runner/automation/AutomationDisconnected.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/app/src/runner/automation/AutomationDisconnected.vue b/packages/app/src/runner/automation/AutomationDisconnected.vue
index 3c3bc2ec1e0f..681161b9a374 100644
--- a/packages/app/src/runner/automation/AutomationDisconnected.vue
+++ b/packages/app/src/runner/automation/AutomationDisconnected.vue
@@ -12,9 +12,7 @@
           {{ t('runner.automation.disconnected.description') }}
         </p>
         <Button
-          class="bg-indigo-500 text-white"
           size="md"
-          variant="outline"
           :prefix-icon="RefreshIcon"
           prefix-icon-class="icon-dark-white"
           @click="relaunch"

From 14ec1890e29f70665e409ce308ffe9bd9bed8418 Mon Sep 17 00:00:00 2001
From: elevatebart <ledouxb@gmail.com>
Date: Thu, 19 May 2022 09:48:50 -0500
Subject: [PATCH 07/13] fix disabled card

---
 packages/frontend-shared/src/components/Card.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/frontend-shared/src/components/Card.vue b/packages/frontend-shared/src/components/Card.vue
index 44ef2c53742d..2624f30fcc1b 100644
--- a/packages/frontend-shared/src/components/Card.vue
+++ b/packages/frontend-shared/src/components/Card.vue
@@ -1,7 +1,7 @@
 <template>
   <div
-    class="relative rounded cursor-pointer h-auto outline-none border-1
-      text-center block group focus-within-default hocus-default
+    class="rounded cursor-pointer h-auto outline-none border-1 text-center
+      relative block group focus-within-default hocus-default
       children:hyphens-manual"
     :class="{
       'bg-gray-50 border-gray-100 pointer-events-none': disabled
@@ -11,7 +11,7 @@
   >
     <div
       v-if="title === t('testingType.component.name')"
-      class="ribbon absolute top-0 right-0 text-teal-600"
+      class="top-0 right-0 text-teal-600 ribbon absolute"
       aria-hidden="true"
     >
       {{ t('versions.beta') }}
@@ -23,7 +23,7 @@
       <component
         :is="hoverIcon"
         v-if="hoverIcon"
-        class="opacity-0 absolute group-focus:opacity-100 group-hover:opacity-100"
+        class="opacity-0 absolute group-hover:opacity-100 group-focus:opacity-100"
         :class="iconClass"
         data-cy="card-icon"
       />
@@ -39,9 +39,10 @@
     <!-- this button can be focused via tab key and allows card hocus styles to appear
     as well as allows a keyboard user to "activate" the card with spacebar or enter keys -->
     <button
-      class="font-medium mx-8px mb-8px text-indigo-500 text-18px leading-24px focus:outline-transparent"
+      class="font-medium mx-8px mb-8px text-18px leading-24px focus:outline-transparent"
       :class="{
-        'text-gray-700': disabled
+        'text-gray-700': disabled,
+        'text-indigo-500': !disabled
       }"
       :disabled="disabled"
     >

From e79c226060b12c96f2d9976cd27c83d1d1eb95d8 Mon Sep 17 00:00:00 2001
From: elevatebart <ledouxb@gmail.com>
Date: Thu, 19 May 2022 13:57:32 -0500
Subject: [PATCH 08/13] fix retry button

---
 packages/frontend-shared/src/warning/Warning.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/frontend-shared/src/warning/Warning.vue b/packages/frontend-shared/src/warning/Warning.vue
index 9523e1cccef0..40b828e41fc6 100644
--- a/packages/frontend-shared/src/warning/Warning.vue
+++ b/packages/frontend-shared/src/warning/Warning.vue
@@ -14,14 +14,12 @@
     />
     <Button
       v-if="retryable"
-      class="bg-indigo-500 text-white"
       size="md"
-      variant="outline"
       :prefix-icon="RefreshIcon"
       prefix-icon-class="icon-dark-white"
       @click="emits('retry')"
     >
-      Retry
+      {{ t('warnings.retry') }}
     </Button>
   </Alert>
 </template>
@@ -34,6 +32,9 @@ import Button from '@cy/components/Button.vue'
 import RefreshIcon from '~icons/cy/refresh_x16'
 import { computed, ref } from 'vue'
 import { useVModels } from '@vueuse/core'
+import { useI18n } from '@cy/i18n'
+
+const { t } = useI18n()
 
 const emits = defineEmits<{
   (eventName: 'update:modelValue', value: boolean): void

From e5f3435974c73df19376584b7a4aab765af745f6 Mon Sep 17 00:00:00 2001
From: elevatebart <ledouxb@gmail.com>
Date: Fri, 20 May 2022 15:31:41 -0500
Subject: [PATCH 09/13] fix config warning test

---
 packages/launchpad/cypress/e2e/config-warning.cy.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/launchpad/cypress/e2e/config-warning.cy.ts b/packages/launchpad/cypress/e2e/config-warning.cy.ts
index 90ef3c294884..1c2bbde81dd4 100644
--- a/packages/launchpad/cypress/e2e/config-warning.cy.ts
+++ b/packages/launchpad/cypress/e2e/config-warning.cy.ts
@@ -11,7 +11,7 @@ describe('baseUrl', () => {
       ctx._apis.projectApi.isListening = sinon.stub().resolves(null)
     })
 
-    cy.contains('button', 'Retry').click()
+    cy.contains('button', 'Try again').click()
     cy.get('[data-cy="alert"]').should('not.exist')
   })
 })

From 82a88f9fbdba7815c91e4049744e30f268c802e7 Mon Sep 17 00:00:00 2001
From: elevatebart <ledouxb@gmail.com>
Date: Tue, 24 May 2022 11:52:45 -0500
Subject: [PATCH 10/13] fix color of topnav

---
 .../frontend-shared/src/gql-components/topnav/TopNavList.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontend-shared/src/gql-components/topnav/TopNavList.vue b/packages/frontend-shared/src/gql-components/topnav/TopNavList.vue
index 47da542e7bce..a166aef50916 100644
--- a/packages/frontend-shared/src/gql-components/topnav/TopNavList.vue
+++ b/packages/frontend-shared/src/gql-components/topnav/TopNavList.vue
@@ -8,8 +8,8 @@
       @click="emit('clearForceOpen')"
     >
       <div
-        class="flex text-gray-600 gap-8px items-center group-hocus:text-indigo-600"
-        :class="(open || props.forceOpenState) ? 'text-indigo-600' : ''"
+        class="flex gap-8px items-center group-hocus:text-indigo-600"
+        :class="(open || props.forceOpenState) ? 'text-indigo-600' : 'text-gray-600'"
       >
         <slot
           name="heading"

From 3365a01983d202585dce230670e27a8c94584083 Mon Sep 17 00:00:00 2001
From: elevatebart <ledouxb@gmail.com>
Date: Tue, 24 May 2022 12:07:31 -0500
Subject: [PATCH 11/13] fix browser dropdown header text

---
 packages/app/src/runner/SpecRunnerDropdown.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/app/src/runner/SpecRunnerDropdown.vue b/packages/app/src/runner/SpecRunnerDropdown.vue
index 053345e5a2b1..b9da2b931e7a 100644
--- a/packages/app/src/runner/SpecRunnerDropdown.vue
+++ b/packages/app/src/runner/SpecRunnerDropdown.vue
@@ -13,10 +13,11 @@
       :disabled="props.disabled"
     >
       <div
-        class="flex text-gray-600 gap-8px items-center"
+        class="flex gap-8px items-center"
         :class="{
           'group-hocus:text-indigo-600': !props.disabled,
           'text-indigo-600': open,
+          'text-gray-600': !open,
         }"
       >
         <slot

From 82e54e07a6a99d9dba7c89c4869458bcc2206281 Mon Sep 17 00:00:00 2001
From: elevatebart <ledouxb@gmail.com>
Date: Tue, 24 May 2022 12:09:14 -0500
Subject: [PATCH 12/13] remove the removing

---
 .../frontend-shared/.windicss/safelist.ts     | 27 +++++++++++++++++++
 packages/frontend-shared/windi.config.ts      |  8 +++---
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 packages/frontend-shared/.windicss/safelist.ts

diff --git a/packages/frontend-shared/.windicss/safelist.ts b/packages/frontend-shared/.windicss/safelist.ts
new file mode 100644
index 000000000000..eb8fedc5cb26
--- /dev/null
+++ b/packages/frontend-shared/.windicss/safelist.ts
@@ -0,0 +1,27 @@
+/**
+ * WindiCSS will strip out any styles that aren't used.
+ * We do a lot of dynamic stuff, and we're not too concerned
+ * ith bundle size, so this is a pretty greedy list
+ */
+import { colors } from './colors'
+import { map, reduce, kebabCase } from 'lodash'
+
+const textSafelist = ['xs', 'sm', 'lg', 'xl', '2xl', '3xl', '4xl', '5xl', '6xl'].map((v) => `text-${v}`).join(' ')
+const colorSafelist = reduce(colors, (acc, variants, colorName) => {
+  const name = kebabCase(colorName)
+
+  return `${acc}
+    ${map(variants, (_: string, k: string) => {
+    if (k === 'DEFAULT') return ``
+
+    return `
+    icon-light-${name}-${k}
+    icon-dark-${name}-${k}
+    bg-${name}-${k}
+    text-${name}-${k}
+    before:bg-${name}-${k}
+    before:text-${name}-${k}`
+  }).join(' ')}`
+}, '')
+
+export const safelist = `${textSafelist} ${colorSafelist}`
diff --git a/packages/frontend-shared/windi.config.ts b/packages/frontend-shared/windi.config.ts
index 2b40b16436a8..629004480957 100644
--- a/packages/frontend-shared/windi.config.ts
+++ b/packages/frontend-shared/windi.config.ts
@@ -1,6 +1,7 @@
 import { defineConfig } from 'windicss/helpers'
 import InteractionVariants from '@windicss/plugin-interaction-variants'
 import { IconDuotoneColorsPlugin } from './.windicss/icon-color-plugins'
+import { safelist } from './.windicss/safelist'
 import { colors } from './.windicss/colors'
 import { shortcuts } from './.windicss/shortcuts'
 import path from 'path'
@@ -27,6 +28,7 @@ export const defaultConfig: FullConfig = {
       },
     },
   },
+  safelist,
   variants: {
     // What's hocus?
     // Hocus is a portmanteau of hover + focus. This is useful because
@@ -44,9 +46,9 @@ export const defaultConfig: FullConfig = {
     include: [
       'index.html',
       '**/*.{vue,html,tsx}',
-      path.resolve(__dirname, '../frontend-shared/**/*.{vue,html,tsx,ts,svg}'),
-      path.resolve(__dirname, '../app/**/*.{vue,html,tsx,ts,svg}'),
-      path.resolve(__dirname, '../launchpad/**/*.{vue,html,tsx,ts,svg}'),
+      path.resolve(__dirname, '../frontend-shared/**/*.{vue,html,tsx,svg}'),
+      path.resolve(__dirname, '../app/**/*.{vue,html,tsx,svg}'),
+      path.resolve(__dirname, '../launchpad/**/*.{vue,html,tsx,svg}'),
     ],
     exclude: ['node_modules/**/*', '.git/**/*'],
   },

From 6d52e7b1ab4acefa45f486d1c341a4e1adef0139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barth=C3=A9l=C3=A9my=20Ledoux?= <bart@cypress.io>
Date: Wed, 25 May 2022 10:27:00 -0500
Subject: [PATCH 13/13] revert unwanted change to card

---
 packages/frontend-shared/src/components/Card.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend-shared/src/components/Card.vue b/packages/frontend-shared/src/components/Card.vue
index 142a122d3e14..f9f8c504a5a9 100644
--- a/packages/frontend-shared/src/components/Card.vue
+++ b/packages/frontend-shared/src/components/Card.vue
@@ -42,7 +42,7 @@
     <button
       class="font-medium mx-8px mb-8px text-18px leading-24px focus:outline-transparent"
       :class="{
-        'text-gray-700': disabled,
+        'text-gray-700 cursor-default': disabled,
         'text-indigo-500': !disabled
       }"
       :disabled="disabled"