@docusaurus/core 0.0.0-4683 → 0.0.0-4687

package/bin/docusaurus.mjs

@@ -245,34 +245,33 @@ cli.arguments('<command>').action((cmd) => {
 });
 
 /**
- * @param {string} command
+ * @param {string | undefined} command
  */
 function isInternalCommand(command) {
-  return [
-    'start',
-    'build',
-    'swizzle',
-    'deploy',
-    'serve',
-    'clear',
-    'write-translations',
-    'write-heading-ids',
-  ].includes(command);
+  return (
+    command &&
+    [
+      'start',
+      'build',
+      'swizzle',
+      'deploy',
+      'serve',
+      'clear',
+      'write-translations',
+      'write-heading-ids',
+    ].includes(command)
+  );
 }
 
-async function run() {
-  if (!isInternalCommand(process.argv.slice(2)[0])) {
-    await externalCommand(cli, await resolveDir('.'));
-  }
-
-  cli.parse(process.argv);
+if (!isInternalCommand(process.argv.slice(2)[0])) {
+  await externalCommand(cli, await resolveDir('.'));
+}
 
-  if (!process.argv.slice(2).length) {
-    cli.outputHelp();
-  }
+if (!process.argv.slice(2).length) {
+  cli.outputHelp();
 }
 
-run();
+cli.parse(process.argv);
 
 process.on('unhandledRejection', (err) => {
   logger.error(err);

package/lib/client/exports/BrowserOnly.js

@@ -18,5 +18,5 @@ Current type: ${isValidElement(children) ? 'React element' : typeof children}`);
         }
         return <>{children()}</>;
     }
-    return fallback || null;
+    return fallback ?? null;
 }

package/lib/client/exports/Link.js

@@ -110,7 +110,7 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
     return isRegularHtmlLink ? (
     // eslint-disable-next-line jsx-a11y/anchor-has-content
     <a ref={innerRef} href={targetLink} {...(targetLinkUnprefixed &&
-        !isInternal && { target: '_blank', rel: 'noopener noreferrer' })} {...props}/>) : (<LinkComponent {...props} onMouseEnter={onMouseEnter} innerRef={handleRef} to={targetLink || ''} 
+        !isInternal && { target: '_blank', rel: 'noopener noreferrer' })} {...props}/>) : (<LinkComponent {...props} onMouseEnter={onMouseEnter} innerRef={handleRef} to={targetLink} 
     // avoid "React does not recognize the `activeClassName` prop on a DOM
     // element"
     {...(isNavLink && { isActive, activeClassName })}/>);

package/lib/client/serverEntry.js

@@ -81,13 +81,13 @@ async function doRender(locals) {
     // manifest information.
     const modulesToBeLoaded = [...manifest.entrypoints, ...Array.from(modules)];
     const bundles = getBundles(manifest, modulesToBeLoaded);
-    const stylesheets = (bundles.css || []).map((b) => b.file);
-    const scripts = (bundles.js || []).map((b) => b.file);
+    const stylesheets = (bundles.css ?? []).map((b) => b.file);
+    const scripts = (bundles.js ?? []).map((b) => b.file);
     const renderedHtml = renderSSRTemplate(ssrTemplate, {
         appHtml,
         baseUrl,
-        htmlAttributes: htmlAttributes || '',
-        bodyAttributes: bodyAttributes || '',
+        htmlAttributes,
+        bodyAttributes,
         headTags,
         preBodyTags,
         postBodyTags,

package/lib/commands/commandUtils.js

@@ -11,7 +11,7 @@ const tslib_1 = require("tslib");
 const choosePort_1 = tslib_1.__importDefault(require("../choosePort"));
 const utils_1 = require("@docusaurus/utils");
 function getCLIOptionHost(hostOption) {
-    return hostOption || 'localhost';
+    return hostOption ?? 'localhost';
 }
 exports.getCLIOptionHost = getCLIOptionHost;
 async function getCLIOptionPort(portOption, host) {

package/lib/commands/start.js

@@ -60,17 +60,16 @@ async function start(siteDir, cliOptions) {
             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) => plugin.getPathsToWatch?.() ?? [])
-        .filter(Boolean))
+    const pluginPaths = plugins
+        .flatMap((plugin) => plugin.getPathsToWatch?.() ?? [])
+        .filter(Boolean)
         .map(normalizeToSiteDir);
     const pathsToWatch = [
         ...pluginPaths,

package/lib/server/configValidation.d.ts

@@ -7,6 +7,6 @@
 import type { DocusaurusConfig, I18nConfig } from '@docusaurus/types';
 import { Joi } from '@docusaurus/utils-validation';
 export declare const DEFAULT_I18N_CONFIG: I18nConfig;
-export declare const DEFAULT_CONFIG: Pick<DocusaurusConfig, 'i18n' | 'onBrokenLinks' | 'onBrokenMarkdownLinks' | 'onDuplicateRoutes' | 'plugins' | 'themes' | 'presets' | 'customFields' | 'themeConfig' | 'titleDelimiter' | 'noIndex' | 'tagline' | 'baseUrlIssueBanner' | 'staticDirectories'>;
+export declare const DEFAULT_CONFIG: Pick<DocusaurusConfig, 'i18n' | 'onBrokenLinks' | 'onBrokenMarkdownLinks' | 'onDuplicateRoutes' | 'plugins' | 'themes' | 'presets' | 'stylesheets' | 'scripts' | 'clientModules' | 'customFields' | 'themeConfig' | 'titleDelimiter' | 'noIndex' | 'tagline' | 'baseUrlIssueBanner' | 'staticDirectories'>;
 export declare const ConfigSchema: Joi.ObjectSchema<any>;
 export declare function validateConfig(config: Partial<DocusaurusConfig>): DocusaurusConfig;

package/lib/server/configValidation.js

@@ -23,6 +23,9 @@ exports.DEFAULT_CONFIG = {
     plugins: [],
     themes: [],
     presets: [],
+    stylesheets: [],
+    scripts: [],
+    clientModules: [],
     customFields: {},
     themeConfig: {},
     titleDelimiter: '|',
@@ -131,19 +134,25 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
     themes: utils_validation_1.Joi.array().items(ThemeSchema).default(exports.DEFAULT_CONFIG.themes),
     presets: utils_validation_1.Joi.array().items(PresetSchema).default(exports.DEFAULT_CONFIG.presets),
     themeConfig: utils_validation_1.Joi.object().unknown().default(exports.DEFAULT_CONFIG.themeConfig),
-    scripts: utils_validation_1.Joi.array().items(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
+    scripts: utils_validation_1.Joi.array()
+        .items(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
         src: utils_validation_1.Joi.string().required(),
         async: utils_validation_1.Joi.bool(),
         defer: utils_validation_1.Joi.bool(),
     })
         // See https://github.com/facebook/docusaurus/issues/3378
-        .unknown()),
+        .unknown())
+        .default(exports.DEFAULT_CONFIG.scripts),
     ssrTemplate: utils_validation_1.Joi.string(),
-    stylesheets: utils_validation_1.Joi.array().items(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
+    stylesheets: utils_validation_1.Joi.array()
+        .items(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
         href: utils_validation_1.Joi.string().required(),
         type: utils_validation_1.Joi.string(),
-    }).unknown()),
-    clientModules: utils_validation_1.Joi.array().items(utils_validation_1.Joi.string()),
+    }).unknown())
+        .default(exports.DEFAULT_CONFIG.stylesheets),
+    clientModules: utils_validation_1.Joi.array()
+        .items(utils_validation_1.Joi.string())
+        .default(exports.DEFAULT_CONFIG.clientModules),
     tagline: utils_validation_1.Joi.string().allow('').default(exports.DEFAULT_CONFIG.tagline),
     titleDelimiter: utils_validation_1.Joi.string().default('|'),
     noIndex: utils_validation_1.Joi.bool().default(false),

package/lib/server/html-tags/htmlTags.js

@@ -24,7 +24,7 @@ function htmlTagObjectToString(tagDefinition) {
         throw new Error(`Error loading ${JSON.stringify(tagDefinition)}, "${tagDefinition.tagName}" is not a valid HTML tags.`);
     }
     const isVoidTag = void_1.default.indexOf(tagDefinition.tagName) !== -1;
-    const tagAttributes = tagDefinition.attributes || {};
+    const tagAttributes = tagDefinition.attributes ?? {};
     const attributes = Object.keys(tagAttributes)
         .filter((attributeName) => tagAttributes[attributeName] !== false)
         .map((attributeName) => {

package/lib/server/html-tags/index.js

@@ -21,7 +21,7 @@ function loadHtmlTags(plugins) {
         if (!plugin.injectHtmlTags) {
             return acc;
         }
-        const { headTags, preBodyTags, postBodyTags } = plugin.injectHtmlTags({ content: plugin.content }) || {};
+        const { headTags, preBodyTags, postBodyTags } = plugin.injectHtmlTags({ content: plugin.content }) ?? {};
         return {
             headTags: headTags
                 ? `${acc.headTags}\n${createHtmlTagsString(headTags)}`

package/lib/server/index.js

@@ -100,8 +100,8 @@ async function loadPluginConfigs(context) {
     }
     presetPlugins = presetPlugins.map((plugin) => normalizeShorthand(plugin, 'plugin'));
     presetThemes = presetThemes.map((theme) => normalizeShorthand(theme, 'theme'));
-    const standalonePlugins = (siteConfig.plugins || []).map((plugin) => normalizeShorthand(plugin, 'plugin'));
-    const standaloneThemes = (siteConfig.themes || []).map((theme) => normalizeShorthand(theme, 'theme'));
+    const standalonePlugins = siteConfig.plugins.map((plugin) => normalizeShorthand(plugin, 'plugin'));
+    const standaloneThemes = siteConfig.themes.map((theme) => normalizeShorthand(theme, 'theme'));
     return [
         ...presetPlugins,
         ...presetThemes,
@@ -115,7 +115,7 @@ exports.loadPluginConfigs = loadPluginConfigs;
 // - Resolve aliased theme components
 // - Inject scripts/stylesheets
 function createBootstrapPlugin({ siteConfig, }) {
-    const { stylesheets = [], scripts = [], clientModules: siteConfigClientModules = [], } = siteConfig;
+    const { stylesheets, scripts, clientModules: siteConfigClientModules, } = siteConfig;
     return {
         name: 'docusaurus-bootstrap-plugin',
         content: null,
@@ -208,6 +208,7 @@ async function load(siteDir, options = {}) {
     context.siteConfig.themeConfig = themeConfigTranslated;
     (0, duplicateRoutes_1.handleDuplicateRoutes)(pluginsRouteConfigs, siteConfig.onDuplicateRoutes);
     const genWarning = (0, utils_1.generate)(generatedFilesDir, 'DONT-EDIT-THIS-FOLDER', `This folder stores temp files that Docusaurus' client bundler accesses.
+
 DO NOT hand-modify files in this folder because they will be overwritten in the
 next build. You can clear all build artifacts (including this folder) with the
 \`docusaurus clear\` command.
@@ -215,20 +216,24 @@ next build. You can clear all build artifacts (including this folder) with the
     // Site config must be generated after plugins
     // We want the generated config to have been normalized by the plugins!
     const genSiteConfig = (0, utils_1.generate)(generatedFilesDir, utils_1.DEFAULT_CONFIG_FILE_NAME, `/*
-AUTOGENERATED - DON'T EDIT
-Your edits in this file will be overwritten in the next build!
-Modify the docusaurus.config.js file at your site's root instead.
-*/
-export default ${JSON.stringify(siteConfig, null, 2)};`);
+ * AUTOGENERATED - DON'T EDIT
+ * Your edits in this file will be overwritten in the next build!
+ * Modify the docusaurus.config.js file at your site's root instead.
+ */
+export default ${JSON.stringify(siteConfig, null, 2)};
+`);
     plugins.push(createBootstrapPlugin({ siteConfig }));
     plugins.push(createMDXFallbackPlugin({ siteDir, siteConfig }));
     // Load client modules.
     const clientModules = (0, client_modules_1.default)(plugins);
-    const genClientModules = (0, utils_1.generate)(generatedFilesDir, 'client-modules.js', `export default [\n${clientModules
+    const genClientModules = (0, utils_1.generate)(generatedFilesDir, 'client-modules.js', `export default [
+${clientModules
         // import() is async so we use require() because client modules can have
         // CSS and the order matters for loading CSS.
         .map((module) => `  require('${(0, utils_1.escapePath)(module)}'),`)
-        .join('\n')}\n];\n`);
+        .join('\n')}
+];
+`);
     // Load extra head & body html tags.
     const { headTags, preBodyTags, postBodyTags } = (0, html_tags_1.loadHtmlTags)(plugins);
     // Routing.
@@ -237,7 +242,8 @@ export default ${JSON.stringify(siteConfig, null, 2)};`);
 ${Object.entries(registry)
         .sort((a, b) => a[0].localeCompare(b[0]))
         .map(([key, chunk]) => `  '${key}': [${chunk.loader}, '${(0, utils_1.escapePath)(chunk.modulePath)}', require.resolveWeak('${(0, utils_1.escapePath)(chunk.modulePath)}')],`)
-        .join('\n')}};\n`);
+        .join('\n')}};
+`);
     const genRoutesChunkNames = (0, utils_1.generate)(generatedFilesDir, 'routesChunkNames.json', JSON.stringify(routesChunkNames, null, 2));
     const genRoutes = (0, utils_1.generate)(generatedFilesDir, 'routes.js', routesConfig);
     const genGlobalData = (0, utils_1.generate)(generatedFilesDir, 'globalData.json', JSON.stringify(globalData, null, 2));

package/lib/server/presets/index.js

@@ -14,7 +14,7 @@ async function loadPresets(context) {
     // We need to resolve presets from the perspective of the siteDir, since the
     // siteDir's package.json declares the dependency on these presets.
     const presetRequire = (0, module_1.createRequire)(context.siteConfigPath);
-    const presets = context.siteConfig.presets || [];
+    const { presets } = context.siteConfig;
     const unflatPlugins = [];
     const unflatThemes = [];
     presets.forEach((presetItem) => {

package/lib/webpack/plugins/CleanWebpackPlugin.js

@@ -86,7 +86,7 @@ class CleanWebpackPlugin {
         const statsAssets = stats.toJson({
             all: false,
             assets: true,
-        }).assets || [];
+        }).assets ?? [];
         const assets = statsAssets.map((asset) => asset.name);
         /**
          * Get all files that were in the previous build but not the current

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4683",
+  "version": "0.0.0-4687",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -24,8 +24,8 @@
     "docusaurus": "bin/docusaurus.mjs"
   },
   "scripts": {
-    "build": "tsc && tsc -p tsconfig.client.json && node copyUntypedFiles.mjs",
-    "watch": "node copyUntypedFiles.mjs && concurrently -n \"server,client\" --kill-others \"tsc --watch\" \"tsc -p tsconfig.client.json --watch\""
+    "build": "tsc -p tsconfig.server.json && tsc -p tsconfig.client.json && node copyUntypedFiles.mjs",
+    "watch": "node copyUntypedFiles.mjs && concurrently -n \"server,client\" --kill-others \"tsc -p tsconfig.server.json --watch\" \"tsc -p tsconfig.client.json --watch\""
   },
   "bugs": {
     "url": "https://github.com/facebook/docusaurus/issues"
@@ -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-4683",
-    "@docusaurus/logger": "0.0.0-4683",
-    "@docusaurus/mdx-loader": "0.0.0-4683",
+    "@docusaurus/cssnano-preset": "0.0.0-4687",
+    "@docusaurus/logger": "0.0.0-4687",
+    "@docusaurus/mdx-loader": "0.0.0-4687",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4683",
-    "@docusaurus/utils-common": "0.0.0-4683",
-    "@docusaurus/utils-validation": "0.0.0-4683",
+    "@docusaurus/utils": "0.0.0-4687",
+    "@docusaurus/utils-common": "0.0.0-4687",
+    "@docusaurus/utils-validation": "0.0.0-4687",
     "@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-4683",
-    "@docusaurus/types": "0.0.0-4683",
+    "@docusaurus/module-type-aliases": "0.0.0-4687",
+    "@docusaurus/types": "0.0.0-4687",
     "@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": "57af658e8e5cf53b765ba7267a2b1c062e0bf6a1"
+  "gitHead": "07732e16aa86d21c9c5713e03c7159201c2457de"
 }