vike 0.4.253-commit-a8f23e5 → 0.4.253-commit-6539e7f

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

@@ -4,15 +4,15 @@ import { VikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js'
 import type { PageConfigBuildTime } from '../../types/PageConfig.js';
 declare function resolvePrerenderConfigGlobal(vikeConfig: Pick<VikeConfigInternal, 'config' | '_pageConfigs' | '_from'>): Promise<{
     partial: boolean;
-    redirects: boolean | null;
     noExtraDir: boolean | null;
-    keepDistServer: boolean;
     parallel: number | boolean;
     disableAutoRun: boolean;
 } & {
     defaultLocalValue: boolean;
-    isPrerenderingEnabledForAllPages: boolean;
     isPrerenderingEnabled: boolean;
+    isPrerenderingEnabledForAllPages: boolean;
+    redirects: boolean;
+    keepDistServer: boolean;
 }>;
 declare function resolvePrerenderConfigLocal(pageConfig: PageConfigBuildTime): Promise<{
     value: boolean;

package/dist/node/prerender/resolvePrerenderConfig.js

@@ -16,9 +16,7 @@ async function resolvePrerenderConfigGlobal(vikeConfig) {
     const prerenderSettings = prerenderConfigsResolved.filter(isObject2);
     const prerenderConfigGlobal = {
         partial: pickFirst(prerenderSettings.map((c) => c.partial)) ?? false,
-        redirects: pickFirst(prerenderSettings.map((c) => c.redirects)) ?? null,
         noExtraDir: pickFirst(prerenderSettings.map((c) => c.noExtraDir)) ?? null,
-        keepDistServer: pickFirst(prerenderSettings.map((c) => c.keepDistServer)) ?? false,
         parallel: pickFirst(prerenderSettings.map((c) => c.parallel)) ?? true,
         disableAutoRun: pickFirst(prerenderSettings.map((c) => c.disableAutoRun)) ?? false,
     };
@@ -40,10 +38,16 @@ async function resolvePrerenderConfigGlobal(vikeConfig) {
     const pageConfigs = vikeConfig._pageConfigs;
     const prerenderConfigLocalList = await Promise.all(pageConfigs.map(resolvePrerenderConfigLocal));
     const isEnable = (prerenderConfigLocal) => prerenderConfigLocal?.value ?? defaultLocalValue;
+    const isPrerenderingEnabled = pageConfigs.length > 0 && prerenderConfigLocalList.some(isEnable);
+    const isPrerenderingEnabledForAllPages = pageConfigs.length > 0 && prerenderConfigLocalList.every(isEnable);
     objectAssign(prerenderConfigGlobal, {
         defaultLocalValue,
-        isPrerenderingEnabledForAllPages: pageConfigs.length > 0 && prerenderConfigLocalList.every(isEnable),
-        isPrerenderingEnabled: pageConfigs.length > 0 && prerenderConfigLocalList.some(isEnable),
+        isPrerenderingEnabled,
+        isPrerenderingEnabledForAllPages,
+        redirects: pickFirst(prerenderSettings.map((c) => c.redirects)) ?? isPrerenderingEnabledForAllPages,
+        keepDistServer: !isPrerenderingEnabledForAllPages
+            ? true
+            : (pickFirst(prerenderSettings.map((c) => c.keepDistServer)) ?? false),
     });
     // TO-DO/next-major-release: remove
     if (vikeConfig._pageConfigs.length === 0 && defaultLocalValue)

package/dist/node/prerender/runPrerender.js

@@ -113,8 +113,7 @@ async function runPrerender(options = {}, trigger) {
     };
     await prerenderPages(prerenderContext, concurrencyLimit, onComplete);
     warnContradictoryNoPrerenderList(prerenderContext._prerenderedPageContexts, doNotPrerenderList);
-    const { redirects, isPrerenderingEnabledForAllPages } = prerenderConfigGlobal;
-    if (redirects !== null ? redirects : isPrerenderingEnabledForAllPages) {
+    if (prerenderConfigGlobal.redirects) {
         const showWarningUponDynamicRedirects = !prerenderConfigGlobal.partial;
         await prerenderRedirects(globalContext, onComplete, showWarningUponDynamicRedirects);
     }
@@ -125,7 +124,7 @@ async function runPrerender(options = {}, trigger) {
     const prerenderContextPublic = getPrerenderContextPublic(prerenderContext);
     objectAssign(vikeConfig.prerenderContext, prerenderContextPublic, true);
     setGlobalContext_prerenderContext(prerenderContextPublic);
-    if (prerenderConfigGlobal.isPrerenderingEnabledForAllPages && !prerenderConfigGlobal.keepDistServer) {
+    if (!prerenderConfigGlobal.keepDistServer) {
         fs.rmSync(outDirServer, { recursive: true });
     }
     return { viteConfig };

package/dist/node/vite/index.js

@@ -43,11 +43,13 @@ setGetClientEntrySrcDev(getClientEntrySrcDev);
 assertIsNotProductionRuntime();
 // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
 function plugin(vikeVitePluginOptions = {}) {
+    // TO-DO/next-major-release: remove
+    const pluginAddendum = { _vikeVitePluginOptions: vikeVitePluginOptions };
     const promise = (async () => {
         if (skip())
             return [];
         const vikeConfig = await getVikeConfigInternalEarly();
-        const plugins = [
+        const plugin = [
             ...pluginCommon(vikeVitePluginOptions),
             ...pluginVirtualFiles(),
             ...pluginDev(),
@@ -67,9 +69,10 @@ function plugin(vikeVitePluginOptions = {}) {
             ...pluginNonRunnabeDev(),
             ...(await pluginViteConfigVikeExtensions(vikeConfig)),
         ];
-        return plugins;
+        Object.assign(plugin, pluginAddendum);
+        return plugin;
     })();
-    Object.assign(promise, { _vikeVitePluginOptions: vikeVitePluginOptions });
+    Object.assign(promise, pluginAddendum);
     return promise;
 }
 function pluginBuild() {

package/dist/node/vite/plugins/pluginVirtualFiles/generateVirtualFileGlobalEntryWithOldDesign.js

@@ -1,5 +1,5 @@
 export { generateVirtualFileGlobalEntryWithOldDesign };
-import { assert, assertWarning } from '../../../../utils/assert.js';
+import { assert } from '../../../../utils/assert.js';
 import { isVersionMatch } from '../../../../utils/assertVersion.js';
 import { debugGlob } from '../../../../utils/debugGlob.js';
 import { scriptFileExtensionPattern } from '../../../../utils/isScriptFile.js';
@@ -9,7 +9,7 @@ import { version as viteVersion } from 'vite';
 import { fileTypes } from '../../../../shared-server-client/getPageFiles/fileTypes.js';
 import path from 'node:path';
 import { generateVirtualFileGlobalEntry } from './generateVirtualFileGlobalEntry.js';
-import { getVikeConfigInternal, isV1Design as isV1Design_ } from '../../shared/resolveVikeConfigInternal.js';
+import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
 import { isViteServerSide_extraSafe } from '../../shared/isViteServerSide.js';
 import { resolveIncludeAssetsImportedByServer } from '../../../../server/runtime/renderPageServer/getPageAssets/retrievePageAssetsProd.js';
@@ -78,8 +78,6 @@ export const neverLoaded = {};
 ${await generateVirtualFileGlobalEntry(isForClientSide, isDev, id, isClientRouting)}
 
 `;
-    // We still use import.meta.glob() when using th V1 design in order to not break the V1 design deprecation warning
-    const isV1Design = isV1Design_();
     const vikeConfig = await getVikeConfigInternal();
     // Old design => no + files => only to enable pre-rendering is setting `vike({prerender})` in vite.config.js
     const isPrerendering = !!vikeConfig.config.prerender;
@@ -94,19 +92,19 @@ ${await generateVirtualFileGlobalEntry(isForClientSide, isDev, id, isClientRouti
             isBuild,
         });
         if (includeImport) {
-            fileContent += getGlobs(globRoots, isBuild, fileType, null, isV1Design);
+            fileContent += getGlobs(globRoots, isBuild, fileType, null);
         }
         if (includeExportNames) {
-            fileContent += getGlobs(globRoots, isBuild, fileType, 'extractExportNames', isV1Design);
+            fileContent += getGlobs(globRoots, isBuild, fileType, 'extractExportNames');
         }
     });
     const includeAssetsImportedByServer = resolveIncludeAssetsImportedByServer(vikeConfig.config);
     if (includeAssetsImportedByServer && isForClientSide) {
-        fileContent += getGlobs(globRoots, isBuild, '.page.server', 'extractAssets', isV1Design);
+        fileContent += getGlobs(globRoots, isBuild, '.page.server', 'extractAssets');
     }
     return fileContent;
 }
-function getGlobs(globRoots, isBuild, fileType, query, isV1Design) {
+function getGlobs(globRoots, isBuild, fileType, query) {
     const isEager = isBuild && (query === 'extractExportNames' || fileType === '.page.route');
     let pageFilesVar;
     if (query === 'extractExportNames') {
@@ -149,19 +147,11 @@ function getGlobs(globRoots, isBuild, fileType, query, isV1Design) {
             const globOptions = { eager: isEager };
             if (query) {
                 const isNewViteInterface = isVersionMatch(viteVersion, ['5.1.0']);
-                if (isNewViteInterface &&
-                    // When used for the old design, the new syntax breaks Vike's CI (surprinsigly so). I couldn't reproduce locally (I didn't dig much).
-                    isV1Design) {
+                if (isNewViteInterface) {
                     globOptions.query = `?${query}`;
                 }
                 else {
                     globOptions.as = query;
-                    const msg = [
-                        "Update to the new V1 design to get rid of Vite's warning:",
-                        'The glob option "as" has been deprecated in favour of "query".',
-                        'See https://vike.dev/migration/v1-design for how to migrate.',
-                    ].join(' ');
-                    assertWarning(!isNewViteInterface, msg, { onlyOnce: true });
                 }
             }
             const globPaths = globExcludePath ? `[${globIncludePath}, ${globExcludePath}]` : `[${globIncludePath}]`;

package/dist/node/vite/shared/addSsrMiddleware.js

@@ -31,7 +31,7 @@ function addSsrMiddleware(middlewares, config, isPreview, isPrerenderingEnabled)
             pageContext = await renderPageServer(pageContextInit);
         }
         catch (err) {
-            // Throwing an error in a connect middleware shut downs the server
+            // Throwing an error in a connect middleware shuts down the server
             console.error(err);
             // - next(err) automatically uses buildErrorMessage() (pretty formatting of Rollup errors)
             //   - But it only works for users using Vite's standalone dev server (it doesn't work for users using Vite's dev middleware)

package/dist/server/runtime/renderPageServer/html/stream.js

@@ -78,6 +78,10 @@ async function stringToStreamReadableNode(str) {
     const { Readable } = await loadStreamNodeModule();
     return Readable.from(str);
 }
+async function streamReadableWebToStreamReadableNode(stream) {
+    const { Readable } = await loadStreamNodeModule();
+    return Readable.fromWeb(stream);
+}
 function stringToStreamReadableWeb(str) {
     // ReadableStream.from() spec discussion: https://github.com/whatwg/streams/issues/1018
     assertReadableStreamConstructor();
@@ -214,7 +218,11 @@ function pipeToStreamWritableNode(htmlRender, writable) {
         streamPipeNode(writable);
         return true;
     }
-    if (isStreamReadableWeb(htmlRender) || isStreamPipeWeb(htmlRender)) {
+    if (isStreamReadableWeb(htmlRender)) {
+        streamReadableWebToStreamReadableNode(htmlRender).then((s) => s.pipe(writable));
+        return true;
+    }
+    if (isStreamPipeWeb(htmlRender)) {
         return false;
     }
     checkType(htmlRender);

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.253-commit-a8f23e5";
+export declare const PROJECT_VERSION: "0.4.253-commit-6539e7f";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.253-commit-a8f23e5';
+export const PROJECT_VERSION = '0.4.253-commit-6539e7f';

package/dist/utils/isScriptFile.js

@@ -52,7 +52,7 @@ const extTemplates = [
     'mdx'
 ];
 const scriptFileExtensionList = [...extJsOrTs, ...extJsxOrTsx, ...extTemplates];
-const scriptFileExtensionPattern = '(' + scriptFileExtensionList.join('|') + ')';
+const scriptFileExtensionPattern = '{' + scriptFileExtensionList.join(',') + '}';
 function isScriptFile(filePath) {
     return scriptFileExtensionList.some((ext) => filePath.endsWith('.' + ext));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.253-commit-a8f23e5",
+  "version": "0.4.253-commit-6539e7f",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -121,9 +121,9 @@
     "@babel/core": "^7.28.5",
     "@babel/types": "^7.28.5",
     "@brillout/import": "^0.2.6",
-    "@brillout/json-serializer": "^0.5.21",
+    "@brillout/json-serializer": "^0.5.22",
     "@brillout/picocolors": "^1.0.30",
-    "@brillout/vite-plugin-server-entry": "^0.7.17",
+    "@brillout/vite-plugin-server-entry": "0.7.18",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",
     "esbuild": ">=0.19.0",