vike 0.4.202 → 0.4.203-commit-1b14559

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

@@ -60,14 +60,13 @@ function assertNoInfiniteLoop(visited, filePathAbsoluteFilesystem) {
     (0, utils_js_1.assertUsage)(idx === -1, `Infinite extends loop ${[...loop, filePathAbsoluteFilesystem].join('>')}`);
 }
 async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir, visited) {
-    const extendsPointerImportData = getExtendsPointerImportData(configFileExports, configFilePath);
+    const { extendsPointerImportData, extendsConfigs } = getExtendsPointerImportData(configFileExports, configFilePath);
     const extendsConfigFiles = [];
     extendsPointerImportData.map((pointerImportData) => {
         const filePath = (0, resolvePointerImport_js_1.resolvePointerImport)(pointerImportData, configFilePath, userRootDir);
         (0, utils_js_1.assert)(filePath.filePathAbsoluteFilesystem);
         extendsConfigFiles.push(filePath);
     });
-    const extendsConfigs = [];
     await Promise.all(extendsConfigFiles.map(async (configFilePath) => {
         const result = await loadConfigFile(configFilePath, userRootDir, visited, true);
         extendsConfigs.push(result.configFile);
@@ -79,24 +78,35 @@ async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir
 function getExtendsPointerImportData(configFileExports, configFilePath) {
     const { filePathToShowToUser } = configFilePath;
     const configFileExport = (0, getConfigFileExport_js_1.getConfigFileExport)(configFileExports, filePathToShowToUser);
-    const wrongUsage = `${filePathToShowToUser} sets the config ${picocolors_1.default.cyan('extends')} to an invalid value, see https://vike.dev/extends`;
-    let extendList;
-    if (!('extends' in configFileExport)) {
-        return [];
-    }
-    else if ((0, utils_js_1.hasProp)(configFileExport, 'extends', 'string')) {
-        extendList = [configFileExport.extends];
-    }
-    else if ((0, utils_js_1.hasProp)(configFileExport, 'extends', 'string[]')) {
-        extendList = configFileExport.extends;
-    }
-    else {
-        (0, utils_js_1.assertUsage)(false, wrongUsage);
+    const extendsConfigs = [];
+    const extendsPointerImportData = [];
+    if ('extends' in configFileExport) {
+        const extendsValue = configFileExport.extends;
+        const extendList = [];
+        const wrongUsage = `${filePathToShowToUser} sets the config ${picocolors_1.default.cyan('extends')} to an invalid value, see https://vike.dev/extends`;
+        if (typeof extendsValue === 'string') {
+            extendList.push(extendsValue);
+        }
+        else if ((0, utils_js_1.isArrayOfStrings)(extendsValue)) {
+            extendList.push(...extendsValue);
+        }
+        else if ((0, utils_js_1.isObject)(extendsValue)) {
+            /* If we want to implement this then we need to make filePath optional
+            extendsConfigs.push({
+              fileExports: extendsValue,
+              filePath: null,
+            })
+            */
+            (0, utils_js_1.assertUsage)(false, wrongUsage);
+        }
+        else {
+            (0, utils_js_1.assertUsage)(false, wrongUsage);
+        }
+        extendsPointerImportData.push(...extendList.map((importString) => {
+            const pointerImportData = (0, transformPointerImports_js_1.parsePointerImportData)(importString);
+            (0, utils_js_1.assertUsage)(pointerImportData, wrongUsage);
+            return pointerImportData;
+        }));
     }
-    const extendsPointerImportData = extendList.map((importString) => {
-        const pointerImportData = (0, transformPointerImports_js_1.parsePointerImportData)(importString);
-        (0, utils_js_1.assertUsage)(pointerImportData, wrongUsage);
-        return pointerImportData;
-    });
-    return extendsPointerImportData;
+    return { extendsPointerImportData, extendsConfigs };
 }

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

@@ -149,15 +149,16 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                     //   - assertIsNpmPackageImport()
                     //   - isNpmPackageImport(str, { cannotBePathAlias: true })
                     (0, utils_js_1.assertFilePathAbsoluteFilesystem)(importPathResolved);
-                    // vike-{react,vue,solid} follow the convention that their config export resolves to a file named +config.js
-                    //  - This is temporary, see comment below.
-                    const isVikeExtensionImport = importPathResolved.endsWith('+config.js');
+                    //  Should be remove this? See comment below.
+                    const isVikeExtensionImport = (path.startsWith('vike-') && path.endsWith('/config')) || importPathResolved.endsWith('+config.js');
                     const isPointerImport = transformImports === 'all' ||
                         // .jsx, .vue, .svg, ... => obviously not config code => pointer import
                         !(0, utils_js_1.isPlainJavaScriptFile)(importPathResolved) ||
                         // Import of a Vike extension config => make it a pointer import because we want to show nice error messages (that can display whether a config has been set by the user or by a Vike extension).
-                        //  - TODO/eventually: stop doing this and, instead, let Node.js directly load vike-{react,vue,solid} while enforcing Vike extensions to set 'name' in their +config.js file.
-                        //    - vike@0.4.162 already started soft-requiring Vike extensions to set the name config
+                        //  - Should we stop doing this? (And instead let Node.js directly load Vike extensions.)
+                        //    - In principle, we can use the setting 'name' value of Vike extensions.
+                        //      - vike@0.4.162 started soft-requiring Vike extensions to set the name config.
+                        //    - In practice, it seems like it requires some (non-trivial?) refactoring.
                         isVikeExtensionImport;
                     (0, utils_js_1.assertPosixPath)(importPathResolved);
                     const isNodeModules = importPathResolved.includes('/node_modules/');

package/dist/cjs/shared/page-configs/assertPlusFileExport.js

@@ -29,9 +29,7 @@ function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
         (0, utils_js_1.assertUsage)(false, `${filePathToShowToUser} should have ${exportNamed} or ${exportDefault}`);
     }
     if (exportNamesValid.length === 2) {
-        (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser} is ambiguous: remove ${exportDefault} or ${exportNamed}`, {
-            onlyOnce: true
-        });
+        (0, utils_js_1.assertUsage)(false, `${filePathToShowToUser} is ambiguous: remove ${exportDefault} or ${exportNamed}`);
     }
     if (!TOLERATE_SIDE_EXPORTS.some((ext) => filePathToShowToUser.endsWith(ext))) {
         exportNamesInvalid.forEach((exportInvalid) => {

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

@@ -114,6 +114,7 @@ function parseValueSerialized(valueSerialized, configName, getDefinedAtFile) {
             const isSideExport = exportName !== 'default' && exportName !== configName;
             if (!isSideExport) {
                 value = exportValue;
+                // Already asserted by assertPlusFileExport() call above.
                 (0, utils_js_1.assert)(!valueWasFound);
                 valueWasFound = true;
             }
@@ -131,7 +132,7 @@ function parseValueSerialized(valueSerialized, configName, getDefinedAtFile) {
                 });
             }
         });
-        // Already validated by assertPlusFileExport() call above.
+        // Already asserted by assertPlusFileExport() call above.
         (0, utils_js_1.assert)(valueWasFound);
         return { value, sideExports };
     }

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.202';
+exports.PROJECT_VERSION = '0.4.203-commit-1b14559';

package/dist/esm/client/client-routing-runtime/entry.js

@@ -7,6 +7,6 @@ import { removeFoucBuster } from '../shared/removeFoucBuster.js';
 // @ts-ignore Since dist/cjs/client/ is never used, we can ignore this error.
 const isProd = import.meta.env.PROD;
 assertSingleInstance_onClientEntryClientRouting(isProd);
+initClientRouter();
 if (import.meta.env.DEV)
     removeFoucBuster();
-initClientRouter();

package/dist/esm/client/client-routing-runtime/history.d.ts

@@ -1,6 +1,8 @@
 export { pushHistoryState };
 export { onPopStateBegin };
 export { saveScrollPosition };
+export { initHistoryState };
+export { monkeyPatchHistoryAPI };
 export type { HistoryInfo };
 export type { ScrollPosition };
 type StateEnhanced = {
@@ -15,6 +17,7 @@ type ScrollPosition = {
 };
 declare function saveScrollPosition(): void;
 declare function pushHistoryState(url: string, overwriteLastHistoryEntry: boolean): void;
+declare function monkeyPatchHistoryAPI(): void;
 type HistoryInfo = {
     url: `/${string}`;
     state: StateEnhanced;
@@ -24,3 +27,4 @@ declare function onPopStateBegin(): {
     previous: HistoryInfo;
     current: HistoryInfo;
 };
+declare function initHistoryState(): void;

package/dist/esm/client/client-routing-runtime/history.js

@@ -1,8 +1,10 @@
 export { pushHistoryState };
 export { onPopStateBegin };
 export { saveScrollPosition };
+export { initHistoryState };
+export { monkeyPatchHistoryAPI };
 import { assert, assertUsage, getCurrentUrl, getGlobalObject, hasProp, isObject } from './utils.js';
-init();
+initHistoryState(); // we redundantly call initHistoryState() to ensure it's called early
 const globalObject = getGlobalObject('history.ts', { previous: getHistoryInfo() });
 // `window.history.state === null` when:
 // - The very first render
@@ -129,10 +131,6 @@ function assertStateVikeEnhanced(state) {
         assert(hasProp(state.scrollPosition, 'x', 'number') && hasProp(state.scrollPosition, 'y', 'number'));
     }
 }
-function init() {
-    enhanceHistoryState();
-    monkeyPatchHistoryAPI();
-}
 function getHistoryInfo() {
     return {
         url: getCurrentUrl(),
@@ -148,3 +146,6 @@ function onPopStateBegin() {
     globalObject.previous = current;
     return { isNewState, previous, current };
 }
+function initHistoryState() {
+    enhanceHistoryState();
+}

package/dist/esm/client/client-routing-runtime/initClientRouter.js

@@ -6,6 +6,7 @@ import { initOnLinkClick } from './initOnLinkClick.js';
 import { setupNativeScrollRestoration } from './scrollRestoration.js';
 import { autoSaveScrollPosition } from './setScrollPosition.js';
 import { initLinkPrefetchHandlers } from './prefetch.js';
+import { initHistoryState, monkeyPatchHistoryAPI } from './history.js';
 async function initClientRouter() {
     // Init navigation history and scroll restoration
     initHistoryAndScroll();
@@ -27,6 +28,8 @@ async function renderFirstPage() {
     });
 }
 function initHistoryAndScroll() {
+    monkeyPatchHistoryAPI();
+    initHistoryState(); // we redundantly call initHistoryState() to ensure it's called early
     setupNativeScrollRestoration();
     autoSaveScrollPosition();
     // Handle back-/forward navigation

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

@@ -2,7 +2,7 @@
 export { loadImportedFile };
 export { loadValueFile };
 export { loadConfigFile };
-import { assert, assertUsage, hasProp, assertIsNotProductionRuntime } from '../../../../utils.js';
+import { assert, assertUsage, assertIsNotProductionRuntime, isArrayOfStrings, isObject } from '../../../../utils.js';
 import { transpileAndExecuteFile } from './transpileAndExecuteFile.js';
 import { assertPlusFileExport } from '../../../../../../shared/page-configs/assertPlusFileExport.js';
 import pc from '@brillout/picocolors';
@@ -55,14 +55,13 @@ function assertNoInfiniteLoop(visited, filePathAbsoluteFilesystem) {
     assertUsage(idx === -1, `Infinite extends loop ${[...loop, filePathAbsoluteFilesystem].join('>')}`);
 }
 async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir, visited) {
-    const extendsPointerImportData = getExtendsPointerImportData(configFileExports, configFilePath);
+    const { extendsPointerImportData, extendsConfigs } = getExtendsPointerImportData(configFileExports, configFilePath);
     const extendsConfigFiles = [];
     extendsPointerImportData.map((pointerImportData) => {
         const filePath = resolvePointerImport(pointerImportData, configFilePath, userRootDir);
         assert(filePath.filePathAbsoluteFilesystem);
         extendsConfigFiles.push(filePath);
     });
-    const extendsConfigs = [];
     await Promise.all(extendsConfigFiles.map(async (configFilePath) => {
         const result = await loadConfigFile(configFilePath, userRootDir, visited, true);
         extendsConfigs.push(result.configFile);
@@ -74,24 +73,35 @@ async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir
 function getExtendsPointerImportData(configFileExports, configFilePath) {
     const { filePathToShowToUser } = configFilePath;
     const configFileExport = getConfigFileExport(configFileExports, filePathToShowToUser);
-    const wrongUsage = `${filePathToShowToUser} sets the config ${pc.cyan('extends')} to an invalid value, see https://vike.dev/extends`;
-    let extendList;
-    if (!('extends' in configFileExport)) {
-        return [];
-    }
-    else if (hasProp(configFileExport, 'extends', 'string')) {
-        extendList = [configFileExport.extends];
-    }
-    else if (hasProp(configFileExport, 'extends', 'string[]')) {
-        extendList = configFileExport.extends;
-    }
-    else {
-        assertUsage(false, wrongUsage);
+    const extendsConfigs = [];
+    const extendsPointerImportData = [];
+    if ('extends' in configFileExport) {
+        const extendsValue = configFileExport.extends;
+        const extendList = [];
+        const wrongUsage = `${filePathToShowToUser} sets the config ${pc.cyan('extends')} to an invalid value, see https://vike.dev/extends`;
+        if (typeof extendsValue === 'string') {
+            extendList.push(extendsValue);
+        }
+        else if (isArrayOfStrings(extendsValue)) {
+            extendList.push(...extendsValue);
+        }
+        else if (isObject(extendsValue)) {
+            /* If we want to implement this then we need to make filePath optional
+            extendsConfigs.push({
+              fileExports: extendsValue,
+              filePath: null,
+            })
+            */
+            assertUsage(false, wrongUsage);
+        }
+        else {
+            assertUsage(false, wrongUsage);
+        }
+        extendsPointerImportData.push(...extendList.map((importString) => {
+            const pointerImportData = parsePointerImportData(importString);
+            assertUsage(pointerImportData, wrongUsage);
+            return pointerImportData;
+        }));
     }
-    const extendsPointerImportData = extendList.map((importString) => {
-        const pointerImportData = parsePointerImportData(importString);
-        assertUsage(pointerImportData, wrongUsage);
-        return pointerImportData;
-    });
-    return extendsPointerImportData;
+    return { extendsPointerImportData, extendsConfigs };
 }

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

@@ -144,15 +144,16 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                     //   - assertIsNpmPackageImport()
                     //   - isNpmPackageImport(str, { cannotBePathAlias: true })
                     assertFilePathAbsoluteFilesystem(importPathResolved);
-                    // vike-{react,vue,solid} follow the convention that their config export resolves to a file named +config.js
-                    //  - This is temporary, see comment below.
-                    const isVikeExtensionImport = importPathResolved.endsWith('+config.js');
+                    //  Should be remove this? See comment below.
+                    const isVikeExtensionImport = (path.startsWith('vike-') && path.endsWith('/config')) || importPathResolved.endsWith('+config.js');
                     const isPointerImport = transformImports === 'all' ||
                         // .jsx, .vue, .svg, ... => obviously not config code => pointer import
                         !isPlainJavaScriptFile(importPathResolved) ||
                         // Import of a Vike extension config => make it a pointer import because we want to show nice error messages (that can display whether a config has been set by the user or by a Vike extension).
-                        //  - TODO/eventually: stop doing this and, instead, let Node.js directly load vike-{react,vue,solid} while enforcing Vike extensions to set 'name' in their +config.js file.
-                        //    - vike@0.4.162 already started soft-requiring Vike extensions to set the name config
+                        //  - Should we stop doing this? (And instead let Node.js directly load Vike extensions.)
+                        //    - In principle, we can use the setting 'name' value of Vike extensions.
+                        //      - vike@0.4.162 started soft-requiring Vike extensions to set the name config.
+                        //    - In practice, it seems like it requires some (non-trivial?) refactoring.
                         isVikeExtensionImport;
                     assertPosixPath(importPathResolved);
                     const isNodeModules = importPathResolved.includes('/node_modules/');

package/dist/esm/shared/page-configs/assertPlusFileExport.js

@@ -24,9 +24,7 @@ function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
         assertUsage(false, `${filePathToShowToUser} should have ${exportNamed} or ${exportDefault}`);
     }
     if (exportNamesValid.length === 2) {
-        assertWarning(false, `${filePathToShowToUser} is ambiguous: remove ${exportDefault} or ${exportNamed}`, {
-            onlyOnce: true
-        });
+        assertUsage(false, `${filePathToShowToUser} is ambiguous: remove ${exportDefault} or ${exportNamed}`);
     }
     if (!TOLERATE_SIDE_EXPORTS.some((ext) => filePathToShowToUser.endsWith(ext))) {
         exportNamesInvalid.forEach((exportInvalid) => {

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

@@ -112,6 +112,7 @@ function parseValueSerialized(valueSerialized, configName, getDefinedAtFile) {
             const isSideExport = exportName !== 'default' && exportName !== configName;
             if (!isSideExport) {
                 value = exportValue;
+                // Already asserted by assertPlusFileExport() call above.
                 assert(!valueWasFound);
                 valueWasFound = true;
             }
@@ -129,7 +130,7 @@ function parseValueSerialized(valueSerialized, configName, getDefinedAtFile) {
                 });
             }
         });
-        // Already validated by assertPlusFileExport() call above.
+        // Already asserted by assertPlusFileExport() call above.
         assert(valueWasFound);
         return { value, sideExports };
     }

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.202";
+export declare const PROJECT_VERSION: "0.4.203-commit-1b14559";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.202';
+export const PROJECT_VERSION = '0.4.203-commit-1b14559';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.202";
+    projectVersion: "0.4.203-commit-1b14559";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.202",
+  "version": "0.4.203-commit-1b14559",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {