vike 0.4.267 → 0.4.268-commit-ca58695

package/dist/utils/getContentTypeFromUrl.js

@@ -0,0 +1,39 @@
+export { getContentTypeFromUrl };
+import { parseUrl } from './parseUrl.js';
+import { assertIsNotBrowser } from './assertIsNotBrowser.js';
+assertIsNotBrowser();
+const contentTypes = new Map(Object.entries({
+    atom: 'application/atom+xml;charset=utf-8',
+    rss: 'application/rss+xml;charset=utf-8',
+    xml: 'application/xml;charset=utf-8',
+    json: 'application/json',
+    jsonld: 'application/ld+json',
+    webmanifest: 'application/manifest+json',
+    txt: 'text/plain;charset=utf-8',
+    md: 'text/markdown;charset=utf-8',
+    csv: 'text/csv;charset=utf-8',
+    ics: 'text/calendar;charset=utf-8',
+    html: 'text/html;charset=utf-8',
+    htm: 'text/html;charset=utf-8',
+    css: 'text/css;charset=utf-8',
+    js: 'text/javascript;charset=utf-8',
+    mjs: 'text/javascript;charset=utf-8',
+    svg: 'image/svg+xml',
+    png: 'image/png',
+    jpg: 'image/jpeg',
+    jpeg: 'image/jpeg',
+    gif: 'image/gif',
+    webp: 'image/webp',
+    avif: 'image/avif',
+    ico: 'image/x-icon',
+    pdf: 'application/pdf',
+}));
+// Content-Type of the URL's file extension, or `null` if unknown, see https://vike.dev/pageContext#content
+function getContentTypeFromUrl(url) {
+    const { pathname } = parseUrl(url, '/');
+    // Last non-empty segment, see https://vike.dev/url-normalization
+    const fileName = pathname.split('/').filter(Boolean).pop() ?? '';
+    const i = fileName.lastIndexOf('.');
+    const fileExtension = i > 0 ? fileName.slice(i + 1).toLowerCase() : null;
+    return (fileExtension && contentTypes.get(fileExtension)) || null;
+}

package/dist/utils/injectRollupInputs.d.ts

@@ -1,7 +1,7 @@
 export { injectRollupInputs };
 export { normalizeRollupInput };
-import type { ResolvedConfig, Rollup } from 'vite';
+import type { Rollup } from 'vite';
 type InputOption = Rollup.InputOption;
 type InputsMap = Record<string, string>;
-declare function injectRollupInputs(inputsNew: InputsMap, config: ResolvedConfig): InputsMap;
+declare function injectRollupInputs(inputsNew: InputsMap, inputCurrent: InputOption | undefined): InputsMap;
 declare function normalizeRollupInput(input?: InputOption): InputsMap;

package/dist/utils/injectRollupInputs.js

@@ -3,8 +3,8 @@ export { normalizeRollupInput };
 import { assert } from './assert.js';
 import { isObject } from './isObject.js';
 import { isArray } from './isArray.js';
-function injectRollupInputs(inputsNew, config) {
-    const inputsCurrent = normalizeRollupInput(config.build.rollupOptions.input);
+function injectRollupInputs(inputsNew, inputCurrent) {
+    const inputsCurrent = normalizeRollupInput(inputCurrent);
     const input = {
         ...inputsNew,
         ...inputsCurrent,

package/dist/utils/installUncaughtErrorHandlers.js

@@ -13,8 +13,17 @@ function installUncaughtErrorHandlers() {
         return;
     process?.addListener?.('uncaughtException', (err) => {
         console.error(err);
+        // Writing to stdout/stderr fails if, for example, the terminal was closed — exit like Node.js does by default, otherwise the console.error() above fails again and re-triggers this handler, endlessly.
+        // Wrapping console.error() with try-catch doesn't help: it never throws, the write error is emitted later as an uncaught error.
+        // https://github.com/vikejs/vike/issues/3577
+        if (isWriteError(err))
+            process.exit(1);
     });
     process?.addListener?.('unhandledRejection', (err) => {
         console.error(err);
     });
 }
+function isWriteError(err) {
+    const { syscall, code } = (err ?? {});
+    return syscall === 'write' && (code === 'EPIPE' || code === 'EIO');
+}

package/dist/utils/isDev.js

@@ -1,15 +1,10 @@
 export { isDevCheck };
 export { applyDev };
 export { applyPreview };
-import { assertUsage } from './assert.js';
+import { assert } from './assert.js';
 function isDevCheck(configEnv) {
     const { isPreview, command } = configEnv;
-    // Note that:
-    // - `assertVersion('Vite', version, '5.1.0')` isn't enough: https://github.com/vitejs/vite/pull/19355
-    // - We'll eventually be able to make this an assert() instead of assertUsage() once Vike requires a Vite version that supports this.meta.viteVersion
-    //   - https://github.com/vitejs/vite/pull/20088
-    //   - Released at 7.0.0: https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md#700-2025-06-24
-    assertUsage(typeof isPreview === 'boolean', 'You are using an old Vite version; make sure to use Vite 5.1.0 or above.');
+    assert(typeof isPreview === 'boolean');
     return command === 'serve' && !isPreview;
 }
 function applyDev(_, env) {

package/dist/utils/parseUrl-extras.js

@@ -10,6 +10,7 @@ import { assertUrlComponents, createUrlFromComponents, isBaseServer, parseUrl }
 import { assert } from './assert.js';
 import { slice } from './slice.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
+import { getContentTypeFromUrl } from './getContentTypeFromUrl.js';
 assertIsNotBrowser();
 function prependBase(url, baseServer) {
     if (baseServer.startsWith('http')) {
@@ -61,6 +62,9 @@ function normalizeUrlPathname(urlOriginal, trailingSlash, baseServer) {
         if (urlPathnameNormalized === '/') {
             return urlPathnameNormalized;
         }
+        // A file URL such as /feed.atom doesn't get a trailing slash
+        if (getContentTypeFromUrl(urlPathnameNormalized))
+            trailingSlash = false;
         // If the Base URL has a trailing slash, then Vite (as of vite@5.0.0-beta.19) expects the root URL to also have a trailing slash, see https://github.com/vikejs/vike/issues/1258#issuecomment-1812226260
         if (baseServer.endsWith('/') && baseServer !== '/' && normalize(baseServer) === urlPathnameNormalized) {
             trailingSlash = true;

package/fetch.js

@@ -1,3 +1,3 @@
 // Some tools still need this as of January 2025
-export * from './dist/server/runtime/fetch.js'
-export { default } from './dist/server/runtime/fetch.js'
+export * from './dist/server/__internal/fetch-deprecated.js'
+export { default } from './dist/server/__internal/fetch-deprecated.js'

package/modifyUrl.js

@@ -1,3 +1,3 @@
 // Some tools still need this as of January 2025
-export * from './dist/shared/modifyUrl.js'
-export { default } from './dist/shared/modifyUrl.js'
+export * from './dist/shared-server-client/modifyUrl.js'
+export { default } from './dist/shared-server-client/modifyUrl.js'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.267",
+  "version": "0.4.268-commit-ca58695",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -87,26 +87,35 @@
       "default": "./dist/shared-server-client/modifyUrl.js"
     },
     "./universal-middleware": {
-      "types": "./dist/server/runtime/universal-middleware.d.ts",
-      "worker": "./dist/server/runtime/universal-middleware.js",
-      "workerd": "./dist/server/runtime/universal-middleware.js",
-      "node": "./dist/server/runtime/universal-middleware.js",
+      "types": "./dist/server/runtime/universal-middleware/deprecated-export.d.ts",
+      "worker": "./dist/server/runtime/universal-middleware/deprecated-export.js",
+      "workerd": "./dist/server/runtime/universal-middleware/deprecated-export.js",
+      "node": "./dist/server/runtime/universal-middleware/deprecated-export.js",
       "browser": "./dist/client/node.js",
-      "default": "./dist/server/runtime/universal-middleware.js"
+      "default": "./dist/server/runtime/universal-middleware/deprecated-export.js"
     },
     "./fetch": {
-      "types": "./dist/server/runtime/fetch.d.ts",
-      "worker": "./dist/server/runtime/fetch.js",
-      "workerd": "./dist/server/runtime/fetch.js",
-      "node": "./dist/server/runtime/fetch.js",
+      "types": "./dist/server/__internal/fetch-deprecated.d.ts",
+      "worker": "./dist/server/__internal/fetch-deprecated.js",
+      "workerd": "./dist/server/__internal/fetch-deprecated.js",
+      "node": "./dist/server/__internal/fetch-deprecated.js",
       "browser": "./dist/client/node.js",
-      "default": "./dist/server/runtime/fetch.js"
+      "default": "./dist/server/__internal/fetch-deprecated.js"
     },
     "./__internal": {
       "types": "./dist/server/__internal/index.d.ts",
       "node": "./dist/server/__internal/index.js",
       "default": "./dist/server/__internal/index.js"
     },
+    "./__internal/client": {
+      "types": "./dist/client/__internal/index.d.ts",
+      "default": "./dist/client/__internal/index.js"
+    },
+    "./__internal/fetch": {
+      "types": "./dist/server/__internal/fetch.d.ts",
+      "node": "./dist/server/__internal/fetch.js",
+      "default": "./dist/server/__internal/fetch.js"
+    },
     "./__internal/setup": {
       "types": "./dist/server/runtime/page-files/setup.d.ts",
       "node": "./dist/server/runtime/page-files/setup.js",
@@ -125,30 +134,30 @@
     "@babel/core": "^7.28.5",
     "@babel/types": "^7.28.5",
     "@brillout/import": "^0.2.6",
-    "@brillout/json-serializer": "^0.5.25",
+    "@brillout/json-serializer": "^0.5.27",
     "@brillout/picocolors": "^1.0.31",
-    "@brillout/vite-plugin-server-entry": "^0.7.21",
-    "@universal-deploy/store": "^0.2.2",
-    "@universal-deploy/vite": "^0.1.13",
-    "@universal-middleware/core": "^0.4.18",
-    "@universal-middleware/node": "^0.2.2",
+    "@brillout/vite-plugin-server-entry": "^0.7.23",
+    "@universal-deploy/store": "^0.3.0",
+    "@universal-deploy/vite": "^0.2.2",
+    "@universal-middleware/core": "^0.7.1",
+    "@universal-middleware/node": "^0.2.9",
     "cac": "^6.0.0",
-    "convert-route": "^1.1.1",
+    "convert-route": "^2.0.0",
     "es-module-lexer": "^1.0.0",
     "json5": "^2.0.0",
-    "magic-string": "^1.4.2",
+    "magic-string": "^1.4.3",
     "picomatch": "^4.0.7",
     "rolldown": ">=1.0.0",
     "semver": "^7.8.5",
     "sirv": "^3.0.2",
     "source-map-support": "^0.5.0",
     "tinyglobby": "^0.2.17",
-    "vite": ">=6.3.0",
+    "vite": ">=7.1.0",
     "vite-plugin-wrapper": "^0.1.1"
   },
   "peerDependencies": {
     "react-streaming": ">=0.3.42",
-    "vite": ">=6.3.0"
+    "vite": ">=7.1.0"
   },
   "peerDependenciesMeta": {
     "react-streaming": {
@@ -216,14 +225,20 @@
         "./dist/shared-server-client/modifyUrl.d.ts"
       ],
       "universal-middleware": [
-        "./dist/server/runtime/universal-middleware.d.ts"
+        "./dist/server/runtime/universal-middleware/deprecated-export.d.ts"
       ],
       "fetch": [
-        "./dist/server/runtime/fetch.d.ts"
+        "./dist/server/__internal/fetch-deprecated.d.ts"
       ],
       "__internal": [
         "./dist/server/__internal/index.d.ts"
       ],
+      "__internal/client": [
+        "./dist/client/__internal/index.d.ts"
+      ],
+      "__internal/fetch": [
+        "./dist/server/__internal/fetch.d.ts"
+      ],
       "__internal/setup": [
         "./dist/server/runtime/page-files/setup.d.ts"
       ]
@@ -257,17 +272,18 @@
     "./server.js",
     "./types.js",
     "./universal-middleware.js",
-    "./fetch.js"
+    "./fetch.js",
+    "./vike-server.d.ts"
   ],
   "devDependencies": {
-    "@brillout/release-me": "^0.4.18",
+    "@brillout/release-me": "^0.4.19",
     "@types/babel__core": "^7.20.5",
     "@types/estree": "^1.0.5",
     "@types/node": "^20.10.5",
     "@types/picomatch": "^4.0.3",
     "@types/semver": "^7.7.1",
     "@types/source-map-support": "^0.5.10",
-    "react-streaming": "^0.4.20",
+    "react-streaming": "^0.4.21",
     "rimraf": "^6.1.3",
     "typescript": "^7.0.2",
     "vite": "^7.2.6"

package/routing.js

@@ -1,3 +1,3 @@
 // Some tools still need this as of January 2025
-export * from './dist/shared/route/routing.js'
-export { default } from './dist/shared/route/routing.js'
+export * from './dist/shared-server-client/route/routing.js'
+export { default } from './dist/shared-server-client/route/routing.js'

package/universal-middleware.js

@@ -1,3 +1,3 @@
 // Some tools still need this as of January 2025
-export * from './dist/server/runtime/universal-middleware.js'
-export { default } from './dist/server/runtime/universal-middleware.js'
+export * from './dist/server/runtime/universal-middleware/deprecated-export.js'
+export { default } from './dist/server/runtime/universal-middleware/deprecated-export.js'

package/vike-server.d.ts

@@ -0,0 +1,14 @@
+// `import server from 'vike:server'` — https://vike.dev/serverEntry
+// Hand-written (not generated by tsc): a .ts file inside this ESM package is always a module, whereas `declare module` below needs a script.
+
+declare module 'vike:server' {
+  /**
+   * Your `+server.js` exports.
+   *
+   * https://vike.dev/serverEntry
+   */
+  const server: Record<string, unknown> & {
+    fetch: (request: Request, ...args: any[]) => Promise<Response>
+  }
+  export default server
+}

package/dist/node/vite/plugins/pluginUniversalDeploy/pluginUnwrapProdOptions.d.ts

@@ -1,4 +0,0 @@
-export { pluginUnwrapProdOptions };
-import type { Plugin } from 'vite';
-import '../../assertEnvVite.js';
-declare function pluginUnwrapProdOptions(serverFilePath: string): Plugin;

package/dist/node/vite/plugins/pluginUniversalDeploy/pluginUnwrapProdOptions.js

@@ -1,22 +0,0 @@
-export { pluginUnwrapProdOptions };
-import { wrapper } from 'vite-plugin-wrapper';
-import { escapeRegex } from '../../../../utils/escapeRegex.js';
-import '../../assertEnvVite.js';
-function pluginUnwrapProdOptions(serverFilePath) {
-    return wrapper({
-        resolveId: {
-            filter: {
-                id: new RegExp(escapeRegex(serverFilePath)),
-            },
-        },
-        // Unwrap all prod.* options
-        load(id) {
-            return `
-import mod from ${JSON.stringify(id)};
-
-export * from ${JSON.stringify(id)};
-export default { ...mod, ...mod?.prod };
-`;
-        },
-    });
-}

package/dist/server/runtime/fetch.d.ts

@@ -1,10 +0,0 @@
-import '../assertEnvServer.js';
-declare const _default: {
-    fetch: (<T extends string>(request: Request, context: Universal.Context, runtime: import("@universal-middleware/core").RuntimeAdapterTarget<T>) => Promise<Response>) & import("@universal-middleware/core").WithUniversalSymbols<{
-        name: string;
-        method: ("GET" | "HEAD" | "OPTIONS" | "PATCH" | "POST" | "PUT")[];
-        path: string;
-        immutable: true;
-    }>;
-};
-export default _default;

package/dist/server/runtime/fetch.js

@@ -1,5 +0,0 @@
-import '../assertEnvServer.js';
-import vikeHandler from './universal-middleware.js';
-export default {
-    fetch: vikeHandler,
-};

package/dist/server/runtime/universal-middleware.d.ts

@@ -1,10 +0,0 @@
-import { type RuntimeAdapterTarget } from '@universal-middleware/core';
-import '../assertEnvServer.js';
-declare function universalVikeHandler<T extends string>(request: Request, context: Universal.Context, runtime: RuntimeAdapterTarget<T>): Promise<Response>;
-declare const universalVikeHandlerEnhanced: typeof universalVikeHandler & import("@universal-middleware/core").WithUniversalSymbols<{
-    name: string;
-    method: ("GET" | "HEAD" | "OPTIONS" | "PATCH" | "POST" | "PUT")[];
-    path: string;
-    immutable: true;
-}>;
-export default universalVikeHandlerEnhanced;

package/dist/server/runtime/universal-middleware.js

@@ -1,27 +0,0 @@
-import { enhance } from '@universal-middleware/core';
-import { renderPageServer } from './renderPageServer.js';
-import '../assertEnvServer.js';
-async function universalVikeHandler(request, context, runtime) {
-    const pageContextInit = {
-        ...context,
-        ...runtime,
-        runtime,
-        urlOriginal: request.url,
-        headersOriginal: request.headers,
-        _reqWeb: request,
-    };
-    const pageContext = await renderPageServer(pageContextInit);
-    const response = pageContext.httpResponse;
-    const readable = response.getReadableWebStream();
-    return new Response(readable, {
-        status: response.statusCode,
-        headers: response.headers,
-    });
-}
-const universalVikeHandlerEnhanced = enhance(universalVikeHandler, {
-    name: 'vike',
-    method: ['GET', 'POST', 'PUT', 'PATCH', 'HEAD', 'OPTIONS'],
-    path: '/**',
-    immutable: true,
-});
-export default universalVikeHandlerEnhanced;

package/dist/shared-server-client/addIs404ToPageProps.d.ts

@@ -1,2 +0,0 @@
-export { addIs404ToPageProps };
-declare function addIs404ToPageProps(pageContext: Record<string, unknown>): void;

package/dist/shared-server-client/addIs404ToPageProps.js

@@ -1,17 +0,0 @@
-export { addIs404ToPageProps };
-import { assertWarning } from '../utils/assert.js';
-import { isObject } from '../utils/isObject.js';
-function addIs404ToPageProps(pageContext) {
-    addIs404(pageContext);
-}
-function addIs404(pageContext) {
-    if (pageContext.is404 === undefined || pageContext.is404 === null)
-        return;
-    const pageProps = pageContext.pageProps || {};
-    if (!isObject(pageProps)) {
-        assertWarning(false, 'pageContext.pageProps should be an object', { showStackTrace: true, onlyOnce: true });
-        return;
-    }
-    pageProps.is404 = pageProps.is404 || pageContext.is404;
-    pageContext.pageProps = pageProps;
-}