vike 0.4.171-commit-42245b5 → 0.4.171-commit-43aef47

package/dist/cjs/node/plugin/plugins/importUserCode/{generateEagerImport.js → addImportStatement.js}

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateEagerImport = void 0;
-let varCounterGlobal = 0;
+exports.addImportStatement = void 0;
 /**
  * Naming:
  *   `import { someExport as someImport } from './some-file'`
@@ -11,14 +10,12 @@ let varCounterGlobal = 0;
  *      `exportName: 'someExport',`
  *      `importName: 'someImport',`
  *    `}`
- * We discard the information that the import variable is called `someImport` because we don't need it.
  */
-function generateEagerImport(importPath, varCounter, exportName) {
-    if (varCounter === undefined)
-        varCounter = varCounterGlobal++;
-    const importName = `import_${varCounter}`;
+function addImportStatement(importStatements, importPath, exportName) {
+    const importCounter = importStatements.length + 1;
+    const importName = `import${importCounter}`;
     const importLiteral = (() => {
-        if (!exportName || exportName === '*') {
+        if (exportName === '*') {
             return `* as ${importName}`;
         }
         if (exportName === 'default') {
@@ -27,6 +24,7 @@ function generateEagerImport(importPath, varCounter, exportName) {
         return `{ ${exportName} as ${importName} }`;
     })();
     const importStatement = `import ${importLiteral} from '${importPath}';`;
-    return { importName, importStatement };
+    importStatements.push(importStatement);
+    return { importName };
 }
-exports.generateEagerImport = generateEagerImport;
+exports.addImportStatement = addImportStatement;

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

@@ -10,7 +10,11 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const helpers_js_1 = require("../../../../../shared/page-configs/helpers.js");
 const serializeConfigValue_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValue.js");
 const getConfigValueSourcesNotOverriden_js_1 = require("../../../shared/getConfigValueSourcesNotOverriden.js");
-function getConfigValuesSerialized(pageConfig, isEnvMatch) {
+const transformFileImports_js_1 = require("./getVikeConfig/transformFileImports.js");
+const addImportStatement_js_1 = require("../addImportStatement.js");
+const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
+const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
+function getConfigValuesSerialized(pageConfig, importStatements, isEnvMatch) {
     const lines = [];
     Object.entries(pageConfig.configValuesComputed).forEach(([configName, configValuesComputed]) => {
         const { configEnv } = configValuesComputed;
@@ -23,7 +27,7 @@ function getConfigValuesSerialized(pageConfig, isEnvMatch) {
         (0, utils_js_1.assert)(configValue);
         const { value, ...common } = configValue;
         (0, utils_js_1.assert)(value === configValuesComputed.value);
-        const valueSerialized = getConfigValueSerialized(value, configName, configValue.definedAtData);
+        const valueSerialized = getConfigValueSerialized(value, configName, configValue.definedAtData, importStatements);
         const configValueSerialized = { valueSerialized, ...common };
         (0, serializeConfigValue_js_1.serializeConfigValue)(lines, configName, configValueSerialized);
     });
@@ -36,7 +40,7 @@ function getConfigValuesSerialized(pageConfig, isEnvMatch) {
             return;
         }
         const { value, ...common } = configValue;
-        const valueSerialized = getConfigValueSerialized(value, configName, configValue.definedAtData);
+        const valueSerialized = getConfigValueSerialized(value, configName, configValue.definedAtData, importStatements);
         const configValueSerialized = { valueSerialized, ...common };
         (0, serializeConfigValue_js_1.serializeConfigValue)(lines, configName, configValueSerialized);
     });
@@ -46,31 +50,52 @@ function getConfigValuesSerialized(pageConfig, isEnvMatch) {
 exports.getConfigValuesSerialized = getConfigValuesSerialized;
 function assertConfigValueIsSerializable(value, configName, definedAtData) {
     // Contains asserts
-    getConfigValueSerialized(value, configName, definedAtData);
+    getConfigValueSerialized(value, configName, definedAtData, []);
 }
 exports.assertConfigValueIsSerializable = assertConfigValueIsSerializable;
-function getConfigValueSerialized(value, configName, definedAtData) {
+function getConfigValueSerialized(value, configName, definedAtData, importStatements) {
     const valueName = `config${(0, utils_js_1.getPropAccessNotation)(configName)}`;
     let configValueSerialized;
     try {
-        configValueSerialized = (0, stringify_1.stringify)(value, { valueName, forbidReactElements: true });
+        configValueSerialized = (0, stringify_1.stringify)(value, {
+            valueName,
+            forbidReactElements: true,
+            replacer(_, value) {
+                if (typeof value === 'string') {
+                    const importData = (0, transformFileImports_js_1.parsePointerImportData)(value);
+                    if (importData) {
+                        const { importName } = (0, addImportStatement_js_1.addImportStatement)(importStatements, importData.importPath, importData.exportName);
+                        const replacement = [REPLACE_ME_BEFORE, importName, REPLACE_ME_AFTER].join('');
+                        return { replacement };
+                    }
+                }
+            }
+        });
     }
     catch (err) {
-        /*
-        let serializationErrMsg = ''
-        if (isJsonSerializerError(err)) {
-          serializationErrMsg = err.messageCore
-        } else {
-          // When a property getter throws an error
-          console.error('Serialization error:')
-          console.error(err)
-          serializationErrMsg = 'see serialization error printed above'
-        }
-        */
-        const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(definedAtData);
-        (0, utils_js_1.assert)(configValueFilePathToShowToUser);
-        (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.cyan(configName)} defined by ${configValueFilePathToShowToUser} must be defined over a so-called "pointer import", see https://vike.dev/config#pointer-imports`);
+        logJsonSerializeError(err, configName, definedAtData);
+        (0, utils_js_1.assert)(false);
     }
-    configValueSerialized = JSON.stringify(configValueSerialized);
+    configValueSerialized = configValueSerialized.replaceAll(`"${REPLACE_ME_BEFORE}`, '');
+    configValueSerialized = configValueSerialized.replaceAll(`${REPLACE_ME_AFTER}"`, '');
+    (0, utils_js_1.assert)(!configValueSerialized.includes(REPLACE_ME_BEFORE));
+    (0, utils_js_1.assert)(!configValueSerialized.includes(REPLACE_ME_AFTER));
     return configValueSerialized;
 }
+function logJsonSerializeError(err, configName, definedAtData) {
+    /*
+    // import { isJsonSerializerError } from '@brillout/json-serializer/stringify'
+    let serializationErrMsg = ''
+    if (isJsonSerializerError(err)) {
+      serializationErrMsg = err.messageCore
+    } else {
+      // When a property getter throws an error
+      console.error('Serialization error:')
+      console.error(err)
+      serializationErrMsg = 'see serialization error printed above'
+    }
+    //*/
+    const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(definedAtData);
+    (0, utils_js_1.assert)(configValueFilePathToShowToUser);
+    (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.cyan(configName)} defined by ${configValueFilePathToShowToUser} must be defined over a so-called "pointer import", see https://vike.dev/config#pointer-imports`);
+}

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

@@ -11,19 +11,11 @@ const path_1 = __importDefault(require("path"));
 const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
 const filesEnvMap = new Map();
 function resolvePointerImportOfConfig(configValue, importerFilePath, userRootDir, configEnv, configName) {
-    const pointerImportData = typeof configValue === 'string' && (0, transformFileImports_js_1.parsePointerImportData)(configValue);
-    if (!pointerImportData) {
-        // Temporary workaround to support document.title config.
-        // - We'll be able to remove that workaround once Vike supports custom nested configs (being able to define document.title and document.description as two different configs).
-        replaceStringValues(configValue, (str) => {
-            const pointerImportData = (0, transformFileImports_js_1.parsePointerImportData)(str);
-            if (pointerImportData) {
-                const filePath = resolvePointerImport(pointerImportData, importerFilePath, userRootDir);
-                return filePath.filePathAbsoluteVite;
-            }
-        });
+    if (typeof configValue !== 'string')
+        return null;
+    const pointerImportData = (0, transformFileImports_js_1.parsePointerImportData)(configValue);
+    if (!pointerImportData)
         return null;
-    }
     const { importPath, exportName } = pointerImportData;
     const filePath = resolvePointerImport(pointerImportData, importerFilePath, userRootDir);
     const fileExportPathToShowToUser = exportName === 'default' || exportName === configName ? [] : [exportName];
@@ -135,29 +127,3 @@ function clearFilesEnvMap() {
     filesEnvMap.clear();
 }
 exports.clearFilesEnvMap = clearFilesEnvMap;
-function replaceStringValues(obj, replacer) {
-    const visited = new WeakSet();
-    return traverse(obj, replacer);
-    function traverse(obj, replacer) {
-        // Check if the input is an object
-        if ((0, utils_js_1.isObject)(obj)) {
-            if (visited.has(obj))
-                return;
-            visited.add(obj);
-            for (const key in obj) {
-                if (!obj.hasOwnProperty(key))
-                    continue;
-                const val = obj[key];
-                if (typeof val !== 'string') {
-                    traverse(val, replacer);
-                }
-                else {
-                    const replacement = replacer(val);
-                    if (replacement) {
-                        obj[key] = replacement;
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -40,7 +40,7 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
     lines.push(getConfigValuesImported(pageConfig, isForClientSide, isClientRouting, importStatements));
     lines.push('];');
     lines.push('export const configValuesSerialized = {');
-    lines.push((0, getConfigValuesSerialized_js_1.getConfigValuesSerialized)(pageConfig, (configEnv, configValueSource) => isEnvMatch(configEnv, !configValueSource ? false : checkWhetherIsImport(configValueSource), {
+    lines.push((0, getConfigValuesSerialized_js_1.getConfigValuesSerialized)(pageConfig, importStatements, (configEnv, configValueSource) => isEnvMatch(configEnv, !configValueSource ? false : checkWhetherIsImport(configValueSource), {
         isImport: false,
         isForClientSide,
         isClientRouting
@@ -54,7 +54,6 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
 }
 function getConfigValuesImported(pageConfig, isForClientSide, isClientRouting, importStatements) {
     const lines = [];
-    const varCounterContainer = { varCounter: 0 };
     (0, getConfigValueSourcesNotOverriden_js_1.getConfigValueSourcesNotOverriden)(pageConfig).forEach((configValueSource) => {
         if (!isEnvMatch(configValueSource.configEnv, checkWhetherIsImport(configValueSource), {
             isImport: true,
@@ -63,7 +62,7 @@ function getConfigValuesImported(pageConfig, isForClientSide, isClientRouting, i
         }))
             return;
         const whitespace = '  ';
-        lines.push(...(0, serializeConfigValue_js_1.serializeConfigValueImported)(configValueSource, configValueSource.configName, whitespace, varCounterContainer, importStatements));
+        lines.push(...(0, serializeConfigValue_js_1.serializeConfigValueImported)(configValueSource, configValueSource.configName, whitespace, importStatements));
     });
     const code = lines.join('\n');
     return code;

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

@@ -16,18 +16,17 @@ exports.getVirtualFilePageConfigs = getVirtualFilePageConfigs;
 function getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting) {
     const lines = [];
     const importStatements = [];
-    const varCounterContainer = { varCounter: 0 };
     lines.push('export const pageConfigsSerialized = [');
-    lines.push(getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements, varCounterContainer));
+    lines.push(getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements));
     lines.push('];');
     lines.push('export const pageConfigGlobalSerialized = {');
-    lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements, varCounterContainer));
+    lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements));
     lines.push('};');
     const code = [...importStatements, ...lines].join('\n');
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }
-function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements, varCounterContainer) {
+function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements) {
     const lines = [];
     pageConfigs.forEach((pageConfig) => {
         const { pageId, routeFilesystem, isErrorPage } = pageConfig;
@@ -39,7 +38,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
         lines.push(`    loadConfigValuesAll: () => import(${JSON.stringify(virtualFileIdPageConfigValuesAll)}),`);
         // Serialized config values
         lines.push(`    configValuesSerialized: {`);
-        lines.push((0, getConfigValuesSerialized_js_1.getConfigValuesSerialized)(pageConfig, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isEager: true })));
+        lines.push((0, getConfigValuesSerialized_js_1.getConfigValuesSerialized)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isEager: true })));
         lines.push(`    },`);
         // Imported config values
         const whitespace = '    ';
@@ -54,7 +53,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
                 return;
             if (!(0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configValueSource.configEnv, { isForClientSide, isClientRouting, isEager: true }))
                 return;
-            lines.push(...(0, serializeConfigValue_js_1.serializeConfigValueImported)(configValueSource, configName, whitespace, varCounterContainer, importStatements));
+            lines.push(...(0, serializeConfigValue_js_1.serializeConfigValueImported)(configValueSource, configName, whitespace, importStatements));
         });
         lines.push(`${whitespace}],`);
         lines.push(`  },`);
@@ -62,7 +61,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
     const code = lines.join('\n');
     return code;
 }
-function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements, varCounterContainer) {
+function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements) {
     const lines = [];
     /* Nothing (yet)
     lines.push(`  configValuesSerialized: {`)
@@ -85,7 +84,7 @@ function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, is
         const configValueSource = sources[0];
         (0, utils_js_1.assert)(configValueSource);
         const whitespace = '    ';
-        lines.push(...(0, serializeConfigValue_js_1.serializeConfigValueImported)(configValueSource, configName, whitespace, varCounterContainer, importStatements));
+        lines.push(...(0, serializeConfigValue_js_1.serializeConfigValueImported)(configValueSource, configName, whitespace, importStatements));
     });
     lines.push(`  ],`);
     const code = lines.join('\n');

package/dist/cjs/shared/page-configs/serialize/parseConfigValuesSerialized.js

@@ -8,7 +8,7 @@ function parseConfigValuesSerialized(configValuesSerialized) {
     Object.entries(configValuesSerialized).forEach(([configName, configValueSeriliazed]) => {
         (0, utils_js_1.assert)(!configValues[configName]);
         const { valueSerialized, ...common } = configValueSeriliazed;
-        const value = (0, parse_1.parse)(valueSerialized);
+        const value = (0, parse_1.parseTransform)(valueSerialized);
         let configValue;
         if (common.type === 'cumulative') {
             (0, utils_js_1.assert)((0, utils_js_1.isArray)(value));

package/dist/cjs/shared/page-configs/serialize/serializeConfigValue.js

@@ -8,7 +8,7 @@ exports.serializeConfigValueImported = exports.serializeConfigValue = void 0;
 const assertIsNotProductionRuntime_js_1 = require("../../../utils/assertIsNotProductionRuntime.js");
 (0, assertIsNotProductionRuntime_js_1.assertIsNotProductionRuntime)();
 const utils_js_1 = require("../../utils.js");
-const generateEagerImport_js_1 = require("../../../node/plugin/plugins/importUserCode/generateEagerImport.js");
+const addImportStatement_js_1 = require("../../../node/plugin/plugins/importUserCode/addImportStatement.js");
 function serializeConfigValue(lines, configName, configValueSerialized) {
     let whitespace = '      ';
     lines.push(`${whitespace}['${configName}']: {`);
@@ -21,7 +21,7 @@ function serializeConfigValue(lines, configName, configValueSerialized) {
     lines.push(`${whitespace}},`);
 }
 exports.serializeConfigValue = serializeConfigValue;
-function serializeConfigValueImported(configValueSource, configName, whitespace, varCounterContainer, importStatements) {
+function serializeConfigValueImported(configValueSource, configName, whitespace, importStatements) {
     (0, utils_js_1.assert)(!configValueSource.valueIsFilePath);
     (0, utils_js_1.assert)(whitespace.replaceAll(' ', '').length === 0);
     const { valueIsImportedAtRuntime, valueIsDefinedByValueFile, definedAtFilePath } = configValueSource;
@@ -29,8 +29,7 @@ function serializeConfigValueImported(configValueSource, configName, whitespace,
     const { filePathAbsoluteVite, fileExportName } = definedAtFilePath;
     if (valueIsDefinedByValueFile)
         (0, utils_js_1.assert)(fileExportName === undefined);
-    const { importName, importStatement } = (0, generateEagerImport_js_1.generateEagerImport)(filePathAbsoluteVite, varCounterContainer.varCounter++, fileExportName);
-    importStatements.push(importStatement);
+    const { importName } = (0, addImportStatement_js_1.addImportStatement)(importStatements, filePathAbsoluteVite, fileExportName || '*');
     const lines = [];
     lines.push(`  {`);
     lines.push(`    configName: '${configName}',`);

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.171-commit-42245b5';
+const PROJECT_VERSION = '0.4.171-commit-43aef47';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/node/plugin/plugins/importUserCode/addImportStatement.d.ts

@@ -0,0 +1,14 @@
+export { addImportStatement };
+/**
+ * Naming:
+ *   `import { someExport as someImport } from './some-file'`
+ * <=>
+ *   `{`
+ *      `importPath: './some-file',`
+ *      `exportName: 'someExport',`
+ *      `importName: 'someImport',`
+ *    `}`
+ */
+declare function addImportStatement(importStatements: string[], importPath: string, exportName: string): {
+    importName: string;
+};

package/dist/esm/node/plugin/plugins/importUserCode/{generateEagerImport.js → addImportStatement.js}

@@ -1,5 +1,4 @@
-export { generateEagerImport };
-let varCounterGlobal = 0;
+export { addImportStatement };
 /**
  * Naming:
  *   `import { someExport as someImport } from './some-file'`
@@ -9,14 +8,12 @@ let varCounterGlobal = 0;
  *      `exportName: 'someExport',`
  *      `importName: 'someImport',`
  *    `}`
- * We discard the information that the import variable is called `someImport` because we don't need it.
  */
-function generateEagerImport(importPath, varCounter, exportName) {
-    if (varCounter === undefined)
-        varCounter = varCounterGlobal++;
-    const importName = `import_${varCounter}`;
+function addImportStatement(importStatements, importPath, exportName) {
+    const importCounter = importStatements.length + 1;
+    const importName = `import${importCounter}`;
     const importLiteral = (() => {
-        if (!exportName || exportName === '*') {
+        if (exportName === '*') {
             return `* as ${importName}`;
         }
         if (exportName === 'default') {
@@ -25,5 +22,6 @@ function generateEagerImport(importPath, varCounter, exportName) {
         return `{ ${exportName} as ${importName} }`;
     })();
     const importStatement = `import ${importLiteral} from '${importPath}';`;
-    return { importName, importStatement };
+    importStatements.push(importStatement);
+    return { importName };
 }

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

@@ -1,5 +1,5 @@
 export { getConfigValuesSerialized };
 export { assertConfigValueIsSerializable };
 import type { ConfigEnvInternal, ConfigValueSource, DefinedAtData, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
-declare function getConfigValuesSerialized(pageConfig: PageConfigBuildTime, isEnvMatch: (configEnv: ConfigEnvInternal, configValueSource?: ConfigValueSource) => boolean): string;
+declare function getConfigValuesSerialized(pageConfig: PageConfigBuildTime, importStatements: string[], isEnvMatch: (configEnv: ConfigEnvInternal, configValueSource?: ConfigValueSource) => boolean): string;
 declare function assertConfigValueIsSerializable(value: unknown, configName: string, definedAtData: DefinedAtData): void;

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

@@ -6,7 +6,11 @@ import pc from '@brillout/picocolors';
 import { getConfigValueFilePathToShowToUser } from '../../../../../shared/page-configs/helpers.js';
 import { serializeConfigValue } from '../../../../../shared/page-configs/serialize/serializeConfigValue.js';
 import { getConfigValueSourcesNotOverriden } from '../../../shared/getConfigValueSourcesNotOverriden.js';
-function getConfigValuesSerialized(pageConfig, isEnvMatch) {
+import { parsePointerImportData } from './getVikeConfig/transformFileImports.js';
+import { addImportStatement } from '../addImportStatement.js';
+const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
+const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
+function getConfigValuesSerialized(pageConfig, importStatements, isEnvMatch) {
     const lines = [];
     Object.entries(pageConfig.configValuesComputed).forEach(([configName, configValuesComputed]) => {
         const { configEnv } = configValuesComputed;
@@ -19,7 +23,7 @@ function getConfigValuesSerialized(pageConfig, isEnvMatch) {
         assert(configValue);
         const { value, ...common } = configValue;
         assert(value === configValuesComputed.value);
-        const valueSerialized = getConfigValueSerialized(value, configName, configValue.definedAtData);
+        const valueSerialized = getConfigValueSerialized(value, configName, configValue.definedAtData, importStatements);
         const configValueSerialized = { valueSerialized, ...common };
         serializeConfigValue(lines, configName, configValueSerialized);
     });
@@ -32,7 +36,7 @@ function getConfigValuesSerialized(pageConfig, isEnvMatch) {
             return;
         }
         const { value, ...common } = configValue;
-        const valueSerialized = getConfigValueSerialized(value, configName, configValue.definedAtData);
+        const valueSerialized = getConfigValueSerialized(value, configName, configValue.definedAtData, importStatements);
         const configValueSerialized = { valueSerialized, ...common };
         serializeConfigValue(lines, configName, configValueSerialized);
     });
@@ -41,30 +45,51 @@ function getConfigValuesSerialized(pageConfig, isEnvMatch) {
 }
 function assertConfigValueIsSerializable(value, configName, definedAtData) {
     // Contains asserts
-    getConfigValueSerialized(value, configName, definedAtData);
+    getConfigValueSerialized(value, configName, definedAtData, []);
 }
-function getConfigValueSerialized(value, configName, definedAtData) {
+function getConfigValueSerialized(value, configName, definedAtData, importStatements) {
     const valueName = `config${getPropAccessNotation(configName)}`;
     let configValueSerialized;
     try {
-        configValueSerialized = stringify(value, { valueName, forbidReactElements: true });
+        configValueSerialized = stringify(value, {
+            valueName,
+            forbidReactElements: true,
+            replacer(_, value) {
+                if (typeof value === 'string') {
+                    const importData = parsePointerImportData(value);
+                    if (importData) {
+                        const { importName } = addImportStatement(importStatements, importData.importPath, importData.exportName);
+                        const replacement = [REPLACE_ME_BEFORE, importName, REPLACE_ME_AFTER].join('');
+                        return { replacement };
+                    }
+                }
+            }
+        });
     }
     catch (err) {
-        /*
-        let serializationErrMsg = ''
-        if (isJsonSerializerError(err)) {
-          serializationErrMsg = err.messageCore
-        } else {
-          // When a property getter throws an error
-          console.error('Serialization error:')
-          console.error(err)
-          serializationErrMsg = 'see serialization error printed above'
-        }
-        */
-        const configValueFilePathToShowToUser = getConfigValueFilePathToShowToUser(definedAtData);
-        assert(configValueFilePathToShowToUser);
-        assertUsage(false, `${pc.cyan(configName)} defined by ${configValueFilePathToShowToUser} must be defined over a so-called "pointer import", see https://vike.dev/config#pointer-imports`);
+        logJsonSerializeError(err, configName, definedAtData);
+        assert(false);
     }
-    configValueSerialized = JSON.stringify(configValueSerialized);
+    configValueSerialized = configValueSerialized.replaceAll(`"${REPLACE_ME_BEFORE}`, '');
+    configValueSerialized = configValueSerialized.replaceAll(`${REPLACE_ME_AFTER}"`, '');
+    assert(!configValueSerialized.includes(REPLACE_ME_BEFORE));
+    assert(!configValueSerialized.includes(REPLACE_ME_AFTER));
     return configValueSerialized;
 }
+function logJsonSerializeError(err, configName, definedAtData) {
+    /*
+    // import { isJsonSerializerError } from '@brillout/json-serializer/stringify'
+    let serializationErrMsg = ''
+    if (isJsonSerializerError(err)) {
+      serializationErrMsg = err.messageCore
+    } else {
+      // When a property getter throws an error
+      console.error('Serialization error:')
+      console.error(err)
+      serializationErrMsg = 'see serialization error printed above'
+    }
+    //*/
+    const configValueFilePathToShowToUser = getConfigValueFilePathToShowToUser(definedAtData);
+    assert(configValueFilePathToShowToUser);
+    assertUsage(false, `${pc.cyan(configName)} defined by ${configValueFilePathToShowToUser} must be defined over a so-called "pointer import", see https://vike.dev/config#pointer-imports`);
+}

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

@@ -2,25 +2,17 @@ export { resolvePointerImportOfConfig };
 export { resolvePointerImport };
 export { clearFilesEnvMap };
 import pc from '@brillout/picocolors';
-import { assert, assertIsNpmPackageImport, assertPosixPath, assertUsage, deepEqual, isObject, isPathFilesystemAbsolute, requireResolve } from '../../../../utils.js';
+import { assert, assertIsNpmPackageImport, assertPosixPath, assertUsage, deepEqual, isPathFilesystemAbsolute, requireResolve } from '../../../../utils.js';
 import { parsePointerImportData } from './transformFileImports.js';
 import path from 'path';
 import { getFilePathAbsoluteUserRootDir, getFilePathResolved, getFilePathUnresolved } from '../../../../shared/getFilePath.js';
 const filesEnvMap = new Map();
 function resolvePointerImportOfConfig(configValue, importerFilePath, userRootDir, configEnv, configName) {
-    const pointerImportData = typeof configValue === 'string' && parsePointerImportData(configValue);
-    if (!pointerImportData) {
-        // Temporary workaround to support document.title config.
-        // - We'll be able to remove that workaround once Vike supports custom nested configs (being able to define document.title and document.description as two different configs).
-        replaceStringValues(configValue, (str) => {
-            const pointerImportData = parsePointerImportData(str);
-            if (pointerImportData) {
-                const filePath = resolvePointerImport(pointerImportData, importerFilePath, userRootDir);
-                return filePath.filePathAbsoluteVite;
-            }
-        });
+    if (typeof configValue !== 'string')
+        return null;
+    const pointerImportData = parsePointerImportData(configValue);
+    if (!pointerImportData)
         return null;
-    }
     const { importPath, exportName } = pointerImportData;
     const filePath = resolvePointerImport(pointerImportData, importerFilePath, userRootDir);
     const fileExportPathToShowToUser = exportName === 'default' || exportName === configName ? [] : [exportName];
@@ -129,29 +121,3 @@ function assertFileEnv(filePathAbsoluteFilesystem, importPath, configEnv, config
 function clearFilesEnvMap() {
     filesEnvMap.clear();
 }
-function replaceStringValues(obj, replacer) {
-    const visited = new WeakSet();
-    return traverse(obj, replacer);
-    function traverse(obj, replacer) {
-        // Check if the input is an object
-        if (isObject(obj)) {
-            if (visited.has(obj))
-                return;
-            visited.add(obj);
-            for (const key in obj) {
-                if (!obj.hasOwnProperty(key))
-                    continue;
-                const val = obj[key];
-                if (typeof val !== 'string') {
-                    traverse(val, replacer);
-                }
-                else {
-                    const replacement = replacer(val);
-                    if (replacement) {
-                        obj[key] = replacement;
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -37,7 +37,7 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
     lines.push(getConfigValuesImported(pageConfig, isForClientSide, isClientRouting, importStatements));
     lines.push('];');
     lines.push('export const configValuesSerialized = {');
-    lines.push(getConfigValuesSerialized(pageConfig, (configEnv, configValueSource) => isEnvMatch(configEnv, !configValueSource ? false : checkWhetherIsImport(configValueSource), {
+    lines.push(getConfigValuesSerialized(pageConfig, importStatements, (configEnv, configValueSource) => isEnvMatch(configEnv, !configValueSource ? false : checkWhetherIsImport(configValueSource), {
         isImport: false,
         isForClientSide,
         isClientRouting
@@ -51,7 +51,6 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
 }
 function getConfigValuesImported(pageConfig, isForClientSide, isClientRouting, importStatements) {
     const lines = [];
-    const varCounterContainer = { varCounter: 0 };
     getConfigValueSourcesNotOverriden(pageConfig).forEach((configValueSource) => {
         if (!isEnvMatch(configValueSource.configEnv, checkWhetherIsImport(configValueSource), {
             isImport: true,
@@ -60,7 +59,7 @@ function getConfigValuesImported(pageConfig, isForClientSide, isClientRouting, i
         }))
             return;
         const whitespace = '  ';
-        lines.push(...serializeConfigValueImported(configValueSource, configValueSource.configName, whitespace, varCounterContainer, importStatements));
+        lines.push(...serializeConfigValueImported(configValueSource, configValueSource.configName, whitespace, importStatements));
     });
     const code = lines.join('\n');
     return code;

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

@@ -13,18 +13,17 @@ async function getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRou
 function getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting) {
     const lines = [];
     const importStatements = [];
-    const varCounterContainer = { varCounter: 0 };
     lines.push('export const pageConfigsSerialized = [');
-    lines.push(getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements, varCounterContainer));
+    lines.push(getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements));
     lines.push('];');
     lines.push('export const pageConfigGlobalSerialized = {');
-    lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements, varCounterContainer));
+    lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements));
     lines.push('};');
     const code = [...importStatements, ...lines].join('\n');
     debug(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }
-function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements, varCounterContainer) {
+function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements) {
     const lines = [];
     pageConfigs.forEach((pageConfig) => {
         const { pageId, routeFilesystem, isErrorPage } = pageConfig;
@@ -36,7 +35,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
         lines.push(`    loadConfigValuesAll: () => import(${JSON.stringify(virtualFileIdPageConfigValuesAll)}),`);
         // Serialized config values
         lines.push(`    configValuesSerialized: {`);
-        lines.push(getConfigValuesSerialized(pageConfig, (configEnv) => isRuntimeEnvMatch(configEnv, { isForClientSide, isClientRouting, isEager: true })));
+        lines.push(getConfigValuesSerialized(pageConfig, importStatements, (configEnv) => isRuntimeEnvMatch(configEnv, { isForClientSide, isClientRouting, isEager: true })));
         lines.push(`    },`);
         // Imported config values
         const whitespace = '    ';
@@ -51,7 +50,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
                 return;
             if (!isRuntimeEnvMatch(configValueSource.configEnv, { isForClientSide, isClientRouting, isEager: true }))
                 return;
-            lines.push(...serializeConfigValueImported(configValueSource, configName, whitespace, varCounterContainer, importStatements));
+            lines.push(...serializeConfigValueImported(configValueSource, configName, whitespace, importStatements));
         });
         lines.push(`${whitespace}],`);
         lines.push(`  },`);
@@ -59,7 +58,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
     const code = lines.join('\n');
     return code;
 }
-function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements, varCounterContainer) {
+function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements) {
     const lines = [];
     /* Nothing (yet)
     lines.push(`  configValuesSerialized: {`)
@@ -82,7 +81,7 @@ function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, is
         const configValueSource = sources[0];
         assert(configValueSource);
         const whitespace = '    ';
-        lines.push(...serializeConfigValueImported(configValueSource, configName, whitespace, varCounterContainer, importStatements));
+        lines.push(...serializeConfigValueImported(configValueSource, configName, whitespace, importStatements));
     });
     lines.push(`  ],`);
     const code = lines.join('\n');

package/dist/esm/shared/page-configs/serialize/parseConfigValuesSerialized.js

@@ -1,12 +1,12 @@
 export { parseConfigValuesSerialized };
 import { assert, isArray } from '../../utils.js';
-import { parse } from '@brillout/json-serializer/parse';
+import { parseTransform } from '@brillout/json-serializer/parse';
 function parseConfigValuesSerialized(configValuesSerialized) {
     const configValues = {};
     Object.entries(configValuesSerialized).forEach(([configName, configValueSeriliazed]) => {
         assert(!configValues[configName]);
         const { valueSerialized, ...common } = configValueSeriliazed;
-        const value = parse(valueSerialized);
+        const value = parseTransform(valueSerialized);
         let configValue;
         if (common.type === 'cumulative') {
             assert(isArray(value));

package/dist/esm/shared/page-configs/serialize/serializeConfigValue.d.ts

@@ -3,6 +3,4 @@ export { serializeConfigValueImported };
 import { ConfigValueSource } from '../PageConfig.js';
 import { ConfigValueSerialized } from './PageConfigSerialized.js';
 declare function serializeConfigValue(lines: string[], configName: string, configValueSerialized: ConfigValueSerialized): void;
-declare function serializeConfigValueImported(configValueSource: ConfigValueSource, configName: string, whitespace: string, varCounterContainer: {
-    varCounter: number;
-}, importStatements: string[]): string[];
+declare function serializeConfigValueImported(configValueSource: ConfigValueSource, configName: string, whitespace: string, importStatements: string[]): string[];

package/dist/esm/shared/page-configs/serialize/serializeConfigValue.js

@@ -7,7 +7,7 @@ export { serializeConfigValueImported };
 import { assertIsNotProductionRuntime } from '../../../utils/assertIsNotProductionRuntime.js';
 assertIsNotProductionRuntime();
 import { assert } from '../../utils.js';
-import { generateEagerImport } from '../../../node/plugin/plugins/importUserCode/generateEagerImport.js';
+import { addImportStatement } from '../../../node/plugin/plugins/importUserCode/addImportStatement.js';
 function serializeConfigValue(lines, configName, configValueSerialized) {
     let whitespace = '      ';
     lines.push(`${whitespace}['${configName}']: {`);
@@ -19,7 +19,7 @@ function serializeConfigValue(lines, configName, configValueSerialized) {
     whitespace = whitespace.slice(2);
     lines.push(`${whitespace}},`);
 }
-function serializeConfigValueImported(configValueSource, configName, whitespace, varCounterContainer, importStatements) {
+function serializeConfigValueImported(configValueSource, configName, whitespace, importStatements) {
     assert(!configValueSource.valueIsFilePath);
     assert(whitespace.replaceAll(' ', '').length === 0);
     const { valueIsImportedAtRuntime, valueIsDefinedByValueFile, definedAtFilePath } = configValueSource;
@@ -27,8 +27,7 @@ function serializeConfigValueImported(configValueSource, configName, whitespace,
     const { filePathAbsoluteVite, fileExportName } = definedAtFilePath;
     if (valueIsDefinedByValueFile)
         assert(fileExportName === undefined);
-    const { importName, importStatement } = generateEagerImport(filePathAbsoluteVite, varCounterContainer.varCounter++, fileExportName);
-    importStatements.push(importStatement);
+    const { importName } = addImportStatement(importStatements, filePathAbsoluteVite, fileExportName || '*');
     const lines = [];
     lines.push(`  {`);
     lines.push(`    configName: '${configName}',`);

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.171-commit-42245b5";
+declare const PROJECT_VERSION: "0.4.171-commit-43aef47";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.171-commit-42245b5";
+    projectVersion: "0.4.171-commit-43aef47";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.171-commit-42245b5';
+const PROJECT_VERSION = '0.4.171-commit-43aef47';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.171-commit-42245b5",
+  "version": "0.4.171-commit-43aef47",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@brillout/import": "^0.2.3",
-    "@brillout/json-serializer": "^0.5.8",
+    "@brillout/json-serializer": "^0.5.10",
     "@brillout/picocolors": "^1.0.10",
     "@brillout/require-shim": "^0.1.2",
     "@brillout/vite-plugin-server-entry": "^0.4.5",
@@ -195,23 +195,23 @@
     "@brillout/import": "^0.2.3",
     "@brillout/json-serializer": "^0.5.8",
     "@brillout/picocolors": "^1.0.10",
+    "@brillout/release-me": "^0.3.7",
     "@brillout/require-shim": "^0.1.2",
     "@brillout/vite-plugin-server-entry": "^0.4.0",
-    "acorn": "^8.11.2",
-    "cac": "^6.7.14",
-    "es-module-lexer": "^1.4.1",
-    "esbuild": "^0.19.10",
-    "fast-glob": "^3.3.2",
-    "sirv": "^2.0.4",
-    "source-map-support": "^0.5.21",
-    "@brillout/release-me": "^0.3.7",
     "@types/estree": "^1.0.5",
     "@types/jest": "^29.5.11",
     "@types/node": "^20.10.5",
     "@types/resolve": "^1.20.6",
     "@types/source-map-support": "^0.5.10",
+    "acorn": "^8.11.2",
+    "cac": "^6.7.14",
+    "es-module-lexer": "^1.4.1",
+    "esbuild": "^0.19.10",
+    "fast-glob": "^3.3.2",
     "react-streaming": "^0.3.24",
     "rimraf": "^5.0.5",
+    "sirv": "^2.0.4",
+    "source-map-support": "^0.5.21",
     "typescript": "^5.3.3",
     "vite": "npm:@brillout/vite@5.1.0-commit-3dc7abd"
   },

package/dist/esm/node/plugin/plugins/importUserCode/generateEagerImport.d.ts

@@ -1,16 +0,0 @@
-export { generateEagerImport };
-/**
- * Naming:
- *   `import { someExport as someImport } from './some-file'`
- * <=>
- *   `{`
- *      `importPath: './some-file',`
- *      `exportName: 'someExport',`
- *      `importName: 'someImport',`
- *    `}`
- * We discard the information that the import variable is called `someImport` because we don't need it.
- */
-declare function generateEagerImport(importPath: string, varCounter?: number, exportName?: string): {
-    importName: string;
-    importStatement: string;
-};