vike 0.4.169 → 0.4.171-commit-d60a550

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

@@ -139,9 +139,10 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                         //    - When tsconfig.js#compilerOptions.paths is set, then esbuild is able to resolve the path alias.
                         resolved.errors.length > 0;
                     (0, utils_js_1.assertPosixPath)(importPathResolved);
+                    const isNodeModules = importPathResolved.includes('/node_modules/');
                     const isExternal = isPointerImport ||
                         // Performance: npm package imports that aren't pointer imports can be externalized. For example, if Vike eventually adds support for setting Vite configs in the vike.config.js file, then the user may import a Vite plugin in his vike.config.js file. (We could as well let esbuild always transpile /node_modules/ code but it would be useless and would unnecessarily slow down transpilation.)
-                        importPathResolved.includes('/node_modules/');
+                        isNodeModules;
                     const filePathAbsoluteUserRootDir = (0, getFilePath_js_1.getFilePathAbsoluteUserRootDir)({
                         filePathAbsoluteFilesystem: importPathResolved,
                         userRootDir
@@ -166,8 +167,8 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                         // importPathOriginal is either:
                         //  - Npm package import
                         //  - Path alias
-                        if (filePathAbsoluteUserRootDir) {
-                            // importPathOriginal is most likely a path alias. (Is it even possible for an npm package import to resolved inside `userRootDir`?)
+                        if (filePathAbsoluteUserRootDir && !isNodeModules) {
+                            // importPathOriginal is most likely (always?) a path alias.
                             importPathTranspiled = importPathResolved;
                         }
                         else {

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

@@ -132,6 +132,7 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev) {
                         'vike-pinia',
                         'vike-solid'
                     ];
+                    (0, utils_js_1.assert)(extendsConfig.filePath.importPathAbsolute);
                     const extensionName = extendsConfig.filePath.importPathAbsolute.split('/')[0];
                     const warnMsg = alreadyMigrated.includes(extensionName)
                         ? `You're using a deprecated version of the Vike extension ${extensionName}, update ${extensionName} to its latest version.`
@@ -270,7 +271,6 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev) {
             if (isGlobalConfig(configName))
                 return;
             const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
-            configDef.env = deriveConfigEnvFromFileName(configDef.env, interfaceFile.filePath.fileName);
             if (!isConfigEnv(configDef, configName))
                 return;
             const isAlreadyLoaded = interfacefileIsAlreaydLoaded(interfaceFile);
@@ -501,7 +501,7 @@ function isInterfaceFileUserLand(interfaceFile) {
 async function getConfigValueSource(configName, interfaceFile, configDef, userRootDir, importedFilesLoaded) {
     const conf = interfaceFile.fileExportsByConfigName[configName];
     (0, utils_js_1.assert)(conf);
-    const configEnv = configDef.env;
+    const configEnv = deriveConfigEnvFromFileName(configDef.env, interfaceFile.filePath.fileName);
     const { locationId } = interfaceFile;
     const definedAtFilePath_ = {
         ...interfaceFile.filePath,
@@ -938,6 +938,7 @@ function mergeCumulative(configName, configValueSources) {
 function getConfigEnvValue(val, errMsgIntro) {
     const errInvalidValue = `${errMsgIntro} an invalid value ${picocolors_1.default.cyan(JSON.stringify(val))}`;
     // Legacy outdated values
+    // TODO/v1-release: remove
     if (typeof val === 'string') {
         const valConverted = (() => {
             if (val === 'client-only')

package/dist/cjs/shared/getPageFiles/getExports.js

@@ -32,6 +32,18 @@ function getPageContextExports(pageFiles, pageConfig) {
         });
     });
     // V1 design
+    const source = {};
+    const sources = {};
+    const addSrc = (src, configName) => {
+        source[configName] = src;
+        sources[configName] ?? (sources[configName] = []);
+        sources[configName].push(src);
+    };
+    const from = {
+        configsOverridable: {},
+        configsCumulative: {},
+        configsComputed: {}
+    };
     if (pageConfig) {
         Object.entries(pageConfig.configValues).forEach(([configName, configValue]) => {
             const { value } = configValue;
@@ -46,6 +58,39 @@ function getPageContextExports(pageFiles, pageConfig) {
                 configDefinedAt,
                 configDefinedByFile: configValueFilePathToShowToUser
             });
+            if (configValue.type === 'cumulative') {
+                const src = {
+                    type: 'configsCumulative',
+                    values: configValue.value.map((value, i) => {
+                        const definedAtFile = configValue.definedAtData[i];
+                        (0, utils_js_1.assert)(definedAtFile);
+                        const definedAt = (0, getConfigDefinedAt_js_1.getDefinedAtString)(definedAtFile, configName);
+                        return {
+                            value,
+                            definedAt
+                        };
+                    })
+                };
+                addSrc(src, configName);
+                from.configsCumulative[configName] = src;
+            }
+            if (configValue.type === 'classic') {
+                const src = {
+                    type: 'configsOverridable',
+                    value: configValue.value,
+                    definedAt: (0, getConfigDefinedAt_js_1.getDefinedAtString)(configValue.definedAtData, configName)
+                };
+                addSrc(src, configName);
+                from.configsOverridable[configName] = src;
+            }
+            if (configValue.type === 'computed') {
+                const src = {
+                    type: 'configsComputed',
+                    value: configValue.value
+                };
+                addSrc(src, configName);
+                from.configsComputed[configName] = src;
+            }
             // TODO/v1-release: remove
             const exportName = configName;
             exportsAll[exportName] = exportsAll[exportName] ?? [];
@@ -75,9 +120,12 @@ function getPageContextExports(pageFiles, pageConfig) {
     (0, utils_js_1.assert)(!('default' in exports));
     (0, utils_js_1.assert)(!('default' in exportsAll));
     const pageContextExports = {
+        from,
+        source,
+        sources,
+        // TODO/eventually: deprecate/remove every prop below
         config,
         configEntries,
-        // TODO/v1-release: remove
         exports,
         exportsAll,
         pageExports

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.169';
+const PROJECT_VERSION = '0.4.171-commit-d60a550';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -136,9 +136,10 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                         //    - When tsconfig.js#compilerOptions.paths is set, then esbuild is able to resolve the path alias.
                         resolved.errors.length > 0;
                     assertPosixPath(importPathResolved);
+                    const isNodeModules = importPathResolved.includes('/node_modules/');
                     const isExternal = isPointerImport ||
                         // Performance: npm package imports that aren't pointer imports can be externalized. For example, if Vike eventually adds support for setting Vite configs in the vike.config.js file, then the user may import a Vite plugin in his vike.config.js file. (We could as well let esbuild always transpile /node_modules/ code but it would be useless and would unnecessarily slow down transpilation.)
-                        importPathResolved.includes('/node_modules/');
+                        isNodeModules;
                     const filePathAbsoluteUserRootDir = getFilePathAbsoluteUserRootDir({
                         filePathAbsoluteFilesystem: importPathResolved,
                         userRootDir
@@ -163,8 +164,8 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                         // importPathOriginal is either:
                         //  - Npm package import
                         //  - Path alias
-                        if (filePathAbsoluteUserRootDir) {
-                            // importPathOriginal is most likely a path alias. (Is it even possible for an npm package import to resolved inside `userRootDir`?)
+                        if (filePathAbsoluteUserRootDir && !isNodeModules) {
+                            // importPathOriginal is most likely (always?) a path alias.
                             importPathTranspiled = importPathResolved;
                         }
                         else {

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

@@ -127,6 +127,7 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev) {
                         'vike-pinia',
                         'vike-solid'
                     ];
+                    assert(extendsConfig.filePath.importPathAbsolute);
                     const extensionName = extendsConfig.filePath.importPathAbsolute.split('/')[0];
                     const warnMsg = alreadyMigrated.includes(extensionName)
                         ? `You're using a deprecated version of the Vike extension ${extensionName}, update ${extensionName} to its latest version.`
@@ -265,7 +266,6 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev) {
             if (isGlobalConfig(configName))
                 return;
             const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
-            configDef.env = deriveConfigEnvFromFileName(configDef.env, interfaceFile.filePath.fileName);
             if (!isConfigEnv(configDef, configName))
                 return;
             const isAlreadyLoaded = interfacefileIsAlreaydLoaded(interfaceFile);
@@ -496,7 +496,7 @@ function isInterfaceFileUserLand(interfaceFile) {
 async function getConfigValueSource(configName, interfaceFile, configDef, userRootDir, importedFilesLoaded) {
     const conf = interfaceFile.fileExportsByConfigName[configName];
     assert(conf);
-    const configEnv = configDef.env;
+    const configEnv = deriveConfigEnvFromFileName(configDef.env, interfaceFile.filePath.fileName);
     const { locationId } = interfaceFile;
     const definedAtFilePath_ = {
         ...interfaceFile.filePath,
@@ -932,6 +932,7 @@ function mergeCumulative(configName, configValueSources) {
 function getConfigEnvValue(val, errMsgIntro) {
     const errInvalidValue = `${errMsgIntro} an invalid value ${pc.cyan(JSON.stringify(val))}`;
     // Legacy outdated values
+    // TODO/v1-release: remove
     if (typeof val === 'string') {
         const valConverted = (() => {
             if (val === 'client-only')

package/dist/esm/node/runtime/renderPage/loadUserFilesServerSide.d.ts

@@ -19,6 +19,56 @@ declare function loadUserFilesServerSide(pageContext: {
     _isHtmlOnly: boolean;
     _passToClient: string[];
     _pageFilePathsLoaded: string[];
+    source: {
+        [x: string]: {
+            type: "configsOverridable";
+            value: unknown;
+            definedAt: string;
+        } | {
+            type: "configsCumulative";
+            values: {
+                value: unknown;
+                definedAt: string;
+            }[];
+        } | {
+            type: "configsComputed";
+            value: unknown;
+        };
+    };
+    sources: {
+        [x: string]: ({
+            type: "configsOverridable";
+            value: unknown;
+            definedAt: string;
+        } | {
+            type: "configsCumulative";
+            values: {
+                value: unknown;
+                definedAt: string;
+            }[];
+        } | {
+            type: "configsComputed";
+            value: unknown;
+        })[];
+    };
+    from: {
+        configsOverridable: Record<string, {
+            type: "configsOverridable";
+            value: unknown;
+            definedAt: string;
+        }>;
+        configsCumulative: Record<string, {
+            type: "configsCumulative";
+            values: {
+                value: unknown;
+                definedAt: string;
+            }[];
+        }>;
+        configsComputed: Record<string, {
+            type: "configsComputed";
+            value: unknown;
+        }>;
+    };
     config: Record<string, unknown>;
     configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
     exports: Record<string, unknown>;

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts

@@ -61,6 +61,56 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
+        source: {
+            [x: string]: {
+                type: "configsOverridable";
+                value: unknown;
+                definedAt: string;
+            } | {
+                type: "configsCumulative";
+                values: {
+                    value: unknown;
+                    definedAt: string;
+                }[];
+            } | {
+                type: "configsComputed";
+                value: unknown;
+            };
+        };
+        sources: {
+            [x: string]: ({
+                type: "configsOverridable";
+                value: unknown;
+                definedAt: string;
+            } | {
+                type: "configsCumulative";
+                values: {
+                    value: unknown;
+                    definedAt: string;
+                }[];
+            } | {
+                type: "configsComputed";
+                value: unknown;
+            })[];
+        };
+        from: {
+            configsOverridable: Record<string, {
+                type: "configsOverridable";
+                value: unknown;
+                definedAt: string;
+            }>;
+            configsCumulative: Record<string, {
+                type: "configsCumulative";
+                values: {
+                    value: unknown;
+                    definedAt: string;
+                }[];
+            }>;
+            configsComputed: Record<string, {
+                type: "configsComputed";
+                value: unknown;
+            }>;
+        };
         config: Record<string, unknown>;
         configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
         exports: Record<string, unknown>;
@@ -108,6 +158,56 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
+        source: {
+            [x: string]: {
+                type: "configsOverridable";
+                value: unknown;
+                definedAt: string;
+            } | {
+                type: "configsCumulative";
+                values: {
+                    value: unknown;
+                    definedAt: string;
+                }[];
+            } | {
+                type: "configsComputed";
+                value: unknown;
+            };
+        };
+        sources: {
+            [x: string]: ({
+                type: "configsOverridable";
+                value: unknown;
+                definedAt: string;
+            } | {
+                type: "configsCumulative";
+                values: {
+                    value: unknown;
+                    definedAt: string;
+                }[];
+            } | {
+                type: "configsComputed";
+                value: unknown;
+            })[];
+        };
+        from: {
+            configsOverridable: Record<string, {
+                type: "configsOverridable";
+                value: unknown;
+                definedAt: string;
+            }>;
+            configsCumulative: Record<string, {
+                type: "configsCumulative";
+                values: {
+                    value: unknown;
+                    definedAt: string;
+                }[];
+            }>;
+            configsComputed: Record<string, {
+                type: "configsComputed";
+                value: unknown;
+            }>;
+        };
         config: Record<string, unknown>;
         configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
         exports: Record<string, unknown>;
@@ -156,6 +256,56 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
+        source: {
+            [x: string]: {
+                type: "configsOverridable";
+                value: unknown;
+                definedAt: string;
+            } | {
+                type: "configsCumulative";
+                values: {
+                    value: unknown;
+                    definedAt: string;
+                }[];
+            } | {
+                type: "configsComputed";
+                value: unknown;
+            };
+        };
+        sources: {
+            [x: string]: ({
+                type: "configsOverridable";
+                value: unknown;
+                definedAt: string;
+            } | {
+                type: "configsCumulative";
+                values: {
+                    value: unknown;
+                    definedAt: string;
+                }[];
+            } | {
+                type: "configsComputed";
+                value: unknown;
+            })[];
+        };
+        from: {
+            configsOverridable: Record<string, {
+                type: "configsOverridable";
+                value: unknown;
+                definedAt: string;
+            }>;
+            configsCumulative: Record<string, {
+                type: "configsCumulative";
+                values: {
+                    value: unknown;
+                    definedAt: string;
+                }[];
+            }>;
+            configsComputed: Record<string, {
+                type: "configsComputed";
+                value: unknown;
+            }>;
+        };
         config: Record<string, unknown>;
         configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
         exports: Record<string, unknown>;
@@ -203,6 +353,56 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
+        source: {
+            [x: string]: {
+                type: "configsOverridable";
+                value: unknown;
+                definedAt: string;
+            } | {
+                type: "configsCumulative";
+                values: {
+                    value: unknown;
+                    definedAt: string;
+                }[];
+            } | {
+                type: "configsComputed";
+                value: unknown;
+            };
+        };
+        sources: {
+            [x: string]: ({
+                type: "configsOverridable";
+                value: unknown;
+                definedAt: string;
+            } | {
+                type: "configsCumulative";
+                values: {
+                    value: unknown;
+                    definedAt: string;
+                }[];
+            } | {
+                type: "configsComputed";
+                value: unknown;
+            })[];
+        };
+        from: {
+            configsOverridable: Record<string, {
+                type: "configsOverridable";
+                value: unknown;
+                definedAt: string;
+            }>;
+            configsCumulative: Record<string, {
+                type: "configsCumulative";
+                values: {
+                    value: unknown;
+                    definedAt: string;
+                }[];
+            }>;
+            configsComputed: Record<string, {
+                type: "configsComputed";
+                value: unknown;
+            }>;
+        };
         config: Record<string, unknown>;
         configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
         exports: Record<string, unknown>;

package/dist/esm/shared/getPageFiles/getExports.d.ts

@@ -27,6 +27,9 @@ type ConfigEntries = Record<string, {
     configDefinedByFile: string | null;
 }[]>;
 type PageContextExports = {
+    source: Source;
+    sources: Sources;
+    from: From;
     config: Record<string, unknown>;
     configEntries: ConfigEntries;
     exports: Record<string, unknown>;
@@ -34,4 +37,34 @@ type PageContextExports = {
     /** @deprecated */
     pageExports: Record<string, unknown>;
 };
+type From = {
+    configsOverridable: Record<string, // configName
+    SourceConfigsOverridable>;
+    configsCumulative: Record<string, // configName
+    SourceConfigsCumulative>;
+    configsComputed: Record<string, // configName
+    SourceConfigsComputed>;
+};
+type Source = Record<string, // configName
+SourceAny>;
+type Sources = Record<string, // configName
+SourceAny[]>;
+type SourceAny = SourceConfigs;
+type SourceConfigs = SourceConfigsOverridable | SourceConfigsCumulative | SourceConfigsComputed;
+type SourceConfigsOverridable = {
+    type: 'configsOverridable';
+    value: unknown;
+    definedAt: string;
+};
+type SourceConfigsCumulative = {
+    type: 'configsCumulative';
+    values: {
+        value: unknown;
+        definedAt: string;
+    }[];
+};
+type SourceConfigsComputed = {
+    type: 'configsComputed';
+    value: unknown;
+};
 declare function getPageContextExports(pageFiles: PageFile[], pageConfig: PageConfigRuntimeLoaded | null): PageContextExports;

package/dist/esm/shared/getPageFiles/getExports.js

@@ -2,7 +2,7 @@ export { getPageContextExports };
 import { isScriptFile, isTemplateFile } from '../../utils/isScriptFile.js';
 import { assert, isObject, assertWarning, assertUsage, makeLast, isBrowser } from '../utils.js';
 import { assertDefaultExports, forbiddenDefaultExports } from './assert_exports_old_design.js';
-import { getConfigDefinedAtOptional } from '../page-configs/getConfigDefinedAt.js';
+import { getConfigDefinedAtOptional, getDefinedAtString } from '../page-configs/getConfigDefinedAt.js';
 import { getConfigValueFilePathToShowToUser } from '../page-configs/helpers.js';
 import pc from '@brillout/picocolors';
 function getPageContextExports(pageFiles, pageConfig) {
@@ -27,6 +27,18 @@ function getPageContextExports(pageFiles, pageConfig) {
         });
     });
     // V1 design
+    const source = {};
+    const sources = {};
+    const addSrc = (src, configName) => {
+        source[configName] = src;
+        sources[configName] ?? (sources[configName] = []);
+        sources[configName].push(src);
+    };
+    const from = {
+        configsOverridable: {},
+        configsCumulative: {},
+        configsComputed: {}
+    };
     if (pageConfig) {
         Object.entries(pageConfig.configValues).forEach(([configName, configValue]) => {
             const { value } = configValue;
@@ -41,6 +53,39 @@ function getPageContextExports(pageFiles, pageConfig) {
                 configDefinedAt,
                 configDefinedByFile: configValueFilePathToShowToUser
             });
+            if (configValue.type === 'cumulative') {
+                const src = {
+                    type: 'configsCumulative',
+                    values: configValue.value.map((value, i) => {
+                        const definedAtFile = configValue.definedAtData[i];
+                        assert(definedAtFile);
+                        const definedAt = getDefinedAtString(definedAtFile, configName);
+                        return {
+                            value,
+                            definedAt
+                        };
+                    })
+                };
+                addSrc(src, configName);
+                from.configsCumulative[configName] = src;
+            }
+            if (configValue.type === 'classic') {
+                const src = {
+                    type: 'configsOverridable',
+                    value: configValue.value,
+                    definedAt: getDefinedAtString(configValue.definedAtData, configName)
+                };
+                addSrc(src, configName);
+                from.configsOverridable[configName] = src;
+            }
+            if (configValue.type === 'computed') {
+                const src = {
+                    type: 'configsComputed',
+                    value: configValue.value
+                };
+                addSrc(src, configName);
+                from.configsComputed[configName] = src;
+            }
             // TODO/v1-release: remove
             const exportName = configName;
             exportsAll[exportName] = exportsAll[exportName] ?? [];
@@ -70,9 +115,12 @@ function getPageContextExports(pageFiles, pageConfig) {
     assert(!('default' in exports));
     assert(!('default' in exportsAll));
     const pageContextExports = {
+        from,
+        source,
+        sources,
+        // TODO/eventually: deprecate/remove every prop below
         config,
         configEntries,
-        // TODO/v1-release: remove
         exports,
         exportsAll,
         pageExports

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.169";
+declare const PROJECT_VERSION: "0.4.171-commit-d60a550";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.169";
+    projectVersion: "0.4.171-commit-d60a550";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.169';
+const PROJECT_VERSION = '0.4.171-commit-d60a550';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.169",
+  "version": "0.4.171-commit-d60a550",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -195,7 +195,7 @@
     "fast-glob": "^3.3.2",
     "sirv": "^2.0.4",
     "source-map-support": "^0.5.21",
-    "@brillout/release-me": "^0.2.2",
+    "@brillout/release-me": "^0.3.4",
     "@types/estree": "^1.0.5",
     "@types/jest": "^29.5.11",
     "@types/node": "^20.10.5",