diff --git a/packages/app/package.json b/packages/app/package.json index caf28bb0cc2c..bc84d3851d03 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -21,10 +21,10 @@ }, "dependencies": {}, "devDependencies": { - "@cypress-design/vue-button": "^0.11.6", - "@cypress-design/vue-icon": "^0.26.0", - "@cypress-design/vue-statusicon": "^0.5.7", - "@cypress-design/vue-tabs": "^0.5.1", + "@cypress-design/vue-button": "^1.1.0", + "@cypress-design/vue-icon": "^1.6.0", + "@cypress-design/vue-statusicon": "^1.0.0", + "@cypress-design/vue-tabs": "^1.2.2", "@faker-js/faker": "8.4.1", "@graphql-typed-document-node/core": "^3.1.0", "@headlessui/vue": "1.4.0", diff --git a/packages/app/src/debug/LayeredBrowserIcons.vue b/packages/app/src/debug/LayeredBrowserIcons.vue index 4cb4032cd3b1..c14a181f6734 100644 --- a/packages/app/src/debug/LayeredBrowserIcons.vue +++ b/packages/app/src/debug/LayeredBrowserIcons.vue @@ -20,22 +20,10 @@ diff --git a/packages/app/src/runner/SpecRunnerHeaderOpenMode.vue b/packages/app/src/runner/SpecRunnerHeaderOpenMode.vue index 5c74700bf3d2..ca28e98562ef 100644 --- a/packages/app/src/runner/SpecRunnerHeaderOpenMode.vue +++ b/packages/app/src/runner/SpecRunnerHeaderOpenMode.vue @@ -63,11 +63,11 @@ :disabled="autStore.isRunning" > - + /> {{ selectedBrowser.displayName }} {{ selectedBrowser.majorVersion }} diff --git a/packages/app/src/runner/SpecRunnerHeaderRunMode.cy.tsx b/packages/app/src/runner/SpecRunnerHeaderRunMode.cy.tsx index e534f6e83ed2..283a8bbd09b8 100644 --- a/packages/app/src/runner/SpecRunnerHeaderRunMode.cy.tsx +++ b/packages/app/src/runner/SpecRunnerHeaderRunMode.cy.tsx @@ -70,7 +70,7 @@ describe('SpecRunnerHeaderRunMode', { viewportHeight: 500 }, () => { cy.mount() - cy.get('[data-cy="select-browser"] > button img').should('have.attr', 'src', allBrowsersIcons.Chrome) + cy.get('[data-cy="select-browser"] > button img').should('have.attr', 'src', allBrowsersIcons.chrome) cy.get('[data-cy="select-browser"] > button').should('be.disabled') }) }) diff --git a/packages/app/src/runner/SpecRunnerHeaderRunMode.vue b/packages/app/src/runner/SpecRunnerHeaderRunMode.vue index 8f9a53ca796f..e4a3a769fb90 100644 --- a/packages/app/src/runner/SpecRunnerHeaderRunMode.vue +++ b/packages/app/src/runner/SpecRunnerHeaderRunMode.vue @@ -29,12 +29,12 @@ :disabled="autStore.isRunning" > - {{ selectedBrowser.displayName }} {{ selectedBrowser.majorVersion }} + /> {{ selectedBrowser.displayName }} {{ selectedBrowser.majorVersion }} - + /> {{ selectedBrowser.displayName }} {{ selectedBrowser.majorVersion }} diff --git a/packages/app/src/runs/RunCard.vue b/packages/app/src/runs/RunCard.vue index a40a19a72a88..1dac4f95d8a6 100644 --- a/packages/app/src/runs/RunCard.vue +++ b/packages/app/src/runs/RunCard.vue @@ -122,7 +122,7 @@ :aria-label="t(props.debugEnabled ? 'runs.card.debugDescription' : 'runs.card.noDebugAvailable', { runNumber: run.runNumber })" @click="onDebugClick" > - @@ -155,7 +155,7 @@ import Tooltip from '@packages/frontend-shared/src/components/Tooltip.vue' import UserAvatar from '@cy/gql-components/topnav/UserAvatar.vue' import { RunCardFragment, RunCard_ChangeDocument, RunCard_ShowDebugForCloudRunDocument } from '../generated/graphql' import { useRunDateTimeInterval } from '../debug/useRunDateTimeInterval' -import { IconTechnologyDebugger, IconTimeClock, IconTechnologyBranchH } from '@cypress-design/vue-icon' +import { IconObjectBug, IconTimeClock, IconTechnologyBranchH } from '@cypress-design/vue-icon' import { getUrlWithParams } from '@packages/frontend-shared/src/utils/getUrlWithParams' const { t } = useI18n() diff --git a/packages/frontend-shared/package.json b/packages/frontend-shared/package.json index cb688dca6793..52d2fd107a02 100644 --- a/packages/frontend-shared/package.json +++ b/packages/frontend-shared/package.json @@ -22,7 +22,7 @@ }, "devDependencies": { "@antfu/utils": "^0.7.8", - "@cypress-design/css": "^0.13.3", + "@cypress-design/css": "^1.0.0", "@faker-js/faker": "8.4.1", "@graphql-typed-document-node/core": "^3.1.0", "@headlessui/vue": "1.4.0", @@ -45,7 +45,6 @@ "@vueuse/core": "7.2.2", "autoprefixer": "^10.4.19", "axe-core": "4.4.1", - "browser-logos": "github:alrra/browser-logos", "combine-properties": "0.1.0", "cross-env": "6.0.3", "cypress-plugin-tab": "1.0.5", diff --git a/packages/frontend-shared/src/assets/browserLogos.ts b/packages/frontend-shared/src/assets/browserLogos.ts index fb1317acd30e..c065747088a8 100644 --- a/packages/frontend-shared/src/assets/browserLogos.ts +++ b/packages/frontend-shared/src/assets/browserLogos.ts @@ -1,33 +1,38 @@ -import chromeIcon from 'browser-logos/src/chrome/chrome.svg?url' -import firefoxIcon from 'browser-logos/src/firefox/firefox.svg?url' -import edgeIcon from 'browser-logos/src/edge/edge.svg?url' -import electronIcon from 'browser-logos/src/electron/electron.svg?url' -import canaryIcon from 'browser-logos/src/chrome-canary/chrome-canary.svg?url' -import chromeBetaIcon from 'browser-logos/src/chrome-beta/chrome-beta.svg?url' -import chromeTestIcon from '@packages/frontend-shared/src/assets/logos/browser-chrome-for-testing_x16.svg?url' -import chromiumIcon from 'browser-logos/src/chromium/chromium.svg?url' -import edgeBetaIcon from 'browser-logos/src/edge-beta/edge-beta.png' -import edgeCanaryIcon from 'browser-logos/src/edge-canary/edge-canary.png' -import edgeDevIcon from 'browser-logos/src/edge-dev/edge-dev.png' -import firefoxNightlyIcon from 'browser-logos/src/firefox-nightly/firefox-nightly.svg?url' -import firefoxDeveloperEditionIcon from 'browser-logos/src/firefox-developer-edition/firefox-developer-edition.svg?url' -import webKitIcon from 'browser-logos/src/webkit/webkit.svg?url' -import genericBrowserLogo from '@packages/frontend-shared/src/assets/logos/generic-browser.svg?url' +import { + IconBrowserElectronLight, + IconBrowserChrome, + IconBrowserChromeBeta, + IconBrowserChromeCanary, + IconBrowserChromeForTesting, + IconBrowserMozillaFirefox, + IconBrowserEdge, + IconBrowserChromium, + IconBrowserFirefoxNightly, + IconBrowserFirefoxDev, + IconBrowserEdgeCanary, + IconBrowserEdgeBeta, + IconBrowserEdgeDev, + IconBrowserWebkit, + IconGeneralGlobe, +} from '@cypress-design/vue-icon' export const allBrowsersIcons = { - 'Electron': electronIcon, - 'Chrome': chromeIcon, - 'Chrome Beta': chromeBetaIcon, - 'Chrome Canary': canaryIcon, - 'Chrome for Testing': chromeTestIcon, - 'Firefox': firefoxIcon, - 'Edge': edgeIcon, - 'Chromium': chromiumIcon, - 'Firefox Nightly': firefoxNightlyIcon, - 'Firefox Developer Edition': firefoxDeveloperEditionIcon, - 'Edge Canary': edgeCanaryIcon, - 'Edge Beta': edgeBetaIcon, - 'Edge Dev': edgeDevIcon, - 'WebKit': webKitIcon, - 'generic': genericBrowserLogo, + 'electron': IconBrowserElectronLight, + 'chrome': IconBrowserChrome, + 'chrome beta': IconBrowserChromeBeta, + 'canary': IconBrowserChromeCanary, + 'chrome canary': IconBrowserChromeCanary, + 'chrome for testing': IconBrowserChromeForTesting, + 'custom chrome for testing': IconBrowserChromeForTesting, + 'chromium': IconBrowserChromium, + 'custom chromium': IconBrowserChromium, + 'firefox': IconBrowserMozillaFirefox, + 'firefox nightly': IconBrowserFirefoxNightly, + 'firefox developer edition': IconBrowserFirefoxDev, + 'edge': IconBrowserEdge, + 'edge beta': IconBrowserEdgeBeta, + 'edge canary': IconBrowserEdgeCanary, + 'edge dev': IconBrowserEdgeDev, + 'webkit': IconBrowserWebkit, + 'generic': IconGeneralGlobe, } diff --git a/packages/frontend-shared/src/assets/logos/browser-chrome-for-testing_x16.svg b/packages/frontend-shared/src/assets/logos/browser-chrome-for-testing_x16.svg deleted file mode 100644 index 0426ce0ae6e0..000000000000 --- a/packages/frontend-shared/src/assets/logos/browser-chrome-for-testing_x16.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/packages/frontend-shared/src/assets/logos/generic-browser.svg b/packages/frontend-shared/src/assets/logos/generic-browser.svg deleted file mode 100644 index b6e93b0d0677..000000000000 --- a/packages/frontend-shared/src/assets/logos/generic-browser.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/packages/frontend-shared/src/gql-components/topnav/TopNav.vue b/packages/frontend-shared/src/gql-components/topnav/TopNav.vue index 69926fa2db53..42365b9323af 100644 --- a/packages/frontend-shared/src/gql-components/topnav/TopNav.vue +++ b/packages/frontend-shared/src/gql-components/topnav/TopNav.vue @@ -105,14 +105,14 @@ v-if="props.gql?.currentProject?.activeBrowser && showBrowsers" > - + /> - + /> - + /> =0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2, source-map-js@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" - integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2, source-map-js@^1.2.0, source-map-js@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" + integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== source-map-js@^0.6.2: version "0.6.2" @@ -29455,14 +29425,14 @@ subscriptions-transport-ws@^0.9.18: symbol-observable "^1.0.4" ws "^5.2.0 || ^6.0.0 || ^7.0.0" -sucrase@^3.32.0: - version "3.32.0" - resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.32.0.tgz#c4a95e0f1e18b6847127258a75cf360bc568d4a7" - integrity sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ== +sucrase@^3.35.0: + version "3.35.0" + resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263" + integrity sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA== dependencies: "@jridgewell/gen-mapping" "^0.3.2" commander "^4.0.0" - glob "7.1.6" + glob "^10.3.10" lines-and-columns "^1.1.6" mz "^2.7.0" pirates "^4.0.1" @@ -29681,6 +29651,11 @@ systemjs@^6.15.1: resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-6.15.1.tgz#74175b6810e27a79e1177d21db5f0e3057118cea" integrity sha512-Nk8c4lXvMB98MtbmjX7JwJRgJOL8fluecYCfCeYBznwmpOs8Bf15hLM6z4z71EDAhQVrQrI+wt1aLWSXZq+hXA== +tailwindcss-hocus@^0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/tailwindcss-hocus/-/tailwindcss-hocus-0.0.7.tgz#bd5801deec87765237ed66f676d632365b3c490c" + integrity sha512-KY3jLlppAoPkCLRhDqbe503c1Ryq//G1bLQqFCZz1pnB0JFzHa3VK0bXvjTa8n/dwCxgkhi5uJm1d6gp8OzPhw== + tailwindcss@1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.1.4.tgz#786bd5faaf485c9eddcb821dd55666c56baa814e" @@ -29701,33 +29676,33 @@ tailwindcss@1.1.4: pretty-hrtime "^1.0.3" reduce-css-calc "^2.1.6" -tailwindcss@^3.3.1, tailwindcss@^3.3.2, tailwindcss@^3.3.3, tailwindcss@^3.4.1: - version "3.4.4" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.4.tgz#351d932273e6abfa75ce7d226b5bf3a6cb257c05" - integrity sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A== +tailwindcss@^3.3.1, tailwindcss@^3.4.3: + version "3.4.17" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.17.tgz#ae8406c0f96696a631c790768ff319d46d5e5a63" + integrity sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og== dependencies: "@alloc/quick-lru" "^5.2.0" arg "^5.0.2" - chokidar "^3.5.3" + chokidar "^3.6.0" didyoumean "^1.2.2" dlv "^1.1.3" - fast-glob "^3.3.0" + fast-glob "^3.3.2" glob-parent "^6.0.2" is-glob "^4.0.3" - jiti "^1.21.0" - lilconfig "^2.1.0" - micromatch "^4.0.5" + jiti "^1.21.6" + lilconfig "^3.1.3" + micromatch "^4.0.8" normalize-path "^3.0.0" object-hash "^3.0.0" - picocolors "^1.0.0" - postcss "^8.4.23" + picocolors "^1.1.1" + postcss "^8.4.47" postcss-import "^15.1.0" postcss-js "^4.0.1" - postcss-load-config "^4.0.1" - postcss-nested "^6.0.1" - postcss-selector-parser "^6.0.11" - resolve "^1.22.2" - sucrase "^3.32.0" + postcss-load-config "^4.0.2" + postcss-nested "^6.2.0" + postcss-selector-parser "^6.1.2" + resolve "^1.22.8" + sucrase "^3.35.0" tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" @@ -32659,10 +32634,10 @@ yaml@^1.10.0: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yaml@^2.0.0, yaml@^2.1.1, yaml@^2.4.1: - version "2.5.1" - resolved "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz#c9772aacf62cb7494a95b0c4f1fb065b563db130" - integrity sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q== +yaml@^2.0.0, yaml@^2.3.4, yaml@^2.4.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.1.tgz#42f2b1ba89203f374609572d5349fb8686500773" + integrity sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg== yargs-parser@13.1.1: version "13.1.1"