From 91876d2807ecf349bb2caa13c0b200364e0d00f6 Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Thu, 22 Feb 2024 15:12:11 +0000 Subject: [PATCH 01/14] chore: DSW-0 update page structure for nextjs --- nextjs-app/src/layout/navigation.tsx | 25 + nextjs-app/src/pages/_document.tsx | 1 + .../src/pages/components/assistive-text.tsx | 12 + nextjs-app/src/pages/components/button.tsx | 21 + nextjs-app/src/pages/components/card.tsx | 20 + nextjs-app/src/pages/components/chip.tsx | 15 + .../src/pages/components/cookie-banner.tsx | 18 + .../src/pages/components/form-label.tsx | 10 + .../src/pages/components/icon-button.tsx | 13 + nextjs-app/src/pages/components/link.tsx | 10 + nextjs-app/src/pages/components/modal.tsx | 23 + nextjs-app/src/pages/components/spinner.tsx | 10 + nextjs-app/src/pages/components/switch.tsx | 23 + nextjs-app/src/pages/components/tag.tsx | 10 + nextjs-app/src/pages/index.tsx | 128 +--- .../src/pages/{ => integrations}/form.tsx | 6 +- .../src/pages/{ => integrations}/icons.tsx | 6 +- nextjs-app/src/styles/main.scss | 4 + nextjs-app/test/visual/nextjs.spec.js | 26 - nextjs-app/wdio.conf.js | 6 +- nuxt-app/test/visual/nuxt.spec.js | 27 - nuxt-app/wdio.conf.js | 6 +- playwright-helpers/configuration-helper.js | 8 +- test/visual/component-pages.spec.js | 34 + vanilla-app/test/visual/vanilla.spec.js | 34 - vanilla-app/wdio.conf.js | 8 +- yarn.lock | 686 +++++++++--------- 27 files changed, 657 insertions(+), 533 deletions(-) create mode 100644 nextjs-app/src/layout/navigation.tsx create mode 100644 nextjs-app/src/pages/components/assistive-text.tsx create mode 100644 nextjs-app/src/pages/components/button.tsx create mode 100644 nextjs-app/src/pages/components/card.tsx create mode 100644 nextjs-app/src/pages/components/chip.tsx create mode 100644 nextjs-app/src/pages/components/cookie-banner.tsx create mode 100644 nextjs-app/src/pages/components/form-label.tsx create mode 100644 nextjs-app/src/pages/components/icon-button.tsx create mode 100644 nextjs-app/src/pages/components/link.tsx create mode 100644 nextjs-app/src/pages/components/modal.tsx create mode 100644 nextjs-app/src/pages/components/spinner.tsx create mode 100644 nextjs-app/src/pages/components/switch.tsx create mode 100644 nextjs-app/src/pages/components/tag.tsx rename nextjs-app/src/pages/{ => integrations}/form.tsx (97%) rename nextjs-app/src/pages/{ => integrations}/icons.tsx (74%) delete mode 100644 nextjs-app/test/visual/nextjs.spec.js delete mode 100644 nuxt-app/test/visual/nuxt.spec.js create mode 100644 test/visual/component-pages.spec.js delete mode 100644 vanilla-app/test/visual/vanilla.spec.js diff --git a/nextjs-app/src/layout/navigation.tsx b/nextjs-app/src/layout/navigation.tsx new file mode 100644 index 00000000..fb00bfca --- /dev/null +++ b/nextjs-app/src/layout/navigation.tsx @@ -0,0 +1,25 @@ +import { PieDivider } from "@justeattakeaway/pie-divider/dist/react" +import { PieLink } from "@justeattakeaway/pie-link/dist/react"; +import { useRouter } from "next/router"; +import Head from 'next/head'; + +export default function NavigationLayout({ children, title = '' }) { + + const router = useRouter(); + const isHomePage = router.pathname === '/'; + + return ( + <> + + { isHomePage && PIE Aperture} + {!isHomePage && PIE Aperture | NextJS | { title }} + +

NextJS - PIE { title }

+ { !isHomePage && router.push('/')} tag="button">Back to home} + { !isHomePage && } + { children } + { !isHomePage && } + + ); + } + \ No newline at end of file diff --git a/nextjs-app/src/pages/_document.tsx b/nextjs-app/src/pages/_document.tsx index 6d41fdfe..7d108086 100644 --- a/nextjs-app/src/pages/_document.tsx +++ b/nextjs-app/src/pages/_document.tsx @@ -1,6 +1,7 @@ import { Html, Head, Main, NextScript } from 'next/document' export default function Document() { + return ( diff --git a/nextjs-app/src/pages/components/assistive-text.tsx b/nextjs-app/src/pages/components/assistive-text.tsx new file mode 100644 index 00000000..d3939967 --- /dev/null +++ b/nextjs-app/src/pages/components/assistive-text.tsx @@ -0,0 +1,12 @@ +import NavigationLayout from "@/layout/navigation"; +import { PieAssistiveText } from "@justeattakeaway/pie-assistive-text/dist/react"; + +export default function AssistiveText() { + return ( + + Assistive Text + Assistive Text + Assistive Text + + ); +} diff --git a/nextjs-app/src/pages/components/button.tsx b/nextjs-app/src/pages/components/button.tsx new file mode 100644 index 00000000..14e8f32e --- /dev/null +++ b/nextjs-app/src/pages/components/button.tsx @@ -0,0 +1,21 @@ +import NavigationLayout from "@/layout/navigation"; +import { PieButton } from "@justeattakeaway/pie-button/dist/react"; +import { PieDivider } from "@justeattakeaway/pie-divider/dist/react"; +import { IconSearch } from "@justeattakeaway/pie-icons-webc/dist/react/IconSearch" +import { useState } from "react"; + +export default function Button() { + + const [counter, setCounter] = useState(0) + return ( + + setCounter(counter + 1)}>Counter: {counter} + +

PIE Button - with Icon and text

+ + + Search + + + ); +} diff --git a/nextjs-app/src/pages/components/card.tsx b/nextjs-app/src/pages/components/card.tsx new file mode 100644 index 00000000..15ef0c97 --- /dev/null +++ b/nextjs-app/src/pages/components/card.tsx @@ -0,0 +1,20 @@ +import NavigationLayout from "@/layout/navigation"; +import { PieCard } from "@justeattakeaway/pie-card/dist/react"; + +export default function Card() { + return ( + + +

Default Card

+

Lorem ipsum dolor sit amet + consectetur adipisicing elit. + Fugiat dolore dolorem maxime, + quod, in minima esse fugit + distinctio, officia et soluta + dicta consequuntur commodi officiis + tempora asperiores aspernatur atque quas. +

+ + + ); +} diff --git a/nextjs-app/src/pages/components/chip.tsx b/nextjs-app/src/pages/components/chip.tsx new file mode 100644 index 00000000..233f6820 --- /dev/null +++ b/nextjs-app/src/pages/components/chip.tsx @@ -0,0 +1,15 @@ +import NavigationLayout from "@/layout/navigation"; +import { PieChip } from "@justeattakeaway/pie-chip/dist/react"; +import { PieDivider } from "@justeattakeaway/pie-divider/dist/react"; + +export default function Chip() { + return ( + + PIE Chip + + PIE Chip + + PIE Chip + + ); +} diff --git a/nextjs-app/src/pages/components/cookie-banner.tsx b/nextjs-app/src/pages/components/cookie-banner.tsx new file mode 100644 index 00000000..265122e9 --- /dev/null +++ b/nextjs-app/src/pages/components/cookie-banner.tsx @@ -0,0 +1,18 @@ +import NavigationLayout from "@/layout/navigation"; +import { PieCookieBanner } from "@justeattakeaway/pie-cookie-banner/dist/react"; +// TODO: Remove this comment as soon as we provide the TS declaration for locales +// @ts-ignore: missing declaration for locales +import locales from "@justeattakeaway/pie-cookie-banner/locales" + +export default function CookieBanner() { + return ( + + + + ); +} diff --git a/nextjs-app/src/pages/components/form-label.tsx b/nextjs-app/src/pages/components/form-label.tsx new file mode 100644 index 00000000..9841d1ed --- /dev/null +++ b/nextjs-app/src/pages/components/form-label.tsx @@ -0,0 +1,10 @@ +import NavigationLayout from "@/layout/navigation"; +import { PieFormLabel } from "@justeattakeaway/pie-form-label/dist/react"; + +export default function FormLabel() { + return ( + + Label + + ); +} diff --git a/nextjs-app/src/pages/components/icon-button.tsx b/nextjs-app/src/pages/components/icon-button.tsx new file mode 100644 index 00000000..81e06566 --- /dev/null +++ b/nextjs-app/src/pages/components/icon-button.tsx @@ -0,0 +1,13 @@ +import NavigationLayout from "@/layout/navigation"; +import { PieIconButton } from "@justeattakeaway/pie-icon-button/dist/react" +import { IconClose } from "@justeattakeaway/pie-icons-webc/dist/react/IconClose" + +export default function IconButton() { + return ( + + + + + + ); +} diff --git a/nextjs-app/src/pages/components/link.tsx b/nextjs-app/src/pages/components/link.tsx new file mode 100644 index 00000000..e83d77b9 --- /dev/null +++ b/nextjs-app/src/pages/components/link.tsx @@ -0,0 +1,10 @@ +import NavigationLayout from "@/layout/navigation"; +import { PieLink } from "@justeattakeaway/pie-link/dist/react"; + +export default function Link() { + return ( + + Visit pie.design + + ); +} diff --git a/nextjs-app/src/pages/components/modal.tsx b/nextjs-app/src/pages/components/modal.tsx new file mode 100644 index 00000000..ae0b781d --- /dev/null +++ b/nextjs-app/src/pages/components/modal.tsx @@ -0,0 +1,23 @@ +import NavigationLayout from "@/layout/navigation"; +import { PieButton } from "@justeattakeaway/pie-button/dist/react" +import { PieModal } from "@justeattakeaway/pie-modal/dist/react"; +import { useState } from "react"; + +export default function Modal() { + const [isModalOpen, setIsModalOpen] = useState(false) + return ( + + setIsModalOpen(true)}>Open Modal + setIsModalOpen(false)} + onPieModalBack={() => setIsModalOpen(false)} + > +

Modal

+ + + ); +} diff --git a/nextjs-app/src/pages/components/spinner.tsx b/nextjs-app/src/pages/components/spinner.tsx new file mode 100644 index 00000000..85287e87 --- /dev/null +++ b/nextjs-app/src/pages/components/spinner.tsx @@ -0,0 +1,10 @@ +import NavigationLayout from "@/layout/navigation"; +import { PieSpinner } from "@justeattakeaway/pie-spinner/dist/react"; + +export default function Spinner() { + return ( + + + + ); +} diff --git a/nextjs-app/src/pages/components/switch.tsx b/nextjs-app/src/pages/components/switch.tsx new file mode 100644 index 00000000..b2fc2c02 --- /dev/null +++ b/nextjs-app/src/pages/components/switch.tsx @@ -0,0 +1,23 @@ +import NavigationLayout from "@/layout/navigation"; +import { PieSwitch } from "@justeattakeaway/pie-switch/dist/react"; +import { useState } from "react"; + +export default function Switch() { + + const [isSwitchChecked, setIsSwitchCheck] = useState(false) + + const handleSwitchChange = () => { + setIsSwitchCheck(current => !current); + console.log(isSwitchChecked); + }; + + return ( + + + + + ); +} diff --git a/nextjs-app/src/pages/components/tag.tsx b/nextjs-app/src/pages/components/tag.tsx new file mode 100644 index 00000000..a706e1ad --- /dev/null +++ b/nextjs-app/src/pages/components/tag.tsx @@ -0,0 +1,10 @@ +import NavigationLayout from "@/layout/navigation"; +import { PieTag } from "@justeattakeaway/pie-tag/dist/react"; + +export default function Tag() { + return ( + + Label + + ); +} diff --git a/nextjs-app/src/pages/index.tsx b/nextjs-app/src/pages/index.tsx index 37171d11..d8ec8ce0 100644 --- a/nextjs-app/src/pages/index.tsx +++ b/nextjs-app/src/pages/index.tsx @@ -1,109 +1,33 @@ -import React, { useState } from "react" -import { PieAssistiveText } from "@justeattakeaway/pie-assistive-text/dist/react" -import { PieButton } from "@justeattakeaway/pie-button/dist/react" -import { PieChip } from "@justeattakeaway/pie-chip/dist/react" -import { PieDivider } from "@justeattakeaway/pie-divider/dist/react" -import { PieFormLabel } from "@justeattakeaway/pie-form-label/dist/react" -import { PieLink } from "@justeattakeaway/pie-link/dist/react" -import { PieSpinner } from "@justeattakeaway/pie-spinner/dist/react" -import { PieModal } from "@justeattakeaway/pie-modal/dist/react" -import { PieCookieBanner } from "@justeattakeaway/pie-cookie-banner/dist/react" -// TODO: Remove this comment as soon as we provide the TS declaration for locales -// @ts-ignore: missing declaration for locales -import locales from "@justeattakeaway/pie-cookie-banner/locales" -import { PieIconButton } from "@justeattakeaway/pie-icon-button/dist/react" -import { IconClose } from "@justeattakeaway/pie-icons-webc/dist/react/IconClose" -import { PieSwitch } from "@justeattakeaway/pie-switch/dist/react" -import { PieCard } from "@justeattakeaway/pie-card/dist/react" -import { PieTag } from "@justeattakeaway/pie-tag/dist/react" - -import Link from 'next/link' +import NavigationLayout from "@/layout/navigation"; +import { PieLink } from '@justeattakeaway/pie-link/dist/react'; +import { useRouter } from 'next/router'; export default function Home() { - const [counter, setCounter] = useState(0) - const [isModalOpen, setIsModalOpen] = useState(false) - const [isSwitchChecked, setIsSwitchCheck] = useState(false) - const handleSwitchChange = () => { - setIsSwitchCheck(current => !current); - console.log(isSwitchChecked); - }; + const router = useRouter(); return ( - <> -

PIE Icons Test Page

-

PIE Form Test Page

-

Pie Button

- setCounter(counter + 1)}>Counter: {counter} - - -

Pie Icon Button

- alert('clicked')}> - - - - -

Pie Switch

- - - -

Pie Link

- Visit pie.design - - -

Pie Spinner

- - - -

Pie Card

- alert('Card clicked')}> -

Title

-

Test card

- - - -

Pie Modal

