vike 0.4.143-commit-f03b42d → 0.4.143-commit-dc6fea0

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

@@ -2,6 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFilePathToShowToUser = void 0;
 const utils_js_1 = require("../../../utils.js");
+/*
+const f: FilePath = 1 as any
+if (f.filePathRelativeToUserRootDir === null) {
+  f.importPathAbsolute
+}
+//*/
 function getFilePathToShowToUser(filePath) {
     const filePathToShowToUser = filePath.filePathRelativeToUserRootDir ?? filePath.filePathAbsolute;
     (0, utils_js_1.assert)(filePathToShowToUser);

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

@@ -89,7 +89,8 @@ async function loadInterfaceFiles(userRootDir, isDev, extensions) {
     await Promise.all(configFiles.map(async ({ filePathAbsolute, filePathRelativeToUserRootDir }) => {
         const configFilePath = {
             filePathAbsolute: filePathAbsolute,
-            filePathRelativeToUserRootDir: filePathRelativeToUserRootDir
+            filePathRelativeToUserRootDir: filePathRelativeToUserRootDir,
+            importPathAbsolute: null
         };
         const { configFile, extendsConfigs } = await loadConfigFile(configFilePath, userRootDir, []);
         const interfaceFile = getInterfaceFileFromConfigFile(configFile, false);
@@ -108,7 +109,8 @@ async function loadInterfaceFiles(userRootDir, isDev, extensions) {
         const interfaceFile = {
             filePath: {
                 filePathRelativeToUserRootDir,
-                filePathAbsolute
+                filePathAbsolute,
+                importPathAbsolute: null
             },
             configMap: {
                 [configName]: {}
@@ -802,7 +804,7 @@ function assertNoUnexpectedPlusSign(filePath, fileName) {
     (0, utils_js_1.assertUsage)(!fileName.slice(1).includes('+'), `Character '+' is only allowed at the beginning of filenames: make sure ${filePath} doesn't contain any '+' in its filename other than its first letter`);
 }
 async function loadConfigFile(configFilePath, userRootDir, visited) {
-    const { filePathAbsolute, filePathRelativeToUserRootDir } = configFilePath;
+    const { filePathAbsolute } = configFilePath;
     assertNoInfiniteLoop(visited, filePathAbsolute);
     const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(configFilePath, false, userRootDir);
     const { extendsConfigs, extendsFilePaths } = await loadExtendsConfigs(fileExports, configFilePath, userRootDir, [
@@ -811,10 +813,7 @@ async function loadConfigFile(configFilePath, userRootDir, visited) {
     ]);
     const configFile = {
         fileExports,
-        filePath: {
-            filePathRelativeToUserRootDir,
-            filePathAbsolute
-        },
+        filePath: configFilePath,
         extendsFilePaths
     };
     return { configFile, extendsConfigs };
@@ -837,11 +836,14 @@ async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir
         const filePathAbsolute = resolveImportPath(importData, configFilePath);
         assertImportPath(filePathAbsolute, importData, configFilePath);
         assertExtendsImportPath(importPath, filePathAbsolute, configFilePath);
+        // - filePathRelativeToUserRootDir has no functionality beyond nicer error messages for user
+        // - Using importPath would be visually nicer but it's ambigous => we rather pick filePathAbsolute for added clarity
+        const filePathRelativeToUserRootDir = determineFilePathRelativeToUserDir(filePathAbsolute, userRootDir);
         extendsConfigFiles.push({
             filePathAbsolute,
-            // - filePathRelativeToUserRootDir has no functionality beyond nicer error messages for user
-            // - Using importPath would be visually nicer but it's ambigous => we rather pick filePathAbsolute for added clarity
-            filePathRelativeToUserRootDir: determineFilePathRelativeToUserDir(filePathAbsolute, userRootDir)
+            // TODO: fix type cast
+            filePathRelativeToUserRootDir: filePathRelativeToUserRootDir,
+            importPathAbsolute: importPath
         });
     });
     const extendsConfigs = [];

package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js

@@ -111,7 +111,7 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     if (!isHtmlOnly) {
         // Don't allow the user to manipulate with injectFilter(): injecting <script type="application/json"> before the stream can break the app when:
         //  - using https://vike.dev/stream#initial-data-after-stream-end
-        //  - `pageContext` is modified during the stream, e.g. /examples/vue-pinia which uses https://vuejs.org/api/composition-api-lifecycle.html#onserverprefetch
+        //  - `pageContext` is modified during the stream, e.g. https://github.com/brillout/vike-with-pinia which uses https://vuejs.org/api/composition-api-lifecycle.html#onserverprefetch
         // The <script> tags are handled separately by vike down below.
         htmlTags.push({
             // Needs to be called after `resolvePageContextPromise()`

package/dist/cjs/node/runtime/renderPage/log404/index.js

@@ -72,8 +72,8 @@ function getPagesAndRoutesInfo(pageRoutes) {
         ...entries
     ];
     const terminalWidth = (0, utils_js_1.getTerminalWidth)() || 134;
-    let width2 = Math.max(...linesContent.map(({ routeTypeSrc }) => routeTypeSrc.length));
-    let width3 = Math.max(...linesContent.map(({ routeDefinedBy }) => routeDefinedBy.length));
+    let width2 = Math.max(...linesContent.map(({ routeTypeSrc }) => (0, utils_js_1.stripAnsi)(routeTypeSrc).length));
+    let width3 = Math.max(...linesContent.map(({ routeDefinedBy }) => (0, utils_js_1.stripAnsi)(routeDefinedBy).length));
     let width1 = terminalWidth - width3 - width2 - 10;
     linesContent.forEach((lineContent) => {
         let { routeStr } = lineContent;
@@ -88,9 +88,9 @@ function getPagesAndRoutesInfo(pageRoutes) {
     });
     width1 = Math.max(...linesContent.map(({ routeStr }) => (0, utils_js_1.stripAnsi)(routeStr).length));
     let lines = linesContent.map(({ routeStr, routeTypeSrc, routeDefinedBy }, i) => {
-        let cell1 = routeStr.padEnd(width1 + (routeStr.length - (0, utils_js_1.stripAnsi)(routeStr).length), ' ');
-        let cell2 = routeTypeSrc.padEnd(width2, ' ');
-        let cell3 = routeDefinedBy.padEnd(width3, ' ');
+        let cell1 = padEnd(routeStr, width1 + ((0, utils_js_1.stripAnsi)(routeStr).length - (0, utils_js_1.stripAnsi)(routeStr).length));
+        let cell2 = padEnd(routeTypeSrc, width2);
+        let cell3 = padEnd(routeDefinedBy, width3);
         const isHeader = i === 0;
         if (isHeader) {
             cell1 = picocolors_1.default.dim(cell1);
@@ -125,6 +125,11 @@ function truncateRouteFunction(routeStr, lenMax) {
     routeStr = (0, utils_js_1.truncateString)(routeStr, lenMax, (s) => picocolors_1.default.dim(s));
     return routeStr;
 }
+/** Same as String.prototype.padEnd but with stripAnsi() */
+function padEnd(str, width) {
+    const padWidth = Math.max(0, width - (0, utils_js_1.stripAnsi)(str).length);
+    return str + ''.padEnd(padWidth, ' ');
+}
 function removeNonAscii(str) {
     // https://stackoverflow.com/questions/20856197/remove-non-ascii-character-in-string/20856346#20856346
     return str.replace(/[^\x00-\x7F]/g, '');

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.143-commit-f03b42d';
+const PROJECT_VERSION = '0.4.143-commit-dc6fea0';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getFilePathToShowToUser.d.ts

@@ -6,10 +6,19 @@ type FilePath = {
      * Example: `/home/rom/code/my-app/pages/some-page/Page.js`
      */
     filePathAbsolute: string;
+} & ({
     /** The file's path relative to the Vite's root (i.e. the user's project root directory).
      *
      * Example: `/pages/some-page/Page.js`
      */
-    filePathRelativeToUserRootDir: null | string;
-};
+    filePathRelativeToUserRootDir: string;
+    importPathAbsolute: null;
+} | {
+    filePathRelativeToUserRootDir: null;
+    /** The file's absolute import path.
+     *
+     * Example: `vike-react/config`
+     */
+    importPathAbsolute: string;
+});
 declare function getFilePathToShowToUser(filePath: FilePath): string;

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

@@ -1,5 +1,11 @@
 export { getFilePathToShowToUser };
 import { assert } from '../../../utils.js';
+/*
+const f: FilePath = 1 as any
+if (f.filePathRelativeToUserRootDir === null) {
+  f.importPathAbsolute
+}
+//*/
 function getFilePathToShowToUser(filePath) {
     const filePathToShowToUser = filePath.filePathRelativeToUserRootDir ?? filePath.filePathAbsolute;
     assert(filePathToShowToUser);

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.d.ts

@@ -31,17 +31,18 @@ type ConfigDefinition = {
     effect?: ConfigEffect;
 };
 type ConfigEffect = (config: {
-    /** The resolved config value.
+    /** The config value.
      *
      * https://vike.dev/meta
      */
     configValue: unknown;
-    /** Place where the resolved config value comes from.
+    /** Where the config value is defined.
      *
      * https://vike.dev/meta
      */
     configDefinedAt: `Config ${string}`;
 }) => Config | undefined;
+/** For Vike internal use */
 type ConfigDefinitionInternal = Omit<ConfigDefinition, 'env'> & {
     _computed?: (pageConfig: PageConfigBuildTime) => unknown;
     _valueIsFilePath?: true;

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

@@ -84,7 +84,8 @@ async function loadInterfaceFiles(userRootDir, isDev, extensions) {
     await Promise.all(configFiles.map(async ({ filePathAbsolute, filePathRelativeToUserRootDir }) => {
         const configFilePath = {
             filePathAbsolute: filePathAbsolute,
-            filePathRelativeToUserRootDir: filePathRelativeToUserRootDir
+            filePathRelativeToUserRootDir: filePathRelativeToUserRootDir,
+            importPathAbsolute: null
         };
         const { configFile, extendsConfigs } = await loadConfigFile(configFilePath, userRootDir, []);
         const interfaceFile = getInterfaceFileFromConfigFile(configFile, false);
@@ -103,7 +104,8 @@ async function loadInterfaceFiles(userRootDir, isDev, extensions) {
         const interfaceFile = {
             filePath: {
                 filePathRelativeToUserRootDir,
-                filePathAbsolute
+                filePathAbsolute,
+                importPathAbsolute: null
             },
             configMap: {
                 [configName]: {}
@@ -797,7 +799,7 @@ function assertNoUnexpectedPlusSign(filePath, fileName) {
     assertUsage(!fileName.slice(1).includes('+'), `Character '+' is only allowed at the beginning of filenames: make sure ${filePath} doesn't contain any '+' in its filename other than its first letter`);
 }
 async function loadConfigFile(configFilePath, userRootDir, visited) {
-    const { filePathAbsolute, filePathRelativeToUserRootDir } = configFilePath;
+    const { filePathAbsolute } = configFilePath;
     assertNoInfiniteLoop(visited, filePathAbsolute);
     const { fileExports } = await transpileAndExecuteFile(configFilePath, false, userRootDir);
     const { extendsConfigs, extendsFilePaths } = await loadExtendsConfigs(fileExports, configFilePath, userRootDir, [
@@ -806,10 +808,7 @@ async function loadConfigFile(configFilePath, userRootDir, visited) {
     ]);
     const configFile = {
         fileExports,
-        filePath: {
-            filePathRelativeToUserRootDir,
-            filePathAbsolute
-        },
+        filePath: configFilePath,
         extendsFilePaths
     };
     return { configFile, extendsConfigs };
@@ -832,11 +831,14 @@ async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir
         const filePathAbsolute = resolveImportPath(importData, configFilePath);
         assertImportPath(filePathAbsolute, importData, configFilePath);
         assertExtendsImportPath(importPath, filePathAbsolute, configFilePath);
+        // - filePathRelativeToUserRootDir has no functionality beyond nicer error messages for user
+        // - Using importPath would be visually nicer but it's ambigous => we rather pick filePathAbsolute for added clarity
+        const filePathRelativeToUserRootDir = determineFilePathRelativeToUserDir(filePathAbsolute, userRootDir);
         extendsConfigFiles.push({
             filePathAbsolute,
-            // - filePathRelativeToUserRootDir has no functionality beyond nicer error messages for user
-            // - Using importPath would be visually nicer but it's ambigous => we rather pick filePathAbsolute for added clarity
-            filePathRelativeToUserRootDir: determineFilePathRelativeToUserDir(filePathAbsolute, userRootDir)
+            // TODO: fix type cast
+            filePathRelativeToUserRootDir: filePathRelativeToUserRootDir,
+            importPathAbsolute: importPath
         });
     });
     const extendsConfigs = [];

package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js

@@ -106,7 +106,7 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     if (!isHtmlOnly) {
         // Don't allow the user to manipulate with injectFilter(): injecting <script type="application/json"> before the stream can break the app when:
         //  - using https://vike.dev/stream#initial-data-after-stream-end
-        //  - `pageContext` is modified during the stream, e.g. /examples/vue-pinia which uses https://vuejs.org/api/composition-api-lifecycle.html#onserverprefetch
+        //  - `pageContext` is modified during the stream, e.g. https://github.com/brillout/vike-with-pinia which uses https://vuejs.org/api/composition-api-lifecycle.html#onserverprefetch
         // The <script> tags are handled separately by vike down below.
         htmlTags.push({
             // Needs to be called after `resolvePageContextPromise()`

package/dist/esm/node/runtime/renderPage/log404/index.js

@@ -67,8 +67,8 @@ function getPagesAndRoutesInfo(pageRoutes) {
         ...entries
     ];
     const terminalWidth = getTerminalWidth() || 134;
-    let width2 = Math.max(...linesContent.map(({ routeTypeSrc }) => routeTypeSrc.length));
-    let width3 = Math.max(...linesContent.map(({ routeDefinedBy }) => routeDefinedBy.length));
+    let width2 = Math.max(...linesContent.map(({ routeTypeSrc }) => stripAnsi(routeTypeSrc).length));
+    let width3 = Math.max(...linesContent.map(({ routeDefinedBy }) => stripAnsi(routeDefinedBy).length));
     let width1 = terminalWidth - width3 - width2 - 10;
     linesContent.forEach((lineContent) => {
         let { routeStr } = lineContent;
@@ -83,9 +83,9 @@ function getPagesAndRoutesInfo(pageRoutes) {
     });
     width1 = Math.max(...linesContent.map(({ routeStr }) => stripAnsi(routeStr).length));
     let lines = linesContent.map(({ routeStr, routeTypeSrc, routeDefinedBy }, i) => {
-        let cell1 = routeStr.padEnd(width1 + (routeStr.length - stripAnsi(routeStr).length), ' ');
-        let cell2 = routeTypeSrc.padEnd(width2, ' ');
-        let cell3 = routeDefinedBy.padEnd(width3, ' ');
+        let cell1 = padEnd(routeStr, width1 + (stripAnsi(routeStr).length - stripAnsi(routeStr).length));
+        let cell2 = padEnd(routeTypeSrc, width2);
+        let cell3 = padEnd(routeDefinedBy, width3);
         const isHeader = i === 0;
         if (isHeader) {
             cell1 = pc.dim(cell1);
@@ -119,6 +119,11 @@ function truncateRouteFunction(routeStr, lenMax) {
     routeStr = truncateString(routeStr, lenMax, (s) => pc.dim(s));
     return routeStr;
 }
+/** Same as String.prototype.padEnd but with stripAnsi() */
+function padEnd(str, width) {
+    const padWidth = Math.max(0, width - stripAnsi(str).length);
+    return str + ''.padEnd(padWidth, ' ');
+}
 function removeNonAscii(str) {
     // https://stackoverflow.com/questions/20856197/remove-non-ascii-character-in-string/20856346#20856346
     return str.replace(/[^\x00-\x7F]/g, '');

package/dist/esm/shared/addUrlComputedProps.d.ts

@@ -4,7 +4,8 @@ export type { PageContextUrlComputedPropsInternal };
 export type { PageContextUrlComputedPropsClient };
 export type { PageContextUrlComputedPropsServer };
 export type { PageContextUrlSources };
-type UrlParsed = {
+export type { Url };
+type Url = {
     /** The URL origin, e.g. `https://example.com` of `https://example.com/product/42?details=yes#reviews` */
     origin: null | string;
     /** The URL pathname, e.g. `/product/42` of `https://example.com/product/42?details=yes#reviews` */
@@ -34,8 +35,9 @@ type PageContextUrlComputedPropsClient = {
     /** The URL pathname, e.g. `/product/42` of `https://example.com/product/42?details=yes#reviews` */
     urlPathname: string;
     /** Parsed information about the current URL */
-    urlParsed: UrlParsed;
+    urlParsed: Url;
 };
+/** For Vike internal use */
 type PageContextUrlComputedPropsInternal = PageContextUrlComputedPropsClient & {
     _urlRewrite: string | null;
 };

package/dist/esm/shared/page-configs/Config.d.ts

@@ -32,9 +32,7 @@ import type { ConfigVikeUserProvided } from '../ConfigVike.js';
 import type { Vike, VikePackages } from '../VikeNamespace.js';
 import type { PageContextClient, PageContextServer } from '../types.js';
 type HookName = 'onHydrationEnd' | 'onBeforePrerender' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onBeforeRoute' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onPrerenderStart' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'render';
-type ConfigNameBuiltInPublic = Exclude<keyof Config, keyof ConfigVikeUserProvided | 'onBeforeRoute' | 'onPrerenderStart'> | 'prerender';
-type ConfigNameBuiltInInternal = 'isClientSideRenderable' | 'onBeforeRenderEnv';
-type ConfigNameBuiltIn = ConfigNameBuiltInPublic | ConfigNameBuiltInInternal;
+type ConfigNameBuiltIn = Exclude<keyof Config, keyof ConfigVikeUserProvided | 'onBeforeRoute' | 'onPrerenderStart'> | 'prerender' | 'isClientSideRenderable' | 'onBeforeRenderEnv';
 type Config = ConfigBuiltIn & Vike.Config & (VikePackages.ConfigVikeReact | VikePackages.ConfigVikeVue | VikePackages.ConfigVikeSolid | VikePackages.ConfigVikeSvelte);
 /** Protect page(s), e.g. forbid unauthorized access.
  *

package/dist/esm/shared/page-configs/PageConfig.d.ts

@@ -61,6 +61,7 @@ type PageConfigGlobalBuildTime = {
     configValueSources: ConfigValueSources;
 };
 type ConfigEnv = 'client-only' | 'server-only' | 'server-and-client' | 'config-only';
+/** For Vike internal use */
 type ConfigEnvInternal = ConfigEnv | '_routing-eager' | '_routing-lazy';
 type ConfigValueSource = {
     configEnv: ConfigEnvInternal;

package/dist/esm/shared/types.d.ts

@@ -22,6 +22,7 @@ type PageContextClientWithServerRouting = PageContextBuiltInClientWithServerRout
  * https://vike.dev/pageContext
  */
 type PageContextBuiltInServer<Page = [never]> = PageContextBuiltInCommon<Page> & PageContextUrlComputedPropsServer;
+/** For Vike internal use */
 type PageContextBuiltInServerInternal<Page = [never]> = PageContextBuiltInCommon<Page> & PageContextUrlComputedPropsInternal;
 type PageContextBuiltInCommon<Page = [never]> = {
     /** The `export { Page }` of your `.page.js` file.

package/dist/esm/types/index.d.ts

@@ -10,6 +10,7 @@ export type { Config, ConfigMeta as Meta, GuardAsync, GuardSync, OnBeforePrerend
 export type { ConfigEnv } from '../shared/page-configs/PageConfig.js';
 export type { ConfigDefinition, ConfigEffect } from '../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js';
 export type { ConfigEntries } from '../shared/getPageFiles/getExports.js';
+export type { Url } from '../shared/addUrlComputedProps.js';
 export type { InjectFilterEntry } from '../node/runtime/html/injectAssets/getHtmlTags.js';
 export { defineConfig } from './defineConfig.js';
 import type { ConfigEnv } from '../shared/page-configs/PageConfig.js';

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.143-commit-f03b42d";
+    projectVersion: "0.4.143-commit-dc6fea0";
     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.143-commit-f03b42d';
+const PROJECT_VERSION = '0.4.143-commit-dc6fea0';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.143-commit-f03b42d",
+  "version": "0.4.143-commit-dc6fea0",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",