vike 0.4.227-commit-e36b916 → 0.4.227-commit-710dcb6

package/dist/cjs/shared/route/index.js

@@ -18,23 +18,25 @@ const resolveRouteFunction_js_1 = require("./resolveRouteFunction.js");
 const executeOnBeforeRouteHook_js_1 = require("./executeOnBeforeRouteHook.js");
 const debug_js_1 = require("./debug.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-async function route(pageContext) {
+async function route(pageContext, skipOnBeforeRouteHook) {
     (0, debug_js_1.debug)('Pages routes:', pageContext._pageRoutes);
     (0, getPageContextUrlComputed_js_1.assertPageContextUrl)(pageContext);
     const pageContextFromRoute = {};
     // onBeforeRoute()
-    const pageContextFromOnBeforeRouteHook = await (0, executeOnBeforeRouteHook_js_1.executeOnBeforeRouteHook)(pageContext);
-    if (pageContextFromOnBeforeRouteHook) {
-        if (pageContextFromOnBeforeRouteHook._routingProvidedByOnBeforeRouteHook) {
-            (0, utils_js_1.assert)(pageContextFromOnBeforeRouteHook.pageId);
-            return pageContextFromOnBeforeRouteHook;
-        }
-        else {
-            (0, utils_js_1.objectAssign)(pageContextFromRoute, pageContextFromOnBeforeRouteHook);
+    if (!skipOnBeforeRouteHook) {
+        const pageContextFromOnBeforeRouteHook = await (0, executeOnBeforeRouteHook_js_1.executeOnBeforeRouteHook)(pageContext);
+        if (pageContextFromOnBeforeRouteHook) {
+            if (pageContextFromOnBeforeRouteHook._routingProvidedByOnBeforeRouteHook) {
+                (0, utils_js_1.assert)(pageContextFromOnBeforeRouteHook.pageId);
+                return pageContextFromOnBeforeRouteHook;
+            }
+            else {
+                (0, utils_js_1.objectAssign)(pageContextFromRoute, pageContextFromOnBeforeRouteHook);
+            }
         }
+        // We take into account pageContext.urlLogical set by onBeforeRoute()
+        (0, utils_js_1.objectAssign)(pageContext, pageContextFromOnBeforeRouteHook);
     }
-    // We take into account pageContext.urlLogical set by onBeforeRoute()
-    (0, utils_js_1.objectAssign)(pageContext, pageContextFromOnBeforeRouteHook);
     // Vike's routing
     const allPageIds = pageContext._allPageIds;
     (0, utils_js_1.assertUsage)(allPageIds.length > 0, 'No page found. You must create at least one page.');

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-e36b916';
+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/preservePropertyGetters.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.preservePropertyGetters = preservePropertyGetters;
+const assert_js_1 = require("./assert.js");
+function preservePropertyGetters(objOriginal) {
+    // Store original getter descriptors
+    const getters = Object.fromEntries(Object.entries(Object.getOwnPropertyDescriptors(objOriginal)).filter(([_, desc]) => 'get' in desc));
+    // Make getters non-enumerable
+    for (const [key, desc] of Object.entries(getters)) {
+        Object.defineProperty(objOriginal, key, { ...desc, enumerable: false });
+    }
+    const restorePropertyGetters = function () {
+        const objCopy = this;
+        delete objOriginal._restorePropertyGetters;
+        delete objCopy._restorePropertyGetters;
+        for (const [key, desc] of Object.entries(getters)) {
+            if (objCopy !== objOriginal) {
+                (0, assert_js_1.assert)(!(key in objCopy));
+                Object.defineProperty(objCopy, key, desc); // Add property getters to copy
+            }
+            (0, assert_js_1.assert)(key in objOriginal);
+            Object.defineProperty(objOriginal, key, desc); // Restore original `enumerable` value
+        }
+    };
+    Object.defineProperty(objOriginal, '_restorePropertyGetters', {
+        value: restorePropertyGetters,
+        enumerable: true,
+        configurable: true
+    });
+}

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/plugins/commonConfig.js

@@ -33,7 +33,8 @@ function commonConfig(vikeVitePluginOptions) {
                         isPrerenderingEnabled,
                         isPrerenderingEnabledForAllPages,
                         output: null,
-                        pageContexts: null
+                        pageContexts: null,
+                        pageContexts404: null
                     });
                     assert(prerenderContext.isPrerenderingEnabled === isPrerenderingEnabled);
                     assert(prerenderContext.isPrerenderingEnabledForAllPages === isPrerenderingEnabledForAllPages);

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

@@ -568,6 +568,7 @@ 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,9 +1,7 @@
 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;
-const require_ = createRequire(importMetaUrl);
 assertIsNotProductionRuntime();
 async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     let root = viteDevServer.config.root;
@@ -30,17 +28,17 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
             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 {
             assertIsNpmPackageImport(clientEntry);
-            filePath = require_.resolve(clientEntry);
+            filePath = requireResolveExpected(clientEntry, root);
         }
     }
     if (!filePath.startsWith('/')) {

package/dist/esm/node/prerender/runPrerender.d.ts

@@ -14,6 +14,7 @@ type ProvidedByHook = null | {
 type PageContextPrerendered = {
     urlOriginal: string;
     _providedByHook?: ProvidedByHook;
+    pageId: string;
 };
 type Output<PageContext = PageContextPrerendered> = {
     filePath: string;
@@ -53,4 +54,5 @@ declare function runPrerender_forceExit(): void;
 type PrerenderContextPublic = {
     output: Output<PageContextServer>;
     pageContexts: PageContextServer[];
+    pageContexts404: PageContextServer;
 };