@docusaurus/core 0.0.0-5044 → 0.0.0-5047

package/lib/client/docusaurus.d.ts

@@ -9,7 +9,7 @@ declare global {
         gca: (name: string) => string;
     };
     interface Navigator {
-        connection: {
+        connection?: {
             effectiveType: string;
             saveData: boolean;
         };

package/lib/commands/serve.js

@@ -45,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 = req.url?.replace(baseUrl, '/');
+        req.url = req.url.replace(baseUrl, '/');
         (0, serve_handler_1.default)(req, res, {
             cleanUrls: true,
             public: dir,

package/lib/commands/swizzle/config.js

@@ -13,16 +13,14 @@ const utils_validation_1 = require("@docusaurus/utils-validation");
 const common_1 = require("./common");
 const themes_1 = require("./themes");
 function getModuleSwizzleConfig(swizzlePlugin) {
-    const getSwizzleConfig = swizzlePlugin.plugin.plugin?.getSwizzleConfig ??
-        swizzlePlugin.plugin.pluginModule?.module.getSwizzleConfig ??
-        swizzlePlugin.plugin.pluginModule?.module?.getSwizzleConfig;
+    const getSwizzleConfig = swizzlePlugin.plugin.plugin.getSwizzleConfig ??
+        swizzlePlugin.plugin.pluginModule?.module.getSwizzleConfig;
     if (getSwizzleConfig) {
         return getSwizzleConfig();
     }
     // TODO deprecate getSwizzleComponentList later
-    const getSwizzleComponentList = swizzlePlugin.plugin.plugin?.getSwizzleComponentList ??
-        swizzlePlugin.plugin.pluginModule?.module.getSwizzleComponentList ??
-        swizzlePlugin.plugin.pluginModule?.module?.getSwizzleComponentList;
+    const getSwizzleComponentList = swizzlePlugin.plugin.plugin.getSwizzleComponentList ??
+        swizzlePlugin.plugin.pluginModule?.module.getSwizzleComponentList;
     if (getSwizzleComponentList) {
         const safeComponents = getSwizzleComponentList() ?? [];
         const safeComponentConfig = {

package/lib/commands/swizzle/themes.js

@@ -65,7 +65,7 @@ function handleInvalidThemeName({ themeNameParam, themeNames, }) {
         : logger_1.default.interpolate `Themes available for swizzle: ${themeNames}`}`;
     return process.exit(1);
 }
-async function validateThemeName({ themeNameParam, themeNames, }) {
+function validateThemeName({ themeNameParam, themeNames, }) {
     const isValidName = themeNames.includes(themeNameParam);
     if (!isValidName) {
         return handleInvalidThemeName({

package/lib/commands/writeHeadingIds.d.ts

@@ -5,4 +5,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { type WriteHeadingIDOptions } from '@docusaurus/utils';
-export declare function writeHeadingIds(siteDir: string, files: string[], options: WriteHeadingIDOptions): Promise<void>;
+export declare function writeHeadingIds(siteDir: string, files: string[] | undefined, options: WriteHeadingIDOptions): Promise<void>;

package/lib/commands/writeHeadingIds.js

@@ -32,7 +32,7 @@ async function transformMarkdownFile(filepath, options) {
 async function getPathsToWatch(siteDir) {
     const context = await (0, server_1.loadContext)({ siteDir });
     const plugins = await (0, init_1.initPlugins)(context);
-    return plugins.flatMap((plugin) => plugin?.getPathsToWatch?.() ?? []);
+    return plugins.flatMap((plugin) => plugin.getPathsToWatch?.() ?? []);
 }
 async function writeHeadingIds(siteDir, files, options) {
     const markdownFiles = await (0, utils_2.safeGlobby)(files ?? (await getPathsToWatch(siteDir)), {

package/lib/server/plugins/configs.js

@@ -19,7 +19,7 @@ async function normalizePluginConfig(pluginConfig, configPath, pluginRequire) {
         const pluginPath = pluginRequire.resolve(pluginModuleImport);
         const pluginModule = (0, import_fresh_1.default)(pluginPath);
         return {
-            plugin: pluginModule?.default ?? pluginModule,
+            plugin: pluginModule.default ?? pluginModule,
             options: {},
             pluginModule: {
                 path: pluginModuleImport,
@@ -44,7 +44,7 @@ async function normalizePluginConfig(pluginConfig, configPath, pluginRequire) {
         const pluginPath = pluginRequire.resolve(pluginModuleImport);
         const pluginModule = (0, import_fresh_1.default)(pluginPath);
         return {
-            plugin: pluginModule?.default ?? pluginModule,
+            plugin: pluginModule.default ?? pluginModule,
             options: pluginConfig[1],
             pluginModule: {
                 path: pluginModuleImport,

package/lib/server/plugins/index.js

@@ -33,7 +33,7 @@ async function loadPlugins(context) {
     // translation files that the plugin declares.
     const loadedPlugins = await Promise.all(plugins.map(async (plugin) => {
         const content = await plugin.loadContent?.();
-        const rawTranslationFiles = (await plugin?.getTranslationFiles?.({ content })) ?? [];
+        const rawTranslationFiles = (await plugin.getTranslationFiles?.({ content })) ?? [];
         const translationFiles = await Promise.all(rawTranslationFiles.map((translationFile) => (0, translations_1.localizePluginTranslationFile)({
             locale: context.i18n.currentLocale,
             siteDir: context.siteDir,

package/lib/server/plugins/init.js

@@ -18,8 +18,8 @@ const configs_1 = require("./configs");
 function getOptionValidationFunction(normalizedPluginConfig) {
     if (normalizedPluginConfig.pluginModule) {
         // Support both CommonJS and ES modules
-        return (normalizedPluginConfig.pluginModule.module?.default?.validateOptions ??
-            normalizedPluginConfig.pluginModule.module?.validateOptions);
+        return (normalizedPluginConfig.pluginModule.module.default?.validateOptions ??
+            normalizedPluginConfig.pluginModule.module.validateOptions);
     }
     return normalizedPluginConfig.plugin.validateOptions;
 }
@@ -42,7 +42,7 @@ async function initPlugins(context) {
     const pluginConfigs = await (0, configs_1.loadPluginConfigs)(context);
     async function doGetPluginVersion(normalizedPluginConfig) {
         if (normalizedPluginConfig.pluginModule?.path) {
-            const pluginPath = pluginRequire.resolve(normalizedPluginConfig.pluginModule?.path);
+            const pluginPath = pluginRequire.resolve(normalizedPluginConfig.pluginModule.path);
             return (0, siteMetadata_1.getPluginVersion)(pluginPath, context.siteDir);
         }
         return { type: 'local' };

package/lib/server/plugins/routeConfig.js

@@ -38,8 +38,8 @@ function sortConfig(routeConfigs, baseUrl = '/') {
         }
         // Higher priority get placed first.
         if (a.priority || b.priority) {
-            const priorityA = a.priority || 0;
-            const priorityB = b.priority || 0;
+            const priorityA = a.priority ?? 0;
+            const priorityB = b.priority ?? 0;
             const score = priorityB - priorityA;
             if (score !== 0) {
                 return score;

package/lib/server/plugins/synthetic.js

@@ -74,7 +74,7 @@ function createMDXFallbackPlugin({ siteDir, siteConfig, }) {
             // processed by content plugins mdx loaders. This works, but a bit
             // hacky... Not sure there's a way to handle that differently in webpack
             function getMDXFallbackExcludedPaths() {
-                const rules = config?.module?.rules;
+                const rules = config.module?.rules;
                 return rules.flatMap((rule) => {
                     const isMDXRule = rule.test instanceof RegExp && rule.test.test('x.mdx');
                     return isMDXRule ? rule.include : [];

package/lib/server/translations/translationsExtractor.js

@@ -99,7 +99,7 @@ async function extractSourceCodeFileTranslations(sourceCodeFilePath, babelOption
             // See https://twitter.com/NicoloRibaudo/status/1321130735605002243
             filename: sourceCodeFilePath,
         });
-        const translations = await extractSourceCodeAstTranslations(ast, sourceCodeFilePath);
+        const translations = extractSourceCodeAstTranslations(ast, sourceCodeFilePath);
         return translations;
     }
     catch (err) {
@@ -157,9 +157,7 @@ Full code: ${(0, generator_1.default)(node).code}`;
                     const attributePath = path
                         .get('openingElement.attributes')
                         .find((attr) => attr.isJSXAttribute() &&
-                        attr
-                            .get('name')
-                            .isJSXIdentifier({ name: propName }));
+                        attr.get('name').isJSXIdentifier({ name: propName }));
                     if (attributePath) {
                         const attributeValue = attributePath.get('value');
                         const attributeValueEvaluated = attributeValue.isJSXExpressionContainer()

package/lib/webpack/base.js

@@ -27,7 +27,7 @@ function excludeJS(modulePath) {
         return false;
     }
     // Don't transpile node_modules except any docusaurus npm package
-    return (/node_modules/.test(modulePath) &&
+    return (modulePath.includes('node_modules') &&
         !/docusaurus(?:(?!node_modules).)*\.jsx?$/.test(modulePath) &&
         !LibrariesToTranspileRegex.test(modulePath));
 }

package/lib/webpack/plugins/CleanWebpackPlugin.js

@@ -62,7 +62,7 @@ class CleanWebpackPlugin {
         this.removeFiles = this.removeFiles.bind(this);
     }
     apply(compiler) {
-        if (!compiler.options.output || !compiler.options.output.path) {
+        if (!compiler.options.output.path) {
             console.warn('clean-webpack-plugin: options.output.path not defined. Plugin disabled...');
             return;
         }
@@ -115,7 +115,7 @@ class CleanWebpackPlugin {
          *
          * (relies on del's cwd: outputPath option)
          */
-        const staleFiles = this.currentAssets.filter((previousAsset) => assets.includes(previousAsset) === false);
+        const staleFiles = this.currentAssets.filter((previousAsset) => !assets.includes(previousAsset));
         /**
          * Save assets for next compilation
          */
@@ -124,7 +124,7 @@ class CleanWebpackPlugin {
         /**
          * Remove unused webpack assets
          */
-        if (this.cleanStaleWebpackAssets === true && staleFiles.length !== 0) {
+        if (this.cleanStaleWebpackAssets && staleFiles.length !== 0) {
             removePatterns.push(...staleFiles);
         }
         if (removePatterns.length !== 0) {
@@ -157,7 +157,7 @@ class CleanWebpackPlugin {
             }
         }
         catch (err) {
-            const needsForce = /Cannot delete files\/folders outside the current working directory\./.test(err.message);
+            const needsForce = err.message.includes('Cannot delete files/folders outside the current working directory.');
             if (needsForce) {
                 const message = 'clean-webpack-plugin: Cannot delete files/folders outside the current working directory. Can be overridden with the "dangerouslyAllowCleanPatternsOutsideProject" option.';
                 throw new Error(message);

package/lib/webpack/utils.js

@@ -131,13 +131,11 @@ function applyConfigureWebpack(configureWebpack, config, isServer, jsLoader, con
     };
     if (typeof configureWebpack === 'function') {
         const { mergeStrategy, ...res } = configureWebpack(config, isServer, utils, content) ?? {};
-        if (res && typeof res === 'object') {
-            const customizeRules = mergeStrategy ?? {};
-            return (0, webpack_merge_1.mergeWithCustomize)({
-                customizeArray: (0, webpack_merge_1.customizeArray)(customizeRules),
-                customizeObject: (0, webpack_merge_1.customizeObject)(customizeRules),
-            })(config, res);
-        }
+        const customizeRules = mergeStrategy ?? {};
+        return (0, webpack_merge_1.mergeWithCustomize)({
+            customizeArray: (0, webpack_merge_1.customizeArray)(customizeRules),
+            customizeObject: (0, webpack_merge_1.customizeObject)(customizeRules),
+        })(config, res);
     }
     return config;
 }
@@ -170,7 +168,7 @@ function compile(config) {
         const compiler = (0, webpack_1.default)(config);
         compiler.run((err, stats) => {
             if (err) {
-                logger_1.default.error(err.stack || err);
+                logger_1.default.error(err.stack ?? err);
                 if (err.details) {
                     logger_1.default.error(err.details);
                 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-5044",
+  "version": "0.0.0-5047",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -43,13 +43,13 @@
     "@babel/runtime": "^7.18.0",
     "@babel/runtime-corejs3": "^7.18.0",
     "@babel/traverse": "^7.18.0",
-    "@docusaurus/cssnano-preset": "0.0.0-5044",
-    "@docusaurus/logger": "0.0.0-5044",
-    "@docusaurus/mdx-loader": "0.0.0-5044",
+    "@docusaurus/cssnano-preset": "0.0.0-5047",
+    "@docusaurus/logger": "0.0.0-5047",
+    "@docusaurus/mdx-loader": "0.0.0-5047",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-5044",
-    "@docusaurus/utils-common": "0.0.0-5044",
-    "@docusaurus/utils-validation": "0.0.0-5044",
+    "@docusaurus/utils": "0.0.0-5047",
+    "@docusaurus/utils-common": "0.0.0-5047",
+    "@docusaurus/utils-validation": "0.0.0-5047",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.4",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.7",
@@ -107,8 +107,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-5044",
-    "@docusaurus/types": "0.0.0-5044",
+    "@docusaurus/module-type-aliases": "0.0.0-5047",
+    "@docusaurus/types": "0.0.0-5047",
     "@types/detect-port": "^1.3.2",
     "@types/react-dom": "^18.0.4",
     "@types/react-router-config": "^5.0.6",
@@ -128,5 +128,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "9ffd6ca265dc2af7ed5b96daf5ebf32708e899cf"
+  "gitHead": "67ac297469d98ac3eb8482d8636aee4648586f33"
 }