@docusaurus/theme-classic 0.0.0-5641 → 0.0.0-5643
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/options.js
CHANGED
|
@@ -277,6 +277,9 @@ const LogoSchema = utils_validation_1.Joi.object({
|
|
|
277
277
|
style: utils_validation_1.Joi.object(),
|
|
278
278
|
className: utils_validation_1.Joi.string(),
|
|
279
279
|
});
|
|
280
|
+
// Normalize prism language to lowercase
|
|
281
|
+
// See https://github.com/facebook/docusaurus/issues/9012
|
|
282
|
+
const PrismLanguage = utils_validation_1.Joi.string().custom((val) => val.toLowerCase());
|
|
280
283
|
exports.ThemeConfigSchema = utils_validation_1.Joi.object({
|
|
281
284
|
// TODO temporary (@alpha-58)
|
|
282
285
|
// @ts-expect-error: forbidden
|
|
@@ -341,9 +344,9 @@ exports.ThemeConfigSchema = utils_validation_1.Joi.object({
|
|
|
341
344
|
plain: utils_validation_1.Joi.alternatives().try(utils_validation_1.Joi.array(), utils_validation_1.Joi.object()).required(),
|
|
342
345
|
styles: utils_validation_1.Joi.alternatives().try(utils_validation_1.Joi.array(), utils_validation_1.Joi.object()).required(),
|
|
343
346
|
}),
|
|
344
|
-
defaultLanguage:
|
|
347
|
+
defaultLanguage: PrismLanguage,
|
|
345
348
|
additionalLanguages: utils_validation_1.Joi.array()
|
|
346
|
-
.items(
|
|
349
|
+
.items(PrismLanguage)
|
|
347
350
|
.default(exports.DEFAULT_CONFIG.prism.additionalLanguages),
|
|
348
351
|
magicComments: utils_validation_1.Joi.array()
|
|
349
352
|
.items(utils_validation_1.Joi.object({
|
|
@@ -20,6 +20,12 @@ import CopyButton from '@theme/CodeBlock/CopyButton';
|
|
|
20
20
|
import WordWrapButton from '@theme/CodeBlock/WordWrapButton';
|
|
21
21
|
import Container from '@theme/CodeBlock/Container';
|
|
22
22
|
import styles from './styles.module.css';
|
|
23
|
+
// Prism languages are always lowercase
|
|
24
|
+
// We want to fail-safe and allow both "php" and "PHP"
|
|
25
|
+
// See https://github.com/facebook/docusaurus/issues/9012
|
|
26
|
+
function normalizeLanguage(language) {
|
|
27
|
+
return language?.toLowerCase();
|
|
28
|
+
}
|
|
23
29
|
export default function CodeBlockString({
|
|
24
30
|
children,
|
|
25
31
|
className: blockClassName = '',
|
|
@@ -31,8 +37,9 @@ export default function CodeBlockString({
|
|
|
31
37
|
const {
|
|
32
38
|
prism: {defaultLanguage, magicComments},
|
|
33
39
|
} = useThemeConfig();
|
|
34
|
-
const language =
|
|
35
|
-
languageProp ?? parseLanguage(blockClassName) ?? defaultLanguage
|
|
40
|
+
const language = normalizeLanguage(
|
|
41
|
+
languageProp ?? parseLanguage(blockClassName) ?? defaultLanguage,
|
|
42
|
+
);
|
|
36
43
|
const prismTheme = usePrismTheme();
|
|
37
44
|
const wordWrap = useCodeWordWrap();
|
|
38
45
|
// We still parse the metastring in case we want to support more syntax in the
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@docusaurus/theme-classic",
|
|
3
|
-
"version": "0.0.0-
|
|
3
|
+
"version": "0.0.0-5643",
|
|
4
4
|
"description": "Classic theme for Docusaurus",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "src/theme-classic.d.ts",
|
|
@@ -20,18 +20,18 @@
|
|
|
20
20
|
"copy:watch": "node ../../admin/scripts/copyUntypedFiles.js --watch"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@docusaurus/core": "0.0.0-
|
|
24
|
-
"@docusaurus/mdx-loader": "0.0.0-
|
|
25
|
-
"@docusaurus/module-type-aliases": "0.0.0-
|
|
26
|
-
"@docusaurus/plugin-content-blog": "0.0.0-
|
|
27
|
-
"@docusaurus/plugin-content-docs": "0.0.0-
|
|
28
|
-
"@docusaurus/plugin-content-pages": "0.0.0-
|
|
29
|
-
"@docusaurus/theme-common": "0.0.0-
|
|
30
|
-
"@docusaurus/theme-translations": "0.0.0-
|
|
31
|
-
"@docusaurus/types": "0.0.0-
|
|
32
|
-
"@docusaurus/utils": "0.0.0-
|
|
33
|
-
"@docusaurus/utils-common": "0.0.0-
|
|
34
|
-
"@docusaurus/utils-validation": "0.0.0-
|
|
23
|
+
"@docusaurus/core": "0.0.0-5643",
|
|
24
|
+
"@docusaurus/mdx-loader": "0.0.0-5643",
|
|
25
|
+
"@docusaurus/module-type-aliases": "0.0.0-5643",
|
|
26
|
+
"@docusaurus/plugin-content-blog": "0.0.0-5643",
|
|
27
|
+
"@docusaurus/plugin-content-docs": "0.0.0-5643",
|
|
28
|
+
"@docusaurus/plugin-content-pages": "0.0.0-5643",
|
|
29
|
+
"@docusaurus/theme-common": "0.0.0-5643",
|
|
30
|
+
"@docusaurus/theme-translations": "0.0.0-5643",
|
|
31
|
+
"@docusaurus/types": "0.0.0-5643",
|
|
32
|
+
"@docusaurus/utils": "0.0.0-5643",
|
|
33
|
+
"@docusaurus/utils-common": "0.0.0-5643",
|
|
34
|
+
"@docusaurus/utils-validation": "0.0.0-5643",
|
|
35
35
|
"@mdx-js/react": "^2.1.5",
|
|
36
36
|
"clsx": "^1.2.1",
|
|
37
37
|
"copy-text-to-clipboard": "^3.2.0",
|
|
@@ -62,5 +62,5 @@
|
|
|
62
62
|
"engines": {
|
|
63
63
|
"node": ">=16.14"
|
|
64
64
|
},
|
|
65
|
-
"gitHead": "
|
|
65
|
+
"gitHead": "73060249631420a92613e47b88074c749962d1db"
|
|
66
66
|
}
|
package/src/options.ts
CHANGED
|
@@ -313,6 +313,10 @@ const LogoSchema = Joi.object({
|
|
|
313
313
|
className: Joi.string(),
|
|
314
314
|
});
|
|
315
315
|
|
|
316
|
+
// Normalize prism language to lowercase
|
|
317
|
+
// See https://github.com/facebook/docusaurus/issues/9012
|
|
318
|
+
const PrismLanguage = Joi.string().custom((val) => val.toLowerCase());
|
|
319
|
+
|
|
316
320
|
export const ThemeConfigSchema = Joi.object<ThemeConfig>({
|
|
317
321
|
// TODO temporary (@alpha-58)
|
|
318
322
|
// @ts-expect-error: forbidden
|
|
@@ -385,9 +389,9 @@ export const ThemeConfigSchema = Joi.object<ThemeConfig>({
|
|
|
385
389
|
plain: Joi.alternatives().try(Joi.array(), Joi.object()).required(),
|
|
386
390
|
styles: Joi.alternatives().try(Joi.array(), Joi.object()).required(),
|
|
387
391
|
}),
|
|
388
|
-
defaultLanguage:
|
|
392
|
+
defaultLanguage: PrismLanguage,
|
|
389
393
|
additionalLanguages: Joi.array()
|
|
390
|
-
.items(
|
|
394
|
+
.items(PrismLanguage)
|
|
391
395
|
.default(DEFAULT_CONFIG.prism.additionalLanguages),
|
|
392
396
|
magicComments: Joi.array()
|
|
393
397
|
.items(
|
|
@@ -24,6 +24,13 @@ import type {Props} from '@theme/CodeBlock/Content/String';
|
|
|
24
24
|
|
|
25
25
|
import styles from './styles.module.css';
|
|
26
26
|
|
|
27
|
+
// Prism languages are always lowercase
|
|
28
|
+
// We want to fail-safe and allow both "php" and "PHP"
|
|
29
|
+
// See https://github.com/facebook/docusaurus/issues/9012
|
|
30
|
+
function normalizeLanguage(language: string | undefined): string | undefined {
|
|
31
|
+
return language?.toLowerCase();
|
|
32
|
+
}
|
|
33
|
+
|
|
27
34
|
export default function CodeBlockString({
|
|
28
35
|
children,
|
|
29
36
|
className: blockClassName = '',
|
|
@@ -35,8 +42,10 @@ export default function CodeBlockString({
|
|
|
35
42
|
const {
|
|
36
43
|
prism: {defaultLanguage, magicComments},
|
|
37
44
|
} = useThemeConfig();
|
|
38
|
-
const language =
|
|
39
|
-
languageProp ?? parseLanguage(blockClassName) ?? defaultLanguage
|
|
45
|
+
const language = normalizeLanguage(
|
|
46
|
+
languageProp ?? parseLanguage(blockClassName) ?? defaultLanguage,
|
|
47
|
+
);
|
|
48
|
+
|
|
40
49
|
const prismTheme = usePrismTheme();
|
|
41
50
|
const wordWrap = useCodeWordWrap();
|
|
42
51
|
|