vike 0.4.247-commit-a642bde → 0.4.247-commit-14351e3

package/dist/utils/requireResolve.js

@@ -0,0 +1,208 @@
+export { requireResolveOptional };
+export { requireResolveOptionalDir };
+export { requireResolveNpmPackage };
+export { requireResolveDistFile };
+export { getPackageNodeModulesDirectory };
+import { assert } from './assert.js';
+import { assertIsNotBrowser } from './assertIsNotBrowser.js';
+import { assertIsNotProductionRuntime } from './assertSetup.js';
+import { assertPosixPath, toPosixPath } from './path.js';
+import { scriptFileExtensionList } from './isScriptFile.js';
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import { assertIsImportPathNpmPackage, isImportPathNpmPackageOrPathAlias } from './parseNpmPackage.js';
+import { isNotNullish } from './isNullish.js';
+import { createDebug } from './debug.js';
+const importMetaUrl = import.meta.url;
+assertPosixPath(importMetaUrl);
+assertIsNotBrowser();
+assertIsNotProductionRuntime();
+const debug = createDebug('vike:requireResolve');
+// - We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
+//   - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
+// - Passing context to createRequire(context) isn't equivalent to passing it to the `paths` argument of require.resolve()
+//   - https://github.com/brillout/require-test
+//   - In practice, I guess it doesn't make a difference? It just seems to be small Node.js weirdness.
+// - The argument createRequire(argument) seems to be overridden by the `paths` argument require.resolve()
+//   - For example, passing an empty array to `paths` kills the argument passed to `createRequire()`
+//   - Thus, when `paths` is defined, then the context needs to be passed to both createRequire() as well as the `paths` argument of require.resolve()
+function requireResolve_(importPath, importerFilePath, userRootDir, doNotHandleFileExtension = false) {
+    assertPosixPath(importPath);
+    const contexts = importerFilePath
+        ? [importerFilePath]
+        : [userRootDir ? getFakeImporterFile(userRootDir) : importMetaUrl];
+    addExtraContextForNpmPackageImport(contexts, importPath, userRootDir);
+    let importPathResolvedFilePath;
+    let failure;
+    for (const context of contexts) {
+        assertPosixPath(context);
+        const contextNode = makeNodeFriendly(ensureFilePrefix(context));
+        let importPathNode = makeNodeFriendly(importPath);
+        const require_ = createRequire(contextNode);
+        if (!doNotHandleFileExtension) {
+            addFileExtensionsToRequireResolve(require_);
+            importPathNode = removeFileExtension(importPathNode);
+        }
+        try {
+            importPathResolvedFilePath = require_.resolve(importPathNode);
+        }
+        catch (err) {
+            if (debug.isActivated) {
+                const stack = new Error().stack;
+                debug('ERROR', { err, importPath, context }, stack);
+            }
+            failure ?? (failure = { err });
+        }
+        if (importPathResolvedFilePath)
+            break;
+    }
+    if (!importPathResolvedFilePath) {
+        assert(failure);
+        if (debug.isActivated) {
+            debug('FAILURE', {
+                importPath,
+                importerFilePath,
+                userRootDir,
+                doNotHandleFileExtension,
+                importMetaUrl,
+                contexts,
+            });
+        }
+        return { importPathResolvedFilePath: undefined, err: failure.err, hasFailed: true };
+    }
+    else {
+        if (failure && debug.isActivated) {
+            debug('SUCCESS', {
+                importPath,
+                contexts,
+            });
+        }
+        assert(importPathResolvedFilePath);
+        importPathResolvedFilePath = toPosixPath(importPathResolvedFilePath);
+        return { importPathResolvedFilePath, err: undefined, hasFailed: false };
+    }
+}
+function requireResolveOptional({ importPath, importerFilePath, userRootDir, }) {
+    const res = requireResolve_(importPath, importerFilePath, userRootDir);
+    if (res.hasFailed)
+        return null;
+    return res.importPathResolvedFilePath;
+}
+function requireResolveOptionalDir({ importPath, importerDir, userRootDir, }) {
+    const importerFilePath = getFakeImporterFile(importerDir);
+    const res = requireResolve_(importPath, importerFilePath, userRootDir);
+    if (res.hasFailed)
+        return null;
+    return res.importPathResolvedFilePath;
+}
+function requireResolveNpmPackage({ importPathNpmPackage, userRootDir, }) {
+    assertIsImportPathNpmPackage(importPathNpmPackage);
+    const importerFilePath = getFakeImporterFile(userRootDir);
+    const res = requireResolve_(importPathNpmPackage, importerFilePath, userRootDir);
+    if (res.hasFailed)
+        throw res.err;
+    return res.importPathResolvedFilePath;
+}
+function requireResolveDistFile(distFile) {
+    const packageNodeModulesDirectory = getPackageNodeModulesDirectory();
+    assertPosixPath(packageNodeModulesDirectory);
+    assertPosixPath(distFile);
+    const importPathResolvedFilePath = makeNodeFriendly(path.posix.join(packageNodeModulesDirectory, distFile));
+    // Double check
+    {
+        const res = requireResolve_(importPathResolvedFilePath, 
+        // No context needed: importPathResolvedFilePath is already resolved and absolute
+        null, null, true);
+        if (res.hasFailed)
+            throw res.err;
+        assert(res.importPathResolvedFilePath === importPathResolvedFilePath);
+    }
+    return importPathResolvedFilePath;
+}
+function addExtraContextForNpmPackageImport(contexts, importPath, userRootDir) {
+    // We should add extra context only for npm packages, but unfortunately we cannot always disambiguate between npm package imports and path aliases.
+    if (!isImportPathNpmPackageOrPathAlias(importPath))
+        return;
+    const userRootDirFakeFile = userRootDir && getFakeImporterFile(userRootDir);
+    [
+        // Workaround for monorepo resolve issue: https://github.com/vikejs/vike-react/pull/161/commits/dbaa6643e78015ac2797c237552800fef29b72a7
+        userRootDirFakeFile,
+        // I can't think of a use case where this would be needed, but let's add one extra last chance to successfully resolve some complex monorepo setups
+        importMetaUrl,
+    ]
+        .filter(isNotNullish)
+        .forEach((context) => {
+        const alreadyHasContext = contexts.includes(context) || contexts.includes(ensureFilePrefix(context));
+        if (alreadyHasContext)
+            return;
+        contexts.push(context);
+    });
+}
+function removeFileExtension(importPath) {
+    // Skip for Bun: https://github.com/vikejs/vike/issues/2204
+    //@ts-ignore
+    if (typeof Bun !== 'undefined') {
+        // https://bun.sh/guides/util/detect-bun
+        assert(process.versions.bun);
+        return importPath;
+    }
+    for (const ext of scriptFileExtensionList) {
+        const suffix = `.${ext}`;
+        if (importPath.endsWith(suffix)) {
+            return importPath.slice(0, -1 * suffix.length);
+        }
+    }
+    return importPath;
+}
+function addFileExtensionsToRequireResolve(require_) {
+    const added = [];
+    scriptFileExtensionList.forEach((ext) => {
+        assert(!ext.includes('.'));
+        ext = `.${ext}`;
+        if (!require_.extensions[ext]) {
+            require_.extensions[ext] = require_.extensions['.js'];
+            added.push(ext);
+        }
+    });
+}
+function getPackageNodeModulesDirectory() {
+    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/${packageName}/dist/utils/requireResolve.js
+    assert(importMetaUrl.includes('/dist/utils/'));
+    const packageNodeModulesDirectory = path.posix.join(removeFilePrefix(path.dirname(importMetaUrl)), '../../');
+    // Return `node_modules/${packageName}/`
+    return packageNodeModulesDirectory;
+}
+function getFakeImporterFile(dirPath) {
+    assertPosixPath(dirPath);
+    assert(!dirPath.startsWith('file')); // The file:// prefix is bogus when used with path.posix.join()
+    const importerFilePath = path.posix.join(dirPath, 'fakeFileForNodeResolve.js');
+    return importerFilePath;
+}
+function ensureFilePrefix(filePath) {
+    assertPosixPath(filePath);
+    const filePrefix = getFilePrefix();
+    if (!filePath.startsWith(filePrefix)) {
+        assert(!filePath.startsWith('file'));
+        filePath = filePrefix + filePath;
+    }
+    assert(filePath.startsWith(filePrefix));
+    return filePath;
+}
+function removeFilePrefix(filePath) {
+    const filePrefix = getFilePrefix();
+    if (filePath.startsWith(filePrefix)) {
+        filePath = filePath.slice(filePrefix.length);
+    }
+    assert(!filePath.startsWith('file'));
+    return filePath;
+}
+function getFilePrefix() {
+    let prefix = 'file://';
+    if (process.platform === 'win32')
+        prefix += '/';
+    return prefix;
+}
+function makeNodeFriendly(filePath) {
+    // https://github.com/vikejs/vike/issues/2436#issuecomment-2849145340
+    return decodeURIComponent(filePath);
+}

