vike 0.4.253 → 0.4.254

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

@@ -1,9 +1,9 @@
-import '../../assertEnvVite.js';
 export { configDefinitionsBuiltIn };
 import { assert, assertUsage } from '../../../../utils/assert.js';
 import { getConfigDefinedAt, } from '../../../../shared-server-client/page-configs/getConfigDefinedAt.js';
 import { getConfigValueSourceRelevantAnyEnv, getConfigValueSourcesRelevant, isConfigSourceValueNull, } from '../../plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js';
 import { getFileSuffixes } from '../../../../shared-server-node/getFileSuffixes.js';
+import '../../assertEnvVite.js';
 const configDefinitionsBuiltIn = {
     onRenderHtml: {
         env: { server: true },

package/dist/node/vite/shared/resolveVikeConfigInternal/crawlPlusFilePaths/ignorePatternsBuiltIn.d.ts

@@ -1,2 +1,2 @@
 import '../../../assertEnvVite.js';
-export declare const ignorePatternsBuiltIn: readonly ["**/node_modules/**", "**/ejected/**", "**/*.telefunc.*", "**/.history/**", "**/*.generated.*"];
+export declare const ignorePatternsBuiltIn: readonly ["**/node_modules/**", "**/ejected/**", "**/*.telefunc.*", "**/.history/**", "**/*.generated.*", "**/*.spec.*", "**/*.test.*"];

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

@@ -13,4 +13,7 @@ export const ignorePatternsBuiltIn = [
     '**/.history/**',
     // https://github.com/vikejs/vike/discussions/2222
     '**/*.generated.*',
+    // https://github.com/vikejs/vike/issues/2347
+    '**/*.spec.*',
+    '**/*.test.*',
 ];

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

@@ -1,7 +1,7 @@
-import '../../assertEnvVite.js';
 export { crawlPlusFilePaths };
 export { isPlusFile };
 export { getPlusFileValueConfigName };
+import '../../assertEnvVite.js';
 declare function crawlPlusFilePaths(userRootDir: string): Promise<{
     filePathAbsoluteUserRootDir: string;
 }[]>;

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

@@ -1,4 +1,3 @@
-import '../../assertEnvVite.js';
 export { crawlPlusFilePaths };
 export { isPlusFile };
 export { getPlusFileValueConfigName };
@@ -22,6 +21,7 @@ import { getEnvVarObject } from '../getEnvVarObject.js';
 import pc from '@brillout/picocolors';
 import picomatch from 'picomatch';
 import { ignorePatternsBuiltIn } from './crawlPlusFilePaths/ignorePatternsBuiltIn.js';
+import '../../assertEnvVite.js';
 const execA = promisify(exec);
 const debug = createDebug('vike:crawl');
 assertIsNotProductionRuntime();

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

@@ -1,4 +1,3 @@
-import '../../assertEnvVite.js';
 export { getFilesystemRouteString };
 export { getFilesystemRouteDefinedBy };
 export { isInherited };
@@ -7,6 +6,7 @@ export { sortAfterInheritanceOrder };
 export { applyFilesystemRoutingRootEffect };
 export type { LocationId };
 export { getLogicalPath };
+import '../../assertEnvVite.js';
 /**
  * The `locationId` value is used for filesystem inheritance.
  *

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

@@ -1,4 +1,3 @@
-import '../../assertEnvVite.js';
 export { getFilesystemRouteString };
 export { getFilesystemRouteDefinedBy };
 export { isInherited };
@@ -12,6 +11,7 @@ import { assert, assertWarning } from '../../../../utils/assert.js';
 import { assertIsNotProductionRuntime } from '../../../../utils/assertSetup.js';
 import { assertPosixPath } from '../../../../utils/path.js';
 import { higherFirst } from '../../../../utils/sorter.js';
+import '../../assertEnvVite.js';
 assertIsNotProductionRuntime();
 /**
  * `getLocationId('/pages/some-page/+Page.js')` => `'/pages/some-page'`

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

@@ -1,3 +1,3 @@
-import '../../assertEnvVite.js';
 export { getConfigFileExport };
+import '../../assertEnvVite.js';
 declare function getConfigFileExport(fileExports: Record<string, unknown>, filePathToShowToUser: string): Record<string, unknown>;

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

@@ -1,9 +1,9 @@
-import '../../assertEnvVite.js';
 export { getConfigFileExport };
 import pc from '@brillout/picocolors';
 import { assertPlusFileExport } from '../../../../shared-server-client/page-configs/assertPlusFileExport.js';
 import { assertUsage } from '../../../../utils/assert.js';
 import { isObject } from '../../../../utils/isObject.js';
+import '../../assertEnvVite.js';
 function getConfigFileExport(fileExports, filePathToShowToUser) {
     assertPlusFileExport(fileExports, filePathToShowToUser, 'config');
     const usesNamedExport = !!fileExports.config;

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

@@ -1,4 +1,3 @@
-import '../../assertEnvVite.js';
 export { getPlusFilesByLocationId };
 export type { PlusFileValue };
 export type { PlusFile };
@@ -7,6 +6,7 @@ import { type LocationId } from './filesystemRouting.js';
 import { type EsbuildCache } from './transpileAndExecuteFile.js';
 import { PointerImportLoaded } from './loadFileAtConfigTime.js';
 import type { FilePathResolved } from '../../../../types/FilePath.js';
+import '../../assertEnvVite.js';
 type PlusFile = PlusFileConfig | PlusFileValue;
 type PlusFileCommon = {
     locationId: LocationId;
@@ -14,6 +14,7 @@ type PlusFileCommon = {
 };
 /** +config.js */
 type PlusFileConfig = PlusFileCommon & {
+    /** Whether file is `+config.js` or `+{configName}.js` */
     isConfigFile: true;
     fileExportsByConfigName: Record<string, // configName
     unknown>;
@@ -25,6 +26,7 @@ type PlusFileConfig = PlusFileCommon & {
 };
 /** +{configName}.js */
 type PlusFileValue = PlusFileCommon & {
+    /** Whether file is `+config.js` or `+{configName}.js` */
     isConfigFile: false;
     configName: string;
 } & ({

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

@@ -1,4 +1,3 @@
-import '../../assertEnvVite.js';
 export { getPlusFilesByLocationId };
 import { assert } from '../../../../utils/assert.js';
 import { configDefinitionsBuiltIn } from './configDefinitionsBuiltIn.js';
@@ -9,6 +8,7 @@ import { loadConfigFile, loadValueFile } from './loadFileAtConfigTime.js';
 import { resolvePointerImport } from './resolvePointerImport.js';
 import { getFilePathResolved } from '../getFilePath.js';
 import { assertExtensionsConventions, assertExtensionsRequire } from './assertExtensions.js';
+import '../../assertEnvVite.js';
 async function getPlusFilesByLocationId(userRootDir, esbuildCache) {
     const plusFilePaths = (await crawlPlusFilePaths(userRootDir)).map(({ filePathAbsoluteUserRootDir }) => getFilePathResolved({ filePathAbsoluteUserRootDir, userRootDir }));
     const plusFilesByLocationId = {};

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

@@ -1,4 +1,3 @@
-import '../../assertEnvVite.js';
 export { loadPointerImport };
 export { loadValueFile };
 export { loadConfigFile };
@@ -9,6 +8,7 @@ import { type EsbuildCache } from './transpileAndExecuteFile.js';
 import type { PlusFileValue } from './getPlusFilesByLocationId.js';
 import { PointerImport } from './resolvePointerImport.js';
 import type { ConfigDefinitionsInternal } from './configDefinitionsBuiltIn.js';
+import '../../assertEnvVite.js';
 type ConfigFile = {
     fileExports: Record<string, unknown>;
     filePath: FilePathResolved;

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

@@ -1,4 +1,3 @@
-import '../../assertEnvVite.js';
 // Files loaded at config time:
 export { loadPointerImport };
 export { loadValueFile };
@@ -15,6 +14,7 @@ import { parsePointerImportData } from './pointerImports.js';
 import { getConfigFileExport } from './getConfigFileExport.js';
 import { resolvePointerImportData } from './resolvePointerImport.js';
 import { getConfigDefinedAt } from '../../../../shared-server-client/page-configs/getConfigDefinedAt.js';
+import '../../assertEnvVite.js';
 assertIsNotProductionRuntime();
 // Load pointer import
 async function loadPointerImport(pointerImport, userRootDir, configName, configDefinitions, esbuildCache) {

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

@@ -1,9 +1,9 @@
-import '../../assertEnvVite.js';
 export { transformPointerImports };
 export { parsePointerImportData };
 export { isPointerImportData };
 export { assertPointerImportPath };
 export type { PointerImportData };
+import '../../assertEnvVite.js';
 declare function transformPointerImports(code: string, filePathToShowToUser2: string, pointerImports: Record<string, boolean> | 'all', skipWarnings?: true): string | null;
 /**
  * Data Structure for [pointer imports](https://vike.dev/config#pointer-imports):

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

@@ -1,4 +1,3 @@
-import '../../assertEnvVite.js';
 export { transformPointerImports };
 export { parsePointerImportData };
 export { isPointerImportData };
@@ -26,6 +25,7 @@ import { isImportPath } from '../../../../utils/isImportPath.js';
 import { styleFileRE } from '../../../../utils/styleFileRE.js';
 import pc from '@brillout/picocolors';
 import { parseImportString, isImportString, serializeImportString } from '../importString.js';
+import '../../assertEnvVite.js';
 function transformPointerImports(code, filePathToShowToUser2, pointerImports, 
 // For ./transformPointerImports.spec.ts
 skipWarnings) {

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

@@ -1,10 +1,10 @@
-import '../../assertEnvVite.js';
 export { resolvePointerImport };
 export { resolvePointerImportData };
 export type { PointerImport };
 import type { DefinedAtFilePath } from '../../../../types/PageConfig.js';
 import { type PointerImportData } from './pointerImports.js';
 import type { FilePath, FilePathResolved } from '../../../../types/FilePath.js';
+import '../../assertEnvVite.js';
 type PointerImport = {
     fileExportPath: FileExportPath;
 };

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

@@ -1,4 +1,3 @@
-import '../../assertEnvVite.js';
 export { resolvePointerImport };
 export { resolvePointerImportData };
 import pc from '@brillout/picocolors';
@@ -10,6 +9,7 @@ import { assertPosixPath } from '../../../../utils/path.js';
 import { requireResolveOptional } from '../../../../utils/requireResolve.js';
 import { assertPointerImportPath, parsePointerImportData } from './pointerImports.js';
 import { getFilePathAbsoluteUserRootDir, getFilePathResolved, getFilePathUnresolved } from '../getFilePath.js';
+import '../../assertEnvVite.js';
 function resolvePointerImport(configValue, importerFilePath, userRootDir, configName) {
     if (typeof configValue !== 'string')
         return null;

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

@@ -1,10 +1,10 @@
-import '../../assertEnvVite.js';
 export { transpileAndExecuteFile };
 export { getConfigBuildErrorFormatted };
 export { getConfigExecutionErrorIntroMsg };
 export { isTemporaryBuildFile };
 export type { EsbuildCache };
 import type { FilePathResolved } from '../../../../types/FilePath.js';
+import '../../assertEnvVite.js';
 type FileExports = {
     fileExports: Record<string, unknown>;
 };

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

@@ -1,4 +1,3 @@
-import '../../assertEnvVite.js';
 export { transpileAndExecuteFile };
 export { getConfigBuildErrorFormatted };
 export { getConfigExecutionErrorIntroMsg };
@@ -24,10 +23,12 @@ import { requireResolveOptionalDir } from '../../../../utils/requireResolve.js';
 import { transformPointerImports } from './pointerImports.js';
 import sourceMapSupport from 'source-map-support';
 import { getFilePathAbsoluteUserRootDir } from '../getFilePath.js';
+import '../../assertEnvVite.js';
 assertIsNotProductionRuntime();
 installSourceMapSupport();
 const debug = createDebug('vike:pointer-imports');
 const debugEsbuildResolve = createDebug('vike:esbuild-resolve');
+const debugConfig = createDebug('vike:config');
 if (debugEsbuildResolve.isActivated)
     debugEsbuildResolve('esbuild version', version);
 async function transpileAndExecuteFile(filePath, userRootDir, isExtensionConfig, esbuildCache) {
@@ -52,11 +53,17 @@ async function transpileAndExecuteFile(filePath, userRootDir, isExtensionConfig,
     let fileExports;
     if (isExtensionConfig && !isHeader && fileExtension.endsWith('js')) {
         // This doesn't track dependencies => we should never use this for user land configs
+        if (debugConfig.isActivated) {
+            debugConfig(filePathToShowToUserResolved, 'executed directly (no esbuild transpilation)');
+        }
         fileExports = await executeFile(filePathAbsoluteFilesystem, filePath);
     }
     else {
         const transformImports = isHeader ? 'all' : true;
         const code = await transpileFile(filePath, transformImports, userRootDir, esbuildCache);
+        if (debugConfig.isActivated) {
+            debugConfig(filePathToShowToUserResolved, code);
+        }
         fileExports = await executeTranspiledFile(filePath, code);
     }
     resolve({ fileExports });
@@ -185,7 +192,8 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                         //    - In principle, we can use the setting 'name' value of Vike extensions.
                         //      - vike@0.4.162 started soft-requiring Vike extensions to set the name config.
                         //    - In practice, it seems like it requires some (non-trivial?) refactoring.
-                        isVikeExtensionImport;
+                        isVikeExtensionImport ||
+                        args.with?.['type'] === 'vike-pointer';
                     assertPosixPath(importPathResolved);
                     // `isNpmPkgImport` => `importPathOriginal` is most likely an npm package import, but it can also be a path alias that a) looks like an npm package import and b) resolves outside of `userRootDir`.
                     const isNpmPkgImport = (() => {
@@ -305,7 +313,17 @@ async function executeTranspiledFile(filePath, code) {
     //  - But seems to break source maps, so I don't think it's worth it
     const filePathTmp = getTemporaryBuildFilePath(filePathAbsoluteFilesystem, code);
     fs.writeFileSync(filePathTmp, code);
-    const clean = () => fs.unlinkSync(filePathTmp);
+    const clean = () => {
+        try {
+            fs.unlinkSync(filePathTmp);
+        }
+        catch {
+            // I don't know why but with Vitest (4.0.18) it seems that sometimes `filePathTmp` is already removed => we therefore swallow the follow error:
+            // ```shell
+            // Error: ENOENT: no such file or directory, unlink '/home/rom/tmp/vike/test/vitest/pages/+config.js.build-4718e6535172.mjs'
+            // ```
+        }
+    };
     let fileExports = {};
     try {
         fileExports = await executeFile(filePathTmp, filePath);

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

@@ -1,4 +1,3 @@
-import '../assertEnvVite.js';
 export { getVikeConfig };
 export type { VikeConfig };
 export { getVikeConfigInternal };
@@ -19,6 +18,7 @@ import { type PlusFile } from './resolveVikeConfigInternal/getPlusFilesByLocatio
 import type { PrerenderContextPublic } from '../../prerender/runPrerender.js';
 import type { ResolvedConfig, UserConfig } from 'vite';
 import { type DangerouslyUseInternals } from '../../../shared-server-client/getPublicProxy.js';
+import '../assertEnvVite.js';
 type VikeConfigContext = {
     userRootDir: string;
     isDev: boolean;
@@ -34,6 +34,7 @@ type VikeConfigInternal = GlobalConfigPublic & {
     _pageConfigs: PageConfigBuildTime[];
     _pageConfigGlobal: PageConfigGlobalBuildTime;
     _vikeConfigDependencies: Set<string>;
+    _extensions: PlusFile[];
     prerenderContext: PrerenderContext;
 };
 declare function reloadVikeConfig(): void;

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

@@ -1,4 +1,3 @@
-import '../assertEnvVite.js';
 // Public usage
 export { getVikeConfig };
 // Internal usage
@@ -53,6 +52,7 @@ import { getCliOptions } from '../../cli/context.js';
 import { resolvePrerenderConfigGlobal } from '../../prerender/resolvePrerenderConfig.js';
 import { getPublicProxy } from '../../../shared-server-client/getPublicProxy.js';
 import { setVikeConfigError } from '../../../shared-server-node/getVikeConfigError.js';
+import '../assertEnvVite.js';
 assertIsNotProductionRuntime();
 const globalObject = getGlobalObject('vite/shared/resolveVikeConfigInternal.ts', {
     restartViteBecauseOfError: false,
@@ -228,12 +228,16 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esb
         _from: globalConfigPublic._from,
         _pageConfigs: pageConfigs,
     });
+    const _extensions = Object.values(plusFilesByLocationId)
+        .flat()
+        .filter((p) => p.isConfigFile && p.isExtensionConfig);
     const vikeConfig = {
         ...globalConfigPublic,
         prerenderContext,
         _pageConfigs: pageConfigs,
         _pageConfigGlobal: pageConfigGlobal,
         _vikeConfigDependencies: esbuildCache.vikeConfigDependencies,
+        _extensions,
     };
     globalObject.vikeConfigSync = vikeConfig;
     return vikeConfig;
@@ -509,7 +513,7 @@ function getSourceNonConfigFile(configName, value, definedAt) {
         definedAt,
         locationId: '/',
         plusFile: null,
-        valueIsLoadedWithImport: false,
+        valueLoadedViaImport: false,
         valueIsDefinedByPlusValueFile: false,
     };
     return source;
@@ -663,7 +667,7 @@ function getConfigValueSources(configName, plusFile, configDef, userRootDir) {
             value: valueFilePath,
             valueIsFilePath: true,
             configEnv: configDef.env,
-            valueIsLoadedWithImport: false,
+            valueLoadedViaImport: false,
             valueIsDefinedByPlusValueFile: false,
             definedAt: definedAtFilePath,
         };
@@ -688,7 +692,7 @@ function getConfigValueSources(configName, plusFile, configDef, userRootDir) {
                     ...configValueSourceCommon,
                     ...value,
                     configEnv: resolveConfigEnv(configDef.env, pointerImport.fileExportPath),
-                    valueIsLoadedWithImport: true,
+                    valueLoadedViaImport: true,
                     valueIsDefinedByPlusValueFile: false,
                     definedAt: pointerImport.fileExportPath,
                 };
@@ -701,7 +705,7 @@ function getConfigValueSources(configName, plusFile, configDef, userRootDir) {
             valueIsLoaded: true,
             value: confVal.value,
             configEnv: configDef.env,
-            valueIsLoadedWithImport: false,
+            valueLoadedViaImport: false,
             valueIsDefinedByPlusValueFile: false,
             definedAt: definedAtFilePath_,
         };
@@ -715,7 +719,14 @@ function getConfigValueSources(configName, plusFile, configDef, userRootDir) {
             ...configValueSourceCommon,
             ...confVal,
             configEnv: configEnvResolved,
-            valueIsLoadedWithImport: !confVal.valueIsLoaded || !isJsonValue(confVal.value),
+            valueLoadedViaImport: 
+            // If +{configName}.js is (also) runtime code => always load it via import (not strictly required, but seems to be a good default)
+            !!configEnvResolved.client ||
+                !!configEnvResolved.server ||
+                // No choice: value isn't loaded at config-time
+                !confVal.valueIsLoaded ||
+                // No choice: value isn't serializable
+                !isJsonValue(confVal.value),
             valueIsDefinedByPlusValueFile: true,
             definedAt: {
                 ...plusFile.filePath,
@@ -899,7 +910,7 @@ function applyEffectConfVal(configModFromEffect, sourceEffect, configValueSource
             plusFile: sourceEffect.plusFile,
             locationId: sourceEffect.locationId,
             configEnv: configDef.env,
-            valueIsLoadedWithImport: false,
+            valueLoadedViaImport: false,
             valueIsDefinedByPlusValueFile: false,
             valueIsLoaded: true,
             value: configValue,
@@ -1194,6 +1205,7 @@ async function getVikeConfigDummy(esbuildCache) {
         ...globalConfigPublicDummy,
         prerenderContext: prerenderContextDummy,
         _vikeConfigDependencies: esbuildCache.vikeConfigDependencies,
+        _extensions: [],
     };
     globalObject.vikeConfigSync = vikeConfigDummy;
     globalObject.isV1Design_ = true;

package/dist/node/vite/shared/rollupIsEsm.d.ts

@@ -1,5 +1,5 @@
-import '../assertEnvVite.js';
 export { rollupIsEsm };
+import '../assertEnvVite.js';
 declare function rollupIsEsm(rollupOptions: {
     format: string;
 }): boolean;

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

@@ -1,6 +1,6 @@
-import '../assertEnvVite.js';
 export { rollupIsEsm };
 import { assert } from '../../../utils/assert.js';
+import '../assertEnvVite.js';
 function rollupIsEsm(rollupOptions) {
     const { format } = rollupOptions;
     assert(typeof format === 'string');

package/dist/server/__internal/index.d.ts

@@ -1,10 +1,10 @@
-import '../assertEnvServer.js';
 export { setGlobalContext_prodBuildEntry } from '../runtime/globalContext.js';
 export { route, getPagesAndRoutes };
 export type { PageRoutes, PageFile, PageConfigRuntime as PageConfig };
 import { route as routeInternal, type PageRoutes } from '../../shared-server-client/route/index.js';
 import type { PageFile } from '../../shared-server-client/getPageFiles/getPageFileObject.js';
 import { PageConfigRuntime } from '../../types/PageConfig.js';
+import '../assertEnvServer.js';
 /**
  * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
  *

package/dist/server/__internal/index.js

@@ -1,4 +1,3 @@
-import '../assertEnvServer.js';
 // Used by vike:build:pluginProdBuildEntry
 export { setGlobalContext_prodBuildEntry } from '../runtime/globalContext.js';
 // Used by vite-plugin-vercel
@@ -6,6 +5,7 @@ export { route, getPagesAndRoutes };
 import { route as routeInternal } from '../../shared-server-client/route/index.js';
 import { getGlobalContextServerInternal, initGlobalContext_getPagesAndRoutes } from '../runtime/globalContext.js';
 import { setNodeEnvProductionIfUndefined } from '../../utils/assertSetup.js';
+import '../assertEnvServer.js';
 /**
  * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
  *

package/dist/server/__internal/vite.d.ts

@@ -1,2 +1,2 @@
-import '../assertEnvServer.js';
 export { startupLog } from '../../node/api/dev.js';
+import '../assertEnvServer.js';

package/dist/server/__internal/vite.js

@@ -1,2 +1,2 @@
-import '../assertEnvServer.js';
 export { startupLog } from '../../node/api/dev.js';
+import '../assertEnvServer.js';

package/dist/server/assertEnvServer.js

@@ -2,12 +2,11 @@ import '../utils/trackLogs.js'; // should be loaded ASAP
 import { assertIsNotBrowser } from '../utils/assertIsNotBrowser.js';
 import { assertNodeVersion } from '../utils/assertNodeVersion.js';
 import { setAssertAlwaysShowStackTrace } from '../utils/assert.js';
-import { installRequireShim } from '@brillout/require-shim';
 import { isDebugError } from '../utils/debug.js';
 import { installUncaughtErrorHandlers } from '../utils/installUncaughtErrorHandlers.js';
-assertEnv();
+assertEnvServer();
 onLoad();
-function assertEnv() {
+function assertEnvServer() {
     assertIsNotBrowser();
     assertNodeVersion();
 }
@@ -19,7 +18,6 @@ function onLoad() {
         setAssertAlwaysShowStackTrace();
     }
     addEcosystemStamp();
-    installRequireShim();
 }
 // Used by:
 // - Telefunc (to detect the user's stack https://github.com/brillout/telefunc/blob/8288310e88e06a42b710d39c39fb502364ca6d30/telefunc/utils/isVikeApp.ts#L4)

package/dist/server/client/router.d.ts

@@ -1,8 +1,8 @@
-import '../assertEnvServer.js';
 export { navigate };
 export { reload };
 export { prefetch };
 export { onPopState };
+import '../assertEnvServer.js';
 declare const navigate: never;
 declare const reload: never;
 declare const prefetch: never;

package/dist/server/client/router.js

@@ -1,9 +1,9 @@
-import '../assertEnvServer.js';
 export { navigate };
 export { reload };
 export { prefetch };
 export { onPopState };
 import { assertWarning } from '../../utils/assert.js';
+import '../assertEnvServer.js';
 // `never` to ensure package.json#exports["./client/router"].types points to type defined by the client-side code
 const navigate = (() => warnNoEffect('navigate'));
 const reload = (() => warnNoEffect('reload'));

package/dist/server/createPageRenderer.d.ts

@@ -1,6 +1,6 @@
-import './assertEnvServer.js';
-import { renderPageServer } from './runtime/renderPageServer.js';
 export { createPageRenderer };
+import { renderPageServer } from './runtime/renderPageServer.js';
+import './assertEnvServer.js';
 type Options = {
     viteDevServer?: unknown;
     root?: string;

package/dist/server/createPageRenderer.js

@@ -1,10 +1,10 @@
-import './assertEnvServer.js';
+export { createPageRenderer };
 // TO-DO/next-major-release: remove this file
 //import { SsrEnv, setSsrEnv } from './ssrEnv.js'
 import { renderPageServer } from './runtime/renderPageServer.js';
 import { assertWarning } from '../utils/assert.js';
 //import { importBuildWasLoaded } from './importBuild.js'
-export { createPageRenderer };
+import './assertEnvServer.js';
 /** @deprecated */
 function createPageRenderer(options) {
     showWarnings(options);

package/dist/server/importBuild.js

@@ -1,3 +1,3 @@
-import './assertEnvServer.js';
 // TO-DO/next-major-release: remove
+import './assertEnvServer.js';
 console.warn("[vike][Warning] importBuild.js is not needed anymore; it has no effect. Remove `import 'dist/server/importBuild.js'` to remove this warning. More infos at https://vike.dev/importBuild.js");

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

@@ -1,9 +1,9 @@
-import '../assertEnvServer.js';
 export { getPageContext_withAsyncHook };
 export { getRequestId_withAsyncHook };
 export { getAsyncLocalStorage };
 export type { AsyncStore };
 import type { AsyncLocalStorage as AsyncLocalStorageType } from 'node:async_hooks';
+import '../assertEnvServer.js';
 type AsyncStore = null | {
     requestId: number;
     pageContext?: Record<string, unknown>;

package/dist/server/runtime/asyncHook.js

@@ -1,14 +1,12 @@
-import '../assertEnvServer.js';
 export { getPageContext_withAsyncHook };
 export { getRequestId_withAsyncHook };
 export { getAsyncLocalStorage };
 import { getPageContextPublicServer } from './renderPageServer/getPageContextPublicServer.js';
 import { assert } from '../../utils/assert.js';
-import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { isObject } from '../../utils/isObject.js';
 import { import_ } from '@brillout/import';
-assertIsNotBrowser();
+import '../assertEnvServer.js';
 const globalObject = getGlobalObject('server/runtime/asyncHook.ts', {
     asyncLocalStorage: null,
     installPromise: install(),

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

@@ -1,4 +1,4 @@
-import '../assertEnvServer.js';
 export { createDevMiddleware_ as createDevMiddleware };
 import type { createDevMiddleware as createDevMiddlewareType } from '../../node/createDevMiddleware.js';
+import '../assertEnvServer.js';
 declare const createDevMiddleware_: typeof createDevMiddlewareType;

package/dist/server/runtime/createDevMiddleware.js

@@ -1,5 +1,5 @@
-import '../assertEnvServer.js';
 export { createDevMiddleware_ as createDevMiddleware };
+import '../assertEnvServer.js';
 const createDevMiddleware_ = async (...args) => {
     const p = '../../node/createDevMiddleware.js';
     const { createDevMiddleware } = await import(/*webpackIgnore: true*/ /* @vite-ignore */ p);

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

@@ -1,9 +1,9 @@
-import '../assertEnvServer.js';
 export { getPageContext };
 export { providePageContext };
 export type { GetPageContextParams };
 import { providePageContext } from '../../shared-server-client/hooks/execHook.js';
 import type { PageContextClient, PageContextServer } from '../../types/PageContext.js';
+import '../assertEnvServer.js';
 type GetPageContextParams = Parameters<typeof getPageContext>[0];
 /**
  * Access `pageContext` object inside Vike hooks, in order to create universal hooks.

package/dist/server/runtime/getPageContext.js

@@ -1,8 +1,8 @@
-import '../assertEnvServer.js';
 export { getPageContext };
 export { providePageContext };
 import { getPageContext_withAsyncHook } from './asyncHook.js';
 import { getPageContext_sync, providePageContext } from '../../shared-server-client/hooks/execHook.js';
+import '../assertEnvServer.js';
 /**
  * Access `pageContext` object inside Vike hooks, in order to create universal hooks.
  *

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

@@ -1,4 +1,3 @@
-import '../assertEnvServer.js';
 export { getGlobalContext };
 export { getGlobalContextSync };
 export { getGlobalContextAsync };
@@ -28,6 +27,7 @@ import type { ViteConfigRuntime } from '../../node/vite/shared/getViteConfigRunt
 import type { GlobalContext } from '../../types/GlobalContext.js';
 import type { HookInternal } from '../../shared-server-client/hooks/getHook.js';
 import type { PrerenderContext } from '../../types/index.js';
+import '../assertEnvServer.js';
 declare const vikeConfigErrorRecoverMsg: "Vike config loaded";
 type GlobalContextServerInternal = Awaited<ReturnType<typeof createGlobalContext>>;
 declare function getGlobalContextServerInternal(): Promise<{