@docusaurus/core 2.0.0-beta.16 → 2.0.0-beta.19

package/lib/commands/start.js

@@ -6,71 +6,71 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.start = void 0;
 const tslib_1 = require("tslib");
 const utils_1 = require("@docusaurus/utils");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const chokidar_1 = (0, tslib_1.__importDefault)(require("chokidar"));
-const html_webpack_plugin_1 = (0, tslib_1.__importDefault)(require("html-webpack-plugin"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
-const openBrowser_1 = (0, tslib_1.__importDefault)(require("react-dev-utils/openBrowser"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const chokidar_1 = tslib_1.__importDefault(require("chokidar"));
+const html_webpack_plugin_1 = tslib_1.__importDefault(require("html-webpack-plugin"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const openBrowser_1 = tslib_1.__importDefault(require("react-dev-utils/openBrowser"));
 const WebpackDevServerUtils_1 = require("react-dev-utils/WebpackDevServerUtils");
-const evalSourceMapMiddleware_1 = (0, tslib_1.__importDefault)(require("react-dev-utils/evalSourceMapMiddleware"));
-const webpack_1 = (0, tslib_1.__importDefault)(require("webpack"));
-const webpack_dev_server_1 = (0, tslib_1.__importDefault)(require("webpack-dev-server"));
-const webpack_merge_1 = (0, tslib_1.__importDefault)(require("webpack-merge"));
+const evalSourceMapMiddleware_1 = tslib_1.__importDefault(require("react-dev-utils/evalSourceMapMiddleware"));
+const webpack_1 = tslib_1.__importDefault(require("webpack"));
+const webpack_dev_server_1 = tslib_1.__importDefault(require("webpack-dev-server"));
+const webpack_merge_1 = tslib_1.__importDefault(require("webpack-merge"));
 const server_1 = require("../server");
-const client_1 = (0, tslib_1.__importDefault)(require("../webpack/client"));
+const client_1 = tslib_1.__importDefault(require("../webpack/client"));
 const utils_2 = require("../webpack/utils");
-const commandUtils_1 = require("./commandUtils");
+const getHostPort_1 = require("../server/getHostPort");
 const translations_1 = require("../server/translations/translations");
 async function start(siteDir, cliOptions) {
     process.env.NODE_ENV = 'development';
     process.env.BABEL_ENV = 'development';
     logger_1.default.info('Starting the development server...');
     function loadSite() {
-        return (0, server_1.load)(siteDir, {
-            customConfigFilePath: cliOptions.config,
+        return (0, server_1.load)({
+            siteDir,
+            config: cliOptions.config,
             locale: cliOptions.locale,
-            localizePath: undefined, // should this be configurable?
+            localizePath: undefined, // Should this be configurable?
         });
     }
     // Process all related files as a prop.
     const props = await loadSite();
     const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
-    const host = (0, commandUtils_1.getCLIOptionHost)(cliOptions.host);
-    const port = await (0, commandUtils_1.getCLIOptionPort)(cliOptions.port, host);
+    const { host, port } = await (0, getHostPort_1.getHostPort)(cliOptions);
     if (port === null) {
         process.exit();
     }
     const { baseUrl, headTags, preBodyTags, postBodyTags } = props;
     const urls = (0, WebpackDevServerUtils_1.prepareUrls)(protocol, host, port);
     const openUrl = (0, utils_1.normalizeUrl)([urls.localUrlForBrowser, baseUrl]);
-    logger_1.default.success `Docusaurus website is running at path=${openUrl}.`;
+    logger_1.default.success `Docusaurus website is running at url=${openUrl}.`;
     // Reload files processing.
     const reload = lodash_1.default.debounce(() => {
         loadSite()
             .then(({ baseUrl: newBaseUrl }) => {
             const newOpenUrl = (0, utils_1.normalizeUrl)([urls.localUrlForBrowser, newBaseUrl]);
             if (newOpenUrl !== openUrl) {
-                logger_1.default.success `Docusaurus website is running at path=${newOpenUrl}.`;
+                logger_1.default.success `Docusaurus website is running at url=${newOpenUrl}.`;
             }
         })
             .catch((err) => {
             logger_1.default.error(err.stack);
         });
     }, 500);
-    const { siteConfig, plugins = [] } = props;
+    const { siteConfig, plugins } = props;
     const normalizeToSiteDir = (filepath) => {
         if (filepath && path_1.default.isAbsolute(filepath)) {
             return (0, utils_1.posixPath)(path_1.default.relative(siteDir, filepath));
         }
         return (0, utils_1.posixPath)(filepath);
     };
-    const pluginPaths = []
-        .concat(...plugins
-        .map((plugin) => { var _a, _b; return (_b = (_a = plugin.getPathsToWatch) === null || _a === void 0 ? void 0 : _a.call(plugin)) !== null && _b !== void 0 ? _b : []; })
-        .filter(Boolean))
+    const pluginPaths = plugins
+        .flatMap((plugin) => plugin.getPathsToWatch?.() ?? [])
+        .filter(Boolean)
         .map(normalizeToSiteDir);
     const pathsToWatch = [
         ...pluginPaths,
@@ -94,6 +94,10 @@ async function start(siteDir, cliOptions) {
     });
     ['add', 'change', 'unlink', 'addDir', 'unlinkDir'].forEach((event) => fsWatcher.on(event, reload));
     let config = (0, webpack_merge_1.default)(await (0, client_1.default)(props), {
+        watchOptions: {
+            ignored: /node_modules\/(?!@docusaurus)/,
+            poll: cliOptions.poll,
+        },
         infrastructureLogging: {
             // Reduce log verbosity, see https://github.com/facebook/docusaurus/pull/5420#issuecomment-906613105
             level: 'warn',
@@ -101,7 +105,7 @@ async function start(siteDir, cliOptions) {
         plugins: [
             // Generates an `index.html` file with the <script> injected.
             new html_webpack_plugin_1.default({
-                template: path_1.default.resolve(__dirname, '../webpack/templates/index.html.template.ejs'),
+                template: path_1.default.join(__dirname, '../webpack/templates/index.html.template.ejs'),
                 // So we can define the position where the scripts are injected.
                 inject: false,
                 filename: 'index.html',
@@ -114,14 +118,13 @@ async function start(siteDir, cliOptions) {
     });
     // Plugin Lifecycle - configureWebpack and configurePostCss.
     plugins.forEach((plugin) => {
-        var _a;
         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, false, (_a = props.siteConfig.webpack) === null || _a === void 0 ? void 0 : _a.jsLoader, plugin.content);
+            config = (0, utils_2.applyConfigureWebpack)(configureWebpack.bind(plugin), // The plugin lifecycle may reference `this`.
+            config, false, props.siteConfig.webpack?.jsLoader, plugin.content);
         }
     });
     const compiler = (0, webpack_1.default)(config);
@@ -200,4 +203,4 @@ async function start(siteDir, cliOptions) {
         });
     });
 }
-exports.default = start;
+exports.start = start;

package/lib/commands/swizzle/actions.d.ts

@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { SwizzleAction, SwizzleComponentConfig } from '@docusaurus/types';
-import type { SwizzleOptions } from './common';
+import type { SwizzleCLIOptions } from './common';
 export declare const SwizzleActions: SwizzleAction[];
-export declare function getAction(componentConfig: SwizzleComponentConfig, options: Pick<SwizzleOptions, 'wrap' | 'eject'>): Promise<SwizzleAction>;
+export declare function getAction(componentConfig: SwizzleComponentConfig, options: Pick<SwizzleCLIOptions, 'wrap' | 'eject'>): Promise<SwizzleAction>;
 export declare type ActionParams = {
     siteDir: string;
     themePath: string;

package/lib/commands/swizzle/actions.js

@@ -8,10 +8,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.wrap = exports.eject = exports.getAction = exports.SwizzleActions = void 0;
 const tslib_1 = require("tslib");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const utils_1 = require("@docusaurus/utils");
 const prompts_1 = require("./prompts");
 exports.SwizzleActions = ['wrap', 'eject'];
@@ -32,7 +32,7 @@ async function eject({ siteDir, themePath, componentName, }) {
     const fromPath = path_1.default.join(themePath, componentName);
     const isDirectory = await isDir(fromPath);
     const globPattern = isDirectory
-        ? // do we really want to copy all components?
+        ? // Do we really want to copy all components?
             path_1.default.join(fromPath, '*')
         : `${fromPath}.*`;
     const globPatternPosix = (0, utils_1.posixPath)(globPattern);
@@ -51,10 +51,11 @@ async function eject({ siteDir, themePath, componentName, }) {
         const fileName = path_1.default.basename(sourceFile);
         const targetFile = path_1.default.join(toPath, fileName);
         try {
-            await fs_extra_1.default.copy(sourceFile, targetFile, { overwrite: true });
+            const fileContents = await fs_extra_1.default.readFile(sourceFile, 'utf-8');
+            await fs_extra_1.default.outputFile(targetFile, fileContents.trimStart().replace(/^\/\*.+?\*\/\s*/ms, ''));
         }
         catch (err) {
-            throw new Error(logger_1.default.interpolate `Could not copy file from ${sourceFile} to ${targetFile}`);
+            throw new Error(logger_1.default.interpolate `Could not copy file from path=${sourceFile} to path=${targetFile}`);
         }
         return targetFile;
     }));
@@ -74,7 +75,7 @@ async function wrap({ siteDir, themePath, componentName: themeComponentName, typ
 import type ${componentName}Type from '@theme/${themeComponentName}';
 import ${componentName} from '@theme-${importType}/${themeComponentName}';
 
-type Props = ComponentProps<typeof ${componentName}Type>
+type Props = ComponentProps<typeof ${componentName}Type>;
 
 export default function ${wrapperComponentName}(props: Props): JSX.Element {
   return (
@@ -95,8 +96,7 @@ export default function ${wrapperComponentName}(props) {
   );
 }
 `;
-    await fs_extra_1.default.ensureDir(path_1.default.dirname(toPath));
-    await fs_extra_1.default.writeFile(toPath, content);
+    await fs_extra_1.default.outputFile(toPath, content);
     return { createdFiles: [toPath] };
 }
 exports.wrap = wrap;

package/lib/commands/swizzle/common.d.ts

@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import type { NormalizedPluginConfig } from '../../server/plugins/configs';
 import type { InitializedPlugin, SwizzleAction, SwizzleActionStatus } from '@docusaurus/types';
-import type { NormalizedPluginConfig } from '../../server/plugins/init';
 export declare const SwizzleActions: SwizzleAction[];
 export declare const SwizzleActionsStatuses: SwizzleActionStatus[];
 export declare const PartiallySafeHint: string;
@@ -21,13 +21,13 @@ export declare type SwizzlePlugin = {
 export declare type SwizzleContext = {
     plugins: SwizzlePlugin[];
 };
-export declare type SwizzleOptions = {
+export declare type SwizzleCLIOptions = {
     typescript: boolean;
     danger: boolean;
     list: boolean;
     wrap: boolean;
     eject: boolean;
 };
-export declare function normalizeOptions(options: Partial<SwizzleOptions>): SwizzleOptions;
+export declare function normalizeOptions(options: Partial<SwizzleCLIOptions>): SwizzleCLIOptions;
 export declare function findStringIgnoringCase(str: string, values: string[]): string | undefined;
 export declare function findClosestValue(str: string, values: string[], maxLevenshtein?: number): string | undefined;

package/lib/commands/swizzle/common.js

@@ -8,9 +8,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findClosestValue = exports.findStringIgnoringCase = exports.normalizeOptions = exports.actionStatusSuffix = exports.actionStatusColor = exports.actionStatusLabel = exports.PartiallySafeHint = exports.SwizzleActionsStatuses = exports.SwizzleActions = void 0;
 const tslib_1 = require("tslib");
-const leven_1 = (0, tslib_1.__importDefault)(require("leven"));
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
+const leven_1 = tslib_1.__importDefault(require("leven"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 exports.SwizzleActions = ['wrap', 'eject'];
 exports.SwizzleActionsStatuses = [
     'safe',
@@ -37,13 +37,12 @@ function actionStatusSuffix(status, options = {}) {
 }
 exports.actionStatusSuffix = actionStatusSuffix;
 function normalizeOptions(options) {
-    var _a, _b, _c, _d, _e;
     return {
-        typescript: (_a = options.typescript) !== null && _a !== void 0 ? _a : false,
-        danger: (_b = options.danger) !== null && _b !== void 0 ? _b : false,
-        list: (_c = options.list) !== null && _c !== void 0 ? _c : false,
-        wrap: (_d = options.wrap) !== null && _d !== void 0 ? _d : false,
-        eject: (_e = options.eject) !== null && _e !== void 0 ? _e : false,
+        typescript: options.typescript ?? false,
+        danger: options.danger ?? false,
+        list: options.list ?? false,
+        wrap: options.wrap ?? false,
+        eject: options.eject ?? false,
     };
 }
 exports.normalizeOptions = normalizeOptions;

package/lib/commands/swizzle/components.js

@@ -8,16 +8,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getComponentName = exports.getThemeComponents = exports.listComponentNames = exports.readComponentNames = void 0;
 const tslib_1 = require("tslib");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const utils_1 = require("@docusaurus/utils");
 const prompts_1 = require("./prompts");
 const common_1 = require("./common");
 const tables_1 = require("./tables");
 const actions_1 = require("./actions");
 const formatComponentName = (componentName) => componentName.replace(/[/\\]index\.[jt]sx?/, '').replace(/\.[jt]sx?/, '');
+function sortComponentNames(componentNames) {
+    return componentNames.sort(); // Algo may change?
+}
+/**
+ * Expand a list of components to include and return parent folders.
+ * If a folder is not directly a component (no Folder/index.tsx file),
+ * we still want to be able to swizzle --eject that folder.
+ * See https://github.com/facebook/docusaurus/pull/7175#issuecomment-1103757218
+ *
+ * @param componentNames the original list of component names
+ */
+function getMissingIntermediateComponentFolderNames(componentNames) {
+    function getAllIntermediatePaths(componentName) {
+        const paths = componentName.split('/');
+        return lodash_1.default.range(1, paths.length + 1).map((i) => paths.slice(0, i).join('/'));
+    }
+    const expandedComponentNames = lodash_1.default.uniq(componentNames.flatMap((componentName) => getAllIntermediatePaths(componentName)));
+    return lodash_1.default.difference(expandedComponentNames, componentNames);
+}
 const skipReadDirNames = ['__test__', '__tests__', '__mocks__', '__fixtures__'];
 async function readComponentNames(themePath) {
     if (!(await fs_extra_1.default.pathExists(themePath))) {
@@ -48,8 +67,8 @@ async function readComponentNames(themePath) {
         }))).flat();
     }
     const componentFiles = await walk(themePath);
-    const componentFilesOrdered = lodash_1.default.orderBy(componentFiles, [(f) => f.componentName], ['asc']);
-    return componentFilesOrdered.map((f) => f.componentName);
+    const componentNames = componentFiles.map((f) => f.componentName);
+    return sortComponentNames(componentNames);
 }
 exports.readComponentNames = readComponentNames;
 function listComponentNames(themeComponents) {
@@ -72,21 +91,37 @@ async function getThemeComponents({ themeName, themePath, swizzleConfig, }) {
         },
         description: FallbackSwizzleComponentDescription,
     };
-    const allComponents = await readComponentNames(themePath);
+    const FallbackIntermediateFolderSwizzleComponentConfig = {
+        actions: {
+            // It doesn't make sense to wrap an intermediate folder
+            // because it has not any index component
+            wrap: 'forbidden',
+            eject: FallbackSwizzleActionStatus,
+        },
+        description: FallbackSwizzleComponentDescription,
+    };
+    const allInitialComponents = await readComponentNames(themePath);
+    const missingIntermediateComponentFolderNames = getMissingIntermediateComponentFolderNames(allInitialComponents);
+    const allComponents = sortComponentNames(allInitialComponents.concat(missingIntermediateComponentFolderNames));
     function getConfig(component) {
-        var _a;
         if (!allComponents.includes(component)) {
             throw new Error(`Can't get component config: component doesn't exist: ${component}`);
         }
-        return ((_a = swizzleConfig.components[component]) !== null && _a !== void 0 ? _a : FallbackSwizzleComponentConfig);
+        const config = swizzleConfig.components[component];
+        if (config) {
+            return config;
+        }
+        const isIntermediateFolder = missingIntermediateComponentFolderNames.includes(component);
+        if (isIntermediateFolder) {
+            return FallbackIntermediateFolderSwizzleComponentConfig;
+        }
+        return (swizzleConfig.components[component] ?? FallbackSwizzleComponentConfig);
     }
     function getDescription(component) {
-        var _a;
-        return ((_a = getConfig(component).description) !== null && _a !== void 0 ? _a : FallbackSwizzleComponentDescription);
+        return (getConfig(component).description ?? FallbackSwizzleComponentDescription);
     }
     function getActionStatus(component, action) {
-        var _a;
-        return (_a = getConfig(component).actions[action]) !== null && _a !== void 0 ? _a : FallbackSwizzleActionStatus;
+        return getConfig(component).actions[action] ?? FallbackSwizzleActionStatus;
     }
     function isSafeAction(component, action) {
         return getActionStatus(component, action) === 'safe';

package/lib/commands/swizzle/config.js

@@ -11,15 +11,18 @@ const utils_validation_1 = require("@docusaurus/utils-validation");
 const common_1 = require("./common");
 const themes_1 = require("./themes");
 function getModuleSwizzleConfig(swizzlePlugin) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    const getSwizzleConfig = (_d = (_b = (_a = swizzlePlugin.plugin.plugin) === null || _a === void 0 ? void 0 : _a.getSwizzleConfig) !== null && _b !== void 0 ? _b : (_c = swizzlePlugin.plugin.pluginModule) === null || _c === void 0 ? void 0 : _c.module.getSwizzleConfig) !== null && _d !== void 0 ? _d : (_f = (_e = swizzlePlugin.plugin.pluginModule) === null || _e === void 0 ? void 0 : _e.module) === null || _f === void 0 ? void 0 : _f.getSwizzleConfig;
+    const getSwizzleConfig = swizzlePlugin.plugin.plugin?.getSwizzleConfig ??
+        swizzlePlugin.plugin.pluginModule?.module.getSwizzleConfig ??
+        swizzlePlugin.plugin.pluginModule?.module?.getSwizzleConfig;
     if (getSwizzleConfig) {
         return getSwizzleConfig();
     }
     // TODO deprecate getSwizzleComponentList later
-    const getSwizzleComponentList = (_k = (_h = (_g = swizzlePlugin.plugin.plugin) === null || _g === void 0 ? void 0 : _g.getSwizzleComponentList) !== null && _h !== void 0 ? _h : (_j = swizzlePlugin.plugin.pluginModule) === null || _j === void 0 ? void 0 : _j.module.getSwizzleComponentList) !== null && _k !== void 0 ? _k : (_m = (_l = swizzlePlugin.plugin.pluginModule) === null || _l === void 0 ? void 0 : _l.module) === null || _m === void 0 ? void 0 : _m.getSwizzleComponentList;
+    const getSwizzleComponentList = swizzlePlugin.plugin.plugin?.getSwizzleComponentList ??
+        swizzlePlugin.plugin.pluginModule?.module.getSwizzleComponentList ??
+        swizzlePlugin.plugin.pluginModule?.module?.getSwizzleComponentList;
     if (getSwizzleComponentList) {
-        const safeComponents = (_o = getSwizzleComponentList()) !== null && _o !== void 0 ? _o : [];
+        const safeComponents = getSwizzleComponentList() ?? [];
         const safeComponentConfig = {
             actions: {
                 eject: 'safe',
@@ -33,20 +36,23 @@ function getModuleSwizzleConfig(swizzlePlugin) {
     }
     return undefined;
 }
-function normalizeSwizzleConfig(unsafeSwizzleConfig) {
-    const schema = utils_validation_1.Joi.object({
-        components: utils_validation_1.Joi.object()
-            .pattern(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
-            actions: utils_validation_1.Joi.object().pattern(utils_validation_1.Joi.string().valid(...common_1.SwizzleActions), utils_validation_1.Joi.string().valid(...common_1.SwizzleActionsStatuses)),
-            description: utils_validation_1.Joi.string(),
-        }))
-            .required(),
-    });
-    const result = schema.validate(unsafeSwizzleConfig);
+const SwizzleConfigSchema = utils_validation_1.Joi.object({
+    components: utils_validation_1.Joi.object()
+        .pattern(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
+        actions: utils_validation_1.Joi.object().pattern(utils_validation_1.Joi.string().valid(...common_1.SwizzleActions), utils_validation_1.Joi.string().valid(...common_1.SwizzleActionsStatuses)),
+        description: utils_validation_1.Joi.string(),
+    }))
+        .required(),
+});
+function validateSwizzleConfig(unsafeSwizzleConfig) {
+    const result = SwizzleConfigSchema.validate(unsafeSwizzleConfig);
     if (result.error) {
         throw new Error(`Swizzle config does not match expected schema: ${result.error.message}`);
     }
-    const swizzleConfig = result.value;
+    return result.value;
+}
+function normalizeSwizzleConfig(unsafeSwizzleConfig) {
+    const swizzleConfig = validateSwizzleConfig(unsafeSwizzleConfig);
     // Ensure all components always declare all actions
     Object.values(swizzleConfig.components).forEach((componentConfig) => {
         common_1.SwizzleActions.forEach((action) => {

package/lib/commands/swizzle/context.js

@@ -7,22 +7,16 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initSwizzleContext = void 0;
-const tslib_1 = require("tslib");
-const module_1 = require("module");
 const server_1 = require("../../server");
-const init_1 = (0, tslib_1.__importStar)(require("../../server/plugins/init"));
+const init_1 = require("../../server/plugins/init");
+const configs_1 = require("../../server/plugins/configs");
 async function initSwizzleContext(siteDir) {
-    const context = await (0, server_1.loadContext)(siteDir);
-    const pluginRequire = (0, module_1.createRequire)(context.siteConfigPath);
-    const pluginConfigs = await (0, server_1.loadPluginConfigs)(context);
-    const plugins = await (0, init_1.default)({
-        pluginConfigs,
-        context,
-    });
-    const pluginsNormalized = await (0, init_1.normalizePluginConfigs)(pluginConfigs, pluginRequire);
+    const context = await (0, server_1.loadContext)({ siteDir });
+    const plugins = await (0, init_1.initPlugins)(context);
+    const pluginConfigs = await (0, configs_1.loadPluginConfigs)(context);
     return {
         plugins: plugins.map((plugin, pluginIndex) => ({
-            plugin: pluginsNormalized[pluginIndex],
+            plugin: pluginConfigs[pluginIndex],
             instance: plugin,
         })),
     };

package/lib/commands/swizzle/index.d.ts

@@ -4,5 +4,5 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import type { SwizzleOptions } from './common';
-export default function swizzle(siteDir: string, themeNameParam: string | undefined, componentNameParam: string | undefined, optionsParam: Partial<SwizzleOptions>): Promise<void>;
+import type { SwizzleCLIOptions } from './common';
+export declare function swizzle(siteDir: string, themeNameParam: string | undefined, componentNameParam: string | undefined, optionsParam: Partial<SwizzleCLIOptions>): Promise<void>;

package/lib/commands/swizzle/index.js

@@ -6,8 +6,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.swizzle = void 0;
 const tslib_1 = require("tslib");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const themes_1 = require("./themes");
 const components_1 = require("./components");
 const tables_1 = require("./tables");
@@ -90,7 +91,7 @@ async function swizzle(siteDir, themeNameParam, componentNameParam, optionsParam
                     typescript,
                 });
                 logger_1.default.success `
-Created wrapper of name=${componentName} from name=${themeName} in path=${result.createdFiles}.
+Created wrapper of name=${componentName} from name=${themeName} in path=${result.createdFiles}
 `;
                 return result;
             }
@@ -101,7 +102,7 @@ Created wrapper of name=${componentName} from name=${themeName} in path=${result
                     componentName,
                 });
                 logger_1.default.success `
-Ejected name=${componentName} from name=${themeName} to path=${result.createdFiles}.
+Ejected name=${componentName} from name=${themeName} to path=${result.createdFiles}
 `;
                 return result;
             }
@@ -112,4 +113,4 @@ Ejected name=${componentName} from name=${themeName} to path=${result.createdFil
     await executeAction();
     return process.exit(0);
 }
-exports.default = swizzle;
+exports.swizzle = swizzle;

package/lib/commands/swizzle/prompts.js

@@ -8,8 +8,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.askSwizzleAction = exports.askSwizzleDangerousComponent = exports.askComponentName = exports.askThemeName = void 0;
 const tslib_1 = require("tslib");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const prompts_1 = (0, tslib_1.__importDefault)(require("prompts"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const prompts_1 = tslib_1.__importDefault(require("prompts"));
 const common_1 = require("./common");
 const ExitTitle = logger_1.default.yellow('[Exit]');
 async function askThemeName(themeNames) {

package/lib/commands/swizzle/tables.js

@@ -8,9 +8,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.themeComponentsTable = exports.helpTables = void 0;
 const tslib_1 = require("tslib");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const cli_table3_1 = (0, tslib_1.__importDefault)(require("cli-table3"));
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const cli_table3_1 = tslib_1.__importDefault(require("cli-table3"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const actions_1 = require("./actions");
 const common_1 = require("./common");
 function tableStatusLabel(status) {
@@ -31,8 +31,7 @@ This component is safe to swizzle and was designed for this purpose.
 The swizzled component is retro-compatible with minor version upgrades.
 `,
         ],
-    });
-    table.push({
+    }, {
         [tableStatusLabel('unsafe')]: [
             logger_1.default.code('--danger'),
             `
@@ -44,12 +43,11 @@ ${logger_1.default.green('Tip')}: your customization can't be done in a ${tableS
 Report it here: https://github.com/facebook/docusaurus/discussions/5468
 `,
         ],
-    });
-    table.push({
+    }, {
         [tableStatusLabel('forbidden')]: [
             '',
             `
-This component should not meant to be swizzled.
+This component is not meant to be swizzled.
 `,
         ],
     });
@@ -66,18 +64,17 @@ function actionsTable() {
 Creates a wrapper around the original theme component.
 Allows rendering other components before/after the original theme component.
 
-${logger_1.default.green('Tip')}: prefer ${logger_1.default.code('--wrap')} whenever possible to reduces the amount of code to maintain.
+${logger_1.default.green('Tip')}: prefer ${logger_1.default.code('--wrap')} whenever possible to reduce the amount of code to maintain.
       `,
         ],
-    });
-    table.push({
+    }, {
         [logger_1.default.bold('Eject')]: [
             logger_1.default.code('--eject'),
             `
 Ejects the full source code of the original theme component.
-Allows overriding the original component entirely with your own UI and logic.
+Allows overriding of the original component entirely with your own UI and logic.
 
-${logger_1.default.green('Tip')}: ${logger_1.default.code('--eject')} can be useful to completely redesign a component.
+${logger_1.default.green('Tip')}: ${logger_1.default.code('--eject')} can be useful for completely redesigning a component.
 `,
         ],
     });

package/lib/commands/swizzle/themes.js

@@ -8,15 +8,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getThemePath = exports.getThemeName = exports.getThemeNames = exports.getPluginByThemeName = exports.pluginToThemeName = void 0;
 const tslib_1 = require("tslib");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const leven_1 = (0, tslib_1.__importDefault)(require("leven"));
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const leven_1 = tslib_1.__importDefault(require("leven"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const prompts_1 = require("./prompts");
 const common_1 = require("./common");
 function pluginToThemeName(plugin) {
-    var _a;
     if (plugin.instance.getThemePath) {
-        return ((_a = plugin.instance.version.name) !== null && _a !== void 0 ? _a : plugin.instance.name);
+        return (plugin.instance.version.name ?? plugin.instance.name);
     }
     return undefined;
 }
@@ -86,11 +86,12 @@ async function getThemeName({ themeNameParam, themeNames, list, }) {
 }
 exports.getThemeName = getThemeName;
 function getThemePath({ plugins, themeName, typescript, }) {
-    var _a, _b, _c, _d;
     const pluginInstance = getPluginByThemeName(plugins, themeName);
     const themePath = typescript
-        ? (_b = (_a = pluginInstance.instance).getTypeScriptThemePath) === null || _b === void 0 ? void 0 : _b.call(_a)
-        : (_d = (_c = pluginInstance.instance).getThemePath) === null || _d === void 0 ? void 0 : _d.call(_c);
+        ? pluginInstance.instance.getTypeScriptThemePath &&
+            path_1.default.resolve(pluginInstance.instance.path, pluginInstance.instance.getTypeScriptThemePath())
+        : pluginInstance.instance.getThemePath &&
+            path_1.default.resolve(pluginInstance.instance.path, pluginInstance.instance.getThemePath());
     if (!themePath) {
         logger_1.default.warn(typescript
             ? logger_1.default.interpolate `name=${themeName} does not provide TypeScript theme code via ${'getTypeScriptThemePath()'}.`

package/lib/commands/writeHeadingIds.d.ts

@@ -4,12 +4,5 @@
  * 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 {};
+import { type WriteHeadingIDOptions } from '@docusaurus/utils';
+export declare function writeHeadingIds(siteDir: string, files: string[], options: WriteHeadingIDOptions): Promise<void>;