vike 0.4.239-commit-59f1017 → 0.4.239-commit-9dcde6d

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

@@ -20,61 +20,63 @@ const filterRolldown = {
 const filterFunction = (id) => isVirtualFileId(id);
 function pluginVirtualFiles() {
     let config;
-    return {
-        name: 'vike:pluginVirtualFiles',
-        configResolved: {
-            async handler(config_) {
-                config = config_;
-                // TO-DO/next-major-release: remove
-                if (!isV1Design())
-                    config.experimental.importGlobRestoreExtension = true;
+    return [
+        {
+            name: 'vike:pluginVirtualFiles',
+            configResolved: {
+                async handler(config_) {
+                    config = config_;
+                    // TO-DO/next-major-release: remove
+                    if (!isV1Design())
+                        config.experimental.importGlobRestoreExtension = true;
+                },
             },
-        },
-        resolveId: {
-            filter: filterRolldown,
-            handler(id) {
-                assert(filterFunction(id));
-                return addVirtualFileIdPrefix(id);
-            },
-        },
-        handleHotUpdate: {
-            async handler(ctx) {
-                try {
-                    return await handleHotUpdate(ctx, config);
-                }
-                catch (err) {
-                    // Vite swallows errors thrown by handleHotUpdate()
-                    console.error(err);
-                    throw err;
-                }
+            resolveId: {
+                filter: filterRolldown,
+                handler(id) {
+                    assert(filterFunction(id));
+                    return addVirtualFileIdPrefix(id);
+                },
             },
-        },
-        load: {
-            filter: filterRolldown,
-            async handler(id, options) {
-                assert(filterFunction(id));
-                id = removeVirtualFileIdPrefix(id);
-                const isDev = config._isDev;
-                assert(typeof isDev === 'boolean');
-                const idParsed = parseVirtualFileId(id);
-                if (idParsed) {
-                    if (idParsed.type === 'page-entry') {
-                        const code = await generateVirtualFilePageEntry(id, isDev);
-                        return code;
+            handleHotUpdate: {
+                async handler(ctx) {
+                    try {
+                        return await handleHotUpdate(ctx, config);
                     }
-                    if (idParsed.type === 'global-entry') {
-                        const code = await generateVirtualFileGlobalEntryWithOldDesign(id, options, config, this.environment, isDev);
-                        return code;
+                    catch (err) {
+                        // Vite swallows errors thrown by handleHotUpdate()
+                        console.error(err);
+                        throw err;
                     }
-                }
+                },
             },
-        },
-        configureServer: {
-            handler(server) {
-                handleFileAddRemove(server, config);
+            load: {
+                filter: filterRolldown,
+                async handler(id, options) {
+                    assert(filterFunction(id));
+                    id = removeVirtualFileIdPrefix(id);
+                    const isDev = config._isDev;
+                    assert(typeof isDev === 'boolean');
+                    const idParsed = parseVirtualFileId(id);
+                    if (idParsed) {
+                        if (idParsed.type === 'page-entry') {
+                            const code = await generateVirtualFilePageEntry(id, isDev);
+                            return code;
+                        }
+                        if (idParsed.type === 'global-entry') {
+                            const code = await generateVirtualFileGlobalEntryWithOldDesign(id, options, config, this.environment, isDev);
+                            return code;
+                        }
+                    }
+                },
+            },
+            configureServer: {
+                handler(server) {
+                    handleFileAddRemove(server, config);
+                },
             },
         },
-    };
+    ];
 }
 function handleFileAddRemove(server, config) {
     server.watcher.prependListener('add', (f) => listener(f, false));

package/dist/esm/node/vite/plugins/pluginWorkaroundCssModuleHmr.d.ts

@@ -1,3 +1,3 @@
 export { pluginWorkaroundCssModuleHmr };
 import type { Plugin } from 'vite';
-declare function pluginWorkaroundCssModuleHmr(): Plugin;
+declare function pluginWorkaroundCssModuleHmr(): Plugin[];

package/dist/esm/node/vite/plugins/pluginWorkaroundCssModuleHmr.js

@@ -1,15 +1,17 @@
 export { pluginWorkaroundCssModuleHmr };
 function pluginWorkaroundCssModuleHmr() {
-    return {
-        name: 'vike:pluginWorkaroundCssModuleHmr',
-        handleHotUpdate: {
-            handler(ctx) {
-                // prevent full reload due to non self-accepting css module.
-                // here only "?direct" module should be filtered out as it doesn't have a parent module.
-                if (ctx.file.includes('module.css')) {
-                    return ctx.modules.filter((m) => !m.id?.includes('?direct'));
-                }
+    return [
+        {
+            name: 'vike:pluginWorkaroundCssModuleHmr',
+            handleHotUpdate: {
+                handler(ctx) {
+                    // prevent full reload due to non self-accepting css module.
+                    // here only "?direct" module should be filtered out as it doesn't have a parent module.
+                    if (ctx.file.includes('module.css')) {
+                        return ctx.modules.filter((m) => !m.id?.includes('?direct'));
+                    }
+                },
             },
         },
-    };
+    ];
 }

package/dist/esm/node/vite/plugins/pluginWorkaroundVite6HmrRegression.d.ts

@@ -1,3 +1,3 @@
 export { pluginWorkaroundVite6HmrRegression };
 import type { Plugin } from 'vite';
-declare function pluginWorkaroundVite6HmrRegression(): Plugin;
+declare function pluginWorkaroundVite6HmrRegression(): Plugin[];

package/dist/esm/node/vite/plugins/pluginWorkaroundVite6HmrRegression.js

@@ -4,30 +4,32 @@ export { pluginWorkaroundVite6HmrRegression };
 // Workaround seems to work for docs page /banner (which is HTML-only)
 // But doesn't seem to work for /examples/render-modes/ (see https://github.com/vikejs/vike/pull/2069 commit `renable HMR test for HTML-only`)
 function pluginWorkaroundVite6HmrRegression() {
-    return {
-        name: 'vike:pluginWorkaroundVite6HmrRegression',
-        enforce: 'post',
-        hotUpdate: {
-            order: 'post',
-            handler({ modules, server, timestamp }) {
-                if (this.environment.name !== 'ssr')
-                    return;
-                let hasSsrOnlyModules = false;
-                const invalidatedModules = new Set();
-                for (const mod of modules) {
-                    if (mod.id == null)
-                        continue;
-                    const clientModule = server.environments.client.moduleGraph.getModuleById(mod.id);
-                    if (clientModule != null)
-                        continue;
-                    this.environment.moduleGraph.invalidateModule(mod, invalidatedModules, timestamp, true);
-                    hasSsrOnlyModules = true;
-                }
-                if (hasSsrOnlyModules) {
-                    server.ws.send({ type: 'full-reload' });
-                    return [];
-                }
+    return [
+        {
+            name: 'vike:pluginWorkaroundVite6HmrRegression',
+            enforce: 'post',
+            hotUpdate: {
+                order: 'post',
+                handler({ modules, server, timestamp }) {
+                    if (this.environment.name !== 'ssr')
+                        return;
+                    let hasSsrOnlyModules = false;
+                    const invalidatedModules = new Set();
+                    for (const mod of modules) {
+                        if (mod.id == null)
+                            continue;
+                        const clientModule = server.environments.client.moduleGraph.getModuleById(mod.id);
+                        if (clientModule != null)
+                            continue;
+                        this.environment.moduleGraph.invalidateModule(mod, invalidatedModules, timestamp, true);
+                        hasSsrOnlyModules = true;
+                    }
+                    if (hasSsrOnlyModules) {
+                        server.ws.send({ type: 'full-reload' });
+                        return [];
+                    }
+                },
             },
         },
-    };
+    ];
 }

package/dist/esm/shared/createGlobalContextShared.d.ts

@@ -6,7 +6,7 @@ export type GlobalContextInternal = GlobalContextServerInternal | GlobalContextC
 import type { PageFile } from './getPageFiles.js';
 import type { PageConfigRuntime } from '../types/PageConfig.js';
 import type { GlobalContextServerInternal } from '../node/runtime/globalContext.js';
-import type { GlobalContextClientInternal } from '../client/runtime-client-routing/globalContext.js';
+import type { GlobalContextClientInternal } from '../client/runtime-client-routing/getGlobalContextClientInternal.js';
 import { type Hook } from './hooks/getHook.js';
 declare const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 declare function createGlobalContextShared<GlobalContextAdded extends {}, GlobalContextAddedAsync extends {}>(virtualFileExportsGlobalEntry: unknown, globalObject: {

package/dist/esm/shared/route/abort.d.ts

@@ -13,7 +13,7 @@ export type { ErrorAbort };
 export type { PageContextFromRewrite };
 export type { UrlRedirect };
 type RedirectStatusCode = number & Parameters<typeof redirect>[1];
-type AbortStatusCode = number & Parameters<typeof render>[0];
+type AbortStatusCode = number & Parameters<InferTwoOverloads<typeof render>[0]>[0];
 type UrlRedirect = {
     url: string;
     statusCode: RedirectStatusCode;
@@ -36,16 +36,23 @@ declare function redirect(url: string, statusCode?: 301 | 302): AbortRedirect;
  *
  * https://vike.dev/render
  *
- * @param abortStatusCode
- * One of the following:
- *   `401` Unauthorized (user isn't logged in)
- *   `403` Forbidden (user is logged in but isn't allowed)
- *   `404` Not Found
- *   `410` Gone (use this instead of `404` if the page existed in the past, see https://github.com/vikejs/vike/issues/1097#issuecomment-1695260887)
- *   `429` Too Many Requests (rate limiting)
- *   `500` Internal Server Error (your client or server has a bug)
- *   `503` Service Unavailable (server is overloaded, or a third-party API isn't responding)
- * @param abortReason Sets `pageContext.abortReason` which is usually used by the error page to show a message to the user, see https://vike.dev/error-page
+ *
+ * **Recommended** status codes:
+ *   `401` — Unauthorized (user isn't logged in)
+ *   `403` — Forbidden (user is logged in but isn't allowed)
+ *   `404` — Not Found
+ *   `410` — Gone (use this instead of `404` if the page existed in the past, see https://github.com/vikejs/vike/issues/1097#issuecomment-1695260887)
+ *   `429` — Too Many Requests (rate limiting)
+ *   `500` — Internal Server Error (your client or server has a bug)
+ *   `503` — Service Unavailable (server is overloaded, or a third-party API isn't responding)
+ *
+ * **Not recommended** status codes:
+ *   `400` — See https://github.com/vikejs/vike/issues/1008#issuecomment-3270894445
+ *   Other status codes — See https://github.com/vikejs/vike/issues/1008
+ *
+ * @param abortStatusCode - One of the recommended status codes listed above.
+ *
+ * @param abortReason - Sets `pageContext.abortReason` which is usually used by the error page to show a message to the user, see https://vike.dev/error-page
  */
 declare function render(abortStatusCode: 401 | 403 | 404 | 410 | 429 | 500 | 503, abortReason?: AbortReason): Error;
 /**
@@ -106,3 +113,7 @@ type PageContextFromAllRewrites = {
 };
 declare function getPageContextFromAllRewrites(pageContextsFromRewrite: PageContextFromRewrite[]): PageContextFromAllRewrites;
 declare function assertNoInfiniteAbortLoop(rewriteCount: number, redirectCount: number): void;
+type InferTwoOverloads<F extends Function> = F extends {
+    (...a1: infer A1): infer R1;
+    (...a0: infer A0): infer R0;
+} ? [(...a1: A1) => R1, (...a0: A0) => R0] : never;

package/dist/esm/shared/route/abort.js

@@ -8,7 +8,7 @@ export { getPageContextFromAllRewrites };
 export { AbortRender };
 export { assertNoInfiniteAbortLoop };
 import { isUserHookError } from '../hooks/execHook.js';
-import { assert, assertInfo, assertUsage, assertUsageUrlPathnameAbsolute, assertUsageUrlRedirectTarget, assertWarning, checkType, hasProp, joinEnglish, objectAssign, truncateString, } from './utils.js';
+import { assert, assertInfo, assertUsage, assertUsageUrlPathnameAbsolute, assertUsageUrlRedirectTarget, assertWarning, checkType, hasProp, isBrowser, joinEnglish, objectAssign, truncateString, } from './utils.js';
 import pc from '@brillout/picocolors';
 /**
  * Abort the rendering of the current page, and redirect the user to another URL instead.
@@ -26,7 +26,9 @@ function redirect(url, statusCode) {
         statusCode = 302;
     }
     else {
-        assertStatusCode(statusCode, [301, 302], 'redirect');
+        if (!globalThis.__VIKE__IS_CLIENT || globalThis.__VIKE__IS_DEV) {
+            assertStatusCode(statusCode, [301, 302], 'redirect');
+        }
         args.push(String(statusCode));
     }
     const pageContextAbort = {};
@@ -67,8 +69,10 @@ function render_(urlOrStatusCode, abortReason, abortCall, abortCaller, pageConte
         return AbortRender(pageContextAbort);
     }
     else {
+        if (!globalThis.__VIKE__IS_CLIENT || globalThis.__VIKE__IS_DEV) {
+            assertStatusCode(urlOrStatusCode, [401, 403, 404, 410, 429, 500, 503], 'render');
+        }
         const abortStatusCode = urlOrStatusCode;
-        assertStatusCode(urlOrStatusCode, [401, 403, 404, 410, 429, 500, 503], 'render');
         objectAssign(pageContextAbort, {
             abortStatusCode,
             is404: abortStatusCode === 404,
@@ -132,8 +136,36 @@ function logAbortErrorHandled(err, isProduction, pageContext) {
     });
 }
 function assertStatusCode(statusCode, expected, caller) {
-    const expectedEnglish = joinEnglish(expected.map((s) => s.toString()), 'or');
-    assertWarning(expected.includes(statusCode), `Unepexected status code ${statusCode} passed to ${caller}(), we recommend ${expectedEnglish} instead. (Or reach out at https://github.com/vikejs/vike/issues/1008 if you believe ${statusCode} should be added.)`, { onlyOnce: true });
+    assert(!globalThis.__VIKE__IS_CLIENT || globalThis.__VIKE__IS_DEV); // save client-side KBs
+    // double check vike:pluginReplaceGlobalThisConstants
+    if (globalThis.__VIKE__IS_CLIENT) {
+        assert(isBrowser());
+        assert(typeof globalThis.__VIKE__IS_DEV === 'boolean');
+        assert(typeof globalThis.__VIKE__IS_CLIENT === 'boolean');
+        assert(import.meta.env.SSR === false);
+        assert(import.meta.env.DEV === globalThis.__VIKE__IS_DEV);
+    }
+    else {
+        assert(!isBrowser());
+        if (import.meta.env) {
+            assert(typeof globalThis.__VIKE__IS_DEV === 'boolean');
+            assert(typeof globalThis.__VIKE__IS_CLIENT === 'boolean');
+            assert(import.meta.env.SSR === true);
+            assert(import.meta.env.DEV === globalThis.__VIKE__IS_DEV);
+        }
+        else {
+            // import.meta.env isn't defined when 'vike' is ssr.external
+        }
+    }
+    const expectedEnglish = joinEnglish(expected.map((s) => pc.bold(String(s))), 'or');
+    const statusCodeWithColor = pc.bold(String(statusCode));
+    if (statusCode === 400) {
+        assert(!expected.includes(statusCode));
+        assertWarning(false, `We recommend against using the status code ${statusCodeWithColor} passed to ${caller}() — we recommend using ${pc.bold('404')} instead, see https://github.com/vikejs/vike/issues/1008#issuecomment-3270894445`, { onlyOnce: true, showStackTrace: true });
+    }
+    else {
+        assertWarning(expected.includes(statusCode), `Unexpected status code ${statusCodeWithColor} passed to ${caller}() — we recommend using ${expectedEnglish} instead. (Or reach out at https://github.com/vikejs/vike/issues/1008 if you believe ${statusCodeWithColor} should be added.)`, { onlyOnce: true, showStackTrace: true });
+    }
 }
 function getPageContextFromAllRewrites(pageContextsFromRewrite) {
     assertNoInfiniteLoop(pageContextsFromRewrite);

package/dist/esm/types/PageContext.d.ts

@@ -19,8 +19,8 @@ import type { From, PageContextConfig, Source, Sources } from '../shared/page-co
 import type { Config } from './Config.js';
 import type { AbortStatusCode } from '../shared/route/abort.js';
 import type { GlobalContextServer } from '../node/runtime/globalContext.js';
-import type { GlobalContextClient } from '../client/runtime-client-routing/globalContext.js';
-import type { GlobalContextClientWithServerRouting } from '../client/runtime-server-routing/globalContext.js';
+import type { GlobalContextClient } from '../client/runtime-client-routing/getGlobalContextClientInternal.js';
+import type { GlobalContextClientWithServerRouting } from '../client/runtime-server-routing/getGlobalContextClientInternal.js';
 type PageContextServer<Data = unknown> = PageContextBuiltInServer<Data> & Vike.PageContext & Vike.PageContextServer;
 type PageContext<Data = unknown> = PageContextClient<Data> | PageContextServer<Data>;
 type PageContextClient<Data = unknown> = PageContextBuiltInClientWithClientRouting<Data> & Vike.PageContext & Vike.PageContextClient;
@@ -137,9 +137,9 @@ type PageContextBuiltInCommon<Data> = PageContextConfig & {
 };
 type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageContextUrlServer & {
     /**
-     * Whether the page is being rendered on the client-side or server-side / pre-rendered.
-     *
-     * We recommend using `import.meta.env.SSR` instead, see https://vike.dev/pageContext#isClientSide
+     * Whether the environment is the client-side:
+     * - In the browser, the value is `true`.
+     * - Upon SSR and pre-rendering, the value is `false`.
      *
      * https://vike.dev/pageContext#isClientSide
      */
@@ -210,9 +210,9 @@ type PageContextBuiltInClientWithServerRouting<Data> = Partial<PageContextBuiltI
 };
 type PageContextClientCommon = {
     /**
-     * Whether the page is being rendered on the client-side, or rendered on the server-side / pre-rendered.
-     *
-     * In order to save client-side KBs, we recommend using `import.meta.env.SSR` whenever possible instead, see https://vike.dev/pageContext#isClientSide
+     * Whether the environment is the client-side:
+     * - In the browser, the value is `true`.
+     * - Upon SSR and pre-rendering, the value is `false`.
      *
      * https://vike.dev/pageContext#isClientSide
      */

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.239-commit-59f1017";
+export declare const PROJECT_VERSION: "0.4.239-commit-9dcde6d";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.239-commit-59f1017';
+export const PROJECT_VERSION = '0.4.239-commit-9dcde6d';

package/dist/esm/utils/findPackageJson.js

@@ -1,7 +1,6 @@
 export { findPackageJson };
 import { findFile } from './findFile.js';
 import { createRequire } from 'node:module';
-// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 function findPackageJson(cwd) {

package/dist/esm/utils/getViteRPC.js

@@ -16,7 +16,6 @@ function getViteRPC() {
     return globalObject.rpc;
 }
 function createRpcClient() {
-    // @ts-ignore CJS build doesn't support import.meta — TO-DO/eventually: let's remove this ts-ignore after we removed the CJS build
     const hot = import.meta.hot;
     assert(hot);
     const listeners = [];
@@ -34,7 +33,6 @@ function createRpcClient() {
     const rpc = new Proxy({}, {
         get(_, functionName) {
             return async (...functionArgs) => {
-                // @ts-ignore CJS build doesn't support import.meta — TO-DO/eventually: let's remove this ts-ignore after we removed the CJS build
                 const hot = import.meta.hot;
                 assert(hot);
                 const callId = getRandomId();

package/dist/esm/utils/requireResolve.js

@@ -13,7 +13,6 @@ import path from 'node:path';
 import { assertIsImportPathNpmPackage, isImportPathNpmPackageOrPathAlias } from './parseNpmPackage.js';
 import { isNotNullish } from './isNullish.js';
 import { createDebugger } from './debug.js';
-// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 assertPosixPath(importMetaUrl);
 assertIsNotBrowser();

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "vike",
-  "version": "0.4.239-commit-59f1017",
+  "version": "0.4.239-commit-9dcde6d",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
       "worker": "./dist/esm/node/runtime/index.js",
       "workerd": "./dist/esm/node/runtime/index.js",
-      "require": "./dist/cjs/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",
@@ -21,7 +20,6 @@
     "./client/router": {
       "worker": "./dist/esm/node/client/router.js",
       "workerd": "./dist/esm/node/client/router.js",
-      "require": "./dist/cjs/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",
@@ -30,32 +28,27 @@
     "./routing": {
       "worker": "./dist/esm/shared/route/routing.js",
       "workerd": "./dist/esm/shared/route/routing.js",
-      "require": "./dist/cjs/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"
     },
     "./cli": {
-      "require": "./dist/cjs/node/cli/index.js",
       "node": "./dist/esm/node/cli/index.js",
       "types": "./dist/esm/node/cli/index.d.ts",
       "default": "./dist/esm/node/cli/index.js"
     },
     "./api": {
-      "require": "./dist/cjs/node/api/index.js",
       "node": "./dist/esm/node/api/index.js",
       "types": "./dist/esm/node/api/index.d.ts",
       "default": "./dist/esm/node/api/index.js"
     },
     "./prerender": {
-      "require": "./dist/cjs/node/prerender/index.js",
       "node": "./dist/esm/node/prerender/index.js",
       "types": "./dist/esm/node/prerender/index.d.ts",
       "default": "./dist/esm/node/prerender/index.js"
     },
     "./plugin": {
-      "require": "./dist/cjs/node/vite/index.js",
       "node": "./dist/esm/node/vite/index.js",
       "types": "./dist/esm/node/vite/index.d.ts",
       "default": "./dist/esm/node/vite/index.js"
@@ -63,7 +56,6 @@
     "./RenderErrorPage": {
       "worker": "./dist/esm/shared/RenderErrorPage.js",
       "workerd": "./dist/esm/shared/RenderErrorPage.js",
-      "require": "./dist/cjs/shared/RenderErrorPage.js",
       "node": "./dist/esm/shared/RenderErrorPage.js",
       "browser": "./dist/esm/shared/RenderErrorPage.js",
       "types": "./dist/esm/shared/RenderErrorPage.d.ts",
@@ -72,7 +64,6 @@
     "./abort": {
       "worker": "./dist/esm/shared/abort.js",
       "workerd": "./dist/esm/shared/abort.js",
-      "require": "./dist/cjs/shared/abort.js",
       "node": "./dist/esm/shared/abort.js",
       "browser": "./dist/esm/shared/abort.js",
       "types": "./dist/esm/shared/abort.d.ts",
@@ -81,7 +72,6 @@
     "./getPageContext": {
       "worker": "./dist/esm/shared/getPageContext.js",
       "workerd": "./dist/esm/shared/getPageContext.js",
-      "require": "./dist/cjs/shared/getPageContext.js",
       "node": "./dist/esm/shared/getPageContext.js",
       "browser": "./dist/esm/shared/getPageContext.js",
       "types": "./dist/esm/shared/getPageContext.d.ts",
@@ -90,7 +80,6 @@
     "./modifyUrl": {
       "worker": "./dist/esm/shared/modifyUrl.js",
       "workerd": "./dist/esm/shared/modifyUrl.js",
-      "require": "./dist/cjs/shared/modifyUrl.js",
       "node": "./dist/esm/shared/modifyUrl.js",
       "browser": "./dist/esm/shared/modifyUrl.js",
       "types": "./dist/esm/shared/modifyUrl.d.ts",
@@ -99,20 +88,17 @@
     "./universal-middleware": {
       "worker": "./dist/esm/node/runtime/universal-middleware.js",
       "workerd": "./dist/esm/node/runtime/universal-middleware.js",
-      "require": "./dist/cjs/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"
     },
     "./__internal": {
-      "require": "./dist/cjs/__internal/index.js",
       "node": "./dist/esm/__internal/index.js",
       "types": "./dist/esm/__internal/index.d.ts",
       "default": "./dist/esm/__internal/index.js"
     },
     "./__internal/setup": {
-      "require": "./dist/cjs/node/runtime/page-files/setup.js",
       "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"
@@ -120,7 +106,6 @@
     ".": {
       "worker": "./dist/esm/node/runtime/index.js",
       "workerd": "./dist/esm/node/runtime/index.js",
-      "require": "./dist/cjs/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",
@@ -267,11 +252,7 @@
   },
   "scripts": {
     "dev": "tsc --watch",
-    "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
-    "build:esm": "tsc",
-    "build:cjs": "pnpm run build:cjs:ts && pnpm run build:cjs:fixup",
-    "build:cjs:ts": "tsc --project ./tsconfig.cjs.json",
-    "build:cjs:fixup": "node ./dist-cjs-fixup.mjs",
+    "build": "rimraf dist/ && tsc",
     "========= Release": "",
     "release": "release-me patch",
     "release:minor": "release-me minor",

package/dist/cjs/__internal/index.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setGlobalContext_prodBuildEntry = void 0;
-exports.route = route;
-exports.getPagesAndRoutes = getPagesAndRoutes;
-// Used by vike:build:pluginProdBuildEntry
-var globalContext_js_1 = require("../node/runtime/globalContext.js");
-Object.defineProperty(exports, "setGlobalContext_prodBuildEntry", { enumerable: true, get: function () { return globalContext_js_1.setGlobalContext_prodBuildEntry; } });
-const index_js_1 = require("../shared/route/index.js");
-const globalContext_js_2 = require("../node/runtime/globalContext.js");
-const assertSetup_js_1 = require("../utils/assertSetup.js");
-/**
- * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
- *
- * TO-DO/eventually: remove
- */
-async function getPagesAndRoutes() {
-    (0, assertSetup_js_1.setNodeEnvProduction)();
-    await (0, globalContext_js_2.initGlobalContext_getPagesAndRoutes)();
-    const { globalContext } = await (0, globalContext_js_2.getGlobalContextServerInternal)();
-    const { 
-    //
-    _pageRoutes: pageRoutes, _pageFilesAll: pageFilesAll, _pageConfigs: pageConfigs, _allPageIds: allPageIds, } = globalContext;
-    return {
-        pageRoutes,
-        pageFilesAll,
-        pageConfigs,
-        allPageIds,
-    };
-}
-async function route(pageContext) {
-    const pageContextFromRoute = await (0, index_js_1.route)(pageContext);
-    // Old interface
-    return { pageContextAddendum: pageContextFromRoute };
-}

package/dist/cjs/client/runtime-client-routing/globalContext.js

@@ -1,49 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGlobalContextClientInternal = void 0;
-const createGetGlobalContextClient_js_1 = require("../shared/createGetGlobalContextClient.js");
-const loadPageRoutes_js_1 = require("../../shared/route/loadPageRoutes.js");
-// @ts-ignore
-const virtualFileExportsGlobalEntry = __importStar(require("virtual:vike:global-entry:client:client-routing"));
-const getGlobalContextClientInternal = (0, createGetGlobalContextClient_js_1.createGetGlobalContextClient)(virtualFileExportsGlobalEntry, true, addGlobalContext);
-exports.getGlobalContextClientInternal = getGlobalContextClientInternal;
-async function addGlobalContext(globalContext) {
-    const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
-    return {
-        _pageRoutes: pageRoutes,
-        _onBeforeRouteHook: onBeforeRouteHook,
-    };
-}