@docusaurus/core 0.0.0-4675 → 0.0.0-4678

package/lib/commands/build.js

@@ -123,7 +123,7 @@ async function buildLocale({ siteDir, locale, cliOptions, forceTerminate, isLast
     plugins.forEach((plugin) => {
         const { configureWebpack, configurePostCss } = plugin;
         if (configurePostCss) {
-            clientConfig = (0, utils_1.applyConfigurePostCss)(configurePostCss, clientConfig);
+            clientConfig = (0, utils_1.applyConfigurePostCss)(configurePostCss.bind(plugin), clientConfig);
         }
         if (configureWebpack) {
             clientConfig = (0, utils_1.applyConfigureWebpack)(configureWebpack.bind(plugin), // The plugin lifecycle may reference `this`.

package/lib/commands/external.js

@@ -15,11 +15,7 @@ async function externalCommand(cli, siteDir) {
     const plugins = await (0, init_1.default)({ pluginConfigs, context });
     // Plugin Lifecycle - extendCli.
     plugins.forEach((plugin) => {
-        const { extendCli } = plugin;
-        if (!extendCli) {
-            return;
-        }
-        extendCli(cli);
+        plugin.extendCli?.(cli);
     });
 }
 exports.default = externalCommand;

package/lib/commands/start.js

@@ -116,10 +116,10 @@ async function start(siteDir, cliOptions) {
     plugins.forEach((plugin) => {
         const { configureWebpack, configurePostCss } = plugin;
         if (configurePostCss) {
-            config = (0, utils_2.applyConfigurePostCss)(configurePostCss, config);
+            config = (0, utils_2.applyConfigurePostCss)(configurePostCss.bind(plugin), config);
         }
         if (configureWebpack) {
-            config = (0, utils_2.applyConfigureWebpack)(configureWebpack.bind(plugin), // The plugin lifecycle may reference `this`. // TODO remove this implicit api: inject in callback instead
+            config = (0, utils_2.applyConfigureWebpack)(configureWebpack.bind(plugin), // The plugin lifecycle may reference `this`.
             config, false, props.siteConfig.webpack?.jsLoader, plugin.content);
         }
     });

package/lib/commands/writeHeadingIds.d.ts

@@ -4,12 +4,10 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { type Slugger } from '@docusaurus/utils';
 declare type Options = {
     maintainCase?: boolean;
     overwrite?: boolean;
 };
-export declare function transformMarkdownHeadingLine(line: string, slugger: Slugger, options?: Options): string;
 export declare function transformMarkdownContent(content: string, options?: Options): string;
 export default function writeHeadingIds(siteDir: string, files?: string[], options?: Options): Promise<void>;
 export {};

package/lib/commands/writeHeadingIds.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformMarkdownContent = exports.transformMarkdownHeadingLine = void 0;
+exports.transformMarkdownContent = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
@@ -24,53 +24,49 @@ function addHeadingId(line, slugger, maintainCase) {
     }
     const headingText = line.slice(headingLevel).trimEnd();
     const headingHashes = line.slice(0, headingLevel);
-    const slug = slugger
-        .slug(unwrapMarkdownLinks(headingText).trim(), { maintainCase })
-        .replace(/^-+/, '')
-        .replace(/-+$/, '');
+    const slug = slugger.slug(unwrapMarkdownLinks(headingText).trim(), {
+        maintainCase,
+    });
     return `${headingHashes}${headingText} {#${slug}}`;
 }
-function transformMarkdownHeadingLine(line, slugger, options = { maintainCase: false, overwrite: false }) {
+function transformMarkdownContent(content, options = { maintainCase: false, overwrite: false }) {
     const { maintainCase = false, overwrite = false } = options;
-    if (!line.startsWith('#')) {
-        throw new Error(`Line is not a Markdown heading: ${line}.`);
-    }
-    const parsedHeading = (0, utils_1.parseMarkdownHeadingId)(line);
-    // Do not process if id is already there
-    if (parsedHeading.id && !overwrite) {
-        return line;
-    }
-    return addHeadingId(parsedHeading.text, slugger, maintainCase);
-}
-exports.transformMarkdownHeadingLine = transformMarkdownHeadingLine;
-function transformMarkdownLine(line, slugger, options) {
-    // Ignore h1 headings on purpose, as we don't create anchor links for those
-    if (line.startsWith('##')) {
-        return transformMarkdownHeadingLine(line, slugger, options);
+    const lines = content.split('\n');
+    const slugger = (0, utils_1.createSlugger)();
+    // If we can't overwrite existing slugs, make sure other headings don't
+    // generate colliding slugs by first marking these slugs as occupied
+    if (!overwrite) {
+        lines.forEach((line) => {
+            const parsedHeading = (0, utils_1.parseMarkdownHeadingId)(line);
+            if (parsedHeading.id) {
+                slugger.slug(parsedHeading.id);
+            }
+        });
     }
-    return line;
-}
-function transformMarkdownLines(lines, options) {
     let inCode = false;
-    const slugger = (0, utils_1.createSlugger)();
-    return lines.map((line) => {
+    return lines
+        .map((line) => {
         if (line.startsWith('```')) {
             inCode = !inCode;
             return line;
         }
-        if (inCode) {
+        // Ignore h1 headings, as we don't create anchor links for those
+        if (inCode || !line.startsWith('##')) {
             return line;
         }
-        return transformMarkdownLine(line, slugger, options);
-    });
-}
-function transformMarkdownContent(content, options) {
-    return transformMarkdownLines(content.split('\n'), options).join('\n');
+        const parsedHeading = (0, utils_1.parseMarkdownHeadingId)(line);
+        // Do not process if id is already there
+        if (parsedHeading.id && !overwrite) {
+            return line;
+        }
+        return addHeadingId(parsedHeading.text, slugger, maintainCase);
+    })
+        .join('\n');
 }
 exports.transformMarkdownContent = transformMarkdownContent;
 async function transformMarkdownFile(filepath, options) {
     const content = await fs_extra_1.default.readFile(filepath, 'utf8');
-    const updatedContent = transformMarkdownLines(content.split('\n'), options).join('\n');
+    const updatedContent = transformMarkdownContent(content, options);
     if (content !== updatedContent) {
         await fs_extra_1.default.writeFile(filepath, updatedContent);
         return filepath;

package/lib/server/themes/index.js

@@ -39,7 +39,7 @@ async function loadThemeAliases(themePaths, userThemePaths) {
 exports.loadThemeAliases = loadThemeAliases;
 function loadPluginsThemeAliases({ siteDir, plugins, }) {
     const pluginThemes = plugins
-        .map((plugin) => (plugin.getThemePath ? plugin.getThemePath() : undefined))
+        .map((plugin) => plugin.getThemePath?.())
         .filter((x) => Boolean(x));
     const userTheme = path_1.default.resolve(siteDir, utils_1.THEME_PATH);
     return loadThemeAliases([ThemeFallbackDir, ...pluginThemes], [userTheme]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4675",
+  "version": "0.0.0-4678",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -41,13 +41,13 @@
     "@babel/runtime": "^7.17.2",
     "@babel/runtime-corejs3": "^7.17.2",
     "@babel/traverse": "^7.17.3",
-    "@docusaurus/cssnano-preset": "0.0.0-4675",
-    "@docusaurus/logger": "0.0.0-4675",
-    "@docusaurus/mdx-loader": "0.0.0-4675",
+    "@docusaurus/cssnano-preset": "0.0.0-4678",
+    "@docusaurus/logger": "0.0.0-4678",
+    "@docusaurus/mdx-loader": "0.0.0-4678",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4675",
-    "@docusaurus/utils-common": "0.0.0-4675",
-    "@docusaurus/utils-validation": "0.0.0-4675",
+    "@docusaurus/utils": "0.0.0-4678",
+    "@docusaurus/utils-common": "0.0.0-4678",
+    "@docusaurus/utils-validation": "0.0.0-4678",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.1",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.2",
@@ -106,8 +106,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4675",
-    "@docusaurus/types": "0.0.0-4675",
+    "@docusaurus/module-type-aliases": "0.0.0-4678",
+    "@docusaurus/types": "0.0.0-4678",
     "@types/detect-port": "^1.3.2",
     "@types/nprogress": "^0.2.0",
     "@types/react-dom": "^17.0.11",
@@ -128,5 +128,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "4489445a352d63a0cad904314abb772281d8bc1a"
+  "gitHead": "553449a1da416365f1980133f6059baa57e9df50"
 }