vike 0.4.226-commit-8f5c172 → 0.4.227

package/dist/cjs/node/cli/entry.js

@@ -62,14 +62,19 @@ async function cmdDev() {
     const startTime = performance.now();
     try {
         const { viteServer } = await (0, index_js_1.dev)();
-        await viteServer.listen();
-        const info = viteServer.config.logger.info;
-        const startupDurationString = picocolors_1.default.dim(`ready in ${picocolors_1.default.reset(picocolors_1.default.bold(String(Math.ceil(performance.now() - startTime))))} ms`);
-        const hasExistingLogs = process.stdout.bytesWritten > 0 || process.stderr.bytesWritten > 0;
-        info(`  ${picocolors_1.default.yellow(`${picocolors_1.default.bold('Vike')} v${utils_js_1.PROJECT_VERSION}`)}  ${startupDurationString}\n`, {
-            clear: !hasExistingLogs
-        });
-        viteServer.printUrls();
+        if (viteServer.httpServer) {
+            await viteServer.listen();
+            const info = viteServer.config.logger.info;
+            const startupDurationString = picocolors_1.default.dim(`ready in ${picocolors_1.default.reset(picocolors_1.default.bold(String(Math.ceil(performance.now() - startTime))))} ms`);
+            const hasExistingLogs = process.stdout.bytesWritten > 0 || process.stderr.bytesWritten > 0;
+            info(`  ${picocolors_1.default.yellow(`${picocolors_1.default.bold('Vike')} v${utils_js_1.PROJECT_VERSION}`)}  ${startupDurationString}\n`, {
+                clear: !hasExistingLogs
+            });
+            viteServer.printUrls();
+        }
+        else {
+            // vike-server => middleware mode => `viteServer.httpServer === null`
+        }
         viteServer.bindCLIShortcuts({ print: true });
     }
     catch (err) {

package/dist/cjs/node/plugin/plugins/previewConfig.js

@@ -38,20 +38,24 @@ function previewConfig() {
             config.appType = 'mpa'
             */
             return () => {
-                assertDist();
+                const prerenderConfigGlobal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(config._vikeConfigObject);
+                const { isPrerenderingEnabledForAllPages, isPrerenderingEnabled } = prerenderConfigGlobal;
+                assertDist(isPrerenderingEnabledForAllPages);
                 // We cannot re-use Vite's static middleware: https://github.com/vitejs/vite/pull/14836#issuecomment-1788540300
                 addStaticAssetsMiddleware(server.middlewares);
-                const prerenderConfigGlobal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(config._vikeConfigObject);
-                if (!prerenderConfigGlobal.isPrerenderingEnabledForAllPages) {
-                    (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares, config, true, prerenderConfigGlobal.isPrerenderingEnabled);
+                if (!isPrerenderingEnabledForAllPages) {
+                    (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares, config, true, isPrerenderingEnabled);
                 }
                 addStatic404Middleware(server.middlewares);
             };
         }
     };
-    function assertDist() {
+    function assertDist(isPrerenderingEnabledForAllPages) {
         const { outDirRoot, outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
-        [outDirRoot, outDirClient, outDirServer].forEach((outDirAny) => {
+        const dirS = [outDirRoot, outDirClient];
+        if (!isPrerenderingEnabledForAllPages)
+            dirS.push(outDirServer);
+        dirS.forEach((outDirAny) => {
             (0, utils_js_1.assertUsage)(fs_1.default.existsSync(outDirAny), `Cannot run ${picocolors_1.default.cyan('$ vike preview')}: your app isn't built (the build directory ${picocolors_1.default.cyan(outDirAny)} is missing). Make sure to run ${picocolors_1.default.cyan('$ vike build')} before running ${picocolors_1.default.cyan('$ vike preview')}.`);
         });
     }

package/dist/cjs/node/prerender/resolvePrerenderConfig.js

@@ -12,6 +12,7 @@ function resolvePrerenderConfigGlobal(vikeConfig) {
     const prerenderConfigGlobal = {
         partial: pickFirst(prerenderSettings.map((c) => c.partial)) ?? false,
         noExtraDir: pickFirst(prerenderSettings.map((c) => c.noExtraDir)) ?? false,
+        keepDistServer: pickFirst(prerenderSettings.map((c) => c.keepDistServer)) ?? false,
         parallel: pickFirst(prerenderSettings.map((c) => c.parallel)) ?? true,
         disableAutoRun: pickFirst(prerenderSettings.map((c) => c.disableAutoRun)) ?? false
     };

package/dist/cjs/node/prerender/runPrerender.js

@@ -69,6 +69,7 @@ const getOutDirs_js_1 = require("../plugin/shared/getOutDirs.js");
 const context_js_2 = require("../cli/context.js");
 const isViteCliCall_js_1 = require("../plugin/shared/isViteCliCall.js");
 const commonConfig_js_1 = require("../plugin/plugins/commonConfig.js");
+const node_fs_1 = __importDefault(require("node:fs"));
 async function runPrerenderFromAPI(options = {}) {
     return await runPrerender(options, 'prerender()');
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
@@ -116,7 +117,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig);
     const vike = (0, commonConfig_js_1.getVikeConfigPublic)(viteConfig);
     (0, utils_js_1.assert)(vike.prerenderContext.isPrerenderingEnabled);
-    const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(viteConfig);
+    const { outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(viteConfig);
     const { root } = viteConfig;
     const prerenderConfigGlobal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
     validatePrerenderConfig(prerenderConfigGlobal);
@@ -160,6 +161,9 @@ async function runPrerender(options = {}, standaloneTrigger) {
     await warnMissingPages(prerenderContext.prerenderedPageContexts, globalContext, doNotPrerenderList, partial);
     const prerenderContextPublic = makePublic(prerenderContext);
     (0, utils_js_1.objectAssign)(vike.prerenderContext, prerenderContextPublic);
+    if (prerenderConfigGlobal.isPrerenderingEnabledForAllPages && !prerenderConfigGlobal.keepDistServer) {
+        node_fs_1.default.rmSync(outDirServer, { recursive: true });
+    }
     return { viteConfig };
 }
 async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, defaultLocalValue, concurrencyLimit, globalContext) {

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.226-commit-8f5c172';
+exports.PROJECT_VERSION = '0.4.227';

package/dist/esm/node/cli/entry.js

@@ -24,14 +24,19 @@ async function cmdDev() {
     const startTime = performance.now();
     try {
         const { viteServer } = await dev();
-        await viteServer.listen();
-        const info = viteServer.config.logger.info;
-        const startupDurationString = pc.dim(`ready in ${pc.reset(pc.bold(String(Math.ceil(performance.now() - startTime))))} ms`);
-        const hasExistingLogs = process.stdout.bytesWritten > 0 || process.stderr.bytesWritten > 0;
-        info(`  ${pc.yellow(`${pc.bold('Vike')} v${PROJECT_VERSION}`)}  ${startupDurationString}\n`, {
-            clear: !hasExistingLogs
-        });
-        viteServer.printUrls();
+        if (viteServer.httpServer) {
+            await viteServer.listen();
+            const info = viteServer.config.logger.info;
+            const startupDurationString = pc.dim(`ready in ${pc.reset(pc.bold(String(Math.ceil(performance.now() - startTime))))} ms`);
+            const hasExistingLogs = process.stdout.bytesWritten > 0 || process.stderr.bytesWritten > 0;
+            info(`  ${pc.yellow(`${pc.bold('Vike')} v${PROJECT_VERSION}`)}  ${startupDurationString}\n`, {
+                clear: !hasExistingLogs
+            });
+            viteServer.printUrls();
+        }
+        else {
+            // vike-server => middleware mode => `viteServer.httpServer === null`
+        }
         viteServer.bindCLIShortcuts({ print: true });
     }
     catch (err) {

package/dist/esm/node/plugin/plugins/previewConfig.js

@@ -33,20 +33,24 @@ function previewConfig() {
             config.appType = 'mpa'
             */
             return () => {
-                assertDist();
+                const prerenderConfigGlobal = resolvePrerenderConfigGlobal(config._vikeConfigObject);
+                const { isPrerenderingEnabledForAllPages, isPrerenderingEnabled } = prerenderConfigGlobal;
+                assertDist(isPrerenderingEnabledForAllPages);
                 // We cannot re-use Vite's static middleware: https://github.com/vitejs/vite/pull/14836#issuecomment-1788540300
                 addStaticAssetsMiddleware(server.middlewares);
-                const prerenderConfigGlobal = resolvePrerenderConfigGlobal(config._vikeConfigObject);
-                if (!prerenderConfigGlobal.isPrerenderingEnabledForAllPages) {
-                    addSsrMiddleware(server.middlewares, config, true, prerenderConfigGlobal.isPrerenderingEnabled);
+                if (!isPrerenderingEnabledForAllPages) {
+                    addSsrMiddleware(server.middlewares, config, true, isPrerenderingEnabled);
                 }
                 addStatic404Middleware(server.middlewares);
             };
         }
     };
-    function assertDist() {
+    function assertDist(isPrerenderingEnabledForAllPages) {
         const { outDirRoot, outDirClient, outDirServer } = getOutDirs(config);
-        [outDirRoot, outDirClient, outDirServer].forEach((outDirAny) => {
+        const dirS = [outDirRoot, outDirClient];
+        if (!isPrerenderingEnabledForAllPages)
+            dirS.push(outDirServer);
+        dirS.forEach((outDirAny) => {
             assertUsage(fs.existsSync(outDirAny), `Cannot run ${pc.cyan('$ vike preview')}: your app isn't built (the build directory ${pc.cyan(outDirAny)} is missing). Make sure to run ${pc.cyan('$ vike build')} before running ${pc.cyan('$ vike preview')}.`);
         });
     }

package/dist/esm/node/prerender/resolvePrerenderConfig.d.ts

@@ -5,6 +5,7 @@ import type { PageConfigBuildTime } from '../../shared/page-configs/PageConfig.j
 declare function resolvePrerenderConfigGlobal(vikeConfig: VikeConfigObject): {
     partial: boolean;
     noExtraDir: boolean;
+    keepDistServer: boolean;
     parallel: number | boolean;
     disableAutoRun: boolean;
 } & {

package/dist/esm/node/prerender/resolvePrerenderConfig.js

@@ -10,6 +10,7 @@ function resolvePrerenderConfigGlobal(vikeConfig) {
     const prerenderConfigGlobal = {
         partial: pickFirst(prerenderSettings.map((c) => c.partial)) ?? false,
         noExtraDir: pickFirst(prerenderSettings.map((c) => c.noExtraDir)) ?? false,
+        keepDistServer: pickFirst(prerenderSettings.map((c) => c.keepDistServer)) ?? false,
         parallel: pickFirst(prerenderSettings.map((c) => c.parallel)) ?? true,
         disableAutoRun: pickFirst(prerenderSettings.map((c) => c.disableAutoRun)) ?? false
     };

package/dist/esm/node/prerender/runPrerender.js

@@ -31,6 +31,7 @@ import { getOutDirs } from '../plugin/shared/getOutDirs.js';
 import { isVikeCli } from '../cli/context.js';
 import { isViteCliCall } from '../plugin/shared/isViteCliCall.js';
 import { getVikeConfigPublic } from '../plugin/plugins/commonConfig.js';
+import fs from 'node:fs';
 async function runPrerenderFromAPI(options = {}) {
     return await runPrerender(options, 'prerender()');
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
@@ -78,7 +79,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
     const vikeConfig = await getVikeConfig(viteConfig);
     const vike = getVikeConfigPublic(viteConfig);
     assert(vike.prerenderContext.isPrerenderingEnabled);
-    const { outDirClient } = getOutDirs(viteConfig);
+    const { outDirClient, outDirServer } = getOutDirs(viteConfig);
     const { root } = viteConfig;
     const prerenderConfigGlobal = resolvePrerenderConfigGlobal(vikeConfig);
     validatePrerenderConfig(prerenderConfigGlobal);
@@ -122,6 +123,9 @@ async function runPrerender(options = {}, standaloneTrigger) {
     await warnMissingPages(prerenderContext.prerenderedPageContexts, globalContext, doNotPrerenderList, partial);
     const prerenderContextPublic = makePublic(prerenderContext);
     objectAssign(vike.prerenderContext, prerenderContextPublic);
+    if (prerenderConfigGlobal.isPrerenderingEnabledForAllPages && !prerenderConfigGlobal.keepDistServer) {
+        fs.rmSync(outDirServer, { recursive: true });
+    }
     return { viteConfig };
 }
 async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, defaultLocalValue, concurrencyLimit, globalContext) {

package/dist/esm/shared/page-configs/Config.d.ts

@@ -308,6 +308,16 @@ type ConfigBuiltIn = {
          * @default true
          */
         enable?: boolean | null;
+        /**
+         * If you pre-render all your pages then Vike removes the `dist/server/` directory after pre-rendering has finished.
+         *
+         * If you set this setting to `true` then Vike won't remove the `dist/server/` directory.
+         *
+         * https://vike.dev/prerender#keepDistServer
+         *
+         * @default false
+         */
+        keepDistServer?: boolean;
     };
     /**
      * Install Vike extensions.

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.226-commit-8f5c172";
+export declare const PROJECT_VERSION: "0.4.227";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.226-commit-8f5c172';
+export const PROJECT_VERSION = '0.4.227';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.226-commit-8f5c172",
+  "version": "0.4.227",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {