@docusaurus/core 0.0.0-4680 → 0.0.0-4684

package/lib/server/configValidation.js

@@ -33,7 +33,9 @@ exports.DEFAULT_CONFIG = {
 };
 function createPluginSchema(theme = false) {
     return (utils_validation_1.Joi.alternatives()
-        .try(utils_validation_1.Joi.function(), utils_validation_1.Joi.array().ordered(utils_validation_1.Joi.function().required(), utils_validation_1.Joi.object().required()), utils_validation_1.Joi.string(), utils_validation_1.Joi.array()
+        .try(utils_validation_1.Joi.function(), utils_validation_1.Joi.array()
+        .ordered(utils_validation_1.Joi.function().required(), utils_validation_1.Joi.object().required())
+        .length(2), utils_validation_1.Joi.string(), utils_validation_1.Joi.array()
         .ordered(utils_validation_1.Joi.string().required(), utils_validation_1.Joi.object().required())
         .length(2), utils_validation_1.Joi.bool().equal(false))
         // @ts-expect-error: bad lib def, doesn't recognize an array of reports

package/lib/server/plugins/index.js

@@ -60,7 +60,7 @@ async function loadPlugins({ pluginConfigs, context, }) {
     // order-dependent. We could change this in future if there are plugins which
     // need to run in certain order or depend on others for data.
     const loadedPlugins = await Promise.all(plugins.map(async (plugin) => {
-        const content = plugin.loadContent ? await plugin.loadContent() : null;
+        const content = await plugin.loadContent?.();
         return { ...plugin, content };
     }));
     const contentLoadedTranslatedPlugins = await Promise.all(loadedPlugins.map(async (contentLoadedPlugin) => {
@@ -135,13 +135,13 @@ async function loadPlugins({ pluginConfigs, context, }) {
     // need to run in certain order or depend on others for data.
     await Promise.all(contentLoadedTranslatedPlugins.map(async (plugin) => {
         if (!plugin.routesLoaded) {
-            return null;
+            return;
         }
         // TODO remove this deprecated lifecycle soon
         // deprecated since alpha-60
         // TODO, 1 user reported usage of this lifecycle! https://github.com/facebook/docusaurus/issues/3918
         logger_1.default.error `Plugin code=${'routesLoaded'} lifecycle is deprecated. If you think we should keep this lifecycle, please report here: path=${'https://github.com/facebook/docusaurus/issues/3918'}`;
-        return plugin.routesLoaded(pluginsRouteConfigs);
+        await plugin.routesLoaded(pluginsRouteConfigs);
     }));
     // Sort the route config. This ensures that route with nested
     // routes are always placed last.

package/lib/server/plugins/init.js

@@ -36,34 +36,29 @@ async function normalizePluginConfig(pluginConfig, pluginRequire) {
             options: {},
         };
     }
-    if (Array.isArray(pluginConfig)) {
-        // plugins: [
-        //   ['./plugin',options],
-        // ]
-        if (typeof pluginConfig[0] === 'string') {
-            const pluginModuleImport = pluginConfig[0];
-            const pluginPath = pluginRequire.resolve(pluginModuleImport);
-            const pluginModule = (0, import_fresh_1.default)(pluginPath);
-            return {
-                plugin: pluginModule?.default ?? pluginModule,
-                options: pluginConfig[1] ?? {},
-                pluginModule: {
-                    path: pluginModuleImport,
-                    module: pluginModule,
-                },
-            };
-        }
-        // plugins: [
-        //   [function plugin() { },options],
-        // ]
-        if (typeof pluginConfig[0] === 'function') {
-            return {
-                plugin: pluginConfig[0],
-                options: pluginConfig[1] ?? {},
-            };
-        }
+    // plugins: [
+    //   ['./plugin',options],
+    // ]
+    if (typeof pluginConfig[0] === 'string') {
+        const pluginModuleImport = pluginConfig[0];
+        const pluginPath = pluginRequire.resolve(pluginModuleImport);
+        const pluginModule = (0, import_fresh_1.default)(pluginPath);
+        return {
+            plugin: pluginModule?.default ?? pluginModule,
+            options: pluginConfig[1],
+            pluginModule: {
+                path: pluginModuleImport,
+                module: pluginModule,
+            },
+        };
     }
-    throw new Error(`Unexpected: can't load plugin for following plugin config.\n${JSON.stringify(pluginConfig)}`);
+    // plugins: [
+    //   [function plugin() { },options],
+    // ]
+    return {
+        plugin: pluginConfig[0],
+        options: pluginConfig[1],
+    };
 }
 async function normalizePluginConfigs(pluginConfigs, pluginRequire) {
     return Promise.all(pluginConfigs.map((pluginConfig) => normalizePluginConfig(pluginConfig, pluginRequire)));
@@ -138,12 +133,7 @@ async function initPlugins({ pluginConfigs, context, }) {
             version: pluginVersion,
         };
     }
-    const plugins = (await Promise.all(pluginConfigsNormalized.map((pluginConfig) => {
-        if (!pluginConfig) {
-            return null;
-        }
-        return initializePlugin(pluginConfig);
-    }))).filter((item) => Boolean(item));
+    const plugins = await Promise.all(pluginConfigsNormalized.map(initializePlugin));
     (0, pluginIds_1.ensureUniquePluginInstanceIds)(plugins);
     return plugins;
 }

package/lib/server/presets/index.js

@@ -23,11 +23,8 @@ async function loadPresets(context) {
         if (typeof presetItem === 'string') {
             presetModuleImport = presetItem;
         }
-        else if (Array.isArray(presetItem)) {
-            [presetModuleImport, presetOptions = {}] = presetItem;
-        }
         else {
-            throw new Error('Invalid presets format detected in config.');
+            [presetModuleImport, presetOptions] = presetItem;
         }
         const presetName = (0, moduleShorthand_1.resolveModuleName)(presetModuleImport, presetRequire, 'preset');
         const presetModule = (0, import_fresh_1.default)(presetRequire.resolve(presetName));

package/lib/server/versions/index.js

@@ -19,11 +19,8 @@ async function getPackageJsonVersion(packageJsonPath) {
 }
 exports.getPackageJsonVersion = getPackageJsonVersion;
 async function getPackageJsonName(packageJsonPath) {
-    if (await fs_extra_1.default.pathExists(packageJsonPath)) {
-        // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-dynamic-require, global-require
-        return require(packageJsonPath).name;
-    }
-    return undefined;
+    // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-dynamic-require, global-require
+    return require(packageJsonPath).name;
 }
 async function getPluginVersion(pluginPath, siteDir) {
     let potentialPluginPackageJsonDirectory = path_1.default.dirname(pluginPath);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4680",
+  "version": "0.0.0-4684",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -41,13 +41,13 @@
     "@babel/runtime": "^7.17.2",
     "@babel/runtime-corejs3": "^7.17.2",
     "@babel/traverse": "^7.17.3",
-    "@docusaurus/cssnano-preset": "0.0.0-4680",
-    "@docusaurus/logger": "0.0.0-4680",
-    "@docusaurus/mdx-loader": "0.0.0-4680",
+    "@docusaurus/cssnano-preset": "0.0.0-4684",
+    "@docusaurus/logger": "0.0.0-4684",
+    "@docusaurus/mdx-loader": "0.0.0-4684",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4680",
-    "@docusaurus/utils-common": "0.0.0-4680",
-    "@docusaurus/utils-validation": "0.0.0-4680",
+    "@docusaurus/utils": "0.0.0-4684",
+    "@docusaurus/utils-common": "0.0.0-4684",
+    "@docusaurus/utils-validation": "0.0.0-4684",
     "@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-4680",
-    "@docusaurus/types": "0.0.0-4680",
+    "@docusaurus/module-type-aliases": "0.0.0-4684",
+    "@docusaurus/types": "0.0.0-4684",
     "@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": "367835b86a28dea97e2addba03291438a5f813f8"
+  "gitHead": "9230ee0c61b8d04d2fcf195e72e1f992d7b39a86"
 }

package/lib/server/versions/__fixtures__/package.json

@@ -1,3 +0,0 @@
-{
-  "version": "random-version"
-}