vike 0.4.144 → 0.4.145-commit-2520555

package/dist/cjs/__internal/index.js

@@ -1,9 +1,7 @@
 "use strict";
-// Internal functions of vike needed by other plugins are exported via this file
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPagesAndRoutes = exports.route = void 0;
 const index_js_1 = require("../shared/route/index.js");
-Object.defineProperty(exports, "route", { enumerable: true, get: function () { return index_js_1.route; } });
 const globalContext_js_1 = require("../node/runtime/globalContext.js");
 const nodeEnv_js_1 = require("../utils/nodeEnv.js");
 const assert_js_1 = require("../utils/assert.js");
@@ -29,3 +27,9 @@ async function getPagesAndRoutes() {
     };
 }
 exports.getPagesAndRoutes = getPagesAndRoutes;
+async function route(pageContext) {
+    const pageContextFromRoute = await (0, index_js_1.route)(pageContext);
+    // Old interface
+    return { pageContextAddendum: pageContextFromRoute };
+}
+exports.route = route;

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

@@ -7,7 +7,7 @@ exports.analyzeClientEntries = exports.assertRollupInput = exports.buildConfig =
 const utils_js_1 = require("../utils.js");
 const virtualFileImportUserCode_js_1 = require("../../shared/virtual-files/virtualFileImportUserCode.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
-const utils_js_2 = require("../../../shared/page-configs/utils.js");
+const helpers_js_1 = require("../../../shared/page-configs/helpers.js");
 const findPageFiles_js_1 = require("../shared/findPageFiles.js");
 const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
@@ -73,7 +73,7 @@ exports.buildConfig = buildConfig;
 async function getEntries(config) {
     const configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
     const pageFileEntries = await getPageFileEntries(config, configVike.includeAssetsImportedByServer); // TODO/v1-release: remove
-    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config.root, (0, utils_js_1.getOutDirs)(config).outDirRoot, false, configVike.extensions);
+    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config, false);
     (0, utils_js_1.assertUsage)(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
     if ((0, utils_js_1.viteIsSSR)(config)) {
         const serverEntries = analyzeServerEntries(pageConfigs);
@@ -112,7 +112,7 @@ function analyzeClientEntries(pageConfigs, config) {
     let clientEntries = {};
     let clientFilePaths = [];
     pageConfigs.forEach((pageConfig) => {
-        const configValue = (0, utils_js_2.getConfigValue)(pageConfig, 'clientRouting', 'boolean');
+        const configValue = (0, helpers_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean');
         if (configValue?.value) {
             hasClientRouting = true;
         }

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

@@ -18,9 +18,6 @@ function commonConfig() {
     return [
         {
             name: 'vike-commonConfig-1',
-            config: () => ({
-                appType: 'custom'
-            }),
             configResolved(config) {
                 (0, require_shim_1.installRequireShim_setUserRootDir)(config.root);
             }

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

@@ -17,20 +17,20 @@ function resolveVikeConfig(vikeConfig) {
         name: 'vike:resolveVikeConfig',
         enforce: 'pre',
         async configResolved(config) {
-            const promise = resolveConfig(vikeConfig, config);
+            const promise = getConfigVikPromise(vikeConfig, config);
             config.configVikePromise = promise;
             await promise;
         }
     };
 }
 exports.resolveVikeConfig = resolveVikeConfig;
-async function resolveConfig(vikeConfig, config) {
+async function getConfigVikPromise(vikeConfig, config) {
     const fromPluginOptions = (vikeConfig ?? {});
     const fromViteConfig = (config.vike ?? {});
     const fromStemPackages = await (0, findConfigVikeFromStemPackages_js_1.findConfigVikeFromStemPackages)(config.root);
     const configs = [fromPluginOptions, ...fromStemPackages, fromViteConfig];
     const extensions = (0, resolveExtensions_js_1.resolveExtensions)(configs, config);
-    const { globalVikeConfig: fromPlusConfigFile } = await (0, getVikeConfig_js_1.getVikeConfig)(config.root, (0, utils_js_1.getOutDirs)(config).outDirRoot, (0, utils_js_1.isDev2)(config), extensions);
+    const { globalVikeConfig: fromPlusConfigFile } = await (0, getVikeConfig_js_1.getVikeConfig)(config, (0, utils_js_1.isDev2)(config), false, extensions);
     configs.push(fromPlusConfigFile);
     (0, assertVikeConfig_js_1.assertVikeConfig)(fromPlusConfigFile, ({ prop, errMsg }) => {
         // TODO: add config file path ?

package/dist/cjs/node/plugin/plugins/devConfig/determineOptimizeDeps.js

@@ -8,7 +8,7 @@ const getConfigValueSourcesRelevant_js_1 = require("../../shared/getConfigValueS
 const buildConfig_js_1 = require("../buildConfig.js");
 const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
 async function determineOptimizeDeps(config, configVike, isDev) {
-    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config.root, (0, utils_js_1.getOutDirs)(config).outDirRoot, isDev, configVike.extensions);
+    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev);
     const { entries, include } = await getPageDeps(config, pageConfigs, isDev);
     {
         // This actually doesn't work: Vite's dep optimizer doesn't seem to be able to crawl virtual files.
@@ -37,18 +37,18 @@ async function getPageDeps(config, pageConfigs, isDev) {
             configValueSourcesRelevant.forEach((configValueSource) => {
                 if (!configValueSource.valueIsImportedAtRuntime)
                     return;
-                const { definedAtInfo, configEnv } = configValueSource;
+                const { definedAt, configEnv } = configValueSource;
                 if (configEnv !== 'client-only' && configEnv !== 'server-and-client')
                     return;
-                if (definedAtInfo.filePathRelativeToUserRootDir !== null) {
-                    const { filePathAbsolute } = definedAtInfo;
-                    (0, utils_js_1.assert)(filePathAbsolute);
+                if (definedAt.filePathRelativeToUserRootDir !== null) {
+                    const { filePathAbsoluteFilesystem } = definedAt;
+                    (0, utils_js_1.assert)(filePathAbsoluteFilesystem);
                     // Surprisingly Vite expects entries to be absolute paths
-                    entries.push(filePathAbsolute);
+                    entries.push(filePathAbsoluteFilesystem);
                 }
                 else {
-                    // Adding definedAtInfo.filePathAbsolute doesn't work for npm packages, I guess because of Vite's config.server.fs.allow
-                    const { importPathAbsolute } = definedAtInfo;
+                    // Adding definedAt.filePathAbsoluteFilesystem doesn't work for npm packages, I guess because of Vite's config.server.fs.allow
+                    const { importPathAbsolute } = definedAt;
                     (0, utils_js_1.assert)(importPathAbsolute);
                     // We need to differentiate between npm package imports and path aliases.
                     // There are path aliases that cannot be distinguished from npm package names.

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

@@ -23,6 +23,7 @@ function devConfig() {
             apply,
             config() {
                 return {
+                    appType: 'custom',
                     optimizeDeps: {
                         exclude: [
                             // We exclude the vike client to be able to use `import.meta.glob()`

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.envVarsPlugin = void 0;
+exports.applyEnvVar = exports.envVarsPlugin = void 0;
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
 function envVarsPlugin() {
@@ -35,27 +35,32 @@ function envVarsPlugin() {
                         : [config.envPrefix];
                 return !envPrefix.some((prefix) => key.startsWith(prefix));
             })
-                .forEach(([key, val]) => {
-                const varName = `import.meta.env.${key}`;
-                const publicPrefix = 'PUBLIC_ENV__';
-                const keyPublic = `${publicPrefix}${key}`;
-                const isPrivate = !key.startsWith(publicPrefix);
-                if (isPrivate && isClientSide) {
-                    if (!code.includes(varName))
-                        return;
-                    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);
-                    }
-                    else {
-                        // Only a warning for faster development DX (e.g. when use toggles `ssr: boolean` or `onBeforeRenderIsomorph: boolean`)
-                        (0, utils_js_1.assertWarning)(false, errMsg, { onlyOnce: true });
+                .forEach(([envName, envVal]) => {
+                // Security check
+                {
+                    const envStatement = getEnvStatement(envName);
+                    const publicPrefix = 'PUBLIC_ENV__';
+                    const isPrivate = !envName.startsWith(publicPrefix);
+                    if (isPrivate && isClientSide) {
+                        if (!code.includes(envStatement))
+                            return;
+                        const filePathToShowToUser = (0, utils_js_1.getFilePathRelativeToUserRootDir)(id, config.root);
+                        const errMsgAddendum = isBuild ? '' : ' (Vike will prevent your app from building for production)';
+                        const keyPublic = `${publicPrefix}${envName}`;
+                        const errMsg = `${envStatement} is used in client-side file ${filePathToShowToUser} which means that the environment variable ${envName} will be included in client-side bundles and, therefore, ${envName} will be publicly exposed which can be a security leak${errMsgAddendum}. Use ${envStatement} only in server-side files, or rename ${envName} to ${keyPublic}, see https://vike.dev/env`;
+                        if (isBuild) {
+                            (0, utils_js_1.assertUsage)(false, errMsg);
+                        }
+                        else {
+                            // Only a warning for faster development DX (e.g. when user toggles `ssr: boolean` or `onBeforeRenderIsomorph: boolean`)
+                            (0, utils_js_1.assertWarning)(false, errMsg, { onlyOnce: true });
+                        }
                     }
+                    // Double check
+                    (0, utils_js_1.assert)(!(isPrivate && isClientSide) || !isBuild);
                 }
-                (0, utils_js_1.assert)(!(isPrivate && isClientSide) || !isBuild);
-                code = code.replaceAll(varName, JSON.stringify(val));
+                // Apply
+                code = applyEnvVar(envName, envVal, code);
             });
             // No need for low-resolution source map since line numbers didn't change. (Does Vite do high-resolution column numbers source mapping?)
             return code;
@@ -63,6 +68,15 @@ function envVarsPlugin() {
     };
 }
 exports.envVarsPlugin = envVarsPlugin;
+function applyEnvVar(envName, envVal, code) {
+    const envStatement = getEnvStatement(envName);
+    const regex = new RegExp((0, utils_js_1.escapeRegex)(envStatement) + '\\b', 'g');
+    return code.replace(regex, JSON.stringify(envVal));
+}
+exports.applyEnvVar = applyEnvVar;
+function getEnvStatement(envName) {
+    return `import.meta.env.${envName}`;
+}
 function getIsClientSide(config, options) {
     const isBuild = config.command === 'build';
     if (isBuild) {

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

@@ -32,15 +32,15 @@ function importBuild() {
 }
 exports.importBuild = importBuild;
 function getImporterCode(config, pageFilesEntry) {
-    const importPathAbsolute = (0, utils_js_1.toPosixPath)(
+    const filePathAbsolute = (0, utils_js_1.toPosixPath)(
     // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/importBuild/index.js
     require_.resolve(`../../../../../../dist/esm/node/runtime/globalContext/loadImportBuild.js`));
     const { outDirServer } = (0, utils_js_1.getOutDirs)(config);
-    const importPath = path_1.default.posix.relative(outDirServer, importPathAbsolute);
+    const filePathRelative = path_1.default.posix.relative(outDirServer, filePathAbsolute);
     // The only reason we went for using CJS require() instead of ESM import() is because import() doesn't support .json files
     const importerCode = [
         '(async () => {',
-        `  const { setImportBuildGetters } = await import('${importPath}');`,
+        `  const { setImportBuildGetters } = await import('${filePathRelative}');`,
         '  setImportBuildGetters({',
         `    pageFiles: () => import('./${pageFilesEntry}'),`,
         "    clientManifest: () => require('../assets.json'),",

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

@@ -146,7 +146,7 @@ export const pageFilesList = [];
 export const neverLoaded = {};
 export const isGeneratedFile = true;
 
-${await (0, getVirtualFilePageConfigs_js_1.getVirtualFilePageConfigs)(config.root, (0, utils_js_1.getOutDirs)(config).outDirRoot, isForClientSide, isDev, id, configVike, isClientRouting)}
+${await (0, getVirtualFilePageConfigs_js_1.getVirtualFilePageConfigs)(isForClientSide, isDev, id, isClientRouting, config)}
 
 `;
     fileTypes_js_1.fileTypes

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

@@ -52,7 +52,7 @@ function importUserCode() {
                 return undefined;
             id = (0, utils_js_1.getVirtualFileId)(id);
             if ((0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id)) {
-                const code = await (0, getVirtualFilePageConfigValuesAll_js_1.getVirtualFilePageConfigValuesAll)(id, config.root, (0, utils_js_1.getOutDirs)(config).outDirRoot, isDev, configVike);
+                const code = await (0, getVirtualFilePageConfigValuesAll_js_1.getVirtualFilePageConfigValuesAll)(id, isDev, config);
                 return code;
             }
             if ((0, virtualFileImportUserCode_js_1.isVirtualFileIdImportUserCode)(id)) {
@@ -117,8 +117,8 @@ function handleHotUpdate(ctx, config, configVike) {
         return virtualModules;
     }
 }
-function isVikeConfigModule(filePathAbsolute) {
-    return getVikeConfig_js_1.vikeConfigDependencies.has(filePathAbsolute);
+function isVikeConfigModule(filePathAbsoluteFilesystem) {
+    return getVikeConfig_js_1.vikeConfigDependencies.has(filePathAbsoluteFilesystem);
 }
 function reloadConfig(filePath, config, configVike, op) {
     {

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

@@ -49,16 +49,17 @@ const configDefinitionsBuiltIn = {
         _valueIsFilePath: true
     },
     clientRouting: {
-        env: 'server-and-client' // TODO: config-only instead?
+        // We could make it 'server-only' (we don't yet because of some legacy V0.4 design code)
+        env: 'server-and-client'
     },
     prerender: {
-        env: 'server-only'
+        env: 'config-only'
     },
     hydrationCanBeAborted: {
-        env: 'client-only' // TODO: config-only instead?
+        env: 'client-only'
     },
     prefetchStaticAssets: {
-        env: 'client-only' // TODO: config-only instead?
+        env: 'client-only'
     },
     extends: {
         env: 'config-only'

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

@@ -7,8 +7,8 @@ const utils_js_1 = require("../../../../utils.js");
  * getLocationId('/pages/some-page') => '/pages/some-page'
  * getLocationId('/renderer/+config.js') => '/renderer'
  */
-function getLocationId(somePath) {
-    const locationId = removeFilename(somePath, true);
+function getLocationId(filePathAbsoluteVite) {
+    const locationId = removeFilename(filePathAbsoluteVite, true);
     assertLocationId(locationId);
     return locationId;
 }
@@ -110,21 +110,21 @@ function removeDirectories(somePath, removeDirs) {
         somePath = '/';
     return somePath;
 }
-function removeFilename(filePath, optional) {
-    (0, utils_js_1.assertPosixPath)(filePath);
-    (0, utils_js_1.assert)(filePath.startsWith('/') || (0, utils_js_1.isNpmPackageImport)(filePath));
+function removeFilename(filePathAbsoluteVite, optional) {
+    (0, utils_js_1.assertPosixPath)(filePathAbsoluteVite);
+    (0, utils_js_1.assert)(filePathAbsoluteVite.startsWith('/') || (0, utils_js_1.isNpmPackageImport)(filePathAbsoluteVite));
     {
-        const filename = filePath.split('/').slice(-1)[0];
+        const filename = filePathAbsoluteVite.split('/').slice(-1)[0];
         if (!filename.includes('.')) {
             (0, utils_js_1.assert)(optional);
-            return filePath;
+            return filePathAbsoluteVite;
         }
     }
-    filePath = filePath.split('/').slice(0, -1).join('/');
-    if (filePath === '')
-        filePath = '/';
-    assertLocationId(filePath);
-    return filePath;
+    let locationId = filePathAbsoluteVite.split('/').slice(0, -1).join('/');
+    if (locationId === '')
+        locationId = '/';
+    assertLocationId(locationId);
+    return locationId;
 }
 function getFilesystemRouteDefinedBy(locationId) {
     if (locationId === '/')