vike 0.4.220-commit-5c7810f → 0.4.220-commit-af5c91f

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

@@ -1,8 +1,7 @@
 export { serializeConfigValues };
 export { getConfigValuesBase };
 import { assertIsNotProductionRuntime } from '../../../utils/assertSetup.js';
-import { assert, assertUsage, getPropAccessNotation } from '../../../node/plugin/utils.js';
-import { addImportStatement } from '../../../node/plugin/plugins/importUserCode/addImportStatement.js';
+import { assert, assertPosixPath, assertUsage, deepEqual, getPropAccessNotation } from '../../../node/plugin/utils.js';
 import { parsePointerImportData } from '../../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transformPointerImports.js';
 import { getConfigValueFilePathToShowToUser } from '../helpers.js';
 import { stringify } from '@brillout/json-serializer/stringify';
@@ -13,20 +12,20 @@ const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
 // - vike/shared/page-configs/serialize/parsePageConfigs.ts
 // - parsePageConfigs() is loaded on both the client- and server-side.
 assertIsNotProductionRuntime();
-function serializeConfigValues(pageConfig, importStatements, isEnvMatch, tabspace, isEager) {
+function serializeConfigValues(pageConfig, importStatements, filesEnv, isEnvMatch, tabspace, isEager) {
     const lines = [];
     tabspace += '  ';
     getConfigValuesBase(pageConfig, isEnvMatch, isEager).forEach((entry) => {
         if (entry.configValueBase.type === 'computed') {
             assert('value' in entry); // Help TS
-            const { configValueBase, value, configName } = entry;
-            const valueData = getValueSerializedWithJson(value, configName, configValueBase.definedAtData, importStatements);
+            const { configValueBase, value, configName, configEnv } = entry;
+            const valueData = getValueSerializedWithJson(value, configName, configValueBase.definedAtData, importStatements, filesEnv, configEnv);
             serializeConfigValue(configValueBase, valueData, configName, lines, tabspace);
         }
         if (entry.configValueBase.type === 'standard') {
             assert('sourceRelevant' in entry); // Help TS
             const { configValueBase, sourceRelevant, configName } = entry;
-            const valueData = getValueSerializedFromSource(sourceRelevant, configName, importStatements);
+            const valueData = getValueSerializedFromSource(sourceRelevant, configName, importStatements, filesEnv);
             serializeConfigValue(configValueBase, valueData, configName, lines, tabspace);
         }
         if (entry.configValueBase.type === 'cumulative') {
@@ -34,7 +33,7 @@ function serializeConfigValues(pageConfig, importStatements, isEnvMatch, tabspac
             const { configValueBase, sourcesRelevant, configName } = entry;
             const valueDataList = [];
             sourcesRelevant.forEach((source) => {
-                const valueData = getValueSerializedFromSource(source, configName, importStatements);
+                const valueData = getValueSerializedFromSource(source, configName, importStatements, filesEnv);
                 valueDataList.push(valueData);
             });
             serializeConfigValue(configValueBase, valueDataList, configName, lines, tabspace);
@@ -42,14 +41,14 @@ function serializeConfigValues(pageConfig, importStatements, isEnvMatch, tabspac
     });
     return lines;
 }
-function getValueSerializedFromSource(configValueSource, configName, importStatements) {
+function getValueSerializedFromSource(configValueSource, configName, importStatements, filesEnv) {
     assert(configValueSource.isOverriden === false);
     let valueData;
     if ('value' in configValueSource) {
-        valueData = getValueSerializedWithJson(configValueSource.value, configName, configValueSource.definedAtFilePath, importStatements);
+        valueData = getValueSerializedWithJson(configValueSource.value, configName, configValueSource.definedAtFilePath, importStatements, filesEnv, configValueSource.configEnv);
     }
     else {
-        valueData = getValueSerializedWithImport(configValueSource, importStatements);
+        valueData = getValueSerializedWithImport(configValueSource, importStatements, filesEnv, configName);
     }
     return valueData;
 }
@@ -95,27 +94,27 @@ function serializeConfigValue(configValueBase, valueData, configName, lines, tab
         tabspace = tabspace.slice(2);
     }
 }
-function getValueSerializedWithImport(configValueSource, importStatements) {
+function getValueSerializedWithImport(configValueSource, importStatements, filesEnv, configName) {
     assert(!configValueSource.valueIsFilePath);
-    const { valueIsImportedAtRuntime, valueIsDefinedByPlusFile, definedAtFilePath } = configValueSource;
+    const { valueIsImportedAtRuntime, valueIsDefinedByPlusFile, definedAtFilePath, configEnv } = configValueSource;
     assert(valueIsImportedAtRuntime);
     const { filePathAbsoluteVite, fileExportName } = definedAtFilePath;
     if (valueIsDefinedByPlusFile)
         assert(fileExportName === undefined);
-    const { importName } = addImportStatement(importStatements, filePathAbsoluteVite, fileExportName || '*');
+    const { importName } = addImportStatement(importStatements, filePathAbsoluteVite, fileExportName || '*', filesEnv, configEnv, configName);
     return {
         type: valueIsDefinedByPlusFile ? 'plus-file' : 'pointer-import',
         valueAsJsCode: importName
     };
 }
-function getValueSerializedWithJson(value, configName, definedAtData, importStatements) {
-    const valueAsJsCode = valueToJson(value, configName, definedAtData, importStatements);
+function getValueSerializedWithJson(value, configName, definedAtData, importStatements, filesEnv, configEnv) {
+    const valueAsJsCode = valueToJson(value, configName, definedAtData, importStatements, filesEnv, configEnv);
     return {
         type: 'js-serialized',
         valueAsJsCode
     };
 }
-function valueToJson(value, configName, definedAtData, importStatements) {
+function valueToJson(value, configName, definedAtData, importStatements, filesEnv, configEnv) {
     const valueName = `config${getPropAccessNotation(configName)}`;
     let configValueSerialized;
     try {
@@ -130,7 +129,7 @@ function valueToJson(value, configName, definedAtData, importStatements) {
                 if (typeof value === 'string') {
                     const importData = parsePointerImportData(value);
                     if (importData) {
-                        const { importName } = addImportStatement(importStatements, importData.importPath, importData.exportName);
+                        const { importName } = addImportStatement(importStatements, importData.importPath, importData.exportName, filesEnv, configEnv, configName);
                         const replacement = [REPLACE_ME_BEFORE, importName, REPLACE_ME_AFTER].join('');
                         return { replacement };
                     }
@@ -167,7 +166,8 @@ function logJsonSerializeError(err, configName, definedAtData) {
 }
 function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
     const fromComputed = Object.entries(pageConfig.configValuesComputed ?? {}).map(([configName, valueInfo]) => {
-        if (!isEnvMatch(valueInfo.configEnv))
+        const { configEnv, value } = valueInfo;
+        if (!isEnvMatch(configEnv))
             return 'SKIP';
         // Is there a use case for overriding computed values? If yes, then configValeSources has higher precedence
         if (pageConfig.configValueSources[configName])
@@ -176,7 +176,7 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
             type: 'computed',
             definedAtData: null
         };
-        return { configValueBase, value: valueInfo.value, configName };
+        return { configValueBase, value, configName, configEnv };
     });
     const fromSources = Object.entries(pageConfig.configValueSources).map(([configName, sources]) => {
         const configDef = pageConfig.configDefinitions[configName];
@@ -221,3 +221,54 @@ function getDefinedAtFileSource(source) {
     };
     return definedAtFile;
 }
+/*
+ * Naming:
+ *   `import { someExport as someImport } from './some-file'`
+ * <=>
+ *   `{`
+ *      `importPath: './some-file',`
+ *      `exportName: 'someExport',`
+ *      `importName: 'someImport',`
+ *    `}`
+ */
+function addImportStatement(importStatements, importPath, exportName, filesEnv, configEnv, configName) {
+    const importCounter = importStatements.length + 1;
+    const importName = `import${importCounter}`;
+    const importLiteral = (() => {
+        if (exportName === '*') {
+            return `* as ${importName}`;
+        }
+        if (exportName === 'default') {
+            return importName;
+        }
+        return `{ ${exportName} as ${importName} }`;
+    })();
+    const importStatement = `import ${importLiteral} from '${importPath}';`;
+    importStatements.push(importStatement);
+    assertFileEnv(importPath, configEnv, configName, filesEnv);
+    return { importName };
+}
+function assertFileEnv(importPath, configEnv, configName, filesEnv) {
+    const key = importPath;
+    assert(key);
+    assertPosixPath(key);
+    assert(!isRelativeImportPath(key));
+    if (!filesEnv.has(key)) {
+        filesEnv.set(key, []);
+    }
+    const fileEnvs = filesEnv.get(key);
+    const fileEnvNew = { configEnv, configName };
+    fileEnvs.push(fileEnvNew);
+    const fileEnvDiff = fileEnvs.filter((c) => !deepEqual(c.configEnv, configEnv))[0];
+    if (fileEnvDiff) {
+        assertUsage(false, [
+            `${importPath} defines the value of configs living in different environments:`,
+            ...[fileEnvDiff, fileEnvNew].map((c) => `  - config ${pc.code(c.configName)} which value lives in environment ${pc.code(JSON.stringify(c.configEnv))}`),
+            'Defining config values in the same file is allowed only if they live in the same environment, see https://vike.dev/config#pointer-imports'
+        ].join('\n'));
+    }
+}
+// TODO/now dedupe
+function isRelativeImportPath(importPath) {
+    return importPath.startsWith('./') || importPath.startsWith('../');
+}

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

@@ -12,7 +12,6 @@ export * from '../utils/isPlainObject.js';
 export * from '../utils/compareString.js';
 export * from '../utils/isNotNullish.js';
 export * from '../utils/stringifyStringArray.js';
-export * from '../utils/toPosixPath.js';
 export * from '../utils/cast.js';
 export * from '../utils/isPropertyGetter.js';
 export * from '../utils/isPromise.js';

package/dist/esm/shared/utils.js

@@ -16,7 +16,6 @@ export * from '../utils/isPlainObject.js';
 export * from '../utils/compareString.js';
 export * from '../utils/isNotNullish.js';
 export * from '../utils/stringifyStringArray.js';
-export * from '../utils/toPosixPath.js';
 export * from '../utils/cast.js';
 export * from '../utils/isPropertyGetter.js';
 export * from '../utils/isPromise.js';

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.220-commit-5c7810f";
+export declare const PROJECT_VERSION: "0.4.220-commit-af5c91f";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.220-commit-5c7810f';
+export const PROJECT_VERSION = '0.4.220-commit-af5c91f';

package/dist/esm/utils/findFile.js

@@ -2,7 +2,7 @@ export { findFile };
 import path from 'path';
 import fs from 'fs';
 import { isArray } from './isArray.js';
-import { assertPosixPath } from './toPosixPath.js';
+import { assertPosixPath } from './path.js';
 function findFile(arg, cwd) {
     assertPosixPath(cwd);
     const filenames = isArray(arg) ? arg : [arg];

package/dist/esm/utils/isDev.js

@@ -1,14 +1,11 @@
 export { isDevCheck };
 export { applyDev };
 export { applyPreview };
-import { assert } from './assert.js';
-import { version } from 'vite';
+import { assertUsage } from './assert.js';
 function isDevCheck(configEnv) {
     const { isPreview, command } = configEnv;
-    // Released at vite@5.1.0 which is guaranteed with `assertVersion('Vite', version, '5.1.0')`
-    // - Release: https://github.com/vitejs/vite/blob/6f7466e6211027686f40ad7e4ce6ec8477414546/packages/vite/CHANGELOG.md#510-beta4-2024-01-26:~:text=fix(preview)%3A-,set%20isPreview%20true,-(%2315695)%20(93fce55
-    // - Surprisingly, this assert() can fail: https://github.com/vikejs/vike/issues/2135
-    assert(typeof isPreview === 'boolean', { isPreview, version });
+    // `assertVersion('Vite', version, '5.1.0')` isn't enough: https://github.com/vitejs/vite/pull/19355
+    assertUsage(typeof isPreview === 'boolean', 'You are using an old Vite version; make sure to use Vite 5.1.0 or above.');
     return command === 'serve' && !isPreview;
 }
 function applyDev(_, env) {

package/dist/esm/utils/isFilePathAbsoluteFilesystem.js

@@ -2,7 +2,7 @@ export { assertFilePathAbsoluteFilesystem };
 export { isFilePathAbsolute };
 import path from 'path';
 import { assert } from './assert.js';
-import { assertPosixPath } from './toPosixPath.js';
+import { assertPosixPath } from './path.js';
 /**
  * Asserts that `filePath` is an absolute file path starting from the filesystem root.
  *

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

@@ -0,0 +1,14 @@
+export { pathJoin };
+export { pathIsRelative };
+export { toPosixPath };
+export { assertPosixPath };
+/**********************/
+/****** SHIMS *********/
+/**********************/
+declare function pathJoin(path1: string, path2: string): string;
+/**********************/
+/****** UTILS *********/
+/**********************/
+declare function toPosixPath(path: string): string;
+declare function assertPosixPath(path: string): void;
+declare function pathIsRelative(importPath: string): boolean;

package/dist/esm/utils/path.js

@@ -0,0 +1,46 @@
+export { pathJoin };
+export { pathIsRelative };
+export { toPosixPath };
+export { assertPosixPath };
+// Utilites for handling file paths.
+// - Shims `import * from "node:path"` for server runtime.
+//   - Robust shim reference: https://github.com/unjs/pathe
+import { assert } from './assert.js';
+import { assertIsNotBrowser } from './assertIsNotBrowser.js';
+assertIsNotBrowser();
+/**********************/
+/****** SHIMS *********/
+/**********************/
+function pathJoin(path1, path2) {
+    assert(!path1.includes('\\'));
+    assert(!path2.includes('\\'));
+    let joined = [...path1.split('/'), ...path2.split('/')].filter(Boolean).join('/');
+    if (path1.startsWith('/'))
+        joined = '/' + joined;
+    return joined;
+}
+/* https://github.com/brillout/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
+const IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/
+function pathIsAbsolute(filePath: string) {
+  return IS_ABSOLUTE_RE.test(filePath)
+}
+//*/
+/**********************/
+/****** UTILS *********/
+/**********************/
+function toPosixPath(path) {
+    const pathPosix = path.split('\\').join('/');
+    assertPosixPath(pathPosix);
+    return pathPosix;
+}
+function assertPosixPath(path) {
+    const errMsg = (msg) => `Not a posix path: ${msg}`;
+    assert(path !== null, errMsg('null'));
+    assert(typeof path === 'string', errMsg(`typeof path === ${JSON.stringify(typeof path)}`));
+    assert(path !== '', errMsg('(empty string)'));
+    assert(path);
+    assert(!path.includes('\\'), errMsg(path));
+}
+function pathIsRelative(importPath) {
+    return importPath.startsWith('./') || importPath.startsWith('../');
+}

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.220-commit-5c7810f";
+    projectVersion: "0.4.220-commit-af5c91f";
 };

package/dist/esm/utils/requireResolve.js

@@ -2,7 +2,7 @@ export { requireResolve };
 import { assert } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 import { assertIsNotProductionRuntime } from './assertSetup.js';
-import { assertPosixPath, toPosixPath } from './toPosixPath.js';
+import { assertPosixPath, toPosixPath } from './path.js';
 import { scriptFileExtensionList } from './isScriptFile.js';
 import { createRequire } from 'module';
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.220-commit-5c7810f",
+  "version": "0.4.220-commit-af5c91f",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {

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

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addImportStatement = addImportStatement;
-/**
- * Naming:
- *   `import { someExport as someImport } from './some-file'`
- * <=>
- *   `{`
- *      `importPath: './some-file',`
- *      `exportName: 'someExport',`
- *      `importName: 'someImport',`
- *    `}`
- */
-function addImportStatement(importStatements, importPath, exportName) {
-    const importCounter = importStatements.length + 1;
-    const importName = `import${importCounter}`;
-    const importLiteral = (() => {
-        if (exportName === '*') {
-            return `* as ${importName}`;
-        }
-        if (exportName === 'default') {
-            return importName;
-        }
-        return `{ ${exportName} as ${importName} }`;
-    })();
-    const importStatement = `import ${importLiteral} from '${importPath}';`;
-    importStatements.push(importStatement);
-    return { importName };
-}

package/dist/cjs/shared/assertPageFilePath.js

@@ -1,11 +0,0 @@
-"use strict";
-// TODO/v1-release: remove
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertPageFilePath = assertPageFilePath;
-const utils_js_1 = require("./utils.js");
-function assertPageFilePath(filePath) {
-    (0, utils_js_1.assertPosixPath)(filePath);
-    /* This assert() is skipped to reduce client-side bundle size
-    assert(filePath.startsWith('/') || isNpmPackageImport(filePath), { filePath })
-    */
-}

package/dist/cjs/utils/path-shim.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pathJoin = pathJoin;
-// Simple shim for `import * from "node:path"` used by the server runtime.
-// Robust alternative: https://github.com/unjs/pathe
-const assert_js_1 = require("./assert.js");
-function pathJoin(path1, path2) {
-    (0, assert_js_1.assert)(!path1.includes('\\'));
-    (0, assert_js_1.assert)(!path2.includes('\\'));
-    let joined = [...path1.split('/'), ...path2.split('/')].filter(Boolean).join('/');
-    if (path1.startsWith('/'))
-        joined = '/' + joined;
-    return joined;
-}
-/* https://github.com/brillout/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
-function isAbsolute(filePath: string) {
-  // ...
-}
-*/

package/dist/cjs/utils/toPosixPath.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.toPosixPath = toPosixPath;
-exports.assertPosixPath = assertPosixPath;
-const assert_js_1 = require("./assert.js");
-function toPosixPath(path) {
-    const pathPosix = path.split('\\').join('/');
-    assertPosixPath(pathPosix);
-    return pathPosix;
-}
-function assertPosixPath(path) {
-    const errMsg = (msg) => `Not a posix path: ${msg}`;
-    (0, assert_js_1.assert)(path !== null, errMsg('null'));
-    (0, assert_js_1.assert)(typeof path === 'string', errMsg(`typeof path === ${JSON.stringify(typeof path)}`));
-    (0, assert_js_1.assert)(path !== '', errMsg('(empty string)'));
-    (0, assert_js_1.assert)(path);
-    (0, assert_js_1.assert)(!path.includes('\\'), errMsg(path));
-}

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

@@ -1,14 +0,0 @@
-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/addImportStatement.js

@@ -1,27 +0,0 @@
-export { addImportStatement };
-/**
- * Naming:
- *   `import { someExport as someImport } from './some-file'`
- * <=>
- *   `{`
- *      `importPath: './some-file',`
- *      `exportName: 'someExport',`
- *      `importName: 'someImport',`
- *    `}`
- */
-function addImportStatement(importStatements, importPath, exportName) {
-    const importCounter = importStatements.length + 1;
-    const importName = `import${importCounter}`;
-    const importLiteral = (() => {
-        if (exportName === '*') {
-            return `* as ${importName}`;
-        }
-        if (exportName === 'default') {
-            return importName;
-        }
-        return `{ ${exportName} as ${importName} }`;
-    })();
-    const importStatement = `import ${importLiteral} from '${importPath}';`;
-    importStatements.push(importStatement);
-    return { importName };
-}

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

@@ -1,2 +0,0 @@
-export { assertPageFilePath };
-declare function assertPageFilePath(filePath: string): void;

package/dist/esm/shared/assertPageFilePath.js

@@ -1,9 +0,0 @@
-// TODO/v1-release: remove
-export { assertPageFilePath };
-import { assertPosixPath } from './utils.js';
-function assertPageFilePath(filePath) {
-    assertPosixPath(filePath);
-    /* This assert() is skipped to reduce client-side bundle size
-    assert(filePath.startsWith('/') || isNpmPackageImport(filePath), { filePath })
-    */
-}

package/dist/esm/utils/path-shim.d.ts

@@ -1,2 +0,0 @@
-export { pathJoin };
-declare function pathJoin(path1: string, path2: string): string;

package/dist/esm/utils/path-shim.js

@@ -1,17 +0,0 @@
-export { pathJoin };
-// Simple shim for `import * from "node:path"` used by the server runtime.
-// Robust alternative: https://github.com/unjs/pathe
-import { assert } from './assert.js';
-function pathJoin(path1, path2) {
-    assert(!path1.includes('\\'));
-    assert(!path2.includes('\\'));
-    let joined = [...path1.split('/'), ...path2.split('/')].filter(Boolean).join('/');
-    if (path1.startsWith('/'))
-        joined = '/' + joined;
-    return joined;
-}
-/* https://github.com/brillout/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
-function isAbsolute(filePath: string) {
-  // ...
-}
-*/

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

@@ -1,4 +0,0 @@
-export { toPosixPath };
-export { assertPosixPath };
-declare function toPosixPath(path: string): string;
-declare function assertPosixPath(path: string): void;

package/dist/esm/utils/toPosixPath.js

@@ -1,16 +0,0 @@
-export { toPosixPath };
-export { assertPosixPath };
-import { assert } from './assert.js';
-function toPosixPath(path) {
-    const pathPosix = path.split('\\').join('/');
-    assertPosixPath(pathPosix);
-    return pathPosix;
-}
-function assertPosixPath(path) {
-    const errMsg = (msg) => `Not a posix path: ${msg}`;
-    assert(path !== null, errMsg('null'));
-    assert(typeof path === 'string', errMsg(`typeof path === ${JSON.stringify(typeof path)}`));
-    assert(path !== '', errMsg('(empty string)'));
-    assert(path);
-    assert(!path.includes('\\'), errMsg(path));
-}