vike 0.4.225-commit-6fc12fc → 0.4.225-commit-765fb9c

package/dist/cjs/node/api/prepareViteApiCall.js

@@ -62,9 +62,9 @@ function clear() {
 }
 async function resolveConfigs(viteConfigFromUserApiOptions, operation) {
     const viteInfo = await getViteInfo(viteConfigFromUserApiOptions, operation);
-    const { viteConfigResolved } = await assertViteRoot2(viteInfo.root, viteInfo.viteConfigFromUserEnhanced, operation);
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig2)(viteInfo.root, operation === 'dev', viteInfo.vikeVitePluginOptions);
     const viteConfigFromUserEnhanced = applyVikeViteConfig(viteInfo.viteConfigFromUserEnhanced, vikeConfig);
+    const { viteConfigResolved } = await assertViteRoot2(viteInfo.root, viteConfigFromUserEnhanced, operation);
     return {
         vikeConfig,
         viteConfigResolved, // ONLY USE if strictly necessary. (We plan to remove assertViteRoot2() as explained in the comments of that function.)

package/dist/cjs/node/api/preview.js

@@ -11,12 +11,14 @@ const getOutDirs_js_1 = require("../plugin/shared/getOutDirs.js");
 const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const node_path_1 = __importDefault(require("node:path"));
+const utils_js_2 = require("../runtime/utils.js");
 /**
  * Programmatically trigger `$ vike preview`
  *
  * https://vike.dev/api#preview
  */
 async function preview(options = {}) {
+    (0, utils_js_2.onSetupPreview)();
     const { viteConfigFromUserEnhanced, viteConfigResolved } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options, 'preview');
     if (viteConfigResolved.vitePluginServerEntry?.inject) {
         const outDir = (0, getOutDirs_js_1.getOutDirs)(viteConfigResolved).outDirRoot;

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.225-commit-6fc12fc';
+exports.PROJECT_VERSION = '0.4.225-commit-765fb9c';

package/dist/cjs/utils/assertSetup.js

@@ -7,12 +7,12 @@ exports.assertIsNotProductionRuntime = assertIsNotProductionRuntime;
 exports.onSetupRuntime = onSetupRuntime;
 exports.onSetupBuild = onSetupBuild;
 exports.onSetupPrerender = onSetupPrerender;
+exports.onSetupPreview = onSetupPreview;
 exports.setNodeEnvProduction = setNodeEnvProduction;
 exports.markSetup_viteDevServer = markSetup_viteDevServer;
 exports.markSetup_vitePreviewServer = markSetup_vitePreviewServer;
 exports.markSetup_vikeVitePlugin = markSetup_vikeVitePlugin;
 exports.markSetup_isViteDev = markSetup_isViteDev;
-exports.markSetup_isPrerendering = markSetup_isPrerendering;
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 const debug_js_1 = require("./debug.js");
@@ -34,7 +34,7 @@ function onSetupRuntime() {
     if (isTest())
         return;
     assertNodeEnvIsNotUndefinedString();
-    if (!isViteLoaded()) {
+    if (!setup.viteDevServer && setup.isViteDev === undefined) {
         // TODO: make it assertUsage() again once https://github.com/vikejs/vike/issues/1528 is implemented.
         (0, assert_js_1.assertWarning)(!isNodeEnvDev(), `The ${getEnvDescription()}, which is contradictory because the environment seems to be a production environment (Vite isn't loaded), see https://vike.dev/NODE_ENV`, { onlyOnce: true });
         (0, assert_js_1.assertUsage)(!setup.vikeVitePlugin, `Loading Vike's Vite plugin (the ${picocolors_1.default.cyan('vike/plugin')} module) is prohibited in production.`);
@@ -42,11 +42,10 @@ function onSetupRuntime() {
         (0, assert_js_1.assert)(!setup.shouldNotBeProduction);
     }
     else {
-        if (!setup.vitePreviewServer && !setup.isPrerendering) {
+        if (!setup.isPreview && !setup.vitePreviewServer && !setup.isPrerendering) {
             // TODO: make it assertUsage() again once https://github.com/vikejs/vike/issues/1528 is implemented.
             (0, assert_js_1.assertWarning)(isNodeEnvDev(), `The ${getEnvDescription()}, but Vite is loaded which is prohibited in production, see https://vike.dev/NODE_ENV`, { onlyOnce: true });
         }
-        // These two assert() calls aren't that interesting
         (0, assert_js_1.assert)(setup.vikeVitePlugin);
         (0, assert_js_1.assert)(setup.shouldNotBeProduction);
     }
@@ -63,15 +62,19 @@ function onSetupBuild() {
     setNodeEnvProduction()
     */
 }
+// Called by ../node/prerender/runPrerender.ts
 function onSetupPrerender() {
     markSetup_isPrerendering();
     if (getNodeEnv())
         assertUsageNodeEnvIsNotDev('pre-rendering');
     setNodeEnvProduction();
 }
-function isViteLoaded() {
-    // Do we need setup.viteDevServer or setup.vitePreviewServer ?
-    return setup.viteDevServer || setup.vitePreviewServer || setup.isViteDev !== undefined;
+// Called by ../node/api/preview.ts
+function onSetupPreview() {
+    markSetup_isPreview();
+    if (getNodeEnv())
+        assertUsageNodeEnvIsNotDev('pre-rendering');
+    setNodeEnvProduction();
 }
 function isTest() {
     return (0, isVitest_js_1.isVitest)() || isNodeEnv('test');
@@ -100,12 +103,16 @@ function markSetup_isViteDev(isViteDev) {
         debug('markSetup_isViteDev()', new Error().stack);
     setup.isViteDev = isViteDev;
 }
-// Called by ../node/prerender/runPrerender.ts
 function markSetup_isPrerendering() {
     if (debug.isActivated)
         debug('markSetup_isPrerendering()', new Error().stack);
     setup.isPrerendering = true;
 }
+function markSetup_isPreview() {
+    if (debug.isActivated)
+        debug('markSetup_isPreview()', new Error().stack);
+    setup.isPreview = true;
+}
 function assertUsageNodeEnvIsNotDev(operation) {
     if (!isNodeEnvDev())
         return;

package/dist/esm/node/api/prepareViteApiCall.js

@@ -24,9 +24,9 @@ function clear() {
 }
 async function resolveConfigs(viteConfigFromUserApiOptions, operation) {
     const viteInfo = await getViteInfo(viteConfigFromUserApiOptions, operation);
-    const { viteConfigResolved } = await assertViteRoot2(viteInfo.root, viteInfo.viteConfigFromUserEnhanced, operation);
     const vikeConfig = await getVikeConfig2(viteInfo.root, operation === 'dev', viteInfo.vikeVitePluginOptions);
     const viteConfigFromUserEnhanced = applyVikeViteConfig(viteInfo.viteConfigFromUserEnhanced, vikeConfig);
+    const { viteConfigResolved } = await assertViteRoot2(viteInfo.root, viteConfigFromUserEnhanced, operation);
     return {
         vikeConfig,
         viteConfigResolved, // ONLY USE if strictly necessary. (We plan to remove assertViteRoot2() as explained in the comments of that function.)

package/dist/esm/node/api/preview.js

@@ -6,12 +6,14 @@ import { getOutDirs } from '../plugin/shared/getOutDirs.js';
 import { assertWarning } from './utils.js';
 import pc from '@brillout/picocolors';
 import path from 'node:path';
+import { onSetupPreview } from '../runtime/utils.js';
 /**
  * Programmatically trigger `$ vike preview`
  *
  * https://vike.dev/api#preview
  */
 async function preview(options = {}) {
+    onSetupPreview();
     const { viteConfigFromUserEnhanced, viteConfigResolved } = await prepareViteApiCall(options, 'preview');
     if (viteConfigResolved.vitePluginServerEntry?.inject) {
         const outDir = getOutDirs(viteConfigResolved).outDirRoot;

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.225-commit-6fc12fc";
+export declare const PROJECT_VERSION: "0.4.225-commit-765fb9c";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.225-commit-6fc12fc';
+export const PROJECT_VERSION = '0.4.225-commit-765fb9c';

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

@@ -2,19 +2,19 @@ export { assertIsNotProductionRuntime };
 export { onSetupRuntime };
 export { onSetupBuild };
 export { onSetupPrerender };
+export { onSetupPreview };
 export { setNodeEnvProduction };
 export { markSetup_viteDevServer };
 export { markSetup_vitePreviewServer };
 export { markSetup_vikeVitePlugin };
 export { markSetup_isViteDev };
-export { markSetup_isPrerendering };
 declare function assertIsNotProductionRuntime(): void | undefined;
 declare function onSetupRuntime(): void | undefined;
 declare function onSetupBuild(): void;
 declare function onSetupPrerender(): void;
+declare function onSetupPreview(): void;
 declare function markSetup_viteDevServer(): void | undefined;
 declare function markSetup_vitePreviewServer(): void | undefined;
 declare function markSetup_vikeVitePlugin(): void;
 declare function markSetup_isViteDev(isViteDev: boolean): void;
-declare function markSetup_isPrerendering(): void;
 declare function setNodeEnvProduction(): void | undefined;

package/dist/esm/utils/assertSetup.js

@@ -2,12 +2,12 @@ export { assertIsNotProductionRuntime };
 export { onSetupRuntime };
 export { onSetupBuild };
 export { onSetupPrerender };
+export { onSetupPreview };
 export { setNodeEnvProduction };
 export { markSetup_viteDevServer };
 export { markSetup_vitePreviewServer };
 export { markSetup_vikeVitePlugin };
 export { markSetup_isViteDev };
-export { markSetup_isPrerendering };
 import { assert, assertUsage, assertWarning } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 import { createDebugger } from './debug.js';
@@ -29,7 +29,7 @@ function onSetupRuntime() {
     if (isTest())
         return;
     assertNodeEnvIsNotUndefinedString();
-    if (!isViteLoaded()) {
+    if (!setup.viteDevServer && setup.isViteDev === undefined) {
         // TODO: make it assertUsage() again once https://github.com/vikejs/vike/issues/1528 is implemented.
         assertWarning(!isNodeEnvDev(), `The ${getEnvDescription()}, which is contradictory because the environment seems to be a production environment (Vite isn't loaded), see https://vike.dev/NODE_ENV`, { onlyOnce: true });
         assertUsage(!setup.vikeVitePlugin, `Loading Vike's Vite plugin (the ${pc.cyan('vike/plugin')} module) is prohibited in production.`);
@@ -37,11 +37,10 @@ function onSetupRuntime() {
         assert(!setup.shouldNotBeProduction);
     }
     else {
-        if (!setup.vitePreviewServer && !setup.isPrerendering) {
+        if (!setup.isPreview && !setup.vitePreviewServer && !setup.isPrerendering) {
             // TODO: make it assertUsage() again once https://github.com/vikejs/vike/issues/1528 is implemented.
             assertWarning(isNodeEnvDev(), `The ${getEnvDescription()}, but Vite is loaded which is prohibited in production, see https://vike.dev/NODE_ENV`, { onlyOnce: true });
         }
-        // These two assert() calls aren't that interesting
         assert(setup.vikeVitePlugin);
         assert(setup.shouldNotBeProduction);
     }
@@ -58,15 +57,19 @@ function onSetupBuild() {
     setNodeEnvProduction()
     */
 }
+// Called by ../node/prerender/runPrerender.ts
 function onSetupPrerender() {
     markSetup_isPrerendering();
     if (getNodeEnv())
         assertUsageNodeEnvIsNotDev('pre-rendering');
     setNodeEnvProduction();
 }
-function isViteLoaded() {
-    // Do we need setup.viteDevServer or setup.vitePreviewServer ?
-    return setup.viteDevServer || setup.vitePreviewServer || setup.isViteDev !== undefined;
+// Called by ../node/api/preview.ts
+function onSetupPreview() {
+    markSetup_isPreview();
+    if (getNodeEnv())
+        assertUsageNodeEnvIsNotDev('pre-rendering');
+    setNodeEnvProduction();
 }
 function isTest() {
     return isVitest() || isNodeEnv('test');
@@ -95,12 +98,16 @@ function markSetup_isViteDev(isViteDev) {
         debug('markSetup_isViteDev()', new Error().stack);
     setup.isViteDev = isViteDev;
 }
-// Called by ../node/prerender/runPrerender.ts
 function markSetup_isPrerendering() {
     if (debug.isActivated)
         debug('markSetup_isPrerendering()', new Error().stack);
     setup.isPrerendering = true;
 }
+function markSetup_isPreview() {
+    if (debug.isActivated)
+        debug('markSetup_isPreview()', new Error().stack);
+    setup.isPreview = true;
+}
 function assertUsageNodeEnvIsNotDev(operation) {
     if (!isNodeEnvDev())
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.225-commit-6fc12fc",
+  "version": "0.4.225-commit-765fb9c",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {