From c6012113636411753f25fa372d2cf853c4e7adb1 Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Thu, 17 Aug 2023 11:42:05 -0600 Subject: [PATCH 01/25] update versions, fixes --- docs/builds/sway | 2 +- docs/fuel-indexer | 2 +- docs/fuel-specs | 2 +- docs/fuels-rs | 2 +- docs/fuels-ts | 2 +- docs/fuelup | 2 +- docs/sway | 2 +- package.json | 1 + scripts/generate-links.mjs | 155 ++++++++++++++++++++++-------- scripts/sync-repos.sh | 4 - scripts/ts-api-gen.sh | 5 + src/components/SidebarLink.tsx | 25 ++++- src/components/SidebarSubmenu.tsx | 26 ++++- src/config/paths.json | 3 + src/lib/md-parser.ts | 62 ++---------- src/lib/plugins/links.ts | 12 +-- 16 files changed, 190 insertions(+), 117 deletions(-) create mode 100644 scripts/ts-api-gen.sh diff --git a/docs/builds/sway b/docs/builds/sway index ce8c1fe7..df84677d 160000 --- a/docs/builds/sway +++ b/docs/builds/sway @@ -1 +1 @@ -Subproject commit ce8c1fe78a69f988e72d7d0aac2dbebf5ed60a98 +Subproject commit df84677dbe123add96bbe31157cd96e8a364e647 diff --git a/docs/fuel-indexer b/docs/fuel-indexer index 848989fd..4c3362dd 160000 --- a/docs/fuel-indexer +++ b/docs/fuel-indexer @@ -1 +1 @@ -Subproject commit 848989fdd7b58d3c254d1d3f90010f6d8abdc195 +Subproject commit 4c3362dd1bd64996cd7f0525c613ca8f8cb74929 diff --git a/docs/fuel-specs b/docs/fuel-specs index 73101287..6b805991 160000 --- a/docs/fuel-specs +++ b/docs/fuel-specs @@ -1 +1 @@ -Subproject commit 7310128720bb17621d6b4cb6cf8ff251fd39fc1d +Subproject commit 6b805991bf022337a06e5ca76f09665c57e032a3 diff --git a/docs/fuels-rs b/docs/fuels-rs index 31381724..df21541b 160000 --- a/docs/fuels-rs +++ b/docs/fuels-rs @@ -1 +1 @@ -Subproject commit 31381724c94e01613f361981dc557e4548a4a48d +Subproject commit df21541b679bb90a1ee3e54f34a67b7037b40be7 diff --git a/docs/fuels-ts b/docs/fuels-ts index 51bcfda6..0dc052a1 160000 --- a/docs/fuels-ts +++ b/docs/fuels-ts @@ -1 +1 @@ -Subproject commit 51bcfda69c68b0d9898f34fb2cdd7814a5229ac3 +Subproject commit 0dc052a171a25bc21515ebf8de21b150fe27d712 diff --git a/docs/fuelup b/docs/fuelup index 2c53dd52..bc34cf2b 160000 --- a/docs/fuelup +++ b/docs/fuelup @@ -1 +1 @@ -Subproject commit 2c53dd52b50ef1265955f7bc8c8d2f3b3b2cc7d0 +Subproject commit bc34cf2b45c40b2b58acfc674814d31b8601a285 diff --git a/docs/sway b/docs/sway index 3b66f8e4..04a59709 160000 --- a/docs/sway +++ b/docs/sway @@ -1 +1 @@ -Subproject commit 3b66f8e424bd21e3ba467783b10b36e808cfa6ee +Subproject commit 04a597093e7441898933dd412b8e4dc6ac860cd3 diff --git a/package.json b/package.json index 80392394..abbfe1ab 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "check:prod": "run-s lint:prod prettier:check", "docs:sync": "sh ./scripts/sync-repos.sh", "docs:clean": "sh ./scripts/clean-build-files.sh", + "docs:ts-api": "sh ./scripts/ts-api-gen.sh", "deps:update": "updates -gu", "dev": "pnpm generate:links && pnpm generate:components && next dev", "export": "DOCS_DIST=${DOCS_DIST:=dist} next export -o $DOCS_DIST", diff --git a/scripts/generate-links.mjs b/scripts/generate-links.mjs index 602d229f..dc378ba1 100644 --- a/scripts/generate-links.mjs +++ b/scripts/generate-links.mjs @@ -29,6 +29,11 @@ const tsConfigPath = join( './fuels-ts/apps/docs/.vitepress/config.ts' ); +const tsAPIOrderPath = join( + DOCS_DIRECTORY, + './fuels-ts/apps/docs/.typedoc/api-links.json' +); + const swaySummaryFile = fs.readFileSync(swaySummaryPath, 'utf8'); const rustSummaryFile = fs.readFileSync(rustSummaryPath, 'utf8'); const fuelupSummaryFile = fs.readFileSync(fuelupSummaryPath, 'utf8'); @@ -41,6 +46,7 @@ const walletOrderFile = JSON.parse(fs.readFileSync(walletOrderPath, 'utf8')); // fs.readFileSync(aboutFuelOrderPath, 'utf8') // ); const tsConfigFile = fs.readFileSync(tsConfigPath, 'utf8'); +const tsAPIOrderFile = fs.readFileSync(tsAPIOrderPath, 'utf8'); const forcLines = []; @@ -71,38 +77,106 @@ async function main() { }) ); } +function extractData(inputString) { + // used for api.json order + const regex = /"([^"]+)":\s*"([^"]+)"/g; + let match = regex.exec(inputString); + if (match !== null) { + return match[2]; + } + return null; +} + +function handleVPLine(trimmedLine, lines, index, thisOrder, thisCat) { + const regex = /'([^']+)'/; + // Create a shallow copy + let newVPOrder = JSON.parse(JSON.stringify(thisOrder)); + let category = thisCat; + if ( + trimmedLine.includes('collapsed:') || + trimmedLine.includes('"collapsed":') + ) { + // handle categories + if (trimmedLine.includes('collapsed:')) { + const matches = regex.exec(lines[index - 2]); + category = matches[1]; + } else { + category = extractData(lines[index - 2]); + } + newVPOrder.menu.push(category); + newVPOrder[category] = []; + } else if ( + // handle items + trimmedLine.includes('text') && + !lines[index + 2].includes('collapsed:') && + !lines[index + 2].includes('"collapsed":') + ) { + const matches = regex.exec(trimmedLine); + let linkMatches = regex.exec(lines[index + 1].trimStart()); + let link; + let linkName; + if (linkMatches && matches) { + link = linkMatches[1]; + linkName = matches[1]; + } else { + linkName = extractData(trimmedLine); + link = extractData(lines[index + 1].trimStart()); + } + if (link && linkName) { + if (link.startsWith('/')) { + link = link.replace('/', ''); + } + const split = link.split('/'); + if (category && split.length !== 2 && split[1] !== '') { + newVPOrder[category].push(linkName); + } else { + newVPOrder.menu.push(linkName); + } + } + } else if (trimmedLine.startsWith('apiLinks')) { + // handle API order + newVPOrder.menu.push('API'); + const apiJSON = JSON.parse(tsAPIOrderFile); + const apiLines = JSON.stringify(apiJSON, null, 2).split(EOL); + apiLines.forEach((apiLine, apiIndex) => { + const trimmedAPILine = apiLine.trimStart(); + const results = handleVPLine( + trimmedAPILine, + apiLines, + apiIndex, + newVPOrder, + category + ); + category = results.category; + newVPOrder = results.newVPOrder; + }); + } + + return { newVPOrder, category }; +} function processVPConfig(lines) { - const order = { menu: ['fuels-ts'] }; + let tsOrder = { menu: ['fuels-ts'] }; let currentCategory; let foundStart = false; - const regex = /'([^']+)'/; lines.forEach((line, index) => { const trimmedLine = line.trimStart(); if (foundStart) { - if (trimmedLine.includes('collapsed:')) { - const matches = regex.exec(lines[index - 2]); - currentCategory = matches[1]; - order.menu.push(currentCategory); - order[currentCategory] = []; - } - - if (trimmedLine.includes('text')) { - if (!lines[index + 2].includes('collapsed:')) { - const matches = regex.exec(trimmedLine); - if (currentCategory) { - order[currentCategory].push(matches[1]); - } else { - order.menu.push(matches[1]); - } - } - } + const { newVPOrder, category } = handleVPLine( + trimmedLine, + lines, + index, + tsOrder, + currentCategory + ); + tsOrder = newVPOrder; + currentCategory = category; } else if (trimmedLine === 'sidebar: [') { foundStart = true; } }); - return order; + return tsOrder; } function processSummary(lines, docsName) { @@ -211,7 +285,8 @@ function getSortedLinks(config, docs) { !doc.category || doc.category === 'src' || doc.category === 'forc' || - (doc.category === 'guide' && doc.title === 'guide') + (doc.category === 'guide' && doc.title === 'guide') || + (doc.category === 'api' && doc.title === 'api') ) { let newLabel = doc.title; if (doc.title === 'index' || doc.title === 'README') { @@ -282,18 +357,12 @@ function getSortedLinks(config, docs) { /** Sort categoried links */ .map((link) => { if (!link.submenu) return link; - let key = link.label + const key = link.label .toLowerCase() .replaceAll(' ', '-') .replaceAll('_', '-'); let catOrder = config[key]; if (!catOrder) catOrder = config[key.replaceAll('-', '_')]; - if (!catOrder) { - const regex = /\/([^/]+)\/[^/]+$/; - const match = link.submenu[0].slug.match(regex); - key = match[1]; - catOrder = config[key]; - } catOrder = catOrder?.map((title) => title.toLowerCase().replaceAll('-', '_').replaceAll(' ', '_') @@ -433,21 +502,25 @@ function removeDocsPath(path) { }); // handle mdbooks folders that use a same name file instead of index.md - const paths = newPath.split('/'); - const length = paths.length - 1; - const last = paths[length].split('.')[0]; - const cat = paths[length - 1]; - if (last === cat) { - paths.pop(); - newPath = `${paths.join('/')}/`; - } - - // move forc docs to their own section - if (path.includes('/forc/')) { - newPath = newPath.replace('sway/', ''); + if ( + newPath.includes('/sway/') || + newPath.includes('/fuels-rs/') || + newPath.includes('/forc/') || + newPath.includes('/indexer/') || + newPath.includes('/fuelup/') || + newPath.includes('/specs/') + ) { + const paths = newPath.split('/'); + const length = paths.length - 1; + const last = paths[length].split('.')[0]; + const cat = paths[length - 1]; + if (last === cat) { + paths.pop(); + newPath = `${paths.join('/')}/`; + } } - return newPath; + return newPath.toLowerCase(); } function getDocBySlug(slug, slugs) { diff --git a/scripts/sync-repos.sh b/scripts/sync-repos.sh index a7d461be..2d1026c8 100644 --- a/scripts/sync-repos.sh +++ b/scripts/sync-repos.sh @@ -1,7 +1,3 @@ #!/bin/bash git submodule update --init - -# TODO: Remove after fuels-rs version updated past 43 -cd docs/fuels-rs -git cherry-pick 989026923b7cca989bf93a7aae481b04e7be915a diff --git a/scripts/ts-api-gen.sh b/scripts/ts-api-gen.sh new file mode 100644 index 00000000..c5ea32ec --- /dev/null +++ b/scripts/ts-api-gen.sh @@ -0,0 +1,5 @@ +cd docs/fuels-ts +pnpm install +pnpm build +cd apps/docs +pnpm typedoc && pnpm tsx ./scripts/typedoc-postbuild.ts \ No newline at end of file diff --git a/src/components/SidebarLink.tsx b/src/components/SidebarLink.tsx index fc03f456..95a24098 100644 --- a/src/components/SidebarLink.tsx +++ b/src/components/SidebarLink.tsx @@ -10,19 +10,34 @@ import { LOWER_CASE_NAV_PATHS } from '../config/constants'; import { capitalize } from '../lib/str'; function getActive(pathname: string, slug: string) { - if (slug.split('/').length > 2 || slug.includes('guides')) { + const split = slug.split('/'); + const pathnameSegments = pathname.split('/'); + if (slug.includes('guides')) { return pathname.includes(slug); + } else if (split.length > 2) { + const category = pathnameSegments[3]; + let active = category === split[2]; + if (active) { + if (pathnameSegments.length === 5) { + active = split.length === 3; + } else if (pathnameSegments.length === 6) { + const pageName = pathnameSegments[4]; + active = split.length > 3 && pageName === split[3]; + } + } + return active; } return pathname === `/${slug}` || pathname === `/${slug}/`; } export type SidebarLinkProps = ButtonLinkProps & { item: SidebarLinkItem; + isActiveMenu?: boolean; }; // eslint-disable-next-line react/display-name export const SidebarLink = forwardRef( - ({ item, ...props }, ref) => { + ({ item, isActiveMenu, ...props }, ref) => { const router = useRouter(); const pathname = router.asPath; let slug = item.slug?.replace('../', '').replace('./', '') || ''; @@ -30,8 +45,10 @@ export const SidebarLink = forwardRef( if (!slug.startsWith('guides/')) { slug = `docs/${slug}`; } - - const active = getActive(pathname, slug); + let active = isActiveMenu; + if (!active) { + active = getActive(pathname, slug); + } const isActive = cx({ active, }); diff --git a/src/components/SidebarSubmenu.tsx b/src/components/SidebarSubmenu.tsx index 82235fe7..37c2c21d 100644 --- a/src/components/SidebarSubmenu.tsx +++ b/src/components/SidebarSubmenu.tsx @@ -18,6 +18,7 @@ export function SidebarSubmenu({ const [isOpened, setIsOpened] = useState(); const newLabel = label.replace(/\s+/g, '-').toLowerCase(); let slug = `${subpath}/${newLabel}`; + const pathnameSegments = pathname?.split('/'); useEffect(() => { if (pathname.includes('/guides/')) { @@ -26,7 +27,24 @@ export function SidebarSubmenu({ const pathArray = submenu![0].slug?.split('/'); const index = pathArray?.indexOf(subpath!); const category = pathArray && index ? `/${pathArray[index + 1]}` : ''; - const active = pathname?.startsWith(`/docs/${subpath}${category}/`); + + let active = + pathnameSegments && + pathnameSegments[2] === subpath && + `/${pathnameSegments[3]}` === category; + + let foundPathInSubmenu = false; + + if (active && submenu) { + for (let i = 0; i < submenu.length; i++) { + const thisSlug = `/docs/${submenu[i].slug!.replace('./', '')}/`; + if (pathname === thisSlug) { + foundPathInSubmenu = true; + break; + } + } + if (!foundPathInSubmenu) active = false; + } setIsOpened(active); } }, [pathname]); @@ -40,12 +58,16 @@ export function SidebarSubmenu({ {isOpened && ( {submenu?.map((item, index) => { - if (item.label !== label) { + if ( + item.label !== label || + (item.slug && item.slug.split('/').length > 3) + ) { return ( diff --git a/src/config/paths.json b/src/config/paths.json index 9d7ac84b..884d6228 100644 --- a/src/config/paths.json +++ b/src/config/paths.json @@ -8,6 +8,9 @@ "/index.md": ".md", "/README.md": ".md", "/guide/": "/", + "docs/guides": "guides", + "/api/": "/", + "sway/forc": "forc", "/forc_client/": "/", "fuel-graphql-docs": "graphql", "fuel-specs": "specs", diff --git a/src/lib/md-parser.ts b/src/lib/md-parser.ts index 2520d0ac..c6fc091f 100644 --- a/src/lib/md-parser.ts +++ b/src/lib/md-parser.ts @@ -1,59 +1,17 @@ -const PATHS_REPLACE_MAP = { - 'docs/sway': 'docs/sway/docs/book/src', - 'docs/fuelup': 'docs/fuelup/docs/src', - 'docs/fuels-rs': 'docs/fuels-rs/docs/src', - 'docs/fuels-ts': 'docs/fuels-ts/apps/docs/src', - 'docs/fuel-specs': 'docs/fuel-specs/src', - 'docs/fuel-indexer': 'docs/fuel-indexer/docs/src', - 'docs/fuels-wallet': 'docs/fuels-wallet/packages/docs/docs', - 'docs/fuel-graphql-docs': 'docs/fuel-graphql-docs/docs', - 'docs/guides': 'docs/guides/docs', -}; +import fs from 'fs'; +import path from 'path'; + +import { DOCS_DIRECTORY } from '../config/constants'; + +const configPath = path.join(DOCS_DIRECTORY, `../src/config/paths.json`); +const pathsConfig = JSON.parse(fs.readFileSync(configPath, 'utf8')); export class DocParser { static createSlug(path: string) { let slug = path; - - for (const [key, value] of Object.entries(PATHS_REPLACE_MAP)) { - if (path.startsWith(key)) { - slug = path.replace(value, key); - } - } - - // handling edges cases according legacy slugs structure - if (slug.includes('docs/fuel-graphql-docs')) { - slug = slug.replace('fuel-graphql-docs', 'graphql'); - } - if (slug.startsWith('docs/fuel-')) { - slug = slug.replace('/fuel-', '/'); - } - if (slug.includes('fuels-wallet')) { - slug = slug.replace('fuels-wallet', 'wallet'); - } - if (slug.includes('sway/forc')) { - slug = slug.replace('sway/', ''); - } - if (slug === 'docs/forc') { - slug = 'docs/forc/index'; - } - if (slug.includes('/forc_client/')) { - slug = slug.replace('/forc_client/', '/'); - } - if (slug === 'docs/guides/quickstart') { - slug = 'docs/guides/quickstart/index'; - } - if (slug.startsWith('docs/guides/')) { - slug = slug.replace('docs/guides/', 'guides/'); - } - if (slug.startsWith('docs/fuels-ts/guide/')) { - slug = slug.replace('docs/fuels-ts/guide/', 'docs/fuels-ts/'); - } - - slug = slug.replace('README', 'index'); - // TODO: Remove after fixed - if (slug === 'docs/fuels-rs/contributing/contributing') { - slug = 'docs/fuels-rs/contributing'; + for (const [key, value] of Object.entries(pathsConfig)) { + slug = slug.replaceAll(key, value as string); } - return slug; + return slug.toLowerCase(); } } diff --git a/src/lib/plugins/links.ts b/src/lib/plugins/links.ts index ac0c31b7..5005c6b3 100644 --- a/src/lib/plugins/links.ts +++ b/src/lib/plugins/links.ts @@ -18,12 +18,6 @@ export function handleLinks( const url = getUrl(node.value); if (url && idx) { node.type = 'link'; - // TODO: remove once Sway book is updated - node.url = url.includes( - 'fuelbook.fuel.network/master/quickstart/developer-quickstart' - ) - ? '/guides/quickstart' - : url; node.value = null; node.children = []; node.children.push(parent.children[idx + 1]); @@ -34,7 +28,8 @@ export function handleLinks( newUrl = node.url .replace('.md', '') .replace('/index', '') - .replace('.html', ''); + .replace('.html', '') + .toLowerCase(); const configPath = join(DOCS_DIRECTORY, `../src/config/paths.json`); const pathsConfig = JSON.parse(readFileSync(configPath, 'utf8')); @@ -63,6 +58,9 @@ export function handleLinks( if (node.url.endsWith('CONTRIBUTING') && node.url.includes('github.com')) { newUrl = `${node.url}.md`; } + if (newUrl && newUrl.startsWith('/api/')) { + newUrl = newUrl.replace('/api/', '/docs/fuels-ts/'); + } } return newUrl; From b43caed7291ff21ceba3a1c15d0fcacb8edc740d Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Thu, 17 Aug 2023 14:16:06 -0600 Subject: [PATCH 02/25] fixes --- scripts/generate-links.mjs | 67 +++++++++++++++++++++++++++++--------- src/lib/md-parser.ts | 29 +++++++++++++++-- 2 files changed, 79 insertions(+), 17 deletions(-) diff --git a/scripts/generate-links.mjs b/scripts/generate-links.mjs index dc378ba1..6b016b3b 100644 --- a/scripts/generate-links.mjs +++ b/scripts/generate-links.mjs @@ -58,7 +58,7 @@ async function main() { await Promise.all( Object.keys(orders).map(async (key) => { - const slugs = await getDocs(key); + const slugs = await getDocs(key, orders[key]); const final = slugs.map(({ slug }) => getDocBySlug(slug, slugs)); let sortedLinks = getSortedLinks(orders[key], final); if (key === 'guides') { @@ -103,6 +103,9 @@ function handleVPLine(trimmedLine, lines, index, thisOrder, thisCat) { } else { category = extractData(lines[index - 2]); } + if (newVPOrder.menu.includes(category)) { + category = `API-${category}`; + } newVPOrder.menu.push(category); newVPOrder[category] = []; } else if ( @@ -254,14 +257,14 @@ async function getOrders() { // WALLET ORDER orders.wallet = walletOrderFile; - orders['fuels-ts'] = processVPConfig(tsConfigFile.split(EOL)); - // FORC ORDER const newForcLines = forcLines.map((line) => line.startsWith('-') ? line : line.slice(2, line.length) ); orders.forc = processSummary(newForcLines, 'forc'); + orders['fuels-ts'] = processVPConfig(tsConfigFile.split(EOL)); + return orders; } @@ -312,7 +315,7 @@ function getSortedLinks(config, docs) { links[categoryIdx].hasIndex = true; } submenu.push({ - slug: doc.slug, + slug: doc.slug.toLowerCase(), label: newLabel, }); continue; @@ -322,7 +325,7 @@ function getSortedLinks(config, docs) { hasIndex = true; } const subpath = doc.slug.split('/')[1]; - const submenu = [{ slug: doc.slug, label: doc.title }]; + const submenu = [{ slug: doc.slug.toLowerCase(), label: doc.title }]; links.push({ subpath, label: doc.category, @@ -336,8 +339,14 @@ function getSortedLinks(config, docs) { ? links /** Sort first level links */ .sort((a, b) => { - const lowerA = a.label.toLowerCase().replaceAll(' ', '_'); - const lowerB = b.label.toLowerCase().replaceAll(' ', '_'); + const lowerA = a.label + .toLowerCase() + .replaceAll(' ', '_') + .replaceAll('-', '_'); + const lowerB = b.label + .toLowerCase() + .replaceAll(' ', '_') + .replaceAll('-', '_'); const aIdx = lcOrder.indexOf(lowerA); const bIdx = lcOrder.indexOf(lowerB); @@ -345,12 +354,13 @@ function getSortedLinks(config, docs) { return aIdx - bIdx; } if (a.subpath && b.subpath) { - const aFirst = lcOrder.filter((i) => i.startsWith(lowerA))?.[0]; - const bFirst = lcOrder.filter((i) => i.startsWith(lowerB))?.[0]; + const aFirst = lcOrder.filter((i) => i === lowerA)?.[0]; + const bFirst = lcOrder.filter((i) => i === lowerB)?.[0]; return lcOrder.indexOf(aFirst) - lcOrder.indexOf(bFirst); } - const category = a.subpath ? lowerA : lowerB; - const first = lcOrder.filter((i) => i.startsWith(category))?.[0]; + let category = a.subpath ? lowerA : lowerB; + category = category.replace('-', '_'); + const first = lcOrder.filter((i) => i === category)?.[0]; const idx = lcOrder.indexOf(first); return a.subpath ? idx - bIdx : aIdx - idx; }) @@ -382,7 +392,7 @@ function getSortedLinks(config, docs) { return sortedLinks; } -async function getDocs(key) { +async function getDocs(key, order) { let paths = []; switch (key) { case 'sway': @@ -483,20 +493,43 @@ async function getDocs(key) { cwd: DOCS_DIRECTORY, }); + const duplicateAPIItems = []; + const duplicateAPICategories = []; + order.menu.forEach((item) => { + if (item.startsWith('API-')) { + duplicateAPIItems.push(item); + } + }); + + duplicateAPIItems.forEach((item) => { + const split = item.split('-'); + split.shift(); + const category = split.join('-'); + duplicateAPICategories.push(category); + }); + const final = paths.map((path) => { return { - slug: removeDocsPath(path), + slug: removeDocsPath(path, duplicateAPICategories), path, }; }); return final; } -function removeDocsPath(path) { +function removeDocsPath(path, duplicateAPICategories) { // clean up the url paths const configPath = join(DOCS_DIRECTORY, `../src/config/paths.json`); const pathsConfig = JSON.parse(fs.readFileSync(configPath, 'utf8')); let newPath = path; + duplicateAPICategories.forEach((category) => { + const cat = category.replace(' ', '-'); + const apiPath = `/api/${cat}`; + if (path.includes(apiPath)) { + newPath = path.replace(category, `API-${category}`); + } + }); + Object.keys(pathsConfig).forEach((key) => { newPath = newPath.replaceAll(key, pathsConfig[key]); }); @@ -520,7 +553,7 @@ function removeDocsPath(path) { } } - return newPath.toLowerCase(); + return newPath; } function getDocBySlug(slug, slugs) { @@ -576,6 +609,10 @@ function getDocBySlug(slug, slugs) { doc.title = newLabel; } + if (doc.slug.includes('fuels-ts/API-')) { + doc.category = `API-${doc.category}`; + } + return { ...doc, }; diff --git a/src/lib/md-parser.ts b/src/lib/md-parser.ts index c6fc091f..e7739b20 100644 --- a/src/lib/md-parser.ts +++ b/src/lib/md-parser.ts @@ -1,14 +1,39 @@ -import fs from 'fs'; -import path from 'path'; +import fs, { readFileSync } from 'fs'; +import path, { join } from 'path'; import { DOCS_DIRECTORY } from '../config/constants'; const configPath = path.join(DOCS_DIRECTORY, `../src/config/paths.json`); const pathsConfig = JSON.parse(fs.readFileSync(configPath, 'utf8')); +const linksPath = join( + DOCS_DIRECTORY, + `../src/generated/sidebar-links/fuels-ts.json` +); +const links = JSON.parse(readFileSync(linksPath, 'utf8')); +const duplicateAPICategories: string[] = []; +// eslint-disable-next-line @typescript-eslint/no-explicit-any +links.forEach((linkItem: any) => { + if (linkItem.label.startsWith('API-')) { + duplicateAPICategories.push(linkItem.label); + } +}); + export class DocParser { static createSlug(path: string) { let slug = path; + if (path.includes('/api/') && path.includes('fuels-ts')) { + duplicateAPICategories.forEach((category) => { + const split = category.split('-'); + split.shift(); + const cat = split.join('-'); + const apiPath = `/api/${cat}`; + if (path.includes(apiPath)) { + slug = path.replace(cat, category); + } + }); + } + for (const [key, value] of Object.entries(pathsConfig)) { slug = slug.replaceAll(key, value as string); } From 0d96566b0c796240845e2a3fbdcb9b6a8e6f7857 Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Thu, 17 Aug 2023 15:06:59 -0600 Subject: [PATCH 03/25] fix ts-api links --- src/lib/md-parser.ts | 36 ++++++++++++----------------------- src/lib/plugins/links.ts | 13 +++++++++++++ src/lib/ts-api.ts | 41 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 24 deletions(-) create mode 100644 src/lib/ts-api.ts diff --git a/src/lib/md-parser.ts b/src/lib/md-parser.ts index e7739b20..1e335f44 100644 --- a/src/lib/md-parser.ts +++ b/src/lib/md-parser.ts @@ -1,37 +1,25 @@ -import fs, { readFileSync } from 'fs'; -import path, { join } from 'path'; +import { readFileSync } from 'fs'; +import { join } from 'path'; import { DOCS_DIRECTORY } from '../config/constants'; -const configPath = path.join(DOCS_DIRECTORY, `../src/config/paths.json`); -const pathsConfig = JSON.parse(fs.readFileSync(configPath, 'utf8')); +import { getTSAPIDuplicates } from './ts-api'; -const linksPath = join( - DOCS_DIRECTORY, - `../src/generated/sidebar-links/fuels-ts.json` -); -const links = JSON.parse(readFileSync(linksPath, 'utf8')); -const duplicateAPICategories: string[] = []; -// eslint-disable-next-line @typescript-eslint/no-explicit-any -links.forEach((linkItem: any) => { - if (linkItem.label.startsWith('API-')) { - duplicateAPICategories.push(linkItem.label); - } -}); +const configPath = join(DOCS_DIRECTORY, `../src/config/paths.json`); +const pathsConfig = JSON.parse(readFileSync(configPath, 'utf8')); export class DocParser { static createSlug(path: string) { let slug = path; if (path.includes('/api/') && path.includes('fuels-ts')) { - duplicateAPICategories.forEach((category) => { - const split = category.split('-'); - split.shift(); - const cat = split.join('-'); - const apiPath = `/api/${cat}`; - if (path.includes(apiPath)) { - slug = path.replace(cat, category); + const duplicates = getTSAPIDuplicates(); + duplicates.forEach( + ({ path: apiPath, originalCategory: cat, newCategory: category }) => { + if (path.includes(apiPath)) { + slug = path.replace(cat, category); + } } - }); + ); } for (const [key, value] of Object.entries(pathsConfig)) { diff --git a/src/lib/plugins/links.ts b/src/lib/plugins/links.ts index 5005c6b3..fba72592 100644 --- a/src/lib/plugins/links.ts +++ b/src/lib/plugins/links.ts @@ -3,6 +3,8 @@ import { join } from 'node:path'; import type { Parent } from 'unist-util-visit/lib'; import { DOCS_DIRECTORY } from '../../config/constants'; +import type { DuplicateAPIItem } from '../ts-api'; +import { getTSAPIDuplicates } from '../ts-api'; export function handleLinks( // eslint-disable-next-line @typescript-eslint/no-explicit-any @@ -58,6 +60,17 @@ export function handleLinks( if (node.url.endsWith('CONTRIBUTING') && node.url.includes('github.com')) { newUrl = `${node.url}.md`; } + const duplicates = getTSAPIDuplicates(); + if (newUrl) { + duplicates.forEach((item: DuplicateAPIItem) => { + if (newUrl?.startsWith(item.path.toLowerCase())) { + newUrl = newUrl.replace( + item.originalCategory.toLowerCase(), + item.newCategory.toLowerCase() + ); + } + }); + } if (newUrl && newUrl.startsWith('/api/')) { newUrl = newUrl.replace('/api/', '/docs/fuels-ts/'); } diff --git a/src/lib/ts-api.ts b/src/lib/ts-api.ts new file mode 100644 index 00000000..fd4b67bc --- /dev/null +++ b/src/lib/ts-api.ts @@ -0,0 +1,41 @@ +import { readFileSync } from 'fs'; +import { join } from 'path'; + +import { DOCS_DIRECTORY } from '../config/constants'; + +const linksPath = join( + DOCS_DIRECTORY, + `../src/generated/sidebar-links/fuels-ts.json` +); + +const links = JSON.parse(readFileSync(linksPath, 'utf8')); + +export interface DuplicateAPIItem { + path: string; + originalCategory: string; + newCategory: string; +} + +export function getTSAPIDuplicates() { + const duplicateAPICategories: string[] = []; + const duplicateAPIPaths: DuplicateAPIItem[] = []; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + links.forEach((linkItem: any) => { + if (linkItem.label.startsWith('API-')) { + duplicateAPICategories.push(linkItem.label); + } + }); + + duplicateAPICategories.forEach((category) => { + const split = category.split('-'); + split.shift(); + const cat = split.join('-'); + const apiPath = `/api/${cat}`; + duplicateAPIPaths.push({ + path: apiPath, + originalCategory: cat, + newCategory: category, + }); + }); + return duplicateAPIPaths; +} From a74c56cc179fe565632cff04168b8d2837a36e5d Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Thu, 17 Aug 2023 15:27:11 -0600 Subject: [PATCH 04/25] fix wallet nav --- scripts/generate-links.mjs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/generate-links.mjs b/scripts/generate-links.mjs index 6b016b3b..40dfeb95 100644 --- a/scripts/generate-links.mjs +++ b/scripts/generate-links.mjs @@ -367,13 +367,18 @@ function getSortedLinks(config, docs) { /** Sort categoried links */ .map((link) => { if (!link.submenu) return link; - const key = link.label + let key = link.label .toLowerCase() .replaceAll(' ', '-') .replaceAll('_', '-'); let catOrder = config[key]; if (!catOrder) catOrder = config[key.replaceAll('-', '_')]; - + if (!catOrder) { + const regex = /\/([^/]+)\/[^/]+$/; + const match = link.submenu[0].slug.match(regex); + key = match[1]; + catOrder = config[key]; + } catOrder = catOrder?.map((title) => title.toLowerCase().replaceAll('-', '_').replaceAll(' ', '_') ); From 7c6076ad666d26b79df6a1731324e0d464939f75 Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Thu, 17 Aug 2023 15:56:28 -0600 Subject: [PATCH 05/25] allow nav scroll, refactor capitalized words --- src/lib/str.ts | 17 ++++++++++++----- src/screens/DocPage.tsx | 11 ++++++++++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/lib/str.ts b/src/lib/str.ts index 4e175e84..fe843e62 100644 --- a/src/lib/str.ts +++ b/src/lib/str.ts @@ -17,6 +17,13 @@ const PREPOSITIONS = [ 'as', ]; +const specialCapsWords = [ + { word: 'fuelvm', newWord: 'FuelVM' }, + { word: 'evm', newWord: 'EVM' }, + { word: 'api', newWord: 'API' }, + { word: 'abi', newWord: 'ABI' }, +]; + export function capitalize(val: string): string { if (val.length === 0) { return val; @@ -27,11 +34,11 @@ export function capitalize(val: string): string { const isPrep = PREPOSITIONS.includes(word.toLowerCase()); const isLowerCase = word === word.toLowerCase(); if (isFirstWord || !isPrep || !isLowerCase) { - if (word === 'fuelvm') { - word = 'fuelVM'; - } else if (word === 'evm') { - word = 'eVM'; - } + specialCapsWords.forEach((item) => { + if (word === item.word) { + word = item.newWord; + } + }); return word.charAt(0).toUpperCase() + word.slice(1); } return word; diff --git a/src/screens/DocPage.tsx b/src/screens/DocPage.tsx index 34a24bf0..6d0ad6cf 100644 --- a/src/screens/DocPage.tsx +++ b/src/screens/DocPage.tsx @@ -24,7 +24,7 @@ export function DocScreen(props: DocPageProps) { category={doc.category} > - + @@ -53,6 +53,15 @@ const styles = { display: 'block', }, }), + sidebarContainer: cssObj({ + position: 'sticky', + top: 20, + maxHeight: 'calc(100vh - 40px)', + overflowX: 'auto', + '&::-webkit-scrollbar': { + display: 'none', + }, + }), section: cssObj({ py: '$6', px: '$6', From 445df41eace65dd6d8631ff91b8a7be6d925db30 Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Thu, 17 Aug 2023 16:02:30 -0600 Subject: [PATCH 06/25] refactor build script --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index abbfe1ab..7099cb3b 100644 --- a/package.json +++ b/package.json @@ -4,12 +4,12 @@ "private": true, "scripts": { "build": "next build", - "build:ci": "run-s docs:* build", + "build:ci": "run-s docs:* gen:ts-api build", "check": "run-s lint prettier:check", "check:prod": "run-s lint:prod prettier:check", "docs:sync": "sh ./scripts/sync-repos.sh", "docs:clean": "sh ./scripts/clean-build-files.sh", - "docs:ts-api": "sh ./scripts/ts-api-gen.sh", + "gen:ts-api": "sh ./scripts/ts-api-gen.sh", "deps:update": "updates -gu", "dev": "pnpm generate:links && pnpm generate:components && next dev", "export": "DOCS_DIST=${DOCS_DIST:=dist} next export -o $DOCS_DIST", From a090d5be0eca13dbe466ba42e02ae0f58dc8e8e0 Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Thu, 17 Aug 2023 16:09:21 -0600 Subject: [PATCH 07/25] fix build --- package.json | 4 ++-- scripts/clean-build-files.sh | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 7099cb3b..b9300108 100644 --- a/package.json +++ b/package.json @@ -4,12 +4,12 @@ "private": true, "scripts": { "build": "next build", - "build:ci": "run-s docs:* gen:ts-api build", + "build:ci": "run-s docs:* generate:* build", "check": "run-s lint prettier:check", "check:prod": "run-s lint:prod prettier:check", "docs:sync": "sh ./scripts/sync-repos.sh", "docs:clean": "sh ./scripts/clean-build-files.sh", - "gen:ts-api": "sh ./scripts/ts-api-gen.sh", + "docs:ts-api": "sh ./scripts/ts-api-gen.sh", "deps:update": "updates -gu", "dev": "pnpm generate:links && pnpm generate:components && next dev", "export": "DOCS_DIST=${DOCS_DIST:=dist} next export -o $DOCS_DIST", diff --git a/scripts/clean-build-files.sh b/scripts/clean-build-files.sh index fec6847e..823767b8 100644 --- a/scripts/clean-build-files.sh +++ b/scripts/clean-build-files.sh @@ -3,9 +3,3 @@ # Remove all other files from build folder to reduce deploy size rm -rf ./docs/builds/sway/v* rm -rf ./docs/builds/sway/latest - -# generate sidebar links -pnpm generate:links - -# generate components -pnpm generate:components \ No newline at end of file From 768abc7de96c890b049ec9c22c7eeb7f37c0d11f Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Thu, 17 Aug 2023 16:17:30 -0600 Subject: [PATCH 08/25] try fix --- package.json | 4 ++-- scripts/ts-api-gen.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b9300108..f9330f05 100644 --- a/package.json +++ b/package.json @@ -4,12 +4,12 @@ "private": true, "scripts": { "build": "next build", - "build:ci": "run-s docs:* generate:* build", + "build:ci": "run-s docs:* typedoc:ts-api generate:* build", "check": "run-s lint prettier:check", "check:prod": "run-s lint:prod prettier:check", "docs:sync": "sh ./scripts/sync-repos.sh", "docs:clean": "sh ./scripts/clean-build-files.sh", - "docs:ts-api": "sh ./scripts/ts-api-gen.sh", + "typedoc:ts-api": "sh ./scripts/ts-api-gen.sh", "deps:update": "updates -gu", "dev": "pnpm generate:links && pnpm generate:components && next dev", "export": "DOCS_DIST=${DOCS_DIST:=dist} next export -o $DOCS_DIST", diff --git a/scripts/ts-api-gen.sh b/scripts/ts-api-gen.sh index c5ea32ec..3e5d8d30 100644 --- a/scripts/ts-api-gen.sh +++ b/scripts/ts-api-gen.sh @@ -2,4 +2,4 @@ cd docs/fuels-ts pnpm install pnpm build cd apps/docs -pnpm typedoc && pnpm tsx ./scripts/typedoc-postbuild.ts \ No newline at end of file +pnpm docs \ No newline at end of file From 4cf1843d7668f0b7e8f0edced384d2e62ce0f1e9 Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Thu, 17 Aug 2023 16:24:20 -0600 Subject: [PATCH 09/25] try fix --- scripts/ts-api-gen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ts-api-gen.sh b/scripts/ts-api-gen.sh index 3e5d8d30..e1b9121d 100644 --- a/scripts/ts-api-gen.sh +++ b/scripts/ts-api-gen.sh @@ -1,5 +1,5 @@ cd docs/fuels-ts -pnpm install +NODE_ENV=development pnpm install pnpm build cd apps/docs pnpm docs \ No newline at end of file From f44ca9904c9ad8c765eca723cabc86cb8d961f7a Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Thu, 17 Aug 2023 16:47:01 -0600 Subject: [PATCH 10/25] fix --- scripts/ts-api-gen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ts-api-gen.sh b/scripts/ts-api-gen.sh index e1b9121d..85482c92 100644 --- a/scripts/ts-api-gen.sh +++ b/scripts/ts-api-gen.sh @@ -2,4 +2,4 @@ cd docs/fuels-ts NODE_ENV=development pnpm install pnpm build cd apps/docs -pnpm docs \ No newline at end of file +pnpm run docs \ No newline at end of file From eeab5853631fd36ee24d6612795dce68eef8f97c Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Fri, 18 Aug 2023 13:43:50 -0600 Subject: [PATCH 11/25] rm ts-api docs --- package.json | 2 +- scripts/generate-links.mjs | 42 +++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index f9330f05..c777455d 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "scripts": { "build": "next build", - "build:ci": "run-s docs:* typedoc:ts-api generate:* build", + "build:ci": "run-s docs:* generate:* build", "check": "run-s lint prettier:check", "check:prod": "run-s lint:prod prettier:check", "docs:sync": "sh ./scripts/sync-repos.sh", diff --git a/scripts/generate-links.mjs b/scripts/generate-links.mjs index 40dfeb95..21090075 100644 --- a/scripts/generate-links.mjs +++ b/scripts/generate-links.mjs @@ -29,10 +29,10 @@ const tsConfigPath = join( './fuels-ts/apps/docs/.vitepress/config.ts' ); -const tsAPIOrderPath = join( - DOCS_DIRECTORY, - './fuels-ts/apps/docs/.typedoc/api-links.json' -); +// const tsAPIOrderPath = join( +// DOCS_DIRECTORY, +// './fuels-ts/apps/docs/.typedoc/api-links.json' +// ); const swaySummaryFile = fs.readFileSync(swaySummaryPath, 'utf8'); const rustSummaryFile = fs.readFileSync(rustSummaryPath, 'utf8'); @@ -46,7 +46,7 @@ const walletOrderFile = JSON.parse(fs.readFileSync(walletOrderPath, 'utf8')); // fs.readFileSync(aboutFuelOrderPath, 'utf8') // ); const tsConfigFile = fs.readFileSync(tsConfigPath, 'utf8'); -const tsAPIOrderFile = fs.readFileSync(tsAPIOrderPath, 'utf8'); +// const tsAPIOrderFile = fs.readFileSync(tsAPIOrderPath, 'utf8'); const forcLines = []; @@ -137,22 +137,22 @@ function handleVPLine(trimmedLine, lines, index, thisOrder, thisCat) { } } } else if (trimmedLine.startsWith('apiLinks')) { - // handle API order - newVPOrder.menu.push('API'); - const apiJSON = JSON.parse(tsAPIOrderFile); - const apiLines = JSON.stringify(apiJSON, null, 2).split(EOL); - apiLines.forEach((apiLine, apiIndex) => { - const trimmedAPILine = apiLine.trimStart(); - const results = handleVPLine( - trimmedAPILine, - apiLines, - apiIndex, - newVPOrder, - category - ); - category = results.category; - newVPOrder = results.newVPOrder; - }); + // // handle API order + // newVPOrder.menu.push('API'); + // const apiJSON = JSON.parse(tsAPIOrderFile); + // const apiLines = JSON.stringify(apiJSON, null, 2).split(EOL); + // apiLines.forEach((apiLine, apiIndex) => { + // const trimmedAPILine = apiLine.trimStart(); + // const results = handleVPLine( + // trimmedAPILine, + // apiLines, + // apiIndex, + // newVPOrder, + // category + // ); + // category = results.category; + // newVPOrder = results.newVPOrder; + // }); } return { newVPOrder, category }; From 3bcd5effd489f2bc97c7f87c30a4003f96e3a840 Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Mon, 21 Aug 2023 08:16:57 -0600 Subject: [PATCH 12/25] update repos, add ts-api section back --- .gitmodules | 1 + docs/builds/sway | 2 +- docs/fuel-indexer | 2 +- docs/fuels-ts | 2 +- docs/fuelup | 2 +- docs/sway | 2 +- package.json | 1 - scripts/generate-links.mjs | 42 +++++++++++++++++++------------------- scripts/ts-api-gen.sh | 5 ----- 9 files changed, 27 insertions(+), 32 deletions(-) delete mode 100644 scripts/ts-api-gen.sh diff --git a/.gitmodules b/.gitmodules index d1c9eb60..7dfa1202 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,7 @@ [submodule "docs/fuels-ts"] path = docs/fuels-ts url = https://github.com/FuelLabs/fuels-ts + branch = docs [submodule "docs/builds/sway"] path = docs/builds/sway url = https://github.com/FuelLabs/sway.git diff --git a/docs/builds/sway b/docs/builds/sway index df84677d..c1d86206 160000 --- a/docs/builds/sway +++ b/docs/builds/sway @@ -1 +1 @@ -Subproject commit df84677dbe123add96bbe31157cd96e8a364e647 +Subproject commit c1d862068009340aeaf59d75e8966f9538182f22 diff --git a/docs/fuel-indexer b/docs/fuel-indexer index 4c3362dd..97692a59 160000 --- a/docs/fuel-indexer +++ b/docs/fuel-indexer @@ -1 +1 @@ -Subproject commit 4c3362dd1bd64996cd7f0525c613ca8f8cb74929 +Subproject commit 97692a59b9e14ad1229e7faad21950a307244da5 diff --git a/docs/fuels-ts b/docs/fuels-ts index 0dc052a1..c370bea2 160000 --- a/docs/fuels-ts +++ b/docs/fuels-ts @@ -1 +1 @@ -Subproject commit 0dc052a171a25bc21515ebf8de21b150fe27d712 +Subproject commit c370bea26aa9ac91e6ed41253ea039b93ec26544 diff --git a/docs/fuelup b/docs/fuelup index bc34cf2b..5c73a230 160000 --- a/docs/fuelup +++ b/docs/fuelup @@ -1 +1 @@ -Subproject commit bc34cf2b45c40b2b58acfc674814d31b8601a285 +Subproject commit 5c73a230c3c8b2cb87f28abddfea663056fda1a3 diff --git a/docs/sway b/docs/sway index 04a59709..8991a258 160000 --- a/docs/sway +++ b/docs/sway @@ -1 +1 @@ -Subproject commit 04a597093e7441898933dd412b8e4dc6ac860cd3 +Subproject commit 8991a2582a1f35bb332dd0613a339b75d0bad72f diff --git a/package.json b/package.json index 927f1ecc..a7648ffb 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "check:prod": "run-s lint:prod prettier:check", "docs:sync": "sh ./scripts/sync-repos.sh", "docs:clean": "sh ./scripts/clean-build-files.sh", - "typedoc:ts-api": "sh ./scripts/ts-api-gen.sh", "deps:update": "updates -gu", "dev": "pnpm generate:links && pnpm generate:components && next dev", "export": "DOCS_DIST=${DOCS_DIST:=dist} next export -o $DOCS_DIST", diff --git a/scripts/generate-links.mjs b/scripts/generate-links.mjs index 21090075..40dfeb95 100644 --- a/scripts/generate-links.mjs +++ b/scripts/generate-links.mjs @@ -29,10 +29,10 @@ const tsConfigPath = join( './fuels-ts/apps/docs/.vitepress/config.ts' ); -// const tsAPIOrderPath = join( -// DOCS_DIRECTORY, -// './fuels-ts/apps/docs/.typedoc/api-links.json' -// ); +const tsAPIOrderPath = join( + DOCS_DIRECTORY, + './fuels-ts/apps/docs/.typedoc/api-links.json' +); const swaySummaryFile = fs.readFileSync(swaySummaryPath, 'utf8'); const rustSummaryFile = fs.readFileSync(rustSummaryPath, 'utf8'); @@ -46,7 +46,7 @@ const walletOrderFile = JSON.parse(fs.readFileSync(walletOrderPath, 'utf8')); // fs.readFileSync(aboutFuelOrderPath, 'utf8') // ); const tsConfigFile = fs.readFileSync(tsConfigPath, 'utf8'); -// const tsAPIOrderFile = fs.readFileSync(tsAPIOrderPath, 'utf8'); +const tsAPIOrderFile = fs.readFileSync(tsAPIOrderPath, 'utf8'); const forcLines = []; @@ -137,22 +137,22 @@ function handleVPLine(trimmedLine, lines, index, thisOrder, thisCat) { } } } else if (trimmedLine.startsWith('apiLinks')) { - // // handle API order - // newVPOrder.menu.push('API'); - // const apiJSON = JSON.parse(tsAPIOrderFile); - // const apiLines = JSON.stringify(apiJSON, null, 2).split(EOL); - // apiLines.forEach((apiLine, apiIndex) => { - // const trimmedAPILine = apiLine.trimStart(); - // const results = handleVPLine( - // trimmedAPILine, - // apiLines, - // apiIndex, - // newVPOrder, - // category - // ); - // category = results.category; - // newVPOrder = results.newVPOrder; - // }); + // handle API order + newVPOrder.menu.push('API'); + const apiJSON = JSON.parse(tsAPIOrderFile); + const apiLines = JSON.stringify(apiJSON, null, 2).split(EOL); + apiLines.forEach((apiLine, apiIndex) => { + const trimmedAPILine = apiLine.trimStart(); + const results = handleVPLine( + trimmedAPILine, + apiLines, + apiIndex, + newVPOrder, + category + ); + category = results.category; + newVPOrder = results.newVPOrder; + }); } return { newVPOrder, category }; diff --git a/scripts/ts-api-gen.sh b/scripts/ts-api-gen.sh deleted file mode 100644 index 85482c92..00000000 --- a/scripts/ts-api-gen.sh +++ /dev/null @@ -1,5 +0,0 @@ -cd docs/fuels-ts -NODE_ENV=development pnpm install -pnpm build -cd apps/docs -pnpm run docs \ No newline at end of file From ec3b66e71a2a993305040da1b52d35ca278d7d1b Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Mon, 21 Aug 2023 10:04:34 -0600 Subject: [PATCH 13/25] update graphql-docs to beta-4 --- docs/fuel-graphql-docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/fuel-graphql-docs b/docs/fuel-graphql-docs index 398330f6..ae8e85cd 160000 --- a/docs/fuel-graphql-docs +++ b/docs/fuel-graphql-docs @@ -1 +1 @@ -Subproject commit 398330f6d7f471096818d7ee6a92fe41d52dd888 +Subproject commit ae8e85cd49702c865c11fd0be6589a5e636cbec6 From 31b173550c09e4b6f225d4e0c494370f1f9b9852 Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Thu, 24 Aug 2023 15:05:18 -0600 Subject: [PATCH 14/25] fix button intents, add Sway Core link --- docs/fuel-graphql-docs | 2 +- src/components/MobileMenu.tsx | 1 + src/config/constants.ts | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/fuel-graphql-docs b/docs/fuel-graphql-docs index ae8e85cd..4cbf648e 160000 --- a/docs/fuel-graphql-docs +++ b/docs/fuel-graphql-docs @@ -1 +1 @@ -Subproject commit ae8e85cd49702c865c11fd0be6589a5e636cbec6 +Subproject commit 4cbf648e45843538f47fb65e4bec203ef1a7d00f diff --git a/src/components/MobileMenu.tsx b/src/components/MobileMenu.tsx index 1e9b4603..e107c34c 100644 --- a/src/components/MobileMenu.tsx +++ b/src/components/MobileMenu.tsx @@ -149,6 +149,7 @@ function MenuButton({ item, active }: MenuButtonProps) { Date: Fri, 25 Aug 2023 09:06:33 -0600 Subject: [PATCH 15/25] add sway-core to front page --- src/screens/HomePage.tsx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/screens/HomePage.tsx b/src/screens/HomePage.tsx index 254363ff..0c4bb0ee 100644 --- a/src/screens/HomePage.tsx +++ b/src/screens/HomePage.tsx @@ -12,8 +12,8 @@ export function HomePage() { Sway Language - Build powerful programs with a Rust-based DSL, but without - needlessly verbose boilerplate. + Build powerful programs with a Rust-based DSL, without needlessly + verbose boilerplate. @@ -35,6 +35,14 @@ export function HomePage() { Examples Apps + + + Sway Core + + @@ -154,6 +162,7 @@ const styles = { padding: '$4 $6 $6', border: '1px solid $border', borderRadius: '$md', + minHeight: '210px', '& > .fuel_Icon': { mt: '3px', From e480d9638f12f08e48d01a424c3326eaf7a9160a Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Fri, 25 Aug 2023 14:11:37 -0600 Subject: [PATCH 16/25] capitalize graphQL --- src/lib/str.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/str.ts b/src/lib/str.ts index fe843e62..78da7a7a 100644 --- a/src/lib/str.ts +++ b/src/lib/str.ts @@ -22,6 +22,7 @@ const specialCapsWords = [ { word: 'evm', newWord: 'EVM' }, { word: 'api', newWord: 'API' }, { word: 'abi', newWord: 'ABI' }, + { word: 'graphql', newWord: 'graphQL' }, ]; export function capitalize(val: string): string { From f6b02c18796f951080d86416f3d231fb8958ccaf Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Wed, 30 Aug 2023 08:51:41 -0600 Subject: [PATCH 17/25] cleanup --- src/components/Layout.tsx | 1 + src/components/Sidebar.tsx | 2 +- src/components/SidebarLink.tsx | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx index b57efd1f..6b29b56c 100644 --- a/src/components/Layout.tsx +++ b/src/components/Layout.tsx @@ -109,6 +109,7 @@ const styles = { '& .Layout--section': { maxWidth: 'calc(100vw - 442px)', + maxHeight: 'calc(100vh - 190px)', }, }, }, diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx index 43080dd3..120dd080 100644 --- a/src/components/Sidebar.tsx +++ b/src/components/Sidebar.tsx @@ -8,7 +8,7 @@ import { styles as linkStyles, SidebarLink } from './SidebarLink'; import { SidebarSubmenu } from './SidebarSubmenu'; interface SidebarProps { - handleClick: Dispatch>; + handleClick?: Dispatch>; } export function Sidebar({ handleClick }: SidebarProps) { diff --git a/src/components/SidebarLink.tsx b/src/components/SidebarLink.tsx index 8f9fe5c6..42128c1b 100644 --- a/src/components/SidebarLink.tsx +++ b/src/components/SidebarLink.tsx @@ -34,7 +34,7 @@ function getActive(pathname: string, slug: string) { export type SidebarLinkProps = ButtonLinkProps & { item: SidebarLinkItem; isActiveMenu?: boolean; - handleClick: Dispatch>; + handleClick?: Dispatch>; }; // eslint-disable-next-line react/display-name From d4414647dd641167e2c14210cc697e1be07fa3f5 Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Wed, 30 Aug 2023 08:54:34 -0600 Subject: [PATCH 18/25] fix audit --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index a7648ffb..69d922c9 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,8 @@ "pnpm": { "overrides": { "semver@<7.5.2": ">=7.5.2", - "word-wrap": "npm:@aashutoshrathi/word-wrap" + "word-wrap": "npm:@aashutoshrathi/word-wrap", + "@adobe/css-tools@<4.3.1": ">=4.3.1" } } } From b76505c0d979c266fde2eddb9bc11370e370605e Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Wed, 30 Aug 2023 09:49:29 -0600 Subject: [PATCH 19/25] update wallet repo --- .gitmodules | 1 - docs/fuels-wallet | 2 +- pnpm-lock.yaml | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7dfa1202..04c7b81e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,7 +18,6 @@ [submodule "docs/fuels-wallet"] path = docs/fuels-wallet url = https://github.com/FuelLabs/fuels-wallet.git - branch = release [submodule "docs/fuelup"] path = docs/fuelup url = https://github.com/FuelLabs/fuelup.git diff --git a/docs/fuels-wallet b/docs/fuels-wallet index 7b92baf7..fe3ca53c 160000 --- a/docs/fuels-wallet +++ b/docs/fuels-wallet @@ -1 +1 @@ -Subproject commit 7b92baf77526944c0788af13bb0a2bb01ae123c4 +Subproject commit fe3ca53c923c303572ce01cf2ff8da2e7ec2c73d diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ea6f2d9d..c3a69cb4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,6 +7,7 @@ settings: overrides: semver@<7.5.2: '>=7.5.2' word-wrap: npm:@aashutoshrathi/word-wrap + '@adobe/css-tools@<4.3.1': '>=4.3.1' dependencies: '@docsearch/css': From f26c8cb48fab0a39f3d78d87c418437f23ea172f Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Thu, 31 Aug 2023 08:24:54 -0600 Subject: [PATCH 20/25] update fuel-ui config --- package.json | 5 +- pnpm-lock.yaml | 1083 ++++++++++++++++++++++++------------------------ 2 files changed, 553 insertions(+), 535 deletions(-) diff --git a/package.json b/package.json index 69d922c9..108e9e0d 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "dependencies": { "@docsearch/css": "^3.5.1", "@docsearch/react": "3.5.1", - "@fuel-ui/config": "^0.16.1", + "@fuel-ui/config": "^0.17.0", "@fuel-ui/css": "^0.16.1", "@fuel-ui/react": "^0.16.1", "@fuel-wallet/sdk": "^0.11.2", @@ -110,8 +110,7 @@ "pnpm": { "overrides": { "semver@<7.5.2": ">=7.5.2", - "word-wrap": "npm:@aashutoshrathi/word-wrap", - "@adobe/css-tools@<4.3.1": ">=4.3.1" + "word-wrap": "npm:@aashutoshrathi/word-wrap" } } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c3a69cb4..1c57fcd9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,7 +7,6 @@ settings: overrides: semver@<7.5.2: '>=7.5.2' word-wrap: npm:@aashutoshrathi/word-wrap - '@adobe/css-tools@<4.3.1': '>=4.3.1' dependencies: '@docsearch/css': @@ -17,14 +16,14 @@ dependencies: specifier: 3.5.1 version: 3.5.1(@algolia/client-search@4.19.1)(@types/react@18.2.16)(react-dom@18.2.0)(react@18.2.0)(search-insights@2.7.0) '@fuel-ui/config': - specifier: ^0.16.1 - version: 0.16.1(typescript@5.1.6) + specifier: ^0.17.0 + version: 0.17.0(@testing-library/dom@9.3.1)(typescript@5.1.6) '@fuel-ui/css': specifier: ^0.16.1 version: 0.16.1 '@fuel-ui/react': specifier: ^0.16.1 - version: 0.16.1(@babel/core@7.22.6)(@types/node@20.4.5)(@types/react-dom@18.2.7)(@types/react@18.2.16)(csstype@3.1.2)(esbuild@0.19.0)(typescript@5.1.6) + version: 0.16.1(@babel/core@7.22.11)(@types/node@20.4.5)(@types/react-dom@18.2.7)(@types/react@18.2.16)(csstype@3.1.2)(esbuild@0.19.0)(typescript@5.1.6) '@fuel-wallet/sdk': specifier: ^0.11.2 version: 0.11.2(dexie@3.2.4)(fuels@0.49.1) @@ -93,7 +92,7 @@ dependencies: version: 7.2.0 next: specifier: 13.4.12 - version: 13.4.12(@babel/core@7.22.6)(@opentelemetry/api@1.4.1)(react-dom@18.2.0)(react@18.2.0) + version: 13.4.12(@babel/core@7.22.11)(@opentelemetry/api@1.4.1)(react-dom@18.2.0)(react@18.2.0) next-contentlayer: specifier: ^0.3.4 version: 0.3.4(contentlayer@0.3.4)(esbuild@0.19.0)(next@13.4.12)(react-dom@18.2.0)(react@18.2.0) @@ -253,8 +252,8 @@ packages: resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==} engines: {node: '>=0.10.0'} - /@adobe/css-tools@4.2.0: - resolution: {integrity: sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA==} + /@adobe/css-tools@4.3.1: + resolution: {integrity: sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==} dev: false /@algolia/autocomplete-core@1.9.3(@algolia/client-search@4.19.1)(algoliasearch@4.18.0)(search-insights@2.7.0): @@ -431,7 +430,15 @@ packages: engines: {node: '>=6.0.0'} dependencies: '@jridgewell/gen-mapping': 0.3.3 - '@jridgewell/trace-mapping': 0.3.18 + '@jridgewell/trace-mapping': 0.3.19 + dev: false + + /@babel/code-frame@7.22.13: + resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/highlight': 7.22.13 + chalk: 2.4.2 dev: false /@babel/code-frame@7.22.5: @@ -440,56 +447,53 @@ packages: dependencies: '@babel/highlight': 7.22.5 - /@babel/compat-data@7.22.6: - resolution: {integrity: sha512-29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg==} + /@babel/compat-data@7.22.9: + resolution: {integrity: sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==} engines: {node: '>=6.9.0'} dev: false - /@babel/core@7.22.6: - resolution: {integrity: sha512-HPIyDa6n+HKw5dEuway3vVAhBboYCtREBMp+IWeseZy6TFtzn6MHkCH2KKYUOC/vKKwgSMHQW4htBOrmuRPXfw==} + /@babel/core@7.22.11: + resolution: {integrity: sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==} engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.2.1 - '@babel/code-frame': 7.22.5 - '@babel/generator': 7.22.5 - '@babel/helper-compilation-targets': 7.22.6(@babel/core@7.22.6) - '@babel/helper-module-transforms': 7.22.5 - '@babel/helpers': 7.22.6 - '@babel/parser': 7.22.7 + '@babel/code-frame': 7.22.13 + '@babel/generator': 7.22.10 + '@babel/helper-compilation-targets': 7.22.10 + '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11) + '@babel/helpers': 7.22.11 + '@babel/parser': 7.22.14 '@babel/template': 7.22.5 - '@babel/traverse': 7.22.6 - '@babel/types': 7.22.5 - '@nicolo-ribaudo/semver-v6': 6.3.3 + '@babel/traverse': 7.22.11 + '@babel/types': 7.22.11 convert-source-map: 1.9.0 debug: 4.3.4 gensync: 1.0.0-beta.2 json5: 2.2.3 + semver: 7.5.4 transitivePeerDependencies: - supports-color dev: false - /@babel/generator@7.22.5: - resolution: {integrity: sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==} + /@babel/generator@7.22.10: + resolution: {integrity: sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.22.5 + '@babel/types': 7.22.11 '@jridgewell/gen-mapping': 0.3.3 - '@jridgewell/trace-mapping': 0.3.18 + '@jridgewell/trace-mapping': 0.3.19 jsesc: 2.5.2 dev: false - /@babel/helper-compilation-targets@7.22.6(@babel/core@7.22.6): - resolution: {integrity: sha512-534sYEqWD9VfUm3IPn2SLcH4Q3P86XL+QvqdC7ZsFrzyyPF3T4XGiVghF6PTYNdWg6pXuoqXxNQAhbYeEInTzA==} + /@babel/helper-compilation-targets@7.22.10: + resolution: {integrity: sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==} engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 dependencies: - '@babel/compat-data': 7.22.6 - '@babel/core': 7.22.6 + '@babel/compat-data': 7.22.9 '@babel/helper-validator-option': 7.22.5 - '@nicolo-ribaudo/semver-v6': 6.3.3 - browserslist: 4.21.9 + browserslist: 4.21.10 lru-cache: 5.1.1 + semver: 7.5.4 dev: false /@babel/helper-environment-visitor@7.22.5: @@ -502,37 +506,35 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.22.5 - '@babel/types': 7.22.5 + '@babel/types': 7.22.11 dev: false /@babel/helper-hoist-variables@7.22.5: resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.22.5 + '@babel/types': 7.22.11 dev: false /@babel/helper-module-imports@7.22.5: resolution: {integrity: sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.22.5 + '@babel/types': 7.22.11 dev: false - /@babel/helper-module-transforms@7.22.5: - resolution: {integrity: sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==} + /@babel/helper-module-transforms@7.22.9(@babel/core@7.22.11): + resolution: {integrity: sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==} engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 dependencies: + '@babel/core': 7.22.11 '@babel/helper-environment-visitor': 7.22.5 '@babel/helper-module-imports': 7.22.5 '@babel/helper-simple-access': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 '@babel/helper-validator-identifier': 7.22.5 - '@babel/template': 7.22.5 - '@babel/traverse': 7.22.6 - '@babel/types': 7.22.5 - transitivePeerDependencies: - - supports-color dev: false /@babel/helper-plugin-utils@7.22.5: @@ -544,14 +546,14 @@ packages: resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.22.5 + '@babel/types': 7.22.11 dev: false /@babel/helper-split-export-declaration@7.22.6: resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.22.5 + '@babel/types': 7.22.11 dev: false /@babel/helper-string-parser@7.22.5: @@ -568,17 +570,26 @@ packages: engines: {node: '>=6.9.0'} dev: false - /@babel/helpers@7.22.6: - resolution: {integrity: sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==} + /@babel/helpers@7.22.11: + resolution: {integrity: sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==} engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.22.5 - '@babel/traverse': 7.22.6 - '@babel/types': 7.22.5 + '@babel/traverse': 7.22.11 + '@babel/types': 7.22.11 transitivePeerDependencies: - supports-color dev: false + /@babel/highlight@7.22.13: + resolution: {integrity: sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-validator-identifier': 7.22.5 + chalk: 2.4.2 + js-tokens: 4.0.0 + dev: false + /@babel/highlight@7.22.5: resolution: {integrity: sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==} engines: {node: '>=6.9.0'} @@ -587,140 +598,140 @@ packages: chalk: 2.4.2 js-tokens: 4.0.0 - /@babel/parser@7.22.7: - resolution: {integrity: sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==} + /@babel/parser@7.22.14: + resolution: {integrity: sha512-1KucTHgOvaw/LzCVrEOAyXkr9rQlp0A1HiHRYnSUE9dmb8PvPW7o5sscg+5169r54n3vGlbx6GevTE/Iw/P3AQ==} engines: {node: '>=6.0.0'} hasBin: true dependencies: - '@babel/types': 7.22.5 + '@babel/types': 7.22.11 dev: false - /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.22.6): + /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.22.11): resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.22.6): + /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.22.11): resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.22.6): + /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.22.11): resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.22.6): + /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.22.11): resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.22.6): + /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.22.11): resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.22.6): + /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.22.6): + /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.22.11): resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.22.6): + /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.22.11): resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.22.6): + /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.22.11): resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.22.6): + /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.22.11): resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.22.6): + /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.22.11): resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.22.6): + /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.22.11): resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.22.6): + /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.22.11): resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.22.6): + /@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 dev: false @@ -734,31 +745,31 @@ packages: resolution: {integrity: sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.22.5 - '@babel/parser': 7.22.7 - '@babel/types': 7.22.5 + '@babel/code-frame': 7.22.13 + '@babel/parser': 7.22.14 + '@babel/types': 7.22.11 dev: false - /@babel/traverse@7.22.6: - resolution: {integrity: sha512-53CijMvKlLIDlOTrdWiHileRddlIiwUIyCKqYa7lYnnPldXCG5dUSN38uT0cA6i7rHWNKJLH0VU/Kxdr1GzB3w==} + /@babel/traverse@7.22.11: + resolution: {integrity: sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.22.5 - '@babel/generator': 7.22.5 + '@babel/code-frame': 7.22.13 + '@babel/generator': 7.22.10 '@babel/helper-environment-visitor': 7.22.5 '@babel/helper-function-name': 7.22.5 '@babel/helper-hoist-variables': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 - '@babel/parser': 7.22.7 - '@babel/types': 7.22.5 + '@babel/parser': 7.22.14 + '@babel/types': 7.22.11 debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: - supports-color dev: false - /@babel/types@7.22.5: - resolution: {integrity: sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==} + /@babel/types@7.22.11: + resolution: {integrity: sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-string-parser': 7.22.5 @@ -1767,8 +1778,8 @@ packages: resolution: {integrity: sha512-7nt00VvEo48/KZvrzQZlowBPPkpKIvL9hn5xdth1rcj5ybOTO1BrQo1xGOUf3F6xFpJxX9WYoZDh5ZG8Z1ECjA==} dev: false - /@fuel-ui/config@0.16.1(typescript@5.1.6): - resolution: {integrity: sha512-Hj4urQBr5jYm0KFrUJvdTbCKnEQESAaS1z1MxHFhe6m+5/tCHRwDnakzi9Cur+5xYXrqpDZlranJ1fZY71NgNA==} + /@fuel-ui/config@0.17.0(@testing-library/dom@9.3.1)(typescript@5.1.6): + resolution: {integrity: sha512-3kJNmSmhLdPtyHPNOOvwMpvRQHgJXoOY96YOkNtscdIX118GfqUxMg10pqFHPwZNnMvaCl+5EdSyiv2QZpxVBQ==} dependencies: '@typescript-eslint/eslint-plugin': 5.61.0(@typescript-eslint/parser@5.61.0)(eslint@8.45.0)(typescript@5.1.6) '@typescript-eslint/parser': 5.61.0(eslint@8.45.0)(typescript@5.1.6) @@ -1778,7 +1789,7 @@ packages: eslint-config-prettier: 8.8.0(eslint@8.45.0) eslint-plugin-eslint-comments: 3.2.0(eslint@8.45.0) eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.61.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0) - eslint-plugin-jest-dom: 4.0.3(eslint@8.45.0) + eslint-plugin-jest-dom: 5.0.1(@testing-library/dom@9.3.1)(eslint@8.45.0) eslint-plugin-jsx-a11y: 6.7.1(eslint@8.45.0) eslint-plugin-prettier: 4.2.1(eslint-config-prettier@8.8.0)(eslint@8.45.0)(prettier@2.8.8) eslint-plugin-react: 7.33.0(eslint@8.45.0) @@ -1788,6 +1799,7 @@ packages: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) transitivePeerDependencies: + - '@testing-library/dom' - eslint-import-resolver-typescript - eslint-import-resolver-webpack - supports-color @@ -1813,12 +1825,12 @@ packages: lodash: 4.17.21 dev: false - /@fuel-ui/react@0.16.1(@babel/core@7.22.6)(@types/node@20.4.5)(@types/react-dom@18.2.7)(@types/react@18.2.16)(csstype@3.1.2)(esbuild@0.19.0)(typescript@5.1.6): + /@fuel-ui/react@0.16.1(@babel/core@7.22.11)(@types/node@20.4.5)(@types/react-dom@18.2.7)(@types/react@18.2.16)(csstype@3.1.2)(esbuild@0.19.0)(typescript@5.1.6): resolution: {integrity: sha512-0OZa/6mZ5l2MhI88wJHU4IBqOGFkhXEUJf4+qKvCbSe4zQ8D+/0mOu856Ddq32KPrjae7THMR8aS2Z7+MYjcKg==} dependencies: '@fuel-ts/math': 0.42.0 '@fuel-ui/css': 0.16.1 - '@fuel-ui/test-utils': 0.16.1(@babel/core@7.22.6)(@types/node@20.4.5)(esbuild@0.19.0)(react@18.2.0)(typescript@5.1.6) + '@fuel-ui/test-utils': 0.16.1(@babel/core@7.22.11)(@types/node@20.4.5)(esbuild@0.19.0)(react@18.2.0)(typescript@5.1.6) '@radix-ui/react-accordion': 1.1.2(@types/react-dom@18.2.7)(@types/react@18.2.16)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-alert-dialog': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.16)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-aspect-ratio': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.16)(react-dom@18.2.0)(react@18.2.0) @@ -1836,10 +1848,10 @@ packages: '@react-aria/overlays': 3.15.0(react-dom@18.2.0)(react@18.2.0) '@react-aria/utils': 3.18.0(react@18.2.0) '@storybook/global': 5.0.0 - '@tabler/icons-react': 2.23.0(react@18.2.0) - '@xstate/react': 3.2.2(@types/react@18.2.16)(react@18.2.0)(xstate@4.38.0) + '@tabler/icons-react': 2.32.0(react@18.2.0) + '@xstate/react': 3.2.2(@types/react@18.2.16)(react@18.2.0)(xstate@4.38.2) deepmerge-json: 1.5.0 - framer-motion: 10.13.1(react-dom@18.2.0)(react@18.2.0) + framer-motion: 10.16.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-aria: 3.26.0(react-dom@18.2.0)(react@18.2.0) react-content-loader: 6.2.1(react@18.2.0) @@ -1848,8 +1860,8 @@ packages: react-number-format: 5.2.2(react-dom@18.2.0)(react@18.2.0) react-stately: 3.24.0(react@18.2.0) react-use: 17.4.0(react-dom@18.2.0)(react@18.2.0) - xstate: 4.38.0 - zustand: 4.3.9(react@18.2.0) + xstate: 4.38.2 + zustand: 4.4.1(@types/react@18.2.16)(react@18.2.0) transitivePeerDependencies: - '@babel/core' - '@jest/types' @@ -1858,6 +1870,7 @@ packages: - '@types/react-dom' - '@xstate/fsm' - babel-jest + - babel-plugin-macros - bufferutil - canvas - csstype @@ -1870,31 +1883,32 @@ packages: - utf-8-validate dev: false - /@fuel-ui/test-utils@0.16.1(@babel/core@7.22.6)(@types/node@20.4.5)(esbuild@0.19.0)(react@18.2.0)(typescript@5.1.6): + /@fuel-ui/test-utils@0.16.1(@babel/core@7.22.11)(@types/node@20.4.5)(esbuild@0.19.0)(react@18.2.0)(typescript@5.1.6): resolution: {integrity: sha512-osQgH9aKK/BwBvPQ4yYmqR0YIdI5RbJ4e4ZcfODFIijWv08Jc1u/RSaDqpyhNzCkwI7163GSH3JQyBgcuqjoXw==} peerDependencies: react: '>=18.2.0' dependencies: '@testing-library/dom': 9.3.1 - '@testing-library/jest-dom': 5.16.5 + '@testing-library/jest-dom': 5.17.0 '@testing-library/react': 14.0.0(react-dom@18.2.0)(react@18.2.0) '@testing-library/user-event': 14.4.3(@testing-library/dom@9.3.1) identity-obj-proxy: 3.0.0 - jest: 29.6.0(@types/node@20.4.5) + jest: 29.6.4(@types/node@20.4.5) jest-axe: 7.0.1 - jest-environment-jsdom: 29.6.0 + jest-environment-jsdom: 29.6.4 jest-fail-on-console: 3.1.1 - jest-matcher-utils: 29.6.0 + jest-matcher-utils: 29.6.4 jest-transform-stub: 2.0.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) resize-observer-polyfill: 1.5.1 - ts-jest: 29.1.1(@babel/core@7.22.6)(esbuild@0.19.0)(jest@29.6.0)(typescript@5.1.6) + ts-jest: 29.1.1(@babel/core@7.22.11)(esbuild@0.19.0)(jest@29.6.4)(typescript@5.1.6) transitivePeerDependencies: - '@babel/core' - '@jest/types' - '@types/node' - babel-jest + - babel-plugin-macros - bufferutil - canvas - esbuild @@ -2068,20 +2082,20 @@ packages: engines: {node: '>=8'} dev: false - /@jest/console@29.6.0: - resolution: {integrity: sha512-anb6L1yg7uPQpytNVA5skRaXy3BmrsU8icRhTVNbWdjYWDDfy8M1Kq5HIVRpYoABdbpqsc5Dr+jtu4+qWRQBiQ==} + /@jest/console@29.6.4: + resolution: {integrity: sha512-wNK6gC0Ha9QeEPSkeJedQuTQqxZYnDPuDcDhVuVatRvMkL4D0VTvFVZj+Yuh6caG2aOfzkUZ36KtCmLNtR02hw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/types': 29.6.0 + '@jest/types': 29.6.3 '@types/node': 20.4.5 chalk: 4.1.2 - jest-message-util: 29.6.0 - jest-util: 29.6.0 + jest-message-util: 29.6.3 + jest-util: 29.6.3 slash: 3.0.0 dev: false - /@jest/core@29.6.0: - resolution: {integrity: sha512-5dbMHfY/5R9m8NbgmB3JlxQqooZ/ooPSOiwEQZZ+HODwJTbIu37seVcZNBK29aMdXtjvTRB3f6LCvkKq+r8uQA==} + /@jest/core@29.6.4: + resolution: {integrity: sha512-U/vq5ccNTSVgYH7mHnodHmCffGWHJnz/E1BEWlLuK5pM4FZmGfBn/nrJGLjUsSmyx3otCeqc1T31F4y08AMDLg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 @@ -2089,92 +2103,93 @@ packages: node-notifier: optional: true dependencies: - '@jest/console': 29.6.0 - '@jest/reporters': 29.6.0 - '@jest/test-result': 29.6.0 - '@jest/transform': 29.6.0 - '@jest/types': 29.6.0 + '@jest/console': 29.6.4 + '@jest/reporters': 29.6.4 + '@jest/test-result': 29.6.4 + '@jest/transform': 29.6.4 + '@jest/types': 29.6.3 '@types/node': 20.4.5 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.8.0 exit: 0.1.2 graceful-fs: 4.2.11 - jest-changed-files: 29.5.0 - jest-config: 29.6.0(@types/node@20.4.5) - jest-haste-map: 29.6.0 - jest-message-util: 29.6.0 - jest-regex-util: 29.4.3 - jest-resolve: 29.6.0 - jest-resolve-dependencies: 29.6.0 - jest-runner: 29.6.0 - jest-runtime: 29.6.0 - jest-snapshot: 29.6.0 - jest-util: 29.6.0 - jest-validate: 29.6.0 - jest-watcher: 29.6.0 + jest-changed-files: 29.6.3 + jest-config: 29.6.4(@types/node@20.4.5) + jest-haste-map: 29.6.4 + jest-message-util: 29.6.3 + jest-regex-util: 29.6.3 + jest-resolve: 29.6.4 + jest-resolve-dependencies: 29.6.4 + jest-runner: 29.6.4 + jest-runtime: 29.6.4 + jest-snapshot: 29.6.4 + jest-util: 29.6.3 + jest-validate: 29.6.3 + jest-watcher: 29.6.4 micromatch: 4.0.5 - pretty-format: 29.6.0 + pretty-format: 29.6.3 slash: 3.0.0 strip-ansi: 6.0.1 transitivePeerDependencies: + - babel-plugin-macros - supports-color - ts-node dev: false - /@jest/environment@29.6.0: - resolution: {integrity: sha512-bUZLYUxYlUIsslBbxII0fq0kr1+friI3Gty+cRLmocGB1jdcAHs7FS8QdCDqedE8q4DZE1g/AJHH6OJZBLGGsg==} + /@jest/environment@29.6.4: + resolution: {integrity: sha512-sQ0SULEjA1XUTHmkBRl7A1dyITM9yb1yb3ZNKPX3KlTd6IG7mWUe3e2yfExtC2Zz1Q+mMckOLHmL/qLiuQJrBQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/fake-timers': 29.6.0 - '@jest/types': 29.6.0 + '@jest/fake-timers': 29.6.4 + '@jest/types': 29.6.3 '@types/node': 20.4.5 - jest-mock: 29.6.0 + jest-mock: 29.6.3 dev: false - /@jest/expect-utils@29.6.0: - resolution: {integrity: sha512-LLSQQN7oypMSETKoPWpsWYVKJd9LQWmSDDAc4hUQ4JocVC7LAMy9R3ZMhlnLwbcFvQORZnZR7HM893Px6cJhvA==} + /@jest/expect-utils@29.6.4: + resolution: {integrity: sha512-FEhkJhqtvBwgSpiTrocquJCdXPsyvNKcl/n7A3u7X4pVoF4bswm11c9d4AV+kfq2Gpv/mM8x7E7DsRvH+djkrg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - jest-get-type: 29.4.3 + jest-get-type: 29.6.3 dev: false - /@jest/expect@29.6.0: - resolution: {integrity: sha512-a7pISPW28Q3c0/pLwz4mQ6tbAI+hc8/0CJp9ix6e9U4dQ6TiHQX82CT5DV5BMWaw8bFH4E6zsfZxXdn6Ka23Bw==} + /@jest/expect@29.6.4: + resolution: {integrity: sha512-Warhsa7d23+3X5bLbrbYvaehcgX5TLYhI03JKoedTiI8uJU4IhqYBWF7OSSgUyz4IgLpUYPkK0AehA5/fRclAA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - expect: 29.6.0 - jest-snapshot: 29.6.0 + expect: 29.6.4 + jest-snapshot: 29.6.4 transitivePeerDependencies: - supports-color dev: false - /@jest/fake-timers@29.6.0: - resolution: {integrity: sha512-nuCU46AsZoskthWSDS2Aj6LARgyNcp5Fjx2qxsO/fPl1Wp1CJ+dBDqs0OkEcJK8FBeV/MbjH5efe79M2sHcV+A==} + /@jest/fake-timers@29.6.4: + resolution: {integrity: sha512-6UkCwzoBK60edXIIWb0/KWkuj7R7Qq91vVInOe3De6DSpaEiqjKcJw4F7XUet24Wupahj9J6PlR09JqJ5ySDHw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/types': 29.6.0 + '@jest/types': 29.6.3 '@sinonjs/fake-timers': 10.3.0 '@types/node': 20.4.5 - jest-message-util: 29.6.0 - jest-mock: 29.6.0 - jest-util: 29.6.0 + jest-message-util: 29.6.3 + jest-mock: 29.6.3 + jest-util: 29.6.3 dev: false - /@jest/globals@29.6.0: - resolution: {integrity: sha512-IQQ3hZ2D/hwEwXSMv5GbfhzdH0nTQR3KPYxnuW6gYWbd6+7/zgMz7Okn6EgBbNtJNONq03k5EKA6HqGyzRbpeg==} + /@jest/globals@29.6.4: + resolution: {integrity: sha512-wVIn5bdtjlChhXAzVXavcY/3PEjf4VqM174BM3eGL5kMxLiZD5CLnbmkEyA1Dwh9q8XjP6E8RwjBsY/iCWrWsA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/environment': 29.6.0 - '@jest/expect': 29.6.0 - '@jest/types': 29.6.0 - jest-mock: 29.6.0 + '@jest/environment': 29.6.4 + '@jest/expect': 29.6.4 + '@jest/types': 29.6.3 + jest-mock: 29.6.3 transitivePeerDependencies: - supports-color dev: false - /@jest/reporters@29.6.0: - resolution: {integrity: sha512-dWEq4HI0VvHcAD6XTtyBKKARLytyyWPIy1SvGOcU91106MfvHPdxZgupFwVHd8TFpZPpA3SebYjtwS5BUS76Rw==} + /@jest/reporters@29.6.4: + resolution: {integrity: sha512-sxUjWxm7QdchdrD3NfWKrL8FBsortZeibSJv4XLjESOOjSUOkjQcb0ZHJwfhEGIvBvTluTzfG2yZWZhkrXJu8g==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 @@ -2183,11 +2198,11 @@ packages: optional: true dependencies: '@bcoe/v8-coverage': 0.2.3 - '@jest/console': 29.6.0 - '@jest/test-result': 29.6.0 - '@jest/transform': 29.6.0 - '@jest/types': 29.6.0 - '@jridgewell/trace-mapping': 0.3.18 + '@jest/console': 29.6.4 + '@jest/test-result': 29.6.4 + '@jest/transform': 29.6.4 + '@jest/types': 29.6.3 + '@jridgewell/trace-mapping': 0.3.19 '@types/node': 20.4.5 chalk: 4.1.2 collect-v8-coverage: 1.0.2 @@ -2195,13 +2210,13 @@ packages: glob: 7.2.3 graceful-fs: 4.2.11 istanbul-lib-coverage: 3.2.0 - istanbul-lib-instrument: 5.2.1 - istanbul-lib-report: 3.0.0 + istanbul-lib-instrument: 6.0.0 + istanbul-lib-report: 3.0.1 istanbul-lib-source-maps: 4.0.1 - istanbul-reports: 3.1.5 - jest-message-util: 29.6.0 - jest-util: 29.6.0 - jest-worker: 29.6.0 + istanbul-reports: 3.1.6 + jest-message-util: 29.6.3 + jest-util: 29.6.3 + jest-worker: 29.6.4 slash: 3.0.0 string-length: 4.0.2 strip-ansi: 6.0.1 @@ -2210,57 +2225,57 @@ packages: - supports-color dev: false - /@jest/schemas@29.6.0: - resolution: {integrity: sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==} + /@jest/schemas@29.6.3: + resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@sinclair/typebox': 0.27.8 dev: false - /@jest/source-map@29.6.0: - resolution: {integrity: sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==} + /@jest/source-map@29.6.3: + resolution: {integrity: sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jridgewell/trace-mapping': 0.3.18 + '@jridgewell/trace-mapping': 0.3.19 callsites: 3.1.0 graceful-fs: 4.2.11 dev: false - /@jest/test-result@29.6.0: - resolution: {integrity: sha512-9qLb7xITeyWhM4yatn2muqfomuoCTOhv0QV9i7XiIyYi3QLfnvPv5NeJp5u0PZeutAOROMLKakOkmoAisOr3YQ==} + /@jest/test-result@29.6.4: + resolution: {integrity: sha512-uQ1C0AUEN90/dsyEirgMLlouROgSY+Wc/JanVVk0OiUKa5UFh7sJpMEM3aoUBAz2BRNvUJ8j3d294WFuRxSyOQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/console': 29.6.0 - '@jest/types': 29.6.0 + '@jest/console': 29.6.4 + '@jest/types': 29.6.3 '@types/istanbul-lib-coverage': 2.0.4 collect-v8-coverage: 1.0.2 dev: false - /@jest/test-sequencer@29.6.0: - resolution: {integrity: sha512-HYCS3LKRQotKWj2mnA3AN13PPevYZu8MJKm12lzYojpJNnn6kI/3PWmr1At/e3tUu+FHQDiOyaDVuR4EV3ezBw==} + /@jest/test-sequencer@29.6.4: + resolution: {integrity: sha512-E84M6LbpcRq3fT4ckfKs9ryVanwkaIB0Ws9bw3/yP4seRLg/VaCZ/LgW0MCq5wwk4/iP/qnilD41aj2fsw2RMg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/test-result': 29.6.0 + '@jest/test-result': 29.6.4 graceful-fs: 4.2.11 - jest-haste-map: 29.6.0 + jest-haste-map: 29.6.4 slash: 3.0.0 dev: false - /@jest/transform@29.6.0: - resolution: {integrity: sha512-bhP/KxPo3e322FJ0nKAcb6WVK76ZYyQd1lWygJzoSqP8SYMSLdxHqP4wnPTI4WvbB8PKPDV30y5y7Tya4RHOBA==} + /@jest/transform@29.6.4: + resolution: {integrity: sha512-8thgRSiXUqtr/pPGY/OsyHuMjGyhVnWrFAwoxmIemlBuiMyU1WFs0tXoNxzcr4A4uErs/ABre76SGmrr5ab/AA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@babel/core': 7.22.6 - '@jest/types': 29.6.0 - '@jridgewell/trace-mapping': 0.3.18 + '@babel/core': 7.22.11 + '@jest/types': 29.6.3 + '@jridgewell/trace-mapping': 0.3.19 babel-plugin-istanbul: 6.1.1 chalk: 4.1.2 convert-source-map: 2.0.0 fast-json-stable-stringify: 2.1.0 graceful-fs: 4.2.11 - jest-haste-map: 29.6.0 - jest-regex-util: 29.4.3 - jest-util: 29.6.0 + jest-haste-map: 29.6.4 + jest-regex-util: 29.6.3 + jest-util: 29.6.3 micromatch: 4.0.5 pirates: 4.0.6 slash: 3.0.0 @@ -2269,11 +2284,11 @@ packages: - supports-color dev: false - /@jest/types@29.6.0: - resolution: {integrity: sha512-8XCgL9JhqbJTFnMRjEAO+TuW251+MoMd5BSzLiE3vvzpQ8RlBxy8NoyNkDhs3K3OL3HeVinlOl9or5p7GTeOLg==} + /@jest/types@29.6.3: + resolution: {integrity: sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/schemas': 29.6.0 + '@jest/schemas': 29.6.3 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 '@types/node': 20.4.5 @@ -2287,11 +2302,11 @@ packages: dependencies: '@jridgewell/set-array': 1.1.2 '@jridgewell/sourcemap-codec': 1.4.15 - '@jridgewell/trace-mapping': 0.3.18 + '@jridgewell/trace-mapping': 0.3.19 dev: false - /@jridgewell/resolve-uri@3.1.0: - resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==} + /@jridgewell/resolve-uri@3.1.1: + resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==} engines: {node: '>=6.0.0'} dev: false @@ -2300,19 +2315,15 @@ packages: engines: {node: '>=6.0.0'} dev: false - /@jridgewell/sourcemap-codec@1.4.14: - resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==} - dev: false - /@jridgewell/sourcemap-codec@1.4.15: resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} dev: false - /@jridgewell/trace-mapping@0.3.18: - resolution: {integrity: sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==} + /@jridgewell/trace-mapping@0.3.19: + resolution: {integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==} dependencies: - '@jridgewell/resolve-uri': 3.1.0 - '@jridgewell/sourcemap-codec': 1.4.14 + '@jridgewell/resolve-uri': 3.1.1 + '@jridgewell/sourcemap-codec': 1.4.15 dev: false /@js-temporal/polyfill@0.4.4: @@ -2460,11 +2471,6 @@ packages: dev: false optional: true - /@nicolo-ribaudo/semver-v6@6.3.3: - resolution: {integrity: sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==} - hasBin: true - dev: false - /@nodelib/fs.scandir@2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -4810,32 +4816,18 @@ packages: tslib: 2.6.0 dev: false - /@tabler/icons-react@2.23.0(react@18.2.0): - resolution: {integrity: sha512-+H4mC1EZVCzCRhnPwZEVTI0veVCJuAKlopeCnRlfsYcmzgJm6Ye234c4A2qrLPQoi1Y29uN9+kqCyuYW007jPg==} + /@tabler/icons-react@2.32.0(react@18.2.0): + resolution: {integrity: sha512-B6op3r/up+QRiB3CQOo8wqF5FNv+hG8dEWmBnO1v5KRjubGKLFRpBldQ6rjqfsdg/QW+jvcZQ5OMEEcA0tOPIA==} peerDependencies: react: ^16.5.1 || ^17.0.0 || ^18.0.0 dependencies: - '@tabler/icons': 2.23.0 + '@tabler/icons': 2.32.0 prop-types: 15.8.1 react: 18.2.0 dev: false - /@tabler/icons@2.23.0: - resolution: {integrity: sha512-dU54aBwaxG0H+jQ4BdrqtYFN5L7PZevvlnzyL6XeOZgfDS3+sVNCtuG3JmpTEqQSwGLYC1IEwogPGA/Iit2bOA==} - dev: false - - /@testing-library/dom@8.20.1: - resolution: {integrity: sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g==} - engines: {node: '>=12'} - dependencies: - '@babel/code-frame': 7.22.5 - '@babel/runtime': 7.22.6 - '@types/aria-query': 5.0.1 - aria-query: 5.1.3 - chalk: 4.1.2 - dom-accessibility-api: 0.5.16 - lz-string: 1.5.0 - pretty-format: 27.5.1 + /@tabler/icons@2.32.0: + resolution: {integrity: sha512-w1oNvrnqFipoBEy2/0X4/IHo2aLsijuz4QRi/HizxqiaoMfmWG5X2DpEYTw9WnGvFmixpu/rtQsQAr7Wr0Mc2w==} dev: false /@testing-library/dom@9.3.1: @@ -4851,13 +4843,13 @@ packages: lz-string: 1.5.0 pretty-format: 27.5.1 - /@testing-library/jest-dom@5.16.5: - resolution: {integrity: sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA==} + /@testing-library/jest-dom@5.17.0: + resolution: {integrity: sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg==} engines: {node: '>=8', npm: '>=6', yarn: '>=1'} dependencies: - '@adobe/css-tools': 4.2.0 + '@adobe/css-tools': 4.3.1 '@babel/runtime': 7.22.6 - '@types/testing-library__jest-dom': 5.14.6 + '@types/testing-library__jest-dom': 5.14.9 aria-query: 5.3.0 chalk: 3.0.0 css.escape: 1.5.1 @@ -4906,8 +4898,8 @@ packages: /@types/babel__core@7.20.1: resolution: {integrity: sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==} dependencies: - '@babel/parser': 7.22.7 - '@babel/types': 7.22.5 + '@babel/parser': 7.22.14 + '@babel/types': 7.22.11 '@types/babel__generator': 7.6.4 '@types/babel__template': 7.4.1 '@types/babel__traverse': 7.20.1 @@ -4916,20 +4908,20 @@ packages: /@types/babel__generator@7.6.4: resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==} dependencies: - '@babel/types': 7.22.5 + '@babel/types': 7.22.11 dev: false /@types/babel__template@7.4.1: resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==} dependencies: - '@babel/parser': 7.22.7 - '@babel/types': 7.22.5 + '@babel/parser': 7.22.14 + '@babel/types': 7.22.11 dev: false /@types/babel__traverse@7.20.1: resolution: {integrity: sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==} dependencies: - '@babel/types': 7.22.5 + '@babel/types': 7.22.11 dev: false /@types/bn.js@5.1.1: @@ -5014,11 +5006,11 @@ packages: '@types/istanbul-lib-report': 3.0.0 dev: false - /@types/jest@29.5.2: - resolution: {integrity: sha512-mSoZVJF5YzGVCk+FsDxzDuH7s+SCkzrgKZzf0Z0T2WudhBUPoF6ktoTPC4R0ZoCPCV5xUvuU6ias5NvxcBcMMg==} + /@types/jest@29.5.4: + resolution: {integrity: sha512-PhglGmhWeD46FYOVLt3X7TiWjzwuVGW9wG/4qocPevXMjCmrIc5b6db9WjeGE4QYVpUAWMDv3v0IiBwObY289A==} dependencies: - expect: 29.6.0 - pretty-format: 29.6.0 + expect: 29.6.4 + pretty-format: 29.6.3 dev: false /@types/js-cookie@2.2.7: @@ -5064,10 +5056,6 @@ packages: resolution: {integrity: sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==} dev: false - /@types/prettier@2.7.3: - resolution: {integrity: sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==} - dev: false - /@types/prop-types@15.7.5: resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==} @@ -5103,10 +5091,10 @@ packages: resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==} dev: false - /@types/testing-library__jest-dom@5.14.6: - resolution: {integrity: sha512-FkHXCb+ikSoUP4Y4rOslzTdX5sqYwMxfefKh1GmZ8ce1GOkEHntSp6b5cGadmNfp5e4BMEWOMx+WSKd5/MqlDA==} + /@types/testing-library__jest-dom@5.14.9: + resolution: {integrity: sha512-FSYhIjFlfOpGSRyVoMBMuS3ws5ehFQODymf3vlI7U1K8c7PHwWwFY7VREfmsuzHSOnoKs/9/Y983ayOs7eRzqw==} dependencies: - '@types/jest': 29.5.2 + '@types/jest': 29.5.4 dev: false /@types/tough-cookie@4.0.2: @@ -5387,7 +5375,7 @@ packages: resolution: {integrity: sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==} dev: false - /@xstate/react@3.2.2(@types/react@18.2.16)(react@18.2.0)(xstate@4.38.0): + /@xstate/react@3.2.2(@types/react@18.2.16)(react@18.2.0)(xstate@4.38.2): resolution: {integrity: sha512-feghXWLedyq8JeL13yda3XnHPZKwYDN5HPBLykpLeuNpr9178tQd2/3d0NrH6gSd0sG5mLuLeuD+ck830fgzLQ==} peerDependencies: '@xstate/fsm': ^2.0.0 @@ -5402,7 +5390,7 @@ packages: react: 18.2.0 use-isomorphic-layout-effect: 1.1.2(@types/react@18.2.16)(react@18.2.0) use-sync-external-store: 1.2.0(react@18.2.0) - xstate: 4.38.0 + xstate: 4.38.2 transitivePeerDependencies: - '@types/react' dev: false @@ -5648,17 +5636,17 @@ packages: resolution: {integrity: sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==} dev: true - /babel-jest@29.6.0(@babel/core@7.22.6): - resolution: {integrity: sha512-Jj8Bq2yKsk11XLk06Nm8SdvYkAcecH+GuhxB8DnK5SncjHnJ88TQjSnGgE7jpajpnSvz9DZ6X8hXrDkD/6/TPQ==} + /babel-jest@29.6.4(@babel/core@7.22.11): + resolution: {integrity: sha512-meLj23UlSLddj6PC+YTOFRgDAtjnZom8w/ACsrx0gtPtv5cJZk0A5Unk5bV4wixD7XaPCN1fQvpww8czkZURmw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: '@babel/core': ^7.8.0 dependencies: - '@babel/core': 7.22.6 - '@jest/transform': 29.6.0 + '@babel/core': 7.22.11 + '@jest/transform': 29.6.4 '@types/babel__core': 7.20.1 babel-plugin-istanbul: 6.1.1 - babel-preset-jest: 29.5.0(@babel/core@7.22.6) + babel-preset-jest: 29.6.3(@babel/core@7.22.11) chalk: 4.1.2 graceful-fs: 4.2.11 slash: 3.0.0 @@ -5679,45 +5667,45 @@ packages: - supports-color dev: false - /babel-plugin-jest-hoist@29.5.0: - resolution: {integrity: sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==} + /babel-plugin-jest-hoist@29.6.3: + resolution: {integrity: sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@babel/template': 7.22.5 - '@babel/types': 7.22.5 + '@babel/types': 7.22.11 '@types/babel__core': 7.20.1 '@types/babel__traverse': 7.20.1 dev: false - /babel-preset-current-node-syntax@1.0.1(@babel/core@7.22.6): + /babel-preset-current-node-syntax@1.0.1(@babel/core@7.22.11): resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.22.6 - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.6) - '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.22.6) - '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.22.6) - '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.22.6) - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.6) - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.6) - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.6) - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.6) - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.6) - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.6) - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.6) - '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.22.6) - dev: false - - /babel-preset-jest@29.5.0(@babel/core@7.22.6): - resolution: {integrity: sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==} + '@babel/core': 7.22.11 + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.11) + '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.22.11) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.22.11) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.11) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.11) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.22.11) + dev: false + + /babel-preset-jest@29.6.3(@babel/core@7.22.11): + resolution: {integrity: sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.22.6 - babel-plugin-jest-hoist: 29.5.0 - babel-preset-current-node-syntax: 1.0.1(@babel/core@7.22.6) + '@babel/core': 7.22.11 + babel-plugin-jest-hoist: 29.6.3 + babel-preset-current-node-syntax: 1.0.1(@babel/core@7.22.11) dev: false /bail@2.0.2: @@ -5792,15 +5780,15 @@ packages: resolution: {integrity: sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==} dev: false - /browserslist@4.21.9: - resolution: {integrity: sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==} + /browserslist@4.21.10: + resolution: {integrity: sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001512 - electron-to-chromium: 1.4.450 - node-releases: 2.0.12 - update-browserslist-db: 1.0.11(browserslist@4.21.9) + caniuse-lite: 1.0.30001525 + electron-to-chromium: 1.4.506 + node-releases: 2.0.13 + update-browserslist-db: 1.0.11(browserslist@4.21.10) dev: false /bs-logger@0.2.6: @@ -5871,6 +5859,10 @@ packages: resolution: {integrity: sha512-2S9nK0G/mE+jasCUsMPlARhRCts1ebcp2Ji8Y8PWi4NDE1iRdLCnEPHkEfeBrGC45L4isBx5ur3IQ6yTE2mRZw==} dev: false + /caniuse-lite@1.0.30001525: + resolution: {integrity: sha512-/3z+wB4icFt3r0USMwxujAqRvaD/B7rvGTsKhbhSQErVrJvkZCLhgNLJxU8MevahQVH6hCU9FsHdNUFbiwmE7Q==} + dev: false + /ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} dev: false @@ -6298,8 +6290,13 @@ packages: mimic-response: 3.1.0 dev: true - /dedent@0.7.0: - resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==} + /dedent@1.5.1: + resolution: {integrity: sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==} + peerDependencies: + babel-plugin-macros: ^3.1.0 + peerDependenciesMeta: + babel-plugin-macros: + optional: true dev: false /deep-equal@2.2.1: @@ -6405,8 +6402,8 @@ packages: engines: {node: '>=6.0'} dev: false - /diff-sequences@29.4.3: - resolution: {integrity: sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==} + /diff-sequences@29.6.3: + resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dev: false @@ -6478,8 +6475,8 @@ packages: /eastasianwidth@0.2.0: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} - /electron-to-chromium@1.4.450: - resolution: {integrity: sha512-BLG5HxSELlrMx7dJ2s+8SFlsCtJp37Zpk2VAxyC6CZtbc+9AJeZHfYHbrlSgdXp6saQ8StMqOTEDaBKgA7u1sw==} + /electron-to-chromium@1.4.506: + resolution: {integrity: sha512-xxGct4GPAKSRlrLBtJxJFYy74W11zX6PO9GyHgl/U+2s3Dp0ZEwAklDfNHXOWcvH7zWMpsmgbR0ggEuaYAVvHA==} dev: false /elliptic@6.5.4: @@ -6936,18 +6933,6 @@ packages: - eslint-import-resolver-webpack - supports-color - /eslint-plugin-jest-dom@4.0.3(eslint@8.45.0): - resolution: {integrity: sha512-9j+n8uj0+V0tmsoS7bYC7fLhQmIvjRqRYEcbDSi+TKPsTThLLXCyj5swMSSf/hTleeMktACnn+HFqXBr5gbcbA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6', yarn: '>=1'} - peerDependencies: - eslint: ^6.8.0 || ^7.0.0 || ^8.0.0 - dependencies: - '@babel/runtime': 7.22.6 - '@testing-library/dom': 8.20.1 - eslint: 8.45.0 - requireindex: 1.2.0 - dev: false - /eslint-plugin-jest-dom@5.0.1(@testing-library/dom@9.3.1)(eslint@8.45.0): resolution: {integrity: sha512-zD/BjNk12R5R9cxIu8oa2HfNeDSknI3ewtN8nygIUMQuieWDnTY9Np//6a1Z3G7Y3dx3l45hCUR4EphsgRmUtA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6', yarn: '>=1'} @@ -7289,16 +7274,15 @@ packages: engines: {node: '>=6'} dev: true - /expect@29.6.0: - resolution: {integrity: sha512-AV+HaBtnDJ2YEUhPPo25HyUHBLaetM+y/Dq6pEC8VPQyt1dK+k8MfGkMy46djy2bddcqESc1kl4/K1uLWSfk9g==} + /expect@29.6.4: + resolution: {integrity: sha512-F2W2UyQ8XYyftHT57dtfg8Ue3X5qLgm2sSug0ivvLRH/VKNRL/pDxg/TH7zVzbQB0tu80clNFy6LU7OS/VSEKA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/expect-utils': 29.6.0 - '@types/node': 20.4.5 - jest-get-type: 29.4.3 - jest-matcher-utils: 29.6.0 - jest-message-util: 29.6.0 - jest-util: 29.6.0 + '@jest/expect-utils': 29.6.4 + jest-get-type: 29.6.3 + jest-matcher-utils: 29.6.4 + jest-message-util: 29.6.3 + jest-util: 29.6.3 dev: false /extend-shallow@2.0.1: @@ -7478,6 +7462,24 @@ packages: '@emotion/is-prop-valid': 0.8.8 dev: false + /framer-motion@10.16.2(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-aY6L9YMvqMWtfOQptaUvvr8dp97jskXY5UYLQM0vOPxKeERrG/Z034EIQZ/52u7MeCT0HlCQy3/l0HdUZCB9Tw==} + peerDependencies: + react: ^18.0.0 + react-dom: ^18.0.0 + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + dependencies: + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + tslib: 2.6.0 + optionalDependencies: + '@emotion/is-prop-valid': 0.8.8 + dev: false + /fs-constants@1.0.0: resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} dev: true @@ -8380,8 +8382,8 @@ packages: resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==} engines: {node: '>=8'} dependencies: - '@babel/core': 7.22.6 - '@babel/parser': 7.22.7 + '@babel/core': 7.22.11 + '@babel/parser': 7.22.14 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.0 semver: 7.5.4 @@ -8389,12 +8391,25 @@ packages: - supports-color dev: false - /istanbul-lib-report@3.0.0: - resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==} - engines: {node: '>=8'} + /istanbul-lib-instrument@6.0.0: + resolution: {integrity: sha512-x58orMzEVfzPUKqlbLd1hXCnySCxKdDKa6Rjg97CwuLLRI4g3FHTdnExu1OqffVFay6zeMW+T6/DowFLndWnIw==} + engines: {node: '>=10'} dependencies: + '@babel/core': 7.22.11 + '@babel/parser': 7.22.14 + '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.0 - make-dir: 3.1.0 + semver: 7.5.4 + transitivePeerDependencies: + - supports-color + dev: false + + /istanbul-lib-report@3.0.1: + resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==} + engines: {node: '>=10'} + dependencies: + istanbul-lib-coverage: 3.2.0 + make-dir: 4.0.0 supports-color: 7.2.0 dev: false @@ -8409,12 +8424,12 @@ packages: - supports-color dev: false - /istanbul-reports@3.1.5: - resolution: {integrity: sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==} + /istanbul-reports@3.1.6: + resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==} engines: {node: '>=8'} dependencies: html-escaper: 2.0.2 - istanbul-lib-report: 3.0.0 + istanbul-lib-report: 3.0.1 dev: false /jackspeak@2.2.1: @@ -8436,44 +8451,46 @@ packages: lodash.merge: 4.6.2 dev: false - /jest-changed-files@29.5.0: - resolution: {integrity: sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==} + /jest-changed-files@29.6.3: + resolution: {integrity: sha512-G5wDnElqLa4/c66ma5PG9eRjE342lIbF6SUnTJi26C3J28Fv2TVY2rOyKB9YGbSA5ogwevgmxc4j4aVjrEK6Yg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: execa: 5.1.1 + jest-util: 29.6.3 p-limit: 3.1.0 dev: false - /jest-circus@29.6.0: - resolution: {integrity: sha512-LtG45qEKhse2Ws5zNR4DnZATReLGQXzBZGZnJ0DU37p6d4wDhu41vvczCQ3Ou+llR6CRYDBshsubV7H4jZvIkw==} + /jest-circus@29.6.4: + resolution: {integrity: sha512-YXNrRyntVUgDfZbjXWBMPslX1mQ8MrSG0oM/Y06j9EYubODIyHWP8hMUbjbZ19M3M+zamqEur7O80HODwACoJw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/environment': 29.6.0 - '@jest/expect': 29.6.0 - '@jest/test-result': 29.6.0 - '@jest/types': 29.6.0 + '@jest/environment': 29.6.4 + '@jest/expect': 29.6.4 + '@jest/test-result': 29.6.4 + '@jest/types': 29.6.3 '@types/node': 20.4.5 chalk: 4.1.2 co: 4.6.0 - dedent: 0.7.0 + dedent: 1.5.1 is-generator-fn: 2.1.0 - jest-each: 29.6.0 - jest-matcher-utils: 29.6.0 - jest-message-util: 29.6.0 - jest-runtime: 29.6.0 - jest-snapshot: 29.6.0 - jest-util: 29.6.0 + jest-each: 29.6.3 + jest-matcher-utils: 29.6.4 + jest-message-util: 29.6.3 + jest-runtime: 29.6.4 + jest-snapshot: 29.6.4 + jest-util: 29.6.3 p-limit: 3.1.0 - pretty-format: 29.6.0 + pretty-format: 29.6.3 pure-rand: 6.0.2 slash: 3.0.0 stack-utils: 2.0.6 transitivePeerDependencies: + - babel-plugin-macros - supports-color dev: false - /jest-cli@29.6.0(@types/node@20.4.5): - resolution: {integrity: sha512-WvZIaanK/abkw6s01924DQ2QLwM5Q4Y4iPbSDb9Zg6smyXGqqcPQ7ft9X8D7B0jICz312eSzM6UlQNxuZJBrMw==} + /jest-cli@29.6.4(@types/node@20.4.5): + resolution: {integrity: sha512-+uMCQ7oizMmh8ZwRfZzKIEszFY9ksjjEQnTEMTaL7fYiL3Kw4XhqT9bYh+A4DQKUb67hZn2KbtEnDuHvcgK4pQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true peerDependencies: @@ -8482,26 +8499,27 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 29.6.0 - '@jest/test-result': 29.6.0 - '@jest/types': 29.6.0 + '@jest/core': 29.6.4 + '@jest/test-result': 29.6.4 + '@jest/types': 29.6.3 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 import-local: 3.1.0 - jest-config: 29.6.0(@types/node@20.4.5) - jest-util: 29.6.0 - jest-validate: 29.6.0 + jest-config: 29.6.4(@types/node@20.4.5) + jest-util: 29.6.3 + jest-validate: 29.6.3 prompts: 2.4.2 yargs: 17.7.2 transitivePeerDependencies: - '@types/node' + - babel-plugin-macros - supports-color - ts-node dev: false - /jest-config@29.6.0(@types/node@20.4.5): - resolution: {integrity: sha512-fKA4jM91PDqWVkMpb1FVKxIuhg3hC6hgaen57cr1rRZkR96dCatvJZsk3ik7/GNu9ERj9wgAspOmyvkFoGsZhA==} + /jest-config@29.6.4(@types/node@20.4.5): + resolution: {integrity: sha512-JWohr3i9m2cVpBumQFv2akMEnFEPVOh+9L2xIBJhJ0zOaci2ZXuKJj0tgMKQCBZAKA09H049IR4HVS/43Qb19A==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: '@types/node': '*' @@ -8512,63 +8530,64 @@ packages: ts-node: optional: true dependencies: - '@babel/core': 7.22.6 - '@jest/test-sequencer': 29.6.0 - '@jest/types': 29.6.0 + '@babel/core': 7.22.11 + '@jest/test-sequencer': 29.6.4 + '@jest/types': 29.6.3 '@types/node': 20.4.5 - babel-jest: 29.6.0(@babel/core@7.22.6) + babel-jest: 29.6.4(@babel/core@7.22.11) chalk: 4.1.2 ci-info: 3.8.0 deepmerge: 4.3.1 glob: 7.2.3 graceful-fs: 4.2.11 - jest-circus: 29.6.0 - jest-environment-node: 29.6.0 - jest-get-type: 29.4.3 - jest-regex-util: 29.4.3 - jest-resolve: 29.6.0 - jest-runner: 29.6.0 - jest-util: 29.6.0 - jest-validate: 29.6.0 + jest-circus: 29.6.4 + jest-environment-node: 29.6.4 + jest-get-type: 29.6.3 + jest-regex-util: 29.6.3 + jest-resolve: 29.6.4 + jest-runner: 29.6.4 + jest-util: 29.6.3 + jest-validate: 29.6.3 micromatch: 4.0.5 parse-json: 5.2.0 - pretty-format: 29.6.0 + pretty-format: 29.6.3 slash: 3.0.0 strip-json-comments: 3.1.1 transitivePeerDependencies: + - babel-plugin-macros - supports-color dev: false - /jest-diff@29.6.0: - resolution: {integrity: sha512-ZRm7cd2m9YyZ0N3iMyuo1iUiprxQ/MFpYWXzEEj7hjzL3WnDffKW8192XBDcrAI8j7hnrM1wed3bL/oEnYF/8w==} + /jest-diff@29.6.4: + resolution: {integrity: sha512-9F48UxR9e4XOEZvoUXEHSWY4qC4zERJaOfrbBg9JpbJOO43R1vN76REt/aMGZoY6GD5g84nnJiBIVlscegefpw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: chalk: 4.1.2 - diff-sequences: 29.4.3 - jest-get-type: 29.4.3 - pretty-format: 29.6.0 + diff-sequences: 29.6.3 + jest-get-type: 29.6.3 + pretty-format: 29.6.3 dev: false - /jest-docblock@29.4.3: - resolution: {integrity: sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==} + /jest-docblock@29.6.3: + resolution: {integrity: sha512-2+H+GOTQBEm2+qFSQ7Ma+BvyV+waiIFxmZF5LdpBsAEjWX8QYjSCa4FrkIYtbfXUJJJnFCYrOtt6TZ+IAiTjBQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: detect-newline: 3.1.0 dev: false - /jest-each@29.6.0: - resolution: {integrity: sha512-d0Jem4RBAlFUyV6JSXPSHVUpNo5RleSj+iJEy1G3+ZCrzHDjWs/1jUfrbnJKHdJdAx5BCEce/Ju379WqHhQk4w==} + /jest-each@29.6.3: + resolution: {integrity: sha512-KoXfJ42k8cqbkfshW7sSHcdfnv5agDdHCPA87ZBdmHP+zJstTJc0ttQaJ/x7zK6noAL76hOuTIJ6ZkQRS5dcyg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/types': 29.6.0 + '@jest/types': 29.6.3 chalk: 4.1.2 - jest-get-type: 29.4.3 - jest-util: 29.6.0 - pretty-format: 29.6.0 + jest-get-type: 29.6.3 + jest-util: 29.6.3 + pretty-format: 29.6.3 dev: false - /jest-environment-jsdom@29.6.0: - resolution: {integrity: sha512-/cOhoyv+uMbOh4nQPyqtkPas/uUxr5AbK6TPqMMFyj1qEJURY78RhqgBjOFIX02+Lvu5V0RWLq2qKY1dHubFOQ==} + /jest-environment-jsdom@29.6.4: + resolution: {integrity: sha512-K6wfgUJ16DoMs02JYFid9lOsqfpoVtyJxpRlnTxUHzvZWBnnh2VNGRB9EC1Cro96TQdq5TtSjb3qUjNaJP9IyA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: canvas: ^2.5.0 @@ -8576,13 +8595,13 @@ packages: canvas: optional: true dependencies: - '@jest/environment': 29.6.0 - '@jest/fake-timers': 29.6.0 - '@jest/types': 29.6.0 + '@jest/environment': 29.6.4 + '@jest/fake-timers': 29.6.4 + '@jest/types': 29.6.3 '@types/jsdom': 20.0.1 '@types/node': 20.4.5 - jest-mock: 29.6.0 - jest-util: 29.6.0 + jest-mock: 29.6.3 + jest-util: 29.6.3 jsdom: 20.0.3 transitivePeerDependencies: - bufferutil @@ -8590,16 +8609,16 @@ packages: - utf-8-validate dev: false - /jest-environment-node@29.6.0: - resolution: {integrity: sha512-BOf5Q2/nFCdBOnyBM5c5/6DbdQYgc+0gyUQ8l8qhUAB8O7pM+4QJXIXJsRZJaxd5SHV6y5VArTVhOfogoqcP8Q==} + /jest-environment-node@29.6.4: + resolution: {integrity: sha512-i7SbpH2dEIFGNmxGCpSc2w9cA4qVD+wfvg2ZnfQ7XVrKL0NA5uDVBIiGH8SR4F0dKEv/0qI5r+aDomDf04DpEQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/environment': 29.6.0 - '@jest/fake-timers': 29.6.0 - '@jest/types': 29.6.0 + '@jest/environment': 29.6.4 + '@jest/fake-timers': 29.6.4 + '@jest/types': 29.6.3 '@types/node': 20.4.5 - jest-mock: 29.6.0 - jest-util: 29.6.0 + jest-mock: 29.6.3 + jest-util: 29.6.3 dev: false /jest-fail-on-console@3.1.1: @@ -8608,36 +8627,36 @@ packages: chalk: 4.1.2 dev: false - /jest-get-type@29.4.3: - resolution: {integrity: sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==} + /jest-get-type@29.6.3: + resolution: {integrity: sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dev: false - /jest-haste-map@29.6.0: - resolution: {integrity: sha512-dY1DKufptj7hcJSuhpqlYPGcnN3XjlOy/g0jinpRTMsbb40ivZHiuIPzeminOZkrek8C+oDxC54ILGO3vMLojg==} + /jest-haste-map@29.6.4: + resolution: {integrity: sha512-12Ad+VNTDHxKf7k+M65sviyynRoZYuL1/GTuhEVb8RYsNSNln71nANRb/faSyWvx0j+gHcivChXHIoMJrGYjog==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/types': 29.6.0 + '@jest/types': 29.6.3 '@types/graceful-fs': 4.1.6 '@types/node': 20.4.5 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 - jest-regex-util: 29.4.3 - jest-util: 29.6.0 - jest-worker: 29.6.0 + jest-regex-util: 29.6.3 + jest-util: 29.6.3 + jest-worker: 29.6.4 micromatch: 4.0.5 walker: 1.0.8 optionalDependencies: fsevents: 2.3.2 dev: false - /jest-leak-detector@29.6.0: - resolution: {integrity: sha512-JdV6EZOPxHR1gd6ccxjNowuROkT2jtGU5G/g58RcJX1xe5mrtLj0g6/ZkyMoXF4cs+tTkHMFX6pcIrB1QPQwCw==} + /jest-leak-detector@29.6.3: + resolution: {integrity: sha512-0kfbESIHXYdhAdpLsW7xdwmYhLf1BRu4AA118/OxFm0Ho1b2RcTmO4oF6aAMaxpxdxnJ3zve2rgwzNBD4Zbm7Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - jest-get-type: 29.4.3 - pretty-format: 29.6.0 + jest-get-type: 29.6.3 + pretty-format: 29.6.3 dev: false /jest-matcher-utils@29.2.2: @@ -8645,46 +8664,46 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: chalk: 4.1.2 - jest-diff: 29.6.0 - jest-get-type: 29.4.3 - pretty-format: 29.6.0 + jest-diff: 29.6.4 + jest-get-type: 29.6.3 + pretty-format: 29.6.3 dev: false - /jest-matcher-utils@29.6.0: - resolution: {integrity: sha512-oSlqfGN+sbkB2Q5um/zL7z80w84FEAcLKzXBZIPyRk2F2Srg1ubhrHVKW68JCvb2+xKzAeGw35b+6gciS24PHw==} + /jest-matcher-utils@29.6.4: + resolution: {integrity: sha512-KSzwyzGvK4HcfnserYqJHYi7sZVqdREJ9DMPAKVbS98JsIAvumihaNUbjrWw0St7p9IY7A9UskCW5MYlGmBQFQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: chalk: 4.1.2 - jest-diff: 29.6.0 - jest-get-type: 29.4.3 - pretty-format: 29.6.0 + jest-diff: 29.6.4 + jest-get-type: 29.6.3 + pretty-format: 29.6.3 dev: false - /jest-message-util@29.6.0: - resolution: {integrity: sha512-mkCp56cETbpoNtsaeWVy6SKzk228mMi9FPHSObaRIhbR2Ujw9PqjW/yqVHD2tN1bHbC8ol6h3UEo7dOPmIYwIA==} + /jest-message-util@29.6.3: + resolution: {integrity: sha512-FtzaEEHzjDpQp51HX4UMkPZjy46ati4T5pEMyM6Ik48ztu4T9LQplZ6OsimHx7EuM9dfEh5HJa6D3trEftu3dA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@babel/code-frame': 7.22.5 - '@jest/types': 29.6.0 + '@jest/types': 29.6.3 '@types/stack-utils': 2.0.1 chalk: 4.1.2 graceful-fs: 4.2.11 micromatch: 4.0.5 - pretty-format: 29.6.0 + pretty-format: 29.6.3 slash: 3.0.0 stack-utils: 2.0.6 dev: false - /jest-mock@29.6.0: - resolution: {integrity: sha512-2Pb7R2w24Q0aUVn+2/vdRDL6CqGqpheDZy7zrXav8FotOpSGw/4bS2hyVoKHMEx4xzOn6EyCAGwc5czWxXeN7w==} + /jest-mock@29.6.3: + resolution: {integrity: sha512-Z7Gs/mOyTSR4yPsaZ72a/MtuK6RnC3JYqWONe48oLaoEcYwEDxqvbXz85G4SJrm2Z5Ar9zp6MiHF4AlFlRM4Pg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/types': 29.6.0 + '@jest/types': 29.6.3 '@types/node': 20.4.5 - jest-util: 29.6.0 + jest-util: 29.6.3 dev: false - /jest-pnp-resolver@1.2.3(jest-resolve@29.6.0): + /jest-pnp-resolver@1.2.3(jest-resolve@29.6.4): resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==} engines: {node: '>=6'} peerDependencies: @@ -8693,122 +8712,121 @@ packages: jest-resolve: optional: true dependencies: - jest-resolve: 29.6.0 + jest-resolve: 29.6.4 dev: false - /jest-regex-util@29.4.3: - resolution: {integrity: sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==} + /jest-regex-util@29.6.3: + resolution: {integrity: sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dev: false - /jest-resolve-dependencies@29.6.0: - resolution: {integrity: sha512-eOfPog9K3hJdJk/3i6O6bQhXS+3uXhMDkLJGX+xmMPp7T1d/zdcFofbDnHgNoEkhD/mSimC5IagLEP7lpLLu/A==} + /jest-resolve-dependencies@29.6.4: + resolution: {integrity: sha512-7+6eAmr1ZBF3vOAJVsfLj1QdqeXG+WYhidfLHBRZqGN24MFRIiKG20ItpLw2qRAsW/D2ZUUmCNf6irUr/v6KHA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - jest-regex-util: 29.4.3 - jest-snapshot: 29.6.0 + jest-regex-util: 29.6.3 + jest-snapshot: 29.6.4 transitivePeerDependencies: - supports-color dev: false - /jest-resolve@29.6.0: - resolution: {integrity: sha512-+hrpY4LzAONoZA/rvB6rnZLkOSA6UgJLpdCWrOZNSgGxWMumzRLu7dLUSCabAHzoHIDQ9qXfr3th1zYNJ0E8sQ==} + /jest-resolve@29.6.4: + resolution: {integrity: sha512-fPRq+0vcxsuGlG0O3gyoqGTAxasagOxEuyoxHeyxaZbc9QNek0AmJWSkhjlMG+mTsj+8knc/mWb3fXlRNVih7Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: chalk: 4.1.2 graceful-fs: 4.2.11 - jest-haste-map: 29.6.0 - jest-pnp-resolver: 1.2.3(jest-resolve@29.6.0) - jest-util: 29.6.0 - jest-validate: 29.6.0 + jest-haste-map: 29.6.4 + jest-pnp-resolver: 1.2.3(jest-resolve@29.6.4) + jest-util: 29.6.3 + jest-validate: 29.6.3 resolve: 1.22.2 resolve.exports: 2.0.2 slash: 3.0.0 dev: false - /jest-runner@29.6.0: - resolution: {integrity: sha512-4fZuGV2lOxS2BiqEG9/AI8E6O+jo+QZjMVcgi1x5E6aDql0Gd/EFIbUQ0pSS09y8cya1vJB/qC2xsE468jqtSg==} + /jest-runner@29.6.4: + resolution: {integrity: sha512-SDaLrMmtVlQYDuG0iSPYLycG8P9jLI+fRm8AF/xPKhYDB2g6xDWjXBrR5M8gEWsK6KVFlebpZ4QsrxdyIX1Jaw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/console': 29.6.0 - '@jest/environment': 29.6.0 - '@jest/test-result': 29.6.0 - '@jest/transform': 29.6.0 - '@jest/types': 29.6.0 + '@jest/console': 29.6.4 + '@jest/environment': 29.6.4 + '@jest/test-result': 29.6.4 + '@jest/transform': 29.6.4 + '@jest/types': 29.6.3 '@types/node': 20.4.5 chalk: 4.1.2 emittery: 0.13.1 graceful-fs: 4.2.11 - jest-docblock: 29.4.3 - jest-environment-node: 29.6.0 - jest-haste-map: 29.6.0 - jest-leak-detector: 29.6.0 - jest-message-util: 29.6.0 - jest-resolve: 29.6.0 - jest-runtime: 29.6.0 - jest-util: 29.6.0 - jest-watcher: 29.6.0 - jest-worker: 29.6.0 + jest-docblock: 29.6.3 + jest-environment-node: 29.6.4 + jest-haste-map: 29.6.4 + jest-leak-detector: 29.6.3 + jest-message-util: 29.6.3 + jest-resolve: 29.6.4 + jest-runtime: 29.6.4 + jest-util: 29.6.3 + jest-watcher: 29.6.4 + jest-worker: 29.6.4 p-limit: 3.1.0 source-map-support: 0.5.13 transitivePeerDependencies: - supports-color dev: false - /jest-runtime@29.6.0: - resolution: {integrity: sha512-5FavYo3EeXLHIvnJf+r7Cj0buePAbe4mzRB9oeVxDS0uVmouSBjWeGgyRjZkw7ArxOoZI8gO6f8SGMJ2HFlwwg==} + /jest-runtime@29.6.4: + resolution: {integrity: sha512-s/QxMBLvmwLdchKEjcLfwzP7h+jsHvNEtxGP5P+Fl1FMaJX2jMiIqe4rJw4tFprzCwuSvVUo9bn0uj4gNRXsbA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/environment': 29.6.0 - '@jest/fake-timers': 29.6.0 - '@jest/globals': 29.6.0 - '@jest/source-map': 29.6.0 - '@jest/test-result': 29.6.0 - '@jest/transform': 29.6.0 - '@jest/types': 29.6.0 + '@jest/environment': 29.6.4 + '@jest/fake-timers': 29.6.4 + '@jest/globals': 29.6.4 + '@jest/source-map': 29.6.3 + '@jest/test-result': 29.6.4 + '@jest/transform': 29.6.4 + '@jest/types': 29.6.3 '@types/node': 20.4.5 chalk: 4.1.2 cjs-module-lexer: 1.2.3 collect-v8-coverage: 1.0.2 glob: 7.2.3 graceful-fs: 4.2.11 - jest-haste-map: 29.6.0 - jest-message-util: 29.6.0 - jest-mock: 29.6.0 - jest-regex-util: 29.4.3 - jest-resolve: 29.6.0 - jest-snapshot: 29.6.0 - jest-util: 29.6.0 + jest-haste-map: 29.6.4 + jest-message-util: 29.6.3 + jest-mock: 29.6.3 + jest-regex-util: 29.6.3 + jest-resolve: 29.6.4 + jest-snapshot: 29.6.4 + jest-util: 29.6.3 slash: 3.0.0 strip-bom: 4.0.0 transitivePeerDependencies: - supports-color dev: false - /jest-snapshot@29.6.0: - resolution: {integrity: sha512-H3kUE9NwWDEDoutcOSS921IqdlkdjgnMdj1oMyxAHNflscdLc9dB8OudZHV6kj4OHJxbMxL8CdI5DlwYrs4wQg==} + /jest-snapshot@29.6.4: + resolution: {integrity: sha512-VC1N8ED7+4uboUKGIDsbvNAZb6LakgIPgAF4RSpF13dN6YaMokfRqO+BaqK4zIh6X3JffgwbzuGqDEjHm/MrvA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@babel/core': 7.22.6 - '@babel/generator': 7.22.5 - '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.6) - '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.22.6) - '@babel/types': 7.22.5 - '@jest/expect-utils': 29.6.0 - '@jest/transform': 29.6.0 - '@jest/types': 29.6.0 - '@types/prettier': 2.7.3 - babel-preset-current-node-syntax: 1.0.1(@babel/core@7.22.6) + '@babel/core': 7.22.11 + '@babel/generator': 7.22.10 + '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.22.11) + '@babel/types': 7.22.11 + '@jest/expect-utils': 29.6.4 + '@jest/transform': 29.6.4 + '@jest/types': 29.6.3 + babel-preset-current-node-syntax: 1.0.1(@babel/core@7.22.11) chalk: 4.1.2 - expect: 29.6.0 + expect: 29.6.4 graceful-fs: 4.2.11 - jest-diff: 29.6.0 - jest-get-type: 29.4.3 - jest-matcher-utils: 29.6.0 - jest-message-util: 29.6.0 - jest-util: 29.6.0 + jest-diff: 29.6.4 + jest-get-type: 29.6.3 + jest-matcher-utils: 29.6.4 + jest-message-util: 29.6.3 + jest-util: 29.6.3 natural-compare: 1.4.0 - pretty-format: 29.6.0 + pretty-format: 29.6.3 semver: 7.5.4 transitivePeerDependencies: - supports-color @@ -8818,11 +8836,11 @@ packages: resolution: {integrity: sha512-lspHaCRx/mBbnm3h4uMMS3R5aZzMwyNpNIJLXj4cEsV0mIUtS4IjYJLSoyjRCtnxb6RIGJ4NL2quZzfIeNhbkg==} dev: false - /jest-util@29.6.0: - resolution: {integrity: sha512-S0USx9YwcvEm4pQ5suisVm/RVxBmi0GFR7ocJhIeaCuW5AXnAnffXbaVKvIFodyZNOc9ygzVtTxmBf40HsHXaA==} + /jest-util@29.6.3: + resolution: {integrity: sha512-QUjna/xSy4B32fzcKTSz1w7YYzgiHrjjJjevdRf61HYk998R5vVMMNmrHESYZVDS5DSWs+1srPLPKxXPkeSDOA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/types': 29.6.0 + '@jest/types': 29.6.3 '@types/node': 20.4.5 chalk: 4.1.2 ci-info: 3.8.0 @@ -8830,44 +8848,44 @@ packages: picomatch: 2.3.1 dev: false - /jest-validate@29.6.0: - resolution: {integrity: sha512-MLTrAJsb1+W7svbeZ+A7pAnyXMaQrjvPDKCy7OlfsfB6TMVc69v7WjUWfiR6r3snULFWZASiKgvNVDuATta1dg==} + /jest-validate@29.6.3: + resolution: {integrity: sha512-e7KWZcAIX+2W1o3cHfnqpGajdCs1jSM3DkXjGeLSNmCazv1EeI1ggTeK5wdZhF+7N+g44JI2Od3veojoaumlfg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/types': 29.6.0 + '@jest/types': 29.6.3 camelcase: 6.3.0 chalk: 4.1.2 - jest-get-type: 29.4.3 + jest-get-type: 29.6.3 leven: 3.1.0 - pretty-format: 29.6.0 + pretty-format: 29.6.3 dev: false - /jest-watcher@29.6.0: - resolution: {integrity: sha512-LdsQqFNX60mRdRRe+zsELnYRH1yX6KL+ukbh+u6WSQeTheZZe1TlLJNKRQiZ7e0VbvMkywmMWL/KV35noOJCcw==} + /jest-watcher@29.6.4: + resolution: {integrity: sha512-oqUWvx6+On04ShsT00Ir9T4/FvBeEh2M9PTubgITPxDa739p4hoQweWPRGyYeaojgT0xTpZKF0Y/rSY1UgMxvQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/test-result': 29.6.0 - '@jest/types': 29.6.0 + '@jest/test-result': 29.6.4 + '@jest/types': 29.6.3 '@types/node': 20.4.5 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.13.1 - jest-util: 29.6.0 + jest-util: 29.6.3 string-length: 4.0.2 dev: false - /jest-worker@29.6.0: - resolution: {integrity: sha512-oiQHH1SnKmZIwwPnpOrXTq4kHBk3lKGY/07DpnH0sAu+x7J8rXlbLDROZsU6vy9GwB0hPiZeZpu6YlJ48QoKcA==} + /jest-worker@29.6.4: + resolution: {integrity: sha512-6dpvFV4WjcWbDVGgHTWo/aupl8/LbBx2NSKfiwqf79xC/yeJjKHT1+StcKy/2KTmW16hE68ccKVOtXf+WZGz7Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@types/node': 20.4.5 - jest-util: 29.6.0 + jest-util: 29.6.3 merge-stream: 2.0.0 supports-color: 8.1.1 dev: false - /jest@29.6.0(@types/node@20.4.5): - resolution: {integrity: sha512-do1J9gGrQ68E4UfMz/4OM71p9qCqQxu32N/9ZfeYFSSlx0uUOuxeyZxtJZNaUTW12ZA11ERhmBjBhy1Ho96R4g==} + /jest@29.6.4(@types/node@20.4.5): + resolution: {integrity: sha512-tEFhVQFF/bzoYV1YuGyzLPZ6vlPrdfvDmmAxudA1dLEuiztqg2Rkx20vkKY32xiDROcD2KXlgZ7Cu8RPeEHRKw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true peerDependencies: @@ -8876,12 +8894,13 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 29.6.0 - '@jest/types': 29.6.0 + '@jest/core': 29.6.4 + '@jest/types': 29.6.3 import-local: 3.1.0 - jest-cli: 29.6.0(@types/node@20.4.5) + jest-cli: 29.6.4(@types/node@20.4.5) transitivePeerDependencies: - '@types/node' + - babel-plugin-macros - supports-color - ts-node dev: false @@ -8938,7 +8957,7 @@ packages: http-proxy-agent: 5.0.0 https-proxy-agent: 5.0.1 is-potential-custom-element-name: 1.0.1 - nwsapi: 2.2.6 + nwsapi: 2.2.7 parse5: 7.1.2 saxes: 6.0.0 symbol-tree: 3.2.4 @@ -9200,9 +9219,9 @@ packages: resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==} hasBin: true - /make-dir@3.1.0: - resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} - engines: {node: '>=8'} + /make-dir@4.0.0: + resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==} + engines: {node: '>=10'} dependencies: semver: 7.5.4 dev: false @@ -9941,7 +9960,7 @@ packages: '@contentlayer/core': 0.3.4(esbuild@0.19.0) '@contentlayer/utils': 0.3.4 contentlayer: 0.3.4(esbuild@0.19.0) - next: 13.4.12(@babel/core@7.22.6)(@opentelemetry/api@1.4.1)(react-dom@18.2.0)(react@18.2.0) + next: 13.4.12(@babel/core@7.22.11)(@opentelemetry/api@1.4.1)(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) transitivePeerDependencies: @@ -9951,7 +9970,7 @@ packages: - supports-color dev: false - /next@13.4.12(@babel/core@7.22.6)(@opentelemetry/api@1.4.1)(react-dom@18.2.0)(react@18.2.0): + /next@13.4.12(@babel/core@7.22.11)(@opentelemetry/api@1.4.1)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-eHfnru9x6NRmTMcjQp6Nz0J4XH9OubmzOa7CkWL+AUrUxpibub3vWwttjduu9No16dug1kq04hiUUpo7J3m3Xw==} engines: {node: '>=16.8.0'} hasBin: true @@ -9977,7 +9996,7 @@ packages: postcss: 8.4.14 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - styled-jsx: 5.1.1(@babel/core@7.22.6)(react@18.2.0) + styled-jsx: 5.1.1(@babel/core@7.22.11)(react@18.2.0) watchpack: 2.4.0 zod: 3.21.4 optionalDependencies: @@ -10061,8 +10080,8 @@ packages: resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} dev: false - /node-releases@2.0.12: - resolution: {integrity: sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==} + /node-releases@2.0.13: + resolution: {integrity: sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==} dev: false /normalize-package-data@2.5.0: @@ -10112,8 +10131,8 @@ packages: boolbase: 1.0.0 dev: false - /nwsapi@2.2.6: - resolution: {integrity: sha512-vSZ4miHQ4FojLjmz2+ux4B0/XA16jfwt/LBzIUftDpRd8tujHFkXjMyLwjS08fIZCzesj2z7gJukOKJwqebJAQ==} + /nwsapi@2.2.7: + resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==} dev: false /object-assign@4.1.1: @@ -10486,11 +10505,11 @@ packages: ansi-styles: 5.2.0 react-is: 17.0.2 - /pretty-format@29.6.0: - resolution: {integrity: sha512-XH+D4n7Ey0iSR6PdAnBs99cWMZdGsdKrR33iUHQNr79w1szKTCIZDVdXuccAsHVwDBp0XeWPfNEoaxP9EZgRmQ==} + /pretty-format@29.6.3: + resolution: {integrity: sha512-ZsBgjVhFAj5KeK+nHfF1305/By3lechHQSMWCTl8iHSbfOm2TN5nHEtFc/+W7fAyUeCs2n5iow72gld4gW0xDw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/schemas': 29.6.0 + '@jest/schemas': 29.6.3 ansi-styles: 5.2.0 react-is: 18.2.0 dev: false @@ -11549,7 +11568,7 @@ packages: inline-style-parser: 0.1.1 dev: false - /styled-jsx@5.1.1(@babel/core@7.22.6)(react@18.2.0): + /styled-jsx@5.1.1(@babel/core@7.22.11)(react@18.2.0): resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==} engines: {node: '>= 12.0.0'} peerDependencies: @@ -11562,7 +11581,7 @@ packages: babel-plugin-macros: optional: true dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 client-only: 0.0.1 react: 18.2.0 dev: false @@ -11743,7 +11762,7 @@ packages: resolution: {integrity: sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==} dev: false - /ts-jest@29.1.1(@babel/core@7.22.6)(esbuild@0.19.0)(jest@29.6.0)(typescript@5.1.6): + /ts-jest@29.1.1(@babel/core@7.22.11)(esbuild@0.19.0)(jest@29.6.4)(typescript@5.1.6): resolution: {integrity: sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -11764,12 +11783,12 @@ packages: esbuild: optional: true dependencies: - '@babel/core': 7.22.6 + '@babel/core': 7.22.11 bs-logger: 0.2.6 esbuild: 0.19.0 fast-json-stable-stringify: 2.1.0 - jest: 29.6.0(@types/node@20.4.5) - jest-util: 29.6.0 + jest: 29.6.4(@types/node@20.4.5) + jest-util: 29.6.3 json5: 2.2.3 lodash.memoize: 4.1.2 make-error: 1.3.6 @@ -11984,13 +12003,13 @@ packages: resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==} engines: {node: '>=8'} - /update-browserslist-db@1.0.11(browserslist@4.21.9): + /update-browserslist-db@1.0.11(browserslist@4.21.10): resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' dependencies: - browserslist: 4.21.9 + browserslist: 4.21.10 escalade: 3.1.1 picocolors: 1.0.0 dev: false @@ -12098,7 +12117,7 @@ packages: resolution: {integrity: sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==} engines: {node: '>=10.12.0'} dependencies: - '@jridgewell/trace-mapping': 0.3.18 + '@jridgewell/trace-mapping': 0.3.19 '@types/istanbul-lib-coverage': 2.0.4 convert-source-map: 1.9.0 dev: false @@ -12327,10 +12346,6 @@ packages: resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==} dev: false - /xstate@4.38.0: - resolution: {integrity: sha512-oFjw2YZPyu6HeO0JWCSqfhAALsjFPURsrD2FUFN3u213dWwYU68RFuLtSHco+cEUhpQFW+hRG3PNYgq8HatudQ==} - dev: false - /xstate@4.38.2: resolution: {integrity: sha512-Fba/DwEPDLneHT3tbJ9F3zafbQXszOlyCJyQqqdzmtlY/cwE2th462KK48yaANf98jHlP6lJvxfNtN0LFKXPQg==} dev: false @@ -12377,18 +12392,22 @@ packages: resolution: {integrity: sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==} dev: false - /zustand@4.3.9(react@18.2.0): - resolution: {integrity: sha512-Tat5r8jOMG1Vcsj8uldMyqYKC5IZvQif8zetmLHs9WoZlntTHmIoNM8TpLRY31ExncuUvUOXehd0kvahkuHjDw==} + /zustand@4.4.1(@types/react@18.2.16)(react@18.2.0): + resolution: {integrity: sha512-QCPfstAS4EBiTQzlaGP1gmorkh/UL1Leaj2tdj+zZCZ/9bm0WS7sI2wnfD5lpOszFqWJ1DcPnGoY8RDL61uokw==} engines: {node: '>=12.7.0'} peerDependencies: + '@types/react': '>=16.8' immer: '>=9.0' react: '>=16.8' peerDependenciesMeta: + '@types/react': + optional: true immer: optional: true react: optional: true dependencies: + '@types/react': 18.2.16 react: 18.2.0 use-sync-external-store: 1.2.0(react@18.2.0) dev: false From ec49a88dcd2d0bd66bef86cf8c1fc84530acf566 Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Thu, 31 Aug 2023 14:32:48 -0600 Subject: [PATCH 21/25] update versions, fix indexer version --- docs/fuel-indexer | 2 +- docs/fuels-rs | 2 +- docs/fuels-ts | 2 +- src/lib/versions.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/fuel-indexer b/docs/fuel-indexer index 97692a59..fab10163 160000 --- a/docs/fuel-indexer +++ b/docs/fuel-indexer @@ -1 +1 @@ -Subproject commit 97692a59b9e14ad1229e7faad21950a307244da5 +Subproject commit fab101632573eff2b478277917b6c560965556ce diff --git a/docs/fuels-rs b/docs/fuels-rs index df21541b..2915eb72 160000 --- a/docs/fuels-rs +++ b/docs/fuels-rs @@ -1 +1 @@ -Subproject commit df21541b679bb90a1ee3e54f34a67b7037b40be7 +Subproject commit 2915eb728347839e1fc3747ac838be0174839365 diff --git a/docs/fuels-ts b/docs/fuels-ts index c370bea2..8dd2da89 160000 --- a/docs/fuels-ts +++ b/docs/fuels-ts @@ -1 +1 @@ -Subproject commit c370bea26aa9ac91e6ed41253ea039b93ec26544 +Subproject commit 8dd2da89f2d4c42de2fc3de18d8d42aff7d3bc2e diff --git a/src/lib/versions.ts b/src/lib/versions.ts index f0f2becf..26b0562e 100644 --- a/src/lib/versions.ts +++ b/src/lib/versions.ts @@ -101,7 +101,7 @@ export async function getVersions() { Forc: forc, Sway: forc, Fuelup: fuelup, - Indexer: indexer, + 'Fuel Indexer': indexer, 'Fuel Rust SDK': rust, 'Fuel TS SDK': tsSDK, 'Fuel Wallet': wallet, From 16e3e294d439597a42c6fbb7735f5b15b7c3d462 Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Thu, 31 Aug 2023 20:00:31 -0600 Subject: [PATCH 22/25] fix ts links --- src/lib/plugins/links.ts | 33 ++++++++++++++++++++++++++++++--- src/lib/plugins/plugins.ts | 4 ++-- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/lib/plugins/links.ts b/src/lib/plugins/links.ts index fba72592..70934c7c 100644 --- a/src/lib/plugins/links.ts +++ b/src/lib/plugins/links.ts @@ -1,29 +1,50 @@ import { readFileSync } from 'node:fs'; import { join } from 'node:path'; +import type { Root } from 'remark-gfm'; import type { Parent } from 'unist-util-visit/lib'; import { DOCS_DIRECTORY } from '../../config/constants'; import type { DuplicateAPIItem } from '../ts-api'; import { getTSAPIDuplicates } from '../ts-api'; +const configPath = join(DOCS_DIRECTORY, `../src/config/paths.json`); +const pathsConfig = JSON.parse(readFileSync(configPath, 'utf8')); + export function handleLinks( // eslint-disable-next-line @typescript-eslint/no-explicit-any node: any, dirname: string, - idx: number | null, + idx?: number | null, // eslint-disable-next-line @typescript-eslint/no-explicit-any - parent: Parent + parent?: Parent, + tree?: Root ) { let newUrl: string | null = null; if (node.type === 'html') { const url = getUrl(node.value); - if (url && idx) { + if (url !== 'url' && (idx || idx === 0)) { node.type = 'link'; node.value = null; node.children = []; node.children.push(parent.children[idx + 1]); parent.children.splice(idx + 1, 2); + } else if (url === 'url' && (idx || idx === 0)) { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const scriptString = tree?.children[0] as any; + let newURL = getTSUrl(scriptString.value); + if (newURL) { + newURL = newURL.replace('/v${forc}', '').replace('/v${fuels}', ''); + for (const [key, value] of Object.entries(pathsConfig)) { + newURL = newURL.replaceAll(key, value as string); + } + node.type = 'link'; + node.value = null; + node.url = newURL; + node.children = []; + node.children.push(parent.children[idx + 1]); + parent.children.splice(idx + 1, 2); + } } } else { if (!node.url.includes('http')) { @@ -89,3 +110,9 @@ function getUrl(html: string): string | null { return null; } + +function getTSUrl(input: string): string | null { + const regex = /https?:\/\/[^\s'"`]+/g; + const matches = input.match(regex); + return matches ? matches[0] : null; +} diff --git a/src/lib/plugins/plugins.ts b/src/lib/plugins/plugins.ts index 992194ac..d2ae4bb4 100644 --- a/src/lib/plugins/plugins.ts +++ b/src/lib/plugins/plugins.ts @@ -169,12 +169,12 @@ export function handlePlugins() { nodes.push([node as any, idx ?? null, parent as Parent]); } }); - nodes.forEach(([node, _idx, parent]) => { + nodes.forEach(([node, idx, parent]) => { if (exampleImportCondition(node)) { const content = handleExampleImports(node, dirname, rootDir, parent); node.value = content; } else if (mdBookLinks(node)) { - const newUrl = handleLinks(node, dirname); + const newUrl = handleLinks(node, dirname, idx, parent, tree); if (newUrl) node.url = newUrl; } else if (tsBookVersions(node)) { if (node.value === 'v{{forc}}') { From 67ebd585581aaf5b822f4d1d3ed7c073ba4562e1 Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Fri, 1 Sep 2023 08:58:05 -0600 Subject: [PATCH 23/25] fix --- package.json | 2 +- pnpm-lock.yaml | 20 ++++++++++---- src/lib/plugins/links.ts | 60 ++++++++++++++++++++++++++++++---------- 3 files changed, 61 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 108e9e0d..8f777e3e 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@fuel-ui/config": "^0.17.0", "@fuel-ui/css": "^0.16.1", "@fuel-ui/react": "^0.16.1", - "@fuel-wallet/sdk": "^0.11.2", + "@fuel-wallet/sdk": "^0.12.2", "@fuels/eslint-plugin": "^0.0.3", "@fuels/prettier-config": "^0.0.3", "@fuels/ts-config": "^0.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1c57fcd9..386669e4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,8 +25,8 @@ dependencies: specifier: ^0.16.1 version: 0.16.1(@babel/core@7.22.11)(@types/node@20.4.5)(@types/react-dom@18.2.7)(@types/react@18.2.16)(csstype@3.1.2)(esbuild@0.19.0)(typescript@5.1.6) '@fuel-wallet/sdk': - specifier: ^0.11.2 - version: 0.11.2(dexie@3.2.4)(fuels@0.49.1) + specifier: ^0.12.2 + version: 0.12.2(dexie@3.2.4)(fuels@0.49.1) '@fuels/eslint-plugin': specifier: ^0.0.3 version: 0.0.3(@testing-library/dom@9.3.1)(eslint@8.45.0)(typescript@5.1.6) @@ -1919,12 +1919,12 @@ packages: - utf-8-validate dev: false - /@fuel-wallet/sdk@0.11.2(dexie@3.2.4)(fuels@0.49.1): - resolution: {integrity: sha512-7DYwi9FxMLieDlagNjIZqE7DEqWjZ36HB1/1Q/7gcim/98uk3Xqlgaf1P9Hrwmzv3qcD0OxY3/W8nVnGnHYUQw==} + /@fuel-wallet/sdk@0.12.2(dexie@3.2.4)(fuels@0.49.1): + resolution: {integrity: sha512-jWVHgBSo8cRbCmOGldABj0LLu72VGD9pFQ1eIIIhwlAnCgIXMtFRllJ1McvQhhFcqEhuS/ASDX2ob4kAHQd2Zw==} peerDependencies: - fuels: '>=0.49.1' + fuels: '>=0.53.0' dependencies: - '@types/chrome': 0.0.242 + '@types/chrome': 0.0.243 dexie-observable: 4.0.1-beta.13(dexie@3.2.4) events: 3.3.0 fuels: 0.49.1 @@ -4935,6 +4935,14 @@ packages: dependencies: '@types/filesystem': 0.0.32 '@types/har-format': 1.2.11 + dev: true + + /@types/chrome@0.0.243: + resolution: {integrity: sha512-4PHv0kxxxpZFHWPBiJJ9TWH8kbx0567j1b2djnhpJjpiSGNI7UKkz7dSEECBtQ0B3N5nQTMwSB/5IopkWGAbEA==} + dependencies: + '@types/filesystem': 0.0.32 + '@types/har-format': 1.2.11 + dev: false /@types/cookie@0.3.3: resolution: {integrity: sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==} diff --git a/src/lib/plugins/links.ts b/src/lib/plugins/links.ts index 70934c7c..7cf22045 100644 --- a/src/lib/plugins/links.ts +++ b/src/lib/plugins/links.ts @@ -23,27 +23,53 @@ export function handleLinks( if (node.type === 'html') { const url = getUrl(node.value); - if (url !== 'url' && (idx || idx === 0)) { + if ( + url && + !node.value.includes(':href') && + idx !== undefined && + idx !== null + ) { node.type = 'link'; node.value = null; node.children = []; node.children.push(parent.children[idx + 1]); parent.children.splice(idx + 1, 2); - } else if (url === 'url' && (idx || idx === 0)) { + } else if ( + url && + node.value.includes(':href') && + idx !== undefined && + idx !== null + ) { // eslint-disable-next-line @typescript-eslint/no-explicit-any const scriptString = tree?.children[0] as any; - let newURL = getTSUrl(scriptString.value); - if (newURL) { + const newURLs = getTSUrl(scriptString.value); + + if (newURLs) { + let newURL = newURLs[url]; newURL = newURL.replace('/v${forc}', '').replace('/v${fuels}', ''); for (const [key, value] of Object.entries(pathsConfig)) { newURL = newURL.replaceAll(key, value as string); } - node.type = 'link'; - node.value = null; - node.url = newURL; - node.children = []; - node.children.push(parent.children[idx + 1]); - parent.children.splice(idx + 1, 2); + const value = parent.children[idx + 1].value; + parent.children[idx] = { + type: 'link', + url: newURL, + children: [ + { + type: 'text', + value: value, + }, + ], + }; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + parent.children.forEach((child: any) => { + if (child.type === 'html' && child.value === '') { + child.type = 'text'; + child.value = ''; + } else if (child.value === value) { + child.value = ''; + } + }); } } } else { @@ -111,8 +137,14 @@ function getUrl(html: string): string | null { return null; } -function getTSUrl(input: string): string | null { - const regex = /https?:\/\/[^\s'"`]+/g; - const matches = input.match(regex); - return matches ? matches[0] : null; +function getTSUrl(input: string): { [key: string]: string } { + const regex = /const (\w+) = `\s*([\s\S]+?)\s*`/g; + const matches = [...input.matchAll(regex)]; + const result: { [key: string]: string } = {}; + for (const match of matches) { + const key = match[1]; + const url = match[2]; + result[key] = url; + } + return result; } From dad840656df1febb1c0ace7e68163872df83fc77 Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Fri, 1 Sep 2023 09:09:57 -0600 Subject: [PATCH 24/25] fix --- src/lib/plugins/links.ts | 48 +++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/src/lib/plugins/links.ts b/src/lib/plugins/links.ts index 7cf22045..102c4ca1 100644 --- a/src/lib/plugins/links.ts +++ b/src/lib/plugins/links.ts @@ -46,30 +46,32 @@ export function handleLinks( if (newURLs) { let newURL = newURLs[url]; - newURL = newURL.replace('/v${forc}', '').replace('/v${fuels}', ''); - for (const [key, value] of Object.entries(pathsConfig)) { - newURL = newURL.replaceAll(key, value as string); - } - const value = parent.children[idx + 1].value; - parent.children[idx] = { - type: 'link', - url: newURL, - children: [ - { - type: 'text', - value: value, - }, - ], - }; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - parent.children.forEach((child: any) => { - if (child.type === 'html' && child.value === '') { - child.type = 'text'; - child.value = ''; - } else if (child.value === value) { - child.value = ''; + if (newURL) { + newURL = newURL.replace('/v${forc}', '').replace('/v${fuels}', ''); + for (const [key, value] of Object.entries(pathsConfig)) { + newURL = newURL.replaceAll(key, value as string); } - }); + const value = parent.children[idx + 1].value; + parent.children[idx] = { + type: 'link', + url: newURL, + children: [ + { + type: 'text', + value: value, + }, + ], + }; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + parent.children.forEach((child: any) => { + if (child.type === 'html' && child.value === '') { + child.type = 'text'; + child.value = ''; + } else if (child.value === value) { + child.value = ''; + } + }); + } } } } else { From e3ffe456a6ad28a9cdbb54fc7413e2bff0106444 Mon Sep 17 00:00:00 2001 From: sarahschwartz <58856580+sarahschwartz@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:38:33 -0600 Subject: [PATCH 25/25] update wallet --- docs/fuels-wallet | 2 +- package.json | 2 +- pnpm-lock.yaml | 51 +++++++++++++++-------------------------------- 3 files changed, 18 insertions(+), 37 deletions(-) diff --git a/docs/fuels-wallet b/docs/fuels-wallet index fe3ca53c..a46658ea 160000 --- a/docs/fuels-wallet +++ b/docs/fuels-wallet @@ -1 +1 @@ -Subproject commit fe3ca53c923c303572ce01cf2ff8da2e7ec2c73d +Subproject commit a46658ea5e5954912a527a94224be20aff2076e1 diff --git a/package.json b/package.json index d8ae3d66..f3e60c4a 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@fuel-ui/config": "^0.17.0", "@fuel-ui/css": "^0.16.1", "@fuel-ui/react": "^0.16.1", - "@fuel-wallet/sdk": "^0.12.2", + "@fuel-wallet/sdk": "^0.12.3", "@fuels/eslint-plugin": "^0.0.3", "@fuels/prettier-config": "^0.0.3", "@fuels/ts-config": "^0.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 82039f24..651bc8ac 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,8 +26,8 @@ dependencies: specifier: ^0.16.1 version: 0.16.1(@babel/core@7.22.11)(@types/node@20.4.5)(@types/react-dom@18.2.7)(@types/react@18.2.16)(csstype@3.1.2)(esbuild@0.19.2)(typescript@5.1.6) '@fuel-wallet/sdk': - specifier: ^0.12.2 - version: 0.12.2(dexie@3.2.4)(fuels@0.49.1) + specifier: ^0.12.3 + version: 0.12.3(dexie@3.2.4)(fuels@0.49.1) '@fuels/eslint-plugin': specifier: ^0.0.3 version: 0.0.3(@testing-library/dom@9.3.1)(eslint@8.45.0)(typescript@5.1.6) @@ -549,15 +549,6 @@ packages: - supports-color dev: false - /@babel/highlight@7.22.13: - resolution: {integrity: sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-validator-identifier': 7.22.5 - chalk: 2.4.2 - js-tokens: 4.0.0 - dev: false - /@babel/highlight@7.22.13: resolution: {integrity: sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==} engines: {node: '>=6.9.0'} @@ -1826,7 +1817,7 @@ packages: '@tabler/icons-react': 2.32.0(react@18.2.0) '@xstate/react': 3.2.2(@types/react@18.2.16)(react@18.2.0)(xstate@4.38.2) deepmerge-json: 1.5.0 - framer-motion: 10.16.2(react-dom@18.2.0)(react@18.2.0) + framer-motion: 10.13.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-aria: 3.26.0(react-dom@18.2.0)(react@18.2.0) react-content-loader: 6.2.1(react@18.2.0) @@ -1894,10 +1885,10 @@ packages: - utf-8-validate dev: false - /@fuel-wallet/sdk@0.12.2(dexie@3.2.4)(fuels@0.49.1): - resolution: {integrity: sha512-jWVHgBSo8cRbCmOGldABj0LLu72VGD9pFQ1eIIIhwlAnCgIXMtFRllJ1McvQhhFcqEhuS/ASDX2ob4kAHQd2Zw==} + /@fuel-wallet/sdk@0.12.3(dexie@3.2.4)(fuels@0.49.1): + resolution: {integrity: sha512-E607SDgHUYk4wQ7/O9ZTPe04+e6PbD6kb2yKnHQSZh1nSlgGR42OvMHTtdDfrHUWokHWMqU6umw1Gq7tgVtwfg==} peerDependencies: - fuels: '>=0.53.0' + fuels: '>=0.54.1' dependencies: '@types/chrome': 0.0.243 dexie-observable: 4.0.1-beta.13(dexie@3.2.4) @@ -4954,6 +4945,14 @@ packages: dependencies: '@types/filesystem': 0.0.32 '@types/har-format': 1.2.12 + dev: true + + /@types/chrome@0.0.243: + resolution: {integrity: sha512-4PHv0kxxxpZFHWPBiJJ9TWH8kbx0567j1b2djnhpJjpiSGNI7UKkz7dSEECBtQ0B3N5nQTMwSB/5IopkWGAbEA==} + dependencies: + '@types/filesystem': 0.0.32 + '@types/har-format': 1.2.12 + dev: false /@types/cookie@0.3.3: resolution: {integrity: sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==} @@ -5909,8 +5908,8 @@ packages: engines: {node: '>=10'} dev: false - /caniuse-lite@1.0.30001512: - resolution: {integrity: sha512-2S9nK0G/mE+jasCUsMPlARhRCts1ebcp2Ji8Y8PWi4NDE1iRdLCnEPHkEfeBrGC45L4isBx5ur3IQ6yTE2mRZw==} + /caniuse-lite@1.0.30001525: + resolution: {integrity: sha512-/3z+wB4icFt3r0USMwxujAqRvaD/B7rvGTsKhbhSQErVrJvkZCLhgNLJxU8MevahQVH6hCU9FsHdNUFbiwmE7Q==} dev: false /ccount@2.0.1: @@ -7521,24 +7520,6 @@ packages: '@emotion/is-prop-valid': 0.8.8 dev: false - /framer-motion@10.16.2(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-aY6L9YMvqMWtfOQptaUvvr8dp97jskXY5UYLQM0vOPxKeERrG/Z034EIQZ/52u7MeCT0HlCQy3/l0HdUZCB9Tw==} - peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - dependencies: - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - tslib: 2.6.2 - optionalDependencies: - '@emotion/is-prop-valid': 0.8.8 - dev: false - /fs-constants@1.0.0: resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} dev: true