package/dist/utils/trackLogs.js

@@ -0,0 +1,26 @@
+import { isDebug } from './debug.js';
+import pc from '@brillout/picocolors';
+import { assertIsNotBrowser } from './assertIsNotBrowser.js';
+assertIsNotBrowser();
+if (isDebug('vike:log')) {
+    trackLogs();
+}
+// https://stackoverflow.com/questions/45395369/how-to-get-console-log-line-numbers-shown-in-nodejs/75109905#75109905
+function trackLogs() {
+    const logOriginal = process.stdout.write;
+    // @ts-ignore
+    const log = (msg) => logOriginal.call(process.stdout, msg + '\n');
+    ['stdout', 'stderr'].forEach((stdName) => {
+        // @ts-ignore
+        var methodOriginal = process[stdName].write;
+        // @ts-ignore
+        process[stdName].write = function (...args) {
+            log(pc.bold(pc.blue('*** LOG ***')));
+            // @ts-ignore
+            methodOriginal.apply(process[stdName], args);
+            // @ts-ignore
+            log(new Error().stack.replace(/^Error(\:|)/, pc.magenta('*** LOG ORIGIN ***')));
+        };
+    });
+    Error.stackTraceLimit = Infinity;
+}

package/dist/utils/trimWithAnsi.js

