feat(core): allow plugin lifecycles to return relative paths (#6921)

* feat(core): resolve plugin lifecycles returning relative paths * fix typo * fix tests * revert * rename path -> entryPath
facebook · Mar 16, 2022 · 68aaf92 · 68aaf92
1 parent 8d1c195
commit 68aaf92
Show file tree

Hide file tree

Showing 26 changed files with 100 additions and 68 deletions.
diff --git a/packages/docusaurus-plugin-debug/src/index.ts b/packages/docusaurus-plugin-debug/src/index.ts
@@ -24,10 +24,10 @@ export default function pluginDebug({
     name: 'docusaurus-plugin-debug',
 
     getThemePath() {
-      return path.resolve(__dirname, '../lib/theme');
+      return '../lib/theme';
     },
     getTypeScriptThemePath() {
-      return path.resolve(__dirname, '../src/theme');
+      return '../src/theme';
     },
 
     async contentLoaded({actions: {createData, addRoute}, allContent}) {

diff --git a/packages/docusaurus-plugin-google-analytics/src/index.ts b/packages/docusaurus-plugin-google-analytics/src/index.ts
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import path from 'path';
 import {Joi} from '@docusaurus/utils-validation';
 import type {
   LoadContext,
@@ -28,7 +27,7 @@ export default function pluginGoogleAnalytics(
     name: 'docusaurus-plugin-google-analytics',
 
     getClientModules() {
-      return isProd ? [path.resolve(__dirname, './analytics')] : [];
+      return isProd ? ['./analytics'] : [];
     },
 
     injectHtmlTags() {

diff --git a/packages/docusaurus-plugin-google-gtag/src/index.ts b/packages/docusaurus-plugin-google-gtag/src/index.ts
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import path from 'path';
 import {Joi} from '@docusaurus/utils-validation';
 import type {
   LoadContext,
@@ -32,7 +31,7 @@ export default function pluginGoogleGtag(
     },
 
     getClientModules() {
-      return isProd ? [path.resolve(__dirname, './gtag')] : [];
+      return isProd ? ['./gtag'] : [];
     },
 
     injectHtmlTags() {

diff --git a/packages/docusaurus-plugin-ideal-image/src/index.ts b/packages/docusaurus-plugin-ideal-image/src/index.ts
@@ -15,8 +15,6 @@ import type {PluginOptions} from '@docusaurus/plugin-ideal-image';
 import {Joi} from '@docusaurus/utils-validation';
 import {readDefaultCodeTranslationMessages} from '@docusaurus/theme-translations';
 
-import path from 'path';
-
 export default function pluginIdealImage(
   context: LoadContext,
   options: PluginOptions,
@@ -29,11 +27,11 @@ export default function pluginIdealImage(
     name: 'docusaurus-plugin-ideal-image',
 
     getThemePath() {
-      return path.resolve(__dirname, '../lib/theme');
+      return '../lib/theme';
     },
 
     getTypeScriptThemePath() {
-      return path.resolve(__dirname, '../src/theme');
+      return '../src/theme';
     },
 
     getDefaultCodeTranslationMessages() {

diff --git a/packages/docusaurus-plugin-pwa/src/index.ts b/packages/docusaurus-plugin-pwa/src/index.ts
@@ -64,10 +64,10 @@ export default function pluginPWA(
     name: 'docusaurus-plugin-pwa',
 
     getThemePath() {
-      return path.resolve(__dirname, '../lib/theme');
+      return '../lib/theme';
     },
     getTypeScriptThemePath() {
-      return path.resolve(__dirname, '../src/theme');
+      return '../src/theme';
     },
 
     getClientModules() {
@@ -138,7 +138,7 @@ export default function pluginPWA(
       const swSourceFileTest = /\.m?js$/;
 
       const swWebpackConfig: Configuration = {
-        entry: path.resolve(__dirname, 'sw.js'),
+        entry: require.resolve('./sw.js'),
         output: {
           path: outDir,
           filename: 'sw.js',

diff --git a/packages/docusaurus-plugin-pwa/src/options.ts b/packages/docusaurus-plugin-pwa/src/options.ts
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import path from 'path';
 import {Joi} from '@docusaurus/utils-validation';
 import type {
   ThemeConfig,
@@ -24,7 +23,7 @@ const DEFAULT_OPTIONS = {
   injectManifestConfig: {},
   pwaHead: [],
   swCustom: undefined,
-  swRegister: path.join(__dirname, 'registerSw.js'),
+  swRegister: './registerSw.js',
   reloadPopup: '@theme/PwaReloadPopup',
 };
 

diff --git a/packages/docusaurus-theme-classic/src/index.ts b/packages/docusaurus-theme-classic/src/index.ts
@@ -8,7 +8,6 @@
 import type {LoadContext, Plugin, PostCssOptions} from '@docusaurus/types';
 import type {ThemeConfig} from '@docusaurus/theme-common';
 import {getTranslationFiles, translateThemeConfig} from './translations';
-import path from 'path';
 import {createRequire} from 'module';
 import type {Plugin as PostCssPlugin} from 'postcss';
 import rtlcss from 'rtlcss';
@@ -112,11 +111,11 @@ export default function docusaurusThemeClassic(
     name: 'docusaurus-theme-classic',
 
     getThemePath() {
-      return path.join(__dirname, '../lib-next/theme');
+      return '../lib-next/theme';
     },
 
     getTypeScriptThemePath() {
-      return path.resolve(__dirname, '../src/theme');
+      return '../src/theme';
     },
 
     getTranslationFiles: async () => getTranslationFiles({themeConfig}),
@@ -137,8 +136,8 @@ export default function docusaurusThemeClassic(
     getClientModules() {
       const modules = [
         require.resolve(getInfimaCSSFile(direction)),
-        path.resolve(__dirname, './prism-include-languages'),
-        path.resolve(__dirname, './admonitions.css'),
+        './prism-include-languages',
+        './admonitions.css',
       ];
 
       if (customCss) {

diff --git a/packages/docusaurus-theme-live-codeblock/src/index.ts b/packages/docusaurus-theme-live-codeblock/src/index.ts
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import path from 'path';
 import {readDefaultCodeTranslationMessages} from '@docusaurus/theme-translations';
 import type {LoadContext, Plugin} from '@docusaurus/types';
 
@@ -18,10 +17,10 @@ export default function themeLiveCodeblock(context: LoadContext): Plugin {
     name: 'docusaurus-theme-live-codeblock',
 
     getThemePath() {
-      return path.resolve(__dirname, '../lib/theme');
+      return '../lib/theme';
     },
     getTypeScriptThemePath() {
-      return path.resolve(__dirname, '../src/theme');
+      return '../src/theme';
     },
 
     getDefaultCodeTranslationMessages() {
@@ -35,7 +34,7 @@ export default function themeLiveCodeblock(context: LoadContext): Plugin {
       return {
         resolve: {
           alias: {
-            buble: path.resolve(__dirname, './custom-buble.js'),
+            buble: require.resolve('./custom-buble.js'),
           },
         },
       };

diff --git a/packages/docusaurus-theme-search-algolia/src/index.ts b/packages/docusaurus-theme-search-algolia/src/index.ts
@@ -47,10 +47,10 @@ export default function themeSearchAlgolia(context: LoadContext): Plugin<void> {
     name: 'docusaurus-theme-search-algolia',
 
     getThemePath() {
-      return path.resolve(__dirname, '../lib/theme');
+      return '../lib/theme';
     },
     getTypeScriptThemePath() {
-      return path.resolve(__dirname, '../src/theme');
+      return '../src/theme';
     },
 
     getDefaultCodeTranslationMessages() {

diff --git a/packages/docusaurus-types/src/index.d.ts b/packages/docusaurus-types/src/index.d.ts
@@ -290,6 +290,10 @@ export interface Plugin<Content = unknown> {
 export type InitializedPlugin<Content = unknown> = Plugin<Content> & {
   readonly options: Required<PluginOptions>;
   readonly version: DocusaurusPluginVersionInformation;
+  /**
+   * The absolute path to the folder containing the entry point file.
+   */
+  readonly path: string;
 };
 
 export type LoadedPlugin<Content = unknown> = InitializedPlugin<Content> & {

diff --git a/packages/docusaurus/src/commands/swizzle/context.ts b/packages/docusaurus/src/commands/swizzle/context.ts
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {createRequire} from 'module';
 import {loadContext, loadPluginConfigs} from '../../server';
 import initPlugins, {normalizePluginConfigs} from '../../server/plugins/init';
 import type {InitializedPlugin} from '@docusaurus/types';
@@ -15,7 +14,6 @@ export async function initSwizzleContext(
   siteDir: string,
 ): Promise<SwizzleContext> {
   const context = await loadContext(siteDir);
-  const pluginRequire = createRequire(context.siteConfigPath);
 
   const pluginConfigs = await loadPluginConfigs(context);
   const plugins: InitializedPlugin[] = await initPlugins({
@@ -25,7 +23,7 @@ export async function initSwizzleContext(
 
   const pluginsNormalized = await normalizePluginConfigs(
     pluginConfigs,
-    pluginRequire,
+    context.siteConfigPath,
   );
 
   return {

diff --git a/packages/docusaurus/src/commands/swizzle/themes.ts b/packages/docusaurus/src/commands/swizzle/themes.ts
@@ -6,6 +6,7 @@
  */
 
 import logger from '@docusaurus/logger';
+import path from 'path';
 import leven from 'leven';
 import _ from 'lodash';
 import {askThemeName} from './prompts';
@@ -132,8 +133,16 @@ export function getThemePath({
 }): string {
   const pluginInstance = getPluginByThemeName(plugins, themeName);
   const themePath = typescript
-    ? pluginInstance.instance.getTypeScriptThemePath?.()
-    : pluginInstance.instance.getThemePath?.();
+    ? pluginInstance.instance.getTypeScriptThemePath &&
+      path.resolve(
+        pluginInstance.instance.path,
+        pluginInstance.instance.getTypeScriptThemePath(),
+      )
+    : pluginInstance.instance.getThemePath &&
+      path.resolve(
+        pluginInstance.instance.path,
+        pluginInstance.instance.getThemePath(),
+      );
   if (!themePath) {
     logger.warn(
       typescript

diff --git a/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/plugin-empty.js b/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/plugin-empty.js
diff --git a/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/plugin-foo-bar.js b/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/plugin-foo-bar.js
diff --git a/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/plugin-hello-world.js b/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/plugin-hello-world.js
diff --git a/packages/docusaurus/src/server/client-modules/__tests__/index.test.ts b/packages/docusaurus/src/server/client-modules/__tests__/index.test.ts
@@ -21,8 +21,8 @@ describe('loadClientModules', () => {
     const clientModules = loadClientModules([pluginFooBar()]);
     expect(clientModules).toMatchInlineSnapshot(`
       [
-        "foo",
-        "bar",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/foo",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/bar",
       ]
     `);
   });
@@ -34,10 +34,10 @@ describe('loadClientModules', () => {
     ]);
     expect(clientModules).toMatchInlineSnapshot(`
       [
-        "foo",
-        "bar",
-        "hello",
-        "world",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/foo",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/bar",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/hello",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/world",
       ]
     `);
   });
@@ -49,10 +49,10 @@ describe('loadClientModules', () => {
     ]);
     expect(clientModules).toMatchInlineSnapshot(`
       [
-        "hello",
-        "world",
-        "foo",
-        "bar",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/hello",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/world",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/foo",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/bar",
       ]
     `);
   });
@@ -65,10 +65,10 @@ describe('loadClientModules', () => {
     ]);
     expect(clientModules).toMatchInlineSnapshot(`
       [
-        "hello",
-        "world",
-        "foo",
-        "bar",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/hello",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/world",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/foo",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/bar",
       ]
     `);
   });
@@ -81,10 +81,10 @@ describe('loadClientModules', () => {
     ]);
     expect(clientModules).toMatchInlineSnapshot(`
       [
-        "hello",
-        "world",
-        "foo",
-        "bar",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/hello",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/world",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/foo",
+        "<PROJECT_ROOT>/packages/docusaurus/src/server/client-modules/__tests__/__fixtures__/bar",
       ]
     `);
   });

diff --git a/packages/docusaurus/src/server/client-modules/index.ts b/packages/docusaurus/src/server/client-modules/index.ts
@@ -5,10 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {Plugin} from '@docusaurus/types';
+import path from 'path';
+import type {LoadedPlugin} from '@docusaurus/types';
 
 export default function loadClientModules(
-  plugins: Plugin<unknown>[],
+  plugins: LoadedPlugin<unknown>[],
 ): string[] {
-  return plugins.flatMap((plugin) => plugin.getClientModules?.() ?? []);
+  return plugins.flatMap(
+    (plugin) =>
+      plugin.getClientModules?.().map((p) => path.resolve(plugin.path, p)) ??
+      [],
+  );
 }
diff --git a/packages/docusaurus/src/server/index.ts b/packages/docusaurus/src/server/index.ts
@@ -176,8 +176,10 @@ export async function loadPluginConfigs(
 // - Resolve aliased theme components
 // - Inject scripts/stylesheets
 function createBootstrapPlugin({
+  siteDir,
   siteConfig,
 }: {
+  siteDir: string;
   siteConfig: DocusaurusConfig;
 }): LoadedPlugin {
   const {
@@ -192,6 +194,7 @@ function createBootstrapPlugin({
       id: 'default',
     },
     version: {type: 'synthetic'},
+    path: siteDir,
     getClientModules() {
       return siteConfigClientModules;
     },
@@ -244,6 +247,8 @@ function createMDXFallbackPlugin({
       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
@@ -336,7 +341,7 @@ export default ${JSON.stringify(siteConfig, null, 2)};
 `,
   );
 
-  plugins.push(createBootstrapPlugin({siteConfig}));
+  plugins.push(createBootstrapPlugin({siteDir, siteConfig}));
   plugins.push(createMDXFallbackPlugin({siteDir, siteConfig}));
 
   // Load client modules.