@docusaurus/core 2.0.0-beta.14 → 2.0.0-beta.15

package/bin/docusaurus.js

@@ -34,7 +34,7 @@ cli
   .description('Build website.')
   .option(
     '--bundle-analyzer',
-    'visualize size of webpack output files with an interactive zoomable treemap (default: false)',
+    'visualize size of webpack output files with an interactive zoomable tree map (default: false)',
   )
   .option(
     '--out-dir <dir>',

package/lib/babel/preset.d.ts

@@ -4,6 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { ConfigAPI, TransformOptions } from '@babel/core';
+import type { ConfigAPI, TransformOptions } from '@babel/core';
 declare function babelPresets(api: ConfigAPI): TransformOptions;
 export default babelPresets;

package/lib/client/LinksCollector.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { ReactNode } from 'react';
+import { type ReactNode } from 'react';
 declare type LinksCollector = {
     collectLink: (link: string) => void;
 };

package/lib/client/PendingNavigation.d.ts

@@ -6,8 +6,8 @@
  */
 /// <reference types="node" />
 import React from 'react';
-import { RouteComponentProps } from 'react-router-dom';
-import { RouteConfig } from 'react-router-config';
+import { type RouteComponentProps } from 'react-router-dom';
+import type { RouteConfig } from 'react-router-config';
 import type { Location } from '@docusaurus/history';
 import './nprogress.css';
 interface Props extends RouteComponentProps {

package/lib/client/exports/BrowserOnly.d.ts

@@ -6,7 +6,7 @@
  */
 /// <reference types="react" />
 declare function BrowserOnly({ children, fallback, }: {
-    children?: () => JSX.Element;
+    children: () => JSX.Element;
     fallback?: JSX.Element;
 }): JSX.Element | null;
 export default BrowserOnly;

package/lib/client/exports/BrowserOnly.js

@@ -4,13 +4,18 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React from 'react';
+import React, { isValidElement } from 'react';
 import useIsBrowser from '@docusaurus/useIsBrowser';
 // Similar comp to the one described here:
 // https://www.joshwcomeau.com/react/the-perils-of-rehydration/#abstractions
 function BrowserOnly({ children, fallback, }) {
     const isBrowser = useIsBrowser();
-    if (isBrowser && children != null) {
+    if (isBrowser) {
+        if (typeof children !== 'function' &&
+            process.env.NODE_ENV === 'development') {
+            throw new Error(`Docusaurus error: The children of <BrowserOnly> must be a "render function", e.g. <BrowserOnly>{() => <span>{window.location.href}</span>}</BrowserOnly>.
+Current type: ${isValidElement(children) ? 'React element' : typeof children}`);
+        }
         return React.createElement(React.Fragment, null, children());
     }
     return fallback || null;

package/lib/client/exports/ErrorBoundary.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 /// <reference types="@docusaurus/module-type-aliases" />
-import React, { ReactNode } from 'react';
+import React, { type ReactNode } from 'react';
 import type { Props } from '@docusaurus/ErrorBoundary';
 interface State {
     error: Error | null;

package/lib/client/exports/ErrorBoundary.js

@@ -29,7 +29,9 @@ class ErrorBoundary extends React.Component {
                 tryAgain: () => this.setState({ error: null }),
             });
         }
-        return children;
+        return (children !== null && children !== void 0 ? children : 
+        // See https://github.com/facebook/docusaurus/issues/6337#issuecomment-1012913647
+        null);
     }
 }
 export default ErrorBoundary;

package/lib/client/exports/Interpolate.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 /// <reference types="@docusaurus/module-type-aliases" />
-import { ReactNode } from 'react';
+import { type ReactNode } from 'react';
 import type { InterpolateProps, InterpolateValues } from '@docusaurus/Interpolate';
 export declare function interpolate<Str extends string>(text: Str, values?: InterpolateValues<Str, string | number>): string;
 export declare function interpolate<Str extends string, Value extends ReactNode>(text: Str, values?: InterpolateValues<Str, Value>): ReactNode;

package/lib/client/exports/Translate.d.ts

@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 /// <reference types="@docusaurus/module-type-aliases" />
-import { ReactNode } from 'react';
-import { InterpolateValues } from '@docusaurus/Interpolate';
+import type { ReactNode } from 'react';
+import { type InterpolateValues } from '@docusaurus/Interpolate';
 import type { TranslateParam, TranslateProps } from '@docusaurus/Translate';
 export declare function translate<Str extends string>({ message, id }: TranslateParam<Str>, values?: InterpolateValues<Str, string | number>): string;
 export default function Translate<Str extends string>({ children, id, values, }: TranslateProps<Str>): ReactNode;

package/lib/client/exports/browserContext.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React, { ReactNode } from 'react';
+import React, { type ReactNode } from 'react';
 export declare const Context: React.Context<boolean>;
 export declare function BrowserContextProvider({ children, }: {
     children: ReactNode;

package/lib/client/exports/docusaurusContext.d.ts

@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React, { ReactNode } from 'react';
-import { DocusaurusContext } from '@docusaurus/types';
+import React, { type ReactNode } from 'react';
+import type { DocusaurusContext } from '@docusaurus/types';
 export declare const Context: React.Context<DocusaurusContext>;
 export declare function DocusaurusContextProvider({ children, }: {
     children: ReactNode;

package/lib/client/exports/useBaseUrl.js

@@ -19,7 +19,7 @@ function addBaseUrl(siteUrl, baseUrl, url, { forcePrependBaseUrl = false, absolu
         return url;
     }
     if (forcePrependBaseUrl) {
-        return baseUrl + url;
+        return baseUrl + url.replace(/^\//, '');
     }
     // We should avoid adding the baseurl twice if it's already there
     const shouldAddBaseUrl = !url.startsWith(baseUrl);
@@ -27,7 +27,7 @@ function addBaseUrl(siteUrl, baseUrl, url, { forcePrependBaseUrl = false, absolu
     return absolute ? siteUrl + basePath : basePath;
 }
 export function useBaseUrlUtils() {
-    const { siteConfig: { baseUrl = '/', url: siteUrl } = {} } = useDocusaurusContext();
+    const { siteConfig: { baseUrl, url: siteUrl }, } = useDocusaurusContext();
     return {
         withBaseUrl: (url, options) => addBaseUrl(siteUrl, baseUrl, url, options),
     };

package/lib/client/exports/useDocusaurusContext.d.ts

@@ -4,6 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { DocusaurusContext } from '@docusaurus/types';
+import type { DocusaurusContext } from '@docusaurus/types';
 declare function useDocusaurusContext(): DocusaurusContext;
 export default useDocusaurusContext;

package/lib/client/nprogress.css

@@ -27,10 +27,10 @@
 
 #nprogress .peg {
   position: absolute;
-  right: 0px;
+  right: 0;
   width: 100px;
   height: 100%;
   box-shadow: 0 0 10px #29d, 0 0 5px #29d;
   opacity: 1;
-  transform: rotate(3deg) translate(0px, -4px);
+  transform: rotate(3deg) translate(0, -4px);
 }

package/lib/client/preload.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { RouteConfig } from 'react-router-config';
+import { type RouteConfig } from 'react-router-config';
 /**
  * Helper function to make sure all async components for that particular route
  * is preloaded before rendering. This is especially useful to avoid loading screens.

package/lib/client/serverEntry.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import type { Locals } from '@slorber/static-site-generator-webpack-plugin';
+export default function render(locals: Locals & {
+    path: string;
+}): Promise<string>;

package/lib/client/serverEntry.js

@@ -4,143 +4,109 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-
-// @ts-check
-
 import * as eta from 'eta';
 import React from 'react';
-import {StaticRouter} from 'react-router-dom';
+import { StaticRouter } from 'react-router-dom';
 import ReactDOMServer from 'react-dom/server';
-import {Helmet} from 'react-helmet';
-import {getBundles} from 'react-loadable-ssr-addon-v5-slorber';
+import { Helmet } from 'react-helmet';
+import { getBundles } from 'react-loadable-ssr-addon-v5-slorber';
 import Loadable from 'react-loadable';
-
-import {minify} from 'html-minifier-terser';
+import { minify } from 'html-minifier-terser';
 import path from 'path';
 import fs from 'fs-extra';
 import routes from '@generated/routes';
-import packageJson from '../../package.json';
 import preload from './preload';
 import App from './App';
-import {
-  createStatefulLinksCollector,
-  ProvideLinksCollector,
-} from './LinksCollector';
+import { createStatefulLinksCollector, ProvideLinksCollector, } from './LinksCollector';
 import logger from '@docusaurus/logger';
 // eslint-disable-next-line no-restricted-imports
-import {memoize} from 'lodash';
-
-const getCompiledSSRTemplate = memoize((template) =>
-  eta.compile(template.trim(), {
+import { memoize } from 'lodash';
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const packageJson = require('../../package.json');
+const getCompiledSSRTemplate = memoize((template) => eta.compile(template.trim(), {
     rmWhitespace: true,
-  }),
-);
-
+}));
 function renderSSRTemplate(ssrTemplate, data) {
-  const compiled = getCompiledSSRTemplate(ssrTemplate);
-  return compiled(data, eta.defaultConfig);
+    const compiled = getCompiledSSRTemplate(ssrTemplate);
+    return compiled(data, eta.defaultConfig);
 }
-
 export default async function render(locals) {
-  try {
-    return await doRender(locals);
-  } catch (e) {
-    logger.error`Docusaurus Node/SSR could not render static page with path path=${locals.path} because of following error:
+    try {
+        return await doRender(locals);
+    }
+    catch (e) {
+        logger.error `Docusaurus Node/SSR could not render static page with path path=${locals.path} because of following error:
 ${e.stack}`;
-
-    const isNotDefinedErrorRegex =
-      /(window|document|localStorage|navigator|alert|location|buffer|self) is not defined/i;
-
-    if (isNotDefinedErrorRegex.test(e.message)) {
-      logger.info`It looks like you are using code that should run on the client-side only.
+        const isNotDefinedErrorRegex = /(window|document|localStorage|navigator|alert|location|buffer|self) is not defined/i;
+        if (isNotDefinedErrorRegex.test(e.message)) {
+            logger.info `It looks like you are using code that should run on the client-side only.
 To get around it, try using code=${'<BrowserOnly>'} (path=${'https://docusaurus.io/docs/docusaurus-core/#browseronly'}) or code=${'ExecutionEnvironment'} (path=${'https://docusaurus.io/docs/docusaurus-core/#executionenvironment'}).
 It might also require to wrap your client code in code=${'useEffect'} hook and/or import a third-party library dynamically (if any).`;
+        }
+        throw new Error('Server-side rendering fails due to the error above.');
     }
-
-    throw new Error('Server-side rendering fails due to the error above.');
-  }
 }
-
 // Renderer for static-site-generator-webpack-plugin (async rendering via promises).
 async function doRender(locals) {
-  const {
-    routesLocation,
-    headTags,
-    preBodyTags,
-    postBodyTags,
-    onLinksCollected,
-    baseUrl,
-    ssrTemplate,
-    noIndex,
-  } = locals;
-  const location = routesLocation[locals.path];
-  await preload(routes, location);
-  const modules = new Set();
-  const context = {};
-
-  const linksCollector = createStatefulLinksCollector();
-  const appHtml = ReactDOMServer.renderToString(
-    <Loadable.Capture report={(moduleName) => modules.add(moduleName)}>
-      <StaticRouter location={location} context={context}>
-        <ProvideLinksCollector linksCollector={linksCollector}>
-          <App />
-        </ProvideLinksCollector>
-      </StaticRouter>
-    </Loadable.Capture>,
-  );
-  onLinksCollected(location, linksCollector.getCollectedLinks());
-
-  const helmet = Helmet.renderStatic();
-  const htmlAttributes = helmet.htmlAttributes.toString();
-  const bodyAttributes = helmet.bodyAttributes.toString();
-  const metaStrings = [
-    helmet.title.toString(),
-    helmet.meta.toString(),
-    helmet.link.toString(),
-    helmet.script.toString(),
-  ];
-  const metaAttributes = metaStrings.filter(Boolean);
-
-  const {generatedFilesDir} = locals;
-  const manifestPath = path.join(generatedFilesDir, 'client-manifest.json');
-  const manifest = JSON.parse(await fs.readFile(manifestPath, 'utf8'));
-
-  // Get all required assets for this particular page based on client
-  // 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 renderedHtml = renderSSRTemplate(ssrTemplate, {
-    appHtml,
-    baseUrl,
-    htmlAttributes: htmlAttributes || '',
-    bodyAttributes: bodyAttributes || '',
-    headTags,
-    preBodyTags,
-    postBodyTags,
-    metaAttributes,
-    scripts,
-    stylesheets,
-    noIndex,
-    version: packageJson.version,
-  });
-
-  try {
-    // Minify html with https://github.com/DanielRuf/html-minifier-terser
-    return await minify(renderedHtml, {
-      removeComments: false,
-      removeRedundantAttributes: true,
-      removeEmptyAttributes: true,
-      removeScriptTypeAttributes: true,
-      removeStyleLinkTypeAttributes: true,
-      useShortDoctype: true,
-      minifyJS: true,
+    const { routesLocation, headTags, preBodyTags, postBodyTags, onLinksCollected, baseUrl, ssrTemplate, noIndex, } = locals;
+    const location = routesLocation[locals.path];
+    await preload(routes, location);
+    const modules = new Set();
+    const context = {};
+    const linksCollector = createStatefulLinksCollector();
+    const appHtml = ReactDOMServer.renderToString(React.createElement(Loadable.Capture, { report: (moduleName) => modules.add(moduleName) },
+        React.createElement(StaticRouter, { location: location, context: context },
+            React.createElement(ProvideLinksCollector, { linksCollector: linksCollector },
+                React.createElement(App, null)))));
+    onLinksCollected(location, linksCollector.getCollectedLinks());
+    const helmet = Helmet.renderStatic();
+    const htmlAttributes = helmet.htmlAttributes.toString();
+    const bodyAttributes = helmet.bodyAttributes.toString();
+    const metaStrings = [
+        helmet.title.toString(),
+        helmet.meta.toString(),
+        helmet.link.toString(),
+        helmet.script.toString(),
+    ];
+    const metaAttributes = metaStrings.filter(Boolean);
+    const { generatedFilesDir } = locals;
+    const manifestPath = path.join(generatedFilesDir, 'client-manifest.json');
+    const manifest = JSON.parse(await fs.readFile(manifestPath, 'utf8'));
+    // Get all required assets for this particular page based on client
+    // 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 renderedHtml = renderSSRTemplate(ssrTemplate, {
+        appHtml,
+        baseUrl,
+        htmlAttributes: htmlAttributes || '',
+        bodyAttributes: bodyAttributes || '',
+        headTags,
+        preBodyTags,
+        postBodyTags,
+        metaAttributes,
+        scripts,
+        stylesheets,
+        noIndex,
+        version: packageJson.version,
     });
-  } catch (e) {
-    logger.error`Minification of page path=${locals.path} failed because of following error:
+    try {
+        // Minify html with https://github.com/DanielRuf/html-minifier-terser
+        return await minify(renderedHtml, {
+            removeComments: false,
+            removeRedundantAttributes: true,
+            removeEmptyAttributes: true,
+            removeScriptTypeAttributes: true,
+            removeStyleLinkTypeAttributes: true,
+            useShortDoctype: true,
+            minifyJS: true,
+        });
+    }
+    catch (e) {
+        logger.error `Minification of page path=${locals.path} failed because of following error:
 ${e.stack}`;
-    throw e;
-  }
+        throw e;
+    }
 }

package/lib/commands/build.d.ts

@@ -4,5 +4,5 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { BuildCLIOptions } from '@docusaurus/types';
+import type { BuildCLIOptions } from '@docusaurus/types';
 export default function build(siteDir: string, cliOptions?: Partial<BuildCLIOptions>, forceTerminate?: boolean): Promise<string>;

package/lib/commands/build.js

@@ -23,7 +23,10 @@ const CleanWebpackPlugin_1 = (0, tslib_1.__importDefault)(require("../webpack/pl
 const i18n_1 = require("../server/i18n");
 const utils_2 = require("@docusaurus/utils");
 async function build(siteDir, cliOptions = {}, 
-// TODO what's the purpose of this arg ?
+// When running build, we force terminate the process to prevent async
+// operations from never returning. However, if run as part of docusaurus
+// deploy, we have to let deploy finish.
+// See https://github.com/facebook/docusaurus/pull/2496
 forceTerminate = true) {
     ['SIGINT', 'SIGTERM'].forEach((sig) => {
         process.on(sig, () => process.exit());
@@ -60,12 +63,12 @@ forceTerminate = true) {
             logger_1.default.info `Website will be built for all these locales: ${i18n.locales}`;
         }
         // We need the default locale to always be the 1st in the list
-        // If we build it last, it would "erase" the localized sites built in subfolders
+        // If we build it last, it would "erase" the localized sites built in sub-folders
         const orderedLocales = [
             i18n.defaultLocale,
             ...i18n.locales.filter((locale) => locale !== i18n.defaultLocale),
         ];
-        const results = await (0, utils_2.mapAsyncSequencial)(orderedLocales, (locale) => {
+        const results = await (0, utils_2.mapAsyncSequential)(orderedLocales, (locale) => {
             const isLastLocale = orderedLocales.indexOf(locale) === orderedLocales.length - 1;
             return tryToBuildLocale({ locale, isLastLocale });
         });
@@ -90,7 +93,7 @@ async function buildLocale({ siteDir, locale, cliOptions, forceTerminate, isLast
         plugins: [
             // Remove/clean build folders before building bundles.
             new CleanWebpackPlugin_1.default({ verbose: false }),
-            // Visualize size of webpack output files with an interactive zoomable treemap.
+            // Visualize size of webpack output files with an interactive zoomable tree map.
             cliOptions.bundleAnalyzer && new webpack_bundle_analyzer_1.BundleAnalyzerPlugin(),
             // Generate client manifests file that will be used for server bundle.
             new react_loadable_ssr_addon_v5_slorber_1.default({
@@ -123,9 +126,9 @@ async function buildLocale({ siteDir, locale, cliOptions, forceTerminate, isLast
             clientConfig = (0, utils_1.applyConfigurePostCss)(configurePostCss, clientConfig);
         }
         if (configureWebpack) {
-            clientConfig = (0, utils_1.applyConfigureWebpack)(configureWebpack.bind(plugin), // The plugin lifecycle may reference `this`. // TODO remove this implicit api: inject in callback instead
+            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);
-            serverConfig = (0, utils_1.applyConfigureWebpack)(configureWebpack.bind(plugin), // The plugin lifecycle may reference `this`. // TODO remove this implicit api: inject in callback instead
+            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);
         }
     });
@@ -150,7 +153,8 @@ async function buildLocale({ siteDir, locale, cliOptions, forceTerminate, isLast
         if (!plugin.postBuild) {
             return;
         }
-        await plugin.postBuild(props);
+        // The plugin may reference `this`. We manually bind it again to prevent any bugs.
+        await plugin.postBuild({ ...props, content: plugin.content });
     }));
     await (0, brokenLinks_1.handleBrokenLinks)({
         allCollectedLinks,

package/lib/commands/commandUtils.d.ts

@@ -4,6 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { HostPortCLIOptions } from '@docusaurus/types';
+import type { HostPortCLIOptions } from '@docusaurus/types';
 export declare function getCLIOptionHost(hostOption: HostPortCLIOptions['host']): string;
 export declare function getCLIOptionPort(portOption: HostPortCLIOptions['port'], host: string): Promise<number | null>;

package/lib/commands/deploy.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { BuildCLIOptions } from '@docusaurus/types';
+import type { BuildCLIOptions } from '@docusaurus/types';
 export declare function buildSshUrl(githubHost: string, organizationName: string, projectName: string, githubPort?: string): string;
 export declare function buildHttpsUrl(gitCredentials: string, githubHost: string, organizationName: string, projectName: string, githubPort?: string): string;
 export declare function hasSSHProtocol(sourceRepoUrl: string): boolean;

package/lib/commands/deploy.js

@@ -158,7 +158,7 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
         // the files in the directory. If the 'clone' command fails, assume that
         // the deployment branch doesn't exist, and initialize git in an empty
         // directory, check out a clean deployment branch and add remote.
-        if (shellExecLog(`git clone --depth 1 --branch ${deploymentBranch} ${deploymentRepoURL} ${toPath}`).code === 0) {
+        if (shellExecLog(`git clone --depth 1 --branch ${deploymentBranch} ${deploymentRepoURL} "${toPath}"`).code === 0) {
             shellExecLog('git rm -rf .');
         }
         else {

package/lib/commands/external.d.ts

@@ -4,5 +4,5 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { Command } from 'commander';
+import type { Command } from 'commander';
 export default function externalCommand(cli: Command, siteDir: string): Promise<void>;

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/serve.d.ts

@@ -4,5 +4,5 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { ServeCLIOptions } from '@docusaurus/types';
+import type { ServeCLIOptions } from '@docusaurus/types';
 export default function serve(siteDir: string, cliOptions: ServeCLIOptions): Promise<void>;

package/lib/commands/start.d.ts

@@ -4,5 +4,5 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { StartCLIOptions } from '@docusaurus/types';
+import type { StartCLIOptions } from '@docusaurus/types';
 export default function start(siteDir: string, cliOptions: Partial<StartCLIOptions>): Promise<void>;

package/lib/commands/start.js

@@ -101,7 +101,7 @@ async function start(siteDir, cliOptions) {
         plugins: [
             // Generates an `index.html` file with the <script> injected.
             new html_webpack_plugin_1.default({
-                template: path_1.default.resolve(__dirname, '../client/templates/index.html.template.ejs'),
+                template: path_1.default.resolve(__dirname, '../webpack/templates/index.html.template.ejs'),
                 // So we can define the position where the scripts are injected.
                 inject: false,
                 filename: 'index.html',
@@ -179,11 +179,10 @@ async function start(siteDir, cliOptions) {
         allowedHosts: 'all',
         host,
         port,
-        onBeforeSetupMiddleware: (devServer) => {
+        setupMiddlewares: (middlewares, devServer) => {
             // This lets us fetch source contents from webpack for the error overlay.
-            devServer.app.use((0, evalSourceMapMiddleware_1.default)(
-            // @ts-expect-error: bad types
-            devServer));
+            middlewares.unshift((0, evalSourceMapMiddleware_1.default)(devServer));
+            return middlewares;
         },
     };
     // Allow plugin authors to customize/override devServer config

package/lib/commands/swizzle.d.ts

@@ -4,6 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { PluginConfig } from '@docusaurus/types';
+import type { PluginConfig } from '@docusaurus/types';
 export declare function getPluginNames(plugins: PluginConfig[]): string[];
 export default function swizzle(siteDir: string, themeName?: string, componentName?: string, typescript?: boolean, danger?: boolean): Promise<void>;

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.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { Slugger } from '@docusaurus/utils';
+import { type Slugger } from '@docusaurus/utils';
 declare type Options = {
     maintainCase?: boolean;
     overwrite?: boolean;

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,
     });