vike 0.4.165-commit-8eba585 → 0.4.166

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

@@ -12,7 +12,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const transformFileImports_js_1 = require("./transformFileImports.js");
 const getConfigFileExport_js_1 = require("../getConfigFileExport.js");
 const resolveImportPath_js_1 = require("./resolveImportPath.js");
-const getFilePath_js_1 = require("./getFilePath.js");
+const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 // Load fake import
 async function loadImportedFile(import_, userRootDir, importedFilesLoaded) {

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

@@ -8,7 +8,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../../../../utils.js");
 const transformFileImports_js_1 = require("./transformFileImports.js");
 const path_1 = __importDefault(require("path"));
-const getFilePath_js_1 = require("./getFilePath.js");
+const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
 const filesEnvMap = new Map();
 function resolveImport(configValue, importerFilePath, userRootDir, configEnv, configName) {
     if (typeof configValue !== 'string')

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

@@ -20,7 +20,7 @@ const crawlPlusFiles_js_1 = require("./getVikeConfig/crawlPlusFiles.js");
 const getConfigFileExport_js_1 = require("./getConfigFileExport.js");
 const loadFileAtConfigTime_js_1 = require("./getVikeConfig/loadFileAtConfigTime.js");
 const resolveImportPath_js_1 = require("./getVikeConfig/resolveImportPath.js");
-const getFilePath_js_1 = require("./getVikeConfig/getFilePath.js");
+const getFilePath_js_1 = require("../../../shared/getFilePath.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 let devServerIsCorrupt = false;
 let wasConfigInvalid = null;

package/dist/cjs/node/plugin/{plugins/importUserCode/v1-design/getVikeConfig → shared}/getFilePath.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFilePathUnresolved = exports.getFilePathResolved = void 0;
 const path_1 = __importDefault(require("path"));
-const utils_js_1 = require("../../../../utils.js");
+const utils_js_1 = require("../utils.js");
 function getFilePathUnresolved(args) {
     const { filePathAbsoluteFilesystem, filePathAbsoluteUserRootDir } = args;
     let filePathAbsoluteVite;
@@ -71,20 +71,18 @@ function getFilePathAbsoluteUserFilesystem({ filePathAbsoluteUserRootDir, userRo
 function getFilePathAbsoluteUserRootDir({ filePathAbsoluteFilesystem, userRootDir }) {
     (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
     (0, utils_js_1.assertPosixPath)(userRootDir);
-    let filePathAbsoluteUserRootDir = null;
-    if (filePathAbsoluteFilesystem.startsWith(userRootDir)) {
-        {
-            let filePathAbsoluteUserRootDir1 = filePathAbsoluteFilesystem.slice(userRootDir.length);
-            if (!filePathAbsoluteUserRootDir1.startsWith('/'))
-                filePathAbsoluteUserRootDir1 = '/' + filePathAbsoluteUserRootDir1;
-            filePathAbsoluteUserRootDir = filePathAbsoluteUserRootDir1;
-        }
-        {
-            let filePathAbsoluteUserRootDir2 = path_1.default.posix.relative(userRootDir, filePathAbsoluteFilesystem);
-            (0, utils_js_1.assert)(!filePathAbsoluteUserRootDir2.startsWith('.') && !filePathAbsoluteUserRootDir2.startsWith('/'));
-            filePathAbsoluteUserRootDir2 = '/' + filePathAbsoluteUserRootDir2;
-            (0, utils_js_1.assert)(filePathAbsoluteFilesystem === filePathAbsoluteUserRootDir2);
-        }
+    const filePathRelative = path_1.default.posix.relative(userRootDir, filePathAbsoluteFilesystem);
+    if (!filePathAbsoluteFilesystem.startsWith(userRootDir)) {
+        (0, utils_js_1.assert)(filePathRelative.startsWith('../'));
+        return null;
+    }
+    (0, utils_js_1.assert)(!filePathRelative.startsWith('.') && !filePathRelative.startsWith('/'));
+    const filePathAbsoluteUserRootDir = `/${filePathRelative}`;
+    {
+        let check = filePathAbsoluteFilesystem.slice(userRootDir.length);
+        if (!check.startsWith('/'))
+            check = '/' + check;
+        (0, utils_js_1.assert)(filePathAbsoluteUserRootDir === check);
     }
     return filePathAbsoluteUserRootDir;
 }

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

@@ -1,7 +1,11 @@
 "use strict";
+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;
 const utils_js_1 = require("../utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const knownErrors = [
     {
         errMsg: 'jsxDEV is not a function',
@@ -44,6 +48,7 @@ function getHint(error) {
 exports.getHint = getHint;
 function logHint(hint) {
     hint = (0, utils_js_1.formatHintLog)(hint);
+    hint = picocolors_1.default.bold(hint);
     console.error(hint);
 }
 function isKnownError(error) {

package/dist/cjs/utils/parseUrl.js

@@ -10,7 +10,14 @@ exports.isUriWithProtocol = exports.createUrlFromComponents = exports.assertUrlC
 const slice_js_1 = require("./slice.js");
 const assert_js_1 = require("./assert.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const PROTOCOLS = ['http://', 'https://', 'tauri://', 'file://'];
+const PROTOCOLS = [
+    'http://',
+    'https://',
+    // For [Tauri](https://tauri.app/)
+    'tauri://',
+    // For Electron: https://github.com/vikejs/vike/issues/1557
+    'file://'
+];
 function isParsable(url) {
     // `parseUrl()` works with these URLs
     return (PROTOCOLS.some((p) => url.startsWith(p)) ||

package/dist/cjs/utils/projectInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
-const PROJECT_VERSION = '0.4.165-commit-8eba585';
+const PROJECT_VERSION = '0.4.166';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/client/client-routing-runtime/history.d.ts

@@ -2,7 +2,7 @@ export { initHistoryState, getHistoryState, pushHistory, ScrollPosition, saveScr
 type HistoryState = {
     timestamp?: number;
     scrollPosition?: null | ScrollPosition;
-    triggedBy?: 'user' | 'vike' | 'browser';
+    triggeredBy?: 'user' | 'vike' | 'browser';
 };
 type ScrollPosition = {
     x: number;

package/dist/esm/client/client-routing-runtime/history.js

@@ -21,8 +21,8 @@ function initHistoryState() {
         hasModifications = true;
         state.scrollPosition = getScrollPosition();
     }
-    if (!('triggedBy' in state)) {
-        state.triggedBy = 'browser';
+    if (!('triggeredBy' in state)) {
+        state.triggeredBy = 'browser';
     }
     assertState(state);
     if (hasModifications) {
@@ -49,7 +49,7 @@ function saveScrollPosition() {
 function pushHistory(url, overwriteLastHistoryEntry) {
     if (!overwriteLastHistoryEntry) {
         const timestamp = getTimestamp();
-        pushHistoryState({ timestamp, scrollPosition: null, triggedBy: 'vike' }, url);
+        pushHistoryState({ timestamp, scrollPosition: null, triggeredBy: 'vike' }, url);
     }
     else {
         replaceHistoryState(getHistoryState(), url);
@@ -82,8 +82,8 @@ function monkeyPatchHistoryPushState() {
             scrollPosition: getScrollPosition(),
             timestamp: getTimestamp(),
             ...stateFromUser,
-            // Don't allow user to overwrite triggedBy as it would break Vike's handling of the 'popstate' event
-            triggedBy: 'user'
+            // Don't allow user to overwrite triggeredBy as it would break Vike's handling of the 'popstate' event
+            triggeredBy: 'user'
         };
         return pushStateOriginal(state, ...rest);
     };

package/dist/esm/client/client-routing-runtime/onBrowserHistoryNavigation.js

@@ -18,7 +18,7 @@ function onBrowserHistoryNavigation() {
     window.addEventListener('popstate', async () => {
         const currentState = getState();
         const scrollTarget = currentState.historyState.scrollPosition || 'scroll-to-top-or-hash';
-        const isUserLandPushStateNavigation = currentState.historyState.triggedBy === 'user';
+        const isUserLandPushStateNavigation = currentState.historyState.triggeredBy === 'user';
         const isHashNavigation = currentState.urlWithoutHash === globalObject.previousState.urlWithoutHash;
         const isBackwardNavigation = !currentState.historyState.timestamp || !globalObject.previousState.historyState.timestamp
             ? null

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

@@ -9,7 +9,7 @@ import pc from '@brillout/picocolors';
 import { parseImportData } from './transformFileImports.js';
 import { getConfigFileExport } from '../getConfigFileExport.js';
 import { assertImportPath, resolveImportPath } from './resolveImportPath.js';
-import { getFilePathResolved } from './getFilePath.js';
+import { getFilePathResolved } from '../../../../shared/getFilePath.js';
 assertIsNotProductionRuntime();
 // Load fake import
 async function loadImportedFile(import_, userRootDir, importedFilesLoaded) {

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

@@ -6,7 +6,7 @@ import pc from '@brillout/picocolors';
 import { assert, assertPosixPath, assertUsage, deepEqual, requireResolve } from '../../../../utils.js';
 import { parseImportData } from './transformFileImports.js';
 import path from 'path';
-import { getFilePathResolved, getFilePathUnresolved } from './getFilePath.js';
+import { getFilePathResolved, getFilePathUnresolved } from '../../../../shared/getFilePath.js';
 const filesEnvMap = new Map();
 function resolveImport(configValue, importerFilePath, userRootDir, configEnv, configName) {
     if (typeof configValue !== 'string')

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

@@ -19,7 +19,7 @@ import { crawlPlusFiles } from './getVikeConfig/crawlPlusFiles.js';
 import { getConfigFileExport } from './getConfigFileExport.js';
 import { loadConfigFile, loadImportedFile, loadValueFile } from './getVikeConfig/loadFileAtConfigTime.js';
 import { clearFilesEnvMap, resolveImport } from './getVikeConfig/resolveImportPath.js';
-import { getFilePathResolved } from './getVikeConfig/getFilePath.js';
+import { getFilePathResolved } from '../../../shared/getFilePath.js';
 assertIsNotProductionRuntime();
 let devServerIsCorrupt = false;
 let wasConfigInvalid = null;

package/dist/esm/node/plugin/{plugins/importUserCode/v1-design/getVikeConfig → shared}/getFilePath.d.ts

@@ -1,6 +1,6 @@
 export { getFilePathResolved };
 export { getFilePathUnresolved };
-import type { FilePath, FilePathResolved } from '../../../../../../shared/page-configs/FilePath.js';
+import type { FilePath, FilePathResolved } from '../../../shared/page-configs/FilePath.js';
 declare function getFilePathUnresolved(args: {
     filePathAbsoluteFilesystem: string | null;
     filePathAbsoluteUserRootDir: string | null;

package/dist/esm/node/plugin/{plugins/importUserCode/v1-design/getVikeConfig → shared}/getFilePath.js

@@ -1,7 +1,7 @@
 export { getFilePathResolved };
 export { getFilePathUnresolved };
 import path from 'path';
-import { assert, assertPosixPath, hasProp } from '../../../../utils.js';
+import { assert, assertPosixPath, hasProp } from '../utils.js';
 function getFilePathUnresolved(args) {
     const { filePathAbsoluteFilesystem, filePathAbsoluteUserRootDir } = args;
     let filePathAbsoluteVite;
@@ -65,20 +65,18 @@ function getFilePathAbsoluteUserFilesystem({ filePathAbsoluteUserRootDir, userRo
 function getFilePathAbsoluteUserRootDir({ filePathAbsoluteFilesystem, userRootDir }) {
     assertPosixPath(filePathAbsoluteFilesystem);
     assertPosixPath(userRootDir);
-    let filePathAbsoluteUserRootDir = null;
-    if (filePathAbsoluteFilesystem.startsWith(userRootDir)) {
-        {
-            let filePathAbsoluteUserRootDir1 = filePathAbsoluteFilesystem.slice(userRootDir.length);
-            if (!filePathAbsoluteUserRootDir1.startsWith('/'))
-                filePathAbsoluteUserRootDir1 = '/' + filePathAbsoluteUserRootDir1;
-            filePathAbsoluteUserRootDir = filePathAbsoluteUserRootDir1;
-        }
-        {
-            let filePathAbsoluteUserRootDir2 = path.posix.relative(userRootDir, filePathAbsoluteFilesystem);
-            assert(!filePathAbsoluteUserRootDir2.startsWith('.') && !filePathAbsoluteUserRootDir2.startsWith('/'));
-            filePathAbsoluteUserRootDir2 = '/' + filePathAbsoluteUserRootDir2;
-            assert(filePathAbsoluteFilesystem === filePathAbsoluteUserRootDir2);
-        }
+    const filePathRelative = path.posix.relative(userRootDir, filePathAbsoluteFilesystem);
+    if (!filePathAbsoluteFilesystem.startsWith(userRootDir)) {
+        assert(filePathRelative.startsWith('../'));
+        return null;
+    }
+    assert(!filePathRelative.startsWith('.') && !filePathRelative.startsWith('/'));
+    const filePathAbsoluteUserRootDir = `/${filePathRelative}`;
+    {
+        let check = filePathAbsoluteFilesystem.slice(userRootDir.length);
+        if (!check.startsWith('/'))
+            check = '/' + check;
+        assert(filePathAbsoluteUserRootDir === check);
     }
     return filePathAbsoluteUserRootDir;
 }

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

@@ -4,6 +4,7 @@ export { isCjsEsmError };
 export { isKnownError };
 export { getHint };
 import { assert, formatHintLog, isNotNullish, isObject, unique } from '../utils.js';
+import pc from '@brillout/picocolors';
 const knownErrors = [
     {
         errMsg: 'jsxDEV is not a function',
@@ -44,6 +45,7 @@ function getHint(error) {
 }
 function logHint(hint) {
     hint = formatHintLog(hint);
+    hint = pc.bold(hint);
     console.error(hint);
 }
 function isKnownError(error) {

package/dist/esm/utils/parseUrl.js

@@ -12,7 +12,14 @@ export { isUriWithProtocol };
 import { slice } from './slice.js';
 import { assert, assertUsage } from './assert.js';
 import pc from '@brillout/picocolors';
-const PROTOCOLS = ['http://', 'https://', 'tauri://', 'file://'];
+const PROTOCOLS = [
+    'http://',
+    'https://',
+    // For [Tauri](https://tauri.app/)
+    'tauri://',
+    // For Electron: https://github.com/vikejs/vike/issues/1557
+    'file://'
+];
 function isParsable(url) {
     // `parseUrl()` works with these URLs
     return (PROTOCOLS.some((p) => url.startsWith(p)) ||

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.165-commit-8eba585";
+declare const PROJECT_VERSION: "0.4.166";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.165-commit-8eba585";
+    projectVersion: "0.4.166";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.165-commit-8eba585';
+const PROJECT_VERSION = '0.4.166';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.165-commit-8eba585",
+  "version": "0.4.166",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -33,7 +33,8 @@
       "require": "./dist/cjs/node/runtime/index-deprecated.js",
       "node": "./dist/esm/node/runtime/index-deprecated.js",
       "browser": "./dist/esm/client/node.js",
-      "types": "./dist/esm/node/runtime/index-deprecated.d.ts"
+      "types": "./dist/esm/node/runtime/index-deprecated.d.ts",
+      "default": "./dist/esm/node/runtime/index-deprecated.js"
     },
     "./server": {
       "worker": "./dist/esm/node/runtime/index.js",
@@ -41,7 +42,8 @@
       "require": "./dist/cjs/node/runtime/index.js",
       "node": "./dist/esm/node/runtime/index.js",
       "browser": "./dist/esm/client/node.js",
-      "types": "./dist/esm/node/runtime/index.d.ts"
+      "types": "./dist/esm/node/runtime/index.d.ts",
+      "default": "./dist/esm/node/runtime/index.js"
     },
     "./client": {
       "types": "./dist/esm/client/server-routing-runtime/index.d.ts"
@@ -55,7 +57,8 @@
       "require": "./dist/cjs/node/client/router.js",
       "node": "./dist/esm/node/client/router.js",
       "browser": "./dist/esm/client/client-routing-runtime/index.js",
-      "types": "./dist/esm/client/client-routing-runtime/index.d.ts"
+      "types": "./dist/esm/client/client-routing-runtime/index.d.ts",
+      "default": "./dist/esm/client/client-routing-runtime/index.js"
     },
     "./routing": {
       "worker": "./dist/esm/shared/route/routing.js",
@@ -63,22 +66,26 @@
       "require": "./dist/cjs/shared/route/routing.js",
       "node": "./dist/esm/shared/route/routing.js",
       "browser": "./dist/esm/shared/route/routing.js",
-      "types": "./dist/esm/shared/route/routing.d.ts"
+      "types": "./dist/esm/shared/route/routing.d.ts",
+      "default": "./dist/esm/shared/route/routing.js"
     },
     "./cli": {
       "require": "./dist/cjs/node/cli/index.js",
       "node": "./dist/esm/node/cli/index.js",
-      "types": "./dist/esm/node/cli/index.d.ts"
+      "types": "./dist/esm/node/cli/index.d.ts",
+      "default": "./dist/esm/node/cli/index.js"
     },
     "./prerender": {
       "require": "./dist/cjs/node/prerender/index.js",
       "node": "./dist/esm/node/prerender/index.js",
-      "types": "./dist/esm/node/prerender/index.d.ts"
+      "types": "./dist/esm/node/prerender/index.d.ts",
+      "default": "./dist/esm/node/prerender/index.js"
     },
     "./plugin": {
       "require": "./dist/cjs/node/plugin/index.js",
       "node": "./dist/esm/node/plugin/index.js",
-      "types": "./dist/esm/node/plugin/index.d.ts"
+      "types": "./dist/esm/node/plugin/index.d.ts",
+      "default": "./dist/esm/node/plugin/index.js"
     },
     "./RenderErrorPage": {
       "worker": "./dist/esm/shared/RenderErrorPage.js",
@@ -86,7 +93,8 @@
       "require": "./dist/cjs/shared/RenderErrorPage.js",
       "node": "./dist/esm/shared/RenderErrorPage.js",
       "browser": "./dist/esm/shared/RenderErrorPage.js",
-      "types": "./dist/esm/shared/RenderErrorPage.d.ts"
+      "types": "./dist/esm/shared/RenderErrorPage.d.ts",
+      "default": "./dist/esm/shared/RenderErrorPage.js"
     },
     "./abort": {
       "worker": "./dist/esm/shared/abort.js",
@@ -94,24 +102,28 @@
       "require": "./dist/cjs/shared/abort.js",
       "node": "./dist/esm/shared/abort.js",
       "browser": "./dist/esm/shared/abort.js",
-      "types": "./dist/esm/shared/abort.d.ts"
+      "types": "./dist/esm/shared/abort.d.ts",
+      "default": "./dist/esm/shared/abort.js"
     },
     "./__internal": {
       "require": "./dist/cjs/__internal/index.js",
       "node": "./dist/esm/__internal/index.js",
-      "types": "./dist/esm/__internal/index.d.ts"
+      "types": "./dist/esm/__internal/index.d.ts",
+      "default": "./dist/esm/__internal/index.js"
     },
     "./__internal/setup": {
       "require": "./dist/cjs/node/runtime/page-files/setup.js",
       "node": "./dist/esm/node/runtime/page-files/setup.js",
-      "types": "./dist/esm/node/runtime/page-files/setup.d.ts"
+      "types": "./dist/esm/node/runtime/page-files/setup.d.ts",
+      "default": "./dist/esm/node/runtime/page-files/setup.js"
     },
     "./__internal/loadImportBuild": {
       "worker": "./dist/esm/node/runtime/globalContext/loadImportBuild.js",
       "edge-light": "./dist/esm/node/runtime/globalContext/loadImportBuild.js",
       "require": "./dist/cjs/node/runtime/globalContext/loadImportBuild.js",
       "node": "./dist/esm/node/runtime/globalContext/loadImportBuild.js",
-      "types": "./dist/esm/node/runtime/globalContext/loadImportBuild.d.ts"
+      "types": "./dist/esm/node/runtime/globalContext/loadImportBuild.d.ts",
+      "default": "./dist/esm/node/runtime/globalContext/loadImportBuild.js"
     }
   },
   "peerDependencies": {