Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/sixty-actors-love.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'myst-config': patch
'myst-cli': patch
---

Favicon on site option is under options.
3 changes: 0 additions & 3 deletions packages/myst-cli/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -375,9 +375,6 @@ async function resolveSiteConfigPaths(
}),
);
}
if (siteConfig.favicon) {
resolvedFields.favicon = await resolutionFn(session, path, siteConfig.favicon);
}
if (siteConfig.parts) {
resolvedFields.parts = await loadFrontmatterParts(
session,
Expand Down
12 changes: 11 additions & 1 deletion packages/myst-config/src/site/site.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,20 @@ describe('validateSiteConfig', () => {
nav: [{ title: 'cool folder', children: [{ title: 'cool page', url: '/test/cool-page' }] }],
actions: [{ title: 'Go To Example', url: 'https://example.com', static: false }],
domains: ['test.curve.space'],
favicon: 'curvenote.png',
options: { favicon: 'curvenote.png' },
};
expect(validateSiteConfig(siteConfig, opts)).toEqual(siteConfig);
});
it('valid favicon is moved to options', async () => {
const siteConfig = {
projects: [{ path: 'my-proj', slug: 'test' }],
favicon: 'curvenote.png',
};
expect(validateSiteConfig(siteConfig, opts)).toEqual({
projects: [{ path: 'my-proj', slug: 'test' }],
options: { favicon: 'curvenote.png' },
});
});
it('invalid list values are filtered', async () => {
expect(
validateSiteConfig(
Expand Down
1 change: 0 additions & 1 deletion packages/myst-config/src/site/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export type SiteConfig = SiteFrontmatter & {
nav?: SiteNavItem[];
actions?: SiteAction[];
domains?: string[];
favicon?: string;
template?: string;
};

Expand Down
13 changes: 1 addition & 12 deletions packages/myst-config/src/site/validators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,7 @@ import {
import type { SiteAction, SiteConfig, SiteNavItem, SiteProject } from './types.js';

export const SITE_CONFIG_KEYS = {
optional: [
...SITE_FRONTMATTER_KEYS,
'projects',
'nav',
'actions',
'domains',
'favicon',
'template',
],
optional: [...SITE_FRONTMATTER_KEYS, 'projects', 'nav', 'actions', 'domains', 'template'],
alias: FRONTMATTER_ALIASES,
};

Expand Down Expand Up @@ -150,9 +142,6 @@ export function validateSiteConfigKeys(
);
if (domains) output.domains = [...new Set(domains)];
}
if (defined(value.favicon)) {
output.favicon = validateString(value.favicon, incrementOptions('favicon', opts));
}
if (defined(value.template)) {
output.template = validateString(value.template, incrementOptions('template', opts));
}
Expand Down
Loading