vike 0.4.227-commit-25aa0f8 → 0.4.227-commit-710dcb6

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

@@ -16,8 +16,8 @@ const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/ge
 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}`;
+// @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);
 const manifestTempFile = '_temp_manifest.json';
 exports.manifestTempFile = manifestTempFile;

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

@@ -11,8 +11,8 @@ 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}`;
+// @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);
 const extractExportNamesPlugin_js_1 = require("../extractExportNamesPlugin.js");
 const globalContext_js_1 = require("../../../runtime/globalContext.js");

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

@@ -10,8 +10,8 @@ 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}`;
+// @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);
 const __dirname_ = (0, path_2.dirname)((0, url_1.fileURLToPath)(importMetaUrl));
 async function determineFsAllowList(config) {

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

@@ -17,8 +17,8 @@ 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}`;
+// @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);
 (0, utils_js_1.assertIsNotProductionRuntime)();
 installSourceMapSupport();

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,21 @@ 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')));
+                filePath = (0, utils_js_1.requireResolveInternal)(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts'), importMetaUrl);
             }
             catch {
                 // 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.requireResolveInternal)(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/'), importMetaUrl);
             }
         }
         else {
-            const require_ = (0, module_1.createRequire)(root);
             (0, utils_js_1.assertIsNpmPackageImport)(clientEntry);
-            filePath = require_.resolve(clientEntry);
+            filePath = (0, utils_js_1.requireResolveExpected)(clientEntry, root);
         }
     }
     if (!filePath.startsWith('/')) {

package/dist/cjs/node/runtime/renderPage/analyzePage.js

@@ -15,6 +15,7 @@ async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
             clientEntries.push(clientFilePath);
         if (isClientRuntimeLoaded)
             clientEntries.push((0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting));
+        console.log('clientEntries', clientEntries);
         const clientDependencies = [];
         clientDependencies.push({
             id: (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageConfig.pageId, true),

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-710dcb6';

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,38 +1,82 @@
 "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.requireResolveExpected = requireResolveExpected;
+exports.requireResolveInternal = requireResolveInternal;
 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) {
     (0, path_js_1.assertPosixPath)(cwd);
+    (0, path_js_1.assertPosixPath)(importPath);
+    cwd = resolveCwd(cwd);
     const 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 requireResolve(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd);
+    if (res.hasFailed)
+        return null;
+    return res.importedFile;
+}
+function requireResolveExpected(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd);
+    if (res.hasFailed)
+        throw res.err;
+    return res.importedFile;
+}
+// For internal Vike files that are expected to exist and to be .js files
+function requireResolveInternal(importPath, cwd) {
+    (0, path_js_1.assertPosixPath)(cwd);
+    (0, path_js_1.assertPosixPath)(importPath);
+    cwd = resolveCwd(cwd);
+    let importedFile;
+    try {
+        importedFile = require_.resolve(importPath, { paths: [cwd] });
     }
+    catch (err) {
+        console.log('err', err);
+        (0, assert_js_1.assert)(false, { cwd, importPath });
+    }
+    importedFile = (0, path_js_1.toPosixPath)(importedFile);
     return 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);
+    }
+    (0, assert_js_1.assert)(!cwd.startsWith('file:'));
+    return cwd;
+}
 function removeFileExtention(importPath) {
     // Skip for Bun: https://github.com/vikejs/vike/issues/2204
     //@ts-ignore

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, requireResolveInternal, requireResolveExpected } 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,21 @@ 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')));
+                filePath = requireResolveInternal(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts'), importMetaUrl);
             }
             catch {
                 // 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 = requireResolveInternal(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/'), importMetaUrl);
             }
         }
         else {
-            const require_ = createRequire(root);
             assertIsNpmPackageImport(clientEntry);
-            filePath = require_.resolve(clientEntry);
+            filePath = requireResolveExpected(clientEntry, root);
         }
     }
     if (!filePath.startsWith('/')) {

package/dist/esm/node/runtime/renderPage/analyzePage.js

@@ -13,6 +13,7 @@ async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
             clientEntries.push(clientFilePath);
         if (isClientRuntimeLoaded)
             clientEntries.push(getVikeClientEntry(isClientRouting));
+        console.log('clientEntries', clientEntries);
         const clientDependencies = [];
         clientDependencies.push({
             id: getVirtualFileIdPageConfigValuesAll(pageConfig.pageId, true),

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-710dcb6";

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-710dcb6';

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

@@ -1,2 +1,6 @@
 export { requireResolve };
+export { requireResolveExpected };
+export { requireResolveInternal };
 declare function requireResolve(importPath: string, cwd: string): string | null;
+declare function requireResolveExpected(importPath: string, cwd: string): string;
+declare function requireResolveInternal(importPath: string, cwd: string): string;

package/dist/esm/utils/requireResolve.js

@@ -1,36 +1,77 @@
 export { requireResolve };
+export { requireResolveExpected };
+export { requireResolveInternal };
 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) {
     assertPosixPath(cwd);
+    assertPosixPath(importPath);
+    cwd = resolveCwd(cwd);
     const 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 requireResolve(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd);
+    if (res.hasFailed)
+        return null;
+    return res.importedFile;
+}
+function requireResolveExpected(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd);
+    if (res.hasFailed)
+        throw res.err;
+    return res.importedFile;
+}
+// For internal Vike files that are expected to exist and to be .js files
+function requireResolveInternal(importPath, cwd) {
+    assertPosixPath(cwd);
+    assertPosixPath(importPath);
+    cwd = resolveCwd(cwd);
+    let importedFile;
+    try {
+        importedFile = require_.resolve(importPath, { paths: [cwd] });
     }
+    catch (err) {
+        console.log('err', err);
+        assert(false, { cwd, importPath });
+    }
+    importedFile = toPosixPath(importedFile);
     return 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);
+    }
+    assert(!cwd.startsWith('file:'));
+    return cwd;
+}
 function removeFileExtention(importPath) {
     // Skip for Bun: https://github.com/vikejs/vike/issues/2204
     //@ts-ignore

package/package.json

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