@@ -0,0 +1,38 @@
+export { trimWithAnsi };
+export { trimWithAnsiTrailOnly };
+import { assert } from './assert.js';
+import { stripAnsi } from './colors.js';
+const whitespaceRegex = /(\s+)/; // Capturing parathesis so that split preserves separator
+/* Same as trim() but works with ANSI escape codes */
+function trimWithAnsi(str) {
+    str = trimWithAnsiHead(str);
+    str = trimWithAnsiTrailOnly(str);
+    return str;
+}
+function trimWithAnsiHead(str) {
+    return trim(str, false);
+}
+function trimWithAnsiTrailOnly(str) {
+    return trim(str, true);
+}
+function trim(str, trail) {
+    let parts = str.split(whitespaceRegex);
+    if (trail)
+        parts.reverse();
+    let visible = false;
+    parts = parts.map((line) => {
+        if (visible)
+            return line;
+        const lineTrimmed = line.trim();
+        const lineTrimmedAndStripped = stripAnsi(lineTrimmed);
+        assert(lineTrimmedAndStripped.trim() === lineTrimmedAndStripped);
+        if (lineTrimmedAndStripped !== '')
+            visible = true;
+        return lineTrimmed;
+    });
+    if (trail)
+        parts.reverse();
+    assert(str.split(whitespaceRegex).join('') === str);
+    const strTrimmed = parts.join('');
+    return strTrimmed;
+}

package/getPageContext.js

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

package/modifyUrl.js

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

package/node/cli/bin.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-import '../../dist/esm/node/cli/entry.js'
+import '../../dist/node/cli/entry.js'

package/package.json

