vike 0.4.161 → 0.4.162

package/dist/cjs/node/shared/{getClientEntryFilePath.js → getClientEntry.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getClientEntryFilePath = void 0;
+exports.getClientEntry = void 0;
 const helpers_js_1 = require("../../shared/page-configs/helpers.js");
-function getClientEntryFilePath(pageConfig) {
+function getClientEntry(pageConfig) {
     const configName = 'client';
     const configValue = (0, helpers_js_1.getConfigValue)(pageConfig, configName, 'string');
     if (!configValue)
         return null;
     return configValue.value;
 }
-exports.getClientEntryFilePath = getClientEntryFilePath;
+exports.getClientEntry = getClientEntry;

package/dist/cjs/node/shared/prependEntriesDir.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prependEntriesDir = void 0;
+const utils_js_1 = require("./utils.js");
+function prependEntriesDir(entryName) {
+    if (entryName.startsWith('/')) {
+        entryName = entryName.slice(1);
+    }
+    (0, utils_js_1.assert)(!entryName.startsWith('/'));
+    entryName = `entries/${entryName}`;
+    return entryName;
+}
+exports.prependEntriesDir = prependEntriesDir;

package/dist/cjs/node/shared/utils.js

@@ -31,3 +31,5 @@ __exportStar(require("../../utils/parseUrl-extras.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);
 __exportStar(require("../../utils/virtual-files.js"), exports);
 __exportStar(require("../../utils/assertIsNotBrowser.js"), exports);
+__exportStar(require("../../utils/isNotNullish.js"), exports);
+__exportStar(require("../../utils/unique.js"), exports);

package/dist/cjs/node/shared/virtual-files/virtualFileImportUserCode.js

@@ -15,6 +15,7 @@ function isVirtualFileIdImportUserCode(id) {
         return false;
     (0, utils_js_1.assert)(
     // prettier-ignore
+    // biome-ignore format:
     [
         virtualFileIdImportUserCodeServer,
         virtualFileIdImportUserCodeClientCR,

package/dist/cjs/shared/hooks/getHook.js

@@ -56,7 +56,7 @@ function getHookFromPageConfigGlobal(pageConfigGlobal, hookName) {
     // hook isn't a computed nor a cumulative config => definedAt should always be defined
     (0, utils_js_1.assert)(hookFilePath);
     assertHookFn(hookFn, { hookName, hookFilePath });
-    // We could use the global value of config.hooksTimeout but it requires some non-trivial refactoring
+    // We could use the global value of configooksTimeout but it requires some non-trivial refactoring
     const hookTimeout = getHookTimeoutDefault(hookName);
     return { hookFn, hookName, hookFilePath, hookTimeout };
 }

package/dist/cjs/shared/page-configs/helpers/getConfigValue.js

@@ -8,6 +8,7 @@ const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getConfigDefinedAtString_js_1 = require("./getConfigDefinedAtString.js");
 // prettier-ignore
+// biome-ignore format:
 function getConfigValue(pageConfig, configName, type) {
     const configValue = getConfigValueEntry(pageConfig, configName);
     if (configValue === null)

package/dist/cjs/shared/page-configs/serialize/parseConfigValuesImported.js

@@ -78,7 +78,7 @@ function assertIsNotNull(configValue, configName, importPath) {
      *  - for cumulative values in the future: we don't need this for now because, currently, cumulative values are never imported.
     assertUsage(
       configValue !== null,
-      `Set ${pc.cyan(configName)} to ${pc.cyan('null')} in a +config.h.js file instead of ${importPath}`
+      `Set ${pc.cyan(configName)} to ${pc.cyan('null')} in a +config.js file instead of ${importPath}`
     )
     */
 }

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

@@ -164,6 +164,7 @@ function assertNoInfiniteLoop(pageContextsFromRewrite) {
 function assertNoInfiniteAbortLoop(rewriteCount, redirectCount) {
     const abortCalls = [
         // prettier-ignore
+        // biome-ignore format:
         rewriteCount > 0 && picocolors_1.default.cyan("throw render('/some-url')"),
         redirectCount > 0 && picocolors_1.default.cyan("throw redirect('/some-url')")
     ]

package/dist/cjs/shared/route/resolvePrecedence.js

@@ -9,6 +9,7 @@ const resolveRouteString_js_2 = require("./resolveRouteString.js");
 // See https://vike.dev/route-function#precedence
 function resolvePrecendence(routeMatches) {
     // prettier-ignore
+    // biome-ignore format:
     routeMatches
         .sort(sortMatches)
         .sort((0, utils_js_2.makeFirst)((routeMatch) => routeMatch.routeType === 'FUNCTION' && !!routeMatch.precedence && routeMatch.precedence < 0))

package/dist/cjs/utils/{nodeEnv.js → assertNodeEnv.js}

@@ -1,4 +1,7 @@
 "use strict";
+// Utils to manage process.env.NODE_ENV and, most notably, to assert correct usage, which is crucial:
+//  - https://github.com/vikejs/vike/issues/1469#issuecomment-1919518096
+//  - https://github.com/vitejs/vite/blob/76f30ae23b92f9af910ec02d98e2baaefa12141f/packages/vite/src/node/config.ts#L567
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/cjs/utils/formatHintLog.js

@@ -9,6 +9,7 @@ function formatHintLog(msg) {
     const sep = '─'.repeat(msgLength);
     return [
         // prettier-ignore
+        // biome-ignore format:
         `┌─${sep}─┐`,
         `│ ${msg} │`,
         `└─${sep}─┘`

package/dist/cjs/utils/hasProp.js

@@ -6,6 +6,7 @@ exports.hasProp = void 0;
 const isCallable_js_1 = require("./isCallable.js");
 const isObject_js_1 = require("./isObject.js");
 // prettier-ignore
+// biome-ignore format:
 function hasProp(obj, prop, type = 'unknown') {
     if (!(0, isObject_js_1.isObject)(obj))
         return false;

package/dist/cjs/utils/isScriptFile.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scriptFileExtensionList = exports.scriptFileExtensions = exports.isTemplateFile = exports.isScriptFile = void 0;
+exports.scriptFileExtensionList = exports.scriptFileExtensions = exports.isTemplateFile = exports.isJavaScriptFile = exports.isScriptFile = void 0;
 const assert_js_1 = require("./assert.js");
 // We can't use a RegExp:
 //  - Needs to work with Micromatch: https://github.com/micromatch/micromatch because:
@@ -12,6 +12,7 @@ const assert_js_1 = require("./assert.js");
 //     - We cannot implement a blacklist with a glob pattern.
 //     - A post `import.meta.glob()` blacklist filtering doesn't work because Vite would still process the files (e.g. including them in the bundle).
 // prettier-ignore
+// biome-ignore format:
 const extJavaScript = [
     'js',
     'ts',
@@ -19,6 +20,10 @@ const extJavaScript = [
     'cts',
     'mjs',
     'mts',
+];
+// prettier-ignore
+// biome-ignore format:
+const extJsx = [
     'jsx',
     'tsx',
     'cjsx',
@@ -27,6 +32,7 @@ const extJavaScript = [
     'mtsx',
 ];
 // prettier-ignore
+// biome-ignore format:
 const extTemplates = [
     'vue',
     'svelte',
@@ -34,19 +40,24 @@ const extTemplates = [
     'md',
     'mdx'
 ];
-const scriptFileExtensionList = [...extJavaScript, ...extTemplates];
+const scriptFileExtensionList = [...extJavaScript, ...extJsx, ...extTemplates];
 exports.scriptFileExtensionList = scriptFileExtensionList;
 const scriptFileExtensions = '(' + scriptFileExtensionList.join('|') + ')';
 exports.scriptFileExtensions = scriptFileExtensions;
 function isScriptFile(filePath) {
     const yes = scriptFileExtensionList.some((ext) => filePath.endsWith('.' + ext));
-    (0, assert_js_1.assert)(!isJavaScriptFile(filePath) || yes);
+    if (isJavaScriptFile(filePath))
+        (0, assert_js_1.assert)(yes);
     return yes;
 }
 exports.isScriptFile = isScriptFile;
 function isJavaScriptFile(filePath) {
-    return /\.(c|m)?(j|t)sx?$/.test(filePath);
+    const yes1 = /\.(c|m)?(j|t)s$/.test(filePath);
+    const yes2 = extJavaScript.some((ext) => filePath.endsWith('.' + ext));
+    (0, assert_js_1.assert)(yes1 === yes2);
+    return yes1;
 }
+exports.isJavaScriptFile = isJavaScriptFile;
 function isTemplateFile(filePath) {
     return extTemplates.some((ext) => filePath.endsWith('.' + ext));
 }

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.161';
+const PROJECT_VERSION = '0.4.162';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/__internal/index.js

@@ -2,7 +2,7 @@
 export { route, getPagesAndRoutes };
 import { route as routeInternal } from '../shared/route/index.js';
 import { getGlobalContext, initGlobalContext } from '../node/runtime/globalContext.js';
-import { setNodeEnvToProduction } from '../utils/nodeEnv.js';
+import { setNodeEnvToProduction } from '../utils/assertNodeEnv.js';
 import { assert } from '../utils/assert.js';
 import { getRenderContext } from '../node/runtime/renderPage/renderPageAlreadyRouted.js';
 /**

package/dist/esm/client/shared/loadUserFilesClientSide.js

@@ -12,6 +12,7 @@ async function loadUserFilesClientSide(pageId, pageFilesAll, pageConfigs) {
     const isDev = import.meta.env.DEV;
     try {
         // prettier-ignore
+        // biome-ignore format:
         const result = await Promise.all([
             pageConfig && loadConfigValues(pageConfig, isDev),
             ...pageFilesClientSide.map((p) => p.loadFile?.()),

package/dist/esm/node/plugin/index.js

@@ -19,7 +19,6 @@ import { suppressRollupWarning } from './plugins/suppressRollupWarning.js';
 import { setGlobalContext } from './plugins/setGlobalContext.js';
 import { importBuild } from './plugins/importBuild/index.js';
 import { commonConfig } from './plugins/commonConfig.js';
-import { extensionsAssets } from './plugins/extensionsAssets.js';
 import { baseUrls } from './plugins/baseUrls.js';
 import { envVarsPlugin } from './plugins/envVars.js';
 import pc from '@brillout/picocolors';
@@ -44,7 +43,6 @@ function plugin(vikeConfig) {
         suppressRollupWarning(),
         setGlobalContext(),
         ...importBuild(),
-        extensionsAssets(),
         baseUrls(vikeConfig),
         envVarsPlugin(),
         fileEnv()

package/dist/esm/node/plugin/plugins/buildConfig.js

@@ -2,7 +2,7 @@ export { buildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
 export { manifestTempFile };
-import { assert, resolveOutDir, viteIsSSR, getFilePathAbsolute, addOnBeforeLogHook, removeFileExtention, unique, assertPosixPath, assertUsage, injectRollupInputs, normalizeRollupInput, assertNodeEnvIsNotDev, getOutDirs } from '../utils.js';
+import { assert, resolveOutDir, viteIsSSR, getFilePathAbsolute, addOnBeforeLogHook, removeFileExtention, unique, assertPosixPath, assertUsage, injectRollupInputs, normalizeRollupInput, assertNodeEnvIsNotDev, getOutDirs, isNpmPackageImport } from '../utils.js';
 import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { getConfigValue } from '../../../shared/page-configs/helpers.js';
 import { findPageFiles } from '../shared/findPageFiles.js';
@@ -10,11 +10,12 @@ import { getConfigVike } from '../../shared/getConfigVike.js';
 import { getVirtualFileIdPageConfigValuesAll } from '../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { createRequire } from 'module';
-import { getClientEntryFilePath } from '../../shared/getClientEntryFilePath.js';
+import { getClientEntry } from '../../shared/getClientEntry.js';
 import fs from 'fs/promises';
 import path from 'path';
 import { fixServerAssets, fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
 import { set_constant_ASSETS_MAP } from './importBuild/index.js';
+import { prependEntriesDir } from '../../shared/prependEntriesDir.js';
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
@@ -132,7 +133,7 @@ function analyzeClientEntries(pageConfigs, config) {
     let hasClientRouting = false;
     let hasServerRouting = false;
     let clientEntries = {};
-    let clientFilePaths = [];
+    let clientEntryList = [];
     pageConfigs.forEach((pageConfig) => {
         const configValue = getConfigValue(pageConfig, 'clientRouting', 'boolean');
         if (configValue?.value) {
@@ -147,15 +148,15 @@ function analyzeClientEntries(pageConfigs, config) {
             clientEntries[entryName] = entryTarget;
         }
         {
-            const clientFilePath = getClientEntryFilePath(pageConfig);
-            if (clientFilePath) {
-                clientFilePaths.push(clientFilePath);
+            const clientEntry = getClientEntry(pageConfig);
+            if (clientEntry) {
+                clientEntryList.push(clientEntry);
             }
         }
     });
-    clientFilePaths = unique(clientFilePaths);
-    clientFilePaths.forEach((pageFile) => {
-        const { entryName, entryTarget } = getEntryFromFilePath(pageFile, config);
+    clientEntryList = unique(clientEntryList);
+    clientEntryList.forEach((clientEntry) => {
+        const { entryName, entryTarget } = getEntryFromClientEntry(clientEntry, config);
         clientEntries[entryName] = entryTarget;
     });
     return { hasClientRouting, hasServerRouting, clientEntries };
@@ -177,12 +178,18 @@ async function getPageFileEntries(config, includeAssetsImportedByServer) {
             assert(includeAssetsImportedByServer);
             addExtractAssetsQuery = true;
         }
-        const { entryName, entryTarget } = getEntryFromFilePath(pageFile, config, addExtractAssetsQuery);
+        const { entryName, entryTarget } = getEntryFromClientEntry(pageFile, config, addExtractAssetsQuery);
         pageFileEntries[entryName] = entryTarget;
     });
     return pageFileEntries;
 }
-function getEntryFromFilePath(filePath, config, addExtractAssetsQuery) {
+function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
+    if (isNpmPackageImport(clientEntry)) {
+        const entryTarget = clientEntry;
+        const entryName = prependEntriesDir(clientEntry);
+        return { entryName, entryTarget };
+    }
+    const filePath = clientEntry;
     assertPosixPath(filePath);
     assert(filePath.startsWith('/'));
     let entryTarget = getFilePathAbsolute(filePath, config);
@@ -202,14 +209,6 @@ function getEntryFromPageConfig(pageConfig, isForClientSide) {
     entryName = prependEntriesDir(entryName);
     return { entryName, entryTarget };
 }
-function prependEntriesDir(entryName) {
-    if (entryName.startsWith('/')) {
-        entryName = entryName.slice(1);
-    }
-    assert(!entryName.startsWith('/'));
-    entryName = `entries/${entryName}`;
-    return entryName;
-}
 function resolve(filePath) {
     assert(filePath.startsWith('dist/'));
     // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/
@@ -229,6 +228,7 @@ function addLogHook() {
     });
     // Exhaustive list extracted from writeLine() calls at https://github.com/vitejs/vite/blob/193d55c7b9cbfec5b79ebfca276d4a721e7de14d/packages/vite/src/node/plugins/reporter.ts
     // prettier-ignore
+    // biome-ignore format:
     const viteTransientLogs = [
         'transforming (',
         'rendering chunks (',

package/dist/esm/node/plugin/plugins/config/index.js

@@ -1,9 +1,7 @@
 export { resolveVikeConfig };
 import { assertVikeConfig } from './assertVikeConfig.js';
 import { isDev2 } from '../../utils.js';
-import { findConfigVikeFromStemPackages } from './findConfigVikeFromStemPackages.js';
 import { pickFirst } from './pickFirst.js';
-import { resolveExtensions } from './resolveExtensions.js';
 import { resolveBase } from './resolveBase.js';
 import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
 import pc from '@brillout/picocolors';
@@ -21,10 +19,8 @@ function resolveVikeConfig(vikeConfig) {
 async function getConfigVikPromise(vikeConfig, config) {
     const fromPluginOptions = (vikeConfig ?? {});
     const fromViteConfig = (config.vike ?? {});
-    const fromStemPackages = await findConfigVikeFromStemPackages(config.root);
-    const configs = [fromPluginOptions, ...fromStemPackages, fromViteConfig];
-    const extensions = resolveExtensions(configs, config);
-    const { globalVikeConfig: fromPlusConfigFile } = await getVikeConfig(config, isDev2(config), false, extensions);
+    const configs = [fromPluginOptions, fromViteConfig];
+    const { globalVikeConfig: fromPlusConfigFile } = await getVikeConfig(config, isDev2(config), false);
     configs.push(fromPlusConfigFile);
     assertVikeConfig(fromPlusConfigFile, ({ prop, errMsg }) => {
         // TODO: add config file path ?
@@ -36,7 +32,6 @@ async function getConfigVikPromise(vikeConfig, config) {
     const { baseServer, baseAssets } = resolveBase(configs, config);
     const configVike = {
         disableAutoFullBuild: pickFirst(configs.map((c) => c.disableAutoFullBuild)) ?? null,
-        extensions,
         prerender: resolvePrerenderOptions(configs),
         includeAssetsImportedByServer: pickFirst(configs.map((c) => c.includeAssetsImportedByServer)) ?? true,
         baseServer,

package/dist/esm/node/plugin/plugins/devConfig/determineFsAllowList.d.ts

@@ -1,4 +1,3 @@
 export { determineFsAllowList };
 import type { ResolvedConfig } from 'vite';
-import type { ConfigVikeResolved } from '../../../../shared/ConfigVike.js';
-declare function determineFsAllowList(config: ResolvedConfig, configVike: ConfigVikeResolved): Promise<void>;
+declare function determineFsAllowList(config: ResolvedConfig): Promise<void>;

package/dist/esm/node/plugin/plugins/devConfig/determineFsAllowList.js

@@ -1,7 +1,6 @@
 export { determineFsAllowList };
 import { searchForWorkspaceRoot } from 'vite';
 import path from 'path';
-import fs from 'fs';
 import { assert } from '../../utils.js';
 import { createRequire } from 'module';
 import { dirname } from 'path';
@@ -10,7 +9,7 @@ import { fileURLToPath } from 'url';
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 const __dirname_ = dirname(fileURLToPath(importMetaUrl));
-async function determineFsAllowList(config, configVike) {
+async function determineFsAllowList(config) {
     const fsAllow = config.server.fs.allow;
     // fsAllow should already contain searchForWorkspaceRoot()
     assert(fsAllow.length >= 1);
@@ -27,10 +26,4 @@ async function determineFsAllowList(config, configVike) {
         require_.resolve(`${vikeRoot}/dist/esm/node/plugin/plugins/devConfig/index.js`);
         fsAllow.push(vikeRoot);
     }
-    // Add Vike extensions, e.g. node_modules/stem-react/
-    configVike.extensions.forEach(({ npmPackageRootDir }) => {
-        const npmPackageRootDirReal = fs.realpathSync(npmPackageRootDir);
-        fsAllow.push(npmPackageRootDir);
-        fsAllow.push(npmPackageRootDirReal);
-    });
 }

package/dist/esm/node/plugin/plugins/devConfig/determineOptimizeDeps.d.ts

@@ -1,4 +1,3 @@
 export { determineOptimizeDeps };
 import type { ResolvedConfig } from 'vite';
-import { ConfigVikeResolved } from '../../../../shared/ConfigVike.js';
-declare function determineOptimizeDeps(config: ResolvedConfig, configVike: ConfigVikeResolved, isDev: true): Promise<void>;
+declare function determineOptimizeDeps(config: ResolvedConfig, isDev: true): Promise<void>;

package/dist/esm/node/plugin/plugins/devConfig/determineOptimizeDeps.js

@@ -1,11 +1,11 @@
 export { determineOptimizeDeps };
 import { findPageFiles } from '../../shared/findPageFiles.js';
-import { assert, getFilePathAbsolute, isNotNullish, isNpmPackageImport, unique } from '../../utils.js';
+import { assert, getFilePathAbsolute, isNpmPackageImport, unique } from '../../utils.js';
 import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
 import { getConfigValueSourcesNotOverriden } from '../../shared/getConfigValueSourcesNotOverriden.js';
 import { analyzeClientEntries } from '../buildConfig.js';
 import { virtualFileIdImportUserCodeClientCR, virtualFileIdImportUserCodeClientSR } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
-async function determineOptimizeDeps(config, configVike, isDev) {
+async function determineOptimizeDeps(config, isDev) {
     const { pageConfigs } = await getVikeConfig(config, isDev);
     const { entries, include } = await getPageDeps(config, pageConfigs, isDev);
     {
@@ -16,7 +16,6 @@ async function determineOptimizeDeps(config, configVike, isDev) {
         const entriesVirtualFiles = getVirtualFiles(config, pageConfigs);
         entries.push(...entriesVirtualFiles);
     }
-    include.push(...getExtensionsDeps(configVike));
     /* Other Vite plugins may populate optimizeDeps, e.g. Cypress: https://github.com/vikejs/vike/issues/386
     assert(config.optimizeDeps.entries === undefined)
     */
@@ -88,22 +87,6 @@ function getVirtualFiles(config, pageConfigs) {
         entriesVirtualFiles.push(virtualFileIdImportUserCodeClientSR);
     return entriesVirtualFiles;
 }
-function getExtensionsDeps(configVike) {
-    return [
-        /* Doesn't work since `pageConfigsSrcDir` is a directory. We could make it work by using find-glob.
-        ...configVike.extensions
-          .map(({ pageConfigsSrcDir }) => pageConfigsSrcDir)
-          .flat()
-          .filter(isNotNullish),
-        //*/
-        ...configVike.extensions
-            .map(({ pageConfigsDistFiles }) => pageConfigsDistFiles)
-            .flat()
-            .filter(isNotNullish)
-            .filter(({ importPath }) => !importPath.endsWith('.css'))
-            .map(({ importPath }) => importPath)
-    ];
-}
 function normalizeEntries(entries) {
     if (Array.isArray(entries))
         return entries;

package/dist/esm/node/plugin/plugins/devConfig/index.js

@@ -1,7 +1,6 @@
 export { devConfig };
 import { determineOptimizeDeps } from './determineOptimizeDeps.js';
 import { determineFsAllowList } from './determineFsAllowList.js';
-import { getConfigVike } from '../../../shared/getConfigVike.js';
 import { addSsrMiddleware } from '../../shared/addSsrMiddleware.js';
 import { markEnvAsViteDev } from '../../utils.js';
 import { improveViteLogs } from '../../shared/loggerVite.js';
@@ -55,9 +54,8 @@ function devConfig() {
             },
             async configResolved(config_) {
                 config = config_;
-                const configVike = await getConfigVike(config);
-                await determineOptimizeDeps(config, configVike, isDev);
-                await determineFsAllowList(config, configVike);
+                await determineOptimizeDeps(config, isDev);
+                await determineFsAllowList(config);
                 if (!isErrorDebug()) {
                     await installHttpRequestAsyncStore();
                     improveViteLogs(config);

package/dist/esm/node/plugin/plugins/envVars.js

@@ -3,6 +3,7 @@ export { envVarsPlugin };
 export { applyEnvVar };
 import { loadEnv } from 'vite';
 import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, getFilePathRelativeToUserRootDir, lowerFirst } from '../utils.js';
+import { sourceMapPassthrough } from '../shared/rollupSourceMap.js';
 function envVarsPlugin() {
     let envsAll;
     let config;
@@ -62,8 +63,11 @@ function envVarsPlugin() {
                 // Apply
                 code = applyEnvVar(envName, envVal, code);
             });
-            // No need for low-resolution source map since line numbers didn't change. (Does Vite do high-resolution column numbers source mapping?)
-            return code;
+            // Line numbers didn't change.
+            //  - We only break the column number of a couple of lines, wich is acceptable.
+            //  - Anyways, I'm not even sure Vite supports high-resolution column number source mapping.
+            const ret = sourceMapPassthrough(code);
+            return ret;
         }
     };
 }

package/dist/esm/node/plugin/plugins/extractAssetsPlugin.js

@@ -11,10 +11,11 @@ import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { getConfigVike } from '../../shared/getConfigVike.js';
 import { isAsset } from '../shared/isAsset.js';
 import { getImportStatements } from '../shared/parseEsModule.js';
-import { removeSourceMap } from '../shared/removeSourceMap.js';
+import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import pc from '@brillout/picocolors';
 import { fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
-import { isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
+import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
+import { assertV1Design } from '../../shared/assertV1Design.js';
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
@@ -25,6 +26,7 @@ const debugEnabled = isDebugEnabled(debugNamespace);
 function extractAssetsPlugin() {
     let config;
     let configVike;
+    let vikeConfig;
     let isServerAssetsFixEnabled;
     return [
         // This plugin removes all JavaScript from server-side only code, so that only CSS imports remains. (And also satic files imports e.g. `import logoURL from './logo.svg.js'`).
@@ -37,14 +39,18 @@ function extractAssetsPlugin() {
                 if (!extractAssetsRE.test(id)) {
                     return;
                 }
-                assert(!isServerAssetsFixEnabled);
+                if (isServerAssetsFixEnabled) {
+                    // I'm guessing isServerAssetsFixEnabled can only be true when mixing both designs: https://github.com/vikejs/vike/issues/1480
+                    assertV1Design(true, vikeConfig.pageConfigs);
+                    assert(false);
+                }
                 assert(configVike.includeAssetsImportedByServer);
                 assert(!viteIsSSR_options(options));
                 const importStatements = await getImportStatements(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
                 debugTransformResult(id, code, importStatements);
-                return removeSourceMap(code);
+                return sourceMapRemove(code);
             }
         },
         // This plugin appends `?extractAssets` to module IDs
@@ -95,25 +101,6 @@ function extractAssetsPlugin() {
                 if (!isScriptFile(file)) {
                     return emptyModule(file, importer);
                 }
-                // If the dependency is a Vike extension and has `configVike.extension[number].pageConfigsSrcDir`, then include its CSS
-                if (configVike.extensions
-                    .filter(({ pageConfigsSrcDir }) => pageConfigsSrcDir !== null)
-                    .some(({ npmPackageName }) => {
-                    const check1 = source === npmPackageName ||
-                        source.startsWith(npmPackageName + '/') ||
-                        // Include relative imports within modules of `npmPackageName`. (This only works for dependencies: user may use import path aliases.)
-                        source.startsWith('.');
-                    // This doesn't work for linked dependencies
-                    const check2 = file.includes('node_modules/' + npmPackageName + '/') ||
-                        file.includes('node_modules\\' + npmPackageName + '\\');
-                    if (check1) {
-                        return true;
-                    }
-                    assert(!check2);
-                    return false;
-                })) {
-                    return appendExtractAssetsQuery(file, importer);
-                }
                 // If the import path resolves to a file in `node_modules/`, we ignore that file:
                 //  - Direct CSS dependencies are included though, such as `import 'bootstrap/theme/dark.css'`. (Because the above if-branch for CSS files will add the file.)
                 //  - Loading CSS from a library (living in `node_modules/`) in a non-direct way is non-standard; we can safely not support this case. (I'm not aware of any library that does this.)
@@ -135,6 +122,7 @@ function extractAssetsPlugin() {
             async configResolved(config_) {
                 configVike = await getConfigVike(config_);
                 config = config_;
+                vikeConfig = await getVikeConfig(config, false);
                 isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (await isV1Design(config, false));
             },
             load(id) {

package/dist/esm/node/plugin/plugins/extractExportNamesPlugin.js

@@ -3,7 +3,7 @@ export { isUsingClientRouter };
 export { extractExportNamesRE };
 import { assert, getFileExtension, viteIsSSR_options, createDebugger, isDebugEnabled, getGlobalObject, assertUsage } from '../utils.js';
 import { getExportNames } from '../shared/parseEsModule.js';
-import { removeSourceMap } from '../shared/removeSourceMap.js';
+import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 const debugNamespace = 'vike:extractExportNames';
 const debug = createDebugger(debugNamespace);
@@ -38,7 +38,7 @@ async function getExtractExportNamesCode(src, isClientSide, isProduction, id) {
         globalObject.usesClientRouter = true;
     }
     const code = getCode(exportNames, wildcardReExports, isClientSide, isProduction, id);
-    return removeSourceMap(code);
+    return sourceMapRemove(code);
 }
 function getCode(exportNames, wildcardReExports, isClientSide, isProduction, id) {
     let code = '';

package/dist/esm/node/plugin/plugins/importBuild/getVikeManifest.d.ts

@@ -1,5 +1,4 @@
 export { getVikeManifest };
-import { ResolvedConfig } from 'vite';
 import { type PluginManifest } from '../../../shared/assertPluginManifest.js';
 import type { ConfigVikeResolved } from '../../../../shared/ConfigVike.js';
-declare function getVikeManifest(config: ResolvedConfig, configVike: ConfigVikeResolved): PluginManifest;
+declare function getVikeManifest(configVike: ConfigVikeResolved): PluginManifest;

package/dist/esm/node/plugin/plugins/importBuild/getVikeManifest.js

@@ -1,32 +1,15 @@
 export { getVikeManifest };
-import { projectInfo, toPosixPath, assertPosixPath, isNotNullish } from '../../utils.js';
+import { projectInfo } from '../../utils.js';
 import { assertPluginManifest } from '../../../shared/assertPluginManifest.js';
 import { isUsingClientRouter } from '../extractExportNamesPlugin.js';
-import path from 'path';
 import { getRuntimeManifest } from '../../../runtime/globalContext.js';
-function getVikeManifest(config, configVike) {
+function getVikeManifest(configVike) {
     const runtimeManifest = getRuntimeManifest(configVike);
     const manifest = {
         version: projectInfo.projectVersion,
         usesClientRouter: isUsingClientRouter(), // TODO/v1-release: remove
-        manifestKeyMap: getManifestKeyMap(configVike, config),
         ...runtimeManifest
     };
     assertPluginManifest(manifest);
     return manifest;
 }
-function getManifestKeyMap(configVike, config) {
-    const manifestKeyMap = {};
-    configVike.extensions
-        .map(({ pageConfigsDistFiles }) => pageConfigsDistFiles)
-        .flat()
-        .filter(isNotNullish)
-        .forEach(({ importPath, filePath }) => {
-        // Recreating https://github.com/vitejs/vite/blob/8158ece72b66307e7b607b98496891610ca70ea2/packages/vite/src/node/plugins/manifest.ts#L38
-        const filePathRelative = path.posix.relative(config.root, toPosixPath(filePath));
-        assertPosixPath(filePathRelative);
-        assertPosixPath(importPath);
-        manifestKeyMap[importPath] = filePathRelative;
-    });
-    return manifestKeyMap;
-}