@docusaurus/core 0.0.0-4630 → 0.0.0-4631

package/bin/beforeCli.mjs

@@ -61,9 +61,9 @@ export default async function beforeCli() {
       notifier.config.set('lastUpdateCheck', 0);
       notifier.check();
     }
-  } catch (e) {
+  } catch (err) {
     // Do not stop cli if this fails, see https://github.com/facebook/docusaurus/issues/5400
-    logger.error(e);
+    logger.error(err);
   }
 
   /**

package/lib/choosePort.js

@@ -55,7 +55,7 @@ function getProcessForPort(port) {
         const command = getProcessCommand(processId);
         return logger_1.default.interpolate `code=${command} subdue=${`(pid ${processId})`} in path=${directory}`;
     }
-    catch (e) {
+    catch {
         return null;
     }
 }
@@ -64,41 +64,33 @@ function getProcessForPort(port) {
  * to choose another if port is already being used
  */
 async function choosePort(host, defaultPort) {
-    return (0, detect_port_1.default)({ port: defaultPort, hostname: host }).then((port) => new Promise((resolve) => {
+    try {
+        const port = await (0, detect_port_1.default)({ port: defaultPort, hostname: host });
         if (port === defaultPort) {
-            resolve(port);
-            return;
+            return port;
         }
         const message = process.platform !== 'win32' && defaultPort < 1024 && !(0, is_root_1.default)()
             ? `Admin permissions are required to run a server on a port below 1024.`
             : `Something is already running on port ${defaultPort}.`;
-        if (isInteractive) {
-            clearConsole();
-            const existingProcess = getProcessForPort(defaultPort);
-            const question = {
-                type: 'confirm',
-                name: 'shouldChangePort',
-                message: logger_1.default.yellow(`${logger_1.default.bold('[WARNING]')} ${message}${existingProcess ? ` Probably:\n  ${existingProcess}` : ''}
-
-Would you like to run the app on another port instead?`),
-                initial: true,
-            };
-            (0, prompts_1.default)(question).then((answer) => {
-                if (answer.shouldChangePort === true) {
-                    resolve(port);
-                }
-                else {
-                    resolve(null);
-                }
-            });
-        }
-        else {
+        if (!isInteractive) {
             logger_1.default.error(message);
-            resolve(null);
+            return null;
         }
-    }), (err) => {
-        throw new Error(`Could not find an open port at ${host}.
-${`Network error message: "${err.message || err}".`}`);
-    });
+        clearConsole();
+        const existingProcess = getProcessForPort(defaultPort);
+        const { shouldChangePort } = await (0, prompts_1.default)({
+            type: 'confirm',
+            name: 'shouldChangePort',
+            message: logger_1.default.yellow(`${logger_1.default.bold('[WARNING]')} ${message}${existingProcess ? ` Probably:\n  ${existingProcess}` : ''}
+
+Would you like to run the app on another port instead?`),
+            initial: true,
+        });
+        return shouldChangePort ? port : null;
+    }
+    catch (err) {
+        logger_1.default.error `Could not find an open port at ${host}.`;
+        throw err;
+    }
 }
 exports.default = choosePort;

package/lib/client/serverEntry.js

@@ -34,16 +34,15 @@ export default async function render(locals) {
     try {
         return await doRender(locals);
     }
-    catch (e) {
-        logger.error `Docusaurus Node/SSR could not render static page with path path=${locals.path} because of following error:
-${e.stack}`;
+    catch (err) {
+        logger.error `Docusaurus server-side rendering could not render static page with path path=${locals.path}.`;
         const isNotDefinedErrorRegex = /(?:window|document|localStorage|navigator|alert|location|buffer|self) is not defined/i;
-        if (isNotDefinedErrorRegex.test(e.message)) {
+        if (isNotDefinedErrorRegex.test(err.message)) {
             logger.info `It looks like you are using code that should run on the client-side only.
 To get around it, try using code=${'<BrowserOnly>'} (path=${'https://docusaurus.io/docs/docusaurus-core/#browseronly'}) or code=${'ExecutionEnvironment'} (path=${'https://docusaurus.io/docs/docusaurus-core/#executionenvironment'}).
 It might also require to wrap your client code in code=${'useEffect'} hook and/or import a third-party library dynamically (if any).`;
         }
-        throw new Error('Server-side rendering fails due to the error above.');
+        throw err;
     }
 }
 // Renderer for static-site-generator-webpack-plugin (async rendering).
@@ -110,9 +109,8 @@ async function doRender(locals) {
             minifyJS: true,
         });
     }
-    catch (e) {
-        logger.error `Minification of page path=${locals.path} failed because of following error:
-${e.stack}`;
-        throw e;
+    catch (err) {
+        logger.error `Minification of page path=${locals.path} failed.`;
+        throw err;
     }
 }

package/lib/commands/build.js

@@ -41,9 +41,9 @@ forceTerminate = true) {
                 isLastLocale,
             });
         }
