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

package/lib/babel/preset.js

@@ -7,7 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const path_1 = tslib_1.__importDefault(require("path"));
 function getTransformOptions(isServer) {
     const absoluteRuntimePath = path_1.default.dirname(require.resolve(`@babel/runtime/package.json`));
     return {
@@ -68,7 +68,7 @@ function getTransformOptions(isServer) {
     };
 }
 function babelPresets(api) {
-    const callerName = api.caller((caller) => caller === null || caller === void 0 ? void 0 : caller.name);
+    const callerName = api.caller((caller) => caller?.name);
     return getTransformOptions(callerName === 'server');
 }
 exports.default = babelPresets;

package/lib/choosePort.js

@@ -12,10 +12,10 @@ const tslib_1 = require("tslib");
  * uses many of the same utility functions to implement it.
  */
 const child_process_1 = require("child_process");
-const detect_port_1 = (0, tslib_1.__importDefault)(require("detect-port"));
-const is_root_1 = (0, tslib_1.__importDefault)(require("is-root"));
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const prompts_1 = (0, tslib_1.__importDefault)(require("prompts"));
+const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
+const is_root_1 = tslib_1.__importDefault(require("is-root"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const prompts_1 = tslib_1.__importDefault(require("prompts"));
 const isInteractive = process.stdout.isTTY;
 const execOptions = {
     encoding: 'utf8',

package/lib/client/client-lifecycles-dispatcher.js

@@ -7,9 +7,9 @@
 import clientModules from '@generated/client-modules';
 function dispatchLifecycleAction(lifecycleAction, args) {
     clientModules.forEach((clientModule) => {
-        var _a, _b;
-        const lifecycleFunction = ((_b = (_a = clientModule === null || clientModule === void 0 ? void 0 : clientModule.default) === null || _a === void 0 ? void 0 : _a[lifecycleAction]) !== null && _b !== void 0 ? _b : clientModule[lifecycleAction]);
-        lifecycleFunction === null || lifecycleFunction === void 0 ? void 0 : lifecycleFunction(...args);
+        const lifecycleFunction = (clientModule?.default?.[lifecycleAction] ??
+            clientModule[lifecycleAction]);
+        lifecycleFunction?.(...args);
     });
 }
 const clientLifecyclesDispatchers = {

package/lib/client/docusaurus.js

@@ -13,11 +13,8 @@ import flat from './flat';
 const fetched = {};
 const loaded = {};
 // If user is on slow or constrained connection.
-const isSlowConnection = () => {
-    var _a, _b;
-    return ((_a = navigator.connection) === null || _a === void 0 ? void 0 : _a.effectiveType.includes('2g')) &&
-        ((_b = navigator.connection) === null || _b === void 0 ? void 0 : _b.saveData);
-};
+const isSlowConnection = () => navigator.connection?.effectiveType.includes('2g') &&
+    navigator.connection?.saveData;
 const canPrefetch = (routePath) => !isSlowConnection() && !loaded[routePath] && !fetched[routePath];
 const canPreload = (routePath) => !isSlowConnection() && !loaded[routePath];
 // Remove the last part containing the route hash

package/lib/client/exports/ErrorBoundary.js

@@ -19,18 +19,17 @@ export default class ErrorBoundary extends React.Component {
         }
     }
     render() {
-        var _a;
         const { children } = this.props;
         const { error } = this.state;
         if (error) {
-            const fallback = (_a = this.props.fallback) !== null && _a !== void 0 ? _a : DefaultFallback;
+            const fallback = this.props.fallback ?? DefaultFallback;
             return fallback({
                 error,
                 tryAgain: () => this.setState({ error: null }),
             });
         }
-        return (children !== null && children !== void 0 ? children : 
-        // See https://github.com/facebook/docusaurus/issues/6337#issuecomment-1012913647
-        null);
+        return (children ??
+            // See https://github.com/facebook/docusaurus/issues/6337#issuecomment-1012913647
+            null);
     }
 }

package/lib/client/exports/Interpolate.js

@@ -17,7 +17,7 @@ export function interpolate(text, values) {
     const processedText = text.replace(ValueRegexp, (match) => {
         // remove {{ and }} around the placeholder
         const key = match.substring(1, match.length - 1);
-        const value = values === null || values === void 0 ? void 0 : values[key];
+        const value = values?.[key];
         if (typeof value !== 'undefined') {
             const element = React.isValidElement(value)
                 ? value
@@ -36,7 +36,7 @@ export function interpolate(text, values) {
     if (elements.every((el) => typeof el === 'string')) {
         return processedText
             .split(ValueFoundMarker)
-            .reduce((str, value, index) => { var _a; return str.concat(value).concat((_a = elements[index]) !== null && _a !== void 0 ? _a : ''); }, '');
+            .reduce((str, value, index) => str.concat(value).concat(elements[index] ?? ''), '');
     }
     // JSX interpolation: returns ReactNode
     return processedText.split(ValueFoundMarker).reduce((array, value, index) => [

package/lib/client/exports/Link.js

@@ -19,7 +19,6 @@ import { applyTrailingSlash } from '@docusaurus/utils-common';
 // like "introduction" to "/baseUrl/introduction" => bad behavior to fix
 const shouldAddBaseUrlAutomatically = (to) => to.startsWith('/');
 function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLinkCheck': noBrokenLinkCheck, autoAddBaseUrl = true, ...props }, forwardedRef) {
-    var _a;
     const { siteConfig: { trailingSlash, baseUrl }, } = useDocusaurusContext();
     const { withBaseUrl } = useBaseUrlUtils();
     const linksCollector = useLinksCollector();
@@ -42,7 +41,7 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
     // see https://github.com/facebook/docusaurus/issues/3309
     // note: we want baseUrl to be appended (see issue for details)
     // TODO read routes and automatically detect internal/external links?
-    const targetLinkWithoutPathnameProtocol = targetLinkUnprefixed === null || targetLinkUnprefixed === void 0 ? void 0 : targetLinkUnprefixed.replace('pathname://', '');
+    const targetLinkWithoutPathnameProtocol = targetLinkUnprefixed?.replace('pathname://', '');
     // TODO we should use ReactRouter basename feature instead!
     // Automatically apply base url in links that start with /
     let targetLink = typeof targetLinkWithoutPathnameProtocol !== 'undefined'
@@ -103,7 +102,7 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
             }
         };
     }, [ioRef, targetLink, IOSupported, isInternal]);
-    const isAnchorLink = (_a = targetLink === null || targetLink === void 0 ? void 0 : targetLink.startsWith('#')) !== null && _a !== void 0 ? _a : false;
+    const isAnchorLink = targetLink?.startsWith('#') ?? false;
     const isRegularHtmlLink = !targetLink || !isInternal || isAnchorLink;
     if (targetLink && isInternal && !isAnchorLink && !noBrokenLinkCheck) {
         linksCollector.collectLink(targetLink);

package/lib/client/exports/Translate.js

@@ -8,11 +8,10 @@ import { interpolate } from '@docusaurus/Interpolate';
 // Can't read it from context, due to exposing imperative API
 import codeTranslations from '@generated/codeTranslations';
 function getLocalizedMessage({ id, message, }) {
-    var _a, _b;
     if (typeof id === 'undefined' && typeof message === 'undefined') {
         throw new Error('Docusaurus translation declarations must have at least a translation id or a default translation message');
     }
-    return (_b = (_a = codeTranslations[(id !== null && id !== void 0 ? id : message)]) !== null && _a !== void 0 ? _a : message) !== null && _b !== void 0 ? _b : id;
+    return codeTranslations[(id ?? message)] ?? message ?? id;
 }
 // Imperative translation API is useful for some edge-cases:
 // - translating page titles (meta)

package/lib/commands/build.js

@@ -7,19 +7,19 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const copy_webpack_plugin_1 = (0, tslib_1.__importDefault)(require("copy-webpack-plugin"));
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const react_loadable_ssr_addon_v5_slorber_1 = (0, tslib_1.__importDefault)(require("react-loadable-ssr-addon-v5-slorber"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const copy_webpack_plugin_1 = tslib_1.__importDefault(require("copy-webpack-plugin"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const react_loadable_ssr_addon_v5_slorber_1 = tslib_1.__importDefault(require("react-loadable-ssr-addon-v5-slorber"));
 const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
-const webpack_merge_1 = (0, tslib_1.__importDefault)(require("webpack-merge"));
+const webpack_merge_1 = tslib_1.__importDefault(require("webpack-merge"));
 const server_1 = require("../server");
 const brokenLinks_1 = require("../server/brokenLinks");
-const client_1 = (0, tslib_1.__importDefault)(require("../webpack/client"));
-const server_2 = (0, tslib_1.__importDefault)(require("../webpack/server"));
+const client_1 = tslib_1.__importDefault(require("../webpack/client"));
+const server_2 = tslib_1.__importDefault(require("../webpack/server"));
 const utils_1 = require("../webpack/utils");
-const CleanWebpackPlugin_1 = (0, tslib_1.__importDefault)(require("../webpack/plugins/CleanWebpackPlugin"));
+const CleanWebpackPlugin_1 = tslib_1.__importDefault(require("../webpack/plugins/CleanWebpackPlugin"));
 const i18n_1 = require("../server/i18n");
 const utils_2 = require("@docusaurus/utils");
 async function build(siteDir, cliOptions = {}, 
@@ -75,7 +75,6 @@ forceTerminate = true) {
 }
 exports.default = build;
 async function buildLocale({ siteDir, locale, cliOptions, forceTerminate, isLastLocale, }) {
-    var _a;
     process.env.BABEL_ENV = 'production';
     process.env.NODE_ENV = 'production';
     logger_1.default.info `name=${`[${locale}]`} Creating an optimized production build...`;
@@ -122,16 +121,15 @@ async function buildLocale({ siteDir, locale, cliOptions, forceTerminate, isLast
     }
     // Plugin Lifecycle - configureWebpack and configurePostCss.
     plugins.forEach((plugin) => {
-        var _a, _b;
         const { configureWebpack, configurePostCss } = plugin;
         if (configurePostCss) {
             clientConfig = (0, utils_1.applyConfigurePostCss)(configurePostCss, clientConfig);
         }
         if (configureWebpack) {
             clientConfig = (0, utils_1.applyConfigureWebpack)(configureWebpack.bind(plugin), // The plugin lifecycle may reference `this`.
-            clientConfig, false, (_a = props.siteConfig.webpack) === null || _a === void 0 ? void 0 : _a.jsLoader, plugin.content);
+            clientConfig, false, props.siteConfig.webpack?.jsLoader, plugin.content);
             serverConfig = (0, utils_1.applyConfigureWebpack)(configureWebpack.bind(plugin), // The plugin lifecycle may reference `this`.
-            serverConfig, true, (_b = props.siteConfig.webpack) === null || _b === void 0 ? void 0 : _b.jsLoader, plugin.content);
+            serverConfig, true, props.siteConfig.webpack?.jsLoader, plugin.content);
         }
     });
     // Make sure generated client-manifest is cleaned first so we don't reuse
@@ -142,7 +140,7 @@ async function buildLocale({ siteDir, locale, cliOptions, forceTerminate, isLast
     // Run webpack to build JS bundle (client) and static html files (server).
     await (0, utils_1.compile)([clientConfig, serverConfig]);
     // Remove server.bundle.js because it is not needed.
-    if (typeof ((_a = serverConfig.output) === null || _a === void 0 ? void 0 : _a.filename) === 'string') {
+    if (typeof serverConfig.output?.filename === 'string') {
         const serverBundle = path_1.default.join(outDir, serverConfig.output.filename);
         if (await fs_extra_1.default.pathExists(serverBundle)) {
             await fs_extra_1.default.unlink(serverBundle);

package/lib/commands/clear.js

@@ -7,9 +7,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const logger_1 = (0, 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 logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
 async function removePath(entry) {
     if (!(await fs_extra_1.default.pathExists(entry.path))) {

package/lib/commands/commandUtils.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCLIOptionPort = exports.getCLIOptionHost = void 0;
 const tslib_1 = require("tslib");
-const choosePort_1 = (0, tslib_1.__importDefault)(require("../choosePort"));
+const choosePort_1 = tslib_1.__importDefault(require("../choosePort"));
 const utils_1 = require("@docusaurus/utils");
 function getCLIOptionHost(hostOption) {
     return hostOption || 'localhost';

package/lib/commands/deploy.js

@@ -8,13 +8,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasSSHProtocol = exports.buildHttpsUrl = exports.buildSshUrl = void 0;
 const tslib_1 = require("tslib");
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const server_1 = require("../server");
-const build_1 = (0, tslib_1.__importDefault)(require("./build"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const os_1 = (0, tslib_1.__importDefault)(require("os"));
+const build_1 = tslib_1.__importDefault(require("./build"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const os_1 = tslib_1.__importDefault(require("os"));
 // GIT_PASS env variable should not appear in logs
 function obfuscateGitPass(str) {
     const gitPass = process.env.GIT_PASS;

package/lib/commands/external.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const server_1 = require("../server");
-const init_1 = (0, tslib_1.__importDefault)(require("../server/plugins/init"));
+const init_1 = tslib_1.__importDefault(require("../server/plugins/init"));
 async function externalCommand(cli, siteDir) {
     const context = await (0, server_1.loadContext)(siteDir);
     const pluginConfigs = await (0, server_1.loadPluginConfigs)(context);

package/lib/commands/serve.js

@@ -7,12 +7,12 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const http_1 = (0, tslib_1.__importDefault)(require("http"));
-const serve_handler_1 = (0, tslib_1.__importDefault)(require("serve-handler"));
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const http_1 = tslib_1.__importDefault(require("http"));
+const serve_handler_1 = tslib_1.__importDefault(require("serve-handler"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const server_1 = require("../server");
-const build_1 = (0, tslib_1.__importDefault)(require("./build"));
+const build_1 = tslib_1.__importDefault(require("./build"));
 const commandUtils_1 = require("./commandUtils");
 async function serve(siteDir, cliOptions) {
     let dir = path_1.default.isAbsolute(cliOptions.dir)
@@ -35,9 +35,8 @@ async function serve(siteDir, cliOptions) {
     });
     const servingUrl = `http://${host}:${port}`;
     const server = http_1.default.createServer((req, res) => {
-        var _a, _b;
         // Automatically redirect requests to /baseUrl/
-        if (!((_a = req.url) === null || _a === void 0 ? void 0 : _a.startsWith(baseUrl))) {
+        if (!req.url?.startsWith(baseUrl)) {
             res.writeHead(302, {
                 Location: baseUrl,
             });
@@ -46,7 +45,7 @@ async function serve(siteDir, cliOptions) {
         }
         // Remove baseUrl before calling serveHandler, because /baseUrl/ should
         // serve /build/index.html, not /build/baseUrl/index.html (does not exist)
-        req.url = (_b = req.url) === null || _b === void 0 ? void 0 : _b.replace(baseUrl, '/');
+        req.url = req.url?.replace(baseUrl, '/');
         (0, serve_handler_1.default)(req, res, {
             cleanUrls: true,
             public: dir,

package/lib/commands/start.js

@@ -8,19 +8,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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 translations_1 = require("../server/translations/translations");
@@ -69,7 +69,7 @@ async function start(siteDir, cliOptions) {
     };
     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 : []; })
+        .map((plugin) => plugin.getPathsToWatch?.() ?? [])
         .filter(Boolean))
         .map(normalizeToSiteDir);
     const pathsToWatch = [
@@ -114,14 +114,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);
         }
         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, false, props.siteConfig.webpack?.jsLoader, plugin.content);
         }
     });
     const compiler = (0, webpack_1.default)(config);

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'];

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,10 +8,10 @@
 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");
@@ -74,19 +74,16 @@ async function getThemeComponents({ themeName, themePath, swizzleConfig, }) {
     };
     const allComponents = await readComponentNames(themePath);
     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);
+        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',

package/lib/commands/swizzle/context.js

@@ -10,7 +10,7 @@ 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 = tslib_1.__importStar(require("../../server/plugins/init"));
 async function initSwizzleContext(siteDir) {
     const context = await (0, server_1.loadContext)(siteDir);
     const pluginRequire = (0, module_1.createRequire)(context.siteConfigPath);

package/lib/commands/swizzle/index.js

@@ -7,7 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 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");

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) {

package/lib/commands/swizzle/themes.js

@@ -8,15 +8,14 @@
 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 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 +85,10 @@ 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?.()
+        : 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.js

@@ -8,10 +8,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformMarkdownContent = exports.transformMarkdownHeadingLine = void 0;
 const tslib_1 = require("tslib");
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const server_1 = require("../server");
-const init_1 = (0, tslib_1.__importDefault)(require("../server/plugins/init"));
+const init_1 = tslib_1.__importDefault(require("../server/plugins/init"));
 const utils_1 = require("@docusaurus/utils");
 const utils_2 = require("../server/utils");
 function unwrapMarkdownLinks(line) {
@@ -90,10 +90,10 @@ async function getPathsToWatch(siteDir) {
         pluginConfigs,
         context,
     });
-    return plugins.flatMap((plugin) => { var _a, _b; return (_b = (_a = plugin === null || plugin === void 0 ? void 0 : plugin.getPathsToWatch) === null || _a === void 0 ? void 0 : _a.call(plugin)) !== null && _b !== void 0 ? _b : []; });
+    return plugins.flatMap((plugin) => plugin?.getPathsToWatch?.() ?? []);
 }
 async function writeHeadingIds(siteDir, files, options) {
-    const markdownFiles = await (0, utils_2.safeGlobby)(files !== null && files !== void 0 ? files : (await getPathsToWatch(siteDir)), {
+    const markdownFiles = await (0, utils_2.safeGlobby)(files ?? (await getPathsToWatch(siteDir)), {
         expandDirectories: ['**/*.{md,mdx}'],
     });
     const result = await Promise.all(markdownFiles.map((p) => transformMarkdownFile(p, options)));