@docusaurus/core 0.0.0-4990 → 0.0.0-4994

package/lib/client/exports/ErrorBoundary.js

@@ -22,14 +22,10 @@ export default class ErrorBoundary extends React.Component {
         const { children } = this.props;
         const { error } = this.state;
         if (error) {
-            const fallback = this.props.fallback ?? DefaultFallback;
-            return fallback({
-                error,
-                tryAgain: () => this.setState({ error: null }),
-            });
+            const Fallback = this.props.fallback ?? DefaultFallback;
+            return (<Fallback error={error} tryAgain={() => this.setState({ error: null })}/>);
         }
-        return (children ??
-            // See https://github.com/facebook/docusaurus/issues/6337#issuecomment-1012913647
-            null);
+        // See https://github.com/facebook/docusaurus/issues/6337#issuecomment-1012913647
+        return children ?? null;
     }
 }

package/lib/commands/swizzle/actions.js

@@ -43,19 +43,17 @@ async function eject({ siteDir, themePath, componentName, }) {
         // This should never happen
         throw new Error(logger_1.default.interpolate `No files to copy from path=${fromPath} with glob code=${globPatternPosix}`);
     }
-    const toPath = isDirectory
-        ? path_1.default.join(siteDir, utils_1.THEME_PATH, componentName)
-        : path_1.default.join(siteDir, utils_1.THEME_PATH);
+    const toPath = path_1.default.join(siteDir, utils_1.THEME_PATH);
     await fs_extra_1.default.ensureDir(toPath);
     const createdFiles = await Promise.all(filesToCopy.map(async (sourceFile) => {
-        const fileName = path_1.default.basename(sourceFile);
-        const targetFile = path_1.default.join(toPath, fileName);
+        const targetFile = path_1.default.join(toPath, path_1.default.relative(themePath, sourceFile));
         try {
             const fileContents = await fs_extra_1.default.readFile(sourceFile, 'utf-8');
             await fs_extra_1.default.outputFile(targetFile, fileContents.trimStart().replace(/^\/\*.+?\*\/\s*/ms, ''));
         }
         catch (err) {
-            throw new Error(logger_1.default.interpolate `Could not copy file from path=${sourceFile} to path=${targetFile}`);
+            logger_1.default.error `Could not copy file from path=${sourceFile} to path=${targetFile}`;
+            throw err;
         }
         return targetFile;
     }));

package/lib/commands/swizzle/config.js

@@ -7,9 +7,11 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getThemeSwizzleConfig = exports.normalizeSwizzleConfig = void 0;
+const tslib_1 = require("tslib");
 const utils_validation_1 = require("@docusaurus/utils-validation");
 const common_1 = require("./common");
 const themes_1 = require("./themes");
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 function getModuleSwizzleConfig(swizzlePlugin) {
     const getSwizzleConfig = swizzlePlugin.plugin.plugin?.getSwizzleConfig ??
         swizzlePlugin.plugin.pluginModule?.module.getSwizzleConfig ??
@@ -74,8 +76,9 @@ function getThemeSwizzleConfig(themeName, plugins) {
         try {
             return normalizeSwizzleConfig(config);
         }
-        catch (e) {
-            throw new Error(`Invalid Swizzle config for theme ${themeName}.\n${e.message}`);
+        catch (err) {
+            logger_1.default.error `Invalid Swizzle config for theme name=${themeName}.`;
+            throw err;
         }
     }
     return FallbackSwizzleConfig;

package/lib/webpack/utils.js

@@ -210,16 +210,16 @@ function validateKeyAndCerts({ cert, key, keyFile, crtFile, }) {
         encrypted = crypto_1.default.publicEncrypt(cert, Buffer.from('test'));
     }
     catch (err) {
-        throw new Error(`The certificate ${crtFile} is invalid.
-${err}`);
+        logger_1.default.error `The certificate path=${crtFile} is invalid.`;
+        throw err;
     }
     try {
         // privateDecrypt will throw an error with an invalid key
         crypto_1.default.privateDecrypt(key, encrypted);
     }
     catch (err) {
-        throw new Error(`The certificate key ${keyFile} is invalid.
-${err}`);
+        logger_1.default.error `The certificate key path=${keyFile} is invalid.`;
+        throw err;
     }
 }
 // Read file and throw an error if it doesn't exist

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4990",
+  "version": "0.0.0-4994",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -41,13 +41,13 @@
     "@babel/runtime": "^7.17.9",
     "@babel/runtime-corejs3": "^7.17.9",
     "@babel/traverse": "^7.17.10",
-    "@docusaurus/cssnano-preset": "0.0.0-4990",
-    "@docusaurus/logger": "0.0.0-4990",
-    "@docusaurus/mdx-loader": "0.0.0-4990",
+    "@docusaurus/cssnano-preset": "0.0.0-4994",
+    "@docusaurus/logger": "0.0.0-4994",
+    "@docusaurus/mdx-loader": "0.0.0-4994",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4990",
-    "@docusaurus/utils-common": "0.0.0-4990",
-    "@docusaurus/utils-validation": "0.0.0-4990",
+    "@docusaurus/utils": "0.0.0-4994",
+    "@docusaurus/utils-common": "0.0.0-4994",
+    "@docusaurus/utils-validation": "0.0.0-4994",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.4",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.7",
@@ -104,8 +104,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4990",
-    "@docusaurus/types": "0.0.0-4990",
+    "@docusaurus/module-type-aliases": "0.0.0-4994",
+    "@docusaurus/types": "0.0.0-4994",
     "@types/detect-port": "^1.3.2",
     "@types/react-dom": "^18.0.3",
     "@types/react-router-config": "^5.0.6",
@@ -125,5 +125,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "712531f8bdb90ef84f88e49ebaecdb200698da0a"
+  "gitHead": "2a32b411193e88dc4c6ea4a11d1202333beb7bc2"
 }