vike 0.4.231 → 0.4.232-commit-134207d

package/dist/cjs/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginBuildEntry.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginBuildEntry = pluginBuildEntry;
 exports.set_macro_ASSETS_MANIFEST = set_macro_ASSETS_MANIFEST;
 const plugin_1 = require("@brillout/vite-plugin-server-entry/plugin");
-const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
+const virtualFileEntry_js_1 = require("../../../shared/virtualFiles/virtualFileEntry.js");
 const utils_js_1 = require("../../utils.js");
-const promises_1 = __importDefault(require("fs/promises"));
-const path_1 = __importDefault(require("path"));
-const extractExportNamesPlugin_js_1 = require("../extractExportNamesPlugin.js");
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
+const pluginExtractExportNames_js_1 = require("../pluginExtractExportNames.js");
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const getViteConfigRuntime_js_1 = require("../../shared/getViteConfigRuntime.js");
@@ -24,28 +24,28 @@ function pluginBuildEntry() {
             enforce: 'post',
             async configResolved(config_) {
                 config = config_;
-            }
+            },
         },
         ...(0, plugin_1.serverProductionEntryPlugin)({
             getServerProductionEntry: () => {
                 return getServerProductionEntryCode(config);
             },
-            libraryName: 'Vike'
-        })
+            libraryName: 'Vike',
+        }),
     ];
 }
 function getServerProductionEntryCode(config) {
     const importPath = getImportPath(config);
     const buildInfo = {
         versionAtBuildTime: utils_js_1.PROJECT_VERSION,
-        usesClientRouter: (0, extractExportNamesPlugin_js_1.isUsingClientRouter)(), // TODO/v1-release: remove
-        viteConfigRuntime: (0, getViteConfigRuntime_js_1.getViteConfigRuntime)(config)
+        usesClientRouter: (0, pluginExtractExportNames_js_1.isUsingClientRouter)(), // TODO/v1-release: remove
+        viteConfigRuntime: (0, getViteConfigRuntime_js_1.getViteConfigRuntime)(config),
     };
     (0, globalContext_js_1.assertBuildInfo)(buildInfo);
     // After the old design is removed, let's maybe simplify and move everything into a single virtual module
     const importerCode = [
         `  import { setGlobalContext_buildEntry } from '${importPath}';`,
-        `  import * as virtualFileExports from '${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer}';`,
+        `  import * as virtualFileExports from '${virtualFileEntry_js_1.virtualFileIdEntryServer}';`,
         `  {`,
         // Because of a Rollup bug, we have to assign ASSETS_MANIFEST to a variable before passing it to setGlobalContext_buildEntry()
         // - This workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
@@ -57,14 +57,13 @@ function getServerProductionEntryCode(config) {
         `      buildInfo,`,
         '    });',
         `  }`,
-        ''
+        '',
     ].join('\n');
     return importerCode;
 }
 // Set the value of the ASSETS_MANIFEST constant inside dist/server/entry.js (or dist/server/index.js)
-async function set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath) {
-    const { dir } = options;
-    (0, utils_js_1.assert)(dir);
+async function set_macro_ASSETS_MANIFEST(assetsJsonFilePath, bundle, outDir) {
+    (0, utils_js_1.assert)(outDir);
     const chunkPath = find_ASSETS_MANIFEST(bundle);
     // Some server builds don't contain __VITE_ASSETS_MANIFEST__ such as dist/rsc/ from vike-react-rsc
     if (!chunkPath) {
@@ -72,10 +71,10 @@ async function set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath) {
         return noop;
     }
     (0, utils_js_1.assert)(assetsJsonFilePath);
-    const chunkFilePath = path_1.default.join(dir, chunkPath);
+    const chunkFilePath = node_path_1.default.join(outDir, chunkPath);
     const [assetsJsonString, chunkFileContent] = await Promise.all([
         await promises_1.default.readFile(assetsJsonFilePath, 'utf8'),
-        await promises_1.default.readFile(chunkFilePath, 'utf8')
+        await promises_1.default.readFile(chunkFilePath, 'utf8'),
     ]);
     const serverEntryFileContentPatched = chunkFileContent.replace(ASSETS_MANIFEST, assetsJsonString);
     (0, utils_js_1.assert)(serverEntryFileContentPatched !== chunkFileContent);
@@ -104,7 +103,7 @@ function getImportPath(config) {
     }
     else {
         const { outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
-        const filePathRelative = path_1.default.posix.relative(outDirServer, filePathAbsolute);
+        const filePathRelative = node_path_1.default.posix.relative(outDirServer, filePathAbsolute);
         return filePathRelative;
     }
 }

package/dist/cjs/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginDistFileNames.js

@@ -8,8 +8,8 @@ exports.pluginDistFileNames = pluginDistFileNames;
 //  - https://github.com/vikejs/vike/commit/11a4c49e5403aa7c37c8020c462b499425b41854
 //  - Blocker: https://github.com/rollup/rollup/issues/4724
 const utils_js_1 = require("../../utils.js");
-const path_1 = __importDefault(require("path"));
-const crypto_1 = __importDefault(require("crypto"));
+const node_path_1 = __importDefault(require("node:path"));
+const node_crypto_1 = __importDefault(require("node:crypto"));
 const getAssetsDir_js_1 = require("../../shared/getAssetsDir.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
 function pluginDistFileNames() {
@@ -19,7 +19,7 @@ function pluginDistFileNames() {
         enforce: 'post',
         configResolved(config) {
             const rollupOutputs = getRollupOutputs(config);
-            // We need to support multiple outputs: @vite/plugin-legacy adds an ouput, see https://github.com/vikejs/vike/issues/477#issuecomment-1406434802
+            // We need to support multiple outputs: @vite/plugin-legacy adds an output, see https://github.com/vikejs/vike/issues/477#issuecomment-1406434802
             rollupOutputs.forEach((rollupOutput) => {
                 if (!('entryFileNames' in rollupOutput)) {
                     rollupOutput.entryFileNames = (chunkInfo) => getEntryFileName(chunkInfo, config, true);
@@ -29,6 +29,8 @@ function pluginDistFileNames() {
                 }
                 if (!('assetFileNames' in rollupOutput)) {
                     rollupOutput.assetFileNames = (chunkInfo) => getAssetFileName(chunkInfo, config);
+                    rollupOutput.assetFileNames.isTheOneSetByVike = true;
+                    (0, utils_js_1.assert)(rollupOutput.assetFileNames.isTheOneSetByVike);
                 }
                 else {
                     // If a user needs this:
@@ -36,7 +38,7 @@ function pluginDistFileNames() {
                     //    - It's needed for getHash() of handleAssetsManifest()
                     //    - Asset URLs should always contain a hash: it's paramount for caching assets.
                     //    - If rollupOutput.assetFileNames is a function then use a wrapper function to apply the assertUsage()
-                    (0, utils_js_1.assertUsage)(false, "Setting Vite's configuration build.rollupOptions.output.assetFileNames is currently forbidden. Reach out if you need to use.");
+                    (0, utils_js_1.assertUsage)(rollupOutput.assetFileNames.isTheOneSetByVike, "Setting Vite's configuration build.rollupOptions.output.assetFileNames is currently forbidden. Reach out if you need to use it.");
                 }
                 {
                     const manualChunksOriginal = rollupOutput.manualChunks;
@@ -70,7 +72,7 @@ function pluginDistFileNames() {
                                     name = name.split('/').filter(Boolean).join('_');
                                 }
                                 // Make fileHash the same between local development and CI
-                                const idStable = path_1.default.posix.relative(userRootDir, id);
+                                const idStable = node_path_1.default.posix.relative(userRootDir, id);
                                 // Don't remove `?` queries because each `id` should belong to a unique bundle.
                                 const hash = getIdHash(idStable);
                                 return `${name}-${hash}`;
@@ -97,11 +99,11 @@ function pluginDistFileNames() {
                     };
                 }
             });
-        }
+        },
     };
 }
 function getIdHash(id) {
-    return crypto_1.default.createHash('md5').update(id).digest('hex').slice(0, 8);
+    return node_crypto_1.default.createHash('md5').update(id).digest('hex').slice(0, 8);
 }
 function getAssetFileName(assetInfo, config) {
     const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
@@ -112,7 +114,7 @@ function getAssetFileName(assetInfo, config) {
     }
     // https://github.com/vikejs/vike/issues/794
     (0, utils_js_1.assertPosixPath)(name);
-    name = path_1.default.posix.basename(name);
+    name = node_path_1.default.posix.basename(name);
     // dist/client/assets/index.page.server.jsx_extractAssets_lang.e4e33422.css
     // => dist/client/assets/index.page.server.e4e33422.css
     if (
@@ -152,7 +154,7 @@ function getEntryFileName(chunkInfo, config, isEntry) {
         return `${name}.${isEntry ? 'mjs' : 'js'}`;
     }
 }
-function removePathSeperators(name) {
+function removePathSeparators(name) {
     (0, utils_js_1.assertPosixPath)(name);
     (0, utils_js_1.assert)(!name.startsWith('/'));
     const entryDir = 'entries/';
@@ -172,9 +174,9 @@ function clean(name, removePathSep, fixGlob) {
     if (fixGlob) {
         name = workaroundGlob(name);
     }
-    name = replaceNonLatinCharaters(name);
+    name = replaceNonLatinCharacters(name);
     if (removePathSep) {
-        name = removePathSeperators(name);
+        name = removePathSeparators(name);
     }
     name = removeLeadingUnderscoreInFilename(name);
     name = removeUnderscoreDoublets(name);
@@ -194,7 +196,7 @@ function removeUnderscoreDoublets(name) {
     name = name.split(/__+/).join('_');
     return name;
 }
-function replaceNonLatinCharaters(name) {
+function replaceNonLatinCharacters(name) {
     name = name.split('+').join('');
     name = name.replace(/[^a-zA-Z0-9\/\._]/g, '-');
     return name;

package/dist/cjs/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginDistPackageJsonFile.js

@@ -29,9 +29,9 @@ function pluginDistPackageJsonFile() {
             this.emitFile({
                 fileName,
                 type: 'asset',
-                source: getPackageJsonContent(isEsm)
+                source: getPackageJsonContent(isEsm),
             });
-        }
+        },
     };
 }
 function getPackageJsonContent(isEsm) {

package/dist/cjs/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginModuleBanner.js

@@ -5,14 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginModuleBanner = pluginModuleBanner;
 const magic_string_1 = __importDefault(require("magic-string"));
-const virtual_files_js_1 = require("../../../shared/virtual-files.js");
+const virtualFiles_js_1 = require("../../../shared/virtualFiles.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 // Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
 // But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
 function pluginModuleBanner() {
     let config;
     return {
-        name: 'vike:pluginModuleBanner',
+        name: 'vike:build:pluginModuleBanner',
         enforce: 'post',
         apply: 'build',
         configResolved(config_) {
@@ -28,7 +28,7 @@ function pluginModuleBanner() {
                 }
                 if (id.startsWith('\0'))
                     id = id;
-                id = (0, virtual_files_js_1.removeVirtualIdTag)(id);
+                id = (0, virtualFiles_js_1.removeVirtualIdTag)(id);
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
                 id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377
@@ -39,9 +39,9 @@ function pluginModuleBanner() {
                 magicString.prepend(`/*! ${id} [vike:pluginModuleBanner] */\n`);
                 return {
                     code: magicString.toString(),
-                    map: magicString.generateMap({ hires: true, source: id })
+                    map: magicString.generateMap({ hires: true, source: id }),
                 };
-            }
-        }
+            },
+        },
     };
 }

package/dist/cjs/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginSuppressRollupWarning.js

@@ -25,14 +25,14 @@ function pluginSuppressRollupWarning() {
                     warn(warning);
                 }
             };
-        }
+        },
     };
 }
 /** Suppress warning about Rollup removing the React Server Components `"use client";` directives */
 function suppressUseClientDirective(warning) {
     return warning.code === 'MODULE_LEVEL_DIRECTIVE' && warning.message.includes('"use client"');
 }
-/** Suppress warning about generating emtpy chunks in dist/ */
+/** Suppress warning about generating empty chunks in dist/ */
 function suppressEmptyBundle(warning) {
     return warning.code === 'EMPTY_BUNDLE';
 }
@@ -40,7 +40,7 @@ function suppressEmptyBundle(warning) {
 function suppressUnusedImport(warning) {
     if (warning.code !== 'UNUSED_EXTERNAL_IMPORT')
         return false;
-    // I guess it's expected that JSX contains unsused `import React from 'react'`
+    // I guess it's expected that JSX contains unused `import React from 'react'`
     if (warning.exporter === 'react' && warning.names?.includes('default')) {
         warning.names = warning.names.filter((n) => n !== 'default');
         if (warning.names.length === 0)

package/dist/cjs/node/vite/plugins/pluginBuild.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pluginBuild = pluginBuild;
+const pluginBuildApp_js_1 = require("./pluginBuild/pluginBuildApp.js");
+const pluginDistPackageJsonFile_js_1 = require("./pluginBuild/pluginDistPackageJsonFile.js");
+const pluginSuppressRollupWarning_js_1 = require("./pluginBuild/pluginSuppressRollupWarning.js");
+const pluginDistFileNames_js_1 = require("./pluginBuild/pluginDistFileNames.js");
+const pluginAutoFullBuild_js_1 = require("./pluginBuild/pluginAutoFullBuild.js");
+const pluginBuildEntry_js_1 = require("./pluginBuild/pluginBuildEntry.js");
+const pluginBuildConfig_js_1 = require("./pluginBuild/pluginBuildConfig.js");
+const pluginModuleBanner_js_1 = require("./pluginBuild/pluginModuleBanner.js");
+function pluginBuild() {
+    return [
+        ...(0, pluginBuildConfig_js_1.pluginBuildConfig)(),
+        ...(0, pluginBuildApp_js_1.pluginBuildApp)(),
+        ...(0, pluginAutoFullBuild_js_1.pluginAutoFullBuild)(),
+        ...(0, pluginBuildEntry_js_1.pluginBuildEntry)(),
+        (0, pluginDistPackageJsonFile_js_1.pluginDistPackageJsonFile)(),
+        (0, pluginSuppressRollupWarning_js_1.pluginSuppressRollupWarning)(),
+        (0, pluginDistFileNames_js_1.pluginDistFileNames)(),
+        (0, pluginModuleBanner_js_1.pluginModuleBanner)(),
+    ];
+}

package/dist/cjs/node/{plugin/plugins/commonConfig → vite/plugins/pluginCommon}/assertResolveAlias.js

@@ -25,7 +25,7 @@ function assertResolveAlias(config) {
     const errPrefix = config.configFile || 'Your Vite configuration';
     const errSuffix1 = 'see https://vike.dev/path-aliases#vite';
     const deprecation = 'which will be deprecated in the next major release';
-    const errSuffix2 = `${deprecation}, use a string insead and ${errSuffix1}`;
+    const errSuffix2 = `${deprecation}, use a string instead and ${errSuffix1}`;
     aliases.forEach((alias) => {
         const { customResolver, find } = alias;
         {
@@ -45,7 +45,7 @@ function assertResolveAlias(config) {
             {
                 const msg = `${errPrefix} defines resolve.alias with a regular expression ${errSuffix2}`;
                 (0, utils_js_1.assertWarning)(false, msg, {
-                    onlyOnce: true
+                    onlyOnce: true,
                 });
             }
         }

package/dist/cjs/node/{plugin/plugins/commonConfig.js → vite/plugins/pluginCommon.js}

@@ -3,25 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.commonConfig = commonConfig;
-exports.getVikeConfigPublic = getVikeConfigPublic;
-exports.getVikeConfigInternal = getVikeConfigInternal;
+exports.pluginCommon = pluginCommon;
 const utils_js_1 = require("../utils.js");
-const pluginBuildConfig_js_1 = require("./build/pluginBuildConfig.js");
+const pluginBuildConfig_js_1 = require("./pluginBuild/pluginBuildConfig.js");
 const require_shim_1 = require("@brillout/require-shim");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const path_1 = __importDefault(require("path"));
-const assertResolveAlias_js_1 = require("./commonConfig/assertResolveAlias.js");
+const node_path_1 = __importDefault(require("node:path"));
+const assertResolveAlias_js_1 = require("./pluginCommon/assertResolveAlias.js");
 const isViteCliCall_js_1 = require("../shared/isViteCliCall.js");
 const context_js_1 = require("../../api/context.js");
-const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
+const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
 const prepareViteApiCall_js_1 = require("../../api/prepareViteApiCall.js");
 const context_js_2 = require("../../prerender/context.js");
-const resolvePrerenderConfig_js_1 = require("../../prerender/resolvePrerenderConfig.js");
-const pluginName = 'vike:commonConfig';
-function commonConfig(vikeVitePluginOptions) {
-    // We cache it => makes sure we only generate one object => we can mutate it at runPrerender()
-    let prerenderContext;
+const pluginName = 'vike:pluginCommon';
+function pluginCommon(vikeVitePluginOptions) {
     return [
         {
             name: `${pluginName}:pre`,
@@ -31,50 +26,38 @@ function commonConfig(vikeVitePluginOptions) {
                 async handler(configFromUser, env) {
                     const isDev = (0, utils_js_1.isDevCheck)(env);
                     const operation = env.command === 'build' ? 'build' : env.isPreview ? 'preview' : 'dev';
-                    const root = configFromUser.root ? (0, prepareViteApiCall_js_1.normalizeViteRoot)(configFromUser.root) : await (0, prepareViteApiCall_js_1.getViteRoot)(operation);
-                    (0, utils_js_1.assert)(root);
-                    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig2)(root, isDev, vikeVitePluginOptions);
-                    const { isPrerenderingEnabled, isPrerenderingEnabledForAllPages } = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
-                    prerenderContext ?? (prerenderContext = {
-                        isPrerenderingEnabled,
-                        isPrerenderingEnabledForAllPages,
-                        output: null,
-                        pageContexts: null
-                    });
-                    (0, utils_js_1.assert)(prerenderContext.isPrerenderingEnabled === isPrerenderingEnabled);
-                    (0, utils_js_1.assert)(prerenderContext.isPrerenderingEnabledForAllPages === isPrerenderingEnabledForAllPages);
+                    const rootResolvedEarly = configFromUser.root
+                        ? (0, prepareViteApiCall_js_1.normalizeViteRoot)(configFromUser.root)
+                        : await (0, prepareViteApiCall_js_1.getViteRoot)(operation);
+                    (0, utils_js_1.assert)(rootResolvedEarly);
+                    // TODO/v1-release: we can remove setVikeConfigContext() call here since with Vike's CLI it's already called at vike/node/api/prepareViteApiCall.ts
+                    (0, resolveVikeConfigInternal_js_1.setVikeConfigContext)({ userRootDir: rootResolvedEarly, isDev, vikeVitePluginOptions });
+                    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
                     return {
                         _isDev: isDev,
-                        _root: root,
-                        _vikeVitePluginOptions: vikeVitePluginOptions,
-                        _vikeConfigObject: vikeConfig,
-                        _vike: {
-                            pages: vikeConfig.pages,
-                            config: vikeConfig.global.config,
-                            prerenderContext
-                        },
+                        _rootResolvedEarly: rootResolvedEarly,
                         // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({
-                            prerender: isPrerenderingEnabled
-                        })
+                            prerender: vikeConfig.prerenderContext.isPrerenderingEnabled,
+                        }),
                     };
-                }
-            }
+                },
+            },
         },
         {
             name: pluginName,
             configResolved(config) {
-                (0, prepareViteApiCall_js_1.assertViteRoot)(config._root, config);
+                (0, prepareViteApiCall_js_1.assertViteRoot)(config._rootResolvedEarly, config);
                 assertSingleInstance(config);
                 (0, require_shim_1.installRequireShim_setUserRootDir)(config.root);
-            }
+            },
         },
         {
             name: `${pluginName}:post`,
             enforce: 'post',
             configResolved: {
                 order: 'post',
-                handler(config) {
+                async handler(config) {
                     /* TODO: do this after implementing vike.config.js and new setting transformLinkedDependencies (or probably a better name like transpileLinkedDependencies/bundleLinkedDependencies or something else)
                     overrideViteDefaultSsrExternal(config)
                     //*/
@@ -84,34 +67,34 @@ function commonConfig(vikeVitePluginOptions) {
                     assertEsm(config.root);
                     assertVikeCliOrApi(config);
                     temp_supportOldInterface(config);
-                    emitServerEntryOnlyIfNeeded(config);
-                }
+                    await emitServerEntryOnlyIfNeeded(config);
+                },
             },
             config: {
                 order: 'post',
-                handler(configFromUser) {
+                async handler(configFromUser) {
                     let configFromVike = { server: {}, preview: {} };
-                    const vike = getVikeConfigInternal(configFromUser);
-                    if (vike.config.port !== undefined) {
+                    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+                    if (vikeConfig.config.port !== undefined) {
                         // https://vike.dev/port
-                        setDefault('port', vike.config.port, configFromUser, configFromVike);
+                        setDefault('port', vikeConfig.config.port, configFromUser, configFromVike);
                     }
                     else {
                         // Change Vite's default port
                         setDefault('port', 3000, configFromUser, configFromVike);
                     }
-                    if (vike.config.host) {
+                    if (vikeConfig.config.host) {
                         // https://vike.dev/host
-                        setDefault('host', vike.config.host, configFromUser, configFromVike);
+                        setDefault('host', vikeConfig.config.host, configFromUser, configFromVike);
                     }
                     else if ((0, utils_js_1.isDocker)()) {
                         // Set `--host` for Docker/Podman
                         setDefault('host', true, configFromUser, configFromVike);
                     }
                     return configFromVike;
-                }
-            }
-        }
+                },
+            },
+        },
     ];
 }
 // Override Vite's default value without overriding user settings
@@ -142,7 +125,7 @@ function assertEsm(userViteRoot) {
     if (!found)
         return;
     const { packageJson, packageJsonPath } = found;
-    let dir = path_1.default.posix.dirname(packageJsonPath);
+    let dir = node_path_1.default.posix.dirname(packageJsonPath);
     if (dir !== '/') {
         (0, utils_js_1.assert)(!dir.endsWith('/'));
         dir = dir + '/';
@@ -161,7 +144,7 @@ function assertVikeCliOrApi(config) {
     if ((0, isViteCliCall_js_1.isViteCliCall)()) {
         (0, utils_js_1.assert)(!(0, utils_js_1.isVitest)());
         (0, utils_js_1.assertWarning)(false, `Vite's CLI is deprecated ${picocolors_1.default.underline('https://vike.dev/migration/cli')}`, {
-            onlyOnce: true
+            onlyOnce: true,
         });
         return;
     }
@@ -171,12 +154,12 @@ function assertVikeCliOrApi(config) {
     }
     if (config.server.middlewareMode) {
         (0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan('vite.createServer()')} is deprecated ${picocolors_1.default.underline('https://vike.dev/migration/cli#api')}`, {
-            onlyOnce: true
+            onlyOnce: true,
         });
         return;
     }
     (0, utils_js_1.assertWarning)(false, `Vite's JavaScript API is deprecated ${picocolors_1.default.underline('https://vike.dev/migration/cli#api')}`, {
-        onlyOnce: true
+        onlyOnce: true,
     });
 }
 // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
@@ -200,30 +183,10 @@ function temp_supportOldInterface(config) {
     }
     (0, utils_js_1.assert)(false);
 }
-// TODO/soon rename:
-// - `getVikeConfig()` => `resolveVikeConfig()` ?
-// - `getVikeConfigInternal()` => `getVikeConfig()`
-// - `VikeConfigPublic` => `VikeConfig` ?
-// - `VikeConfigObject` => `VikeConfigInternal` ?
-/**
- * Get all the information Vike knows about the app in your Vite plugin.
- *
- * https://vike.dev/getVikeConfig
- */
-function getVikeConfigInternal(config) {
-    const vikeConfig = config._vike;
-    (0, utils_js_1.assert)(vikeConfig);
-    return vikeConfig;
-}
-function getVikeConfigPublic(config) {
-    const vikeConfig = config._vike;
-    (0, utils_js_1.assertUsage)(vikeConfig, "getVikeConfig() can only be used when Vite is running with Vike's Vite plugin");
-    return vikeConfig;
-}
 // Only emit dist/server/entry.mjs if necessary
-function emitServerEntryOnlyIfNeeded(config) {
-    if (config.vitePluginServerEntry?.inject &&
-        !(0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(config._vikeConfigObject).isPrerenderingEnabled) {
+async function emitServerEntryOnlyIfNeeded(config) {
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+    if (config.vitePluginServerEntry?.inject && !vikeConfig.prerenderContext.isPrerenderingEnabled) {
         config.vitePluginServerEntry.disableServerEntryEmit = true;
     }
 }

package/dist/cjs/node/{plugin/plugins/devConfig → vite/plugins/pluginDev}/determineFsAllowList.js

@@ -7,11 +7,11 @@ exports.determineFsAllowList = determineFsAllowList;
 const vite_1 = require("vite");
 const node_path_1 = __importDefault(require("node:path"));
 const utils_js_1 = require("../../utils.js");
-const url_1 = require("url");
+const node_url_1 = require("node:url");
 // @ts-ignore `file:///${__filename.split('\\').join('/')}` is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = `file:///${__filename.split('\\').join('/')}`;
 (0, utils_js_1.assertPosixPath)(importMetaUrl);
-const __dirname_ = node_path_1.default.posix.dirname((0, url_1.fileURLToPath)(importMetaUrl));
+const __dirname_ = node_path_1.default.posix.dirname((0, node_url_1.fileURLToPath)(importMetaUrl));
 (0, utils_js_1.assertPosixPath)(__dirname_);
 async function determineFsAllowList(config) {
     const fsAllow = config.server.fs.allow;

package/dist/cjs/node/{plugin/plugins/devConfig → vite/plugins/pluginDev}/determineOptimizeDeps.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineOptimizeDeps = determineOptimizeDeps;
 const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
 const utils_js_1 = require("../../utils.js");
-const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
-const pluginBuildConfig_js_1 = require("../build/pluginBuildConfig.js");
-const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
+const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
+const pluginBuildConfig_js_1 = require("../pluginBuild/pluginBuildConfig.js");
+const virtualFileEntry_js_1 = require("../../../shared/virtualFiles/virtualFileEntry.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
 const debug = (0, utils_js_1.createDebugger)('vike:optimizeDeps');
 async function determineOptimizeDeps(config) {
-    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config);
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+    const { _pageConfigs: pageConfigs } = vikeConfig;
     const { entries, include } = await getPageDeps(config, pageConfigs);
     {
         // This actually doesn't work: Vite's dep optimizer doesn't seem to be able to crawl virtual files.
@@ -27,7 +28,7 @@ async function determineOptimizeDeps(config) {
     if (debug.isActivated)
         debug('config.optimizeDeps', {
             'config.optimizeDeps.entries': config.optimizeDeps.entries,
-            'config.optimizeDeps.include': config.optimizeDeps.include
+            'config.optimizeDeps.include': config.optimizeDeps.include,
         });
 }
 async function getPageDeps(config, pageConfigs) {
@@ -48,7 +49,7 @@ async function getPageDeps(config, pageConfigs) {
         pageConfigs.forEach((pageConfig) => {
             Object.entries(pageConfig.configValueSources).forEach(([configName, sources]) => {
                 sources
-                    .filter((source) => !(0, getVikeConfig_js_1.isOverriden)(source, configName, pageConfig))
+                    .filter((source) => !(0, resolveVikeConfigInternal_js_1.isOverridden)(source, configName, pageConfig))
                     .forEach((configValueSource) => {
                     if (!configValueSource.valueIsLoadedWithImport && !configValueSource.valueIsFilePath)
                         return;
@@ -92,9 +93,9 @@ function getVirtualFiles(config, pageConfigs) {
     const { hasClientRouting, hasServerRouting, clientEntries } = (0, pluginBuildConfig_js_1.analyzeClientEntries)(pageConfigs, config);
     const entriesVirtualFiles = Object.values(clientEntries);
     if (hasClientRouting)
-        entriesVirtualFiles.push(virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeClientCR);
+        entriesVirtualFiles.push(virtualFileEntry_js_1.virtualFileIdEntryClientCR);
     if (hasServerRouting)
-        entriesVirtualFiles.push(virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeClientSR);
+        entriesVirtualFiles.push(virtualFileEntry_js_1.virtualFileIdEntryClientSR);
     return entriesVirtualFiles;
 }
 function normalizeEntries(entries) {