- setIsModalOpen(true)}>Open Modal - setIsModalOpen(false)} - onPieModalBack={() => setIsModalOpen(false)} - > -

Modal

- - - - - - -

Pie Form Label

- Label - - - -

Pie Tag

- Pie Tag - - - -

Pie Assistive Text

- Assistive Text - - -

Pie Chip

- Pie Chip - - + +

Demo Integrations

+
    +
  • router.push('/integrations/icons')} tag="button">Icons Demo
    • +
  • router.push('/integrations/form')} tag="button">Form Demo
    • +
+

Component Pages

+
    +
  • router.push('/components/assistive-text')} tag="button">Assistive Text
    • +
  • router.push('/components/button')} tag="button">Button
    • +
  • router.push('/components/card')} tag="button">Card
    • +
  • router.push('/components/chip')} tag="button">Chip
    • +
  • router.push('/components/cookie-banner')} tag="button">Cookie Banner
    • +
  • router.push('/components/form-label')} tag="button">Form Label
    • +
  • router.push('/components/icon-button')} tag="button">Icon Button
    • +
  • router.push('/components/link')} tag="button">Link
    • +
  • router.push('/components/modal')} tag="button">Modal
    • +
  • router.push('/components/spinner')} tag="button">Spinner
    • +
  • router.push('/components/switch')} tag="button">Switch
    • +
  • router.push('/components/tag')} tag="button">Tag
    • +
