vike 0.4.162-commit-8995471 → 0.4.162-commit-421de1c

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

@@ -14,16 +14,18 @@ const assertResolveAlias_js_1 = require("./commonConfig/assertResolveAlias.js");
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
+const pluginName = 'vike:commonConfig-1';
 function commonConfig() {
     return [
         {
-            name: 'vike-commonConfig-1',
+            name: pluginName,
             configResolved(config) {
+                assertSingleInstance(config);
                 (0, require_shim_1.installRequireShim_setUserRootDir)(config.root);
             }
         },
         {
-            name: 'vike-.commonConfig-2',
+            name: 'vike:commonConfig-2',
             enforce: 'post',
             configResolved: {
                 order: 'post',
@@ -81,3 +83,7 @@ function assertEsm(userViteRoot) {
     dir = picocolors_1.default.dim(dir);
     (0, utils_js_1.assertWarning)(packageJson.type === 'module', `We recommend setting ${dir}package.json#type to "module", see https://vike.dev/CJS`, { onlyOnce: true });
 }
+function assertSingleInstance(config) {
+    const numberOfInstances = config.plugins.filter((o) => o.name === pluginName).length;
+    (0, utils_js_1.assertUsage)(numberOfInstances === 1, `Vike's Vite plugin (${picocolors_1.default.cyan("import vike from 'vike/plugin'")}) is being added ${numberOfInstances} times to the list of Vite plugins. Make sure to add it only once instead.`);
+}

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

@@ -474,7 +474,8 @@ function warnOverridenConfigValues(interfaceFileWinner, interfaceFilesOverriden,
     interfaceFilesOverriden.forEach((interfaceFileLoser) => {
         const loserFilePath = interfaceFileLoser.filePath.filePathToShowToUser;
         const winnerFilePath = interfaceFileWinner.filePath.filePathToShowToUser;
-        (0, utils_js_1.assertWarning)(false, `Config ${configName} defined at ${loserFilePath} is always overwritten by ${configName} defined at ${winnerFilePath}, remove the superfluous ${configName} value defined at ${interfaceFileLoser}`, { onlyOnce: false });
+        const confName = picocolors_1.default.cyan(configName);
+        (0, utils_js_1.assertWarning)(false, `The value of the config ${confName} defined at ${loserFilePath} is always overwritten by the value defined at ${winnerFilePath}, remove the superfluous value defined at ${loserFilePath}`, { onlyOnce: true });
     });
 }
 function isInterfaceFileUserLand(interfaceFile) {
@@ -515,6 +516,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
             valueIsFilePath: true,
             configEnv,
             valueIsImportedAtRuntime: true,
+            valueIsDefinedByValueFile: false,
             definedAt
         };
         return configValueSource;
@@ -530,6 +532,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
                 locationId,
                 configEnv,
                 valueIsImportedAtRuntime: true,
+                valueIsDefinedByValueFile: false,
                 definedAt: import_
             };
             // Load fake import
@@ -554,6 +557,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
             value: configValue,
             configEnv,
             valueIsImportedAtRuntime: false,
+            valueIsDefinedByValueFile: false,
             definedAt: definedAtConfigFile
         };
         return configValueSource;
@@ -566,6 +570,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
             locationId,
             configEnv,
             valueIsImportedAtRuntime: !valueAlreadyLoaded,
+            valueIsDefinedByValueFile: true,
             definedAt: {
                 ...interfaceFile.filePath,
                 fileExportPathToShowToUser: configName === interfaceFile.configName

package/dist/cjs/node/runtime/renderPage.js

@@ -327,6 +327,9 @@ function normalizeUrl(pageContextInit, httpRequestId) {
     if (disableUrlNormalization)
         return null;
     const { urlOriginal } = pageContextInit;
+    const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
+    if (isPageContextRequest)
+        return null;
     const urlNormalized = (0, utils_js_1.normalizeUrlPathname)(urlOriginal, trailingSlash, baseServer);
     if (!urlNormalized)
         return null;

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

@@ -1,7 +1,4 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeConfigValueImported = exports.serializeConfigValue = void 0;
 // This file is never loaded on the client-side but we save it under the vike/shared/ directory in order to collocate it with:
@@ -10,7 +7,6 @@ exports.serializeConfigValueImported = exports.serializeConfigValue = void 0;
 // Both parsePageConfigs() parseConfigValuesImported() and are loaded on the client-side and server-side
 const assertIsNotProductionRuntime_js_1 = require("../../../utils/assertIsNotProductionRuntime.js");
 (0, assertIsNotProductionRuntime_js_1.assertIsNotProductionRuntime)();
-const path_1 = __importDefault(require("path"));
 const utils_js_1 = require("../../utils.js");
 const generateEagerImport_js_1 = require("../../../node/plugin/plugins/importUserCode/generateEagerImport.js");
 function serializeConfigValue(lines, configName, configValueSerialized) {
@@ -28,13 +24,10 @@ exports.serializeConfigValue = serializeConfigValue;
 function serializeConfigValueImported(configValueSource, configName, whitespace, varCounterContainer, importStatements) {
     (0, utils_js_1.assert)(!configValueSource.valueIsFilePath);
     (0, utils_js_1.assert)(whitespace.replaceAll(' ', '').length === 0);
-    const { valueIsImportedAtRuntime, definedAt } = configValueSource;
+    const { valueIsImportedAtRuntime, valueIsDefinedByValueFile, definedAt } = configValueSource;
     (0, utils_js_1.assert)(valueIsImportedAtRuntime);
     const { filePathAbsoluteVite, fileExportName } = definedAt;
-    (0, utils_js_1.assertPosixPath)(filePathAbsoluteVite);
-    const fileName = path_1.default.posix.basename(filePathAbsoluteVite);
-    const isValueFile = fileName.startsWith('+');
-    if (isValueFile)
+    if (valueIsDefinedByValueFile)
         (0, utils_js_1.assert)(fileExportName === undefined);
     const { importName, importStatement } = (0, generateEagerImport_js_1.generateEagerImport)(filePathAbsoluteVite, varCounterContainer.varCounter++, fileExportName);
     importStatements.push(importStatement);
@@ -42,8 +35,8 @@ function serializeConfigValueImported(configValueSource, configName, whitespace,
     lines.push(`  {`);
     lines.push(`    configName: '${configName}',`);
     lines.push(`    importPath: '${filePathAbsoluteVite}',`);
-    lines.push(`    isValueFile: ${JSON.stringify(isValueFile)},`);
-    if (isValueFile) {
+    lines.push(`    isValueFile: ${JSON.stringify(valueIsDefinedByValueFile)},`);
+    if (valueIsDefinedByValueFile) {
         lines.push(`    exportValues: ${importName},`);
     }
     else {

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.162-commit-8995471';
+const PROJECT_VERSION = '0.4.162-commit-421de1c';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -1,5 +1,5 @@
 export { commonConfig };
-import { assert, assertWarning, findFile } from '../utils.js';
+import { assert, assertUsage, assertWarning, findFile } from '../utils.js';
 import { assertRollupInput } from './buildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';
@@ -9,16 +9,18 @@ import { assertResolveAlias } from './commonConfig/assertResolveAlias.js';
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
+const pluginName = 'vike:commonConfig-1';
 function commonConfig() {
     return [
         {
-            name: 'vike-commonConfig-1',
+            name: pluginName,
             configResolved(config) {
+                assertSingleInstance(config);
                 installRequireShim_setUserRootDir(config.root);
             }
         },
         {
-            name: 'vike-.commonConfig-2',
+            name: 'vike:commonConfig-2',
             enforce: 'post',
             configResolved: {
                 order: 'post',
@@ -75,3 +77,7 @@ function assertEsm(userViteRoot) {
     dir = pc.dim(dir);
     assertWarning(packageJson.type === 'module', `We recommend setting ${dir}package.json#type to "module", see https://vike.dev/CJS`, { onlyOnce: true });
 }
+function assertSingleInstance(config) {
+    const numberOfInstances = config.plugins.filter((o) => o.name === pluginName).length;
+    assertUsage(numberOfInstances === 1, `Vike's Vite plugin (${pc.cyan("import vike from 'vike/plugin'")}) is being added ${numberOfInstances} times to the list of Vite plugins. Make sure to add it only once instead.`);
+}

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

@@ -469,7 +469,8 @@ function warnOverridenConfigValues(interfaceFileWinner, interfaceFilesOverriden,
     interfaceFilesOverriden.forEach((interfaceFileLoser) => {
         const loserFilePath = interfaceFileLoser.filePath.filePathToShowToUser;
         const winnerFilePath = interfaceFileWinner.filePath.filePathToShowToUser;
-        assertWarning(false, `Config ${configName} defined at ${loserFilePath} is always overwritten by ${configName} defined at ${winnerFilePath}, remove the superfluous ${configName} value defined at ${interfaceFileLoser}`, { onlyOnce: false });
+        const confName = pc.cyan(configName);
+        assertWarning(false, `The value of the config ${confName} defined at ${loserFilePath} is always overwritten by the value defined at ${winnerFilePath}, remove the superfluous value defined at ${loserFilePath}`, { onlyOnce: true });
     });
 }
 function isInterfaceFileUserLand(interfaceFile) {
@@ -510,6 +511,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
             valueIsFilePath: true,
             configEnv,
             valueIsImportedAtRuntime: true,
+            valueIsDefinedByValueFile: false,
             definedAt
         };
         return configValueSource;
@@ -525,6 +527,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
                 locationId,
                 configEnv,
                 valueIsImportedAtRuntime: true,
+                valueIsDefinedByValueFile: false,
                 definedAt: import_
             };
             // Load fake import
@@ -549,6 +552,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
             value: configValue,
             configEnv,
             valueIsImportedAtRuntime: false,
+            valueIsDefinedByValueFile: false,
             definedAt: definedAtConfigFile
         };
         return configValueSource;
@@ -561,6 +565,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
             locationId,
             configEnv,
             valueIsImportedAtRuntime: !valueAlreadyLoaded,
+            valueIsDefinedByValueFile: true,
             definedAt: {
                 ...interfaceFile.filePath,
                 fileExportPathToShowToUser: configName === interfaceFile.configName

package/dist/esm/node/runtime/renderPage.js

@@ -321,6 +321,9 @@ function normalizeUrl(pageContextInit, httpRequestId) {
     if (disableUrlNormalization)
         return null;
     const { urlOriginal } = pageContextInit;
+    const { isPageContextRequest } = handlePageContextRequestUrl(urlOriginal);
+    if (isPageContextRequest)
+        return null;
     const urlNormalized = normalizeUrlPathname(urlOriginal, trailingSlash, baseServer);
     if (!urlNormalized)
         return null;

package/dist/esm/shared/page-configs/PageConfig.d.ts

@@ -75,6 +75,7 @@ type ConfigValueSource = {
     valueIsImportedAtRuntime: boolean;
     /** Whether the config value is a file path, for example config.client */
     valueIsFilePath?: true;
+    valueIsDefinedByValueFile: boolean;
 };
 type DefinedAtFileFullInfo = DefinedAtFile & FilePath & {
     fileExportName?: string;

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

@@ -6,8 +6,7 @@ export { serializeConfigValueImported };
 // Both parsePageConfigs() parseConfigValuesImported() and are loaded on the client-side and server-side
 import { assertIsNotProductionRuntime } from '../../../utils/assertIsNotProductionRuntime.js';
 assertIsNotProductionRuntime();
-import path from 'path';
-import { assert, assertPosixPath } from '../../utils.js';
+import { assert } from '../../utils.js';
 import { generateEagerImport } from '../../../node/plugin/plugins/importUserCode/generateEagerImport.js';
 function serializeConfigValue(lines, configName, configValueSerialized) {
     let whitespace = '      ';
@@ -23,13 +22,10 @@ function serializeConfigValue(lines, configName, configValueSerialized) {
 function serializeConfigValueImported(configValueSource, configName, whitespace, varCounterContainer, importStatements) {
     assert(!configValueSource.valueIsFilePath);
     assert(whitespace.replaceAll(' ', '').length === 0);
-    const { valueIsImportedAtRuntime, definedAt } = configValueSource;
+    const { valueIsImportedAtRuntime, valueIsDefinedByValueFile, definedAt } = configValueSource;
     assert(valueIsImportedAtRuntime);
     const { filePathAbsoluteVite, fileExportName } = definedAt;
-    assertPosixPath(filePathAbsoluteVite);
-    const fileName = path.posix.basename(filePathAbsoluteVite);
-    const isValueFile = fileName.startsWith('+');
-    if (isValueFile)
+    if (valueIsDefinedByValueFile)
         assert(fileExportName === undefined);
     const { importName, importStatement } = generateEagerImport(filePathAbsoluteVite, varCounterContainer.varCounter++, fileExportName);
     importStatements.push(importStatement);
@@ -37,8 +33,8 @@ function serializeConfigValueImported(configValueSource, configName, whitespace,
     lines.push(`  {`);
     lines.push(`    configName: '${configName}',`);
     lines.push(`    importPath: '${filePathAbsoluteVite}',`);
-    lines.push(`    isValueFile: ${JSON.stringify(isValueFile)},`);
-    if (isValueFile) {
+    lines.push(`    isValueFile: ${JSON.stringify(valueIsDefinedByValueFile)},`);
+    if (valueIsDefinedByValueFile) {
         lines.push(`    exportValues: ${importName},`);
     }
     else {

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.162-commit-8995471";
+declare const PROJECT_VERSION: "0.4.162-commit-421de1c";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.162-commit-8995471";
+    projectVersion: "0.4.162-commit-421de1c";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
 import { onProjectInfo } from './assertSingleInstance.js';
-const PROJECT_VERSION = '0.4.162-commit-8995471';
+const PROJECT_VERSION = '0.4.162-commit-421de1c';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.162-commit-8995471",
+  "version": "0.4.162-commit-421de1c",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",