diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a3ad028..91af3ea 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,8 @@ on: jobs: test: - runs-on: ubuntu-latest + # Keep the test OS compatible with the locked Playwright/browser dependencies. + runs-on: ubuntu-24.04 steps: - name: Checkout code @@ -41,7 +42,8 @@ jobs: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} e2e: - runs-on: ubuntu-latest + # Keep the test OS compatible with the locked Playwright/browser dependencies. + runs-on: ubuntu-24.04 steps: - name: Checkout code diff --git a/.nvmrc b/.nvmrc index b009dfb..a45fd52 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -lts/* +24 diff --git a/e2e/fto.spec.ts b/e2e/fto.spec.ts new file mode 100644 index 0000000..f83dac1 --- /dev/null +++ b/e2e/fto.spec.ts @@ -0,0 +1,104 @@ +import { readFile } from 'node:fs/promises'; +import { test, expect } from '@playwright/test'; +import type { Competition } from '@wca/helpers'; +import { fixtures } from './fixtures'; +import { createWcaApiState, registerWcaApiRoutes, seedAuth } from './mocks/wcaApi'; + +test('official FTO groups, assignments, persistence, display and CSV exports', async ({ page }) => { + test.setTimeout(60_000); + // Reuse the small two-person fixture, retaining official WCIF identifiers throughout. + const wcif = JSON.parse( + JSON.stringify(fixtures.wcif) + .replaceAll('333', 'fto') + .replaceAll('3x3x3 Cube', 'Face-Turning Octahedron') + ) as Competition; + // Exports read the required WCIF room extensions, omitted by the base UI fixture. + wcif.schedule.venues[0].rooms[0].extensions = []; + wcif.persons[0].email = 'alex@example.com'; + const state = createWcaApiState({ wcif }); + await seedAuth(page); + await registerWcaApiRoutes(page, state, fixtures); + const errors: string[] = []; + page.on('pageerror', (error) => errors.push(error.message)); + + await page.goto('/competitions/TestComp2026'); + await expect(page.getByText('Events:').locator('..')).toHaveText('Events: FTO (1)'); + const roundLink = page.getByText('Face-Turning Octahedron, Round 1', { exact: true }); + await expect(roundLink).toBeVisible(); + const icon = page.locator('.cubing-icon.event-fto').first(); + await expect(icon).toBeVisible(); + expect(await icon.evaluate((element) => getComputedStyle(element, '::before').content)).toBe( + '"\uf135"' + ); + await roundLink.click(); + await expect(page).toHaveURL(/\/events\/fto-r1$/); + + await page.getByRole('button', { name: 'Configure Group Counts' }).click(); + const counts = page.getByRole('dialog', { name: 'Configuring Group Counts For fto-r1' }); + await counts.getByLabel('Groups').fill('2'); + await counts.getByRole('button', { name: 'Save And Create Groups' }).click(); + await expect(page.getByText('Main Room: Group 2')).toBeVisible(); + await page.getByRole('button', { name: 'Assign Competitor and Judging Assignments' }).click(); + const stats = page.getByRole('table').filter({ hasText: 'Round Size' }).getByRole('row').last(); + await expect(stats.getByRole('cell').nth(2)).toHaveText('2'); + await expect(stats.getByRole('cell').nth(3)).toHaveText('2'); + + await page.getByRole('button', { name: 'Configure Assignments', exact: true }).click(); + const assignments = page.getByRole('dialog', { + name: 'Configuring Assignments For Face-Turning Octahedron, Round 1', + }); + await assignments.getByRole('switch').first().click(); + await expect(assignments.getByRole('row', { name: /Alex Example/ })).toBeVisible(); + await expect(assignments.getByRole('row', { name: /Jamie Example/ })).toBeVisible(); + await assignments.getByRole('button', { name: 'Close' }).click(); + + await page.getByRole('button', { name: 'SAVE', exact: true }).click(); + await expect(page.getByText('Saved!', { exact: true })).toBeVisible(); + const saved = state.wcifById.TestComp2026 as Competition; + expect(saved.events[0].id).toBe('fto'); + expect( + saved.schedule.venues[0].rooms[0].activities[0].childActivities.map( + (group) => group.activityCode + ) + ).toEqual(['fto-r1-g1', 'fto-r1-g2']); + for (const person of saved.persons) { + expect(person.registration?.eventIds).toEqual(['fto']); + expect(person.assignments?.map((a) => a.assignmentCode).sort()).toEqual([ + 'competitor', + 'staff-judge', + ]); + } + + await page.goto('/competitions/TestComp2026/assignments'); + const eventFilter = page.getByRole('button', { name: 'Face-Turning Octahedron', exact: true }); + await expect(eventFilter).toHaveAttribute('aria-pressed', 'true'); + await eventFilter.click(); + await expect(eventFilter).toHaveAttribute('aria-pressed', 'false'); + await eventFilter.click(); + + await page.goto('/competitions/TestComp2026/export'); + for (const [button, expected] of [ + [ + 'Generate Nametags CSV', + ['fto', 'fto_station_number', 'fto_staff', 'Alex Example', 'Jamie Example'], + ], + ['Generate Scorecard CSV', ['Face-Turning Octahedron', 'ao5', 'Alex Example', 'Jamie Example']], + ['Generate Registration CSV', ['alex@example.com', 'jamie@example.com']], + [ + 'Generate Nametags for publisher CSV', + ['fto-0', 'fto_staff-0', 'Alex Example', 'Jamie Example'], + ], + ] as const) { + await test.step(button, async () => { + const downloadPromise = page.waitForEvent('download'); + await page.getByRole('button', { name: button, exact: true }).click(); + expect(errors).toEqual([]); + const download = await downloadPromise; + expect(await download.failure()).toBeNull(); + const csv = await readFile((await download.path())!, 'utf8'); + for (const value of expected) expect(csv).toContain(value); + expect(csv).not.toContain('undefined'); + }); + } + expect(errors).toEqual([]); +}); diff --git a/package.json b/package.json index f542405..339b175 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,8 @@ "test:e2e": "playwright test", "test:e2e:headed": "playwright test --headed", "prepare": "husky install", - "prettier": "prettier \"src/**/*.js\" --write" + "prettier": "prettier \"src/**/*.js\" --write", + "postinstall": "patch-package --error-on-fail" }, "dependencies": { "@codemirror/lang-json": "6.0.2", @@ -36,7 +37,7 @@ "@types/react-dom": "19.2.3", "@uiw/react-codemirror": "^4.25.4", "@vitejs/plugin-react": "^5.1.2", - "@wca/helpers": "^1.1.6", + "@wca/helpers": "1.1.6", "clsx": "^2.1.1", "country-flag-icons": "^1.6.8", "date-fns": "^4.1.0", @@ -50,6 +51,7 @@ "lodash.debounce": "^4.0.8", "material-ui-confirm": "^4.0.0", "notistack": "^3.0.1", + "patch-package": "^8.0.1", "prop-types": "^15.8.1", "react": "19.2.3", "react-dom": "19.2.3", @@ -109,5 +111,8 @@ "singleQuote": true, "bracketSpacing": true, "bracketSameLine": true + }, + "resolutions": { + "@wca/helpers": "1.1.6" } } diff --git a/patches/@wca+helpers+1.1.6.patch b/patches/@wca+helpers+1.1.6.patch new file mode 100644 index 0000000..f043b14 --- /dev/null +++ b/patches/@wca+helpers+1.1.6.patch @@ -0,0 +1,21 @@ +diff --git a/node_modules/@wca/helpers/lib/helpers/event.js b/node_modules/@wca/helpers/lib/helpers/event.js +index 87b4f87..78c7846 100644 +--- a/node_modules/@wca/helpers/lib/helpers/event.js ++++ b/node_modules/@wca/helpers/lib/helpers/event.js +@@ -2,6 +2,7 @@ + Object.defineProperty(exports, "__esModule", { value: true }); + exports.getEventResultType = exports.getEventName = void 0; + var eventDataById = { ++ fto: { resultType: 'time', name: 'Face-Turning Octahedron' }, + '333': { resultType: 'time', name: '3x3x3 Cube' }, + '222': { resultType: 'time', name: '2x2x2 Cube' }, + '444': { resultType: 'time', name: '4x4x4 Cube' }, +diff --git a/node_modules/@wca/helpers/lib/models/eventId.d.ts b/node_modules/@wca/helpers/lib/models/eventId.d.ts +index f676817..f872d26 100644 +--- a/node_modules/@wca/helpers/lib/models/eventId.d.ts ++++ b/node_modules/@wca/helpers/lib/models/eventId.d.ts +@@ -1,3 +1,3 @@ +-export type CurrentEventId = '222' | '333' | '444' | '555' | '666' | '777' | '333bf' | '333fm' | '333oh' | 'clock' | 'minx' | 'pyram' | 'skewb' | 'sq1' | '444bf' | '555bf' | '333mbf'; ++export type CurrentEventId = '222' | '333' | '444' | '555' | '666' | '777' | '333bf' | '333fm' | '333oh' | 'clock' | 'minx' | 'pyram' | 'skewb' | 'sq1' | '444bf' | '555bf' | '333mbf' | 'fto'; + export type DeprecatedEventId = 'magic' | 'mmagic' | '333mbo' | '333ft'; + export type EventId = CurrentEventId | DeprecatedEventId; diff --git a/patches/README.md b/patches/README.md new file mode 100644 index 0000000..b103c00 --- /dev/null +++ b/patches/README.md @@ -0,0 +1,16 @@ +# FTO compatibility + +`@wca/helpers` 1.1.6 is pinned and patched at install time to add the official +`fto` event ID, display name and timed-result type. The patch applies to the +shared dependency used by both this app and `wca-group-generators`; changing +only the app registry leaves upstream activity naming and group creation broken. + +The 1.1.9 release still lacks FTO. Version 2.0.0 includes the ID type but not the +runtime event metadata, and also changes the WCIF schema. Remove this patch and +pin/resolution when a compatible upstream release supplies both pieces. +Install with Yarn lifecycle scripts enabled. `postinstall` fails if the patch +cannot apply. The FTO workflow test exercises the actual upstream functions. + +`@cubing/icons` 3.0.5 includes the FTO glyph as `unofficial-fto`. The CSS alias in +`src/assets/index.css` lets every existing `event-fto` consumer display it while +keeping the official WCIF identifier throughout registrations and assignments. diff --git a/src/assets/index.css b/src/assets/index.css index 40f116d..4a9bb58 100644 --- a/src/assets/index.css +++ b/src/assets/index.css @@ -21,3 +21,9 @@ display: flex; flex-shrink: 1; } + +/* @cubing/icons 3.0.5 ships the FTO glyph as unofficial-fto. + * Alias the official WCIF event ID for all event icon consumers. */ +.cubing-icon.event-fto::before { + content: "\f135"; +} diff --git a/src/components/EventSelector.tsx b/src/components/EventSelector.tsx index b2e3fc0..68856bd 100644 --- a/src/components/EventSelector.tsx +++ b/src/components/EventSelector.tsx @@ -1,3 +1,4 @@ +import { eventNameById } from '../lib/domain/events'; import { IconButton } from '@mui/material'; import { type EventId } from '@wca/helpers'; @@ -25,6 +26,8 @@ const EventSelector = ({ eventIds, value, onChange, styleOverrides }: EventSelec {eventIds.map((eventId) => ( ({ diff --git a/src/components/_tests_/CompetitionSummaryCard.test.tsx b/src/components/_tests_/CompetitionSummaryCard.test.tsx index 2759989..846b303 100644 --- a/src/components/_tests_/CompetitionSummaryCard.test.tsx +++ b/src/components/_tests_/CompetitionSummaryCard.test.tsx @@ -15,7 +15,7 @@ describe('CompetitionSummaryCard', () => { id: 'Comp', name: 'Summary Competition', schedule: { startDate: '2024-01-01', numberOfDays: 1, venues: [] }, - events: [{ id: '333' }, { id: '222' }], + events: [{ id: '333' }, { id: '222' }, { id: 'fto' }], persons: [{ registration: { status: 'accepted' } }, { registration: { status: 'pending' } }], }; @@ -26,6 +26,6 @@ describe('CompetitionSummaryCard', () => { expect(getByText('Summary Competition')).toBeInTheDocument(); expect(getByText('Competitors:').parentElement).toHaveTextContent('Competitors: 1'); - expect(getByText('Events:').parentElement).toHaveTextContent('Events: 3x3, 2x2 (2)'); + expect(getByText('Events:').parentElement).toHaveTextContent('Events: 3x3, 2x2, FTO (3)'); }); }); diff --git a/src/lib/domain/_tests_/fto.test.ts b/src/lib/domain/_tests_/fto.test.ts new file mode 100644 index 0000000..0af60a9 --- /dev/null +++ b/src/lib/domain/_tests_/fto.test.ts @@ -0,0 +1,147 @@ +import { describe, expect, it } from 'vitest'; +import { + activityCodeToName as helperActivityName, + getEventName, + getEventResultType, + type EventId, +} from '@wca/helpers'; +import { createGroupActivity as generatorGroupActivity } from 'wca-group-generators'; +import { + buildActivity, + buildEvent, + buildPerson, + buildRound, + buildWcifWithEvents, +} from '../../../store/reducers/_tests_/helpers'; +import { events, eventNameById, shortEventNameById, sortWcifEvents } from '../events'; +import { activityCodeToName, hasDistributedAttempts, parseActivityCode } from '../activities'; +import { personsRegistered, personsShouldBeInRound } from '../persons'; +import { generateCompetingGroupActitivitesForEveryone } from '../../assignmentGenerators/generateCompetingGroupActitivitesForEveryone'; +import { generateJudgeAssignmentsFromCompetingAssignments } from '../../assignmentGenerators/generateJudgeAssignmentsFromCompetingAssignments'; +import { + determineMissingGroupActivities, + generateAssignments, + generateMissingGroupActivities, + upsertCompetitorAssignments, + validate, +} from '../../importExport/import'; +import { formatSeedResult } from '../../../dialogs/ConfigureAssignmentsDialog/formatSeedResult'; + +const eventId: EventId = 'fto'; +const round = buildRound({ id: 'fto-r1' }); +const event = buildEvent({ id: eventId, rounds: [round] }); +const registered = ( + registrantId: number, + status: 'accepted' | 'pending' = 'accepted', + eventIds: EventId[] = [eventId] +) => + buildPerson({ + registrantId, + email: `${registrantId}@example.com`, + registration: { + wcaRegistrationId: registrantId, + status, + eventIds, + isCompeting: true, + }, + }); + +const buildFtoWcif = () => + buildWcifWithEvents( + [ + buildActivity({ + activityCode: 'fto-r1', + childActivities: [ + buildActivity({ id: 2, activityCode: 'fto-r1-g1' }), + buildActivity({ id: 3, activityCode: 'fto-r1-g2' }), + ], + }), + ], + [event], + [registered(1), registered(2), registered(3, 'pending'), registered(4, 'accepted', ['333'])] + ); + +describe('official FTO workflow', () => { + it('uses the official ID, names, time results and deterministic event order', () => { + expect(events.filter(({ id }) => id === eventId)).toHaveLength(1); + expect(eventNameById(eventId)).toBe('Face-Turning Octahedron'); + expect(shortEventNameById(eventId)).toBe('FTO'); + expect(getEventName(eventId)).toBe(eventNameById(eventId)); + expect(getEventResultType(eventId)).toBe('time'); + expect( + sortWcifEvents([event, buildEvent(), buildEvent({ id: 'clock' })]).map(({ id }) => id) + ).toEqual(['333', 'clock', 'fto']); + expect(formatSeedResult(eventId, 'average', 1234)).toBe('12.34'); + expect(formatSeedResult(eventId, 'single', -1)).toBe('DNF'); + expect(formatSeedResult(eventId, 'average')).toBe('-'); + }); + + it('names and creates ordinary round/group activities in both helper implementations', () => { + expect(parseActivityCode('fto-r1-g2')).toMatchObject({ + eventId, + roundNumber: 1, + groupNumber: 2, + }); + expect(hasDistributedAttempts('fto-r1')).toBe(false); + expect(activityCodeToName('fto-r1-g2')).toBe('Face-Turning Octahedron, Round 1, Group 2'); + expect(helperActivityName('fto-r1-g2')).toBe(activityCodeToName('fto-r1-g2')); + const activity = generatorGroupActivity( + 2, + buildActivity({ activityCode: 'fto-r1' }), + 1, + null, + null + ); + expect(activity).toMatchObject({ + activityCode: 'fto-r1-g1', + name: 'Face-Turning Octahedron, Round 1, Group 1', + }); + }); + + it('generates competing and judging assignments only for accepted FTO registrants', () => { + const wcif = buildFtoWcif(); + expect(personsRegistered(wcif.persons, eventId).map((p) => p.registrantId)).toEqual([1, 2]); + expect(personsShouldBeInRound(round)(wcif.persons).map((p) => p.registrantId)).toEqual([1, 2]); + expect(personsShouldBeInRound(buildRound({ id: 'fto-r2' }))(wcif.persons)).toEqual([]); + const competing = generateCompetingGroupActitivitesForEveryone(wcif, round.id)!([]); + expect(competing).toHaveLength(2); + expect(competing.map((a) => a.registrantId).sort()).toEqual([1, 2]); + expect(new Set(competing.map((a) => a.assignment.activityId))).toEqual(new Set([2, 3])); + const judging = generateJudgeAssignmentsFromCompetingAssignments(wcif, round.id)!(competing); + expect(judging).toHaveLength(2); + for (const assignment of judging) { + expect(assignment.assignment.assignmentCode).toBe('staff-judge'); + expect(assignment.assignment.activityId).not.toBe( + competing.find((a) => a.registrantId === assignment.registrantId)!.assignment.activityId + ); + } + }); + + it('imports official FTO competitor and staff columns and creates missing groups', () => { + const wcif = buildWcifWithEvents( + [buildActivity({ activityCode: 'fto-r1' })], + [event], + [registered(1)] + ); + const data = { + meta: { fields: ['email', 'fto', 'fto-staff'] }, + data: [{ email: '1@example.com', fto: '1', 'fto-staff': 'S2' }], + }; + expect(validate(wcif)(data).every((check) => check.passed)).toBe(true); + const assignments = generateAssignments(wcif, data); + expect(assignments.map((a) => a.activityCode)).toEqual(['fto-r1-g1', 'fto-r1-g2']); + const missing = determineMissingGroupActivities(wcif, assignments); + const withGroups = generateMissingGroupActivities(wcif, missing); + const updated = upsertCompetitorAssignments(withGroups, assignments); + expect(updated.persons[0].assignments?.map((a) => a.assignmentCode).sort()).toEqual([ + 'competitor', + 'staff-scrambler', + ]); + expect( + updated.schedule.venues[0].rooms[0].activities[0].childActivities.map((a) => a.name) + ).toEqual([ + 'Face-Turning Octahedron, Round 1, Group 1', + 'Face-Turning Octahedron, Round 1, Group 2', + ]); + }); +}); diff --git a/src/lib/domain/events.ts b/src/lib/domain/events.ts index 28ea7cf..29cd5f3 100644 --- a/src/lib/domain/events.ts +++ b/src/lib/domain/events.ts @@ -25,6 +25,7 @@ export const events: EventInfo[] = [ { id: '444bf', name: '4x4x4 Blindfolded', shortName: '4BLD' }, { id: '555bf', name: '5x5x5 Blindfolded', shortName: '5BLD' }, { id: '333mbf', name: '3x3x3 Multi-Blind', shortName: 'MBLD' }, + { id: 'fto', name: 'Face-Turning Octahedron', shortName: 'FTO' }, ]; export const eventNameById = (eventId: EventId): string => propertyById('name', eventId); diff --git a/yarn.lock b/yarn.lock index 9bc5b22..85fbbbc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2914,16 +2914,16 @@ "@vitest/pretty-format" "4.0.18" tinyrainbow "^3.0.3" -"@wca/helpers@^1.1.5": - version "1.1.5" - resolved "https://registry.npmjs.org/@wca/helpers/-/helpers-1.1.5.tgz" - integrity sha512-Sr/XxkEXctrRKFJuqyAy9KH7q//YevEo+zSCESpVQqieB4Y3KjHYOl54kPaocwAHkWniGMOwZWD6O1Q9MR1d3w== - -"@wca/helpers@^1.1.6": +"@wca/helpers@1.1.6", "@wca/helpers@^1.1.5": version "1.1.6" resolved "https://registry.yarnpkg.com/@wca/helpers/-/helpers-1.1.6.tgz#9157225955df954cd4cd0ab1e7fdad24cd39d0fb" integrity sha512-Y5zsRpQ6Bt/aOuqm1dbkb1awYmR3D5hrHHLXYmWLiJzfb8wo4fxyKLIEnK4LrfjWpO+rmictG99cWORhaby5Lg== +"@yarnpkg/lockfile@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" + integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== + acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz" @@ -3336,6 +3336,11 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.2: ansi-styles "^4.1.0" supports-color "^7.1.0" +ci-info@^3.7.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" + integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== + ci-info@^4.2.0: version "4.3.1" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.3.1.tgz#355ad571920810b5623e11d40232f443f16f1daa" @@ -3463,7 +3468,7 @@ crelt@^1.0.5: resolved "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz" integrity sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g== -cross-spawn@^7.0.6: +cross-spawn@^7.0.3, cross-spawn@^7.0.6: version "7.0.6" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== @@ -4254,6 +4259,13 @@ find-up@^5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" +find-yarn-workspace-root@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd" + integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ== + dependencies: + micromatch "^4.0.2" + flag-icon-css@^3.2.1: version "3.5.0" resolved "https://registry.npmjs.org/flag-icon-css/-/flag-icon-css-3.5.0.tgz" @@ -4294,6 +4306,15 @@ foreground-child@^3.3.1: cross-spawn "^7.0.6" signal-exit "^4.0.1" +fs-extra@^10.0.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs-extra@^9.0.1: version "9.1.0" resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz" @@ -4488,6 +4509,11 @@ gopd@^1.2.0: resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1" integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg== +graceful-fs@^4.1.11: + version "4.2.12" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.12.tgz#7f6162dee07bc600281cea1b038e5f7cf215a6c2" + integrity sha512-iuyGF2E4oafQfPsRrG2wtY2ILupMhvtdrhzrxB+0VcjsPpSPttpfYdjnGFGsTi5MaJFjI1jOKHPQ6UTbTj9TAw== + graceful-fs@^4.1.6, graceful-fs@^4.2.0: version "4.2.10" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz" @@ -4795,6 +4821,11 @@ is-date-object@^1.1.0: call-bound "^1.0.2" has-tostringtag "^1.0.2" +is-docker@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" @@ -5000,6 +5031,13 @@ is-weakset@^2.0.3: call-bound "^1.0.3" get-intrinsic "^1.2.6" +is-wsl@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + isarray@^2.0.5: version "2.0.5" resolved "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz" @@ -5222,6 +5260,17 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz" integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== +json-stable-stringify@^1.0.2: + version "1.3.0" + resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.3.0.tgz#8903cfac42ea1a0f97f35d63a4ce0518f0cc6a70" + integrity sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg== + dependencies: + call-bind "^1.0.8" + call-bound "^1.0.4" + isarray "^2.0.5" + jsonify "^0.0.1" + object-keys "^1.1.1" + json5@^2.2.0, json5@^2.2.3: version "2.2.3" resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz" @@ -5236,6 +5285,11 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" +jsonify@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978" + integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg== + jsonpath@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/jsonpath/-/jsonpath-1.1.1.tgz" @@ -5337,6 +5391,13 @@ keyv@^4.5.4: dependencies: json-buffer "3.0.1" +klaw-sync@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" + integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ== + dependencies: + graceful-fs "^4.1.11" + leven@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz" @@ -5483,7 +5544,7 @@ mdn-data@2.12.2: resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.12.2.tgz#9ae6c41a9e65adf61318b32bff7b64fbfb13f8cf" integrity sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA== -micromatch@^4.0.8: +micromatch@^4.0.2, micromatch@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== @@ -5524,6 +5585,11 @@ minimatch@^9.0.0, minimatch@^9.0.5: dependencies: brace-expansion "^2.0.1" +minimist@^1.2.6: + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + minipass@^7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" @@ -5666,6 +5732,14 @@ obug@^2.1.1: resolved "https://registry.yarnpkg.com/obug/-/obug-2.1.1.tgz#2cba74ff241beb77d63055ddf4cd1e9f90b538be" integrity sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ== +open@^7.4.2: + version "7.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== + dependencies: + is-docker "^2.0.0" + is-wsl "^2.1.1" + optionator@^0.8.1: version "0.8.3" resolved "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz" @@ -5759,6 +5833,26 @@ parse5@^8.0.0: dependencies: entities "^6.0.0" +patch-package@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-8.0.1.tgz#79d02f953f711e06d1f8949c8a13e5d3d7ba1a60" + integrity sha512-VsKRIA8f5uqHQ7NGhwIna6Bx6D9s/1iXlA1hthBVBEbkq+t4kXD0HHt+rJhf/Z+Ci0F/HCB2hvn0qLdLG+Qxlw== + dependencies: + "@yarnpkg/lockfile" "^1.1.0" + chalk "^4.1.2" + ci-info "^3.7.0" + cross-spawn "^7.0.3" + find-yarn-workspace-root "^2.0.0" + fs-extra "^10.0.0" + json-stable-stringify "^1.0.2" + klaw-sync "^6.0.0" + minimist "^1.2.6" + open "^7.4.2" + semver "^7.5.3" + slash "^2.0.0" + tmp "^0.2.4" + yaml "^2.2.2" + path-exists@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz" @@ -6396,6 +6490,11 @@ sirv@^3.0.2: mrmime "^2.0.0" totalist "^3.0.0" +slash@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" + integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== + slash@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz" @@ -6759,6 +6858,11 @@ tldts@^7.0.5: dependencies: tldts-core "^7.0.19" +tmp@^0.2.4: + version "0.2.7" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.7.tgz#26f4db11d1601ce8012dcb8a798ece1c06a99059" + integrity sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw== + to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz" @@ -7480,6 +7584,11 @@ yaml@^1.10.0: resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== +yaml@^2.2.2: + version "2.9.1" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.9.1.tgz#c16233fb31944e705cfefaff38795587f57588ce" + integrity sha512-3NxN8+78OdzbT7C/WjGsyfPAtJaN3FNDsWxv7Y7mcDsT/oOmgW8BpyQQFFBnvZE3j9Y2Sdz1ULFLezL7Eb2yFw== + yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"