@docusaurus/core 0.0.0-4724 → 0.0.0-4727

package/lib/commands/swizzle/context.js

@@ -8,18 +8,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initSwizzleContext = void 0;
 const tslib_1 = require("tslib");
-const module_1 = require("module");
 const server_1 = require("../../server");
 const init_1 = tslib_1.__importStar(require("../../server/plugins/init"));
 async function initSwizzleContext(siteDir) {
     const context = await (0, server_1.loadContext)(siteDir);
-    const pluginRequire = (0, module_1.createRequire)(context.siteConfigPath);
     const pluginConfigs = await (0, server_1.loadPluginConfigs)(context);
     const plugins = await (0, init_1.default)({
         pluginConfigs,
         context,
     });
-    const pluginsNormalized = await (0, init_1.normalizePluginConfigs)(pluginConfigs, pluginRequire);
+    const pluginsNormalized = await (0, init_1.normalizePluginConfigs)(pluginConfigs, context.siteConfigPath);
     return {
         plugins: plugins.map((plugin, pluginIndex) => ({
             plugin: pluginsNormalized[pluginIndex],

package/lib/commands/swizzle/themes.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getThemePath = exports.getThemeName = exports.getThemeNames = exports.getPluginByThemeName = exports.pluginToThemeName = void 0;
 const tslib_1 = require("tslib");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const leven_1 = tslib_1.__importDefault(require("leven"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const prompts_1 = require("./prompts");
@@ -87,8 +88,10 @@ exports.getThemeName = getThemeName;
 function getThemePath({ plugins, themeName, typescript, }) {
     const pluginInstance = getPluginByThemeName(plugins, themeName);
     const themePath = typescript
-        ? pluginInstance.instance.getTypeScriptThemePath?.()
-        : pluginInstance.instance.getThemePath?.();
+        ? pluginInstance.instance.getTypeScriptThemePath &&
+            path_1.default.resolve(pluginInstance.instance.path, pluginInstance.instance.getTypeScriptThemePath())
+        : pluginInstance.instance.getThemePath &&
+            path_1.default.resolve(pluginInstance.instance.path, pluginInstance.instance.getThemePath());
     if (!themePath) {
         logger_1.default.warn(typescript
             ? logger_1.default.interpolate `name=${themeName} does not provide TypeScript theme code via ${'getTypeScriptThemePath()'}.`

package/lib/server/client-modules/index.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 type { Plugin } from '@docusaurus/types';
-export default function loadClientModules(plugins: Plugin<unknown>[]): string[];
+import type { LoadedPlugin } from '@docusaurus/types';
+export default function loadClientModules(plugins: LoadedPlugin<unknown>[]): string[];

package/lib/server/client-modules/index.js

@@ -6,7 +6,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
 function loadClientModules(plugins) {
-    return plugins.flatMap((plugin) => plugin.getClientModules?.() ?? []);
+    return plugins.flatMap((plugin) => plugin.getClientModules?.().map((p) => path_1.default.resolve(plugin.path, p)) ??
+        []);
 }
 exports.default = loadClientModules;

package/lib/server/index.js

@@ -107,7 +107,7 @@ exports.loadPluginConfigs = loadPluginConfigs;
 // Make a fake plugin to:
 // - Resolve aliased theme components
 // - Inject scripts/stylesheets
-function createBootstrapPlugin({ siteConfig, }) {
+function createBootstrapPlugin({ siteDir, siteConfig, }) {
     const { stylesheets, scripts, clientModules: siteConfigClientModules, } = siteConfig;
     return {
         name: 'docusaurus-bootstrap-plugin',
@@ -116,6 +116,7 @@ function createBootstrapPlugin({ siteConfig, }) {
             id: 'default',
         },
         version: { type: 'synthetic' },
+        path: siteDir,
         getClientModules() {
             return siteConfigClientModules;
         },
@@ -157,6 +158,8 @@ function createMDXFallbackPlugin({ siteDir, siteConfig, }) {
             id: 'default',
         },
         version: { type: 'synthetic' },
+        // Synthetic, the path doesn't matter much
+        path: '.',
         configureWebpack(config, isServer, { getJSLoader }) {
             // We need the mdx fallback loader to exclude files that were already
             // processed by content plugins mdx loaders. This works, but a bit
@@ -219,7 +222,7 @@ next build. You can clear all build artifacts (including this folder) with the
  */
 export default ${JSON.stringify(siteConfig, null, 2)};
 `);
-    plugins.push(createBootstrapPlugin({ siteConfig }));
+    plugins.push(createBootstrapPlugin({ siteDir, siteConfig }));
     plugins.push(createMDXFallbackPlugin({ siteDir, siteConfig }));
     // Load client modules.
     const clientModules = (0, client_modules_1.default)(plugins);

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

@@ -4,7 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-/// <reference types="node" />
 import type { ImportedPluginModule, LoadContext, PluginModule, PluginConfig, PluginOptions, InitializedPlugin } from '@docusaurus/types';
 export declare type NormalizedPluginConfig = {
     plugin: PluginModule;
@@ -13,8 +12,13 @@ export declare type NormalizedPluginConfig = {
         path: string;
         module: ImportedPluginModule;
     };
+    /**
+     * Different from pluginModule.path, this one is always an absolute path used
+     * to resolve relative paths returned from lifecycles
+     */
+    entryPath: string;
 };
-export declare function normalizePluginConfigs(pluginConfigs: PluginConfig[], pluginRequire: NodeRequire): Promise<NormalizedPluginConfig[]>;
+export declare function normalizePluginConfigs(pluginConfigs: PluginConfig[], configPath: string): Promise<NormalizedPluginConfig[]>;
 export default function initPlugins({ pluginConfigs, context, }: {
     pluginConfigs: PluginConfig[];
     context: LoadContext;

package/lib/server/plugins/init.js

@@ -9,12 +9,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizePluginConfigs = void 0;
 const tslib_1 = require("tslib");
 const module_1 = require("module");
+const path_1 = tslib_1.__importDefault(require("path"));
 const import_fresh_1 = tslib_1.__importDefault(require("import-fresh"));
 const utils_1 = require("@docusaurus/utils");
 const versions_1 = require("../versions");
 const pluginIds_1 = require("./pluginIds");
 const utils_validation_1 = require("@docusaurus/utils-validation");
-async function normalizePluginConfig(pluginConfig, pluginRequire) {
+async function normalizePluginConfig(pluginConfig, configPath) {
+    const pluginRequire = (0, module_1.createRequire)(configPath);
     // plugins: ['./plugin']
     if (typeof pluginConfig === 'string') {
         const pluginModuleImport = pluginConfig;
@@ -27,6 +29,7 @@ async function normalizePluginConfig(pluginConfig, pluginRequire) {
                 path: pluginModuleImport,
                 module: pluginModule,
             },
+            entryPath: pluginPath,
         };
     }
     // plugins: [function plugin() { }]
@@ -34,6 +37,7 @@ async function normalizePluginConfig(pluginConfig, pluginRequire) {
         return {
             plugin: pluginConfig,
             options: {},
+            entryPath: configPath,
         };
     }
     // plugins: [
@@ -50,6 +54,7 @@ async function normalizePluginConfig(pluginConfig, pluginRequire) {
                 path: pluginModuleImport,
                 module: pluginModule,
             },
+            entryPath: pluginPath,
         };
     }
     // plugins: [
@@ -58,10 +63,11 @@ async function normalizePluginConfig(pluginConfig, pluginRequire) {
     return {
         plugin: pluginConfig[0],
         options: pluginConfig[1],
+        entryPath: configPath,
     };
 }
-async function normalizePluginConfigs(pluginConfigs, pluginRequire) {
-    return Promise.all(pluginConfigs.map((pluginConfig) => normalizePluginConfig(pluginConfig, pluginRequire)));
+async function normalizePluginConfigs(pluginConfigs, configPath) {
+    return Promise.all(pluginConfigs.map((pluginConfig) => normalizePluginConfig(pluginConfig, configPath)));
 }
 exports.normalizePluginConfigs = normalizePluginConfigs;
 function getOptionValidationFunction(normalizedPluginConfig) {
@@ -84,7 +90,7 @@ 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);
-    const pluginConfigsNormalized = await normalizePluginConfigs(pluginConfigs, pluginRequire);
+    const pluginConfigsNormalized = await normalizePluginConfigs(pluginConfigs, context.siteConfigPath);
     async function doGetPluginVersion(normalizedPluginConfig) {
         // get plugin version
         if (normalizedPluginConfig.pluginModule?.path) {
@@ -131,6 +137,7 @@ async function initPlugins({ pluginConfigs, context, }) {
             ...pluginInstance,
             options: pluginOptions,
             version: pluginVersion,
+            path: path_1.default.dirname(normalizedPluginConfig.entryPath),
         };
     }
     const plugins = await Promise.all(pluginConfigsNormalized.map(initializePlugin));

package/lib/server/themes/index.js

@@ -39,7 +39,7 @@ async function loadThemeAliases(themePaths, userThemePaths) {
 exports.loadThemeAliases = loadThemeAliases;
 function loadPluginsThemeAliases({ siteDir, plugins, }) {
     const pluginThemes = plugins
-        .map((plugin) => plugin.getThemePath?.())
+        .map((plugin) => plugin.getThemePath && path_1.default.resolve(plugin.path, plugin.getThemePath()))
         .filter((x) => Boolean(x));
     const userTheme = path_1.default.resolve(siteDir, utils_1.THEME_PATH);
     return loadThemeAliases([ThemeFallbackDir, ...pluginThemes], [userTheme]);

package/lib/server/translations/translationsExtractor.js

@@ -44,7 +44,7 @@ function getPluginSourceCodeFilePaths(plugin) {
     if (themePath) {
         codePaths.push(themePath);
     }
-    return codePaths;
+    return codePaths.map((p) => path_1.default.resolve(plugin.path, p));
 }
 async function globSourceCodeFilePaths(dirPaths) {
     const filePaths = await (0, utils_2.safeGlobby)(dirPaths);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4724",
+  "version": "0.0.0-4727",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -41,13 +41,13 @@
     "@babel/runtime": "^7.17.7",
     "@babel/runtime-corejs3": "^7.17.7",
     "@babel/traverse": "^7.17.3",
-    "@docusaurus/cssnano-preset": "0.0.0-4724",
-    "@docusaurus/logger": "0.0.0-4724",
-    "@docusaurus/mdx-loader": "0.0.0-4724",
+    "@docusaurus/cssnano-preset": "0.0.0-4727",
+    "@docusaurus/logger": "0.0.0-4727",
+    "@docusaurus/mdx-loader": "0.0.0-4727",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4724",
-    "@docusaurus/utils-common": "0.0.0-4724",
-    "@docusaurus/utils-validation": "0.0.0-4724",
+    "@docusaurus/utils": "0.0.0-4727",
+    "@docusaurus/utils-common": "0.0.0-4727",
+    "@docusaurus/utils-validation": "0.0.0-4727",
     "@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-4724",
-    "@docusaurus/types": "0.0.0-4724",
+    "@docusaurus/module-type-aliases": "0.0.0-4727",
+    "@docusaurus/types": "0.0.0-4727",
     "@types/detect-port": "^1.3.2",
     "@types/nprogress": "^0.2.0",
     "@types/react-dom": "^17.0.13",
@@ -128,5 +128,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "4766d101935a9b634ac4670286aa0f51e35b75ae"
+  "gitHead": "967bfff81002933a1c68980300233e0320398e04"
 }