@docusaurus/core 2.0.0-beta.1b0acc554 → 2.0.0-beta.2

package/lib/server/themes/index.d.ts

@@ -4,5 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { ThemeAlias } from '@docusaurus/types';
-export default function loadThemeAlias(themePaths: string[], userThemePaths?: string[]): ThemeAlias;
+import { ThemeAliases, LoadedPlugin } from '@docusaurus/types';
+export declare function loadThemeAliases(themePaths: string[], userThemePaths?: string[]): ThemeAliases;
+export declare function loadPluginsThemeAliases({ siteDir, plugins, }: {
+    siteDir: string;
+    plugins: LoadedPlugin[];
+}): ThemeAliases;

package/lib/server/themes/index.js

@@ -6,8 +6,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadPluginsThemeAliases = exports.loadThemeAliases = void 0;
 const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
+const constants_1 = require("../../constants");
 const alias_1 = tslib_1.__importDefault(require("./alias"));
+const ThemeFallbackDir = path_1.default.resolve(__dirname, '../../client/theme-fallback');
 function buildThemeAliases(themeAliases, aliases = {}) {
     Object.keys(themeAliases).forEach((aliasKey) => {
         if (aliasKey in aliases) {
@@ -20,8 +24,8 @@ function buildThemeAliases(themeAliases, aliases = {}) {
     });
     return aliases;
 }
-function loadThemeAlias(themePaths, userThemePaths = []) {
-    let aliases = {};
+function loadThemeAliases(themePaths, userThemePaths = []) {
+    let aliases = {}; // TODO refactor, inelegant side-effect
     themePaths.forEach((themePath) => {
         const themeAliases = alias_1.default(themePath, true);
         aliases = { ...aliases, ...buildThemeAliases(themeAliases, aliases) };
@@ -32,4 +36,12 @@ function loadThemeAlias(themePaths, userThemePaths = []) {
     });
     return aliases;
 }
-exports.default = loadThemeAlias;
+exports.loadThemeAliases = loadThemeAliases;
+function loadPluginsThemeAliases({ siteDir, plugins, }) {
+    const pluginThemes = plugins
+        .map((plugin) => (plugin.getThemePath ? plugin.getThemePath() : undefined))
+        .filter((x) => Boolean(x));
+    const userTheme = path_1.default.resolve(siteDir, constants_1.THEME_PATH);
+    return loadThemeAliases([ThemeFallbackDir, ...pluginThemes], [userTheme]);
+}
+exports.loadPluginsThemeAliases = loadPluginsThemeAliases;

package/lib/server/translations/translations.d.ts

@@ -1,5 +1,4 @@
-import { InitPlugin } from '../plugins/init';
-import { TranslationFileContent, TranslationFile, TranslationMessage } from '@docusaurus/types';
+import { TranslationFileContent, TranslationFile, TranslationMessage, InitializedPlugin } from '@docusaurus/types';
 export declare type WriteTranslationsOptions = {
     override?: boolean;
     messagePrefix?: string;
@@ -21,15 +20,15 @@ export declare function getCodeTranslationsFilePath(context: TranslationContext)
 export declare function readCodeTranslationFileContent(context: TranslationContext): Promise<TranslationFileContent | undefined>;
 export declare function writeCodeTranslations(context: TranslationContext, content: TranslationFileContent, options: WriteTranslationsOptions): Promise<void>;
 export declare function writePluginTranslations({ siteDir, plugin, locale, translationFile, options, }: TranslationContext & {
-    plugin: InitPlugin;
+    plugin: InitializedPlugin;
     translationFile: TranslationFile;
     options?: WriteTranslationsOptions;
 }): Promise<void>;
 export declare function localizePluginTranslationFile({ siteDir, plugin, locale, translationFile, }: TranslationContext & {
-    plugin: InitPlugin;
+    plugin: InitializedPlugin;
     translationFile: TranslationFile;
 }): Promise<TranslationFile>;
-export declare function getPluginsDefaultCodeTranslationMessages(plugins: InitPlugin[]): Promise<Record<string, string>>;
+export declare function getPluginsDefaultCodeTranslationMessages(plugins: InitializedPlugin[]): Promise<Record<string, string>>;
 export declare function applyDefaultCodeTranslations({ extractedCodeTranslations, defaultCodeMessages, }: {
     extractedCodeTranslations: Record<string, TranslationMessage>;
     defaultCodeMessages: Record<string, string>;

package/lib/server/translations/translationsExtractor.d.ts

@@ -1,8 +1,7 @@
 import { TransformOptions } from '@babel/core';
-import { TranslationFileContent, TranslationMessage } from '@docusaurus/types';
-import { InitPlugin } from '../plugins/init';
+import { InitializedPlugin, TranslationFileContent, TranslationMessage } from '@docusaurus/types';
 export declare function globSourceCodeFilePaths(dirPaths: string[]): Promise<string[]>;
-export declare function extractSiteSourceCodeTranslations(siteDir: string, plugins: InitPlugin[], babelOptions: TransformOptions): Promise<TranslationFileContent>;
+export declare function extractSiteSourceCodeTranslations(siteDir: string, plugins: InitializedPlugin[], babelOptions: TransformOptions): Promise<TranslationFileContent>;
 declare type SourceCodeFileTranslations = {
     sourceCodeFilePath: string;
     translations: Record<string, TranslationMessage>;

package/lib/webpack/base.js

@@ -14,6 +14,8 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const utils_1 = require("./utils");
 const constants_1 = require("../constants");
 const sharedModuleAliases_1 = tslib_1.__importDefault(require("./sharedModuleAliases"));
+const themes_1 = require("../server/themes");
+const utils_2 = require("@docusaurus/utils");
 const CSS_REGEX = /\.css$/;
 const CSS_MODULE_REGEX = /\.module\.css$/;
 exports.clientDir = path_1.default.join(__dirname, '..', 'client');
@@ -48,7 +50,7 @@ function getDocusaurusAliases() {
 exports.getDocusaurusAliases = getDocusaurusAliases;
 function createBaseConfig(props, isServer, minify = true) {
     var _a;
-    const { outDir, siteDir, siteConfig, baseUrl, generatedFilesDir, routesPaths, siteMetadata, } = props;
+    const { outDir, siteDir, siteConfig, siteConfigPath, baseUrl, generatedFilesDir, routesPaths, siteMetadata, plugins, } = props;
     const totalPages = routesPaths.length;
     const isProd = process.env.NODE_ENV === 'production';
     const minimizeEnabled = minify && isProd && !isServer;
@@ -56,24 +58,31 @@ function createBaseConfig(props, isServer, minify = true) {
     const fileLoaderUtils = utils_1.getFileLoaderUtils();
     const name = isServer ? 'server' : 'client';
     const mode = isProd ? 'production' : 'development';
+    const themeAliases = themes_1.loadPluginsThemeAliases({ siteDir, plugins });
     return {
         mode,
         name,
         cache: {
-            // TODO temporary env variable to reduce risk of Webpack 5 release
-            // maybe expose an official api, once this is solved? https://github.com/webpack/webpack/issues/13034
-            type: process.env.DOCUSAURUS_WEBPACK_CACHE_TYPE ||
-                'filesystem',
+            type: 'filesystem',
             // Can we share the same cache across locales?
             // Exploring that question at https://github.com/webpack/webpack/issues/13034
             // name: `${name}-${mode}`,
             name: `${name}-${mode}-${props.i18n.currentLocale}`,
-            version: siteMetadata.docusaurusVersion,
+            // When version string changes, cache is evicted
+            version: [
+                siteMetadata.docusaurusVersion,
+                // Webpack does not evict the cache correctly on alias/swizzle change, so we force eviction.
+                // See https://github.com/webpack/webpack/issues/13627
+                utils_2.md5Hash(JSON.stringify(themeAliases)),
+            ].join('-'),
+            // When one of those modules/dependencies change (including transitive deps), cache is invalidated
             buildDependencies: {
-                // When one of dependencies change, cache is invalidated
                 config: [
                     __filename,
                     path_1.default.join(__dirname, isServer ? 'server.js' : 'client.js'),
+                    // Docusaurus config changes can affect MDX/JSX compilation, so we'd rather evict the cache.
+                    // See https://github.com/questdb/questdb.io/issues/493
+                    siteConfigPath,
                 ],
             },
         },
@@ -111,6 +120,7 @@ function createBaseConfig(props, isServer, minify = true) {
                 // so we use fine-grained aliases instead
                 // '@docusaurus': path.resolve(__dirname, '../client/exports'),
                 ...getDocusaurusAliases(),
+                ...themeAliases,
             },
             // This allows you to set a fallback for where Webpack should look for modules.
             // We want `@docusaurus/core` own dependencies/`node_modules` to "win" if there is conflict
@@ -192,7 +202,7 @@ function createBaseConfig(props, isServer, minify = true) {
                         modules: {
                             localIdentName: isProd
                                 ? `[local]_[contenthash:base64:4]`
-                                : `[local]_[path]`,
+                                : `[local]_[path][name]`,
                             exportOnlyLocals: isServer,
                         },
                         importLoaders: 1,

package/lib/webpack/utils.d.ts

@@ -26,9 +26,10 @@ export declare const getCustomizableJSLoader: (jsLoader?: "babel" | ((isServer:
  * @param config initial webpack config
  * @param isServer indicates if this is a server webpack configuration
  * @param jsLoader custom js loader config
+ * @param content content loaded by the plugin
  * @returns final/ modified webpack config
  */
-export declare function applyConfigureWebpack(configureWebpack: ConfigureWebpackFn, config: Configuration, isServer: boolean, jsLoader?: 'babel' | ((isServer: boolean) => RuleSetRule)): Configuration;
+export declare function applyConfigureWebpack(configureWebpack: ConfigureWebpackFn, config: Configuration, isServer: boolean, jsLoader: 'babel' | ((isServer: boolean) => RuleSetRule) | undefined, content: unknown): Configuration;
 export declare function applyConfigurePostCss(configurePostCss: NonNullable<ConfigurePostCssFn>, config: Configuration): Configuration;
 export declare function compile(config: Configuration[]): Promise<void>;
 declare type AssetFolder = 'images' | 'files' | 'fonts' | 'medias';

package/lib/webpack/utils.js

@@ -133,9 +133,10 @@ function getCacheLoaderDeprecated() {
  * @param config initial webpack config
  * @param isServer indicates if this is a server webpack configuration
  * @param jsLoader custom js loader config
+ * @param content content loaded by the plugin
  * @returns final/ modified webpack config
  */
-function applyConfigureWebpack(configureWebpack, config, isServer, jsLoader) {
+function applyConfigureWebpack(configureWebpack, config, isServer, jsLoader, content) {
     // Export some utility functions
     const utils = {
         getStyleLoaders,
@@ -144,7 +145,7 @@ function applyConfigureWebpack(configureWebpack, config, isServer, jsLoader) {
         getCacheLoader: getCacheLoaderDeprecated,
     };
     if (typeof configureWebpack === 'function') {
-        const { mergeStrategy, ...res } = configureWebpack(config, isServer, utils);
+        const { mergeStrategy, ...res } = configureWebpack(config, isServer, utils, content);
         if (res && typeof res === 'object') {
             // @ts-expect-error: annoying error due to enums: https://github.com/survivejs/webpack-merge/issues/179
             const customizeRules = mergeStrategy !== null && mergeStrategy !== void 0 ? mergeStrategy : {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "2.0.0-beta.1b0acc554",
+  "version": "2.0.0-beta.2",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -31,7 +31,7 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.1b0acc554",
+    "@docusaurus/module-type-aliases": "2.0.0-beta.2",
     "@types/detect-port": "^1.3.0",
     "@types/nprogress": "^0.2.0",
     "tmp-promise": "^3.0.2"
@@ -47,12 +47,12 @@
     "@babel/runtime": "^7.12.5",
     "@babel/runtime-corejs3": "^7.12.13",
     "@babel/traverse": "^7.12.13",
-    "@docusaurus/cssnano-preset": "2.0.0-beta.1b0acc554",
+    "@docusaurus/cssnano-preset": "2.0.0-beta.2",
     "@docusaurus/react-loadable": "5.5.0",
-    "@docusaurus/types": "2.0.0-beta.1b0acc554",
-    "@docusaurus/utils": "2.0.0-beta.1b0acc554",
-    "@docusaurus/utils-common": "2.0.0-beta.1b0acc554",
-    "@docusaurus/utils-validation": "2.0.0-beta.1b0acc554",
+    "@docusaurus/types": "2.0.0-beta.2",
+    "@docusaurus/utils": "2.0.0-beta.2",
+    "@docusaurus/utils-common": "2.0.0-beta.2",
+    "@docusaurus/utils-validation": "2.0.0-beta.2",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.0",
     "@svgr/webpack": "^5.5.0",
     "autoprefixer": "^10.2.5",
@@ -63,10 +63,10 @@
     "chokidar": "^3.5.1",
     "clean-css": "^5.1.2",
     "commander": "^5.1.0",
-    "copy-webpack-plugin": "^8.1.1",
+    "copy-webpack-plugin": "^9.0.0",
     "core-js": "^3.9.1",
     "css-loader": "^5.1.1",
-    "css-minimizer-webpack-plugin": "^2.0.0",
+    "css-minimizer-webpack-plugin": "^3.0.1",
     "cssnano": "^5.0.4",
     "del": "^6.0.0",
     "detect-port": "^1.3.0",
@@ -79,7 +79,7 @@
     "globby": "^11.0.2",
     "html-minifier-terser": "^5.1.1",
     "html-tags": "^3.1.0",
-    "html-webpack-plugin": "^5.3.1",
+    "html-webpack-plugin": "^5.3.2",
     "import-fresh": "^3.3.0",
     "is-root": "^2.1.0",
     "leven": "^3.1.0",
@@ -105,15 +105,15 @@
     "shelljs": "^0.8.4",
     "std-env": "^2.2.1",
     "strip-ansi": "^6.0.0",
-    "terser-webpack-plugin": "^5.1.2",
+    "terser-webpack-plugin": "^5.1.3",
     "tslib": "^2.2.0",
     "update-notifier": "^5.1.0",
     "url-loader": "^4.1.1",
     "wait-on": "^5.3.0",
-    "webpack": "^5.37.0",
+    "webpack": "^5.40.0",
     "webpack-bundle-analyzer": "^4.4.2",
     "webpack-dev-server": "^3.11.2",
-    "webpack-merge": "^5.7.3",
+    "webpack-merge": "^5.8.0",
     "webpackbar": "^5.0.0-3"
   },
   "peerDependencies": {
@@ -123,5 +123,5 @@
   "engines": {
     "node": ">=12.13.0"
   },
-  "gitHead": "20372a8567c378da38b3de385f7e8bc85af5f2aa"
+  "gitHead": "883f07fddffaf1657407c8e202e370cc436e25f7"
 }