vike 0.4.144-commit-756f5d7 → 0.4.144-commit-f7ab002

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");
@@ -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/devConfig/determineOptimizeDeps.js

@@ -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 { filePathAbsoluteFilesystem } = definedAtInfo;
+                if (definedAt.filePathRelativeToUserRootDir !== null) {
+                    const { filePathAbsoluteFilesystem } = definedAt;
                     (0, utils_js_1.assert)(filePathAbsoluteFilesystem);
                     // Surprisingly Vite expects entries to be absolute paths
                     entries.push(filePathAbsoluteFilesystem);
                 }
                 else {
-                    // Adding definedAtInfo.filePathAbsoluteFilesystem 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/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/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'
     },
     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 === '/')