vike 0.4.171 → 0.4.172-commit-c1b0884

package/dist/cjs/node/runtime/renderPage/createHttpResponseObject/getCacheControl.js

@@ -9,7 +9,7 @@ function getCacheControl(pageId, pageConfigs) {
     if (pageConfigs.length === 0)
         return defaultValue;
     const pageConfig = (0, helpers_js_1.getPageConfig)(pageId, pageConfigs);
-    const configValue = (0, getConfigValue_js_1.getConfigValue)(pageConfig, 'cacheControl', 'string');
+    const configValue = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'cacheControl', 'string');
     const value = configValue?.value;
     if (value)
         return value;

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

@@ -16,7 +16,7 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
     }
     (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(pageContext);
     if (dataHook) {
-        const hookResult = await (0, executeHook_js_1.executeHook)(() => dataHook.hookFn(pageContext), dataHook);
+        const hookResult = await (0, executeHook_js_1.executeHook)(() => dataHook.hookFn(pageContext), dataHook, pageContext);
         // Note: hookResult can be anything (e.g. an object) and is to be assigned to pageContext.data
         const pageContextFromHook = {
             data: hookResult
@@ -24,7 +24,7 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
         Object.assign(pageContext, pageContextFromHook);
     }
     if (onBeforeRenderHook) {
-        const hookResult = await (0, executeHook_js_1.executeHook)(() => onBeforeRenderHook.hookFn(pageContext), onBeforeRenderHook);
+        const hookResult = await (0, executeHook_js_1.executeHook)(() => onBeforeRenderHook.hookFn(pageContext), onBeforeRenderHook, pageContext);
         (0, assertOnBeforeRenderHookReturn_js_1.assertOnBeforeRenderHookReturn)(hookResult, onBeforeRenderHook.hookFilePath);
         const pageContextFromHook = hookResult?.pageContext;
         Object.assign(pageContext, pageContextFromHook);

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

@@ -18,7 +18,7 @@ async function executeOnRenderHtmlHook(pageContext) {
     const { renderHook, hookFn } = getRenderHook(pageContext);
     (0, utils_js_1.objectAssign)(pageContext, { _renderHook: renderHook });
     (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(pageContext);
-    const hookReturnValue = await (0, executeHook_js_1.executeHook)(() => hookFn(pageContext), renderHook);
+    const hookReturnValue = await (0, executeHook_js_1.executeHook)(() => hookFn(pageContext), renderHook, pageContext);
     const { documentHtml, pageContextProvidedByRenderHook, pageContextPromise, injectFilter } = processHookReturnValue(hookReturnValue, renderHook);
     Object.assign(pageContext, pageContextProvidedByRenderHook);
     (0, utils_js_1.objectAssign)(pageContext, { _pageContextPromise: pageContextPromise });
@@ -69,13 +69,13 @@ function getRenderHook(pageContext) {
         (0, utils_js_1.assertUsage)(false, [
             `No ${hookName}() hook found, see https://vike.dev/${hookName}`
             /*
-          'See https://vike.dev/render-modes for more information.',
-          [
-            // 'Loaded config files (none of them define the onRenderHtml() hook):',
-            'Loaded server-side page files (none of them `export { render }`):',
-            ...pageContext._pageFilePathsLoaded.map((f, i) => ` (${i + 1}): ${f}`)
-          ].join('\n')
-          */
+            'See https://vike.dev/render-modes for more information.',
+            [
+              // 'Loaded config files (none of them define the onRenderHtml() hook):',
+              'Loaded server-side page files (none of them `export { render }`):',
+              ...pageContext._pageFilePathsLoaded.map((f, i) => ` (${i + 1}): ${f}`)
+            ].join('\n')
+            */
         ].join(' '));
     }
     return hookFound;

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

@@ -100,8 +100,8 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             }
         }
     };
-    function getFixMsg(type, standard) {
-        const streamName = (0, stream_js_1.getStreamName)(type, standard);
+    function getFixMsg(kind, type) {
+        const streamName = (0, stream_js_1.getStreamName)(kind, type);
         (0, utils_js_1.assert)(['a ', 'an ', 'the '].some((s) => streamName.startsWith(s)));
         (0, utils_js_1.assert)(renderHook);
         const { hookFilePath, hookName } = renderHook;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPageAssets = void 0;
+exports.setResolveClientEntriesDev = exports.getPageAssets = void 0;
 const utils_js_1 = require("../utils.js");
 const retrieveAssetsDev_js_1 = require("./getPageAssets/retrieveAssetsDev.js");
 const retrieveAssetsProd_js_1 = require("./getPageAssets/retrieveAssetsProd.js");
@@ -8,7 +8,9 @@ const inferMediaType_js_1 = require("./inferMediaType.js");
 const getManifestEntry_js_1 = require("./getPageAssets/getManifestEntry.js");
 const sortPageAssetsForEarlyHintsHeader_js_1 = require("./getPageAssets/sortPageAssetsForEarlyHintsHeader.js");
 const globalContext_js_1 = require("../globalContext.js");
-const import_1 = require("@brillout/import");
+const globalObject = (0, utils_js_1.getGlobalObject)('getPageAssets.ts', {
+    resolveClientEntriesDev: null
+});
 async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
     const isDev = !globalContext.isProduction;
@@ -16,7 +18,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     let clientEntriesSrc;
     if (isDev) {
         const { viteDevServer } = globalContext;
-        clientEntriesSrc = await Promise.all(clientEntries.map((clientEntry) => resolveClientEntriesDev(clientEntry, viteDevServer)));
+        clientEntriesSrc = await Promise.all(clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer)));
         assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
     }
     else {
@@ -57,62 +59,6 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     return pageAssets;
 }
 exports.getPageAssets = getPageAssets;
-async function resolveClientEntriesDev(clientEntry, viteDevServer) {
-    let root = viteDevServer.config.root;
-    (0, utils_js_1.assert)(root);
-    root = (0, utils_js_1.toPosixPath)(root);
-    // The `?import` suffix is needed for MDX to be transpiled:
-    //   - Not transpiled: `/pages/markdown.page.mdx`
-    //   - Transpiled: `/pages/markdown.page.mdx?import`
-    // But `?import` doesn't work with `/@fs/`:
-    //   - Not transpiled: /@fs/home/runner/work/vike/vike/examples/react-full/pages/markdown.page.mdx
-    //   - Not transpiled: /@fs/home/runner/work/vike/vike/examples/react-full/pages/markdown.page.mdx?import
-    if (clientEntry.endsWith('?import')) {
-        (0, utils_js_1.assert)(clientEntry.startsWith('/'));
-        return clientEntry;
-    }
-    (0, utils_js_1.assertPosixPath)(clientEntry);
-    let filePath;
-    if (clientEntry.startsWith('/')) {
-        filePath = (0, utils_js_1.pathJoin)(root, clientEntry);
-    }
-    else {
-        const { createRequire } = (await (0, import_1.import_)('module')).default;
-        const { dirname } = (await (0, import_1.import_)('path')).default;
-        const { fileURLToPath } = (await (0, import_1.import_)('url')).default;
-        // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
-        const importMetaUrl = `file://${__filename}`;
-        const require_ = createRequire(importMetaUrl);
-        const __dirname_ = dirname(fileURLToPath(importMetaUrl));
-        // @ts-expect-error
-        // Bun workaround https://github.com/vikejs/vike/pull/1048
-        const res = typeof Bun !== 'undefined' ? (toPath) => Bun.resolveSync(toPath, __dirname_) : require_.resolve;
-        if (clientEntry.startsWith('@@vike/')) {
-            (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/runtime/renderPage/getPageAssets.js
-                filePath = (0, utils_js_1.toPosixPath)(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts')));
-            }
-            catch {
-                // For users
-                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/runtime/renderPage/getPageAssets.js
-                filePath = (0, utils_js_1.toPosixPath)(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
-            }
-        }
-        else {
-            (0, utils_js_1.assertIsNpmPackageImport)(clientEntry);
-            filePath = res(clientEntry);
-        }
-    }
-    if (!filePath.startsWith('/')) {
-        (0, utils_js_1.assert)(process.platform === 'win32');
-        filePath = '/' + filePath;
-    }
-    filePath = '/@fs' + filePath;
-    (0, utils_js_1.assertPosixPath)(filePath);
-    return filePath;
-}
 function resolveClientEntriesProd(clientEntry, assetsManifest) {
     const { manifestEntry } = (0, getManifestEntry_js_1.getManifestEntry)(clientEntry, assetsManifest);
     (0, utils_js_1.assert)(manifestEntry.isEntry || manifestEntry.isDynamicEntry || clientEntry.endsWith('.css'), { clientEntry });
@@ -120,3 +66,7 @@ function resolveClientEntriesProd(clientEntry, assetsManifest) {
     (0, utils_js_1.assert)(!file.startsWith('/'));
     return '/' + file;
 }
+function setResolveClientEntriesDev(resolveClientEntriesDev) {
+    globalObject.resolveClientEntriesDev = resolveClientEntriesDev;
+}
+exports.setResolveClientEntriesDev = setResolveClientEntriesDev;

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

@@ -12,7 +12,7 @@ const globalContext_js_1 = require("../globalContext.js");
 const loadConfigValues_js_1 = require("../../../shared/page-configs/loadConfigValues.js");
 async function loadUserFilesServerSide(pageContext) {
     const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._pageConfigs, pageContext._pageId); // Make pageConfig globally available as pageContext._pageConfig?
-    const [{ pageFilesLoaded, pageConfigLoaded, ...pageContextExports }] = await Promise.all([
+    const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
         loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext._pageId, !(0, globalContext_js_1.getGlobalContext)().isProduction),
         (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._pageFilesAll, pageContext._pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
@@ -37,8 +37,8 @@ async function loadUserFilesServerSide(pageContext) {
         });
     }
     const pageContextAddendum = {};
+    (0, utils_js_1.objectAssign)(pageContextAddendum, pageContextExports);
     (0, utils_js_1.objectAssign)(pageContextAddendum, {
-        ...pageContextExports,
         Page: pageContextExports.exports.Page,
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
@@ -104,8 +104,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
     const pageContextExports = (0, getPageFiles_js_1.getPageContextExports)(pageFilesServerSide, pageConfigLoaded);
     return {
-        ...pageContextExports,
-        pageFilesLoaded: pageFilesServerSide,
-        pageConfigLoaded
+        pageContextExports,
+        pageFilesLoaded: pageFilesServerSide
     };
 }

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

@@ -3,53 +3,95 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHint = exports.isKnownError = exports.isCjsEsmError = exports.logErrorHint = void 0;
+exports.getErrorHint = exports.logErrorHint = void 0;
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const knownErrors = [
+const hintDefault = 'The error could be a CJS/ESM issue, see https://vike.dev/broken-npm-package';
+const hintLinkPrefix = 'To fix this error, see ';
+const errorsMisc = [
     {
         errMsg: 'jsxDEV is not a function',
-        link: 'https://github.com/vikejs/vike/issues/1469#issuecomment-1919518096'
-    },
-    {
-        errMsg: 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components)',
-        link: 'https://vike.dev/broken-npm-package#react-invalid-component'
+        link: 'https://github.com/vikejs/vike/issues/1469#issuecomment-1919518096',
+        shouldMentionNodeModules: false
     },
     {
         // ```
         // Error [RollupError]: Could not resolve "../dist/client/assets.json" from "renderer/+onRenderHtml.tsx"
         // ```
         errMsg: 'assets.json',
-        link: 'https://vike.dev/getGlobalContext'
+        link: 'https://vike.dev/getGlobalContext',
+        shouldMentionNodeModules: false
+    }
+];
+const errorsReact = [
+    {
+        errMsg: 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components)',
+        link: 'https://vike.dev/broken-npm-package#react-invalid-component',
+        // The stack trace can be user-land while the import is coming from node_modules
+        shouldMentionNodeModules: false
     },
     {
+        // React's "Invalid hook call.", see https://github.com/vikejs/vike/discussions/1637#discussioncomment-9424712
+        errMsg: "Cannot read properties of null (reading 'useContext')"
+    }
+];
+const errorsCjsEsm_withPreciseLink = [
+    {
+        // `SyntaxError: Named export '${exportName}' not found. The requested module '${packageName}' is a CommonJS module, which may not support all module.exports as named exports.`
         errMsg: /Named export.*not found/i,
-        link: 'https://vike.dev/broken-npm-package#named-export-not-found'
+        link: 'https://vike.dev/broken-npm-package#named-export-not-found',
+        // It seems that this always points to an npm package import.
+        shouldMentionNodeModules: false
     }
 ];
+const errorsCjsEsm = [
+    { errMsg: 'ERR_UNSUPPORTED_DIR_IMPORT' },
+    { errMsg: 'ERR_REQUIRE_ESM' },
+    { errMsg: 'Must use import' },
+    { errMsg: /Cannot find \S+ '(\S+)' imported from (\S+)/ },
+    { errMsg: 'ERR_UNKNOWN_FILE_EXTENSION' },
+    { errMsg: /Unknown file extension "\S+" for (\S+)/ },
+    // `SyntaxError: Cannot use import statement outside a module`.
+    {
+        errMsg: 'Cannot use import statement',
+        // Since user code is always ESM, this error must always originate from an npm package.
+        shouldMentionNodeModules: false
+    },
+    { errMsg: 'is not exported' },
+    { errMsg: 'Cannot read properties of undefined' },
+    { errMsg: '.default is not' },
+    // Using CJS inside ESM modules.
+    { errMsg: 'require is not a function' },
+    { errMsg: 'exports is not defined' },
+    { errMsg: 'module is not defined' },
+    { errMsg: 'window is not defined' },
+    { errMsg: 'not defined in ES' },
+    { errMsg: "Unexpected token 'export'" }
+];
 function logErrorHint(error) {
     /* Collect errors for ./logErrorHint.spec.ts
     collectError(error)
     //*/
-    const hint = getHint(error);
+    const hint = getErrorHint(error);
     if (hint)
         logHint(hint);
 }
 exports.logErrorHint = logErrorHint;
-function getHint(error) {
+function getErrorHint(error) {
     {
-        const link = isKnownError(error);
-        if (link)
-            return `To fix this error, see ${link}`;
-    }
-    const res = isCjsEsmError(error);
-    if (res) {
-        const hint = 'The error seems to be a CJS/ESM issue, see https://vike.dev/broken-npm-package';
-        return hint;
+        const knownErr = isKnownError(error);
+        if (knownErr) {
+            if (knownErr.link) {
+                return hintLinkPrefix + knownErr.link;
+            }
+            else {
+                return hintDefault;
+            }
+        }
     }
     return null;
 }
-exports.getHint = getHint;
+exports.getErrorHint = getErrorHint;
 function logHint(hint) {
     hint = (0, utils_js_1.formatHintLog)(hint);
     hint = picocolors_1.default.bold(hint);
@@ -57,268 +99,42 @@ function logHint(hint) {
 }
 function isKnownError(error) {
     const anywhere = getAnywhere(error);
-    const knownErr = knownErrors.find((knownErorr) => {
-        return includes(anywhere, knownErorr.errMsg);
+    const knownErr = [
+        //
+        ...errorsMisc,
+        ...errorsReact,
+        ...errorsCjsEsm_withPreciseLink,
+        ...errorsCjsEsm
+    ].find((knownErorr) => {
+        if (!includesLowercase(anywhere, knownErorr.errMsg))
+            return false;
+        if (knownErorr.shouldMentionNodeModules !== false && !includesLowercase(anywhere, 'node_modules'))
+            return false;
+        return true;
     });
     if (!knownErr)
         return false;
-    return knownErr.link;
-}
-exports.isKnownError = isKnownError;
-// `false` -> noop
-// `true` -> generic message
-// `'some-npm-package'` -> add some-npm-package to `ssr.noExternal`
-function isCjsEsmError(error) {
-    const res = check(error);
-    if (res === true || res === false)
-        return res;
-    const packageNames = normalizeRes(res);
-    if (packageNames === false)
-        return packageNames;
-    packageNames.forEach((packageName) => {
-        (0, utils_js_1.assert)(!['vite', 'vike'].includes(packageName));
-    });
-    // We don't use this anymore: we could return `true` instead. Shall we remove returning a list of npm packages?
-    return packageNames;
-}
-exports.isCjsEsmError = isCjsEsmError;
-function normalizeRes(res) {
-    let packageNames = (0, utils_js_1.isArray)(res) ? res : [res];
-    packageNames = (0, utils_js_1.unique)(packageNames.filter(utils_js_1.isNotNullish).filter((packageName) => packageName !== '@brillout/import'));
-    if (packageNames.length === 0)
-        return false;
-    return packageNames;
+    return knownErr;
 }
-function check(error) {
-    const message = getErrMessage(error);
-    const anywhere = getAnywhere(error);
-    const packageName_stack1 = getPackageName_stack1(error);
-    const packageName_stack2 = getPackageName_stack2(error);
-    const isRelatedToNodeModules = !!packageName_stack1 || !!packageName_stack2 || includesNodeModules(message);
-    /*
-    const relatedNpmPackages = normalizeArray([
-      packageName_stack1 || null,
-      packageName_stack2 || null,
-      (message && extractFromNodeModulesPath(message)) || null
-    ])
-    */
-    // ERR_UNSUPPORTED_DIR_IMPORT
-    {
-        const packageName = parseNodeModulesPathMessage('ERR_UNSUPPORTED_DIR_IMPORT', anywhere);
-        if (packageName)
-            return packageName;
-    }
-    // ERR_UNKNOWN_FILE_EXTENSION
-    {
-        const packageName = parseUnkownFileExtensionMessage(anywhere);
-        if (packageName)
-            return packageName;
-    }
-    {
-        const packageName = parseNodeModulesPathMessage('ERR_UNKNOWN_FILE_EXTENSION', anywhere);
-        if (packageName)
-            return packageName;
+function includesLowercase(str, substr) {
+    if (substr instanceof RegExp) {
+        let { flags } = substr;
+        if (!flags.includes('i'))
+            flags += 'i';
+        const regex = new RegExp(substr.source, flags);
+        return regex.test(str);
     }
-    {
-        const packageName = parseNodeModulesPathMessage('is not exported', anywhere);
-        if (packageName)
-            return packageName;
-    }
-    // Using CJS inside ESM modules.
-    if (includes(anywhere, 'require is not a function') ||
-        includes(anywhere, 'exports is not defined') ||
-        includes(anywhere, 'module is not defined') ||
-        includes(anywhere, 'window is not defined') ||
-        includes(anywhere, 'not defined in ES')) {
-        if (packageName_stack1)
-            return packageName_stack1;
-    }
-    if (includes(anywhere, "Unexpected token 'export'")) {
-        if (packageName_stack2)
-            return packageName_stack2;
-        if (packageName_stack1)
-            return packageName_stack1;
-    }
-    // ERR_REQUIRE_ESM
-    if (includes(anywhere, 'ERR_REQUIRE_ESM')) {
-        /* The issue is the importer, not the importee.
-        if (relatedNpmPackages) return relatedNpmPackages
-         */
-        {
-            if (packageName_stack1)
-                return packageName_stack1;
-        }
-        if (isRelatedToNodeModules)
-            return true;
+    if (typeof substr === 'string') {
+        return str.toLowerCase().includes(substr.toLowerCase());
     }
-    /* The following two wrongfully match user land errors
-    {
-      const packageNames = parseNodeModulesPath('ERR_REQUIRE_ESM', anywhere)
-      if (packageNames) return packageNames
-    }
-    {
-      const packageNames = parseNodeModulesPath('Must use import', anywhere)
-      if (packageNames) return packageNames
-    }
-    */
-    // `SyntaxError: Named export '${exportName}' not found. The requested module '${packageName}' is a CommonJS module, which may not support all module.exports as named exports.`
-    {
-        const packageName = parseImportFrom(anywhere);
-        if (packageName)
-            return packageName;
-    }
-    if (includes(anywhere, 'Cannot read properties of undefined')) {
-        if (isRelatedToNodeModules) {
-            /* We return true because relatedNpmPackages points to the importer but the problematic npm package is the importee
-            if (relatedNpmPackages) return relatedNpmPackages
-            */
-            return true;
-        }
-    }
-    // ERR_MODULE_NOT_FOUND
-    {
-        const packageNames = parseCannotFindMessage(anywhere);
-        if (packageNames)
-            return packageNames;
-    }
-    if (
-    // `SyntaxError: Cannot use import statement outside a module`.
-    // Since user code is always ESM, this error must always originate from an npm package.
-    includes(anywhere, 'Cannot use import statement') ||
-        // `SyntaxError: Named export '${exportName}' not found. The requested module '${packageName}' is a CommonJS module, which may not support all module.exports as named exports.`
-        // It seems that this always points to an npm package import.
-        /Named export.*not found/i.test(anywhere)) {
-        /* We return true even if fromNodeModules is false because the errors always relate to npm packages.
-        if (fromNodeModules) return true
-        */
-        return true;
-    }
-    return false;
-}
-function parseCannotFindMessage(str) {
-    const match = /Cannot find \S+ '(\S+)' imported from (\S+)/.exec(str);
-    if (!match)
-        return false;
-    // const packageNameCannotFind = extractFromPath(match[1]!)
-    const packageNameFrom = extractFromPath(match[2]);
-    return normalizeArray([
-        // packageNameCannotFind,
-        packageNameFrom
-    ]);
-}
-function parseUnkownFileExtensionMessage(str) {
-    const match = /Unknown file extension "\S+" for (\S+)/.exec(str);
-    if (!match)
-        return false;
-    const filePath = match[1];
-    const packageName = extractFromPath(filePath);
-    return packageName;
-}
-function parseImportFrom(str) {
-    const match = /\bimport\b.*?\bfrom\b\s*?"(.+?)"/.exec(str);
-    if (!match)
-        return false;
-    const importPath = match[1];
-    const packageName = extractFromPath(importPath);
-    return packageName;
-}
-function parseNodeModulesPathMessage(begin, str) {
-    str = str.replaceAll('\\', '/');
-    const regex = new RegExp(`${begin}.*(node_modules\\/\\S+)`);
-    const match = regex.exec(str);
-    if (!match)
-        return false;
-    const importPath = match[1];
-    return extractFromNodeModulesPath(importPath);
-}
-function getPackageName_stack1(err) {
-    const errStack = getErrStack(err);
-    if (!errStack)
-        return false;
-    const firstLineStackTrace = errStack.split('\n').filter((line) => line.startsWith('    at '))[0];
-    if (!firstLineStackTrace)
-        return false;
-    return extractFromNodeModulesPath(firstLineStackTrace);
-}
-/** See https://github.com/brillout/repro_node-syntax-error#nodejs-behavior */
-function getPackageName_stack2(err) {
-    const errStack = getErrStack(err);
-    if (!errStack)
-        return false;
-    const firstLine = errStack.trim().split('\n')[0];
-    return extractFromNodeModulesPath(firstLine);
-}
-function extractFromPath(filePath) {
-    (0, utils_js_1.assert)(filePath);
-    filePath = clean(filePath);
-    filePath = filePath.replaceAll('\\', '/');
-    let packageName;
-    if (!filePath.includes('node_modules/')) {
-        packageName = filePath;
-        if (packageName.startsWith('/'))
-            return null;
-        if (packageName.startsWith('.'))
-            return null;
-    }
-    else {
-        packageName = filePath.split('node_modules/').pop();
-        // This assert is fairly risk, we should eventually remove it
-        (0, utils_js_1.assert)(!packageName.startsWith('.'));
-        // This assert is fairly risk, we should eventually remove it
-        (0, utils_js_1.assert)(!packageName.startsWith('/'));
-    }
-    if (!packageName)
-        return null;
-    packageName = packageName.split('/').slice(0, 2).join('/');
-    if (!packageName.startsWith('@')) {
-        packageName = packageName.split('/')[0];
-    }
-    packageName = clean(packageName);
-    return packageName;
-}
-function clean(packageName) {
-    const b = ['"', "'", '(', ')'];
-    if (b.includes(packageName[0])) {
-        packageName = packageName.slice(1);
-    }
-    if (b.includes(packageName[packageName.length - 1])) {
-        packageName = packageName.slice(0, -1);
-    }
-    return packageName;
+    (0, utils_js_1.assert)(false);
 }
-function extractFromNodeModulesPath(str) {
-    if (!includesNodeModules(str))
-        return false;
-    const packageName = extractFromPath(str);
-    (0, utils_js_1.assert)(packageName);
-    return packageName;
-}
-function includes(str1, str2) {
-    if (!str1)
-        return false;
-    if (str2 instanceof RegExp) {
-        return str2.test(str1.toLowerCase());
-    }
-    if (typeof str2 === 'string') {
-        return str1.toLowerCase().includes(str2.toLowerCase());
-    }
-    return false;
-}
-function includesNodeModules(str) {
-    if (!str)
-        return false;
-    str = str.replaceAll('\\', '/');
-    if (!str.includes('node_modules/'))
-        return false;
-    if (str.includes('node_modules/vite/'))
-        return false;
-    return true;
-}
-function normalizeArray(arr) {
-    const arrNormalized = arr.filter(utils_js_1.isNotNullish);
-    if (arrNormalized.length === 0)
-        return null;
-    return arrNormalized;
+function getAnywhere(error) {
+    const code = getErrCode(error);
+    const message = getErrMessage(error);
+    const stack = getErrStack(error);
+    const anywhere = [code, message, stack].filter(Boolean).join('\n');
+    return anywhere;
 }
 function getErrMessage(err) {
     if (!(0, utils_js_1.isObject)(err))
@@ -347,13 +163,6 @@ function getErrStack(err) {
         return null;
     return err.stack;
 }
-function getAnywhere(error) {
-    const code = getErrCode(error);
-    const message = getErrMessage(error);
-    const stack = getErrStack(error);
-    const anywhere = [code, message, stack].filter(Boolean).join('\n');
-    return anywhere;
-}
 function collectError(err) {
     console.log([
         '{',

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

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.preparePageContextForUserConsumptionServerSide = void 0;
 const utils_js_1 = require("../utils.js");
 const sortPageContext_js_1 = require("../../../shared/sortPageContext.js");
-const addUrlComputedProps_js_1 = require("../../../shared/addUrlComputedProps.js");
+const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUrlComputed.js");
 const addIs404ToPageProps_js_1 = require("../../../shared/addIs404ToPageProps.js");
 function preparePageContextForUserConsumptionServerSide(pageContext) {
-    (0, addUrlComputedProps_js_1.assertPageContextUrlComputedProps)(pageContext);
+    (0, getPageContextUrlComputed_js_1.assertPageContextUrl)(pageContext);
     (0, utils_js_1.assert)((0, utils_js_1.isPlainObject)(pageContext.routeParams));
     (0, utils_js_1.assert)('Page' in pageContext);
     (0, utils_js_1.assert)((0, utils_js_1.isObject)(pageContext.pageExports));