@@ -1,116 +1,116 @@
 {
   "name": "vike",
-  "version": "0.4.247-commit-a642bde",
+  "version": "0.4.247-commit-14351e3",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
-      "worker": "./dist/esm/node/runtime/index.js",
-      "workerd": "./dist/esm/node/runtime/index.js",
-      "node": "./dist/esm/node/runtime/index.js",
-      "browser": "./dist/esm/client/node.js",
-      "types": "./dist/esm/node/runtime/index.d.ts",
-      "default": "./dist/esm/node/runtime/index.js"
+      "worker": "./dist/server/runtime/index.js",
+      "workerd": "./dist/server/runtime/index.js",
+      "node": "./dist/server/runtime/index.js",
+      "browser": "./dist/client/node.js",
+      "types": "./dist/server/runtime/index.d.ts",
+      "default": "./dist/server/runtime/index.js"
     },
     "./client": {
-      "types": "./dist/esm/client/runtime-server-routing/index.d.ts"
+      "types": "./dist/client/runtime-server-routing/index.d.ts"
     },
     "./types": {
-      "types": "./dist/esm/types/index.d.ts",
-      "default": "./dist/esm/types/index.js"
+      "types": "./dist/types/index.d.ts",
+      "default": "./dist/types/index.js"
     },
     "./client/router": {
-      "worker": "./dist/esm/node/client/router.js",
-      "workerd": "./dist/esm/node/client/router.js",
-      "node": "./dist/esm/node/client/router.js",
-      "browser": "./dist/esm/client/runtime-client-routing/index.js",
-      "types": "./dist/esm/client/runtime-client-routing/index.d.ts",
-      "default": "./dist/esm/client/runtime-client-routing/index.js"
+      "worker": "./dist/server/client/router.js",
+      "workerd": "./dist/server/client/router.js",
+      "node": "./dist/server/client/router.js",
+      "browser": "./dist/client/runtime-client-routing/index.js",
+      "types": "./dist/client/runtime-client-routing/index.d.ts",
+      "default": "./dist/client/runtime-client-routing/index.js"
     },
     "./routing": {
-      "worker": "./dist/esm/shared/route/routing.js",
-      "workerd": "./dist/esm/shared/route/routing.js",
-      "node": "./dist/esm/shared/route/routing.js",
-      "browser": "./dist/esm/shared/route/routing.js",
-      "types": "./dist/esm/shared/route/routing.d.ts",
-      "default": "./dist/esm/shared/route/routing.js"
+      "worker": "./dist/shared-server-client/route/routing.js",
+      "workerd": "./dist/shared-server-client/route/routing.js",
+      "node": "./dist/shared-server-client/route/routing.js",
+      "browser": "./dist/shared-server-client/route/routing.js",
+      "types": "./dist/shared-server-client/route/routing.d.ts",
+      "default": "./dist/shared-server-client/route/routing.js"
     },
     "./cli": {
-      "node": "./dist/esm/node/cli/index.js",
-      "types": "./dist/esm/node/cli/index.d.ts",
-      "default": "./dist/esm/node/cli/index.js"
+      "node": "./dist/node/cli/index.js",
+      "types": "./dist/node/cli/index.d.ts",
+      "default": "./dist/node/cli/index.js"
     },
     "./api": {
-      "node": "./dist/esm/node/api/index.js",
-      "types": "./dist/esm/node/api/index.d.ts",
-      "default": "./dist/esm/node/api/index.js"
+      "node": "./dist/node/api/index.js",
+      "types": "./dist/node/api/index.d.ts",
+      "default": "./dist/node/api/index.js"
     },
     "./prerender": {
-      "node": "./dist/esm/node/prerender/index.js",
-      "types": "./dist/esm/node/prerender/index.d.ts",
-      "default": "./dist/esm/node/prerender/index.js"
+      "node": "./dist/node/prerender/index.js",
+      "types": "./dist/node/prerender/index.d.ts",
+      "default": "./dist/node/prerender/index.js"
     },
     "./plugin": {
-      "node": "./dist/esm/node/vite/index.js",
-      "types": "./dist/esm/node/vite/index.d.ts",
-      "default": "./dist/esm/node/vite/index.js"
+      "node": "./dist/node/vite/index.js",
+      "types": "./dist/node/vite/index.d.ts",
+      "default": "./dist/node/vite/index.js"
     },
     "./RenderErrorPage": {
-      "worker": "./dist/esm/shared/RenderErrorPage.js",
-      "workerd": "./dist/esm/shared/RenderErrorPage.js",
-      "node": "./dist/esm/shared/RenderErrorPage.js",
-      "browser": "./dist/esm/shared/RenderErrorPage.js",
-      "types": "./dist/esm/shared/RenderErrorPage.d.ts",
-      "default": "./dist/esm/shared/RenderErrorPage.js"
+      "worker": "./dist/shared-server-client/RenderErrorPage.js",
+      "workerd": "./dist/shared-server-client/RenderErrorPage.js",
+      "node": "./dist/shared-server-client/RenderErrorPage.js",
+      "browser": "./dist/shared-server-client/RenderErrorPage.js",
+      "types": "./dist/shared-server-client/RenderErrorPage.d.ts",
+      "default": "./dist/shared-server-client/RenderErrorPage.js"
     },
     "./abort": {
-      "worker": "./dist/esm/shared/abort.js",
-      "workerd": "./dist/esm/shared/abort.js",
-      "node": "./dist/esm/shared/abort.js",
-      "browser": "./dist/esm/shared/abort.js",
-      "types": "./dist/esm/shared/abort.d.ts",
-      "default": "./dist/esm/shared/abort.js"
+      "worker": "./dist/shared-server-client/abort.js",
+      "workerd": "./dist/shared-server-client/abort.js",
+      "node": "./dist/shared-server-client/abort.js",
+      "browser": "./dist/shared-server-client/abort.js",
+      "types": "./dist/shared-server-client/abort.d.ts",
+      "default": "./dist/shared-server-client/abort.js"
     },
     "./getPageContext": {
-      "worker": "./dist/esm/shared/getPageContext.js",
-      "workerd": "./dist/esm/shared/getPageContext.js",
-      "node": "./dist/esm/shared/getPageContext.js",
-      "browser": "./dist/esm/shared/getPageContext.js",
-      "types": "./dist/esm/shared/getPageContext.d.ts",
-      "default": "./dist/esm/shared/getPageContext.js"
+      "worker": "./dist/server/runtime/getPageContext.js",
+      "workerd": "./dist/server/runtime/getPageContext.js",
+      "node": "./dist/server/runtime/getPageContext.js",
+      "browser": "./dist/client/runtime-client-routing/getPageContext.js",
+      "types": "./dist/server/runtime/getPageContext.d.ts",
+      "default": "./dist/server/runtime/getPageContext.js"
     },
     "./modifyUrl": {
-      "worker": "./dist/esm/shared/modifyUrl.js",
-      "workerd": "./dist/esm/shared/modifyUrl.js",
-      "node": "./dist/esm/shared/modifyUrl.js",
-      "browser": "./dist/esm/shared/modifyUrl.js",
-      "types": "./dist/esm/shared/modifyUrl.d.ts",
-      "default": "./dist/esm/shared/modifyUrl.js"
+      "worker": "./dist/shared-server-client/modifyUrl.js",
+      "workerd": "./dist/shared-server-client/modifyUrl.js",
+      "node": "./dist/shared-server-client/modifyUrl.js",
+      "browser": "./dist/shared-server-client/modifyUrl.js",
+      "types": "./dist/shared-server-client/modifyUrl.d.ts",
+      "default": "./dist/shared-server-client/modifyUrl.js"
     },
     "./universal-middleware": {
-      "worker": "./dist/esm/node/runtime/universal-middleware.js",
-      "workerd": "./dist/esm/node/runtime/universal-middleware.js",
-      "node": "./dist/esm/node/runtime/universal-middleware.js",
-      "browser": "./dist/esm/client/node.js",
-      "types": "./dist/esm/node/runtime/universal-middleware.d.ts",
-      "default": "./dist/esm/node/runtime/universal-middleware.js"
+      "worker": "./dist/server/runtime/universal-middleware.js",
+      "workerd": "./dist/server/runtime/universal-middleware.js",
+      "node": "./dist/server/runtime/universal-middleware.js",
+      "browser": "./dist/client/node.js",
+      "types": "./dist/server/runtime/universal-middleware.d.ts",
+      "default": "./dist/server/runtime/universal-middleware.js"
     },
     "./__internal": {
-      "node": "./dist/esm/__internal/index.js",
-      "types": "./dist/esm/__internal/index.d.ts",
-      "default": "./dist/esm/__internal/index.js"
+      "node": "./dist/server/__internal/index.js",
+      "types": "./dist/server/__internal/index.d.ts",
+      "default": "./dist/server/__internal/index.js"
     },
     "./__internal/setup": {
-      "node": "./dist/esm/node/runtime/page-files/setup.js",
-      "types": "./dist/esm/node/runtime/page-files/setup.d.ts",
-      "default": "./dist/esm/node/runtime/page-files/setup.js"
+      "node": "./dist/server/runtime/page-files/setup.js",
+      "types": "./dist/server/runtime/page-files/setup.d.ts",
+      "default": "./dist/server/runtime/page-files/setup.js"
     },
     ".": {
-      "worker": "./dist/esm/node/runtime/index.js",
-      "workerd": "./dist/esm/node/runtime/index.js",
-      "node": "./dist/esm/node/runtime/index.js",
-      "browser": "./dist/esm/client/index.js",
-      "types": "./dist/esm/node/runtime/index.d.ts",
-      "default": "./dist/esm/node/runtime/index.js"
+      "worker": "./dist/server/runtime/index.js",
+      "workerd": "./dist/server/runtime/index.js",
+      "node": "./dist/server/runtime/index.js",
+      "browser": "./dist/client/index.js",
+      "types": "./dist/server/runtime/index.d.ts",
+      "default": "./dist/server/runtime/index.js"
     }
   },
   "dependencies": {
@@ -163,58 +163,58 @@
   "typesVersions": {
     "*": {
       "types": [
-        "./dist/esm/types/index.d.ts"
+        "./dist/types/index.d.ts"
       ],
       "server": [
-        "./dist/esm/node/runtime/index.d.ts"
+        "./dist/server/runtime/index.d.ts"
       ],
       "client": [
-        "./dist/esm/client/runtime-server-routing/index.d.ts"
+        "./dist/client/runtime-server-routing/index.d.ts"
       ],
       "client/router": [
-        "./dist/esm/client/runtime-client-routing/index.d.ts"
+        "./dist/client/runtime-client-routing/index.d.ts"
       ],
       "routing": [
-        "./dist/esm/shared/route/routing.d.ts"
+        "./dist/shared-server-client/route/routing.d.ts"
       ],
       "cli": [
-        "./dist/esm/node/cli/index.d.ts"
+        "./dist/node/cli/index.d.ts"
       ],
       "api": [
-        "./dist/esm/node/api/index.d.ts"
+        "./dist/node/api/index.d.ts"
       ],
       "prerender": [
-        "./dist/esm/node/prerender/index.d.ts"
+        "./dist/node/prerender/index.d.ts"
       ],
       "plugin": [
-        "./dist/esm/node/vite/index.d.ts"
+        "./dist/node/vite/index.d.ts"
       ],
       "RenderErrorPage": [
-        "./dist/esm/shared/RenderErrorPage.d.ts"
+        "./dist/shared-server-client/RenderErrorPage.d.ts"
       ],
       "abort": [
-        "./dist/esm/shared/abort.d.ts"
+        "./dist/shared-server-client/abort.d.ts"
       ],
       "getPageContext": [
-        "./dist/esm/shared/getPageContext.d.ts"
+        "./dist/server/runtime/getPageContext.d.ts"
       ],
       "modifyUrl": [
-        "./dist/esm/shared/modifyUrl.d.ts"
+        "./dist/shared-server-client/modifyUrl.d.ts"
       ],
       "universal-middleware": [
-        "./dist/esm/node/runtime/universal-middleware.d.ts"
+        "./dist/server/runtime/universal-middleware.d.ts"
       ],
       "__internal": [
-        "./dist/esm/__internal/index.d.ts"
+        "./dist/server/__internal/index.d.ts"
       ],
       "__internal/setup": [
-        "./dist/esm/node/runtime/page-files/setup.d.ts"
+        "./dist/server/runtime/page-files/setup.d.ts"
       ]
     }
   },
-  "main": "./dist/esm/node/runtime/index.js",
-  "browser": "./dist/esm/client/index.js",
-  "types": "./dist/esm/node/runtime/index.d.ts",
+  "main": "./dist/server/runtime/index.js",
+  "browser": "./dist/client/index.js",
+  "types": "./dist/server/runtime/index.d.ts",
   "type": "module",
   "bin": {
     "vike": "./node/cli/bin.js"
@@ -246,9 +246,9 @@
     "@types/picomatch": "^3.0.2",
     "@types/semver": "^7.5.8",
     "@types/source-map-support": "^0.5.10",
-    "react-streaming": "^0.4.12",
+    "react-streaming": "^0.4.13",
     "rimraf": "^5.0.5",
-    "typescript": "^5.9.2",
+    "typescript": "^5.9.3",
     "vite": "^7.1.5"
   },
   "scripts": {

package/plugin.js

@@ -1,3 +1,3 @@
 // Some tools still need this as of January 2025
-export * from './dist/esm/node/vite/index.js'
-export { default } from './dist/esm/node/vite/index.js'
+export * from './dist/node/vite/index.js'
+export { default } from './dist/node/vite/index.js'

package/prerender.js

@@ -1,3 +1,3 @@
 // Some tools still need this as of January 2025
-export * from './dist/esm/node/prerender/index.js'
-export { default } from './dist/esm/node/prerender/index.js'
+export * from './dist/node/prerender/index.js'
+export { default } from './dist/node/prerender/index.js'

package/routing.js

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

package/server.js

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

package/types.js

@@ -1,3 +1,3 @@
 // Some tools still need this as of January 2025
-export * from './dist/esm/types/index.js'
-export { default } from './dist/esm/types/index.js'
+export * from './dist/types/index.js'
+export { default } from './dist/types/index.js'

package/universal-middleware.js

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