-        catch (e) {
+        catch (err) {
             logger_1.default.error `Unable to build website for locale name=${locale}.`;
-            throw e;
+            throw err;
         }
     }
     const context = await (0, server_1.loadContext)(siteDir, {

package/lib/commands/clear.js

@@ -19,9 +19,9 @@ async function removePath(entry) {
         await fs_extra_1.default.remove(entry.path);
         logger_1.default.success `Removed the ${entry.description} at path=${entry.path}.`;
     }
-    catch (e) {
-        logger_1.default.error `Could not remove the ${entry.description} at path=${entry.path}.
-${e}`;
+    catch (err) {
+        logger_1.default.error `Could not remove the ${entry.description} at path=${entry.path}.`;
+        logger_1.default.error(err);
     }
 }
 async function clear(siteDir) {

package/lib/commands/deploy.js

@@ -28,9 +28,9 @@ function shellExecLog(cmd) {
         logger_1.default.info `code=${obfuscateGitPass(cmd)} subdue=${`code: ${result.code}`}`;
         return result;
     }
-    catch (e) {
+    catch (err) {
         logger_1.default.error `code=${obfuscateGitPass(cmd)}`;
-        throw e;
+        throw err;
     }
 }
 function buildSshUrl(githubHost, organizationName, projectName, githubPort) {
@@ -169,8 +169,9 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
         try {
             await fs_extra_1.default.copy(fromPath, toPath);
         }
-        catch (error) {
-            throw new Error(`Copying build assets from "${fromPath}" to "${toPath}" failed with error "${error}".`);
+        catch (err) {
+            logger_1.default.error `Copying build assets from path=${fromPath} to path=${toPath} failed.`;
+            throw err;
         }
         shellExecLog('git add --all');
         const commitMessage = process.env.CUSTOM_COMMIT_MESSAGE ||
@@ -200,9 +201,9 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
         try {
             await runDeploy(await (0, build_1.default)(siteDir, cliOptions, false));
         }
-        catch (buildError) {
-            logger_1.default.error(buildError.message);
-            process.exit(1);
+        catch (err) {
+            logger_1.default.error('Deployment of the build output failed.');
+            throw err;
         }
     }
     else {

package/lib/commands/writeTranslations.js

@@ -25,7 +25,7 @@ async function getExtraSourceCodeFilePaths() {
         const themeCommonSourceDir = path_1.default.dirname(require.resolve('@docusaurus/theme-common/lib'));
         return (0, translationsExtractor_1.globSourceCodeFilePaths)([themeCommonSourceDir]);
     }
-    catch (e) {
+    catch {
         return []; // User may not use a Docusaurus official theme? Quite unlikely...
     }
 }

package/lib/server/brokenLinks.js

@@ -98,7 +98,7 @@ async function isExistingFile(filePath) {
     try {
         return (await fs_extra_1.default.stat(filePath)).isFile();
     }
-    catch (e) {
+    catch {
         return false;
     }
 }

package/lib/server/configValidation.js

@@ -93,7 +93,7 @@ const SiteUrlSchema = utils_validation_1.URISchema.required().custom((value, hel
             });
         }
     }
-    catch (e) { }
+    catch { }
     return value;
 }, 'siteUrlCustomValidation');
 // TODO move to @docusaurus/utils-validation

package/lib/server/translations/translations.js

@@ -35,8 +35,9 @@ async function readTranslationFileContent(filePath) {
             ensureTranslationFileContent(content);
             return content;
         }
-        catch (e) {
-            throw new Error(`Invalid translation file at ${filePath}.\n${e.message}`);
+        catch (err) {
+            logger_1.default.error `Invalid translation file at path=${filePath}.`;
+            throw err;
         }
     }
     return undefined;

package/lib/server/translations/translationsExtractor.js

@@ -103,11 +103,9 @@ async function extractSourceCodeFileTranslations(sourceCodeFilePath, babelOption
         const translations = await extractSourceCodeAstTranslations(ast, sourceCodeFilePath);
         return translations;
     }
-    catch (e) {
-        if (e instanceof Error) {
-            e.message = `Error while attempting to extract Docusaurus translations from source code file at path=${sourceCodeFilePath}\n${e.message}`;
-        }
-        throw e;
+    catch (err) {
+        logger_1.default.error `Error while attempting to extract Docusaurus translations from source code file at path=${sourceCodeFilePath}.`;
+        throw err;
     }
 }
 exports.extractSourceCodeFileTranslations = extractSourceCodeFileTranslations;

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

@@ -6,5 +6,4 @@
  */
 import type { DocusaurusPluginVersionInformation } from '@docusaurus/types';
 export declare function getPackageJsonVersion(packageJsonPath: string): Promise<string | undefined>;
-export declare function getPackageJsonName(packageJsonPath: string): Promise<string | undefined>;
 export declare function getPluginVersion(pluginPath: string, siteDir: string): Promise<DocusaurusPluginVersionInformation>;

package/lib/server/versions/index.js

@@ -6,15 +6,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPluginVersion = exports.getPackageJsonName = exports.getPackageJsonVersion = void 0;
+exports.getPluginVersion = exports.getPackageJsonVersion = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 async function getPackageJsonVersion(packageJsonPath) {
     if (await fs_extra_1.default.pathExists(packageJsonPath)) {
         // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-dynamic-require, global-require
-        const { version } = require(packageJsonPath);
-        return typeof version === 'string' ? version : undefined;
+        return require(packageJsonPath).version;
     }
     return undefined;
 }
@@ -22,12 +21,10 @@ exports.getPackageJsonVersion = getPackageJsonVersion;
 async function getPackageJsonName(packageJsonPath) {
     if (await fs_extra_1.default.pathExists(packageJsonPath)) {
         // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-dynamic-require, global-require
-        const { name } = require(packageJsonPath);
-        return typeof name === 'string' ? name : undefined;
+        return require(packageJsonPath).name;
     }
     return undefined;
 }
-exports.getPackageJsonName = getPackageJsonName;
 async function getPluginVersion(pluginPath, siteDir) {
     let potentialPluginPackageJsonDirectory = path_1.default.dirname(pluginPath);
     while (potentialPluginPackageJsonDirectory !== '/') {

package/lib/webpack/plugins/CleanWebpackPlugin.js

@@ -134,13 +134,13 @@ class CleanWebpackPlugin {
                 });
             }
         }
-        catch (error) {
-            const needsForce = /Cannot delete files\/folders outside the current working directory\./.test(error.message);
+        catch (err) {
+            const needsForce = /Cannot delete files\/folders outside the current working directory\./.test(err.message);
             if (needsForce) {
                 const message = 'clean-webpack-plugin: Cannot delete files/folders outside the current working directory. Can be overridden with the "dangerouslyAllowCleanPatternsOutsideProject" option.';
                 throw new Error(message);
             }
-            throw error;
+            throw err;
         }
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4630",
+  "version": "0.0.0-4631",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -41,13 +41,13 @@
     "@babel/runtime": "^7.17.2",
     "@babel/runtime-corejs3": "^7.17.2",
     "@babel/traverse": "^7.17.3",
-    "@docusaurus/cssnano-preset": "0.0.0-4630",
-    "@docusaurus/logger": "0.0.0-4630",
-    "@docusaurus/mdx-loader": "0.0.0-4630",
+    "@docusaurus/cssnano-preset": "0.0.0-4631",
+    "@docusaurus/logger": "0.0.0-4631",
+    "@docusaurus/mdx-loader": "0.0.0-4631",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4630",
-    "@docusaurus/utils-common": "0.0.0-4630",
-    "@docusaurus/utils-validation": "0.0.0-4630",
+    "@docusaurus/utils": "0.0.0-4631",
+    "@docusaurus/utils-common": "0.0.0-4631",
+    "@docusaurus/utils-validation": "0.0.0-4631",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.1",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.2",
@@ -105,8 +105,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4630",
-    "@docusaurus/types": "0.0.0-4630",
+    "@docusaurus/module-type-aliases": "0.0.0-4631",
+    "@docusaurus/types": "0.0.0-4631",
     "@types/detect-port": "^1.3.2",
     "@types/nprogress": "^0.2.0",
     "@types/react-dom": "^17.0.11",
@@ -126,5 +126,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "aadefa165fdcbb364fd83ca33a18b987b94c28b0"
+  "gitHead": "f280d17b332a55e34b33a59274fc584384687d47"
 }