@docusaurus/core 0.0.0-4307 → 0.0.0-4315

package/lib/commands/external.js

@@ -12,7 +12,7 @@ const init_1 = (0, tslib_1.__importDefault)(require("../server/plugins/init"));
 async function externalCommand(cli, siteDir) {
     const context = await (0, server_1.loadContext)(siteDir);
     const pluginConfigs = (0, server_1.loadPluginConfigs)(context);
-    const plugins = (0, init_1.default)({ pluginConfigs, context });
+    const plugins = await (0, init_1.default)({ pluginConfigs, context });
     // Plugin Lifecycle - extendCli.
     plugins.forEach((plugin) => {
         const { extendCli } = plugin;

package/lib/commands/swizzle.js

@@ -111,7 +111,7 @@ async function swizzle(siteDir, themeName, componentName, typescript, danger) {
     const context = await (0, server_1.loadContext)(siteDir);
     const pluginConfigs = (0, server_1.loadPluginConfigs)(context);
     const pluginNames = getPluginNames(pluginConfigs);
-    const plugins = (0, init_1.default)({
+    const plugins = await (0, init_1.default)({
         pluginConfigs,
         context,
     });
@@ -162,7 +162,7 @@ async function swizzle(siteDir, themeName, componentName, typescript, danger) {
     }
     // support both commonjs and ES style exports
     const plugin = (_c = pluginModule.default) !== null && _c !== void 0 ? _c : pluginModule;
-    const pluginInstance = plugin(context, pluginOptions);
+    const pluginInstance = await plugin(context, pluginOptions);
     const themePath = typescript
         ? (_d = pluginInstance.getTypeScriptThemePath) === null || _d === void 0 ? void 0 : _d.call(pluginInstance)
         : (_e = pluginInstance.getThemePath) === null || _e === void 0 ? void 0 : _e.call(pluginInstance);

package/lib/commands/writeHeadingIds.js

@@ -87,7 +87,7 @@ async function transformMarkdownFile(filepath, options) {
 async function getPathsToWatch(siteDir) {
     const context = await (0, server_1.loadContext)(siteDir);
     const pluginConfigs = (0, server_1.loadPluginConfigs)(context);
-    const plugins = (0, init_1.default)({
+    const plugins = await (0, init_1.default)({
         pluginConfigs,
         context,
     });

package/lib/commands/writeTranslations.js

@@ -51,7 +51,7 @@ async function writeTranslations(siteDir, options) {
         locale: options.locale,
     });
     const pluginConfigs = (0, server_1.loadPluginConfigs)(context);
-    const plugins = (0, init_1.default)({
+    const plugins = await (0, init_1.default)({
         pluginConfigs,
         context,
     });

package/lib/server/config.d.ts

@@ -5,4 +5,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { DocusaurusConfig } from '@docusaurus/types';
-export default function loadConfig(configPath: string): DocusaurusConfig;
+export default function loadConfig(configPath: string): Promise<DocusaurusConfig>;

package/lib/server/config.js

@@ -10,11 +10,14 @@ const tslib_1 = require("tslib");
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const import_fresh_1 = (0, tslib_1.__importDefault)(require("import-fresh"));
 const configValidation_1 = require("./configValidation");
-function loadConfig(configPath) {
+async function loadConfig(configPath) {
     if (!fs_extra_1.default.existsSync(configPath)) {
         throw new Error(`Config file at "${configPath}" not found.`);
     }
-    const loadedConfig = (0, import_fresh_1.default)(configPath);
+    const importedConfig = (0, import_fresh_1.default)(configPath);
+    const loadedConfig = importedConfig instanceof Function
+        ? await importedConfig()
+        : await importedConfig;
     return (0, configValidation_1.validateConfig)(loadedConfig);
 }
 exports.default = loadConfig;

package/lib/server/plugins/index.js

@@ -52,7 +52,7 @@ function sortConfig(routeConfigs, baseUrl = '/') {
 exports.sortConfig = sortConfig;
 async function loadPlugins({ pluginConfigs, context, }) {
     // 1. Plugin Lifecycle - Initialization/Constructor.
-    const plugins = (0, init_1.default)({
+    const plugins = await (0, init_1.default)({
         pluginConfigs,
         context,
     });

package/lib/server/plugins/init.d.ts

@@ -8,4 +8,4 @@ import { LoadContext, PluginConfig, InitializedPlugin } from '@docusaurus/types'
 export default function initPlugins({ pluginConfigs, context, }: {
     pluginConfigs: PluginConfig[];
     context: LoadContext;
-}): InitializedPlugin[];
+}): Promise<InitializedPlugin[]>;

package/lib/server/plugins/init.js

@@ -85,7 +85,7 @@ function getThemeValidationFunction(normalizedPluginConfig) {
         return normalizedPluginConfig.plugin.validateThemeConfig;
     }
 }
-function initPlugins({ pluginConfigs, context, }) {
+async function initPlugins({ pluginConfigs, context, }) {
     // We need to resolve plugins from the perspective of the siteDir, since the siteDir's package.json
     // declares the dependency on these plugins.
     const pluginRequire = (0, module_1.createRequire)(context.siteConfigPath);
@@ -130,11 +130,7 @@ function initPlugins({ pluginConfigs, context, }) {
             };
         }
     }
-    const plugins = pluginConfigs
-        .map((pluginConfig) => {
-        if (!pluginConfig) {
-            return null;
-        }
+    async function initializePlugin(pluginConfig) {
         const normalizedPluginConfig = normalizePluginConfig(pluginConfig, pluginRequire);
         const pluginVersion = doGetPluginVersion(normalizedPluginConfig);
         const pluginOptions = doValidatePluginOptions(normalizedPluginConfig);
@@ -143,14 +139,19 @@ function initPlugins({ pluginConfigs, context, }) {
             ...context.siteConfig.themeConfig,
             ...doValidateThemeConfig(normalizedPluginConfig),
         };
-        const pluginInstance = normalizedPluginConfig.plugin(context, pluginOptions);
+        const pluginInstance = await normalizedPluginConfig.plugin(context, pluginOptions);
         return {
             ...pluginInstance,
             options: pluginOptions,
             version: pluginVersion,
         };
-    })
-        .filter((item) => Boolean(item));
+    }
+    const plugins = (await Promise.all(pluginConfigs.map((pluginConfig) => {
+        if (!pluginConfig) {
+            return null;
+        }
+        return initializePlugin(pluginConfig);
+    }))).filter((item) => Boolean(item));
     (0, pluginIds_1.ensureUniquePluginInstanceIds)(plugins);
     return plugins;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4307",
+  "version": "0.0.0-4315",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -41,13 +41,13 @@
     "@babel/runtime": "^7.16.3",
     "@babel/runtime-corejs3": "^7.16.3",
     "@babel/traverse": "^7.16.3",
-    "@docusaurus/cssnano-preset": "0.0.0-4307",
-    "@docusaurus/logger": "0.0.0-4307",
-    "@docusaurus/mdx-loader": "0.0.0-4307",
+    "@docusaurus/cssnano-preset": "0.0.0-4315",
+    "@docusaurus/logger": "0.0.0-4315",
+    "@docusaurus/mdx-loader": "0.0.0-4315",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4307",
-    "@docusaurus/utils-common": "0.0.0-4307",
-    "@docusaurus/utils-validation": "0.0.0-4307",
+    "@docusaurus/utils": "0.0.0-4315",
+    "@docusaurus/utils-common": "0.0.0-4315",
+    "@docusaurus/utils-validation": "0.0.0-4315",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.0",
     "@svgr/webpack": "^6.0.0",
     "autoprefixer": "^10.3.5",
@@ -108,8 +108,8 @@
     "webpackbar": "^5.0.0-3"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4307",
-    "@docusaurus/types": "0.0.0-4307",
+    "@docusaurus/module-type-aliases": "0.0.0-4315",
+    "@docusaurus/types": "0.0.0-4315",
     "@types/copy-webpack-plugin": "^8.0.1",
     "@types/css-minimizer-webpack-plugin": "^3.0.2",
     "@types/detect-port": "^1.3.0",
@@ -128,5 +128,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "d7b9a0f0eb96f5f853500c3810f7f4df4054b910"
+  "gitHead": "74ad9e9368fb6683a9494d7157f79df21cc5ee25"
 }