vike 0.4.142-commit-6eb0dd3 → 0.4.142-commit-937cb3b

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

@@ -43,11 +43,9 @@ function envVarsPlugin() {
                 if (isPrivate && isClientSide) {
                     if (!code.includes(varName))
                         return;
-                    const filePathVite = (0, utils_js_1.getFilePathVite)(id, config.root);
-                    const errMsgAddendum = isBuild
-                        ? ''
-                        : ' (vike will prevent your app from building for production)';
-                    const errMsg = `${varName} used in ${filePathVite} and therefore included in client-side bundle which can be be a security leak${errMsgAddendum}, remove ${varName} or rename ${key} to ${keyPublic}, see https://vike.dev/env`;
+                    const filePathToShowToUser = (0, utils_js_1.getFilePathRelativeToUserRootDir)(id, config.root);
+                    const errMsgAddendum = isBuild ? '' : ' (vike will prevent your app from building for production)';
+                    const errMsg = `${varName} used in ${filePathToShowToUser} and therefore included in client-side bundle which can be be a security leak${errMsgAddendum}, remove ${varName} or rename ${key} to ${keyPublic}, see https://vike.dev/env`;
                     if (isBuild) {
                         (0, utils_js_1.assertUsage)(false, errMsg);
                     }

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

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

package/dist/cjs/node/plugin/shared/loggerNotProd/errorWithCodeSnippet.js

@@ -48,7 +48,7 @@ function getPrettyErrorWithCodeSnippet(err, userRootDir) {
     let { id, frame } = err;
     const msgFirstLine = [
         picocolors_1.default.red('Failed to transpile'),
-        picocolors_1.default.bold(picocolors_1.default.red((0, utils_js_1.getFilePathVite)(normalizeId(id), userRootDir))),
+        picocolors_1.default.bold(picocolors_1.default.red((0, utils_js_1.getFilePathRelativeToUserRootDir)(normalizeId(id), userRootDir))),
         picocolors_1.default.red('because:')
     ].join(' ');
     const errMsg = getPrettyErrMessage(err);

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

@@ -199,9 +199,9 @@ function logErrorDebugNote() {
         store.errorDebugNoteAlreadyShown = true;
     }
     const msg = picocolors_1.default.dim([
-        '┌─────────────────────────────────────────────────────────────────────┐',
+        '┌──────────────────────────────────────────────────────────┐',
         "│ Error isn't helpful? See https://vike.dev/errors#verbose │",
-        '└─────────────────────────────────────────────────────────────────────┘'
+        '└──────────────────────────────────────────────────────────┘'
     ].join('\n'));
     (0, log_js_1.logDirectly)(msg, 'error');
 }

package/dist/cjs/utils/getFilePathAbsolute.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFilePathVite = exports.getFilePathAbsolute = void 0;
+exports.getFilePathRelativeToUserRootDir = exports.getFilePathAbsolute = void 0;
 const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
 const assert_js_1 = require("./assert.js");
 const path_1 = __importDefault(require("path"));
@@ -47,20 +47,24 @@ function getFilePathAbsolute(filePath, config) {
     return filePathAbsolute;
 }
 exports.getFilePathAbsolute = getFilePathAbsolute;
-function getFilePathVite(filePath, userRootDir, alwaysRelativeToRoot = false) {
-    (0, filesystemPathHandling_js_1.assertPosixPath)(filePath);
+function getFilePathRelativeToUserRootDir(filePathAbsolute, userRootDir, alwaysRelative = false) {
+    (0, filesystemPathHandling_js_1.assertPosixPath)(filePathAbsolute);
     (0, filesystemPathHandling_js_1.assertPosixPath)(userRootDir);
-    const filePathRelativeToRoot = path_1.default.posix.relative(userRootDir, filePath);
-    if (!filePath.startsWith(userRootDir)) {
-        if (alwaysRelativeToRoot) {
-            return filePathRelativeToRoot;
+    let filePathRelativeToUserRootDir = path_1.default.posix.relative(userRootDir, filePathAbsolute);
+    if (filePathAbsolute.startsWith(userRootDir)) {
+        (0, assert_js_1.assert)(!filePathRelativeToUserRootDir.startsWith('.') && !filePathRelativeToUserRootDir.startsWith('/'), 
+        // Surprinsingly, this assertion seem to fail sometimes: https://github.com/vikejs/vike/issues/1139
+        { filePathRelativeToUserRootDir, filePathAbsolute, userRootDir });
+        filePathRelativeToUserRootDir = `/${filePathRelativeToUserRootDir}`;
+        return filePathRelativeToUserRootDir;
+    }
+    else {
+        if (alwaysRelative) {
+            return filePathRelativeToUserRootDir;
         }
         else {
-            return filePath;
+            return filePathAbsolute;
         }
     }
-    (0, assert_js_1.assert)(!filePathRelativeToRoot.startsWith('.') && !filePathRelativeToRoot.startsWith('/'));
-    const filePathVite = `/${filePathRelativeToRoot}`;
-    return filePathVite;
 }
-exports.getFilePathVite = getFilePathVite;
+exports.getFilePathRelativeToUserRootDir = getFilePathRelativeToUserRootDir;

package/dist/cjs/utils/parseUrl.js

@@ -112,7 +112,10 @@ function parsePathname(urlWithoutHashNorSearch, baseServer) {
     else {
         // In the browser, this is the Base URL of the current URL
         // Safe access `window?.document?.baseURI` for users who shim `window` in Node.js
-        const base = (typeof window !== 'undefined' && window?.document?.baseURI) || baseServer;
+        let baseURI = typeof window !== 'undefined' && window?.document?.baseURI;
+        if (baseURI)
+            baseURI = parseOrigin(baseURI).pathname;
+        const base = baseURI || baseServer;
         const pathname = resolveUrlPathnameRelative(urlWithoutHashNorSearch, base);
         // We need to parse the origin in case `base === window.document.baseURI`
         const parsed = parseOrigin(pathname);
@@ -155,6 +158,8 @@ function resolveUrlPathnameRelative(pathnameRelative, base) {
     let pathnameAbsolute = stack.join('/');
     if (baseRestoreTrailingSlash && !pathnameAbsolute.endsWith('/'))
         pathnameAbsolute += '/';
+    if (!pathnameAbsolute.startsWith('/'))
+        pathnameAbsolute = '/' + pathnameAbsolute;
     return pathnameAbsolute;
 }
 /* Not needed anymore?

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.142-commit-6eb0dd3';
+const PROJECT_VERSION = '0.4.142-commit-937cb3b';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

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

@@ -1,6 +1,6 @@
 export { envVarsPlugin };
 import { loadEnv } from 'vite';
-import { assert, assertPosixPath, assertUsage, assertWarning, getFilePathVite, lowerFirst } from '../utils.js';
+import { assert, assertPosixPath, assertUsage, assertWarning, getFilePathRelativeToUserRootDir, lowerFirst } from '../utils.js';
 function envVarsPlugin() {
     let envsAll;
     let config;
@@ -41,11 +41,9 @@ function envVarsPlugin() {
                 if (isPrivate && isClientSide) {
                     if (!code.includes(varName))
                         return;
-                    const filePathVite = getFilePathVite(id, config.root);
-                    const errMsgAddendum = isBuild
-                        ? ''
-                        : ' (vike will prevent your app from building for production)';
-                    const errMsg = `${varName} used in ${filePathVite} and therefore included in client-side bundle which can be be a security leak${errMsgAddendum}, remove ${varName} or rename ${key} to ${keyPublic}, see https://vike.dev/env`;
+                    const filePathToShowToUser = getFilePathRelativeToUserRootDir(id, config.root);
+                    const errMsgAddendum = isBuild ? '' : ' (vike will prevent your app from building for production)';
+                    const errMsg = `${varName} used in ${filePathToShowToUser} and therefore included in client-side bundle which can be be a security leak${errMsgAddendum}, remove ${varName} or rename ${key} to ${keyPublic}, see https://vike.dev/env`;
                     if (isBuild) {
                         assertUsage(false, errMsg);
                     }

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

@@ -3,7 +3,7 @@ import { normalizePath } from 'vite';
 import { getConfigVike } from '../../../shared/getConfigVike.js';
 import { getVirtualFilePageConfigValuesAll } from './v1-design/getVirtualFilePageConfigValuesAll.js';
 import { getVirtualFileImportUserCode } from './getVirtualFileImportUserCode.js';
-import { assert, assertPosixPath, getFilePathVite, getVirtualFileId, isDev1, isDev1_onConfigureServer, isVirtualFileId, resolveVirtualFileId } from '../../utils.js';
+import { assert, assertPosixPath, getFilePathRelativeToUserRootDir, getVirtualFileId, isDev1, isDev1_onConfigureServer, isVirtualFileId, resolveVirtualFileId } from '../../utils.js';
 import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { isVirtualFileIdImportUserCode } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
 import { vikeConfigDependencies, reloadVikeConfig, isVikeConfigFile } from './v1-design/getVikeConfig.js';
@@ -116,7 +116,7 @@ function isVikeConfigModule(filePathAbsolute) {
 }
 function reloadConfig(filePath, config, configVike, op) {
     {
-        const filePathToShowToUser = pc.dim(getFilePathVite(filePath, config.root, true));
+        const filePathToShowToUser = pc.dim(getFilePathRelativeToUserRootDir(filePath, config.root, true));
         const msg = `${op} ${filePathToShowToUser}`;
         logConfigInfo(msg, 'info');
     }

package/dist/esm/node/plugin/shared/loggerNotProd/errorWithCodeSnippet.js

@@ -7,7 +7,7 @@ export { isEquivalentErrorWithCodeSnippet };
 export { getPrettyErrMessage };
 // Copied & adapted from https://github.com/vitejs/vite/blob/9c114c5c72a6af87e3330d5573362554b4511265/packages/vite/src/node/server/middlewares/error.ts
 import pc from '@brillout/picocolors';
-import { assert, escapeRegex, getFilePathVite, isObject, removeEmptyLines, stripAnsi, toPosixPath } from '../../utils.js';
+import { assert, escapeRegex, getFilePathRelativeToUserRootDir, isObject, removeEmptyLines, stripAnsi, toPosixPath } from '../../utils.js';
 function isErrorWithCodeSnippet(err) {
     if (!isObject(err)) {
         return false;
@@ -46,7 +46,7 @@ function getPrettyErrorWithCodeSnippet(err, userRootDir) {
     let { id, frame } = err;
     const msgFirstLine = [
         pc.red('Failed to transpile'),
-        pc.bold(pc.red(getFilePathVite(normalizeId(id), userRootDir))),
+        pc.bold(pc.red(getFilePathRelativeToUserRootDir(normalizeId(id), userRootDir))),
         pc.red('because:')
     ].join(' ');
     const errMsg = getPrettyErrMessage(err);

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

@@ -194,9 +194,9 @@ function logErrorDebugNote() {
         store.errorDebugNoteAlreadyShown = true;
     }
     const msg = pc.dim([
-        '┌─────────────────────────────────────────────────────────────────────┐',
+        '┌──────────────────────────────────────────────────────────┐',
         "│ Error isn't helpful? See https://vike.dev/errors#verbose │",
-        '└─────────────────────────────────────────────────────────────────────┘'
+        '└──────────────────────────────────────────────────────────┘'
     ].join('\n'));
     logDirectly(msg, 'error');
 }

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

@@ -1,5 +1,5 @@
 export { getFilePathAbsolute };
-export { getFilePathVite };
+export { getFilePathRelativeToUserRootDir };
 import type { ResolvedConfig } from 'vite';
 declare function getFilePathAbsolute(filePath: string, config: ResolvedConfig): string;
-declare function getFilePathVite(filePath: string, userRootDir: string, alwaysRelativeToRoot?: boolean): string;
+declare function getFilePathRelativeToUserRootDir(filePathAbsolute: string, userRootDir: string, alwaysRelative?: boolean): string;

package/dist/esm/utils/getFilePathAbsolute.js

@@ -1,5 +1,5 @@
 export { getFilePathAbsolute };
-export { getFilePathVite };
+export { getFilePathRelativeToUserRootDir };
 import { assertPosixPath, toPosixPath } from './filesystemPathHandling.js';
 import { assert } from './assert.js';
 import path from 'path';
@@ -42,19 +42,23 @@ function getFilePathAbsolute(filePath, config) {
     assertPathIsFilesystemAbsolute(filePathAbsolute);
     return filePathAbsolute;
 }
-function getFilePathVite(filePath, userRootDir, alwaysRelativeToRoot = false) {
-    assertPosixPath(filePath);
+function getFilePathRelativeToUserRootDir(filePathAbsolute, userRootDir, alwaysRelative = false) {
+    assertPosixPath(filePathAbsolute);
     assertPosixPath(userRootDir);
-    const filePathRelativeToRoot = path.posix.relative(userRootDir, filePath);
-    if (!filePath.startsWith(userRootDir)) {
-        if (alwaysRelativeToRoot) {
-            return filePathRelativeToRoot;
+    let filePathRelativeToUserRootDir = path.posix.relative(userRootDir, filePathAbsolute);
+    if (filePathAbsolute.startsWith(userRootDir)) {
+        assert(!filePathRelativeToUserRootDir.startsWith('.') && !filePathRelativeToUserRootDir.startsWith('/'), 
+        // Surprinsingly, this assertion seem to fail sometimes: https://github.com/vikejs/vike/issues/1139
+        { filePathRelativeToUserRootDir, filePathAbsolute, userRootDir });
+        filePathRelativeToUserRootDir = `/${filePathRelativeToUserRootDir}`;
+        return filePathRelativeToUserRootDir;
+    }
+    else {
+        if (alwaysRelative) {
+            return filePathRelativeToUserRootDir;
         }
         else {
-            return filePath;
+            return filePathAbsolute;
         }
     }
-    assert(!filePathRelativeToRoot.startsWith('.') && !filePathRelativeToRoot.startsWith('/'));
-    const filePathVite = `/${filePathRelativeToRoot}`;
-    return filePathVite;
 }

package/dist/esm/utils/parseUrl.js

@@ -110,7 +110,10 @@ function parsePathname(urlWithoutHashNorSearch, baseServer) {
     else {
         // In the browser, this is the Base URL of the current URL
         // Safe access `window?.document?.baseURI` for users who shim `window` in Node.js
-        const base = (typeof window !== 'undefined' && window?.document?.baseURI) || baseServer;
+        let baseURI = typeof window !== 'undefined' && window?.document?.baseURI;
+        if (baseURI)
+            baseURI = parseOrigin(baseURI).pathname;
+        const base = baseURI || baseServer;
         const pathname = resolveUrlPathnameRelative(urlWithoutHashNorSearch, base);
         // We need to parse the origin in case `base === window.document.baseURI`
         const parsed = parseOrigin(pathname);
@@ -153,6 +156,8 @@ function resolveUrlPathnameRelative(pathnameRelative, base) {
     let pathnameAbsolute = stack.join('/');
     if (baseRestoreTrailingSlash && !pathnameAbsolute.endsWith('/'))
         pathnameAbsolute += '/';
+    if (!pathnameAbsolute.startsWith('/'))
+        pathnameAbsolute = '/' + pathnameAbsolute;
     return pathnameAbsolute;
 }
 /* Not needed anymore?

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

@@ -5,7 +5,7 @@ type ProjectVersion = typeof projectInfo.projectVersion;
 type ProjectTag = `[${PackageName}]` | `[${PackageName}@${ProjectVersion}]`;
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.142-commit-6eb0dd3";
+    projectVersion: "0.4.142-commit-937cb3b";
     npmPackageName: "vike";
     githubRepository: "https://github.com/vikejs/vike";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 import { onProjectInfo } from './assertSingleInstance.js';
-const PROJECT_VERSION = '0.4.142-commit-6eb0dd3';
+const PROJECT_VERSION = '0.4.142-commit-937cb3b';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.142-commit-6eb0dd3",
+  "version": "0.4.142-commit-937cb3b",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",