vike 0.4.253 → 0.4.255

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

@@ -1,6 +1,5 @@
-import '../../assertEnvVite.js';
 export { generateVirtualFileGlobalEntryWithOldDesign };
-import { assert, assertWarning } from '../../../../utils/assert.js';
+import { assert } from '../../../../utils/assert.js';
 import { isVersionMatch } from '../../../../utils/assertVersion.js';
 import { debugGlob } from '../../../../utils/debugGlob.js';
 import { scriptFileExtensionPattern } from '../../../../utils/isScriptFile.js';
@@ -10,11 +9,12 @@ import { version as viteVersion } from 'vite';
 import { fileTypes } from '../../../../shared-server-client/getPageFiles/fileTypes.js';
 import path from 'node:path';
 import { generateVirtualFileGlobalEntry } from './generateVirtualFileGlobalEntry.js';
-import { getVikeConfigInternal, isV1Design as isV1Design_ } from '../../shared/resolveVikeConfigInternal.js';
+import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
 import { isViteServerSide_extraSafe } from '../../shared/isViteServerSide.js';
 import { resolveIncludeAssetsImportedByServer } from '../../../../server/runtime/renderPageServer/getPageAssets/retrievePageAssetsProd.js';
 import { VIRTUAL_FILE_ID_constantsGlobalThis } from '../pluginReplaceConstantsGlobalThis.js';
