diff --git a/packages/new-design/lib/utils.mjs b/packages/new-design/lib/utils.mjs index c04a4238973..eff6ec7018a 100644 --- a/packages/new-design/lib/utils.mjs +++ b/packages/new-design/lib/utils.mjs @@ -1,14 +1,13 @@ import { config } from './config.mjs' -import { mkdir, readFile, writeFile, copyFile, open, opendir } from 'node:fs/promises' -import { join, dirname, relative } from 'path' +import { mkdir, writeFile, copyFile, open, opendir } from 'node:fs/promises' +import { join, dirname } from 'path' import mustache from 'mustache' -import rdir from 'recursive-readdir' import chalk from 'chalk' import prompts from 'prompts' import { oraPromise } from 'ora' import { execa } from 'execa' import axios from 'axios' -import { fileURLToPath, pathToFileURL } from 'url' +import { fileURLToPath } from 'url' // Current working directory let filename @@ -18,7 +17,6 @@ try { filename = fileURLToPath(new URL(import.meta.url)) } const newDesignDir = join(filename, '../..') -const designSrcDir = 'design/src' const nl = '\n' const tab = ' ' @@ -126,8 +124,6 @@ export const getChoices = async () => { return { name, manager, overwrite, sideStep } } -const capitalize = (string) => string.charAt(0).toUpperCase() + string.slice(1) - // Keep track of directories that need to be created const dirPromises = {} const ensureDir = async (file, suppress = false) => { diff --git a/sites/sde/components/header/index.mjs b/sites/sde/components/header/index.mjs index e3bbf890ec6..303e1333e3a 100644 --- a/sites/sde/components/header/index.mjs +++ b/sites/sde/components/header/index.mjs @@ -7,16 +7,11 @@ import { useTheme } from 'shared/hooks/use-theme.mjs' import { ModalContext } from 'shared/context/modal-context.mjs' // Components import { - DesignIcon, DocsIcon, - MenuIcon, LockIcon, ThemeIcon, I18nIcon, - MeasieIcon, - NewPatternIcon, GitHubIcon, - PlusIcon, HelpIcon, HomeIcon, RocketIcon, @@ -24,7 +19,6 @@ import { import { HeaderWrapper } from 'shared/components/wrappers/header.mjs' import { ModalThemePicker, ns as themeNs } from 'shared/components/modal/theme-picker.mjs' import { ModalLocalePicker, ns as localeNs } from 'shared/components/modal/locale-picker.mjs' -import { ModalMenu } from 'site/components/navigation/modal-menu.mjs' import { ModalDesignPicker } from './design-picker.mjs' import { NavButton, NavSpacer } from 'shared/components/header.mjs' diff --git a/sites/sde/pages/account.mjs b/sites/sde/pages/account.mjs index b3cb5bd79f1..307cb7686ff 100644 --- a/sites/sde/pages/account.mjs +++ b/sites/sde/pages/account.mjs @@ -5,12 +5,8 @@ import { nsMerge } from 'shared/utils.mjs' import { useTranslation } from 'next-i18next' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' -import { Popout, ns as popoutNs } from 'shared/components/popout/index.mjs' -import { PageLink, WebLink } from 'shared/components/link.mjs' -import { FreeSewingIcon } from 'shared/components/icons.mjs' -import { collection } from 'site/hooks/use-design.mjs' -const ns = nsMerge('sde', 'account', pageNs, popoutNs) +const ns = nsMerge('sde', 'account', pageNs) /* * Each page MUST be wrapped in the PageWrapper component. * You also MUST spread props.page into this wrapper component diff --git a/sites/sde/pages/code/index.mjs b/sites/sde/pages/code/index.mjs index d2b9ea23ed9..75e203554ba 100644 --- a/sites/sde/pages/code/index.mjs +++ b/sites/sde/pages/code/index.mjs @@ -1,8 +1,8 @@ // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge } from 'shared/utils.mjs' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' -import { Popout } from 'shared/components/popout/index.mjs' // MDX import { MdxWrapper } from 'shared/components/wrappers/mdx.mjs' import { components } from 'shared/components/mdx/index.mjs' @@ -13,7 +13,7 @@ import nl, { frontmatter as nlFrontmatter } from './nl.mdx' import fr, { frontmatter as frFrontmatter } from './fr.mdx' import uk, { frontmatter as ukFrontmatter } from './uk.mdx' -const ns = [pageNs, 'sde', 'account'] +const ns = nsMerge(pageNs, 'sde', 'account') const mdx = { en, de, es, nl, fr, uk } const frontmatter = { diff --git a/sites/sde/pages/docs/index.mjs b/sites/sde/pages/docs/index.mjs index d2b9ea23ed9..75e203554ba 100644 --- a/sites/sde/pages/docs/index.mjs +++ b/sites/sde/pages/docs/index.mjs @@ -1,8 +1,8 @@ // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge } from 'shared/utils.mjs' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' -import { Popout } from 'shared/components/popout/index.mjs' // MDX import { MdxWrapper } from 'shared/components/wrappers/mdx.mjs' import { components } from 'shared/components/mdx/index.mjs' @@ -13,7 +13,7 @@ import nl, { frontmatter as nlFrontmatter } from './nl.mdx' import fr, { frontmatter as frFrontmatter } from './fr.mdx' import uk, { frontmatter as ukFrontmatter } from './uk.mdx' -const ns = [pageNs, 'sde', 'account'] +const ns = nsMerge(pageNs, 'sde', 'account') const mdx = { en, de, es, nl, fr, uk } const frontmatter = { diff --git a/sites/sde/pages/index.mjs b/sites/sde/pages/index.mjs index 3617c02a8ca..0989cb999f7 100644 --- a/sites/sde/pages/index.mjs +++ b/sites/sde/pages/index.mjs @@ -1,16 +1,16 @@ // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge } from 'shared/utils.mjs' // Hooks import { useTranslation } from 'next-i18next' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' -import { Popout, ns as popoutNs } from 'shared/components/popout/index.mjs' import { PageLink, WebLink } from 'shared/components/link.mjs' import { FreeSewingIcon } from 'shared/components/icons.mjs' import { collection } from 'site/hooks/use-design.mjs' import { version } from '@freesewing/core' -const ns = ['sde', ...pageNs, ...popoutNs] +const ns = nsMerge('sde', pageNs) /* * Each page MUST be wrapped in the PageWrapper component. * You also MUST spread props.page into this wrapper component