@docusaurus/core 3.10.1-canary-6612 → 3.10.1-canary-6615

package/lib/server/site.js

@@ -37,7 +37,7 @@ async function loadContext(params) {
     const { siteDir, outDir: baseOutDir = utils_1.DEFAULT_BUILD_DIR_NAME, locale, config: customConfigFilePath, automaticBaseUrlLocalizationDisabled, } = params;
     const generatedFilesDir = path_1.default.resolve(siteDir, utils_1.GENERATED_FILES_DIR_NAME);
     const { siteVersion, loadSiteConfig: { siteConfig: initialSiteConfig, siteConfigPath }, } = await (0, combine_promises_1.default)({
-        siteVersion: (0, siteMetadata_1.loadSiteVersion)(siteDir),
+        siteVersion: (0, siteMetadata_1.tryLoadSitePackageJson)(siteDir).then((pkg) => pkg?.version),
         loadSiteConfig: (0, config_1.loadSiteConfig)({
             siteDir,
             customConfigFilePath,

package/lib/server/siteMetadata.d.ts

@@ -5,9 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { LoadedPlugin, PluginVersionInformation, SiteMetadata } from '@docusaurus/types';
-export declare function loadSiteVersion(siteDir: string): Promise<string | undefined>;
+type PackageJson = {
+    name?: string;
+    version?: string;
+};
+export declare function tryLoadSitePackageJson(siteDir: string): Promise<PackageJson | undefined>;
 export declare function loadPluginVersion(pluginPath: string, siteDir: string): Promise<PluginVersionInformation>;
 export declare function createSiteMetadata({ siteVersion, plugins, }: {
     siteVersion: string | undefined;
     plugins: LoadedPlugin[];
 }): SiteMetadata;
+export {};

package/lib/server/siteMetadata.js

@@ -6,26 +6,28 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadSiteVersion = loadSiteVersion;
+exports.tryLoadSitePackageJson = tryLoadSitePackageJson;
 exports.loadPluginVersion = loadPluginVersion;
 exports.createSiteMetadata = createSiteMetadata;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const utils_1 = require("@docusaurus/utils");
-async function loadPackageJsonVersion(packageJsonPath) {
+async function tryLoadPackageJson(packageJsonPath) {
     if (await fs_extra_1.default.pathExists(packageJsonPath)) {
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
-        return require(packageJsonPath).version;
+        try {
+            return (await fs_extra_1.default.readJSON(packageJsonPath));
+        }
+        catch (error) {
+            throw new Error(`Couldn't load package.json file at ${packageJsonPath}`, {
+                cause: error,
+            });
+        }
     }
     return undefined;
 }
-async function loadPackageJsonName(packageJsonPath) {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    return require(packageJsonPath).name;
-}
-async function loadSiteVersion(siteDir) {
-    return loadPackageJsonVersion(path_1.default.join(siteDir, 'package.json'));
+async function tryLoadSitePackageJson(siteDir) {
+    return tryLoadPackageJson(path_1.default.join(siteDir, 'package.json'));
 }
 async function loadPluginVersion(pluginPath, siteDir) {
     let potentialPluginPackageJsonDirectory = path_1.default.dirname(pluginPath);
@@ -38,10 +40,11 @@ async function loadPluginVersion(pluginPath, siteDir) {
                 // as local plugin.
                 return { type: 'project' };
             }
+            const packageJson = await tryLoadPackageJson(packageJsonPath);
             return {
                 type: 'package',
-                name: await loadPackageJsonName(packageJsonPath),
-                version: await loadPackageJsonVersion(packageJsonPath),
+                name: packageJson?.name,
+                version: packageJson?.version,
             };
         }
         potentialPluginPackageJsonDirectory = path_1.default.dirname(potentialPluginPackageJsonDirectory);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "3.10.1-canary-6612",
+  "version": "3.10.1-canary-6615",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,13 +33,13 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "3.10.1-canary-6612",
-    "@docusaurus/bundler": "3.10.1-canary-6612",
-    "@docusaurus/logger": "3.10.1-canary-6612",
-    "@docusaurus/mdx-loader": "3.10.1-canary-6612",
-    "@docusaurus/utils": "3.10.1-canary-6612",
-    "@docusaurus/utils-common": "3.10.1-canary-6612",
-    "@docusaurus/utils-validation": "3.10.1-canary-6612",
+    "@docusaurus/babel": "3.10.1-canary-6615",
+    "@docusaurus/bundler": "3.10.1-canary-6615",
+    "@docusaurus/logger": "3.10.1-canary-6615",
+    "@docusaurus/mdx-loader": "3.10.1-canary-6615",
+    "@docusaurus/utils": "3.10.1-canary-6615",
+    "@docusaurus/utils-common": "3.10.1-canary-6615",
+    "@docusaurus/utils-validation": "3.10.1-canary-6615",
     "boxen": "^6.2.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -77,8 +77,8 @@
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.10.1-canary-6612",
-    "@docusaurus/types": "3.10.1-canary-6612",
+    "@docusaurus/module-type-aliases": "3.10.1-canary-6615",
+    "@docusaurus/types": "3.10.1-canary-6615",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^19.2.3",
@@ -104,5 +104,5 @@
   "engines": {
     "node": ">=24.14"
   },
-  "gitHead": "4d0d5252d3de5fa3ae601808796280171962535e"
+  "gitHead": "166a09a60f6faa1bb8f16ef456d1e5de2788d98d"
 }