+ ); } diff --git a/nextjs-app/src/pages/form.tsx b/nextjs-app/src/pages/integrations/form.tsx similarity index 97% rename from nextjs-app/src/pages/form.tsx rename to nextjs-app/src/pages/integrations/form.tsx index be100e16..a8e22125 100644 --- a/nextjs-app/src/pages/form.tsx +++ b/nextjs-app/src/pages/integrations/form.tsx @@ -1,4 +1,5 @@ import React, { useState } from 'react'; +import NavigationLayout from '@/layout/navigation'; import { PieFormLabel } from '@justeattakeaway/pie-form-label/dist/react'; import { PieSwitch } from '@justeattakeaway/pie-switch/dist/react'; import { PieButton } from '@justeattakeaway/pie-button/dist/react'; @@ -53,8 +54,7 @@ export default function Form() { }; return ( - <> -

NextJS - PIE Form Test Page

+
Username: @@ -132,6 +132,6 @@ export default function Form() { 
{formDataDisplay}
)} - + ); } diff --git a/nextjs-app/src/pages/icons.tsx b/nextjs-app/src/pages/integrations/icons.tsx similarity index 74% rename from nextjs-app/src/pages/icons.tsx rename to nextjs-app/src/pages/integrations/icons.tsx index 7039a7e9..5c6288ad 100644 --- a/nextjs-app/src/pages/icons.tsx +++ b/nextjs-app/src/pages/integrations/icons.tsx @@ -1,14 +1,14 @@ +import NavigationLayout from '@/layout/navigation'; import * as icons from '@justeattakeaway/pie-icons-webc/dist/react'; export default function Icons() { return ( - <> -

PIE Icons Test Page

+
{Object.entries(icons).map(([iconName, IconComponent]) => ( ))}
- + ); } diff --git a/nextjs-app/src/styles/main.scss b/nextjs-app/src/styles/main.scss index 85e1aac5..c17c2b43 100644 --- a/nextjs-app/src/styles/main.scss +++ b/nextjs-app/src/styles/main.scss @@ -60,4 +60,8 @@ pie-divider { .form-btns > .form-btn:first-of-type { margin-left: auto; +} + +ul { + list-style: none; } \ No newline at end of file diff --git a/nextjs-app/test/visual/nextjs.spec.js b/nextjs-app/test/visual/nextjs.spec.js deleted file mode 100644 index 3e7bce63..00000000 --- a/nextjs-app/test/visual/nextjs.spec.js +++ /dev/null @@ -1,26 +0,0 @@ -const { waitUntilPageLoad } = require('../../../webdriver-helpers/wait-helper.js'); -const { percyScreenshot } = require('@percy/selenium-webdriver'); - -describe('NextJS App', () => { - it('should navigate to the overview page.', async () => { - await browser.url('/'); - await waitUntilPageLoad(); - await expect(await browser.getTitle()).toBe('PIE Aperture'); - await percyScreenshot('Next JS - Component Overview Page'); - }); - - it('should navigate to the icons page.', async () => { - await browser.url('/icons'); - await waitUntilPageLoad(); - await expect(await browser.getTitle()).toBe('PIE Aperture'); - await percyScreenshot('Next JS - Icons Page'); - }); - - it('should navigate to the form page.', async () => { - await browser.url('/form'); - await waitUntilPageLoad(); - await expect(await browser.getTitle()).toBe('PIE Aperture'); - await percyScreenshot('Next JS - Form Page'); - }); -}); - diff --git a/nextjs-app/wdio.conf.js b/nextjs-app/wdio.conf.js index ef895a00..8ba694ea 100644 --- a/nextjs-app/wdio.conf.js +++ b/nextjs-app/wdio.conf.js @@ -2,11 +2,13 @@ const merge = require('deepmerge'); const sharedConf = require('../wdio.conf.js'); const { getEnvironmentBaseUrl } = require('../webdriver-helpers/configuration-helper.js'); +process.env.APP_NAME = 'NextJS'; + exports.config = merge(sharedConf.config, { - baseUrl: getEnvironmentBaseUrl('nextjs-app'), + baseUrl: getEnvironmentBaseUrl(process.env.APP_NAME), specs: [ - './test/visual/*.js' + '../test/visual/*.js' ] }); \ No newline at end of file diff --git a/nuxt-app/test/visual/nuxt.spec.js b/nuxt-app/test/visual/nuxt.spec.js deleted file mode 100644 index b0f2e3d0..00000000 --- a/nuxt-app/test/visual/nuxt.spec.js +++ /dev/null @@ -1,27 +0,0 @@ -const { waitUntilPageLoad } = require('../../../webdriver-helpers/wait-helper.js'); -const { percyScreenshot } = require('@percy/selenium-webdriver'); - -describe('Nuxt App', () => { - it('should navigate to the overview page.', async () => { - await browser.url('/'); - await waitUntilPageLoad(); - await percyScreenshot('Nuxt - Component Overview Page'); - // await expect(await browser.getTitle()).toBe('PIE Aperture'); - // await percyScreenshot('Next JS - Component Overview Page'); - }); - - // it('should navigate to the icons page.', async () => { - // await browser.url('/icons'); - // await waitUntilPageLoad(); - // await expect(await browser.getTitle()).toBe('PIE Aperture'); - // await percyScreenshot('Next JS - Icons Page'); - // }); - - // it('should navigate to the form page.', async () => { - // await browser.url('/form'); - // await waitUntilPageLoad(); - // await expect(await browser.getTitle()).toBe('PIE Aperture'); - // await percyScreenshot('Next JS - Form Page'); - // }); -}); - diff --git a/nuxt-app/wdio.conf.js b/nuxt-app/wdio.conf.js index 48c94e98..7369cef8 100644 --- a/nuxt-app/wdio.conf.js +++ b/nuxt-app/wdio.conf.js @@ -2,11 +2,13 @@ const merge = require('deepmerge'); const sharedConf = require('../wdio.conf.js'); const { getEnvironmentBaseUrl } = require('../webdriver-helpers/configuration-helper.js'); +process.env.APP_NAME = 'Nuxt'; + exports.config = merge(sharedConf.config, { - baseUrl: getEnvironmentBaseUrl('nuxt-app'), + baseUrl: getEnvironmentBaseUrl(process.env.APP_NAME), specs: [ - './test/visual/*.js' + '../test/visual/*.js' ], }); diff --git a/playwright-helpers/configuration-helper.js b/playwright-helpers/configuration-helper.js index 286502c8..edf5df70 100644 --- a/playwright-helpers/configuration-helper.js +++ b/playwright-helpers/configuration-helper.js @@ -4,20 +4,20 @@ export function getAppConfig(appName) { const config = {}; switch (appName) { - case 'vanilla-app': + case 'Vanilla': config.amplifyId = VANILLA_AMPLIFY_ID; config.port = '3001'; break; - case 'nextjs-app': + case 'NextJS': config.amplifyId = NEXT_AMPLIFY_ID; config.port = '3000'; break; - case 'nuxt-app': + case 'Nuxt': config.amplifyId = NUXT_AMPLIFY_ID; config.port = '3002'; break; default: - throw new Error(`appName: '${appName}' is invalid. Please use either 'vanilla-app', 'nextjs-app' or 'nuxt-app'.`); + throw new Error(`appName: '${appName}' is invalid. Please use either 'Vanilla', 'NextJS' or 'Nuxt'.`); } return config; } diff --git a/test/visual/component-pages.spec.js b/test/visual/component-pages.spec.js new file mode 100644 index 00000000..0824e020 --- /dev/null +++ b/test/visual/component-pages.spec.js @@ -0,0 +1,34 @@ + +import { waitUntilPageLoad } from '../../../webdriver-helpers/wait-helper.js'; +import { percyScreenshot } from '@percy/selenium-webdriver'; +const { APP_NAME } = process.env; + +describe(`${APP_NAME} Aperture App`, () => { + const pages = [ + { url: '/index.html', name: 'PIE Aperture' }, + { url: '/integrations/icons.html', name: 'Icons' }, + { url: '/integrations/form.html', name: 'Form' }, + { url: '/components/assistive-text.html', name: 'Assistive Text' }, + { url: '/components/button.html', name: 'Button' }, + { url: '/components/card.html', name: 'Card' }, + { url: '/components/chip.html', name: 'Chip' }, + { url: '/components/cookie-banner.html', name: 'Cookie Banner' }, + { url: '/components/form-label.html', name: 'Form Label' }, + { url: '/components/icon-button.html', name: 'Icon Button' }, + { url: '/components/link.html', name: 'Link' }, + { url: '/components/modal.html', name: 'Modal' }, + { url: '/components/spinner.html', name: 'Spinner' }, + { url: '/components/switch.html', name: 'Switch' }, + { url: '/components/tag.html', name: 'Tag' }, + ]; + + pages.forEach((page) => { + it(`should navigate to the ${appName} ${page.name} page.`, async () => { + await browser.url(page.url); + await waitUntilPageLoad(); + await expect(await browser.getTitle()).toBe(`PIE Aperture | ${APP_NAME} | ${page.name}`); + await percyScreenshot(page.title); + });p + + }); +}); diff --git a/vanilla-app/test/visual/vanilla.spec.js b/vanilla-app/test/visual/vanilla.spec.js deleted file mode 100644 index 8b6cd319..00000000 --- a/vanilla-app/test/visual/vanilla.spec.js +++ /dev/null @@ -1,34 +0,0 @@ -import { waitUntilPageLoad } from '../../../webdriver-helpers/wait-helper.js'; -import { percyScreenshot } from '@percy/selenium-webdriver'; - -describe('Vanilla App', () => { - - const pageUrls = [ - { url: '/index.html', title: 'PIE Aperture' }, - { url: '/integrations/icons.html', title: 'PIE Aperture | Vanilla | Icons' }, - { url: '/integrations/form.html', title: 'PIE Aperture | Vanilla | Form' }, - { url: '/components/assistive-text.html', title: 'PIE Aperture | Vanilla | Assistive Text' }, - { url: '/components/button.html', title: 'PIE Aperture | Vanilla | Button' }, - { url: '/components/card.html', title: 'PIE Aperture | Vanilla | Card' }, - { url: '/components/chip.html', title: 'PIE Aperture | Vanilla | Chip' }, - { url: '/components/cookie-banner.html', title: 'PIE Aperture | Vanilla | Cookie Banner' }, - { url: '/components/form-label.html', title: 'PIE Aperture | Vanilla | Form Label' }, - { url: '/components/icon-button.html', title: 'PIE Aperture | Vanilla | Icon Button' }, - { url: '/components/link.html', title: 'PIE Aperture | Vanilla | Link' }, - { url: '/components/modal.html', title: 'PIE Aperture | Vanilla | Modal' }, - { url: '/components/spinner.html', title: 'PIE Aperture | Vanilla | Spinner' }, - { url: '/components/switch.html', title: 'PIE Aperture | Vanilla | Switch' }, - { url: '/components/tag.html', title: 'PIE Aperture | Vanilla | Tag' }, - ]; - - pageUrls.forEach((page) => { - it(`should navigate to the ${page.url} page.`, async () => { - await browser.url(page.url); - await waitUntilPageLoad(); - await expect(await browser.getTitle()).toBe(page.title); - await percyScreenshot(page.title); - }); - - }); -}); - diff --git a/vanilla-app/wdio.conf.js b/vanilla-app/wdio.conf.js index 782b9e4f..6a217ca4 100644 --- a/vanilla-app/wdio.conf.js +++ b/vanilla-app/wdio.conf.js @@ -2,12 +2,14 @@ import merge from 'deepmerge'; import sharedConf from '../wdio.conf.js'; import { getEnvironmentBaseUrl } from '../webdriver-helpers/configuration-helper.js'; -const config = merge(sharedConf.config, { +process.env.APP_NAME = 'Vanilla'; - baseUrl: getEnvironmentBaseUrl('vanilla-app'), +exports.config = merge(sharedConf.config, { + + baseUrl: getEnvironmentBaseUrl(process.env.APP_NAME), specs: [ - './test/visual/*.js' + '../test/visual/*.js' ], }); diff --git a/yarn.lock b/yarn.lock index 1b188067..78de3f88 100644 --- a/yarn.lock +++ b/yarn.lock @@ -509,9 +509,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/aix-ppc64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/aix-ppc64@npm:0.20.0" +"@esbuild/aix-ppc64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/aix-ppc64@npm:0.20.1" conditions: os=aix & cpu=ppc64 languageName: node linkType: hard @@ -530,9 +530,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/android-arm64@npm:0.20.0" +"@esbuild/android-arm64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/android-arm64@npm:0.20.1" conditions: os=android & cpu=arm64 languageName: node linkType: hard @@ -551,9 +551,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/android-arm@npm:0.20.0" +"@esbuild/android-arm@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/android-arm@npm:0.20.1" conditions: os=android & cpu=arm languageName: node linkType: hard @@ -572,9 +572,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-x64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/android-x64@npm:0.20.0" +"@esbuild/android-x64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/android-x64@npm:0.20.1" conditions: os=android & cpu=x64 languageName: node linkType: hard @@ -593,9 +593,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/darwin-arm64@npm:0.20.0" +"@esbuild/darwin-arm64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/darwin-arm64@npm:0.20.1" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard @@ -614,9 +614,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/darwin-x64@npm:0.20.0" +"@esbuild/darwin-x64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/darwin-x64@npm:0.20.1" conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -635,9 +635,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/freebsd-arm64@npm:0.20.0" +"@esbuild/freebsd-arm64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/freebsd-arm64@npm:0.20.1" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard @@ -656,9 +656,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/freebsd-x64@npm:0.20.0" +"@esbuild/freebsd-x64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/freebsd-x64@npm:0.20.1" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard @@ -677,9 +677,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/linux-arm64@npm:0.20.0" +"@esbuild/linux-arm64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/linux-arm64@npm:0.20.1" conditions: os=linux & cpu=arm64 languageName: node linkType: hard @@ -698,9 +698,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/linux-arm@npm:0.20.0" +"@esbuild/linux-arm@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/linux-arm@npm:0.20.1" conditions: os=linux & cpu=arm languageName: node linkType: hard @@ -719,9 +719,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/linux-ia32@npm:0.20.0" +"@esbuild/linux-ia32@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/linux-ia32@npm:0.20.1" conditions: os=linux & cpu=ia32 languageName: node linkType: hard @@ -740,9 +740,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/linux-loong64@npm:0.20.0" +"@esbuild/linux-loong64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/linux-loong64@npm:0.20.1" conditions: os=linux & cpu=loong64 languageName: node linkType: hard @@ -761,9 +761,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/linux-mips64el@npm:0.20.0" +"@esbuild/linux-mips64el@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/linux-mips64el@npm:0.20.1" conditions: os=linux & cpu=mips64el languageName: node linkType: hard @@ -782,9 +782,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/linux-ppc64@npm:0.20.0" +"@esbuild/linux-ppc64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/linux-ppc64@npm:0.20.1" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard @@ -803,9 +803,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/linux-riscv64@npm:0.20.0" +"@esbuild/linux-riscv64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/linux-riscv64@npm:0.20.1" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard @@ -824,9 +824,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/linux-s390x@npm:0.20.0" +"@esbuild/linux-s390x@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/linux-s390x@npm:0.20.1" conditions: os=linux & cpu=s390x languageName: node linkType: hard @@ -845,9 +845,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/linux-x64@npm:0.20.0" +"@esbuild/linux-x64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/linux-x64@npm:0.20.1" conditions: os=linux & cpu=x64 languageName: node linkType: hard @@ -866,9 +866,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/netbsd-x64@npm:0.20.0" +"@esbuild/netbsd-x64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/netbsd-x64@npm:0.20.1" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard @@ -887,9 +887,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/openbsd-x64@npm:0.20.0" +"@esbuild/openbsd-x64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/openbsd-x64@npm:0.20.1" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard @@ -908,9 +908,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/sunos-x64@npm:0.20.0" +"@esbuild/sunos-x64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/sunos-x64@npm:0.20.1" conditions: os=sunos & cpu=x64 languageName: node linkType: hard @@ -929,9 +929,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/win32-arm64@npm:0.20.0" +"@esbuild/win32-arm64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/win32-arm64@npm:0.20.1" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard @@ -950,9 +950,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/win32-ia32@npm:0.20.0" +"@esbuild/win32-ia32@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/win32-ia32@npm:0.20.1" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard @@ -971,9 +971,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.20.0": - version: 0.20.0 - resolution: "@esbuild/win32-x64@npm:0.20.0" +"@esbuild/win32-x64@npm:0.20.1": + version: 0.20.1 + resolution: "@esbuild/win32-x64@npm:0.20.1" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -2680,93 +2680,93 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-android-arm-eabi@npm:4.11.0": - version: 4.11.0 - resolution: "@rollup/rollup-android-arm-eabi@npm:4.11.0" +"@rollup/rollup-android-arm-eabi@npm:4.12.0": + version: 4.12.0 + resolution: "@rollup/rollup-android-arm-eabi@npm:4.12.0" conditions: os=android & cpu=arm languageName: node linkType: hard -"@rollup/rollup-android-arm64@npm:4.11.0": - version: 4.11.0 - resolution: "@rollup/rollup-android-arm64@npm:4.11.0" +"@rollup/rollup-android-arm64@npm:4.12.0": + version: 4.12.0 + resolution: "@rollup/rollup-android-arm64@npm:4.12.0" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-darwin-arm64@npm:4.11.0": - version: 4.11.0 - resolution: "@rollup/rollup-darwin-arm64@npm:4.11.0" +"@rollup/rollup-darwin-arm64@npm:4.12.0": + version: 4.12.0 + resolution: "@rollup/rollup-darwin-arm64@npm:4.12.0" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-darwin-x64@npm:4.11.0": - version: 4.11.0 - resolution: "@rollup/rollup-darwin-x64@npm:4.11.0" +"@rollup/rollup-darwin-x64@npm:4.12.0": + version: 4.12.0 + resolution: "@rollup/rollup-darwin-x64@npm:4.12.0" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@rollup/rollup-linux-arm-gnueabihf@npm:4.11.0": - version: 4.11.0 - resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.11.0" +"@rollup/rollup-linux-arm-gnueabihf@npm:4.12.0": + version: 4.12.0 + resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.12.0" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@rollup/rollup-linux-arm64-gnu@npm:4.11.0": - version: 4.11.0 - resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.11.0" +"@rollup/rollup-linux-arm64-gnu@npm:4.12.0": + version: 4.12.0 + resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.12.0" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-arm64-musl@npm:4.11.0": - version: 4.11.0 - resolution: "@rollup/rollup-linux-arm64-musl@npm:4.11.0" +"@rollup/rollup-linux-arm64-musl@npm:4.12.0": + version: 4.12.0 + resolution: "@rollup/rollup-linux-arm64-musl@npm:4.12.0" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@rollup/rollup-linux-riscv64-gnu@npm:4.11.0": - version: 4.11.0 - resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.11.0" +"@rollup/rollup-linux-riscv64-gnu@npm:4.12.0": + version: 4.12.0 + resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.12.0" conditions: os=linux & cpu=riscv64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-x64-gnu@npm:4.11.0": - version: 4.11.0 - resolution: "@rollup/rollup-linux-x64-gnu@npm:4.11.0" +"@rollup/rollup-linux-x64-gnu@npm:4.12.0": + version: 4.12.0 + resolution: "@rollup/rollup-linux-x64-gnu@npm:4.12.0" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-x64-musl@npm:4.11.0": - version: 4.11.0 - resolution: "@rollup/rollup-linux-x64-musl@npm:4.11.0" +"@rollup/rollup-linux-x64-musl@npm:4.12.0": + version: 4.12.0 + resolution: "@rollup/rollup-linux-x64-musl@npm:4.12.0" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@rollup/rollup-win32-arm64-msvc@npm:4.11.0": - version: 4.11.0 - resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.11.0" +"@rollup/rollup-win32-arm64-msvc@npm:4.12.0": + version: 4.12.0 + resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.12.0" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-win32-ia32-msvc@npm:4.11.0": - version: 4.11.0 - resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.11.0" +"@rollup/rollup-win32-ia32-msvc@npm:4.12.0": + version: 4.12.0 + resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.12.0" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@rollup/rollup-win32-x64-msvc@npm:4.11.0": - version: 4.11.0 - resolution: "@rollup/rollup-win32-x64-msvc@npm:4.11.0" +"@rollup/rollup-win32-x64-msvc@npm:4.12.0": + version: 4.12.0 + resolution: "@rollup/rollup-win32-x64-msvc@npm:4.12.0" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -2849,9 +2849,9 @@ __metadata: linkType: hard "@sindresorhus/merge-streams@npm:^2.1.0": - version: 2.2.1 - resolution: "@sindresorhus/merge-streams@npm:2.2.1" - checksum: edb3d7b8fd9cdf4976c32483f073bb903f8ee94a2f1e93b47cc7d9205ac77cf64fce751ea45b1b39036a8de19d980cb942fff596c0d200232f3e1d4835c8ca4b + version: 2.3.0 + resolution: "@sindresorhus/merge-streams@npm:2.3.0" + checksum: e989d53dee68d7e49b4ac02ae49178d561c461144cea83f66fa91ff012d981ad0ad2340cbd13f2fdb57989197f5c987ca22a74eb56478626f04e79df84291159 languageName: node linkType: hard @@ -3031,13 +3031,13 @@ __metadata: linkType: hard "@types/react@npm:*": - version: 18.2.55 - resolution: "@types/react@npm:18.2.55" + version: 18.2.57 + resolution: "@types/react@npm:18.2.57" dependencies: "@types/prop-types": "*" "@types/scheduler": "*" csstype: ^3.0.2 - checksum: a8eb4fa77f73831b9112d4f11a7006217dc0740361649b9b0da3fd441d151a9cd415d5d68b91c0af4e430e063424d301c77489e5edaddc9f711c4e46cf9818a5 + checksum: 01e7a3424162468428f3b28acec5e5c6cd1e26775ff605d0f46c883dea2d835924873d36b9ea0b75e40c9593aa78ca56a8ccde66bd58dbf6ecb0dd95af28609d languageName: node linkType: hard @@ -3291,13 +3291,13 @@ __metadata: linkType: hard "@vitest/snapshot@npm:^1.2.2": - version: 1.2.2 - resolution: "@vitest/snapshot@npm:1.2.2" + version: 1.3.1 + resolution: "@vitest/snapshot@npm:1.3.1" dependencies: magic-string: ^0.30.5 pathe: ^1.1.1 pretty-format: ^29.7.0 - checksum: a12d2e5c675ab176961d4de661b3a131334ce8280ce5f7ad13c1c9164e0518b65d6562e99368261787514af9e46cae19ccc00bf31037e6fa2d87cb7f50c422cc + checksum: 5feb485bce446316594fff955a32dff68294f24dbcaeeea3a04175306d9319e62419a63c038d580db412c308c529c3fbaa5ea21365e9a3c4f1ed7e774e58de75 languageName: node linkType: hard @@ -3466,7 +3466,7 @@ __metadata: languageName: node linkType: hard -"@vue/devtools-api@npm:^6.5.0": +"@vue/devtools-api@npm:^6.5.0, @vue/devtools-api@npm:^6.5.1": version: 6.6.1 resolution: "@vue/devtools-api@npm:6.6.1" checksum: cf12b5ebcc7729725087072289410107b55bb82e0b86b8442e4e85516977110a8a3f4e1dec763be8b567a59173703b4e9c0ac1b0489bb2bb81363af7ea258a27 @@ -3660,18 +3660,18 @@ __metadata: languageName: node linkType: hard -"@wdio/config@npm:8.31.1": - version: 8.31.1 - resolution: "@wdio/config@npm:8.31.1" +"@wdio/config@npm:8.32.3": + version: 8.32.3 + resolution: "@wdio/config@npm:8.32.3" dependencies: "@wdio/logger": 8.28.0 - "@wdio/types": 8.31.1 - "@wdio/utils": 8.31.1 + "@wdio/types": 8.32.2 + "@wdio/utils": 8.32.3 decamelize: ^6.0.0 deepmerge-ts: ^5.0.0 glob: ^10.2.2 import-meta-resolve: ^4.0.0 - checksum: 2177fe79962a9ceb50b189016b452066d6993b5b05b5d1a39af996937f8ad1ad3c165aa4f1c4666f808bcb399001bd6250f44d1e3673122bfc37bad722ca19e2 + checksum: ff3ed91d829eb262ab53276f8aeeb0530c5979003d4665bef4f2511fc2ba4f0bae0ec49194f0480f5676eb347c0a811bf83b88216ba66773b979978f47aa60db languageName: node linkType: hard @@ -3691,17 +3691,17 @@ __metadata: linkType: hard "@wdio/globals@npm:^8.29.3": - version: 8.32.1 - resolution: "@wdio/globals@npm:8.32.1" + version: 8.32.3 + resolution: "@wdio/globals@npm:8.32.3" dependencies: expect-webdriverio: ^4.11.2 - webdriverio: 8.32.1 + webdriverio: 8.32.3 dependenciesMeta: expect-webdriverio: optional: true webdriverio: optional: true - checksum: 1e2a18684e091739d1b8fcb29b4d5c42c34e0deb6c19d740d48e5d9bf6926e011679511dbae283de0729c417b33c24be11a24de8cbbac61440ac09ca119dfb14 + checksum: 219d4f782562f065b1be2de5f10aa949eacd38ed4e7b0367994fae7b6f9b303a6e341d94b8a723be44a181677cd76bd4075b1d8df0dc549b6aff86cdea80d722 languageName: node linkType: hard @@ -3883,12 +3883,12 @@ __metadata: languageName: node linkType: hard -"@wdio/types@npm:8.31.1": - version: 8.31.1 - resolution: "@wdio/types@npm:8.31.1" +"@wdio/types@npm:8.32.2": + version: 8.32.2 + resolution: "@wdio/types@npm:8.32.2" dependencies: "@types/node": ^20.1.0 - checksum: af15fd24dedbcc4b849a02131c62f3b280eb3f2372cb8da186bcb5dd27f88f09efca63b4739326284ef6e633e08344a5700dc3d64945ead2688ddd8d19cc4f0a + checksum: d44c11a13a5c7a69a97f42963c2576dc4e7fe46a44b10df5b0d5b45f5ea1a472bca34ab4b0b3b80a227c43cea7aac075efb1fe75595059812315460b54c3d33a languageName: node linkType: hard @@ -3936,13 +3936,13 @@ __metadata: languageName: node linkType: hard -"@wdio/utils@npm:8.31.1": - version: 8.31.1 - resolution: "@wdio/utils@npm:8.31.1" +"@wdio/utils@npm:8.32.3": + version: 8.32.3 + resolution: "@wdio/utils@npm:8.32.3" dependencies: "@puppeteer/browsers": ^1.6.0 "@wdio/logger": 8.28.0 - "@wdio/types": 8.31.1 + "@wdio/types": 8.32.2 decamelize: ^6.0.0 deepmerge-ts: ^5.1.0 edgedriver: ^5.3.5 @@ -3953,7 +3953,7 @@ __metadata: safaridriver: ^0.1.0 split2: ^4.2.0 wait-port: ^1.0.4 - checksum: fc8108e21c191dc70e4192fc30a63f1c1fe983a8f43845bdcc7a6e2cfe520c5a70672db660f1d8598bb71ef3d3f872e166e369a81eadce1ca38fb7ba256b7131 + checksum: 874fa3d194812a477ba6c9a5882703f824324a6be97d4a01cd98054603288f308ccb0ecd77b28330cd7dd82411b01b084d02dd5c0e7875d1ffaa8513176637d9 languageName: node linkType: hard @@ -4436,10 +4436,12 @@ __metadata: languageName: node linkType: hard -"available-typed-arrays@npm:^1.0.5, available-typed-arrays@npm:^1.0.6": - version: 1.0.6 - resolution: "available-typed-arrays@npm:1.0.6" - checksum: 8295571eb86447138adf64a0df0c08ae61250b17190bba30e1fae8c80a816077a6d028e5506f602c382c0197d3080bae131e92e331139d55460989580eeae659 +"available-typed-arrays@npm:^1.0.6, available-typed-arrays@npm:^1.0.7": + version: 1.0.7 + resolution: "available-typed-arrays@npm:1.0.7" + dependencies: + possible-typed-array-names: ^1.0.0 + checksum: 1aa3ffbfe6578276996de660848b6e95669d9a95ad149e3dd0c0cda77db6ee1dbd9d1dd723b65b6d277b882dd0c4b91a654ae9d3cf9e1254b7e93e4908d78fd3 languageName: node linkType: hard @@ -4556,9 +4558,9 @@ __metadata: linkType: hard "birpc@npm:^0.2.14": - version: 0.2.15 - resolution: "birpc@npm:0.2.15" - checksum: 01fe25c0c530e76b691742be243d8cc90361a4d9be520d7da3b9f36213677bf11746aa9f29fd779b83ab1b6641d3d7934fa41e0e6b5487e1e70df0115ed9bea8 + version: 0.2.17 + resolution: "birpc@npm:0.2.17" + checksum: 300fa92714bd62c91070669e9f0389252891c6cf774c1a68fb557736c94a432d8a31e85069bce414f445369518391b1bd83757e27a5e34691089988981ebf2d6 languageName: node linkType: hard @@ -4729,23 +4731,22 @@ __metadata: linkType: hard "c12@npm:^1.5.1, c12@npm:^1.6.1, c12@npm:^1.7.0": - version: 1.8.0 - resolution: "c12@npm:1.8.0" + version: 1.9.0 + resolution: "c12@npm:1.9.0" dependencies: chokidar: ^3.5.3 + confbox: ^0.1.3 defu: ^6.1.4 dotenv: ^16.3.2 giget: ^1.2.1 jiti: ^1.21.0 - json5: ^2.2.3 - jsonc-parser: ^3.2.1 mlly: ^1.5.0 ohash: ^1.1.3 pathe: ^1.1.2 perfect-debounce: ^1.0.0 pkg-types: ^1.0.3 rc9: ^2.1.1 - checksum: 022dc8d06568d0f8046e49e9ae3ff15d711eefa35e1d308402016915e06dfd7af5498a6f9fddded26b8ba955d69bf500f2b794f3265370df82f12de93041515a + checksum: da1d4d822b5663fff8671a8366e5ae4fcb2c21baf41b297984be116ff94208f884677e28c9c284853e7cb5cff92eb3c766cd12c101fdacc7e794e973197aba41 languageName: node linkType: hard @@ -4877,9 +4878,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001406, caniuse-lite@npm:^1.0.30001578, caniuse-lite@npm:^1.0.30001587": - version: 1.0.30001587 - resolution: "caniuse-lite@npm:1.0.30001587" - checksum: fb50aa9beaaae42f9feae92ce038f6ff71e97510f024ef1bef2666f3adcfd36d6c59e5675442e5fe795575193f71bc826cb7721d4b0f6d763e82d193bea57863 + version: 1.0.30001589 + resolution: "caniuse-lite@npm:1.0.30001589" + checksum: 7a6e6c4fb14c2bd0103a8f744bdd8701c1a5f19162f4a7600b89e25bc86d689f82204dc135f3a1dcd1a53050caa04fd0bb39b7df88698a6b90f189ec48900689 languageName: node linkType: hard @@ -5261,6 +5262,13 @@ __metadata: languageName: node linkType: hard +"confbox@npm:^0.1.3": + version: 0.1.3 + resolution: "confbox@npm:0.1.3" + checksum: 78154887c8f53f84bac12bf0bb1bfec75d923165c5ee9e3409c2212efe76752d1b80271ea63be9eebb87a795db0182bd2c409940ef47421d8b37299080786ccc + languageName: node + linkType: hard + "consola@npm:^3.2.3": version: 3.2.3 resolution: "consola@npm:3.2.3" @@ -5742,7 +5750,7 @@ __metadata: languageName: node linkType: hard -"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.2": +"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.2, define-data-property@npm:^1.1.4": version: 1.1.4 resolution: "define-data-property@npm:1.1.4" dependencies: @@ -5825,9 +5833,9 @@ __metadata: linkType: hard "destr@npm:^2.0.0, destr@npm:^2.0.1, destr@npm:^2.0.2": - version: 2.0.2 - resolution: "destr@npm:2.0.2" - checksum: cb63dd477d1c323f95650ce7784f1497466d68150ac0fddd6c99652be45c9dcb997d53fd5eb6c6fda6c0b2a5e5b4fc7fa3c3e18dace3d810ba4cf45d8b55bdd6 + version: 2.0.3 + resolution: "destr@npm:2.0.3" + checksum: 4521b145ba6118919a561f7d979d623793695a516d1b9df704de81932601bf9cf21c47278e1cb93a309c88a14f4fd1f18680bb49ebef8b2546cc7f415e7ae48e languageName: node linkType: hard @@ -5896,10 +5904,10 @@ __metadata: languageName: node linkType: hard -"devtools-protocol@npm:^0.0.1260888": - version: 0.0.1260888 - resolution: "devtools-protocol@npm:0.0.1260888" - checksum: 2db7fae775b74f94f5a93978304acf2f477fb15ef98b3367fd5af40259898c76272ebf20375ab9b234da1109c922bb713fbb89ae7b1a16b6391b357fc01a2504 +"devtools-protocol@npm:^0.0.1262051": + version: 0.0.1262051 + resolution: "devtools-protocol@npm:0.0.1262051" + checksum: beaad00059964a661ab056d5e993492742c612c0370c6f08acd91490181c4d4ecf57d316eedb5a37fb6bb59321901d09ce50762f79ea09a50751d86f601b8f8e languageName: node linkType: hard @@ -6006,9 +6014,9 @@ __metadata: linkType: hard "dotenv@npm:^16.3.1, dotenv@npm:^16.3.2": - version: 16.4.4 - resolution: "dotenv@npm:16.4.4" - checksum: fbe0355972634d8843e1804115885e94d70618cfc975eadca67e26b2d71eb46f0ed45c12c2b88fd88cd6b1476a151471227b13311127a3504d10060cc74ce2f7 + version: 16.4.5 + resolution: "dotenv@npm:16.4.5" + checksum: 301a12c3d44fd49888b74eb9ccf9f07a1f5df43f489e7fcb89647a2edcd84c42d6bc349dc8df099cd18f07c35c7b04685c1a4f3e6a6a9e6b30f8d48c15b7f49c languageName: node linkType: hard @@ -6100,9 +6108,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.4.668": - version: 1.4.672 - resolution: "electron-to-chromium@npm:1.4.672" - checksum: 32dc4f781ca7ea7cd548979a2609451adeee187b368ea5ce151018424359ce89bbbdcb6aea36b4b6d9c13fb82181e0e580800548b8ee22ae4d6fa6f0b3ef56f5 + version: 1.4.679 + resolution: "electron-to-chromium@npm:1.4.679" + checksum: 1884239565cec13308298d08a746a2721ed73f9c0128b7660ef5251404f00b0e1c0fb44afbd73be7d3e9c6bb15c24e7f6374e7148416c127140be9ec86cd9f6f languageName: node linkType: hard @@ -6295,13 +6303,13 @@ __metadata: linkType: hard "es-set-tostringtag@npm:^2.0.2": - version: 2.0.2 - resolution: "es-set-tostringtag@npm:2.0.2" + version: 2.0.3 + resolution: "es-set-tostringtag@npm:2.0.3" dependencies: - get-intrinsic: ^1.2.2 - has-tostringtag: ^1.0.0 - hasown: ^2.0.0 - checksum: afcec3a4c9890ae14d7ec606204858441c801ff84f312538e1d1ccf1e5493c8b17bd672235df785f803756472cb4f2d49b87bde5237aef33411e74c22f194e07 + get-intrinsic: ^1.2.4 + has-tostringtag: ^1.0.2 + hasown: ^2.0.1 + checksum: 7227fa48a41c0ce83e0377b11130d324ac797390688135b8da5c28994c0165be8b252e15cd1de41e1325e5a5412511586960213e88f9ab4a5e7d028895db5129 languageName: node linkType: hard @@ -6483,32 +6491,32 @@ __metadata: linkType: hard "esbuild@npm:^0.20.0": - version: 0.20.0 - resolution: "esbuild@npm:0.20.0" - dependencies: - "@esbuild/aix-ppc64": 0.20.0 - "@esbuild/android-arm": 0.20.0 - "@esbuild/android-arm64": 0.20.0 - "@esbuild/android-x64": 0.20.0 - "@esbuild/darwin-arm64": 0.20.0 - "@esbuild/darwin-x64": 0.20.0 - "@esbuild/freebsd-arm64": 0.20.0 - "@esbuild/freebsd-x64": 0.20.0 - "@esbuild/linux-arm": 0.20.0 - "@esbuild/linux-arm64": 0.20.0 - "@esbuild/linux-ia32": 0.20.0 - "@esbuild/linux-loong64": 0.20.0 - "@esbuild/linux-mips64el": 0.20.0 - "@esbuild/linux-ppc64": 0.20.0 - "@esbuild/linux-riscv64": 0.20.0 - "@esbuild/linux-s390x": 0.20.0 - "@esbuild/linux-x64": 0.20.0 - "@esbuild/netbsd-x64": 0.20.0 - "@esbuild/openbsd-x64": 0.20.0 - "@esbuild/sunos-x64": 0.20.0 - "@esbuild/win32-arm64": 0.20.0 - "@esbuild/win32-ia32": 0.20.0 - "@esbuild/win32-x64": 0.20.0 + version: 0.20.1 + resolution: "esbuild@npm:0.20.1" + dependencies: + "@esbuild/aix-ppc64": 0.20.1 + "@esbuild/android-arm": 0.20.1 + "@esbuild/android-arm64": 0.20.1 + "@esbuild/android-x64": 0.20.1 + "@esbuild/darwin-arm64": 0.20.1 + "@esbuild/darwin-x64": 0.20.1 + "@esbuild/freebsd-arm64": 0.20.1 + "@esbuild/freebsd-x64": 0.20.1 + "@esbuild/linux-arm": 0.20.1 + "@esbuild/linux-arm64": 0.20.1 + "@esbuild/linux-ia32": 0.20.1 + "@esbuild/linux-loong64": 0.20.1 + "@esbuild/linux-mips64el": 0.20.1 + "@esbuild/linux-ppc64": 0.20.1 + "@esbuild/linux-riscv64": 0.20.1 + "@esbuild/linux-s390x": 0.20.1 + "@esbuild/linux-x64": 0.20.1 + "@esbuild/netbsd-x64": 0.20.1 + "@esbuild/openbsd-x64": 0.20.1 + "@esbuild/sunos-x64": 0.20.1 + "@esbuild/win32-arm64": 0.20.1 + "@esbuild/win32-ia32": 0.20.1 + "@esbuild/win32-x64": 0.20.1 dependenciesMeta: "@esbuild/aix-ppc64": optional: true @@ -6558,7 +6566,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: 501b0f540ab68b3843cb9b1be7efa2d90353c8743e99e84931baa1ef5fe1b87934e29becb23cc635a8af45fab223875efa62200589e18d796f0881a655cb9c07 + checksum: af8b3c79e48d303501cac8551bf1ac5ebf5d86eebf2d1eb9d2a7018f4c5506bb120ed2454a013e3387e499de780a916bbffc9edd4ef132be403cd39771ace045 languageName: node linkType: hard @@ -6973,8 +6981,8 @@ __metadata: linkType: hard "expect-webdriverio@npm:^4.11.2, expect-webdriverio@npm:^4.2.5": - version: 4.11.8 - resolution: "expect-webdriverio@npm:4.11.8" + version: 4.11.9 + resolution: "expect-webdriverio@npm:4.11.9" dependencies: "@vitest/snapshot": ^1.2.2 "@wdio/globals": ^8.29.3 @@ -6990,7 +6998,7 @@ __metadata: optional: true webdriverio: optional: true - checksum: c74450a036d19ef464f85e3bf8f8a8f27a83867d554e2c36ed53b698eaaa1da070137ca2d5bc7c2645cecdcb74267b7a4a7fea17ca625e8606277649871d6489 + checksum: 13331c164cbd6d48cd98c2d1452e1916e8ebf0da09f477adfaf2b578f8e47c7c6425b054a92746b7189bef6d6ef95bc6004bcaf56ecff8e91612caf5bad29f1e languageName: node linkType: hard @@ -7288,9 +7296,9 @@ __metadata: linkType: hard "flatted@npm:^3.2.9": - version: 3.2.9 - resolution: "flatted@npm:3.2.9" - checksum: f14167fbe26a9d20f6fca8d998e8f1f41df72c8e81f9f2c9d61ed2bea058248f5e1cbd05e7f88c0e5087a6a0b822a1e5e2b446e879f3cfbe0b07ba2d7f80b026 + version: 3.3.1 + resolution: "flatted@npm:3.3.1" + checksum: 85ae7181650bb728c221e7644cbc9f4bf28bc556f2fc89bb21266962bdf0ce1029cc7acc44bb646cd469d9baac7c317f64e841c4c4c00516afa97320cdac7f94 languageName: node linkType: hard @@ -7511,20 +7519,20 @@ __metadata: linkType: hard "geckodriver@npm:^4.2.0, geckodriver@npm:^4.3.1": - version: 4.3.2 - resolution: "geckodriver@npm:4.3.2" + version: 4.3.3 + resolution: "geckodriver@npm:4.3.3" dependencies: "@wdio/logger": ^8.28.0 decamelize: ^6.0.0 - http-proxy-agent: ^7.0.0 - https-proxy-agent: ^7.0.2 + http-proxy-agent: ^7.0.2 + https-proxy-agent: ^7.0.4 node-fetch: ^3.3.2 - tar-fs: ^3.0.4 + tar-fs: ^3.0.5 unzipper: ^0.10.14 which: ^4.0.0 bin: geckodriver: bin/geckodriver.js - checksum: 36723da0d8a38cc456f45f44f9e63f177826d73f7b89e1d3cc260b18df454431c010f0a5ee76c9903d9ebb3495c7d871367ddeb212f42f916d4addbc6c1bb1b0 + checksum: 554eb3bf81a7b96b49fa019c15a548d7510d36c6952f1c58ac90336576ecc9d5fb5d229d0d5023d58f80aae7ad7d60df7a05f14c1a97e3bc35d0fce8d683b46f languageName: node linkType: hard @@ -7949,8 +7957,8 @@ __metadata: linkType: hard "h3@npm:^1.10.1, h3@npm:^1.8.2, h3@npm:^1.9.0": - version: 1.10.1 - resolution: "h3@npm:1.10.1" + version: 1.10.2 + resolution: "h3@npm:1.10.2" dependencies: cookie-es: ^1.0.0 defu: ^6.1.4 @@ -7961,7 +7969,7 @@ __metadata: ufo: ^1.3.2 uncrypto: ^0.1.3 unenv: ^1.9.0 - checksum: f2849e08610adc6d65259142336cfee0ad42d6e1342d87f396a6b53a8bb8e9919dac5263e8403d5a1d0b8774150b96f9bf2b3c6c836017ca80152559c0195b80 + checksum: 04f36371cd05fdecc6810ff88e4441ac1f077ea1c90ec66bed5c77ad7cf1ba1b25518f70e5b2501b7f9648d2532870898851a782393d37e329f33e56b395e7cb languageName: node linkType: hard @@ -8004,10 +8012,10 @@ __metadata: languageName: node linkType: hard -"has-proto@npm:^1.0.1": - version: 1.0.1 - resolution: "has-proto@npm:1.0.1" - checksum: febc5b5b531de8022806ad7407935e2135f1cc9e64636c3916c6842bd7995994ca3b29871ecd7954bd35f9e2986c17b3b227880484d22259e2f8e6ce63fd383e +"has-proto@npm:^1.0.1, has-proto@npm:^1.0.3": + version: 1.0.3 + resolution: "has-proto@npm:1.0.3" + checksum: fe7c3d50b33f50f3933a04413ed1f69441d21d2d2944f81036276d30635cad9279f6b43bc8f32036c31ebdfcf6e731150f46c1907ad90c669ffe9b066c3ba5c4 languageName: node linkType: hard @@ -8018,7 +8026,7 @@ __metadata: languageName: node linkType: hard -"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.1": +"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.1, has-tostringtag@npm:^1.0.2": version: 1.0.2 resolution: "has-tostringtag@npm:1.0.2" dependencies: @@ -8125,7 +8133,7 @@ __metadata: languageName: node linkType: hard -"http-proxy-agent@npm:^7.0.0": +"http-proxy-agent@npm:^7.0.0, http-proxy-agent@npm:^7.0.2": version: 7.0.2 resolution: "http-proxy-agent@npm:7.0.2" dependencies: @@ -8162,7 +8170,7 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^7.0.0, https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2": +"https-proxy-agent@npm:^7.0.0, https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2, https-proxy-agent@npm:^7.0.4": version: 7.0.4 resolution: "https-proxy-agent@npm:7.0.4" dependencies: @@ -8670,9 +8678,9 @@ __metadata: linkType: hard "is-negative-zero@npm:^2.0.2": - version: 2.0.2 - resolution: "is-negative-zero@npm:2.0.2" - checksum: f3232194c47a549da60c3d509c9a09be442507616b69454716692e37ae9f37c4dea264fb208ad0c9f3efd15a796a46b79df07c7e53c6227c32170608b809149a + version: 2.0.3 + resolution: "is-negative-zero@npm:2.0.3" + checksum: c1e6b23d2070c0539d7b36022d5a94407132411d01aba39ec549af824231f3804b1aea90b5e4e58e807a65d23ceb538ed6e355ce76b267bdd86edb757ffcbdcd languageName: node linkType: hard @@ -8761,11 +8769,11 @@ __metadata: linkType: hard "is-shared-array-buffer@npm:^1.0.2": - version: 1.0.2 - resolution: "is-shared-array-buffer@npm:1.0.2" + version: 1.0.3 + resolution: "is-shared-array-buffer@npm:1.0.3" dependencies: - call-bind: ^1.0.2 - checksum: 9508929cf14fdc1afc9d61d723c6e8d34f5e117f0bffda4d97e7a5d88c3a8681f633a74f8e3ad1fe92d5113f9b921dc5ca44356492079612f9a247efbce7032a + call-bind: ^1.0.7 + checksum: a4fff602c309e64ccaa83b859255a43bb011145a42d3f56f67d9268b55bc7e6d98a5981a1d834186ad3105d6739d21547083fe7259c76c0468483fc538e716d8 languageName: node linkType: hard @@ -8803,7 +8811,7 @@ __metadata: languageName: node linkType: hard -"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.13, is-typed-array@npm:^1.1.9": +"is-typed-array@npm:^1.1.13": version: 1.1.13 resolution: "is-typed-array@npm:1.1.13" dependencies: @@ -9135,7 +9143,7 @@ __metadata: languageName: node linkType: hard -"jsonc-parser@npm:^3.2.0, jsonc-parser@npm:^3.2.1": +"jsonc-parser@npm:^3.2.0": version: 3.2.1 resolution: "jsonc-parser@npm:3.2.1" checksum: 656d9027b91de98d8ab91b3aa0d0a4cab7dc798a6830845ca664f3e76c82d46b973675bbe9b500fae1de37fd3e81aceacbaa2a57884bf2f8f29192150d2d1ef7 @@ -9292,9 +9300,9 @@ __metadata: linkType: hard "lilconfig@npm:^3.0.0": - version: 3.1.0 - resolution: "lilconfig@npm:3.1.0" - checksum: 114fdf6bfde357ced5e314fe238042f02524191ee2032cf567542f5a13955c3a5fdde7518a86d6b2fcdf0cb99abc52635117077c6f6e9e2e83367513416559fb + version: 3.1.1 + resolution: "lilconfig@npm:3.1.1" + checksum: dc8a4f4afde3f0fac6bd36163cc4777a577a90759b8ef1d0d766b19ccf121f723aa79924f32af5b954f3965268215e046d0f237c41c76e5ef01d4e6d1208a15e languageName: node linkType: hard @@ -9421,13 +9429,13 @@ __metadata: linkType: hard "locate-app@npm:^2.1.0": - version: 2.2.18 - resolution: "locate-app@npm:2.2.18" + version: 2.2.20 + resolution: "locate-app@npm:2.2.20" dependencies: - n12: 1.8.21 + n12: 1.8.23 type-fest: 2.13.0 userhome: 1.0.0 - checksum: bcd5164ff04c7c6135febe6999e4862b1c55242ff04ceae58cab9a621cdbb6bd687be4e9f56839e4827c0cbfa8a9da8eac4a40fc560deae87d1bdce8ccd05dac + checksum: 4cf4106e400c4be024374e76326af5f618841b66f3d2fa6071984c0c4d078fd30f0b4f90bdf4e615dd4a697ad00022532faaeaec4eb7b23afa7fe97a9bd7dc38 languageName: node linkType: hard @@ -10032,14 +10040,14 @@ __metadata: linkType: hard "mlly@npm:^1.2.0, mlly@npm:^1.3.0, mlly@npm:^1.4.2, mlly@npm:^1.5.0": - version: 1.5.0 - resolution: "mlly@npm:1.5.0" + version: 1.6.0 + resolution: "mlly@npm:1.6.0" dependencies: acorn: ^8.11.3 pathe: ^1.1.2 pkg-types: ^1.0.3 ufo: ^1.3.2 - checksum: 82fda663265628ee83a31e99950553371f42f6995838795d44320c78497bf17ab04d1f26c49998944178e4e2416f6f0a580bbca3e272114ee597ae9f3c128b47 + checksum: e624c6f0dc224b5d1bbb955746e4f3694a9c584a31ca306b6b6b2bd6b739a6878a2b6b81eb49f3bda562c239777cd67c8340eb5231bd9c04755ac20766013b46 languageName: node linkType: hard @@ -10130,10 +10138,10 @@ __metadata: languageName: node linkType: hard -"n12@npm:1.8.21": - version: 1.8.21 - resolution: "n12@npm:1.8.21" - checksum: edd51fdb8b67ee37d9331b4cd8100936c69248986f780e4265d20d4b8c64b1cb4f9f011f3f84032cb53edb1c745c9f59075d080ee07864d0ee9d58397145f5b5 +"n12@npm:1.8.23": + version: 1.8.23 + resolution: "n12@npm:1.8.23" + checksum: 90423515c29aea16d7d7f55c624c33e1ddae8f3ecee57045233f58f50fea7e3bbcd697312a714a73016dccd3a9e8ee8a1c1e5fe28e6379c7a95144a385957c05 languageName: node linkType: hard @@ -11465,6 +11473,13 @@ __metadata: languageName: node linkType: hard +"possible-typed-array-names@npm:^1.0.0": + version: 1.0.0 + resolution: "possible-typed-array-names@npm:1.0.0" + checksum: b32d403ece71e042385cc7856385cecf1cd8e144fa74d2f1de40d1e16035dba097bc189715925e79b67bdd1472796ff168d3a90d296356c9c94d272d5b95f3ae + languageName: node + linkType: hard + "postcss-calc@npm:^9.0.1": version: 9.0.1 resolution: "postcss-calc@npm:9.0.1" @@ -12526,22 +12541,22 @@ __metadata: linkType: hard "rollup@npm:^4.2.0, rollup@npm:^4.6.0": - version: 4.11.0 - resolution: "rollup@npm:4.11.0" - dependencies: - "@rollup/rollup-android-arm-eabi": 4.11.0 - "@rollup/rollup-android-arm64": 4.11.0 - "@rollup/rollup-darwin-arm64": 4.11.0 - "@rollup/rollup-darwin-x64": 4.11.0 - "@rollup/rollup-linux-arm-gnueabihf": 4.11.0 - "@rollup/rollup-linux-arm64-gnu": 4.11.0 - "@rollup/rollup-linux-arm64-musl": 4.11.0 - "@rollup/rollup-linux-riscv64-gnu": 4.11.0 - "@rollup/rollup-linux-x64-gnu": 4.11.0 - "@rollup/rollup-linux-x64-musl": 4.11.0 - "@rollup/rollup-win32-arm64-msvc": 4.11.0 - "@rollup/rollup-win32-ia32-msvc": 4.11.0 - "@rollup/rollup-win32-x64-msvc": 4.11.0 + version: 4.12.0 + resolution: "rollup@npm:4.12.0" + dependencies: + "@rollup/rollup-android-arm-eabi": 4.12.0 + "@rollup/rollup-android-arm64": 4.12.0 + "@rollup/rollup-darwin-arm64": 4.12.0 + "@rollup/rollup-darwin-x64": 4.12.0 + "@rollup/rollup-linux-arm-gnueabihf": 4.12.0 + "@rollup/rollup-linux-arm64-gnu": 4.12.0 + "@rollup/rollup-linux-arm64-musl": 4.12.0 + "@rollup/rollup-linux-riscv64-gnu": 4.12.0 + "@rollup/rollup-linux-x64-gnu": 4.12.0 + "@rollup/rollup-linux-x64-musl": 4.12.0 + "@rollup/rollup-win32-arm64-msvc": 4.12.0 + "@rollup/rollup-win32-ia32-msvc": 4.12.0 + "@rollup/rollup-win32-x64-msvc": 4.12.0 "@types/estree": 1.0.5 fsevents: ~2.3.2 dependenciesMeta: @@ -12575,7 +12590,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: 6a51be8e4e432fcc56d816f04ef48677554ebbfd9be6b051c6a2f1aabeeb73cce4518e3c6e7b682e5533e33b8bb0d93d9462052d341e6a4c81bfcdb9e61eb2f8 + checksum: a7398f072cf50804e9bdaf363792d0b7801800640434e7867c10b4e2e7be421ca2dc614ae0fc7392044eaf77d5c3a66f76a6fa2246bef97a7bc55926a8d60982 languageName: node linkType: hard @@ -12858,13 +12873,14 @@ __metadata: linkType: hard "set-function-name@npm:^2.0.0, set-function-name@npm:^2.0.1": - version: 2.0.1 - resolution: "set-function-name@npm:2.0.1" + version: 2.0.2 + resolution: "set-function-name@npm:2.0.2" dependencies: - define-data-property: ^1.0.1 + define-data-property: ^1.1.4 + es-errors: ^1.3.0 functions-have-names: ^1.2.3 - has-property-descriptors: ^1.0.0 - checksum: 4975d17d90c40168eee2c7c9c59d023429f0a1690a89d75656306481ece0c3c1fb1ebcc0150ea546d1913e35fbd037bace91372c69e543e51fc5d1f31a9fa126 + has-property-descriptors: ^1.0.2 + checksum: d6229a71527fd0404399fc6227e0ff0652800362510822a291925c9d7b48a1ca1a468b11b281471c34cd5a2da0db4f5d7ff315a61d26655e77f6e971e6d0c80f languageName: node linkType: hard @@ -13181,8 +13197,8 @@ __metadata: linkType: hard "streamx@npm:^2.13.0, streamx@npm:^2.15.0": - version: 2.15.8 - resolution: "streamx@npm:2.15.8" + version: 2.16.1 + resolution: "streamx@npm:2.16.1" dependencies: bare-events: ^2.2.0 fast-fifo: ^1.1.0 @@ -13190,7 +13206,7 @@ __metadata: dependenciesMeta: bare-events: optional: true - checksum: 3068407bb3a856e247dbb32a68d0830170f8c014b8c5123b11c5ee9e4a75905ff80d5b676283bcae2f48d8de61464a71d851e080b5288d18fc3ee94b3ff474e8 + checksum: 6bbb4c38c0ab6ddbe0857d55e72f71288f308f2a9f4413b7b07391cdf9f94232ffc2bbe40a1212d2e09634ecdbd5052b444c73cc8d67ae1c97e2b7e553dad559 languageName: node linkType: hard @@ -13540,7 +13556,7 @@ __metadata: languageName: node linkType: hard -"tar-fs@npm:^3.0.4": +"tar-fs@npm:^3.0.5": version: 3.0.5 resolution: "tar-fs@npm:3.0.5" dependencies: @@ -13602,8 +13618,8 @@ __metadata: linkType: hard "terser@npm:^5.17.4": - version: 5.27.1 - resolution: "terser@npm:5.27.1" + version: 5.27.2 + resolution: "terser@npm:5.27.2" dependencies: "@jridgewell/source-map": ^0.3.3 acorn: ^8.8.2 @@ -13611,7 +13627,7 @@ __metadata: source-map-support: ~0.5.20 bin: terser: bin/terser - checksum: 6b917f9ddeff3264882988ed48a23652a2dbfce67df703ca92a35cedd7ef45a9ad3db2a68f383da745dde529053385048c7d347ab46837ac43d01ed9bbe09a40 + checksum: 0da083942b10e79b2ed20947c8ebb8dbef729096afdcb82b2f0d730801fb416fd6b1fb4a2869b39679b06cb9b5f27be6d3ffac0c77f329822bd9a4e72016660a languageName: node linkType: hard @@ -13867,56 +13883,61 @@ __metadata: linkType: hard "type-fest@npm:^4.2.0": - version: 4.10.2 - resolution: "type-fest@npm:4.10.2" - checksum: ef75736d51c10a885f955c07aed8f46103a8c9ae93742a75fbbdf023dd0e7169c524ebef292f37de19806051fb1bdd96c4098a0101c5f869f80db73bcb484bb1 + version: 4.10.3 + resolution: "type-fest@npm:4.10.3" + checksum: 37d265d584a6587253fe4ab2ed25ef787bb0650fe1924319f68ac3197bfaf3142b304a72d6499d61b60c38c9aba7e1e8f5e940df0898c974a8e6c4a37339b64e languageName: node linkType: hard "typed-array-buffer@npm:^1.0.1": - version: 1.0.1 - resolution: "typed-array-buffer@npm:1.0.1" + version: 1.0.2 + resolution: "typed-array-buffer@npm:1.0.2" dependencies: - call-bind: ^1.0.6 + call-bind: ^1.0.7 es-errors: ^1.3.0 is-typed-array: ^1.1.13 - checksum: 1d65e46b2b9b7ec2a30df39b9ddf32e55ad08d6119aec33975506a3dba56057796bdc3c64dbeb7fdb61bf340a75e279dfd55b48ce8f3b874f01731e1da6833d2 + checksum: 02ffc185d29c6df07968272b15d5319a1610817916ec8d4cd670ded5d1efe72901541ff2202fcc622730d8a549c76e198a2f74e312eabbfb712ed907d45cbb0b languageName: node linkType: hard "typed-array-byte-length@npm:^1.0.0": - version: 1.0.0 - resolution: "typed-array-byte-length@npm:1.0.0" + version: 1.0.1 + resolution: "typed-array-byte-length@npm:1.0.1" dependencies: - call-bind: ^1.0.2 + call-bind: ^1.0.7 for-each: ^0.3.3 - has-proto: ^1.0.1 - is-typed-array: ^1.1.10 - checksum: b03db16458322b263d87a702ff25388293f1356326c8a678d7515767ef563ef80e1e67ce648b821ec13178dd628eb2afdc19f97001ceae7a31acf674c849af94 + gopd: ^1.0.1 + has-proto: ^1.0.3 + is-typed-array: ^1.1.13 + checksum: f65e5ecd1cf76b1a2d0d6f631f3ea3cdb5e08da106c6703ffe687d583e49954d570cc80434816d3746e18be889ffe53c58bf3e538081ea4077c26a41055b216d languageName: node linkType: hard "typed-array-byte-offset@npm:^1.0.0": - version: 1.0.0 - resolution: "typed-array-byte-offset@npm:1.0.0" + version: 1.0.2 + resolution: "typed-array-byte-offset@npm:1.0.2" dependencies: - available-typed-arrays: ^1.0.5 - call-bind: ^1.0.2 + available-typed-arrays: ^1.0.7 + call-bind: ^1.0.7 for-each: ^0.3.3 - has-proto: ^1.0.1 - is-typed-array: ^1.1.10 - checksum: 04f6f02d0e9a948a95fbfe0d5a70b002191fae0b8fe0fe3130a9b2336f043daf7a3dda56a31333c35a067a97e13f539949ab261ca0f3692c41603a46a94e960b + gopd: ^1.0.1 + has-proto: ^1.0.3 + is-typed-array: ^1.1.13 + checksum: c8645c8794a621a0adcc142e0e2c57b1823bbfa4d590ad2c76b266aa3823895cf7afb9a893bf6685e18454ab1b0241e1a8d885a2d1340948efa4b56add4b5f67 languageName: node linkType: hard "typed-array-length@npm:^1.0.4": - version: 1.0.4 - resolution: "typed-array-length@npm:1.0.4" + version: 1.0.5 + resolution: "typed-array-length@npm:1.0.5" dependencies: - call-bind: ^1.0.2 + call-bind: ^1.0.7 for-each: ^0.3.3 - is-typed-array: ^1.1.9 - checksum: 2228febc93c7feff142b8c96a58d4a0d7623ecde6c7a24b2b98eb3170e99f7c7eff8c114f9b283085cd59dcd2bd43aadf20e25bba4b034a53c5bb292f71f8956 + gopd: ^1.0.1 + has-proto: ^1.0.3 + is-typed-array: ^1.1.13 + possible-typed-array-names: ^1.0.0 + checksum: 82f5b666155cff1b345a1f3ab018d3f7667990f525435e4c8448cc094ab0f8ea283bb7cbde4d7bc82ea0b9b1072523bf31e86620d72615951d7fa9ccb4f42dfa languageName: node linkType: hard @@ -13948,9 +13969,9 @@ __metadata: linkType: hard "ultrahtml@npm:^1.5.2": - version: 1.5.2 - resolution: "ultrahtml@npm:1.5.2" - checksum: f3df055d684a9ef4b62765faa1973b93fa0d45cc0cb3b642bf3c60d5bda1ad34b6fedfb686dad4c21c9109d799e1da9f50f31170b9b92330409530c3162e31f3 + version: 1.5.3 + resolution: "ultrahtml@npm:1.5.3" + checksum: eff871bb116c28f972b4a229b4d177caa1102690bd7448b2e133a9ec0cbeb8bfdfb98ccf692bf9b5d7dff0a5819c1a36c59485592c93fac9253fe5e6814d7dbb languageName: node linkType: hard @@ -14346,8 +14367,8 @@ __metadata: linkType: soft "vite-node@npm:^1.2.2": - version: 1.2.2 - resolution: "vite-node@npm:1.2.2" + version: 1.3.1 + resolution: "vite-node@npm:1.3.1" dependencies: cac: ^6.7.14 debug: ^4.3.4 @@ -14356,7 +14377,7 @@ __metadata: vite: ^5.0.0 bin: vite-node: vite-node.mjs - checksum: 559740675bfbba36e1a1c6a52805fca12bfc3e955cc13b5984c7de4cd452276497fd3873ed45e786d4ece4e2a186b0757b9ebb0f58f14ef1acdafacc2cccfbd5 + checksum: 62a0bd2cdb70160b5107011d10f60d76e8ede6dbad1dcac99d57e4b4c0b21683e40a7e6088b7e221a4db0b70fb83ace8e13a0f1c5bf1c0d38e2bf9c0bab17b17 languageName: node linkType: hard @@ -14532,8 +14553,8 @@ __metadata: linkType: hard "vite@npm:^5.0.0": - version: 5.1.3 - resolution: "vite@npm:5.1.3" + version: 5.1.4 + resolution: "vite@npm:5.1.4" dependencies: esbuild: ^0.19.3 fsevents: ~2.3.3 @@ -14567,7 +14588,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 827d67c5b951f0eab9d0293f30a6d60274da914d7548f4220021a596873c8a8891fe8d9418fac52486b8808a57cab8ee61ffe048520cce11b680eae4ed72bffa + checksum: fb8b944c69fd738b412ad10471f01db01ed59b5d7fdf182b836b420b221a8bd5ada74d225a87aaa80cf8d2b693cc4a89ab7c291254a8b4e6faefd93843ebb9d3 languageName: node linkType: hard @@ -14647,7 +14668,7 @@ __metadata: languageName: node linkType: hard -"vue-router@npm:4.2.5, vue-router@npm:^4.2.5": +"vue-router@npm:4.2.5": version: 4.2.5 resolution: "vue-router@npm:4.2.5" dependencies: @@ -14658,6 +14679,17 @@ __metadata: languageName: node linkType: hard +"vue-router@npm:^4.2.5": + version: 4.3.0 + resolution: "vue-router@npm:4.3.0" + dependencies: + "@vue/devtools-api": ^6.5.1 + peerDependencies: + vue: ^3.2.0 + checksum: 0059261d39c8a6f61d3cdf4b74cfcd6a109062e0562f2db5a387cdf4d1b186dfdd2dddcacbf83ce2842d7c3ec9a63d8a6d427c4cec1db61372f4a06048496354 + languageName: node + linkType: hard + "vue@npm:3.4.10": version: 3.4.10 resolution: "vue@npm:3.4.10" @@ -14734,9 +14766,9 @@ __metadata: linkType: hard "web-streams-polyfill@npm:^3.0.3": - version: 3.3.2 - resolution: "web-streams-polyfill@npm:3.3.2" - checksum: 0292f4113c1bda40d8e8ecebee39eb14cc2e2e560a65a6867980e394537a2645130e2c73f5ef6e641fd3697d2f71720ccf659aebaf69a9d5a773f653a0fdf39d + version: 3.3.3 + resolution: "web-streams-polyfill@npm:3.3.3" + checksum: 21ab5ea08a730a2ef8023736afe16713b4f2023ec1c7085c16c8e293ee17ed085dff63a0ad8722da30c99c4ccbd4ccd1b2e79c861829f7ef2963d7de7004c2cb languageName: node linkType: hard @@ -14778,22 +14810,22 @@ __metadata: languageName: node linkType: hard -"webdriver@npm:8.32.0": - version: 8.32.0 - resolution: "webdriver@npm:8.32.0" +"webdriver@npm:8.32.3": + version: 8.32.3 + resolution: "webdriver@npm:8.32.3" dependencies: "@types/node": ^20.1.0 "@types/ws": ^8.5.3 - "@wdio/config": 8.31.1 + "@wdio/config": 8.32.3 "@wdio/logger": 8.28.0 "@wdio/protocols": 8.32.0 - "@wdio/types": 8.31.1 - "@wdio/utils": 8.31.1 + "@wdio/types": 8.32.2 + "@wdio/utils": 8.32.3 deepmerge-ts: ^5.1.0 got: ^12.6.1 ky: ^0.33.0 ws: ^8.8.0 - checksum: 20b2fedd8a1d5133ae61de3e65c1fba9e9bc2d71cc3d7507d974567967c71d980bdfc1776877a3413f9d3d554ff93b950ae9b01674222de6bfd67d92493fbf39 + checksum: f50325361eaa734c362aacea6d234b6c8a6ff99297c5ad34ed76f0421d3956ec71867163390a5ccca0f66bf400088dc850b1e2c87412193f133cdecddde771a5 languageName: node linkType: hard @@ -14871,22 +14903,22 @@ __metadata: languageName: node linkType: hard -"webdriverio@npm:8.32.1, webdriverio@npm:^8.29.3": - version: 8.32.1 - resolution: "webdriverio@npm:8.32.1" +"webdriverio@npm:8.32.3, webdriverio@npm:^8.29.3": + version: 8.32.3 + resolution: "webdriverio@npm:8.32.3" dependencies: "@types/node": ^20.1.0 - "@wdio/config": 8.31.1 + "@wdio/config": 8.32.3 "@wdio/logger": 8.28.0 "@wdio/protocols": 8.32.0 "@wdio/repl": 8.24.12 - "@wdio/types": 8.31.1 - "@wdio/utils": 8.31.1 + "@wdio/types": 8.32.2 + "@wdio/utils": 8.32.3 archiver: ^6.0.0 aria-query: ^5.0.0 css-shorthand-properties: ^1.1.1 css-value: ^0.0.1 - devtools-protocol: ^0.0.1260888 + devtools-protocol: ^0.0.1262051 grapheme-splitter: ^1.0.2 import-meta-resolve: ^4.0.0 is-plain-obj: ^4.1.0 @@ -14898,13 +14930,13 @@ __metadata: resq: ^1.9.1 rgb2hex: 0.2.5 serialize-error: ^11.0.1 - webdriver: 8.32.0 + webdriver: 8.32.3 peerDependencies: devtools: ^8.14.0 peerDependenciesMeta: devtools: optional: true - checksum: 38fb9033e32c6cd40fcf3fb10535997149cc4226e103fc415c13ece5fc4d19f557b3dc13155e748563e2fe3d570b6252563650b4119e446e1841fd6be90de763 + checksum: 8964c0c8a06ae932b3521dce609b3493b4a6b35c432c836c031700aa53dfbbc007accfc0e264a0faf7e48ff2ad037bcd58bd00d22529b947da38e6016d26375e languageName: node linkType: hard From 0e659f58afbeb489d336e7809b0e4e81843d3c29 Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Thu, 22 Feb 2024 16:29:44 +0000 Subject: [PATCH 02/14] chore: DSW-0 fix types --- nextjs-app/src/layout/navigation.tsx | 8 +++++++- nextjs-app/src/pages/_document.tsx | 1 - test/playwright/page-objects/form.page.ts | 2 +- webdriver-helpers/configuration-helper.js | 8 ++++---- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/nextjs-app/src/layout/navigation.tsx b/nextjs-app/src/layout/navigation.tsx index fb00bfca..bec9c0e3 100644 --- a/nextjs-app/src/layout/navigation.tsx +++ b/nextjs-app/src/layout/navigation.tsx @@ -2,8 +2,14 @@ import { PieDivider } from "@justeattakeaway/pie-divider/dist/react" import { PieLink } from "@justeattakeaway/pie-link/dist/react"; import { useRouter } from "next/router"; import Head from 'next/head'; +import { type ReactNode } from "react"; -export default function NavigationLayout({ children, title = '' }) { +interface NavigationLayoutProps { + children: ReactNode; + title: string; +} + +export default function NavigationLayout({ children, title }: NavigationLayoutProps) { const router = useRouter(); const isHomePage = router.pathname === '/'; diff --git a/nextjs-app/src/pages/_document.tsx b/nextjs-app/src/pages/_document.tsx index 7d108086..6d41fdfe 100644 --- a/nextjs-app/src/pages/_document.tsx +++ b/nextjs-app/src/pages/_document.tsx @@ -1,7 +1,6 @@ import { Html, Head, Main, NextScript } from 'next/document' export default function Document() { - return ( diff --git a/test/playwright/page-objects/form.page.ts b/test/playwright/page-objects/form.page.ts index 7bf463c4..74af2124 100644 --- a/test/playwright/page-objects/form.page.ts +++ b/test/playwright/page-objects/form.page.ts @@ -27,7 +27,7 @@ export class FormPage { } async goto() { - const url = process.env.APP_NAME === 'vanilla-app' ? 'integrations/form.html' : '/form'; + const url = process.env.APP_NAME === 'Vanilla' ? 'integrations/form.html' : '/form'; await this.page.goto(url); } diff --git a/webdriver-helpers/configuration-helper.js b/webdriver-helpers/configuration-helper.js index afc0d21e..7601f81c 100644 --- a/webdriver-helpers/configuration-helper.js +++ b/webdriver-helpers/configuration-helper.js @@ -5,20 +5,20 @@ exports.getAppConfig = (appName) => { const config = {}; switch (appName) { - case 'vanilla-app': + case 'Vanilla': config.amplifyId = VANILLA_AMPLIFY_ID; config.port = '3001'; break; - case 'nextjs-app': + case 'NextJS': config.amplifyId = NEXT_AMPLIFY_ID; config.port = '3000'; break; - case 'nuxt-app': + case 'Nuxt': config.amplifyId = NUXT_AMPLIFY_ID; config.port = '3002'; break; default: - throw new Error(`appName: '${appName}' is invalid. Please use either 'vanilla-app', 'nextjs-app' or 'nuxt-app'.`); + throw new Error(`appName: '${appName}' is invalid. Please use either 'Vanilla', 'NextJS' or 'Nuxt'.`); } return config; } From ea3f376ff58029e1cb20b677e5ca3730c4a39a21 Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Thu, 22 Feb 2024 16:55:09 +0000 Subject: [PATCH 03/14] chore: DSW-0 fix test --- playwright-helpers/configuration-helper.js | 8 ++++---- test/visual/component-pages.spec.js | 2 +- vanilla-app/wdio.conf.js | 2 -- webdriver-helpers/configuration-helper.js | 6 +++--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/playwright-helpers/configuration-helper.js b/playwright-helpers/configuration-helper.js index edf5df70..286502c8 100644 --- a/playwright-helpers/configuration-helper.js +++ b/playwright-helpers/configuration-helper.js @@ -4,20 +4,20 @@ export function getAppConfig(appName) { const config = {}; switch (appName) { - case 'Vanilla': + case 'vanilla-app': config.amplifyId = VANILLA_AMPLIFY_ID; config.port = '3001'; break; - case 'NextJS': + case 'nextjs-app': config.amplifyId = NEXT_AMPLIFY_ID; config.port = '3000'; break; - case 'Nuxt': + case 'nuxt-app': config.amplifyId = NUXT_AMPLIFY_ID; config.port = '3002'; break; default: - throw new Error(`appName: '${appName}' is invalid. Please use either 'Vanilla', 'NextJS' or 'Nuxt'.`); + throw new Error(`appName: '${appName}' is invalid. Please use either 'vanilla-app', 'nextjs-app' or 'nuxt-app'.`); } return config; } diff --git a/test/visual/component-pages.spec.js b/test/visual/component-pages.spec.js index 0824e020..c22c319e 100644 --- a/test/visual/component-pages.spec.js +++ b/test/visual/component-pages.spec.js @@ -26,7 +26,7 @@ describe(`${APP_NAME} Aperture App`, () => { it(`should navigate to the ${appName} ${page.name} page.`, async () => { await browser.url(page.url); await waitUntilPageLoad(); - await expect(await browser.getTitle()).toBe(`PIE Aperture | ${APP_NAME} | ${page.name}`); + await expect(await browser.getTitle()).toContain(page.name); await percyScreenshot(page.title); });p diff --git a/vanilla-app/wdio.conf.js b/vanilla-app/wdio.conf.js index 6a217ca4..b75cf03e 100644 --- a/vanilla-app/wdio.conf.js +++ b/vanilla-app/wdio.conf.js @@ -2,8 +2,6 @@ import merge from 'deepmerge'; import sharedConf from '../wdio.conf.js'; import { getEnvironmentBaseUrl } from '../webdriver-helpers/configuration-helper.js'; -process.env.APP_NAME = 'Vanilla'; - exports.config = merge(sharedConf.config, { baseUrl: getEnvironmentBaseUrl(process.env.APP_NAME), diff --git a/webdriver-helpers/configuration-helper.js b/webdriver-helpers/configuration-helper.js index 7601f81c..534cb967 100644 --- a/webdriver-helpers/configuration-helper.js +++ b/webdriver-helpers/configuration-helper.js @@ -5,15 +5,15 @@ exports.getAppConfig = (appName) => { const config = {}; switch (appName) { - case 'Vanilla': + case 'vanilla-app': config.amplifyId = VANILLA_AMPLIFY_ID; config.port = '3001'; break; - case 'NextJS': + case 'nextjs-app': config.amplifyId = NEXT_AMPLIFY_ID; config.port = '3000'; break; - case 'Nuxt': + case 'nuxt-app': config.amplifyId = NUXT_AMPLIFY_ID; config.port = '3002'; break; From cbbb24dd151bb42ba5dbd4d3c222f9dc30fd659a Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Thu, 22 Feb 2024 17:09:45 +0000 Subject: [PATCH 04/14] chore: DSW-0 fix vars --- nextjs-app/wdio.conf.js | 4 +--- nuxt-app/wdio.conf.js | 4 +--- test/playwright/page-objects/form.page.ts | 7 +++++-- vanilla-app/wdio.conf.js | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/nextjs-app/wdio.conf.js b/nextjs-app/wdio.conf.js index 8ba694ea..c1be3884 100644 --- a/nextjs-app/wdio.conf.js +++ b/nextjs-app/wdio.conf.js @@ -2,11 +2,9 @@ const merge = require('deepmerge'); const sharedConf = require('../wdio.conf.js'); const { getEnvironmentBaseUrl } = require('../webdriver-helpers/configuration-helper.js'); -process.env.APP_NAME = 'NextJS'; - exports.config = merge(sharedConf.config, { - baseUrl: getEnvironmentBaseUrl(process.env.APP_NAME), + baseUrl: getEnvironmentBaseUrl('nextjs-app'), specs: [ '../test/visual/*.js' diff --git a/nuxt-app/wdio.conf.js b/nuxt-app/wdio.conf.js index 7369cef8..368fedbf 100644 --- a/nuxt-app/wdio.conf.js +++ b/nuxt-app/wdio.conf.js @@ -2,11 +2,9 @@ const merge = require('deepmerge'); const sharedConf = require('../wdio.conf.js'); const { getEnvironmentBaseUrl } = require('../webdriver-helpers/configuration-helper.js'); -process.env.APP_NAME = 'Nuxt'; - exports.config = merge(sharedConf.config, { - baseUrl: getEnvironmentBaseUrl(process.env.APP_NAME), + baseUrl: getEnvironmentBaseUrl('nuxt-app'), specs: [ '../test/visual/*.js' diff --git a/test/playwright/page-objects/form.page.ts b/test/playwright/page-objects/form.page.ts index 74af2124..2979b4e0 100644 --- a/test/playwright/page-objects/form.page.ts +++ b/test/playwright/page-objects/form.page.ts @@ -1,4 +1,5 @@ import { type Locator, type Page } from '@playwright/test'; +const { APP_NAME } = process.env; export class FormPage { readonly page: Page; @@ -27,8 +28,10 @@ export class FormPage { } async goto() { - const url = process.env.APP_NAME === 'Vanilla' ? 'integrations/form.html' : '/form'; - await this.page.goto(url); + + let url = 'integrations/form'; + const formattedUrl = APP_NAME === 'vanilla-app' ? `${url}.html` : url; + await this.page.goto(formattedUrl); } async fillForm(formData: any) { diff --git a/vanilla-app/wdio.conf.js b/vanilla-app/wdio.conf.js index b75cf03e..fed86e83 100644 --- a/vanilla-app/wdio.conf.js +++ b/vanilla-app/wdio.conf.js @@ -4,7 +4,7 @@ import { getEnvironmentBaseUrl } from '../webdriver-helpers/configuration-helper exports.config = merge(sharedConf.config, { - baseUrl: getEnvironmentBaseUrl(process.env.APP_NAME), + baseUrl: getEnvironmentBaseUrl('vanilla-app'), specs: [ '../test/visual/*.js' From d7761e042bd693b8fda5f0a7b03787f9b77c2d66 Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Thu, 22 Feb 2024 17:15:02 +0000 Subject: [PATCH 05/14] chore: DSW-0 fix config --- vanilla-app/wdio.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vanilla-app/wdio.conf.js b/vanilla-app/wdio.conf.js index fed86e83..cc266608 100644 --- a/vanilla-app/wdio.conf.js +++ b/vanilla-app/wdio.conf.js @@ -2,7 +2,7 @@ import merge from 'deepmerge'; import sharedConf from '../wdio.conf.js'; import { getEnvironmentBaseUrl } from '../webdriver-helpers/configuration-helper.js'; -exports.config = merge(sharedConf.config, { +const config = merge(sharedConf.config, { baseUrl: getEnvironmentBaseUrl('vanilla-app'), From 3795e8594ea6888ae507a12fdcca8732ed74795c Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Fri, 23 Feb 2024 12:03:09 +0000 Subject: [PATCH 06/14] chore: DSW-0 fix tests --- .../test/visual/nextjs.spec.js | 8 ++--- nextjs-app/wdio.conf.js | 2 +- nuxt-app/test/visual/nuxt.spec.js | 31 ++++++++++++++++++ nuxt-app/wdio.conf.js | 2 +- vanilla-app/test/visual/vanilla.spec.js | 32 +++++++++++++++++++ webdriver-helpers/configuration-helper.js | 2 +- 6 files changed, 69 insertions(+), 8 deletions(-) rename test/visual/component-pages.spec.js => nextjs-app/test/visual/nextjs.spec.js (89%) create mode 100644 nuxt-app/test/visual/nuxt.spec.js create mode 100644 vanilla-app/test/visual/vanilla.spec.js diff --git a/test/visual/component-pages.spec.js b/nextjs-app/test/visual/nextjs.spec.js similarity index 89% rename from test/visual/component-pages.spec.js rename to nextjs-app/test/visual/nextjs.spec.js index c22c319e..dcdb17a5 100644 --- a/test/visual/component-pages.spec.js +++ b/nextjs-app/test/visual/nextjs.spec.js @@ -1,9 +1,7 @@ - import { waitUntilPageLoad } from '../../../webdriver-helpers/wait-helper.js'; import { percyScreenshot } from '@percy/selenium-webdriver'; -const { APP_NAME } = process.env; -describe(`${APP_NAME} Aperture App`, () => { +describe('NextJS Aperture App', () => { const pages = [ { url: '/index.html', name: 'PIE Aperture' }, { url: '/integrations/icons.html', name: 'Icons' }, @@ -23,12 +21,12 @@ describe(`${APP_NAME} Aperture App`, () => { ]; pages.forEach((page) => { - it(`should navigate to the ${appName} ${page.name} page.`, async () => { + it(`should navigate to the ${page.name} page.`, async () => { await browser.url(page.url); await waitUntilPageLoad(); await expect(await browser.getTitle()).toContain(page.name); await percyScreenshot(page.title); });p - + }); }); diff --git a/nextjs-app/wdio.conf.js b/nextjs-app/wdio.conf.js index c1be3884..ef895a00 100644 --- a/nextjs-app/wdio.conf.js +++ b/nextjs-app/wdio.conf.js @@ -7,6 +7,6 @@ exports.config = merge(sharedConf.config, { baseUrl: getEnvironmentBaseUrl('nextjs-app'), specs: [ - '../test/visual/*.js' + './test/visual/*.js' ] }); \ No newline at end of file diff --git a/nuxt-app/test/visual/nuxt.spec.js b/nuxt-app/test/visual/nuxt.spec.js new file mode 100644 index 00000000..027b6771 --- /dev/null +++ b/nuxt-app/test/visual/nuxt.spec.js @@ -0,0 +1,31 @@ +import { waitUntilPageLoad } from '../../../webdriver-helpers/wait-helper.js'; +import { percyScreenshot } from '@percy/selenium-webdriver'; + +describe('Nuxt Aperture App', () => { + const pages = [ + { url: '/index.html', name: 'PIE Aperture' }, + { url: '/integrations/icons.html', name: 'Icons' }, + { url: '/integrations/form.html', name: 'Form' }, + { url: '/components/assistive-text.html', name: 'Assistive Text' }, + { url: '/components/button.html', name: 'Button' }, + { url: '/components/card.html', name: 'Card' }, + { url: '/components/chip.html', name: 'Chip' }, + { url: '/components/cookie-banner.html', name: 'Cookie Banner' }, + { url: '/components/form-label.html', name: 'Form Label' }, + { url: '/components/icon-button.html', name: 'Icon Button' }, + { url: '/components/link.html', name: 'Link' }, + { url: '/components/modal.html', name: 'Modal' }, + { url: '/components/spinner.html', name: 'Spinner' }, + { url: '/components/switch.html', name: 'Switch' }, + { url: '/components/tag.html', name: 'Tag' }, + ]; + + pages.forEach((page) => { + it.skip(`should navigate to the ${page.name} page.`, async () => { + await browser.url(page.url); + await waitUntilPageLoad(); + await expect(await browser.getTitle()).toContain(page.name); + await percyScreenshot(page.title); + }); + }); +}); diff --git a/nuxt-app/wdio.conf.js b/nuxt-app/wdio.conf.js index 368fedbf..48c94e98 100644 --- a/nuxt-app/wdio.conf.js +++ b/nuxt-app/wdio.conf.js @@ -7,6 +7,6 @@ exports.config = merge(sharedConf.config, { baseUrl: getEnvironmentBaseUrl('nuxt-app'), specs: [ - '../test/visual/*.js' + './test/visual/*.js' ], }); diff --git a/vanilla-app/test/visual/vanilla.spec.js b/vanilla-app/test/visual/vanilla.spec.js new file mode 100644 index 00000000..e5bcb1e6 --- /dev/null +++ b/vanilla-app/test/visual/vanilla.spec.js @@ -0,0 +1,32 @@ +import { waitUntilPageLoad } from '../../../webdriver-helpers/wait-helper.js'; +import { percyScreenshot } from '@percy/selenium-webdriver'; + +describe('Vanilla Aperture App', () => { + const pages = [ + { url: '/index.html', name: 'PIE Aperture' }, + { url: '/integrations/icons.html', name: 'Icons' }, + { url: '/integrations/form.html', name: 'Form' }, + { url: '/components/assistive-text.html', name: 'Assistive Text' }, + { url: '/components/button.html', name: 'Button' }, + { url: '/components/card.html', name: 'Card' }, + { url: '/components/chip.html', name: 'Chip' }, + { url: '/components/cookie-banner.html', name: 'Cookie Banner' }, + { url: '/components/form-label.html', name: 'Form Label' }, + { url: '/components/icon-button.html', name: 'Icon Button' }, + { url: '/components/link.html', name: 'Link' }, + { url: '/components/modal.html', name: 'Modal' }, + { url: '/components/spinner.html', name: 'Spinner' }, + { url: '/components/switch.html', name: 'Switch' }, + { url: '/components/tag.html', name: 'Tag' }, + ]; + + pages.forEach((page) => { + it(`should navigate to the ${page.name} page.`, async () => { + await browser.url(page.url); + await waitUntilPageLoad(); + await expect(await browser.getTitle()).toContain(page.name); + await percyScreenshot(page.title); + });p + + }); +}); diff --git a/webdriver-helpers/configuration-helper.js b/webdriver-helpers/configuration-helper.js index 534cb967..afc0d21e 100644 --- a/webdriver-helpers/configuration-helper.js +++ b/webdriver-helpers/configuration-helper.js @@ -18,7 +18,7 @@ exports.getAppConfig = (appName) => { config.port = '3002'; break; default: - throw new Error(`appName: '${appName}' is invalid. Please use either 'Vanilla', 'NextJS' or 'Nuxt'.`); + throw new Error(`appName: '${appName}' is invalid. Please use either 'vanilla-app', 'nextjs-app' or 'nuxt-app'.`); } return config; } From fef88a8defce5892822c302df683ea273730d265 Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Fri, 23 Feb 2024 12:05:02 +0000 Subject: [PATCH 07/14] chore: DSW-0 fix typos --- nextjs-app/test/visual/nextjs.spec.js | 3 +-- vanilla-app/test/visual/vanilla.spec.js | 3 +-- vanilla-app/wdio.conf.js | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/nextjs-app/test/visual/nextjs.spec.js b/nextjs-app/test/visual/nextjs.spec.js index dcdb17a5..b0a1daf7 100644 --- a/nextjs-app/test/visual/nextjs.spec.js +++ b/nextjs-app/test/visual/nextjs.spec.js @@ -26,7 +26,6 @@ describe('NextJS Aperture App', () => { await waitUntilPageLoad(); await expect(await browser.getTitle()).toContain(page.name); await percyScreenshot(page.title); - });p - + }); }); }); diff --git a/vanilla-app/test/visual/vanilla.spec.js b/vanilla-app/test/visual/vanilla.spec.js index e5bcb1e6..1630eacb 100644 --- a/vanilla-app/test/visual/vanilla.spec.js +++ b/vanilla-app/test/visual/vanilla.spec.js @@ -26,7 +26,6 @@ describe('Vanilla Aperture App', () => { await waitUntilPageLoad(); await expect(await browser.getTitle()).toContain(page.name); await percyScreenshot(page.title); - });p - + }); }); }); diff --git a/vanilla-app/wdio.conf.js b/vanilla-app/wdio.conf.js index cc266608..782b9e4f 100644 --- a/vanilla-app/wdio.conf.js +++ b/vanilla-app/wdio.conf.js @@ -7,7 +7,7 @@ const config = merge(sharedConf.config, { baseUrl: getEnvironmentBaseUrl('vanilla-app'), specs: [ - '../test/visual/*.js' + './test/visual/*.js' ], }); From 48c370e1fa849fbdce4ae0c7d84cb198d1796879 Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Fri, 23 Feb 2024 12:23:25 +0000 Subject: [PATCH 08/14] chore: DSW-0 remove imports --- nextjs-app/test/visual/nextjs.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nextjs-app/test/visual/nextjs.spec.js b/nextjs-app/test/visual/nextjs.spec.js index b0a1daf7..55a47980 100644 --- a/nextjs-app/test/visual/nextjs.spec.js +++ b/nextjs-app/test/visual/nextjs.spec.js @@ -1,5 +1,5 @@ -import { waitUntilPageLoad } from '../../../webdriver-helpers/wait-helper.js'; -import { percyScreenshot } from '@percy/selenium-webdriver'; +const { waitUntilPageLoad } = require('../../../webdriver-helpers/wait-helper.js'); +const { percyScreenshot } = require('@percy/selenium-webdriver'); describe('NextJS Aperture App', () => { const pages = [ From 56ed1758664c4cff46dfa7742327b2588bba6b7a Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Fri, 23 Feb 2024 14:36:30 +0000 Subject: [PATCH 09/14] chore: DSW-0 update test screenshot name --- nextjs-app/test/visual/nextjs.spec.js | 2 +- nuxt-app/test/visual/nuxt.spec.js | 2 +- vanilla-app/test/visual/vanilla.spec.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nextjs-app/test/visual/nextjs.spec.js b/nextjs-app/test/visual/nextjs.spec.js index 55a47980..29625789 100644 --- a/nextjs-app/test/visual/nextjs.spec.js +++ b/nextjs-app/test/visual/nextjs.spec.js @@ -25,7 +25,7 @@ describe('NextJS Aperture App', () => { await browser.url(page.url); await waitUntilPageLoad(); await expect(await browser.getTitle()).toContain(page.name); - await percyScreenshot(page.title); + await percyScreenshot(page.name); }); }); }); diff --git a/nuxt-app/test/visual/nuxt.spec.js b/nuxt-app/test/visual/nuxt.spec.js index 027b6771..f744728e 100644 --- a/nuxt-app/test/visual/nuxt.spec.js +++ b/nuxt-app/test/visual/nuxt.spec.js @@ -25,7 +25,7 @@ describe('Nuxt Aperture App', () => { await browser.url(page.url); await waitUntilPageLoad(); await expect(await browser.getTitle()).toContain(page.name); - await percyScreenshot(page.title); + await percyScreenshot(page.name); }); }); }); diff --git a/vanilla-app/test/visual/vanilla.spec.js b/vanilla-app/test/visual/vanilla.spec.js index 1630eacb..2948b1db 100644 --- a/vanilla-app/test/visual/vanilla.spec.js +++ b/vanilla-app/test/visual/vanilla.spec.js @@ -25,7 +25,7 @@ describe('Vanilla Aperture App', () => { await browser.url(page.url); await waitUntilPageLoad(); await expect(await browser.getTitle()).toContain(page.name); - await percyScreenshot(page.title); + await percyScreenshot(page.name); }); }); }); From 01ec337dcd85d4a05856fc6cba1ee1c080a8b372 Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Fri, 23 Feb 2024 15:30:02 +0000 Subject: [PATCH 10/14] chore: DSW-0 fix icon import --- nextjs-app/src/pages/components/button.tsx | 2 +- nextjs-app/src/pages/components/icon-button.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nextjs-app/src/pages/components/button.tsx b/nextjs-app/src/pages/components/button.tsx index 14e8f32e..7fa317fe 100644 --- a/nextjs-app/src/pages/components/button.tsx +++ b/nextjs-app/src/pages/components/button.tsx @@ -1,7 +1,7 @@ import NavigationLayout from "@/layout/navigation"; import { PieButton } from "@justeattakeaway/pie-button/dist/react"; import { PieDivider } from "@justeattakeaway/pie-divider/dist/react"; -import { IconSearch } from "@justeattakeaway/pie-icons-webc/dist/react/IconSearch" +import "@justeattakeaway/pie-icons-webc/dist/react/IconSearch"; import { useState } from "react"; export default function Button() { diff --git a/nextjs-app/src/pages/components/icon-button.tsx b/nextjs-app/src/pages/components/icon-button.tsx index 81e06566..1eb359b0 100644 --- a/nextjs-app/src/pages/components/icon-button.tsx +++ b/nextjs-app/src/pages/components/icon-button.tsx @@ -1,6 +1,6 @@ import NavigationLayout from "@/layout/navigation"; import { PieIconButton } from "@justeattakeaway/pie-icon-button/dist/react" -import { IconClose } from "@justeattakeaway/pie-icons-webc/dist/react/IconClose" +import "@justeattakeaway/pie-icons-webc/dist/react/IconClose"; export default function IconButton() { return ( From 1d728f8281b55acd9d9cc1bebbef6443998fceeb Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Fri, 23 Feb 2024 15:33:57 +0000 Subject: [PATCH 11/14] chore: DSW-0 re-add named import --- nextjs-app/src/pages/components/button.tsx | 2 +- nextjs-app/src/pages/components/icon-button.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nextjs-app/src/pages/components/button.tsx b/nextjs-app/src/pages/components/button.tsx index 7fa317fe..651006b7 100644 --- a/nextjs-app/src/pages/components/button.tsx +++ b/nextjs-app/src/pages/components/button.tsx @@ -1,7 +1,7 @@ import NavigationLayout from "@/layout/navigation"; import { PieButton } from "@justeattakeaway/pie-button/dist/react"; import { PieDivider } from "@justeattakeaway/pie-divider/dist/react"; -import "@justeattakeaway/pie-icons-webc/dist/react/IconSearch"; +import { IconSearch } from "@justeattakeaway/pie-icons-webc/dist/react/IconSearch"; import { useState } from "react"; export default function Button() { diff --git a/nextjs-app/src/pages/components/icon-button.tsx b/nextjs-app/src/pages/components/icon-button.tsx index 1eb359b0..c65555f0 100644 --- a/nextjs-app/src/pages/components/icon-button.tsx +++ b/nextjs-app/src/pages/components/icon-button.tsx @@ -1,6 +1,6 @@ import NavigationLayout from "@/layout/navigation"; import { PieIconButton } from "@justeattakeaway/pie-icon-button/dist/react" -import "@justeattakeaway/pie-icons-webc/dist/react/IconClose"; +import { IconClose } from "@justeattakeaway/pie-icons-webc/dist/react/IconClose"; export default function IconButton() { return ( From 7747e8b86cdb743c2c4231f4fb5ef8488d0b4998 Mon Sep 17 00:00:00 2001 From: Ben Siggery <14013357+siggerzz@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:01:31 +0000 Subject: [PATCH 12/14] Apply suggestions from code review Co-authored-by: Raouf --- nextjs-app/src/layout/navigation.tsx | 11 +++++++---- nextjs-app/src/pages/components/icon-button.tsx | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nextjs-app/src/layout/navigation.tsx b/nextjs-app/src/layout/navigation.tsx index bec9c0e3..199e8f79 100644 --- a/nextjs-app/src/layout/navigation.tsx +++ b/nextjs-app/src/layout/navigation.tsx @@ -17,12 +17,15 @@ export default function NavigationLayout({ children, title }: NavigationLayoutPr return ( <> - { isHomePage && PIE Aperture} - {!isHomePage && PIE Aperture | NextJS | { title }} + { isHomePage ? PIE Aperture : PIE Aperture | NextJS | { title }}

NextJS - PIE { title }

- { !isHomePage && router.push('/')} tag="button">Back to home} - { !isHomePage && } + { !isHomePage && + <> + router.push('/')} tag="button">Back to home + + + } { children } { !isHomePage && } diff --git a/nextjs-app/src/pages/components/icon-button.tsx b/nextjs-app/src/pages/components/icon-button.tsx index c65555f0..cfe245b0 100644 --- a/nextjs-app/src/pages/components/icon-button.tsx +++ b/nextjs-app/src/pages/components/icon-button.tsx @@ -5,7 +5,7 @@ import { IconClose } from "@justeattakeaway/pie-icons-webc/dist/react/IconClose" export default function IconButton() { return ( - + console.log("clicked")}> From f973c5240d613f246093c4f8e4c713024f19a8aa Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Fri, 23 Feb 2024 16:02:14 +0000 Subject: [PATCH 13/14] format: DSW-0 fix whitespace --- nextjs-app/src/pages/components/button.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextjs-app/src/pages/components/button.tsx b/nextjs-app/src/pages/components/button.tsx index 651006b7..d587a430 100644 --- a/nextjs-app/src/pages/components/button.tsx +++ b/nextjs-app/src/pages/components/button.tsx @@ -5,8 +5,8 @@ import { IconSearch } from "@justeattakeaway/pie-icons-webc/dist/react/IconSearc import { useState } from "react"; export default function Button() { + const [counter, setCounter] = useState(0); - const [counter, setCounter] = useState(0) return ( setCounter(counter + 1)}>Counter: {counter} From 79904a5bfebd411dd794261051c24b0aefe8de85 Mon Sep 17 00:00:00 2001 From: Ben Siggery Date: Fri, 23 Feb 2024 16:42:53 +0000 Subject: [PATCH 14/14] chore: DSW-0 pr suggestions --- nextjs-app/src/pages/components/modal.tsx | 3 ++- nextjs-app/src/pages/components/switch.tsx | 1 - nuxt-app/pages/components/assistive-text.vue | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nextjs-app/src/pages/components/modal.tsx b/nextjs-app/src/pages/components/modal.tsx index ae0b781d..62d8d93b 100644 --- a/nextjs-app/src/pages/components/modal.tsx +++ b/nextjs-app/src/pages/components/modal.tsx @@ -4,7 +4,8 @@ import { PieModal } from "@justeattakeaway/pie-modal/dist/react"; import { useState } from "react"; export default function Modal() { - const [isModalOpen, setIsModalOpen] = useState(false) + const [isModalOpen, setIsModalOpen] = useState(false); + return ( setIsModalOpen(true)}>Open Modal diff --git a/nextjs-app/src/pages/components/switch.tsx b/nextjs-app/src/pages/components/switch.tsx index b2fc2c02..83d86400 100644 --- a/nextjs-app/src/pages/components/switch.tsx +++ b/nextjs-app/src/pages/components/switch.tsx @@ -3,7 +3,6 @@ import { PieSwitch } from "@justeattakeaway/pie-switch/dist/react"; import { useState } from "react"; export default function Switch() { - const [isSwitchChecked, setIsSwitchCheck] = useState(false) const handleSwitchChange = () => { diff --git a/nuxt-app/pages/components/assistive-text.vue b/nuxt-app/pages/components/assistive-text.vue index 1588ecb2..d91d86d1 100644 --- a/nuxt-app/pages/components/assistive-text.vue +++ b/nuxt-app/pages/components/assistive-text.vue @@ -1,14 +1,14 @@