vike 0.4.161 → 0.4.162

package/dist/cjs/__internal/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPagesAndRoutes = exports.route = void 0;
 const index_js_1 = require("../shared/route/index.js");
 const globalContext_js_1 = require("../node/runtime/globalContext.js");
-const nodeEnv_js_1 = require("../utils/nodeEnv.js");
+const assertNodeEnv_js_1 = require("../utils/assertNodeEnv.js");
 const assert_js_1 = require("../utils/assert.js");
 const renderPageAlreadyRouted_js_1 = require("../node/runtime/renderPage/renderPageAlreadyRouted.js");
 /**
@@ -13,7 +13,7 @@ const renderPageAlreadyRouted_js_1 = require("../node/runtime/renderPage/renderP
  * @param config
  */
 async function getPagesAndRoutes() {
-    (0, nodeEnv_js_1.setNodeEnvToProduction)();
+    (0, assertNodeEnv_js_1.setNodeEnvToProduction)();
     await (0, globalContext_js_1.initGlobalContext)(true);
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
     (0, assert_js_1.assert)(globalContext.isProduction === true);

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

@@ -23,7 +23,6 @@ const suppressRollupWarning_js_1 = require("./plugins/suppressRollupWarning.js")
 const setGlobalContext_js_1 = require("./plugins/setGlobalContext.js");
 const index_js_4 = require("./plugins/importBuild/index.js");
 const commonConfig_js_1 = require("./plugins/commonConfig.js");
-const extensionsAssets_js_1 = require("./plugins/extensionsAssets.js");
 const baseUrls_js_1 = require("./plugins/baseUrls.js");
 const envVars_js_1 = require("./plugins/envVars.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
@@ -48,7 +47,6 @@ function plugin(vikeConfig) {
         (0, suppressRollupWarning_js_1.suppressRollupWarning)(),
         (0, setGlobalContext_js_1.setGlobalContext)(),
         ...(0, index_js_4.importBuild)(),
-        (0, extensionsAssets_js_1.extensionsAssets)(),
         (0, baseUrls_js_1.baseUrls)(vikeConfig),
         (0, envVars_js_1.envVarsPlugin)(),
         (0, fileEnv_js_1.fileEnv)()

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

@@ -12,11 +12,12 @@ const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
 const module_1 = require("module");
-const getClientEntryFilePath_js_1 = require("../../shared/getClientEntryFilePath.js");
+const getClientEntry_js_1 = require("../../shared/getClientEntry.js");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
 const index_js_1 = require("./importBuild/index.js");
+const prependEntriesDir_js_1 = require("../../shared/prependEntriesDir.js");
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
@@ -136,7 +137,7 @@ function analyzeClientEntries(pageConfigs, config) {
     let hasClientRouting = false;
     let hasServerRouting = false;
     let clientEntries = {};
-    let clientFilePaths = [];
+    let clientEntryList = [];
     pageConfigs.forEach((pageConfig) => {
         const configValue = (0, helpers_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean');
         if (configValue?.value) {
@@ -151,15 +152,15 @@ function analyzeClientEntries(pageConfigs, config) {
             clientEntries[entryName] = entryTarget;
         }
         {
-            const clientFilePath = (0, getClientEntryFilePath_js_1.getClientEntryFilePath)(pageConfig);
-            if (clientFilePath) {
-                clientFilePaths.push(clientFilePath);
+            const clientEntry = (0, getClientEntry_js_1.getClientEntry)(pageConfig);
+            if (clientEntry) {
+                clientEntryList.push(clientEntry);
             }
         }
     });
-    clientFilePaths = (0, utils_js_1.unique)(clientFilePaths);
-    clientFilePaths.forEach((pageFile) => {
-        const { entryName, entryTarget } = getEntryFromFilePath(pageFile, config);
+    clientEntryList = (0, utils_js_1.unique)(clientEntryList);
+    clientEntryList.forEach((clientEntry) => {
+        const { entryName, entryTarget } = getEntryFromClientEntry(clientEntry, config);
         clientEntries[entryName] = entryTarget;
     });
     return { hasClientRouting, hasServerRouting, clientEntries };
@@ -182,12 +183,18 @@ async function getPageFileEntries(config, includeAssetsImportedByServer) {
             (0, utils_js_1.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 ((0, utils_js_1.isNpmPackageImport)(clientEntry)) {
+        const entryTarget = clientEntry;
+        const entryName = (0, prependEntriesDir_js_1.prependEntriesDir)(clientEntry);
+        return { entryName, entryTarget };
+    }
+    const filePath = clientEntry;
     (0, utils_js_1.assertPosixPath)(filePath);
     (0, utils_js_1.assert)(filePath.startsWith('/'));
     let entryTarget = (0, utils_js_1.getFilePathAbsolute)(filePath, config);
@@ -197,24 +204,16 @@ function getEntryFromFilePath(filePath, config, addExtractAssetsQuery) {
     if (addExtractAssetsQuery)
         entryName = (0, extractAssetsQuery_js_1.extractAssetsAddQuery)(entryName);
     entryName = (0, utils_js_1.removeFileExtention)(entryName);
-    entryName = prependEntriesDir(entryName);
+    entryName = (0, prependEntriesDir_js_1.prependEntriesDir)(entryName);
     return { entryName, entryTarget };
 }
 function getEntryFromPageConfig(pageConfig, isForClientSide) {
     let { pageId } = pageConfig;
     const entryTarget = (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageId, isForClientSide);
     let entryName = pageId;
-    entryName = prependEntriesDir(entryName);
+    entryName = (0, prependEntriesDir_js_1.prependEntriesDir)(entryName);
     return { entryName, entryTarget };
 }
-function prependEntriesDir(entryName) {
-    if (entryName.startsWith('/')) {
-        entryName = entryName.slice(1);
-    }
-    (0, utils_js_1.assert)(!entryName.startsWith('/'));
-    entryName = `entries/${entryName}`;
-    return entryName;
-}
 function resolve(filePath) {
     (0, utils_js_1.assert)(filePath.startsWith('dist/'));
     // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/
@@ -234,6 +233,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/cjs/node/plugin/plugins/config/index.js

@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveVikeConfig = void 0;
 const assertVikeConfig_js_1 = require("./assertVikeConfig.js");
 const utils_js_1 = require("../../utils.js");
-const findConfigVikeFromStemPackages_js_1 = require("./findConfigVikeFromStemPackages.js");
 const pickFirst_js_1 = require("./pickFirst.js");
-const resolveExtensions_js_1 = require("./resolveExtensions.js");
 const resolveBase_js_1 = require("./resolveBase.js");
 const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
@@ -27,10 +25,8 @@ exports.resolveVikeConfig = resolveVikeConfig;
 async function getConfigVikPromise(vikeConfig, config) {
     const fromPluginOptions = (vikeConfig ?? {});
     const fromViteConfig = (config.vike ?? {});
-    const fromStemPackages = await (0, findConfigVikeFromStemPackages_js_1.findConfigVikeFromStemPackages)(config.root);
-    const configs = [fromPluginOptions, ...fromStemPackages, fromViteConfig];
-    const extensions = (0, resolveExtensions_js_1.resolveExtensions)(configs, config);
-    const { globalVikeConfig: fromPlusConfigFile } = await (0, getVikeConfig_js_1.getVikeConfig)(config, (0, utils_js_1.isDev2)(config), false, extensions);
+    const configs = [fromPluginOptions, fromViteConfig];
+    const { globalVikeConfig: fromPlusConfigFile } = await (0, getVikeConfig_js_1.getVikeConfig)(config, (0, utils_js_1.isDev2)(config), false);
     configs.push(fromPlusConfigFile);
     (0, assertVikeConfig_js_1.assertVikeConfig)(fromPlusConfigFile, ({ prop, errMsg }) => {
         // TODO: add config file path ?
@@ -42,7 +38,6 @@ async function getConfigVikPromise(vikeConfig, config) {
     const { baseServer, baseAssets } = (0, resolveBase_js_1.resolveBase)(configs, config);
     const configVike = {
         disableAutoFullBuild: (0, pickFirst_js_1.pickFirst)(configs.map((c) => c.disableAutoFullBuild)) ?? null,
-        extensions,
         prerender: resolvePrerenderOptions(configs),
         includeAssetsImportedByServer: (0, pickFirst_js_1.pickFirst)(configs.map((c) => c.includeAssetsImportedByServer)) ?? true,
         baseServer,

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineFsAllowList = void 0;
 const vite_1 = require("vite");
 const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
 const utils_js_1 = require("../../utils.js");
 const module_1 = require("module");
 const path_2 = require("path");
@@ -15,7 +14,7 @@ const url_1 = require("url");
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
 const __dirname_ = (0, path_2.dirname)((0, url_1.fileURLToPath)(importMetaUrl));
-async function determineFsAllowList(config, configVike) {
+async function determineFsAllowList(config) {
     const fsAllow = config.server.fs.allow;
     // fsAllow should already contain searchForWorkspaceRoot()
     (0, utils_js_1.assert)(fsAllow.length >= 1);
@@ -32,11 +31,5 @@ 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_1.default.realpathSync(npmPackageRootDir);
-        fsAllow.push(npmPackageRootDir);
-        fsAllow.push(npmPackageRootDirReal);
-    });
 }
 exports.determineFsAllowList = determineFsAllowList;

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

@@ -7,7 +7,7 @@ const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js
 const getConfigValueSourcesNotOverriden_js_1 = require("../../shared/getConfigValueSourcesNotOverriden.js");
 const buildConfig_js_1 = require("../buildConfig.js");
 const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
-async function determineOptimizeDeps(config, configVike, isDev) {
+async function determineOptimizeDeps(config, isDev) {
     const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev);
     const { entries, include } = await getPageDeps(config, pageConfigs, isDev);
     {
@@ -18,7 +18,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)
     */
@@ -91,22 +90,6 @@ function getVirtualFiles(config, pageConfigs) {
         entriesVirtualFiles.push(virtualFileImportUserCode_js_1.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(utils_js_1.isNotNullish)
-            .filter(({ importPath }) => !importPath.endsWith('.css'))
-            .map(({ importPath }) => importPath)
-    ];
-}
 function normalizeEntries(entries) {
     if (Array.isArray(entries))
         return entries;

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.devConfig = void 0;
 const determineOptimizeDeps_js_1 = require("./determineOptimizeDeps.js");
 const determineFsAllowList_js_1 = require("./determineFsAllowList.js");
-const getConfigVike_js_1 = require("../../../shared/getConfigVike.js");
 const addSsrMiddleware_js_1 = require("../../shared/addSsrMiddleware.js");
 const utils_js_1 = require("../../utils.js");
 const loggerVite_js_1 = require("../../shared/loggerVite.js");
@@ -57,9 +56,8 @@ function devConfig() {
             },
             async configResolved(config_) {
                 config = config_;
-                const configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
-                await (0, determineOptimizeDeps_js_1.determineOptimizeDeps)(config, configVike, isDev);
-                await (0, determineFsAllowList_js_1.determineFsAllowList)(config, configVike);
+                await (0, determineOptimizeDeps_js_1.determineOptimizeDeps)(config, isDev);
+                await (0, determineFsAllowList_js_1.determineFsAllowList)(config);
                 if (!(0, isErrorDebug_js_1.isErrorDebug)()) {
                     await (0, getHttpRequestAsyncStore_js_1.installHttpRequestAsyncStore)();
                     (0, loggerVite_js_1.improveViteLogs)(config);

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyEnvVar = exports.envVarsPlugin = void 0;
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
+const rollupSourceMap_js_1 = require("../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 = (0, rollupSourceMap_js_1.sourceMapPassthrough)(code);
+            return ret;
         }
     };
 }

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

@@ -11,10 +11,11 @@ const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
 const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
 const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
-const removeSourceMap_js_1 = require("../shared/removeSourceMap.js");
+const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
+const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 exports.extractAssetsRE = extractAssetsRE;
 const rawRE = /(\?|&)raw(?:&|$)/;
@@ -26,6 +27,7 @@ const debugEnabled = (0, utils_js_1.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'`).
@@ -38,14 +40,18 @@ function extractAssetsPlugin() {
                 if (!extractAssetsRE.test(id)) {
                     return;
                 }
-                (0, utils_js_1.assert)(!isServerAssetsFixEnabled);
+                if (isServerAssetsFixEnabled) {
+                    // I'm guessing isServerAssetsFixEnabled can only be true when mixing both designs: https://github.com/vikejs/vike/issues/1480
+                    (0, assertV1Design_js_1.assertV1Design)(true, vikeConfig.pageConfigs);
+                    (0, utils_js_1.assert)(false);
+                }
                 (0, utils_js_1.assert)(configVike.includeAssetsImportedByServer);
                 (0, utils_js_1.assert)(!(0, utils_js_1.viteIsSSR_options)(options));
                 const importStatements = await (0, parseEsModule_js_1.getImportStatements)(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
                 debugTransformResult(id, code, importStatements);
-                return (0, removeSourceMap_js_1.removeSourceMap)(code);
+                return (0, rollupSourceMap_js_1.sourceMapRemove)(code);
             }
         },
         // This plugin appends `?extractAssets` to module IDs
@@ -96,25 +102,6 @@ function extractAssetsPlugin() {
                 if (!(0, utils_js_1.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;
-                    }
-                    (0, utils_js_1.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.)
@@ -136,6 +123,7 @@ function extractAssetsPlugin() {
             async configResolved(config_) {
                 configVike = await (0, getConfigVike_js_1.getConfigVike)(config_);
                 config = config_;
+                vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config, false);
                 isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config, false));
             },
             load(id) {

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractExportNamesRE = exports.isUsingClientRouter = exports.extractExportNamesPlugin = void 0;
 const utils_js_1 = require("../utils.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
-const removeSourceMap_js_1 = require("../shared/removeSourceMap.js");
+const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 exports.extractExportNamesRE = extractExportNamesRE;
 const debugNamespace = 'vike:extractExportNames';
@@ -40,7 +40,7 @@ async function getExtractExportNamesCode(src, isClientSide, isProduction, id) {
         globalObject.usesClientRouter = true;
     }
     const code = getCode(exportNames, wildcardReExports, isClientSide, isProduction, id);
-    return (0, removeSourceMap_js_1.removeSourceMap)(code);
+    return (0, rollupSourceMap_js_1.sourceMapRemove)(code);
 }
 function getCode(exportNames, wildcardReExports, isClientSide, isProduction, id) {
     let code = '';

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

@@ -1,38 +1,18 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVikeManifest = void 0;
 const utils_js_1 = require("../../utils.js");
 const assertPluginManifest_js_1 = require("../../../shared/assertPluginManifest.js");
 const extractExportNamesPlugin_js_1 = require("../extractExportNamesPlugin.js");
-const path_1 = __importDefault(require("path"));
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
-function getVikeManifest(config, configVike) {
+function getVikeManifest(configVike) {
     const runtimeManifest = (0, globalContext_js_1.getRuntimeManifest)(configVike);
     const manifest = {
         version: utils_js_1.projectInfo.projectVersion,
         usesClientRouter: (0, extractExportNamesPlugin_js_1.isUsingClientRouter)(), // TODO/v1-release: remove
-        manifestKeyMap: getManifestKeyMap(configVike, config),
         ...runtimeManifest
     };
     (0, assertPluginManifest_js_1.assertPluginManifest)(manifest);
     return manifest;
 }
 exports.getVikeManifest = getVikeManifest;
-function getManifestKeyMap(configVike, config) {
-    const manifestKeyMap = {};
-    configVike.extensions
-        .map(({ pageConfigsDistFiles }) => pageConfigsDistFiles)
-        .flat()
-        .filter(utils_js_1.isNotNullish)
-        .forEach(({ importPath, filePath }) => {
-        // Recreating https://github.com/vitejs/vite/blob/8158ece72b66307e7b607b98496891610ca70ea2/packages/vite/src/node/plugins/manifest.ts#L38
-        const filePathRelative = path_1.default.posix.relative(config.root, (0, utils_js_1.toPosixPath)(filePath));
-        (0, utils_js_1.assertPosixPath)(filePathRelative);
-        (0, utils_js_1.assertPosixPath)(importPath);
-        manifestKeyMap[importPath] = filePathRelative;
-    });
-    return manifestKeyMap;
-}

package/dist/cjs/node/plugin/plugins/importBuild/index.js

@@ -39,7 +39,7 @@ function importBuild() {
 exports.importBuild = importBuild;
 function getEntryCode(config, configVike) {
     const importPath = getImportPath(config);
-    const vikeManifest = (0, getVikeManifest_js_1.getVikeManifest)(config, configVike);
+    const vikeManifest = (0, getVikeManifest_js_1.getVikeManifest)(configVike);
     const importerCode = [
         `  import { setImportBuildGetters } from '${importPath}';`,
         `  import * as pageFiles from '${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer}';`,

package/dist/cjs/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js

@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVirtualFileImportUserCode = void 0;
 const utils_js_1 = require("../../utils.js");
 const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
+const vite_1 = require("vite");
 const fileTypes_js_1 = require("../../../../shared/getPageFiles/fileTypes.js");
 const path_1 = __importDefault(require("path"));
 const getVirtualFilePageConfigs_js_1 = require("./v1-design/getVirtualFilePageConfigs.js");
-const generateEagerImport_js_1 = require("./generateEagerImport.js");
+const getVikeConfig_js_1 = require("./v1-design/getVikeConfig.js");
 async function getVirtualFileImportUserCode(id, options, configVike, config, isDev) {
     const idParsed = (0, virtualFileImportUserCode_js_1.isVirtualFileIdImportUserCode)(id);
     (0, utils_js_1.assert)(idParsed);
@@ -27,53 +28,13 @@ async function getCode(config, configVike, isForClientSide, isClientRouting, isP
     (0, utils_js_1.assert)(isDev === !isBuild);
     let content = '';
     {
-        const globRoots = getGlobRoots(config, configVike);
+        const globRoots = getGlobRoots(config);
         (0, utils_js_1.debugGlob)('Glob roots: ', globRoots);
         content += await generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, configVike, isPrerendering, config, isDev, id);
     }
-    {
-        const extensionsImportPaths = configVike.extensions
-            .map(({ pageConfigsDistFiles }) => pageConfigsDistFiles)
-            .flat()
-            .filter(utils_js_1.isNotNullish)
-            .map(({ importPath }) => importPath);
-        content += generateExtensionImports(extensionsImportPaths, isForClientSide, isBuild, isClientRouting, isPrerendering);
-    }
     (0, utils_js_1.debugGlob)(`Glob imports for ${isForClientSide ? 'client' : 'server'}:\n`, content);
     return content;
 }
-function generateExtensionImports(extensionsImportPaths, isForClientSide, isBuild, isClientRouting, isPrerendering) {
-    let fileContent = '\n\n';
-    extensionsImportPaths
-        .filter((importPath) => {
-        (0, utils_js_1.assert)(
-        // V1 design
-        importPath.includes('+') ||
-            // V0.4 design
-            importPath.includes('.page.'));
-        return !importPath.includes('+');
-    })
-        .forEach((importPath) => {
-        const fileType = (0, fileTypes_js_1.determineFileType)(importPath);
-        const { includeImport, includeExportNames } = determineInjection({
-            fileType,
-            isForClientSide,
-            isClientRouting,
-            isPrerendering,
-            isBuild
-        });
-        if (includeImport) {
-            fileContent += addImport(importPath, fileType, false, isBuild);
-        }
-        if (includeExportNames) {
-            fileContent += addImport(importPath, fileType, true, isBuild);
-        }
-        if (!includeImport && !includeExportNames && !isForClientSide) {
-            fileContent += `pageFilesList.push("${importPath}");` + '\n';
-        }
-    });
-    return fileContent;
-}
 function determineInjection({ fileType, isForClientSide, isClientRouting, isPrerendering, isBuild }) {
     if (!isForClientSide) {
         return {
@@ -99,42 +60,6 @@ function determineInjection({ fileType, isForClientSide, isClientRouting, isPrer
         }
     }
 }
-function addImport(importPath, fileType, exportNames, isBuild) {
-    const pageFilesVar = (() => {
-        if (exportNames) {
-            if (isBuild) {
-                return 'pageFilesExportNamesEager';
-            }
-            else {
-                return 'pageFilesExportNamesLazy';
-            }
-        }
-        else {
-            if (fileType === '.page.route') {
-                return 'pageFilesEager';
-            }
-            else {
-                return 'pageFilesLazy';
-            }
-        }
-    })();
-    const query = !exportNames ? '' : '?extractExportNames';
-    let fileContent = '';
-    const mapVar = `${pageFilesVar}['${fileType}']`;
-    fileContent += `${mapVar} = ${mapVar} ?? {};\n`;
-    const value = (() => {
-        if (!pageFilesVar.endsWith('Eager')) {
-            return `() => import('${importPath}${query}')`;
-        }
-        else {
-            const { importName, importStatement } = (0, generateEagerImport_js_1.generateEagerImport)(`${importPath}${query}`);
-            fileContent += importStatement + '\n';
-            return importName;
-        }
-    })();
-    fileContent += `${mapVar}['${importPath}'] = ${value};\n`;
-    return fileContent;
-}
 async function generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, configVike, isPrerendering, config, isDev, id) {
     let fileContent = `// Generatead by node/plugin/plugins/virtualFiles/index.ts
 
@@ -149,6 +74,8 @@ export const isGeneratedFile = true;
 ${await (0, getVirtualFilePageConfigs_js_1.getVirtualFilePageConfigs)(isForClientSide, isDev, id, isClientRouting, config)}
 
 `;
+    // We still use import.meta.glob() when using th V1 design in order to not break the V1 design deprecation warning
+    const isV1Design = await (0, getVikeConfig_js_1.isV1Design)(config, isDev);
     fileTypes_js_1.fileTypes
         .filter((fileType) => fileType !== '.css')
         .forEach((fileType) => {
@@ -161,18 +88,18 @@ ${await (0, getVirtualFilePageConfigs_js_1.getVirtualFilePageConfigs)(isForClien
             isBuild
         });
         if (includeImport) {
-            fileContent += getGlobs(globRoots, isBuild, fileType);
+            fileContent += getGlobs(globRoots, isBuild, fileType, null, isV1Design);
         }
         if (includeExportNames) {
-            fileContent += getGlobs(globRoots, isBuild, fileType, 'extractExportNames');
+            fileContent += getGlobs(globRoots, isBuild, fileType, 'extractExportNames', isV1Design);
         }
     });
     if (configVike.includeAssetsImportedByServer && isForClientSide) {
-        fileContent += getGlobs(globRoots, isBuild, '.page.server', 'extractAssets');
+        fileContent += getGlobs(globRoots, isBuild, '.page.server', 'extractAssets', isV1Design);
     }
     return fileContent;
 }
-function getGlobs(globRoots, isBuild, fileType, query) {
+function getGlobs(globRoots, isBuild, fileType, query, isV1Design) {
     const isEager = isBuild && (query === 'extractExportNames' || fileType === '.page.route');
     let pageFilesVar;
     if (query === 'extractExportNames') {
@@ -212,10 +139,26 @@ function getGlobs(globRoots, isBuild, fileType, query) {
             varNameLocals.push(varNameLocal);
             const globIncludePath = `'${getGlobPath(globRoot.includeDir, fileType)}'`;
             const globExcludePath = globRoot.excludeDir ? `'!${getGlobPath(globRoot.excludeDir, fileType)}'` : null;
-            const globOptions = JSON.stringify({ eager: isEager, as: query });
-            (0, utils_js_1.assert)(globOptions.startsWith('{"eager":true') || globOptions.startsWith('{"eager":false'));
+            const globOptions = { eager: isEager };
+            if (query) {
+                const isNewViteInterface = (0, utils_js_1.isVersionOrAbove)(vite_1.version, '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) {
+                    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(' ');
+                    (0, utils_js_1.assertWarning)(!isNewViteInterface, msg, { onlyOnce: true });
+                }
+            }
             const globPaths = globExcludePath ? `[${globIncludePath}, ${globExcludePath}]` : `[${globIncludePath}]`;
-            const globLine = `const ${varNameLocal} = import.meta.glob(${globPaths}, ${globOptions});`;
+            const globLine = `const ${varNameLocal} = import.meta.glob(${globPaths}, ${JSON.stringify(globOptions)});`;
             return globLine;
         }),
         `const ${varName} = {${varNameLocals.map((varNameLocal) => `...${varNameLocal}`).join(',')}};`,
@@ -223,22 +166,13 @@ function getGlobs(globRoots, isBuild, fileType, query) {
         ''
     ].join('\n');
 }
-function getGlobRoots(config, configVike) {
+function getGlobRoots(config) {
     const globRoots = [
         {
             includeDir: '/',
             excludeDir: path_1.default.posix.relative(config.root, (0, utils_js_1.getOutDirs)(config).outDirRoot)
         }
     ];
-    configVike.extensions
-        .map(({ pageConfigsSrcDir }) => pageConfigsSrcDir)
-        .filter(utils_js_1.isNotNullish)
-        .forEach((pageConfigsSrcDir) => {
-        const globRoot = {
-            includeDir: path_1.default.posix.relative(config.root, pageConfigsSrcDir)
-        };
-        globRoots.push(globRoot);
-    });
     return globRoots;
 }
 function getGlobPath(globRootDir, fileType) {