vike 0.4.227-commit-25aa0f8 → 0.4.227-commit-ff6dcd9

package/dist/cjs/node/plugin/plugins/build/pluginBuildConfig.js

@@ -9,16 +9,14 @@ const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js
 const findPageFiles_js_1 = require("../../shared/findPageFiles.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 prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
 const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/getConfigValueBuildTime.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
-// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = `file://${__filename}`;
-const require_ = (0, module_1.createRequire)(importMetaUrl);
+// @ts-ignore `file:///${__filename.split('\\').join('/')}` is shimmed at dist/cjs by dist-cjs-fixup.js.
+const importMetaUrl = `file:///${__filename.split('\\').join('/')}`;
 const manifestTempFile = '_temp_manifest.json';
 exports.manifestTempFile = manifestTempFile;
 function pluginBuildConfig() {
@@ -200,7 +198,7 @@ function getEntryFromPageConfig(pageConfig, isForClientSide) {
 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/build/
-    return require_.resolve(`../../../../../../${filePath}`);
+    return (0, utils_js_1.requireResolveNonUserFile)(`../../../../../../${filePath}`, importMetaUrl);
 }
 function addLogHook() {
     const tty = process.stdout.isTTY && !process.env.CI; // Equals https://github.com/vitejs/vite/blob/193d55c7b9cbfec5b79ebfca276d4a721e7de14d/packages/vite/src/node/plugins/reporter.ts#L27

package/dist/cjs/node/plugin/plugins/build/pluginBuildEntry.js

@@ -10,10 +10,8 @@ const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/vi
 const utils_js_1 = require("../../utils.js");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
-const module_1 = require("module");
-// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = `file://${__filename}`;
-const require_ = (0, module_1.createRequire)(importMetaUrl);
+// @ts-ignore `file:///${__filename.split('\\').join('/')}` is shimmed at dist/cjs by dist-cjs-fixup.js.
+const importMetaUrl = `file:///${__filename.split('\\').join('/')}`;
 const extractExportNamesPlugin_js_1 = require("../extractExportNamesPlugin.js");
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
@@ -92,9 +90,8 @@ function find_ASSETS_MANIFEST(bundle) {
 }
 function getImportPath(config) {
     // We resolve filePathAbsolute even if we don't use it: we use require.resolve() as an assertion that the relative path is correct
-    const filePathAbsolute = (0, utils_js_1.toPosixPath)(
     // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/pluginBuildEntry/index.js
-    require_.resolve(`../../../../../../dist/esm/__internal/index.js`));
+    const filePathAbsolute = (0, utils_js_1.requireResolveNonUserFile)(`../../../../../../dist/esm/__internal/index.js`, importMetaUrl);
     if (
     // Let's implement a new config if a user needs the import to be a relative path instead of 'vike/__internal' (AFAIK a relative path is needed only if a framework has npm package 'vike' as direct dependency instead of a peer dependency and if the user of that framework uses pnpm)
     true) {

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

@@ -5,15 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineFsAllowList = determineFsAllowList;
 const vite_1 = require("vite");
-const path_1 = __importDefault(require("path"));
+const node_path_1 = __importDefault(require("node:path"));
 const utils_js_1 = require("../../utils.js");
-const module_1 = require("module");
-const path_2 = require("path");
 const url_1 = require("url");
-// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = `file://${__filename}`;
-const require_ = (0, module_1.createRequire)(importMetaUrl);
-const __dirname_ = (0, path_2.dirname)((0, url_1.fileURLToPath)(importMetaUrl));
+// @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));
+(0, utils_js_1.assertPosixPath)(__dirname_);
 async function determineFsAllowList(config) {
     const fsAllow = config.server.fs.allow;
     // fsAllow should already contain searchForWorkspaceRoot()
@@ -26,9 +25,9 @@ async function determineFsAllowList(config) {
     // Add node_modules/vike/
     {
         // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/config/
-        const vikeRoot = path_1.default.join(__dirname_, '../../../../../../');
+        const vikeRoot = node_path_1.default.posix.join(__dirname_, '../../../../../../');
         // Assert that `vikeRoot` is indeed pointing to `node_modules/vike/`
-        require_.resolve(`${vikeRoot}/dist/esm/node/plugin/plugins/devConfig/index.js`);
+        (0, utils_js_1.requireResolveNonUserFile)(`${vikeRoot}/dist/esm/node/plugin/plugins/devConfig/index.js`, importMetaUrl);
         fsAllow.push(vikeRoot);
     }
 }

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

@@ -77,10 +77,8 @@ function resolveImportPathWithNode(pointerImportData, importerFilePath) {
     const importerFilePathAbsolute = importerFilePath.filePathAbsoluteFilesystem;
     (0, utils_js_1.assertPosixPath)(importerFilePathAbsolute);
     const cwd = path_1.default.posix.dirname(importerFilePathAbsolute);
-    // We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
-    // - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
     // filePathAbsoluteFilesystem is expected to be null when pointerImportData.importPath is a Vite path alias
-    const filePathAbsoluteFilesystem = (0, utils_js_1.requireResolve)(pointerImportData.importPath, cwd);
+    const filePathAbsoluteFilesystem = (0, utils_js_1.requireResolveOptional)(pointerImportData.importPath, cwd);
     return filePathAbsoluteFilesystem;
 }
 function assertUsageResolutionSuccess(filePathAbsoluteFilesystem, pointerImportData, importerFilePath) {

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

@@ -16,10 +16,6 @@ const utils_js_1 = require("../../../../utils.js");
 const transformPointerImports_js_1 = require("./transformPointerImports.js");
 const source_map_support_1 = __importDefault(require("source-map-support"));
 const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
-const module_1 = require("module");
-// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = `file://${__filename}`;
-const require_ = (0, module_1.createRequire)(importMetaUrl);
 (0, utils_js_1.assertIsNotProductionRuntime)();
 installSourceMapSupport();
 const debug = (0, utils_js_1.createDebugger)('vike:pointer-imports');
@@ -130,11 +126,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     // - Sitll required for esbuild@0.24.0 (November 2024).
                     // - Let's try to remove this workaround again later.
                     if (resolved.errors.length > 0) {
-                        let resolvedWithNode;
-                        try {
-                            resolvedWithNode = require_.resolve(path, { paths: [args.resolveDir] });
-                        }
-                        catch { }
+                        const resolvedWithNode = (0, utils_js_1.requireResolveOptional)(path, args.resolveDir);
                         if (debugEsbuildResolve.isActivated)
                             debugEsbuildResolve('resolvedWithNode', resolvedWithNode);
                         if (resolvedWithNode)

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

@@ -573,7 +573,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
             // Defined over pointer import
             (0, utils_js_1.assert)(confVal.valueIsLoaded);
             const pointerImport = (0, resolvePointerImport_js_1.resolvePointerImport)(confVal.value, plusFile.filePath, userRootDir, configName);
-            console.log('pointerImport', pointerImport);
             const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, definedAtFilePath_);
             (0, utils_js_1.assertUsage)(pointerImport, `${configDefinedAt} should be an import`);
             valueFilePath = pointerImport.fileExportPath.filePathAbsoluteVite;

package/dist/cjs/node/plugin/shared/resolveClientEntriesDev.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveClientEntriesDev = resolveClientEntriesDev;
 const utils_js_1 = require("../utils.js");
-const module_1 = require("module");
-// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = `file://${__filename}`;
+// @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.assertIsNotProductionRuntime)();
 async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     let root = viteDevServer.config.root;
@@ -27,23 +26,22 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     }
     else {
         if (clientEntry.startsWith('@@vike/')) {
-            const require_ = (0, module_1.createRequire)(importMetaUrl);
             (0, utils_js_1.assert)(clientEntry.endsWith('.js'));
-            try {
-                // For Vitest (which doesn't resolve vike to its dist but to its source files)
-                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/plugin/shared/resolveClientEntriesDev.js
-                filePath = (0, utils_js_1.toPosixPath)(require_.resolve(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts')));
-            }
-            catch {
+            let filePath_;
+            // For Vitest (which doesn't resolve vike to its dist but to its source files)
+            // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/plugin/shared/resolveClientEntriesDev.js
+            filePath_ = (0, utils_js_1.requireResolveOptionalNonUserFile)(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts'), importMetaUrl);
+            if (!filePath_) {
                 // For users
                 // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/shared/resolveClientEntriesDev.js
-                filePath = (0, utils_js_1.toPosixPath)(require_.resolve(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
+                filePath_ = (0, utils_js_1.requireResolveOptionalNonUserFile)(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/'), importMetaUrl);
             }
+            (0, utils_js_1.assert)(filePath_);
+            filePath = filePath_;
         }
         else {
-            const require_ = (0, module_1.createRequire)(root);
             (0, utils_js_1.assertIsNpmPackageImport)(clientEntry);
-            filePath = require_.resolve(clientEntry);
+            filePath = (0, utils_js_1.requireResolve)(clientEntry, root);
         }
     }
     if (!filePath.startsWith('/')) {

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.227-commit-25aa0f8';
+exports.PROJECT_VERSION = '0.4.227-commit-ff6dcd9';

package/dist/cjs/utils/findPackageJson.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findPackageJson = findPackageJson;
 const findFile_js_1 = require("./findFile.js");
 const module_1 = require("module");
-// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = `file://${__filename}`;
+// @ts-ignore `file:///${__filename.split('\\').join('/')}` is shimmed at dist/cjs by dist-cjs-fixup.js.
+const importMetaUrl = `file:///${__filename.split('\\').join('/')}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
 function findPackageJson(cwd) {
     const packageJsonPath = (0, findFile_js_1.findFile)('package.json', cwd);

package/dist/cjs/utils/requireResolve.js

@@ -1,37 +1,81 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireResolve = requireResolve;
+exports.requireResolveOptional = requireResolveOptional;
+exports.requireResolveNonUserFile = requireResolveNonUserFile;
+exports.requireResolveOptionalNonUserFile = requireResolveOptionalNonUserFile;
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 const assertSetup_js_1 = require("./assertSetup.js");
 const path_js_1 = require("./path.js");
 const isScriptFile_js_1 = require("./isScriptFile.js");
-const module_1 = require("module");
-// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = `file://${__filename}`;
-const require_ = (0, module_1.createRequire)(importMetaUrl);
+const node_module_1 = require("node:module");
+const node_path_1 = __importDefault(require("node:path"));
+// @ts-ignore `file:///${__filename.split('\\').join('/')}` is shimmed at dist/cjs by dist-cjs-fixup.js.
+const importMetaUrl = `file:///${__filename.split('\\').join('/')}`;
+const require_ = (0, node_module_1.createRequire)(importMetaUrl);
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 (0, assertSetup_js_1.assertIsNotProductionRuntime)();
-// We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
-// - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
-function requireResolve(importPath, cwd) {
+function requireResolve_(importPath, cwd, options) {
     (0, path_js_1.assertPosixPath)(cwd);
-    const clean = addFileExtensionsToRequireResolve();
-    importPath = removeFileExtention(importPath);
+    (0, path_js_1.assertPosixPath)(importPath);
+    cwd = resolveCwd(cwd);
+    let clean = () => { };
+    if (!options?.doNotHandleFileExtension) {
+        clean = addFileExtensionsToRequireResolve();
+        importPath = removeFileExtention(importPath);
+    }
     let importedFile;
     try {
+        // We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
+        // - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
         importedFile = require_.resolve(importPath, { paths: [cwd] });
     }
-    catch {
-        importedFile = null;
-    }
-    finally {
+    catch (err) {
         clean();
+        return { importedFile: undefined, err, hasFailed: true };
     }
-    if (importedFile) {
-        importedFile = (0, path_js_1.toPosixPath)(importedFile);
+    clean();
+    importedFile = (0, path_js_1.toPosixPath)(importedFile);
+    return { importedFile, err: undefined, hasFailed: false };
+}
+function requireResolveOptional(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd);
+    if (res.hasFailed)
+        return null;
+    return res.importedFile;
+}
+function requireResolveOptionalNonUserFile(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd, { doNotHandleFileExtension: true });
+    if (res.hasFailed)
+        return null;
+    return res.importedFile;
+}
+function requireResolveNonUserFile(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd, { doNotHandleFileExtension: true });
+    if (res.hasFailed)
+        throw res.err;
+    return res.importedFile;
+}
+function requireResolve(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd);
+    if (res.hasFailed)
+        throw res.err;
+    return res.importedFile;
+}
+function resolveCwd(cwd) {
+    let prefix = 'file://';
+    if (process.platform === 'win32')
+        prefix += '/';
+    if (cwd.startsWith(prefix)) {
+        cwd = cwd.slice(prefix.length);
+        cwd = node_path_1.default.posix.dirname(cwd);
     }
-    return importedFile;
+    (0, assert_js_1.assert)(!cwd.startsWith('file:'));
+    return cwd;
 }
 function removeFileExtention(importPath) {
     // Skip for Bun: https://github.com/vikejs/vike/issues/2204

package/dist/esm/node/plugin/plugins/build/pluginBuildConfig.js

@@ -2,12 +2,11 @@ export { pluginBuildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
 export { manifestTempFile };
-import { assert, addOnBeforeLogHook, removeFileExtention, unique, assertUsage, injectRollupInputs, normalizeRollupInput, onSetupBuild, assertIsNpmPackageImport } from '../../utils.js';
+import { assert, addOnBeforeLogHook, removeFileExtention, unique, assertUsage, injectRollupInputs, normalizeRollupInput, onSetupBuild, assertIsNpmPackageImport, requireResolveNonUserFile } from '../../utils.js';
 import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
 import { findPageFiles } from '../../shared/findPageFiles.js';
 import { getVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { extractAssetsAddQuery } from '../../../shared/extractAssetsQuery.js';
-import { createRequire } from 'module';
 import { prependEntriesDir } from '../../../shared/prependEntriesDir.js';
 import { getFilePathResolved } from '../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../shared/page-configs/getConfigValueBuildTime.js';
@@ -16,7 +15,6 @@ import { resolveOutDir } from '../../shared/getOutDirs.js';
 import { handleAssetsManifest_assertUsageCssCodeSplit, handleAssetsManifest_getBuildConfig } from './handleAssetsManifest.js';
 // @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
-const require_ = createRequire(importMetaUrl);
 const manifestTempFile = '_temp_manifest.json';
 function pluginBuildConfig() {
     let config;
@@ -197,7 +195,7 @@ function getEntryFromPageConfig(pageConfig, isForClientSide) {
 function resolve(filePath) {
     assert(filePath.startsWith('dist/'));
     // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/build/
-    return require_.resolve(`../../../../../../${filePath}`);
+    return requireResolveNonUserFile(`../../../../../../${filePath}`, importMetaUrl);
 }
 function addLogHook() {
     const tty = process.stdout.isTTY && !process.env.CI; // Equals https://github.com/vitejs/vite/blob/193d55c7b9cbfec5b79ebfca276d4a721e7de14d/packages/vite/src/node/plugins/reporter.ts#L27

package/dist/esm/node/plugin/plugins/build/pluginBuildEntry.js

@@ -2,13 +2,11 @@ export { pluginBuildEntry };
 export { set_macro_ASSETS_MANIFEST };
 import { serverProductionEntryPlugin } from '@brillout/vite-plugin-server-entry/plugin';
 import { virtualFileIdImportUserCodeServer } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
-import { assert, PROJECT_VERSION, toPosixPath } from '../../utils.js';
+import { assert, PROJECT_VERSION, requireResolveNonUserFile } from '../../utils.js';
 import fs from 'fs/promises';
 import path from 'path';
-import { createRequire } from 'module';
 // @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
-const require_ = createRequire(importMetaUrl);
 import { isUsingClientRouter } from '../extractExportNamesPlugin.js';
 import { assertBuildInfo, getViteConfigRuntime } from '../../../runtime/globalContext.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
@@ -87,9 +85,8 @@ function find_ASSETS_MANIFEST(bundle) {
 }
 function getImportPath(config) {
     // We resolve filePathAbsolute even if we don't use it: we use require.resolve() as an assertion that the relative path is correct
-    const filePathAbsolute = toPosixPath(
     // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/pluginBuildEntry/index.js
-    require_.resolve(`../../../../../../dist/esm/__internal/index.js`));
+    const filePathAbsolute = requireResolveNonUserFile(`../../../../../../dist/esm/__internal/index.js`, importMetaUrl);
     if (
     // Let's implement a new config if a user needs the import to be a relative path instead of 'vike/__internal' (AFAIK a relative path is needed only if a framework has npm package 'vike' as direct dependency instead of a peer dependency and if the user of that framework uses pnpm)
     true) {

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

@@ -1,14 +1,13 @@
 export { determineFsAllowList };
 import { searchForWorkspaceRoot } from 'vite';
-import path from 'path';
-import { assert } from '../../utils.js';
-import { createRequire } from 'module';
-import { dirname } from 'path';
+import path from 'node:path';
+import { assert, assertPosixPath, requireResolveNonUserFile } from '../../utils.js';
 import { fileURLToPath } from 'url';
 // @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
-const require_ = createRequire(importMetaUrl);
-const __dirname_ = dirname(fileURLToPath(importMetaUrl));
+assertPosixPath(importMetaUrl);
+const __dirname_ = path.posix.dirname(fileURLToPath(importMetaUrl));
+assertPosixPath(__dirname_);
 async function determineFsAllowList(config) {
     const fsAllow = config.server.fs.allow;
     // fsAllow should already contain searchForWorkspaceRoot()
@@ -21,9 +20,9 @@ async function determineFsAllowList(config) {
     // Add node_modules/vike/
     {
         // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/config/
-        const vikeRoot = path.join(__dirname_, '../../../../../../');
+        const vikeRoot = path.posix.join(__dirname_, '../../../../../../');
         // Assert that `vikeRoot` is indeed pointing to `node_modules/vike/`
-        require_.resolve(`${vikeRoot}/dist/esm/node/plugin/plugins/devConfig/index.js`);
+        requireResolveNonUserFile(`${vikeRoot}/dist/esm/node/plugin/plugins/devConfig/index.js`, importMetaUrl);
         fsAllow.push(vikeRoot);
     }
 }

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolvePointerImport.js

@@ -1,7 +1,7 @@
 export { resolvePointerImport };
 export { resolvePointerImportData };
 import pc from '@brillout/picocolors';
-import { assert, assertPosixPath, assertUsage, isFilePathAbsolute, pathIsRelative, requireResolve } from '../../../../utils.js';
+import { assert, assertPosixPath, assertUsage, isFilePathAbsolute, pathIsRelative, requireResolveOptional } from '../../../../utils.js';
 import { parsePointerImportData } from './transformPointerImports.js';
 import path from 'path';
 import { getFilePathAbsoluteUserRootDir, getFilePathResolved, getFilePathUnresolved } from '../../../../shared/getFilePath.js';
@@ -72,10 +72,8 @@ function resolveImportPathWithNode(pointerImportData, importerFilePath) {
     const importerFilePathAbsolute = importerFilePath.filePathAbsoluteFilesystem;
     assertPosixPath(importerFilePathAbsolute);
     const cwd = path.posix.dirname(importerFilePathAbsolute);
-    // We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
-    // - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
     // filePathAbsoluteFilesystem is expected to be null when pointerImportData.importPath is a Vite path alias
-    const filePathAbsoluteFilesystem = requireResolve(pointerImportData.importPath, cwd);
+    const filePathAbsoluteFilesystem = requireResolveOptional(pointerImportData.importPath, cwd);
     return filePathAbsoluteFilesystem;
 }
 function assertUsageResolutionSuccess(filePathAbsoluteFilesystem, pointerImportData, importerFilePath) {

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js

@@ -7,14 +7,10 @@ import fs from 'fs';
 import path from 'path';
 import pc from '@brillout/picocolors';
 import { import_ } from '@brillout/import';
-import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertWarning, isObject, toPosixPath, assertUsage, isPlainJavaScriptFile, createDebugger, assertFilePathAbsoluteFilesystem, assertIsNpmPackageImport, genPromise, isVitest } from '../../../../utils.js';
+import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertWarning, isObject, toPosixPath, assertUsage, isPlainJavaScriptFile, createDebugger, assertFilePathAbsoluteFilesystem, assertIsNpmPackageImport, genPromise, isVitest, requireResolveOptional } from '../../../../utils.js';
 import { transformPointerImports } from './transformPointerImports.js';
 import sourceMapSupport from 'source-map-support';
 import { getFilePathAbsoluteUserRootDir } from '../../../../shared/getFilePath.js';
-import { createRequire } from 'module';
-// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = import.meta.url;
-const require_ = createRequire(importMetaUrl);
 assertIsNotProductionRuntime();
 installSourceMapSupport();
 const debug = createDebugger('vike:pointer-imports');
@@ -125,11 +121,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     // - Sitll required for esbuild@0.24.0 (November 2024).
                     // - Let's try to remove this workaround again later.
                     if (resolved.errors.length > 0) {
-                        let resolvedWithNode;
-                        try {
-                            resolvedWithNode = require_.resolve(path, { paths: [args.resolveDir] });
-                        }
-                        catch { }
+                        const resolvedWithNode = requireResolveOptional(path, args.resolveDir);
                         if (debugEsbuildResolve.isActivated)
                             debugEsbuildResolve('resolvedWithNode', resolvedWithNode);
                         if (resolvedWithNode)

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

@@ -568,7 +568,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
             // Defined over pointer import
             assert(confVal.valueIsLoaded);
             const pointerImport = resolvePointerImport(confVal.value, plusFile.filePath, userRootDir, configName);
-            console.log('pointerImport', pointerImport);
             const configDefinedAt = getConfigDefinedAt('Config', configName, definedAtFilePath_);
             assertUsage(pointerImport, `${configDefinedAt} should be an import`);
             valueFilePath = pointerImport.fileExportPath.filePathAbsoluteVite;

package/dist/esm/node/plugin/shared/resolveClientEntriesDev.js

@@ -1,6 +1,5 @@
 export { resolveClientEntriesDev };
-import { assert, assertPosixPath, toPosixPath, pathJoin, assertIsNpmPackageImport, assertIsNotProductionRuntime } from '../utils.js';
-import { createRequire } from 'module';
+import { assert, assertPosixPath, toPosixPath, pathJoin, assertIsNpmPackageImport, assertIsNotProductionRuntime, requireResolveOptionalNonUserFile, requireResolve } from '../utils.js';
 // @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 assertIsNotProductionRuntime();
@@ -25,23 +24,22 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     }
     else {
         if (clientEntry.startsWith('@@vike/')) {
-            const require_ = createRequire(importMetaUrl);
             assert(clientEntry.endsWith('.js'));
-            try {
-                // For Vitest (which doesn't resolve vike to its dist but to its source files)
-                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/plugin/shared/resolveClientEntriesDev.js
-                filePath = toPosixPath(require_.resolve(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts')));
-            }
-            catch {
+            let filePath_;
+            // For Vitest (which doesn't resolve vike to its dist but to its source files)
+            // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/plugin/shared/resolveClientEntriesDev.js
+            filePath_ = requireResolveOptionalNonUserFile(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts'), importMetaUrl);
+            if (!filePath_) {
                 // For users
                 // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/shared/resolveClientEntriesDev.js
-                filePath = toPosixPath(require_.resolve(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
+                filePath_ = requireResolveOptionalNonUserFile(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/'), importMetaUrl);
             }
+            assert(filePath_);
+            filePath = filePath_;
         }
         else {
-            const require_ = createRequire(root);
             assertIsNpmPackageImport(clientEntry);
-            filePath = require_.resolve(clientEntry);
+            filePath = requireResolve(clientEntry, root);
         }
     }
     if (!filePath.startsWith('/')) {

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.227-commit-25aa0f8";
+export declare const PROJECT_VERSION: "0.4.227-commit-ff6dcd9";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.227-commit-25aa0f8';
+export const PROJECT_VERSION = '0.4.227-commit-ff6dcd9';

package/dist/esm/utils/requireResolve.d.ts

@@ -1,2 +1,8 @@
 export { requireResolve };
-declare function requireResolve(importPath: string, cwd: string): string | null;
+export { requireResolveOptional };
+export { requireResolveNonUserFile };
+export { requireResolveOptionalNonUserFile };
+declare function requireResolveOptional(importPath: string, cwd: string): string | null;
+declare function requireResolveOptionalNonUserFile(importPath: string, cwd: string): string | null;
+declare function requireResolveNonUserFile(importPath: string, cwd: string): string;
+declare function requireResolve(importPath: string, cwd: string): string;

package/dist/esm/utils/requireResolve.js

@@ -1,35 +1,76 @@
 export { requireResolve };
+export { requireResolveOptional };
+export { requireResolveNonUserFile };
+export { requireResolveOptionalNonUserFile };
 import { assert } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 import { assertIsNotProductionRuntime } from './assertSetup.js';
 import { assertPosixPath, toPosixPath } from './path.js';
 import { scriptFileExtensionList } from './isScriptFile.js';
-import { createRequire } from 'module';
+import { createRequire } from 'node:module';
+import path from 'node:path';
 // @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 assertIsNotBrowser();
 assertIsNotProductionRuntime();
-// We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
-// - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
-function requireResolve(importPath, cwd) {
+function requireResolve_(importPath, cwd, options) {
     assertPosixPath(cwd);
-    const clean = addFileExtensionsToRequireResolve();
-    importPath = removeFileExtention(importPath);
+    assertPosixPath(importPath);
+    cwd = resolveCwd(cwd);
+    let clean = () => { };
+    if (!options?.doNotHandleFileExtension) {
+        clean = addFileExtensionsToRequireResolve();
+        importPath = removeFileExtention(importPath);
+    }
     let importedFile;
     try {
+        // We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
+        // - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
         importedFile = require_.resolve(importPath, { paths: [cwd] });
     }
-    catch {
-        importedFile = null;
-    }
-    finally {
+    catch (err) {
         clean();
+        return { importedFile: undefined, err, hasFailed: true };
     }
-    if (importedFile) {
-        importedFile = toPosixPath(importedFile);
+    clean();
+    importedFile = toPosixPath(importedFile);
+    return { importedFile, err: undefined, hasFailed: false };
+}
+function requireResolveOptional(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd);
+    if (res.hasFailed)
+        return null;
+    return res.importedFile;
+}
+function requireResolveOptionalNonUserFile(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd, { doNotHandleFileExtension: true });
+    if (res.hasFailed)
+        return null;
+    return res.importedFile;
+}
+function requireResolveNonUserFile(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd, { doNotHandleFileExtension: true });
+    if (res.hasFailed)
+        throw res.err;
+    return res.importedFile;
+}
+function requireResolve(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd);
+    if (res.hasFailed)
+        throw res.err;
+    return res.importedFile;
+}
+function resolveCwd(cwd) {
+    let prefix = 'file://';
+    if (process.platform === 'win32')
+        prefix += '/';
+    if (cwd.startsWith(prefix)) {
+        cwd = cwd.slice(prefix.length);
+        cwd = path.posix.dirname(cwd);
     }
-    return importedFile;
+    assert(!cwd.startsWith('file:'));
+    return cwd;
 }
 function removeFileExtention(importPath) {
     // Skip for Bun: https://github.com/vikejs/vike/issues/2204

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.227-commit-25aa0f8",
+  "version": "0.4.227-commit-ff6dcd9",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {