@docusaurus/core 3.0.0-beta.0 → 3.0.0-rc.1

package/lib/client/clientEntry.js

@@ -23,8 +23,8 @@ if (ExecutionEnvironment.canUseDOM) {
         <App />
       </BrowserRouter>
     </HelmetProvider>);
-    const onRecoverableError = (error) => {
-        console.error('Docusaurus React Root onRecoverableError:', error);
+    const onRecoverableError = (error, errorInfo) => {
+        console.error('Docusaurus React Root onRecoverableError:', error, errorInfo);
     };
     const renderApp = () => {
         if (hydrate) {

package/lib/server/config.js

@@ -10,13 +10,12 @@ exports.loadSiteConfig = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const import_fresh_1 = tslib_1.__importDefault(require("import-fresh"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
 const configValidation_1 = require("./configValidation");
 async function findConfig(siteDir) {
     // We could support .mjs, .ts, etc. in the future
-    const candidates = ['.js', '.cjs'].map((ext) => utils_1.DEFAULT_CONFIG_FILE_NAME + ext);
+    const candidates = ['.ts', '.mts', '.cts', '.js', '.mjs', '.cjs'].map((ext) => utils_1.DEFAULT_CONFIG_FILE_NAME + ext);
     const configPath = await (0, utils_1.findAsyncSequential)(candidates.map((file) => path_1.default.join(siteDir, file)), fs_extra_1.default.pathExists);
     if (!configPath) {
         logger_1.default.error('No config file found.');
@@ -33,7 +32,7 @@ async function loadSiteConfig({ siteDir, customConfigFilePath, }) {
     if (!(await fs_extra_1.default.pathExists(siteConfigPath))) {
         throw new Error(`Config file at "${siteConfigPath}" not found.`);
     }
-    const importedConfig = (0, import_fresh_1.default)(siteConfigPath);
+    const importedConfig = await (0, utils_1.loadFreshModule)(siteConfigPath);
     const loadedConfig = typeof importedConfig === 'function'
         ? await importedConfig()
         : await importedConfig;

package/lib/server/plugins/configs.js

@@ -7,9 +7,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPluginConfigs = void 0;
-const tslib_1 = require("tslib");
 const module_1 = require("module");
-const import_fresh_1 = tslib_1.__importDefault(require("import-fresh"));
+const utils_1 = require("@docusaurus/utils");
 const presets_1 = require("./presets");
 const moduleShorthand_1 = require("./moduleShorthand");
 async function normalizePluginConfig(pluginConfig, configPath, pluginRequire) {
@@ -17,7 +16,7 @@ async function normalizePluginConfig(pluginConfig, configPath, pluginRequire) {
     if (typeof pluginConfig === 'string') {
         const pluginModuleImport = pluginConfig;
         const pluginPath = pluginRequire.resolve(pluginModuleImport);
-        const pluginModule = (0, import_fresh_1.default)(pluginPath);
+        const pluginModule = (await (0, utils_1.loadFreshModule)(pluginPath));
         return {
             plugin: pluginModule.default ?? pluginModule,
             options: {},
@@ -42,7 +41,7 @@ async function normalizePluginConfig(pluginConfig, configPath, pluginRequire) {
     if (typeof pluginConfig[0] === 'string') {
         const pluginModuleImport = pluginConfig[0];
         const pluginPath = pluginRequire.resolve(pluginModuleImport);
-        const pluginModule = (0, import_fresh_1.default)(pluginPath);
+        const pluginModule = (await (0, utils_1.loadFreshModule)(pluginPath));
         return {
             plugin: pluginModule.default ?? pluginModule,
             options: pluginConfig[1],

package/lib/server/plugins/presets.js

@@ -7,9 +7,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPresets = void 0;
-const tslib_1 = require("tslib");
 const module_1 = require("module");
-const import_fresh_1 = tslib_1.__importDefault(require("import-fresh"));
+const utils_1 = require("@docusaurus/utils");
 const moduleShorthand_1 = require("./moduleShorthand");
 /**
  * Calls preset functions, aggregates each of their return values, and returns
@@ -19,15 +18,10 @@ async function loadPresets(context) {
     // We need to resolve plugins from the perspective of the site config, as if
     // we are using `require.resolve` on those module names.
     const presetRequire = (0, module_1.createRequire)(context.siteConfigPath);
-    const { presets } = context.siteConfig;
-    const plugins = [];
-    const themes = [];
-    presets.forEach((presetItem) => {
+    const presets = context.siteConfig.presets.filter((p) => !!p);
+    async function loadPreset(presetItem) {
         let presetModuleImport;
         let presetOptions = {};
-        if (!presetItem) {
-            return;
-        }
         if (typeof presetItem === 'string') {
             presetModuleImport = presetItem;
         }
@@ -35,15 +29,14 @@ async function loadPresets(context) {
             [presetModuleImport, presetOptions] = presetItem;
         }
         const presetName = (0, moduleShorthand_1.resolveModuleName)(presetModuleImport, presetRequire, 'preset');
-        const presetModule = (0, import_fresh_1.default)(presetRequire.resolve(presetName));
-        const preset = (presetModule.default ?? presetModule)(context, presetOptions);
-        if (preset.plugins) {
-            plugins.push(...preset.plugins);
-        }
-        if (preset.themes) {
-            themes.push(...preset.themes);
-        }
-    });
+        const presetPath = presetRequire.resolve(presetName);
+        const presetModule = (await (0, utils_1.loadFreshModule)(presetPath));
+        const presetFunction = presetModule.default ?? presetModule;
+        return presetFunction(context, presetOptions);
+    }
+    const loadedPresets = await Promise.all(presets.map(loadPreset));
+    const plugins = loadedPresets.flatMap((preset) => preset.plugins ?? []);
+    const themes = loadedPresets.flatMap((preset) => preset.themes ?? []);
     return { plugins, themes };
 }
 exports.loadPresets = loadPresets;

package/lib/server/siteMetadata.js

@@ -10,7 +10,6 @@ exports.loadSiteMetadata = exports.getPluginVersion = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
-const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
 async function getPackageJsonVersion(packageJsonPath) {
     if (await fs_extra_1.default.pathExists(packageJsonPath)) {
@@ -60,10 +59,9 @@ function checkDocusaurusPackagesVersion(siteMetadata) {
             versionInfo.name?.startsWith('@docusaurus/') &&
             versionInfo.version &&
             versionInfo.version !== docusaurusVersion) {
-            // Should we throw instead? It still could work with different versions
-            logger_1.default.error `Invalid name=${plugin} version number=${versionInfo.version}.
+            throw new Error(`Invalid name=${plugin} version number=${versionInfo.version}.
 All official @docusaurus/* packages should have the exact same version as @docusaurus/core (number=${docusaurusVersion}).
-Maybe you want to check, or regenerate your yarn.lock or package-lock.json file?`;
+Maybe you want to check, or regenerate your yarn.lock or package-lock.json file?`);
         }
     });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "3.0.0-beta.0",
+  "version": "3.0.0-rc.1",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -43,13 +43,13 @@
     "@babel/runtime": "^7.22.6",
     "@babel/runtime-corejs3": "^7.22.6",
     "@babel/traverse": "^7.22.8",
-    "@docusaurus/cssnano-preset": "3.0.0-beta.0",
-    "@docusaurus/logger": "3.0.0-beta.0",
-    "@docusaurus/mdx-loader": "3.0.0-beta.0",
+    "@docusaurus/cssnano-preset": "3.0.0-rc.1",
+    "@docusaurus/logger": "3.0.0-rc.1",
+    "@docusaurus/mdx-loader": "3.0.0-rc.1",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "3.0.0-beta.0",
-    "@docusaurus/utils-common": "3.0.0-beta.0",
-    "@docusaurus/utils-validation": "3.0.0-beta.0",
+    "@docusaurus/utils": "3.0.0-rc.1",
+    "@docusaurus/utils-common": "3.0.0-rc.1",
+    "@docusaurus/utils-validation": "3.0.0-rc.1",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.7",
     "@svgr/webpack": "^6.5.1",
     "autoprefixer": "^10.4.14",
@@ -76,7 +76,6 @@
     "html-minifier-terser": "^7.2.0",
     "html-tags": "^3.3.1",
     "html-webpack-plugin": "^5.5.3",
-    "import-fresh": "^3.3.0",
     "leven": "^3.1.0",
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^2.7.6",
@@ -106,8 +105,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.0.0-beta.0",
-    "@docusaurus/types": "3.0.0-beta.0",
+    "@docusaurus/module-type-aliases": "3.0.0-rc.1",
+    "@docusaurus/types": "3.0.0-rc.1",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
     "@types/react-router-config": "^5.0.7",
@@ -125,7 +124,7 @@
     "react-dom": "^18.0.0"
   },
   "engines": {
-    "node": ">=16.14"
+    "node": ">=18.0"
   },
-  "gitHead": "27a1e90d9fff88af90ecad35bea16d4d7230482a"
+  "gitHead": "a51cc6fd7660d47ea08349f723cec9c017af0b4e"
 }