+import '../../assertEnvVite.js';
 async function generateVirtualFileGlobalEntryWithOldDesign(id, options, config, env, isDev) {
     const idParsed = parseVirtualFileId(id);
     assert(idParsed && idParsed.type === 'global-entry');
@@ -78,8 +78,6 @@ export const neverLoaded = {};
 ${await generateVirtualFileGlobalEntry(isForClientSide, isDev, id, isClientRouting)}
 
 `;
-    // We still use import.meta.glob() when using th V1 design in order to not break the V1 design deprecation warning
-    const isV1Design = isV1Design_();
     const vikeConfig = await getVikeConfigInternal();
     // Old design => no + files => only to enable pre-rendering is setting `vike({prerender})` in vite.config.js
     const isPrerendering = !!vikeConfig.config.prerender;
@@ -94,19 +92,19 @@ ${await generateVirtualFileGlobalEntry(isForClientSide, isDev, id, isClientRouti
             isBuild,
         });
         if (includeImport) {
-            fileContent += getGlobs(globRoots, isBuild, fileType, null, isV1Design);
+            fileContent += getGlobs(globRoots, isBuild, fileType, null);
         }
         if (includeExportNames) {
-            fileContent += getGlobs(globRoots, isBuild, fileType, 'extractExportNames', isV1Design);
+            fileContent += getGlobs(globRoots, isBuild, fileType, 'extractExportNames');
         }
     });
     const includeAssetsImportedByServer = resolveIncludeAssetsImportedByServer(vikeConfig.config);
     if (includeAssetsImportedByServer && isForClientSide) {
-        fileContent += getGlobs(globRoots, isBuild, '.page.server', 'extractAssets', isV1Design);
+        fileContent += getGlobs(globRoots, isBuild, '.page.server', 'extractAssets');
     }
     return fileContent;
 }
-function getGlobs(globRoots, isBuild, fileType, query, isV1Design) {
+function getGlobs(globRoots, isBuild, fileType, query) {
     const isEager = isBuild && (query === 'extractExportNames' || fileType === '.page.route');
     let pageFilesVar;
     if (query === 'extractExportNames') {
@@ -149,19 +147,11 @@ function getGlobs(globRoots, isBuild, fileType, query, isV1Design) {
             const globOptions = { eager: isEager };
             if (query) {
                 const isNewViteInterface = isVersionMatch(viteVersion, ['5.1.0']);
-                if (isNewViteInterface &&
-                    // When used for the old design, the new syntax breaks Vike's CI (surprinsigly so). I couldn't reproduce locally (I didn't dig much).
-                    isV1Design) {
+                if (isNewViteInterface) {
                     globOptions.query = `?${query}`;
                 }
                 else {
                     globOptions.as = query;
-                    const msg = [
-                        "Update to the new V1 design to get rid of Vite's warning:",
-                        'The glob option "as" has been deprecated in favour of "query".',
-                        'See https://vike.dev/migration/v1-design for how to migrate.',
-                    ].join(' ');
-                    assertWarning(!isNewViteInterface, msg, { onlyOnce: true });
                 }
             }
             const globPaths = globExcludePath ? `[${globIncludePath}, ${globExcludePath}]` : `[${globIncludePath}]`;

package/dist/node/vite/plugins/pluginVirtualFiles/generateVirtualFilePageEntry.d.ts

@@ -1,3 +1,3 @@
-import '../../assertEnvVite.js';
 export { generateVirtualFilePageEntry };
+import '../../assertEnvVite.js';
 declare function generateVirtualFilePageEntry(id: string, isDev: boolean): Promise<string>;

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

@@ -1,4 +1,3 @@
-import '../../assertEnvVite.js';
 export { generateVirtualFilePageEntry };
 import { assert, getProjectError } from '../../../../utils/assert.js';
 import { parseVirtualFileId, generateVirtualFileId } from '../../../../shared-server-node/virtualFileId.js';
@@ -9,6 +8,7 @@ import { serializeConfigValues, } from '../../../../shared-server-client/page-co
 import { handleAssetsManifest_isFixEnabled } from '../build/handleAssetsManifest.js';
 import { getConfigValueBuildTime } from '../../../../shared-server-client/page-configs/getConfigValueBuildTime.js';
 import { resolveIncludeAssetsImportedByServer } from '../../../../server/runtime/renderPageServer/getPageAssets/retrievePageAssetsProd.js';
+import '../../assertEnvVite.js';
 async function generateVirtualFilePageEntry(id, isDev) {
     const result = parseVirtualFileId(id);
     assert(result && result.type === 'page-entry');

package/dist/node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.d.ts

@@ -1,10 +1,10 @@
-import '../../assertEnvVite.js';
 export { getConfigValueSourcesRelevant };
 export { getConfigValueSourceRelevantAnyEnv };
 export { isRuntimeEnvMatch };
 export { isConfigSourceValueNull };
 export type { RuntimeEnv };
 import type { ConfigEnvInternal, ConfigValueSource, PageConfigBuildTime, PageConfigGlobalBuildTime } from '../../../../types/PageConfig.js';
+import '../../assertEnvVite.js';
 type RuntimeEnv = {
     isForClientSide: boolean;
     isClientRouting: boolean;

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

@@ -1,12 +1,10 @@
-import '../../assertEnvVite.js';
 export { getConfigValueSourcesRelevant };
 export { getConfigValueSourceRelevantAnyEnv };
 export { isRuntimeEnvMatch };
 export { isConfigSourceValueNull };
 import { assert } from '../../../../utils/assert.js';
-import { assertIsNotBrowser } from '../../../../utils/assertIsNotBrowser.js';
 import { getFileSuffixes } from '../../../../shared-server-node/getFileSuffixes.js';
-assertIsNotBrowser();
+import '../../assertEnvVite.js';
 function getConfigValueSourcesRelevant(configName, runtimeEnv, pageConfig) {
     const configDef = pageConfig.configDefinitions[configName];
     assert(configDef);

package/dist/node/vite/plugins/pluginVirtualFiles.d.ts

@@ -1,4 +1,4 @@
-import '../assertEnvVite.js';
 export { pluginVirtualFiles };
 import type { Plugin } from 'vite';
+import '../assertEnvVite.js';
 declare function pluginVirtualFiles(): Plugin[];

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

@@ -1,4 +1,3 @@
-import '../assertEnvVite.js';
 export { pluginVirtualFiles };
 import { normalizePath } from 'vite';
 import { generateVirtualFilePageEntry } from './pluginVirtualFiles/generateVirtualFilePageEntry.js';
@@ -17,6 +16,7 @@ import { updateUserFiles } from '../../../server/runtime/globalContext.js';
 import { isPlusFile } from '../shared/resolveVikeConfigInternal/crawlPlusFilePaths.js';
 import { isTemporaryBuildFile } from '../shared/resolveVikeConfigInternal/transpileAndExecuteFile.js';
 import { debugFileChange, getVikeConfigError } from '../../../shared-server-node/getVikeConfigError.js';
+import '../assertEnvVite.js';
 // === Rolldown filter
 const filterRolldown = {
     id: {

package/dist/node/vite/plugins/pluginViteConfigVikeExtensions.d.ts

@@ -1,5 +1,5 @@
-import '../assertEnvVite.js';
 export { pluginViteConfigVikeExtensions };
 import type { Plugin } from 'vite';
 import type { VikeConfigInternal } from '../shared/resolveVikeConfigInternal.js';
+import '../assertEnvVite.js';
 declare function pluginViteConfigVikeExtensions(vikeConfig: VikeConfigInternal): Promise<Plugin[]>;

package/dist/node/vite/plugins/pluginViteConfigVikeExtensions.js

@@ -1,9 +1,9 @@
-import '../assertEnvVite.js';
 export { pluginViteConfigVikeExtensions };
 import { mergeConfig } from 'vite';
 import { assertUsage } from '../../../utils/assert.js';
 import { isCallable } from '../../../utils/isCallable.js';
 import { isObject } from '../../../utils/isObject.js';
+import '../assertEnvVite.js';
 // Apply +vite
 // - For example, Vike extensions adding Vite plugins
 async function pluginViteConfigVikeExtensions(vikeConfig) {

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

@@ -1,4 +1,4 @@
-import '../assertEnvVite.js';
 export { pluginWorkaroundCssModuleHmr };
 import type { Plugin } from 'vite';
+import '../assertEnvVite.js';
 declare function pluginWorkaroundCssModuleHmr(): Plugin[];

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

@@ -1,5 +1,5 @@
-import '../assertEnvVite.js';
 export { pluginWorkaroundCssModuleHmr };
+import '../assertEnvVite.js';
 function pluginWorkaroundCssModuleHmr() {
     return [
         {

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

@@ -1,4 +1,4 @@
-import '../assertEnvVite.js';
 export { pluginWorkaroundVite6HmrRegression };
 import type { Plugin } from 'vite';
+import '../assertEnvVite.js';
 declare function pluginWorkaroundVite6HmrRegression(): Plugin[];

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

@@ -1,5 +1,5 @@
-import '../assertEnvVite.js';
 export { pluginWorkaroundVite6HmrRegression };
+import '../assertEnvVite.js';
 // https://vite.dev/guide/migration (will be 404 after vite@7 release) > search for `hmrReload()`
 // https://v6.vite.dev/guide/migration (will exist after vite@7 release) > search for `hmrReload()`
 // Workaround seems to work for docs page /banner (which is HTML-only)

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

@@ -1,5 +1,5 @@
-import '../assertEnvVite.js';
 export { addSsrMiddleware };
 import type { ResolvedConfig, ViteDevServer } from 'vite';
+import '../assertEnvVite.js';
 type ConnectServer = ViteDevServer['middlewares'];
 declare function addSsrMiddleware(middlewares: ConnectServer, config: ResolvedConfig, isPreview: boolean, isPrerenderingEnabled: boolean | null): void;

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

@@ -1,8 +1,8 @@
-import '../assertEnvVite.js';
 export { addSsrMiddleware };
 import { renderPageServer } from '../../../server/runtime/renderPageServer.js';
 import { assertWarning } from '../../../utils/assert.js';
 import pc from '@brillout/picocolors';
+import '../assertEnvVite.js';
 function addSsrMiddleware(middlewares, config, isPreview, isPrerenderingEnabled) {
     middlewares.use(async (req, res, next) => {
         if (res.headersSent)
@@ -31,7 +31,7 @@ function addSsrMiddleware(middlewares, config, isPreview, isPrerenderingEnabled)
             pageContext = await renderPageServer(pageContextInit);
         }
         catch (err) {
-            // Throwing an error in a connect middleware shut downs the server
+            // Throwing an error in a connect middleware shuts down the server
             console.error(err);
             // - next(err) automatically uses buildErrorMessage() (pretty formatting of Rollup errors)
             //   - But it only works for users using Vite's standalone dev server (it doesn't work for users using Vite's dev middleware)

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

@@ -1,5 +1,5 @@
-import '../assertEnvVite.js';
 export { findPageFiles };
 import type { ResolvedConfig } from 'vite';
 import type { FileType } from '../../../shared-server-client/getPageFiles/fileTypes.js';
+import '../assertEnvVite.js';
 declare function findPageFiles(config: ResolvedConfig, fileTypes: FileType[], isDev: boolean): Promise<string[]>;

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

@@ -1,4 +1,3 @@
-import '../assertEnvVite.js';
 export { findPageFiles };
 import { glob } from 'tinyglobby';
 import { scriptFileExtensionPattern } from '../../../utils/isScriptFile.js';
@@ -6,6 +5,7 @@ import { toPosixPath } from '../../../utils/path.js';
 import { assertWarning } from '../../../utils/assert.js';
 import pc from '@brillout/picocolors';
 import { getOutDirs } from './getOutDirs.js';
+import '../assertEnvVite.js';
 async function findPageFiles(config, fileTypes, isDev) {
     const cwd = config.root;
     const { outDirRoot } = getOutDirs(config, undefined);

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

@@ -1,4 +1,4 @@
-import '../assertEnvVite.js';
 export { getAssetsDir };
 import type { ResolvedConfig } from 'vite';
+import '../assertEnvVite.js';
 declare function getAssetsDir(config: ResolvedConfig): string;

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

@@ -1,6 +1,6 @@
-import '../assertEnvVite.js';
 export { getAssetsDir };
 import { assertUsage } from '../../../utils/assert.js';
+import '../assertEnvVite.js';
 function getAssetsDir(config) {
     let { assetsDir } = config.build;
     assertUsage(assetsDir, `${assetsDir} cannot be an empty string`);

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

@@ -1,5 +1,5 @@
-import '../assertEnvVite.js';
 export { getClientEntrySrcDev };
 export type GetClientEntrySrcDev = typeof getClientEntrySrcDev;
 import type { ViteDevServer } from 'vite';
+import '../assertEnvVite.js';
 declare function getClientEntrySrcDev(clientEntry: string, viteDevServer: ViteDevServer): string;

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

@@ -1,11 +1,11 @@
-import '../assertEnvVite.js';
 export { getClientEntrySrcDev };
 import { assertIsNotProductionRuntime } from '../../../utils/assertSetup.js';
-import { assertIsImportPathNpmPackage } from '../../../utils/parseNpmPackage.js';
+import { assertImportIsNpmPackage } from '../../../utils/parseNpmPackage.js';
 import { toPosixPath, pathJoin } from '../../../utils/path.js';
 import { requireResolveNpmPackage, requireResolveDistFile } from '../../../utils/requireResolve.js';
 import { assert } from '../../../utils/assert.js';
 import { assertPosixPath } from '../../../utils/path.js';
+import '../assertEnvVite.js';
 assertIsNotProductionRuntime();
 function getClientEntrySrcDev(clientEntry, viteDevServer) {
     let userRootDir = viteDevServer.config.root;
@@ -32,7 +32,7 @@ function getClientEntrySrcDev(clientEntry, viteDevServer) {
             filePath = requireResolveDistFile(`dist/${clientEntry.replace('@@vike/dist/', '')}`);
         }
         else {
-            assertIsImportPathNpmPackage(clientEntry);
+            assertImportIsNpmPackage(clientEntry);
             filePath = requireResolveNpmPackage({ importPathNpmPackage: clientEntry, userRootDir });
         }
     }

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

@@ -1,5 +1,5 @@
-import '../assertEnvVite.js';
 export { getEnvVarObject };
 export { parseJson5 };
+import '../assertEnvVite.js';
 declare function getEnvVarObject(envVarName: 'VITE_CONFIG' | 'VIKE_CRAWL' | 'VIKE_CONFIG'): null | Record<string, unknown>;
 declare function parseJson5(valueStr: string, what: string): unknown;

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

@@ -1,10 +1,10 @@
-import '../assertEnvVite.js';
 export { getEnvVarObject };
 export { parseJson5 };
 import pc from '@brillout/picocolors';
 import { assertUsage } from '../../../utils/assert.js';
 import { isObject } from '../../../utils/isObject.js';
 import JSON5 from 'json5';
+import '../assertEnvVite.js';
 function getEnvVarObject(envVarName) {
     const valueStr = process.env[envVarName];
     if (!valueStr)

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

@@ -1,4 +1,3 @@
-import '../assertEnvVite.js';
 export { getFilePathResolved };
 export { getFilePathUnresolved };
 export { getFilePathAbsoluteUserRootDir };
@@ -8,6 +7,7 @@ export { cleanFilePathUnknown };
 export { assertModuleId };
 import type { FilePathResolved, FilePathUnresolved } from '../../../types/FilePath.js';
 import type { ResolvedConfig } from 'vite';
+import '../assertEnvVite.js';
 declare function getFilePathResolved(args: {
     userRootDir: string;
 } & ({

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

@@ -1,4 +1,3 @@
-import '../assertEnvVite.js';
 export { getFilePathResolved };
 export { getFilePathUnresolved };
 export { getFilePathAbsoluteUserRootDir };
@@ -8,10 +7,11 @@ export { cleanFilePathUnknown };
 export { assertModuleId };
 import path from 'node:path';
 import { assertFilePathAbsoluteFilesystem } from '../../../utils/isFilePathAbsoluteFilesystem.js';
-import { assertIsImportPathNpmPackage } from '../../../utils/parseNpmPackage.js';
+import { assertImportIsNpmPackage } from '../../../utils/parseNpmPackage.js';
 import { toPosixPath } from '../../../utils/path.js';
 import { assert } from '../../../utils/assert.js';
 import { assertPosixPath } from '../../../utils/path.js';
+import '../assertEnvVite.js';
 function getFilePathResolved(args) {
     const { userRootDir } = args;
     let filePathAbsoluteFilesystem;
@@ -43,7 +43,7 @@ function getComputedProps(args) {
         const importPathAbsolute = args.importPathAbsolute ?? null;
         const { filePathAbsoluteUserRootDir } = args;
         if (importPathAbsolute)
-            assertIsImportPathNpmPackage(importPathAbsolute);
+            assertImportIsNpmPackage(importPathAbsolute);
         return {
             importPathAbsolute,
             filePathAbsoluteUserRootDir,
@@ -57,7 +57,7 @@ function getComputedProps(args) {
 }
 function getComputedPropsImportPathAbsolute(args) {
     const { importPathAbsolute } = args;
-    assertIsImportPathNpmPackage(importPathAbsolute);
+    assertImportIsNpmPackage(importPathAbsolute);
     return {
         filePathAbsoluteUserRootDir: null,
         importPathAbsolute,

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

@@ -1,6 +1,6 @@
-import '../assertEnvVite.js';
 export { getMagicString };
 import MagicString from 'magic-string';
+import '../assertEnvVite.js';
 declare function getMagicString(code: string, id: string): {
     magicString: MagicString;
     getMagicStringResult: () => {

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

@@ -1,6 +1,6 @@
-import '../assertEnvVite.js';
 export { getMagicString };
 import MagicString from 'magic-string';
+import '../assertEnvVite.js';
 // Used everywhere instead of `new MagicString()` for consistent source map generation
 function getMagicString(code, id) {
     const magicString = new MagicString(code);

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

@@ -1,3 +1,3 @@
-import '../assertEnvVite.js';
 export { getManifestFilePathRelative };
+import '../assertEnvVite.js';
 declare function getManifestFilePathRelative(manifestConfig: string | boolean): string;

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

@@ -1,6 +1,6 @@
-import '../assertEnvVite.js';
 export { getManifestFilePathRelative };
 import { assert } from '../../../utils/assert.js';
+import '../assertEnvVite.js';
 function getManifestFilePathRelative(manifestConfig) {
     assert(['string', 'boolean'].includes(typeof manifestConfig));
     assert(manifestConfig !== false);

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

@@ -1,9 +1,10 @@
-import '../assertEnvVite.js';
 export { getOutDirs };
 export { resolveOutDir };
+export { getOutDirsAllFromRootNormalized };
 export type { OutDirs };
 import type { UserConfig, ResolvedConfig } from 'vite';
 import { type ViteEnv } from './isViteServerSide.js';
+import '../assertEnvVite.js';
 type OutDirs = {
     /** Absolute path to `outDir` */
     outDirRoot: string;
@@ -15,3 +16,4 @@ type OutDirs = {
 declare function getOutDirs(configGlobal: ResolvedConfig, viteEnv: ViteEnv | undefined): OutDirs;
 /** Appends `client/` or `server/` to `config.build.outDir` */
 declare function resolveOutDir(config: UserConfig, isServerSide: boolean): string;
+declare function getOutDirsAllFromRootNormalized(outDirRoot: string, root: string): OutDirs;

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

@@ -1,12 +1,13 @@
-import '../assertEnvVite.js';
 export { getOutDirs };
 export { resolveOutDir };
+export { getOutDirsAllFromRootNormalized };
 import pc from '@brillout/picocolors';
 import { createDebug } from '../../../utils/debug.js';
 import { pathJoin, toPosixPath } from '../../../utils/path.js';
 import { assert, assertUsage } from '../../../utils/assert.js';
 import { assertPosixPath } from '../../../utils/path.js';
 import { isViteServerSide_viteEnvOptional } from './isViteServerSide.js';
+import '../assertEnvVite.js';
 const debug = createDebug('vike:outDir');
 function getOutDirs(configGlobal, viteEnv) {
     debug('getOutDirs()', new Error().stack);
@@ -76,9 +77,12 @@ function getOutDirsAllFromRootNormalized(outDirRoot, root) {
         outDirRoot = pathJoin(root, outDirRoot);
     }
     let { outDirClient, outDirServer } = determineOutDirs(outDirRoot);
-    outDirRoot = outDirRoot + '/';
-    outDirClient = outDirClient + '/';
-    outDirServer = outDirServer + '/';
+    if (!outDirRoot.endsWith('/'))
+        outDirRoot = outDirRoot + '/';
+    if (!outDirClient.endsWith('/'))
+        outDirClient = outDirClient + '/';
+    if (!outDirServer.endsWith('/'))
+        outDirServer = outDirServer + '/';
     assertNormalization(outDirRoot);
     assertNormalization(outDirClient);
     assertNormalization(outDirServer);

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

@@ -1,7 +1,7 @@
-import '../assertEnvVite.js';
 export { getViteConfigRuntime };
 export type { ViteConfigRuntime };
 import type { ResolvedConfig } from 'vite';
+import '../assertEnvVite.js';
 type ViteConfigRuntime = ReturnType<typeof getViteConfigRuntime>;
 declare function getViteConfigRuntime(config: ResolvedConfig): {
     root: string;

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

@@ -1,9 +1,9 @@
-import '../assertEnvVite.js';
 export { getViteConfigRuntime };
 import { assertFilePathAbsoluteFilesystem } from '../../../utils/isFilePathAbsoluteFilesystem.js';
 import { assert } from '../../../utils/assert.js';
 import { hasProp } from '../../../utils/hasProp.js';
 import { getOutDirs } from './getOutDirs.js';
+import '../assertEnvVite.js';
 function getViteConfigRuntime(config) {
     assert(hasProp(config, '_baseViteOriginal', 'string'));
     const { outDirRoot } = getOutDirs(config, undefined);

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

@@ -1,10 +1,10 @@
-import '../assertEnvVite.js';
 export { parseImportString };
 export { isImportString };
 export { serializeImportString };
 export type { ImportString };
 export type { ImportStringList };
 export type { ImportStringParsed };
+import '../assertEnvVite.js';
 /** `import:${importPath}:${exportName}`
  * @example import:./Layout:default
  */

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

@@ -1,9 +1,9 @@
-import '../assertEnvVite.js';
 export { parseImportString };
 export { isImportString };
 export { serializeImportString };
 import pc from '@brillout/picocolors';
 import { assert, assertWarning } from '../../../utils/assert.js';
+import '../assertEnvVite.js';
 const IMPORT = 'import';
 const SEP = ':';
 /**

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

@@ -1,3 +1,3 @@
-import '../assertEnvVite.js';
 export { isAsset };
+import '../assertEnvVite.js';
 declare function isAsset(filename: string): boolean;

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

@@ -1,5 +1,5 @@
-import '../assertEnvVite.js';
 export { isAsset };
+import '../assertEnvVite.js';
 function isAsset(filename) {
     return assetFileExtensions.some((ext) => filename.endsWith('.' + ext));
 }

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

@@ -1,7 +1,7 @@
-import '../assertEnvVite.js';
 export { isViteCli };
 export { getViteConfigForBuildFromCli };
 export { getViteCommandFromCli };
+import '../assertEnvVite.js';
 declare function isViteCli(): boolean;
 type ConfigFromCli = {
     root: undefined | string;

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

@@ -1,23 +1,14 @@
-import '../assertEnvVite.js';
 export { isViteCli };
 export { getViteConfigForBuildFromCli };
 export { getViteCommandFromCli };
-import { toPosixPath } from '../../../utils/path.js';
 import { assert } from '../../../utils/assert.js';
 import { isObject } from '../../../utils/isObject.js';
+import { isToolCli } from '../../../utils/isToolCli.js';
 import { cac } from 'cac';
+import '../assertEnvVite.js';
 const desc = 'vike:vite-cli-simulation';
 function isViteCli() {
-    let execPath = process.argv[1];
-    assert(execPath);
-    execPath = toPosixPath(execPath);
-    return (
-    // pnpm
-    execPath.endsWith('/bin/vite.js') ||
-        // npm & yarn
-        execPath.endsWith('/.bin/vite') ||
-        // Global install
-        execPath.endsWith('/bin/vite'));
+    return isToolCli('vite');
 }
 function getViteCommandFromCli() {
     if (!isViteCli())

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

@@ -1,4 +1,3 @@
-import '../assertEnvVite.js';
 export { isViteServerSide };
 export { isViteServerSide_viteEnvOptional };
 export { isViteServerSide_onlySsrEnv };
@@ -7,6 +6,7 @@ export { isViteServerSide_applyToEnvironment };
 export { isViteServerSide_configEnvironment };
 export type { ViteEnv };
 import type { Environment, EnvironmentOptions, ResolvedConfig, UserConfig, Plugin } from 'vite';
+import '../assertEnvVite.js';
 type ViteEnv = {
     name?: string;
     config: EnvironmentOptions | Environment['config'];

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

@@ -1,4 +1,3 @@
-import '../assertEnvVite.js';
 export { isViteServerSide };
 export { isViteServerSide_viteEnvOptional };
 export { isViteServerSide_onlySsrEnv };
@@ -7,6 +6,7 @@ export { isViteServerSide_applyToEnvironment };
 export { isViteServerSide_configEnvironment };
 import { viteVersionMin } from '../../../utils/assertViteVersion.js';
 import { assert, assertUsage } from '../../../utils/assert.js';
+import '../assertEnvVite.js';
 function isViteServerSide_impl(configGlobal, viteEnv) {
     assert(!('consumer' in configGlobal)); // make sure configGlobal isn't viteEnv.config
     const debug = {

package/dist/node/vite/shared/loggerDev/errorWithCodeSnippet.d.ts

@@ -1,9 +1,9 @@
-import '../../assertEnvVite.js';
 export { getPrettyErrorWithCodeSnippet };
 export { isErrorWithCodeSnippet };
 export { isEquivalentErrorWithCodeSnippet };
 export type { ErrorWithCodeSnippet };
 export { getPrettyErrMessage };
+import '../../assertEnvVite.js';
 type ErrorWithCodeSnippet = {
     id: string;
     frame?: string;

package/dist/node/vite/shared/loggerDev/errorWithCodeSnippet.js

@@ -1,4 +1,3 @@
-import '../../assertEnvVite.js';
 // Prettify transpilation errors
 //  - Doesn't work for optimize errors: https://gist.github.com/brillout/9b7bb78ae866558b292ea1b516a986ec
 export { getPrettyErrorWithCodeSnippet };
@@ -14,6 +13,7 @@ import { escapeRegex } from '../../../../utils/escapeRegex.js';
 import { isObject } from '../../../../utils/isObject.js';
 import { removeEmptyLines } from '../../../../utils/removeEmptyLines.js';
 import { cleanFilePathUnknown, getFilePathToShowToUserUnknown } from '../getFilePath.js';
+import '../../assertEnvVite.js';
 function isErrorWithCodeSnippet(err) {
     if (!isObject(err)) {
         return false;

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

@@ -1,10 +1,10 @@
-import '../assertEnvVite.js';
 export { logVite };
 export { logConfigInfo };
 export { logErrorServerDev };
 export type { LogType };
 export type { AddAssertTagsDev };
 import { type PageContext_logRuntime } from '../../../server/runtime/loggerRuntime.js';
+import '../assertEnvVite.js';
 type LogType = 'info' | 'warn' | 'error' | 'error-resolve';
 declare function logConfigInfo(msg: string, logType: LogType): void;
 declare function logVite(msg: string, logType: LogType, requestId: number | null, prependViteTag: boolean): void;

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

@@ -1,4 +1,3 @@
-import '../assertEnvVite.js';
 // TO-DO/eventually:
 // - New hook onLog(): https://github.com/vikejs/vike/issues/1438
 // - Exact same logs between prod and dev, only difference is that some log objects have:
@@ -29,6 +28,7 @@ import { logErrorServer } from '../../../server/runtime/logErrorServer.js';
 import { getBetterError } from '../../../utils/getBetterError.js';
 import { getRequestId_withAsyncHook } from '../../../server/runtime/asyncHook.js';
 import { getRequestTag } from '../../../server/runtime/renderPageServer.js';
+import '../assertEnvVite.js';
 assertIsNotProductionRuntime();
 setLogRuntimeDev(logErrorServerDev, logRuntimeInfoDev);
 setAssertOnBeforeErr((err) => {