vike 0.4.165 → 0.4.166

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

@@ -38,7 +38,7 @@ function plugin(vikeConfig) {
         ...(0, commonConfig_js_1.commonConfig)(),
         (0, index_js_2.importUserCode)(),
         ...(0, index_js_1.devConfig)(),
-        (0, buildConfig_js_1.buildConfig)(),
+        ...(0, buildConfig_js_1.buildConfig)(),
         (0, previewConfig_js_1.previewConfig)(),
         ...(0, autoFullBuild_js_1.autoFullBuild)(),
         (0, packageJsonFile_js_1.packageJsonFile)(),

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

@@ -10,7 +10,7 @@ function baseUrls(configVike) {
     return {
         name: 'vike:baseUrls',
         enforce: 'post',
-        config: (config) => {
+        async config(config) {
             const bases = (0, resolveBase_js_1.resolveBaseFromUserConfig)(config, configVike);
             baseServer = bases.baseServer;
             baseAssets = bases.baseAssets;

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

@@ -49,10 +49,14 @@ async function copyAssets(filesToCopy, config) {
         return;
     (0, utils_js_1.assert)((0, fs_1.existsSync)(assetsDirServer));
     const concurrencyLimit = (0, utils_js_1.pLimit)(10);
-    await Promise.all(filesToCopy.map((file) => concurrencyLimit(() => promises_1.default.cp(path_1.default.posix.join(outDirServer, file), path_1.default.posix.join(outDirClient, file), {
+    await Promise.all(filesToCopy.map((file) => concurrencyLimit(() => 
+    // TODO: move instead of copying
+    promises_1.default.cp(path_1.default.posix.join(outDirServer, file), path_1.default.posix.join(outDirClient, file), {
         recursive: true
     }))));
-    await promises_1.default.rm(assetsDirServer, { recursive: true });
+    /* We cannot do that because, with some edge case Rollup settings (outputing JavaScript chunks and static assets to the same directoy), this removes JavaScript chunks, see https://github.com/vikejs/vike/issues/1154#issuecomment-1975762404
+    await fs.rm(assetsDirServer, { recursive: true })
+    */
 }
 // Add serverManifest resources to clientManifest
 function addServerAssets(clientManifest, serverManifest) {

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

@@ -28,71 +28,81 @@ function buildConfig() {
     let isSsrBuild;
     let outDirs;
     let config;
-    return {
-        name: 'vike:buildConfig',
-        apply: 'build',
-        enforce: 'post',
-        configResolved: {
-            order: 'post',
-            async handler(config_) {
-                config = config_;
-                (0, utils_js_1.assertNodeEnv_build)();
-                assertRollupInput(config);
-                const entries = await getEntries(config);
-                (0, utils_js_1.assert)(Object.keys(entries).length > 0);
-                config.build.rollupOptions.input = (0, utils_js_1.injectRollupInputs)(entries, config);
-                addLogHook();
-                outDirs = (0, utils_js_1.getOutDirs)(config);
-                {
-                    isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config, false));
-                    if (isServerAssetsFixEnabled) {
-                        // https://github.com/vikejs/vike/issues/1339
-                        config.build.ssrEmitAssets = true;
-                        // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
-                        config.build.cssMinify = 'esbuild';
+    return [
+        {
+            name: 'vike:buildConfig:configResolved',
+            apply: 'build',
+            enforce: 'post',
+            configResolved: {
+                order: 'post',
+                async handler(config_) {
+                    config = config_;
+                    (0, utils_js_1.assertNodeEnv_build)();
+                    assertRollupInput(config);
+                    const entries = await getEntries(config);
+                    (0, utils_js_1.assert)(Object.keys(entries).length > 0);
+                    config.build.rollupOptions.input = (0, utils_js_1.injectRollupInputs)(entries, config);
+                    addLogHook();
+                    outDirs = (0, utils_js_1.getOutDirs)(config);
+                    {
+                        isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config, false));
+                        if (isServerAssetsFixEnabled) {
+                            // https://github.com/vikejs/vike/issues/1339
+                            config.build.ssrEmitAssets = true;
+                            // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
+                            config.build.cssMinify = 'esbuild';
+                        }
                     }
                 }
+            },
+            config(config) {
+                (0, utils_js_1.assertNodeEnv_build)();
+                isSsrBuild = (0, utils_js_1.viteIsSSR)(config);
+                return {
+                    build: {
+                        outDir: (0, utils_js_1.resolveOutDir)(config),
+                        manifest: manifestTempFile,
+                        copyPublicDir: !isSsrBuild
+                    }
+                };
+            },
+            buildStart() {
+                (0, utils_js_1.assertNodeEnv_build)();
             }
         },
-        config(config) {
-            (0, utils_js_1.assertNodeEnv_build)();
-            isSsrBuild = (0, utils_js_1.viteIsSSR)(config);
-            return {
-                build: {
-                    outDir: (0, utils_js_1.resolveOutDir)(config),
-                    manifest: manifestTempFile,
-                    copyPublicDir: !isSsrBuild
-                }
-            };
-        },
-        buildStart() {
-            (0, utils_js_1.assertNodeEnv_build)();
-        },
-        writeBundle: {
-            order: 'post',
-            sequential: true,
-            async handler(options, bundle) {
-                if (isSsrBuild) {
-                    // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
-                    //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
-                    //  - We'll able to do so once we replace `$ vite build` with `$ vike build`
-                    const assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
-                    const clientManifestFilePath = path_1.default.posix.join(outDirs.outDirClient, manifestTempFile);
-                    const serverManifestFilePath = path_1.default.posix.join(outDirs.outDirServer, manifestTempFile);
-                    if (!isServerAssetsFixEnabled) {
-                        await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
-                    }
-                    else {
-                        const clientManifestMod = await (0, fixServerAssets_js_1.fixServerAssets)(config);
-                        await promises_1.default.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
+        {
+            name: 'vike:buildConfig:writeBundle',
+            apply: 'build',
+            // Make sure other writeBundle() hooks are called after this writeBundle() hook.
+            //  - set_constant_ASSETS_MAP() needs to be called before dist/server/ code is executed.
+            //    - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527
+            enforce: 'pre',
+            writeBundle: {
+                order: 'pre',
+                sequential: true,
+                async handler(options, bundle) {
+                    if (isSsrBuild) {
+                        // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
+                        //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
+                        //  - We'll able to do so once we replace `$ vite build` with `$ vike build`
+                        const assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
+                        const clientManifestFilePath = path_1.default.posix.join(outDirs.outDirClient, manifestTempFile);
+                        const serverManifestFilePath = path_1.default.posix.join(outDirs.outDirServer, manifestTempFile);
+                        if (!isServerAssetsFixEnabled) {
+                            await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
+                        }
+                        else {
+                            const clientManifestMod = await (0, fixServerAssets_js_1.fixServerAssets)(config);
+                            await promises_1.default.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
+                        }
+                        await promises_1.default.rm(clientManifestFilePath);
+                        await promises_1.default.rm(serverManifestFilePath);
+                        await (0, index_js_1.set_constant_ASSETS_MAP)(options, bundle);
                     }
-                    await promises_1.default.rm(clientManifestFilePath);
-                    await promises_1.default.rm(serverManifestFilePath);
-                    await (0, index_js_1.set_constant_ASSETS_MAP)(options, bundle);
                 }
             }
         }
-    };
+    ];
 }
 exports.buildConfig = buildConfig;
 async function getEntries(config) {
@@ -203,7 +213,7 @@ function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
     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);
+    let entryTarget = (0, utils_js_1.getFilePathAbsoluteFilesystem)(filePath, config);
     if (addExtractAssetsQuery)
         entryTarget = (0, extractAssetsQuery_js_1.extractAssetsAddQuery)(entryTarget);
     let entryName = filePath;

package/dist/cjs/node/plugin/plugins/commonConfig/assertResolveAlias.js

@@ -6,6 +6,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertResolveAlias = void 0;
 const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+// Recommend users to avoid un-distinguishable path aliases.
+// There are a lot of libraries that don't or cannot follow that recommendation, for example:
+// - Nx
+//   - Not sure why, but Nx seems to add a path alias for each monorepo package
+//   - https://github.com/vikejs/vike/discussions/1134
+// - MUI
+//   - https://mui.com/material-ui/guides/minimizing-bundle-size/#how-to-use-custom-bundles
+//   - https://github.com/vikejs/vike/discussions/1549#discussioncomment-8789002
+// - @preact/preset-vite
+//   - Aliases react imports
+// - @vitejs/plugin-vue2
+//   - https://github.com/vikejs/vike/issues/1329
 // TODO/v1-release: replace assertWarning() with assertUsage()
 function assertResolveAlias(config) {
     const aliases = getAliases(config);

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

@@ -26,7 +26,7 @@ async function getConfigVikPromise(vikeConfig, config) {
     const fromPluginOptions = (vikeConfig ?? {});
     const fromViteConfig = (config.vike ?? {});
     const configs = [fromPluginOptions, fromViteConfig];
-    const { globalVikeConfig: fromPlusConfigFile } = await (0, getVikeConfig_js_1.getVikeConfig)(config, (0, utils_js_1.isDev2)(config), false);
+    const { globalVikeConfig: fromPlusConfigFile } = await (0, getVikeConfig_js_1.getVikeConfig)(config, (0, utils_js_1.isDev2)(config));
     configs.push(fromPlusConfigFile);
     (0, assertVikeConfig_js_1.assertVikeConfig)(fromPlusConfigFile, ({ prop, errMsg }) => {
         // TODO: add config file path ?

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

@@ -38,7 +38,7 @@ async function getPageDeps(config, pageConfigs, isDev) {
                 const { definedAt, configEnv } = configValueSource;
                 if (!configEnv.client)
                     return;
-                if (definedAt.filePathRelativeToUserRootDir !== null) {
+                if (definedAt.filePathAbsoluteUserRootDir !== null) {
                     const { filePathAbsoluteFilesystem } = definedAt;
                     (0, utils_js_1.assert)(filePathAbsoluteFilesystem);
                     // Surprisingly Vite expects entries to be absolute paths
@@ -73,7 +73,7 @@ async function getPageDeps(config, pageConfigs, isDev) {
     {
         const pageFiles = await (0, findPageFiles_js_1.findPageFiles)(config, ['.page', '.page.client'], isDev);
         pageFiles.forEach((filePath) => {
-            const entry = (0, utils_js_1.getFilePathAbsolute)(filePath, config);
+            const entry = (0, utils_js_1.getFilePathAbsoluteFilesystem)(filePath, config);
             entries.push(entry);
         });
     }

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

@@ -45,7 +45,7 @@ function envVarsPlugin() {
                     if (isPrivate && isClientSide) {
                         if (!code.includes(envStatement))
                             return;
-                        const filePathToShowToUser = (0, utils_js_1.getFilePathRelativeToUserRootDir)(id, config.root);
+                        const filePathToShowToUser = (0, utils_js_1.getFilePathAbsoluteUserRootDir)(id, config.root);
                         const errMsgAddendum = isBuild ? '' : ' (Vike will prevent your app from building for production)';
                         const keyPublic = `${publicPrefix}${envName}`;
                         const errMsg = `${envStatement} is used in client-side file ${filePathToShowToUser} which means that the environment variable ${envName} will be included in client-side bundles and, therefore, ${envName} will be publicly exposed which can be a security leak${errMsgAddendum}. Use ${envStatement} only in server-side files, or rename ${envName} to ${keyPublic}, see https://vike.dev/env`;

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

@@ -60,7 +60,7 @@ function fileEnv() {
                     return;
                 // Show error message
                 let errMsg;
-                let modulePathPretty = (0, utils_js_1.getFilePathRelativeToUserRootDir)(modulePath, config.root);
+                let modulePathPretty = (0, utils_js_1.getFilePathAbsoluteUserRootDir)(modulePath, config.root);
                 modulePathPretty = modulePathPretty.replaceAll(suffix, picocolors_1.default.bold(suffix));
                 errMsg = `${(0, utils_js_1.capitalizeFirstLetter)(envExpect)}-only module ${modulePathPretty} (https://vike.dev/file-env) imported on the ${envActual}-side`;
                 if (importer &&
@@ -68,7 +68,7 @@ function fileEnv() {
                     !importer.includes('virtual:vike:') &&
                     // I don't know why and who sets importer to '<stdin>' (I guess Vite?)
                     importer !== '<stdin>') {
-                    const importerPath = (0, utils_js_1.getFilePathRelativeToUserRootDir)(importer.split('?')[0], config.root);
+                    const importerPath = (0, utils_js_1.getFilePathAbsoluteUserRootDir)(importer.split('?')[0], config.root);
                     errMsg += ` by ${importerPath}`;
                 }
                 if (isDev) {

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

@@ -124,7 +124,7 @@ function isVikeConfigModule(filePathAbsoluteFilesystem) {
 }
 function reloadConfig(filePath, config, op) {
     {
-        const filePathToShowToUser = picocolors_1.default.dim((0, utils_js_1.getFilePathRelativeToUserRootDir)(filePath, config.root, true));
+        const filePathToShowToUser = picocolors_1.default.dim((0, utils_js_1.getFilePathAbsoluteUserRootDir)(filePath, config.root, true));
         const msg = `${op} ${filePathToShowToUser}`;
         (0, loggerNotProd_js_1.logConfigInfo)(msg, 'info');
     }

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js

@@ -105,7 +105,6 @@ const configDefinitionsBuiltInGlobal = {
     prerender: {
         env: { config: true }
     },
-    extensions: { env: { config: true } },
     disableAutoFullBuild: { env: { config: true } },
     includeAssetsImportedByServer: { env: { config: true } },
     baseAssets: { env: { config: true } },

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles.js

@@ -11,9 +11,9 @@ const child_process_1 = require("child_process");
 const util_1 = require("util");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const execA = (0, util_1.promisify)(child_process_1.exec);
-const globalObject = (0, utils_js_1.getGlobalObject)('crawlPlusFiles.ts', {
-    gitIsMissing: false
-});
+(0, utils_js_1.assertIsNotProductionRuntime)();
+(0, utils_js_1.assertIsSingleModuleInstance)('crawlPlusFiles.ts');
+let gitIsNotUsable = false;
 async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
     (0, utils_js_1.assertPosixPath)(userRootDir);
     (0, utils_js_1.assertPosixPath)(outDirAbsoluteFilesystem);
@@ -48,15 +48,15 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
     const plusFiles = files.map((p) => {
         p = (0, utils_js_1.toPosixPath)(p);
         (0, utils_js_1.assert)(!p.startsWith(userRootDir));
-        const filePathRelativeToUserRootDir = path_1.default.posix.join('/', p);
-        return { filePathRelativeToUserRootDir };
+        const filePathAbsoluteUserRootDir = path_1.default.posix.join('/', p);
+        return { filePathAbsoluteUserRootDir };
     });
     return plusFiles;
 }
 exports.crawlPlusFiles = crawlPlusFiles;
 // Same as fastGlob() but using `$ git ls-files`
 async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
-    if (globalObject.gitIsMissing)
+    if (gitIsNotUsable)
         return null;
     const ignoreAsPatterns = getIgnoreAsPatterns(outDirRelativeFromUserRootDir);
     const ignoreAsFilterFn = getIgnoreAsFilterFn(outDirRelativeFromUserRootDir);
@@ -74,14 +74,14 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         ;
         [files, filesDeleted] = await Promise.all([
             // Main command
-            runCmd(cmd, userRootDir),
+            runCmd1(cmd, userRootDir),
             // Get tracked by deleted files
-            runCmd('git ls-files --deleted', userRootDir)
+            runCmd1('git ls-files --deleted', userRootDir)
         ]);
     }
     catch (err) {
-        if (await isGitMissing(userRootDir)) {
-            globalObject.gitIsMissing = true;
+        if (await isGitNotUsable(userRootDir)) {
+            gitIsNotUsable = true;
             return null;
         }
         throw err;
@@ -125,24 +125,53 @@ function getIgnoreAsFilterFn(outDirRelativeFromUserRootDir) {
         !file.includes('.telefunc.') &&
         (outDirRelativeFromUserRootDir === null || !file.startsWith(`${outDirRelativeFromUserRootDir}/`));
 }
-// Whether Git is installed and whether userRootDir is inside a Git repository
-async function isGitMissing(userRootDir) {
-    let res;
-    try {
-        res = await execA('git rev-parse --is-inside-work-tree', { cwd: userRootDir });
+// Whether Git is installed and whether we can use it
+async function isGitNotUsable(userRootDir) {
+    // Check Git version
+    {
+        const res = await runCmd2('git --version', userRootDir);
+        if ('err' in res)
+            return true;
+        let { stdout, stderr } = res;
+        (0, utils_js_1.assert)(stderr === '');
+        const prefix = 'git version ';
+        (0, utils_js_1.assert)(stdout.startsWith(prefix));
+        const gitVersion = stdout.slice(prefix.length);
+        //  - Works with Git 2.43.1 but also (most certainly) with earlier versions.
+        //    - We didn't bother test which is the earliest verision that works.
+        //  - Git 2.32.0 doesn't seem to work: https://github.com/vikejs/vike/discussions/1549
+        //    - Maybe it's because of StackBlitz: looking at the release notes, Git 2.32.0 should be working.
+        if (!(0, utils_js_1.isVersionOrAbove)(gitVersion, '2.43.1'))
+            return true;
     }
-    catch {
-        return true;
+    // Is userRootDir inside a Git repository?
+    {
+        const res = await runCmd2('git rev-parse --is-inside-work-tree', userRootDir);
+        if ('err' in res)
+            return true;
+        let { stdout, stderr } = res;
+        (0, utils_js_1.assert)(stderr === '');
+        (0, utils_js_1.assert)(stdout === 'true');
+        return false;
     }
-    const { stdout, stderr } = res;
-    (0, utils_js_1.assert)(stderr.toString().trim() === '');
-    (0, utils_js_1.assert)(stdout.toString().trim() === 'true');
-    return false;
 }
-async function runCmd(cmd, cwd) {
-    const res = await execA(cmd, { cwd });
+async function runCmd1(cmd, cwd) {
+    const { stdout } = await execA(cmd, { cwd });
     /* Not always true: https://github.com/vikejs/vike/issues/1440#issuecomment-1892831303
     assert(res.stderr === '')
     */
-    return res.stdout.toString().split('\n').filter(Boolean);
+    return stdout.toString().split('\n').filter(Boolean);
+}
+async function runCmd2(cmd, cwd) {
+    let res;
+    try {
+        res = await execA(cmd, { cwd });
+    }
+    catch (err) {
+        return { err };
+    }
+    let { stdout, stderr } = res;
+    stdout = stdout.toString().trim();
+    stderr = stderr.toString().trim();
+    return { stdout, stderr };
 }

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/filesystemRouting.js

@@ -10,10 +10,10 @@ const utils_js_1 = require("../../../../utils.js");
  */
 function getLocationId(
 // We always determine `locationId` from a real user-land file: the `locationId` for Vike extensions is the `locationId` of the the user's `+config.js` that extends the Vike extension.
-filePathRelativeToUserRootDir) {
-    (0, utils_js_1.assertPosixPath)(filePathRelativeToUserRootDir);
-    (0, utils_js_1.assert)(filePathRelativeToUserRootDir.startsWith('/'));
-    const locationId = removeFilename(filePathRelativeToUserRootDir);
+filePathAbsoluteUserRootDir) {
+    (0, utils_js_1.assertPosixPath)(filePathAbsoluteUserRootDir);
+    (0, utils_js_1.assert)(filePathAbsoluteUserRootDir.startsWith('/'));
+    const locationId = removeFilename(filePathAbsoluteUserRootDir);
     assertLocationId(locationId);
     return locationId;
 }
@@ -96,8 +96,8 @@ function removeDirectories(somePath, removeDirs) {
         somePath = '/';
     return somePath;
 }
-function removeFilename(filePathRelativeToUserRootDir) {
-    const filePathParts = filePathRelativeToUserRootDir.split('/');
+function removeFilename(filePathAbsoluteUserRootDir) {
+    const filePathParts = filePathAbsoluteUserRootDir.split('/');
     {
         const filename = filePathParts.slice(-1)[0];
         (0, utils_js_1.assert)(filename.includes('.'));

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/loadFileAtConfigTime.js

@@ -12,6 +12,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const transformFileImports_js_1 = require("./transformFileImports.js");
 const getConfigFileExport_js_1 = require("../getConfigFileExport.js");
 const resolveImportPath_js_1 = require("./resolveImportPath.js");
+const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 // Load fake import
 async function loadImportedFile(import_, userRootDir, importedFilesLoaded) {
@@ -64,21 +65,12 @@ async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir
     const extendsImportData = getExtendsImportData(configFileExports, configFilePath);
     const extendsConfigFiles = [];
     extendsImportData.map((importData) => {
-        const { importPath: importPath } = importData;
+        const { importPath: importPathAbsolute } = importData;
         const filePathAbsoluteFilesystem = (0, resolveImportPath_js_1.resolveImportPath)(importData, configFilePath);
         (0, resolveImportPath_js_1.assertImportPath)(filePathAbsoluteFilesystem, importData, configFilePath);
-        warnUserLandExtension(importPath, configFilePath);
-        // - filePathRelativeToUserRootDir has no functionality beyond nicer error messages for user
-        // - Using importPath would be visually nicer but it's ambigous => we rather pick filePathAbsoluteFilesystem for added clarity
-        const filePathRelativeToUserRootDir = determineFilePathRelativeToUserDir(filePathAbsoluteFilesystem, userRootDir);
-        const filePathAbsoluteVite = filePathRelativeToUserRootDir ?? importPath;
-        extendsConfigFiles.push({
-            filePathAbsoluteFilesystem,
-            filePathAbsoluteVite,
-            filePathRelativeToUserRootDir,
-            filePathToShowToUser: filePathAbsoluteVite,
-            importPathAbsolute: importPath
-        });
+        warnUserLandExtension(importPathAbsolute, configFilePath);
+        const filePath = (0, getFilePath_js_1.getFilePathResolved)({ filePathAbsoluteFilesystem, userRootDir, importPathAbsolute });
+        extendsConfigFiles.push(filePath);
     });
     const extendsConfigs = [];
     await Promise.all(extendsConfigFiles.map(async (configFilePath) => {
@@ -89,17 +81,6 @@ async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir
     const extendsFilePaths = extendsConfigFiles.map((f) => f.filePathAbsoluteFilesystem);
     return { extendsConfigs, extendsFilePaths };
 }
-function determineFilePathRelativeToUserDir(filePathAbsoluteFilesystem, userRootDir) {
-    (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
-    (0, utils_js_1.assertPosixPath)(userRootDir);
-    if (!filePathAbsoluteFilesystem.startsWith(userRootDir)) {
-        return null;
-    }
-    let filePathRelativeToUserRootDir = filePathAbsoluteFilesystem.slice(userRootDir.length);
-    if (!filePathRelativeToUserRootDir.startsWith('/'))
-        filePathRelativeToUserRootDir = '/' + filePathRelativeToUserRootDir;
-    return filePathRelativeToUserRootDir;
-}
 function warnUserLandExtension(importPath, configFilePath) {
     (0, utils_js_1.assertWarning)((0, utils_js_1.isNpmPackageImport)(importPath), `${configFilePath.filePathToShowToUser} uses ${picocolors_1.default.cyan('extends')} to inherit from ${picocolors_1.default.cyan(importPath)} which is a user-land file: this is experimental and may be remove at any time. Reach out to a maintainer if you need this.`, { onlyOnce: true });
 }

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveImportPath.js

@@ -8,6 +8,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../../../../utils.js");
 const transformFileImports_js_1 = require("./transformFileImports.js");
 const path_1 = __importDefault(require("path"));
+const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
 const filesEnvMap = new Map();
 function resolveImport(configValue, importerFilePath, userRootDir, configEnv, configName) {
     if (typeof configValue !== 'string')
@@ -25,14 +26,8 @@ function resolveImport(configValue, importerFilePath, userRootDir, configEnv, co
         // [vite] Internal server error: Failed to resolve import "./onPageTransitionHooks" from "virtual:vike:pageConfigValuesAll:client:/pages/index". Does the file exist?
         // ```
         assertImportPath(filePathAbsoluteFilesystem, importData, importerFilePath);
-        const filePathRelativeToUserRootDir = resolveImportPath_relativeToUserRootDir(filePathAbsoluteFilesystem, importData, importerFilePath, userRootDir);
-        const filePath = {
-            filePathAbsoluteFilesystem,
-            filePathRelativeToUserRootDir,
-            filePathAbsoluteVite: filePathRelativeToUserRootDir,
-            filePathToShowToUser: filePathRelativeToUserRootDir,
-            importPathAbsolute: null
-        };
+        const filePathAbsoluteUserRootDir = resolveImportPath_absoluteUserRootDir(filePathAbsoluteFilesystem, importData, importerFilePath, userRootDir);
+        const filePath = (0, getFilePath_js_1.getFilePathResolved)({ filePathAbsoluteUserRootDir, userRootDir, importPathAbsolute: null });
         return {
             ...filePath,
             fileExportName: exportName,
@@ -43,13 +38,11 @@ function resolveImport(configValue, importerFilePath, userRootDir, configEnv, co
         // importPath can be:
         //  - an npm package import
         //  - a path alias
-        const filePath = {
+        const filePath = (0, getFilePath_js_1.getFilePathUnresolved)({
             filePathAbsoluteFilesystem,
-            filePathRelativeToUserRootDir: null,
-            filePathAbsoluteVite: importPath,
-            filePathToShowToUser: importPath,
+            filePathAbsoluteUserRootDir: null,
             importPathAbsolute: importPath
-        };
+        });
         return {
             ...filePath,
             fileExportName: exportName,
@@ -58,11 +51,11 @@ function resolveImport(configValue, importerFilePath, userRootDir, configEnv, co
     }
 }
 exports.resolveImport = resolveImport;
-function resolveImportPath_relativeToUserRootDir(filePathAbsoluteFilesystem, importData, configFilePath, userRootDir) {
+function resolveImportPath_absoluteUserRootDir(filePathAbsoluteFilesystem, importData, configFilePath, userRootDir) {
     (0, utils_js_1.assertPosixPath)(userRootDir);
-    let filePathRelativeToUserRootDir;
+    let filePathAbsoluteUserRootDir;
     if (filePathAbsoluteFilesystem.startsWith(userRootDir)) {
-        filePathRelativeToUserRootDir = getVitePathFromAbsolutePath(filePathAbsoluteFilesystem, userRootDir);
+        filePathAbsoluteUserRootDir = getVitePathFromAbsolutePath(filePathAbsoluteFilesystem, userRootDir);
     }
     else {
         (0, utils_js_1.assertUsage)(false, `${configFilePath.filePathToShowToUser} imports from a relative path ${picocolors_1.default.cyan(importData.importPath)} outside of ${userRootDir} which is forbidden: import from a relative path inside ${userRootDir}, or import from a dependency's package.json#exports entry instead`);
@@ -71,14 +64,14 @@ function resolveImportPath_relativeToUserRootDir(filePathAbsoluteFilesystem, imp
         // assert(filePathAbsoluteFilesystem.startsWith('/'))
         // filePath = `/@fs${filePathAbsoluteFilesystem}`
         // /*/
-        // filePathRelativeToUserRootDir = path.posix.relative(userRootDir, filePathAbsoluteFilesystem)
-        // assert(filePathRelativeToUserRootDir.startsWith('../'))
-        // filePathRelativeToUserRootDir = '/' + filePathRelativeToUserRootDir
+        // filePathAbsoluteUserRootDir = path.posix.relative(userRootDir, filePathAbsoluteFilesystem)
+        // assert(filePathAbsoluteUserRootDir.startsWith('../'))
+        // filePathAbsoluteUserRootDir = '/' + filePathAbsoluteUserRootDir
         // //*/
     }
-    (0, utils_js_1.assertPosixPath)(filePathRelativeToUserRootDir);
-    (0, utils_js_1.assert)(filePathRelativeToUserRootDir.startsWith('/'));
-    return filePathRelativeToUserRootDir;
+    (0, utils_js_1.assertPosixPath)(filePathAbsoluteUserRootDir);
+    (0, utils_js_1.assert)(filePathAbsoluteUserRootDir.startsWith('/'));
+    return filePathAbsoluteUserRootDir;
 }
 function resolveImportPath(importData, importerFilePath) {
     const importerFilePathAbsolute = importerFilePath.filePathAbsoluteFilesystem;