vike 0.4.259-commit-ac2142e → 0.4.259-commit-aa6fa94

package/dist/node/vite/shared/resolveVikeConfigInternal/assertExtensions.d.ts

@@ -1,6 +1,8 @@
 export { assertExtensionsConventions };
 export { assertExtensionsRequire };
+export { getExtensionName };
 import type { PlusFile } from './getPlusFilesByLocationId.js';
 import '../../assertEnvVite.js';
 declare function assertExtensionsConventions(plusFile: PlusFile): void;
 declare function assertExtensionsRequire(plusFiles: PlusFile[]): void;
+declare function getExtensionName(plusFile: PlusFile): null | string;

package/dist/node/vite/shared/resolveVikeConfigInternal/assertExtensions.js

@@ -1,5 +1,6 @@
 export { assertExtensionsConventions };
 export { assertExtensionsRequire };
+export { getExtensionName };
 import pc from '@brillout/picocolors';
 import { PROJECT_VERSION } from '../../../../utils/PROJECT_VERSION.js';
 import { assert, assertUsage, assertWarning } from '../../../../utils/assert.js';
@@ -21,14 +22,14 @@ function assertConfigExportPath(plusFile) {
         assert(!p.includes('node_modules'));
         return;
     }
-    const name = getNameValue(plusFile);
+    const name = getExtensionName(plusFile);
     assert(name); // already asserted in assertExtensionName()
     const importPathAbsoluteExpected = `${name}/config`;
     assertWarning(importPathAbsolute === importPathAbsoluteExpected, `The Vike configuration of ${pc.bold(name)} is exported at ${pc.bold(importPathAbsolute)}, but it should be exported at ${pc.bold(importPathAbsoluteExpected)} instead.`, { onlyOnce: true });
 }
 function assertExtensionName(plusFile) {
     const filePathToShowToUser = getFilePathToShowToUser(plusFile);
-    const name = getNameValue(plusFile);
+    const name = getExtensionName(plusFile);
     assertUsage(name, `Vike extension name missing: the config ${filePathToShowToUser} must define the setting ${pc.cyan('name')}`);
 }
 function assertExtensionsRequire(plusFiles) {
@@ -36,7 +37,7 @@ function assertExtensionsRequire(plusFiles) {
     // Collect extensions
     const extensions = {};
     plusFilesRelevantList.forEach((plusFile) => {
-        const name = getNameValue(plusFile);
+        const name = getExtensionName(plusFile);
         if (name) {
             const version = getExtensionVersion(name, plusFile);
             extensions[name] = version;
@@ -47,7 +48,7 @@ function assertExtensionsRequire(plusFiles) {
         const require = resolveRequireSetting(plusFile);
         if (!require)
             return;
-        const name = getNameValue(plusFile);
+        const name = getExtensionName(plusFile);
         const filePathToShowToUser = getFilePathToShowToUser(plusFile);
         assertUsage(name, `Setting ${pc.bold('name')} is required for being able to use setting ${pc.bold('require')} in ${filePathToShowToUser}.`);
         Object.entries(require).forEach(([reqName, req]) => {
@@ -96,7 +97,7 @@ function resolveRequireSetting(plusFile) {
     });
     return requireSetting;
 }
-function getNameValue(plusFile) {
+function getExtensionName(plusFile) {
     const confVal = getConfVal(plusFile, 'name');
     if (!confVal)
         return null;

package/dist/node/vite/shared/resolveVikeConfigInternal/getPlusFilesByLocationId.js

@@ -25,21 +25,21 @@ async function getPlusFilesByLocationId(userRootDir, esbuildCache) {
             plusFilesByLocationId[locationId].push(plusFile);
             extendsConfigs.forEach((extendsConfig) => {
                 /* We purposely use the same locationId because the Vike extension's config should only apply to where it's being extended from, for example:
-              ```js
-              // /pages/admin/+config.js
+                ```js
+                // /pages/admin/+config.js
       
-              import vikeVue from 'vike-vue/config'
-              // Should only apply to /pages/admin/**
-              export default { extends: [vikeVue] }
-              ```
-              ```js
-              // /pages/marketing/+config.js
+                import vikeVue from 'vike-vue/config'
+                // Should only apply to /pages/admin/**
+                export default { extends: [vikeVue] }
+                ```
+                ```js
+                // /pages/marketing/+config.js
       
-              import vikeReact from 'vike-react/config'
-              // Should only apply to /pages/marketing/**
-              export default { extends: [vikeReact] }
-              ```
-              */
+                import vikeReact from 'vike-react/config'
+                // Should only apply to /pages/marketing/**
+                export default { extends: [vikeReact] }
+                ```
+                */
                 const plusFile = getPlusFileFromConfigFile(extendsConfig, true, locationId, userRootDir);
                 assertExtensionsConventions(plusFile);
                 plusFilesByLocationId[locationId].push(plusFile);

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

@@ -45,6 +45,7 @@ import { getConfigValueBuildTime } from '../../../shared-server-client/page-conf
 import { resolveGlobalConfigPublic, } from '../../../shared-server-client/page-configs/resolveVikeConfigPublic.js';
 import { getConfigValuesBase, isJsonValue, } from '../../../shared-server-client/page-configs/serialize/serializeConfigValues.js';
 import { getPlusFilesByLocationId, } from './resolveVikeConfigInternal/getPlusFilesByLocationId.js';
+import { getExtensionName } from './resolveVikeConfigInternal/assertExtensions.js';
 import { getEnvVarObject } from './getEnvVarObject.js';
 import { getVikeApiOperation } from '../../../shared-server-node/api-context.js';
 import { getCliOptions } from '../../cli/context.js';
@@ -649,9 +650,10 @@ function sortPlusFilesSameLocationId(plusFile1, plusFile2, configName) {
     return 0;
 }
 function resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, isGlobal, plusFilesByLocationId) {
-    let sources = plusFilesRelevant
-        .filter((plusFile) => isDefiningConfig(plusFile, configName))
-        .flatMap((plusFile) => getConfigValueSources(configName, plusFile, configDef, userRootDir));
+    let plusFilesConfig = plusFilesRelevant.filter((plusFile) => isDefiningConfig(plusFile, configName));
+    // Make Vike extension installation idempotent. (Don't cumulate configs twice of an extension installed twice.) Since `plusFilesRelevant` is ordered by inheritance the occurrence closest to the page's locationId is the one kept.
+    plusFilesConfig = dedupeExtensions(plusFilesConfig);
+    let sources = plusFilesConfig.flatMap((plusFile) => getConfigValueSources(configName, plusFile, configDef, userRootDir));
     // Filter hydrid global-local configs
     if (!isCallable(configDef.global)) {
         // Already filtered
@@ -672,6 +674,20 @@ function resolveConfigValueSources(configName, configDef, plusFilesRelevant, use
 function isDefiningConfig(plusFile, configName) {
     return getConfigNamesSetByPlusFile(plusFile).includes(configName);
 }
+function dedupeExtensions(plusFiles) {
+    const seen = new Set();
+    return plusFiles.filter((plusFile) => {
+        if (!plusFile.isConfigFile || !plusFile.isExtensionConfig)
+            return true;
+        const name = getExtensionName(plusFile);
+        // The extension's `name` is guaranteed by assertExtensionsConventions()
+        assert(name);
+        if (seen.has(name))
+            return false;
+        seen.add(name);
+        return true;
+    });
+}
 function getConfigValueSources(configName, plusFile, configDef, userRootDir) {
     const confVal = getConfVal(plusFile, configName);
     assert(confVal);

package/dist/server/runtime/renderPageServer.js

@@ -319,7 +319,9 @@ function logHttpResponse(urlOriginalPretty, pageContextReturn) {
                 const headerRedirect = pageContextReturn.httpResponse.headers
                     .slice()
                     .reverse()
-                    .find((header) => header[0] === 'Location');
+                    // Case-insensitive: a redirect returned by a +middleware comes from a Web Response whose
+                    // Headers object lower-cases header names (`location`), while Vike's own redirect() uses `Location`.
+                    .find((header) => header[0].toLowerCase() === 'location');
                 assert(headerRedirect);
                 const urlRedirect = headerRedirect[1];
                 urlOriginalPretty = urlRedirect;

package/dist/types/Config.d.ts

@@ -50,6 +50,7 @@ import type { CliPreviewConfig } from '../node/api/preview.js';
 import type { StaticReplace } from '../node/vite/plugins/pluginStaticReplace/applyStaticReplace.js';
 import type { ImportStringList } from '../node/vite/shared/importString.js';
 import type { HookPublic } from '../shared-server-client/hooks/execHook.js';
+import type { EnhancedMiddleware } from '@universal-middleware/core';
 type HookNameOld = HookName | HookNameOldDesign;
 type HookName = HookNamePage | HookNameGlobal;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data' | 'onData' | 'route';
@@ -526,8 +527,16 @@ type ConfigBuiltIn = {
      * https://vike.dev/keepScrollPosition
      */
     keepScrollPosition?: KeepScrollPosition;
-    /** @experimental */
-    middleware?: Function;
+    /**
+     * @experimental
+     *
+     * Add server middlewares.
+     *
+     * The middlewares defined via `+middleware` are so called "Universal Middleware" — they work with any JavaScript server (Hono, Express, Cloudflare, ...).
+     *
+     * https://github.com/magne4000/universal-middleware
+     */
+    middleware?: EnhancedMiddleware | EnhancedMiddleware[];
     /**
      * Set to `false` to disable Vike's automatic server integration mechanism (e.g. for integrating a JavaScript server manually via `renderPage()`).
      *
@@ -661,7 +670,7 @@ type ConfigBuiltInResolved = {
     passToClient?: string[][];
     redirects?: Record<string, string>[];
     prerender?: Exclude<Config['prerender'], ImportStringList | undefined>[];
-    middleware?: Function[];
+    middleware?: (EnhancedMiddleware | EnhancedMiddleware[])[];
     headersResponse?: Exclude<Config['headersResponse'], ImportStringList | undefined>[];
     staticReplace?: StaticReplace[][];
 };

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.259-commit-ac2142e";
+export declare const PROJECT_VERSION: "0.4.259-commit-aa6fa94";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.259-commit-ac2142e';
+export const PROJECT_VERSION = '0.4.259-commit-aa6fa94';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.259-commit-ac2142e",
+  "version": "0.4.259-commit-aa6fa94",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {