@docusaurus/core 0.0.0-6042 → 0.0.0-6048

package/lib/commands/build.js

@@ -125,8 +125,7 @@ async function buildLocale({ siteDir, locale, cliOptions, }) {
         clientManifestPath,
         router,
     }));
-    // Remove server.bundle.js because it is not needed.
-    await utils_3.PerfLogger.async('Deleting server bundle', () => ensureUnlink(serverBundlePath));
+    await cleanupServerBundle(serverBundlePath);
     // Plugin Lifecycle - postBuild.
     await utils_3.PerfLogger.async('postBuild()', () => executePluginsPostBuild({ plugins, props, collectedData }));
     // TODO execute this in parallel to postBuild?
@@ -221,8 +220,16 @@ async function getBuildServerConfig({ props }) {
     });
     return { serverConfig: config, serverBundlePath: result.serverBundlePath };
 }
-async function ensureUnlink(filepath) {
-    if (await fs_extra_1.default.pathExists(filepath)) {
-        await fs_extra_1.default.unlink(filepath);
+// Remove /build/server server.bundle.js because it is not needed.
+async function cleanupServerBundle(serverBundlePath) {
+    if (process.env.DOCUSAURUS_KEEP_SERVER_BUNDLE === 'true') {
+        logger_1.default.warn("Will NOT delete server bundle because DOCUSAURUS_KEEP_SERVER_BUNDLE is set to 'true'");
+    }
+    else {
+        await utils_3.PerfLogger.async('Deleting server bundle', async () => {
+            // For now we assume server entry is at the root of the server out dir
+            const serverDir = path_1.default.dirname(serverBundlePath);
+            await fs_extra_1.default.rm(serverDir, { recursive: true, force: true });
+        });
     }
 }

package/lib/webpack/base.js

@@ -47,7 +47,7 @@ async function createBaseConfig({ props, isServer, minify, }) {
     const totalPages = routesPaths.length;
     const isProd = process.env.NODE_ENV === 'production';
     const minimizeEnabled = minify && isProd;
-    const fileLoaderUtils = (0, utils_1.getFileLoaderUtils)();
+    const fileLoaderUtils = (0, utils_1.getFileLoaderUtils)(isServer);
     const name = isServer ? 'server' : 'client';
     const mode = isProd ? 'production' : 'development';
     const themeAliases = await (0, aliases_1.loadThemeAliases)({ siteDir, plugins });

package/lib/webpack/server.js

@@ -22,13 +22,15 @@ async function createServerConfig(params) {
         minify: false,
     });
     const outputFilename = 'server.bundle.js';
-    const serverBundlePath = path_1.default.join(props.outDir, outputFilename);
+    const outputDir = path_1.default.join(props.outDir, '__server');
+    const serverBundlePath = path_1.default.join(outputDir, outputFilename);
     const config = (0, webpack_merge_1.default)(baseConfig, {
         target: `node${utils_1.NODE_MAJOR_VERSION}.${utils_1.NODE_MINOR_VERSION}`,
         entry: {
             main: path_1.default.resolve(__dirname, '../client/serverEntry.js'),
         },
         output: {
+            path: outputDir,
             filename: outputFilename,
             libraryTarget: 'commonjs2',
             // Workaround for Webpack 4 Bug (https://github.com/webpack/webpack/issues/6522)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-6042",
+  "version": "0.0.0-6048",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -43,12 +43,12 @@
     "@babel/runtime": "^7.22.6",
     "@babel/runtime-corejs3": "^7.22.6",
     "@babel/traverse": "^7.22.8",
-    "@docusaurus/cssnano-preset": "0.0.0-6042",
-    "@docusaurus/logger": "0.0.0-6042",
-    "@docusaurus/mdx-loader": "0.0.0-6042",
-    "@docusaurus/utils": "0.0.0-6042",
-    "@docusaurus/utils-common": "0.0.0-6042",
-    "@docusaurus/utils-validation": "0.0.0-6042",
+    "@docusaurus/cssnano-preset": "0.0.0-6048",
+    "@docusaurus/logger": "0.0.0-6048",
+    "@docusaurus/mdx-loader": "0.0.0-6048",
+    "@docusaurus/utils": "0.0.0-6048",
+    "@docusaurus/utils-common": "0.0.0-6048",
+    "@docusaurus/utils-validation": "0.0.0-6048",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",
     "babel-plugin-dynamic-import-node": "^2.3.3",
@@ -103,8 +103,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-6042",
-    "@docusaurus/types": "0.0.0-6042",
+    "@docusaurus/module-type-aliases": "0.0.0-6048",
+    "@docusaurus/types": "0.0.0-6048",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
@@ -125,5 +125,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "24f9d883f307d2d71807e3cd3db99b681388236e"
+  "gitHead": "482a5b8c84f0d0a2e834de99836937c3ccf52d4f"
 }