diff --git a/packages/docusaurus-theme-classic/src/index.ts b/packages/docusaurus-theme-classic/src/index.ts index 175a3cfaca..fffadccaf7 100644 --- a/packages/docusaurus-theme-classic/src/index.ts +++ b/packages/docusaurus-theme-classic/src/index.ts @@ -178,9 +178,6 @@ export default function docusaurusThemeClassic( preBodyTags: [ { tagName: 'script', - attributes: { - type: 'text/javascript', - }, innerHTML: noFlashColorMode(colorMode), }, ], diff --git a/packages/docusaurus/src/client/templates/ssr.html.template.js b/packages/docusaurus/src/client/templates/ssr.html.template.js index 0915f8ac2a..c2c47a7593 100644 --- a/packages/docusaurus/src/client/templates/ssr.html.template.js +++ b/packages/docusaurus/src/client/templates/ssr.html.template.js @@ -20,7 +20,7 @@ module.exports = ` <%~ metaAttribute %> <% }); %> <% it.stylesheets.forEach((stylesheet) => { %> - + <% }); %> <% it.scripts.forEach((script) => { %> @@ -32,7 +32,7 @@ module.exports = ` <%~ it.appHtml %> <% it.scripts.forEach((script) => { %> - + <% }); %> <%~ it.postBodyTags %> diff --git a/packages/docusaurus/src/server/configValidation.ts b/packages/docusaurus/src/server/configValidation.ts index ce7d635735..194dfdda45 100644 --- a/packages/docusaurus/src/server/configValidation.ts +++ b/packages/docusaurus/src/server/configValidation.ts @@ -150,7 +150,7 @@ const ConfigSchema = Joi.object({ Joi.string(), Joi.object({ href: Joi.string().required(), - type: Joi.string().required(), + type: Joi.string(), }).unknown(), ), clientModules: Joi.array().items(Joi.string()), diff --git a/packages/docusaurus/src/server/index.ts b/packages/docusaurus/src/server/index.ts index fd7ec3d4a1..d0979aba6f 100644 --- a/packages/docusaurus/src/server/index.ts +++ b/packages/docusaurus/src/server/index.ts @@ -24,6 +24,7 @@ import loadThemeAlias from './themes'; import { DocusaurusConfig, DocusaurusSiteMetadata, + HtmlTagObject, LoadContext, PluginConfig, Props, @@ -194,24 +195,23 @@ export async function load( const stylesheetsTags = stylesheets.map((source) => typeof source === 'string' ? `` - : { + : ({ tagName: 'link', attributes: { rel: 'stylesheet', ...source, }, - }, + } as HtmlTagObject), ); const scriptsTags = scripts.map((source) => typeof source === 'string' - ? `` - : { + ? `` + : ({ tagName: 'script', attributes: { - type: 'text/javascript', ...source, }, - }, + } as HtmlTagObject), ); return { headTags: [...stylesheetsTags, ...scriptsTags], diff --git a/website/docs/api/docusaurus.config.js.md b/website/docs/api/docusaurus.config.js.md index b44fb6a32c..f39090326d 100644 --- a/website/docs/api/docusaurus.config.js.md +++ b/website/docs/api/docusaurus.config.js.md @@ -406,7 +406,7 @@ module.exports = { <%~ metaAttribute %> <% }); %> <% it.stylesheets.forEach((stylesheet) => { %> - + <% }); %> <% it.scripts.forEach((script) => { %> @@ -421,7 +421,7 @@ module.exports = { Custom markup <% it.scripts.forEach((script) => { %> - + <% }); %> <%~ it.postBodyTags %> @@ -445,7 +445,6 @@ module.exports = { // Object format. { href: 'http://mydomain.com/style.css', - type: 'text/css', }, ], }; diff --git a/website/docs/guides/markdown-features/markdown-features-math-equations.mdx b/website/docs/guides/markdown-features/markdown-features-math-equations.mdx index 15c1e670df..71a876da48 100644 --- a/website/docs/guides/markdown-features/markdown-features-math-equations.mdx +++ b/website/docs/guides/markdown-features/markdown-features-math-equations.mdx @@ -71,7 +71,6 @@ Include the KaTeX CSS in your config under `stylesheets`: stylesheets: [ { href: "https://cdn.jsdelivr.net/npm/katex@0.13.11/dist/katex.min.css", - type: "text/css", integrity: "sha384-Um5gpz1odJg5Z4HAmzPtgZKdTBHZdw8S29IecapCSB31ligYPhHQZMIlWLYQGVoc", crossorigin: "anonymous", }, @@ -108,7 +107,6 @@ module.exports = { + stylesheets: [ + { + href: 'https://cdn.jsdelivr.net/npm/katex@0.13.11/dist/katex.min.css', -+ type: 'text/css', + integrity: + 'sha384-Um5gpz1odJg5Z4HAmzPtgZKdTBHZdw8S29IecapCSB31ligYPhHQZMIlWLYQGVoc', + crossorigin: 'anonymous', diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index fcb7baf8ae..1b27cff79f 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -57,7 +57,6 @@ const isVersioningDisabled = !!process.env.DISABLE_VERSIONING || isI18nStaging; stylesheets: [ { href: 'https://cdn.jsdelivr.net/npm/katex@0.13.11/dist/katex.min.css', - type: 'text/css', integrity: 'sha384-Um5gpz1odJg5Z4HAmzPtgZKdTBHZdw8S29IecapCSB31ligYPhHQZMIlWLYQGVoc', crossorigin: 'anonymous',