vike 0.4.244-commit-a8703f7 → 0.4.244-commit-aae383f

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

@@ -1,5 +1,5 @@
 export { initOnLinkClick };
-import { isLinkIgnored, isSameAsCurrentUrl, skipLink } from './skipLink.js';
+import { isLinkIgnored, isHrefCurrentUrl, isLinkSkipped } from './isLinkSkipped.js';
 import { renderPageClientSide } from './renderPageClientSide.js';
 import { scrollToHashOrTop } from './setScrollPosition.js';
 function initOnLinkClick() {
@@ -19,14 +19,14 @@ async function onLinkClick(ev) {
     // Workaround for Firefox bug: clicking on a hash link that doesn't change the current URL causes Firefox to erroneously set `window.history.state = null` without firing any signal that we can detect.
     // - https://github.com/vikejs/vike/issues/1962
     // - https://github.com/sveltejs/kit/issues/8725
-    if (href.includes('#') && isSameAsCurrentUrl(href)) {
+    if (href.includes('#') && isHrefCurrentUrl(href)) {
         // Prevent Firefox from setting `window.history.state` to `null`
         ev.preventDefault();
         // Replicate the browser's native behavior
         scrollToHashOrTop(href.split('#')[1]);
         return;
     }
-    if (skipLink(linkTag))
+    if (isLinkSkipped(linkTag))
         return;
     ev.preventDefault();
     let scrollTarget;

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

@@ -14,7 +14,7 @@ import { catchInfiniteLoop } from './utils.js';
 // 2. URL hash changes:
 //    - By the user clicking on `<a href="#some-hash">`
 //      - The popstate event is *only* triggered if `href` starts with '#' (even if `href==='/foo#bar'` and the current URL has the same pathname '/foo' then popstate isn't triggered)
-//      - Vike doesn't intercept hash links (see `skipLink()`) and let's the browser handle them.
+//      - Vike doesn't intercept hash links (see `isLinkSkipped()`) and let's the browser handle them.
 //    - By the app using a `location` API such as `location.hash = 'some-hash'`
 //      - Only upon hash navigation: setting `location.href='/foo'` triggers a full page reload and no popstate event is fired.
 //      - Also upon `location.href='/foo#bar'` while the current URL is '/foo' (unlike <a> clicks).

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

@@ -0,0 +1,6 @@
+export { isLinkSkipped };
+export { isLinkIgnored };
+export { isHrefCurrentUrl };
+declare function isLinkSkipped(linkTag: HTMLElement): boolean;
+declare function isLinkIgnored(linkTag: HTMLElement): boolean;
+declare function isHrefCurrentUrl(href: string): boolean;

package/dist/esm/client/runtime-client-routing/{skipLink.js → isLinkSkipped.js}

@@ -1,18 +1,17 @@
-// TODO: rename_full skipLink isLinkSkipped
-export { skipLink };
+export { isLinkSkipped };
 export { isLinkIgnored };
-export { isSameAsCurrentUrl };
+export { isHrefCurrentUrl };
 import { normalizeClientSideUrl } from '../shared/normalizeClientSideUrl.js';
 import { getBaseServer } from './getBaseServer.js';
 import { assert, parseUrl, isBaseServer, isUrl, isUrlExternal } from './utils.js';
-function skipLink(linkTag) {
+function isLinkSkipped(linkTag) {
     const href = linkTag.getAttribute('href');
     return (href === null ||
         !isUrl(href) ||
         href === '' ||
         isUrlExternal(href) ||
-        isSamePageHashLink(href) ||
-        isNewTabLink(linkTag) ||
+        isHrefSamePageHash(href) ||
+        isLinkExternal(linkTag) ||
         isLinkIgnored(linkTag) ||
         !hasBaseServer(href) ||
         // Purposely last because disableAutomaticLinkInterception will be removed in the next major release
@@ -25,13 +24,11 @@ function isVikeLink(linkTag) {
         return true;
     }
     else {
-        // TODO: rename target attrVal
-        const target = linkTag.getAttribute('data-vike-link');
-        return target !== null && target !== 'false';
+        const attrVal = linkTag.getAttribute('data-vike-link');
+        return attrVal !== null && attrVal !== 'false';
     }
 }
-// TODO rename
-function isNewTabLink(linkTag) {
+function isLinkExternal(linkTag) {
     const target = linkTag.getAttribute('target');
     const rel = linkTag.getAttribute('rel');
     return target === '_blank' || target === '_external' || rel === 'external' || linkTag.hasAttribute('download');
@@ -39,11 +36,9 @@ function isNewTabLink(linkTag) {
 function isLinkIgnored(linkTag) {
     return linkTag.getAttribute('data-vike') === 'false';
 }
-// TODO refactor both functions below?
-function isSamePageHashLink(href) {
+function isHrefSamePageHash(href) {
     if (href.startsWith('#'))
         return true;
-    // TODO: remove?
     if (href.includes('#') &&
         normalizeClientSideUrl(href, { withoutHash: true }) ===
             normalizeClientSideUrl(window.location.href, { withoutHash: true })) {
@@ -51,7 +46,7 @@ function isSamePageHashLink(href) {
     }
     return false;
 }
-function isSameAsCurrentUrl(href) {
+function isHrefCurrentUrl(href) {
     if (href.startsWith('#'))
         return href === window.location.hash;
     return normalizeClientSideUrl(href) === normalizeClientSideUrl(window.location.href);

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

@@ -7,7 +7,7 @@ export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
 import { assert, assertClientRouting, assertUsage, assertWarning, checkIfClientRouting, getGlobalObject, hasProp, objectAssign, } from './utils.js';
 import { isErrorFetchingStaticAssets, loadPageConfigsLazyClientSide } from '../shared/loadPageConfigsLazyClientSide.js';
-import { skipLink } from './skipLink.js';
+import { isLinkSkipped } from './isLinkSkipped.js';
 import { disableClientRouting } from './renderPageClientSide.js';
 import { isClientSideRoutable } from './isClientSideRoutable.js';
 import { createPageContextClientSide } from './createPageContextClientSide.js';
@@ -170,7 +170,7 @@ function addLinkPrefetchHandlers_apply() {
         if (globalObject.linkPrefetchHandlerAdded.has(linkTag))
             continue;
         globalObject.linkPrefetchHandlerAdded.add(linkTag);
-        if (skipLink(linkTag))
+        if (isLinkSkipped(linkTag))
             continue;
         linkTag.addEventListener('mouseover', () => {
             prefetchOnEvent(linkTag, 'hover');
@@ -205,7 +205,7 @@ async function prefetchOnEvent(linkTag, event) {
         }
     }
     // Check again in case DOM was manipulated since last check
-    if (skipLink(linkTag))
+    if (isLinkSkipped(linkTag))
         return;
     const urlOfLink = linkTag.getAttribute('href');
     const pageContextLink = await getPageContextLink(urlOfLink);

package/dist/esm/node/vite/plugins/pluginViteConfigVikeExtensions.js

@@ -1,6 +1,6 @@
 export { pluginViteConfigVikeExtensions };
 import { mergeConfig } from 'vite';
-import { assertUsage, isObject } from '../utils.js';
+import { assertUsage, isCallable, isObject } from '../utils.js';
 import { getVikeConfigInternalEarly } from '../../api/resolveViteConfigFromUser.js';
 // Apply +vite
 // - For example, Vike extensions adding Vite plugins
@@ -12,10 +12,13 @@ async function pluginViteConfigVikeExtensions() {
     const viteConfigsExtensions = vikeConfig._from.configsCumulative.vite;
     if (!viteConfigsExtensions)
         return [];
-    viteConfigsExtensions.values.forEach((v) => {
-        assertUsage(isObject(v.value), `${v.definedAt} should be an object`);
-        viteConfigFromExtensions = mergeConfig(viteConfigFromExtensions, v.value);
-    });
+    await Promise.all(viteConfigsExtensions.values.map(async (v) => {
+        let val = v.value;
+        if (isCallable(val))
+            val = await val();
+        assertUsage(isObject(val), `${v.definedAt} should be an object, or a function returning an object`);
+        viteConfigFromExtensions = mergeConfig(viteConfigFromExtensions, val);
+    }));
     const pluginsFromExtensions = (viteConfigFromExtensions.plugins ?? []);
     delete viteConfigFromExtensions.plugins;
     return [

package/dist/esm/node/vite/shared/resolveVikeConfigInternal.d.ts

@@ -2,7 +2,6 @@ export { getVikeConfig };
 export type { VikeConfig };
 export { getVikeConfigInternal };
 export { getVikeConfigInternalOptional };
-export { getVikeConfigInternalSync };
 export { setVikeConfigContext };
 export { isVikeConfigContextSet };
 export { reloadVikeConfig };
@@ -38,13 +37,14 @@ type VikeConfigInternal = GlobalConfigPublic & {
 };
 declare function reloadVikeConfig(): void;
 declare function getVikeConfigInternal(doNotRestartViteOnError?: boolean): Promise<VikeConfigInternal>;
-declare function getVikeConfigInternalSync(): VikeConfigInternal;
 /**
  * Get all the information Vike knows about the app in your Vite plugin.
  *
  * https://vike.dev/getVikeConfig
  */
-declare function getVikeConfig(config: ResolvedConfig | UserConfig): VikeConfig;
+declare function getVikeConfig(
+/** @deprecated the `config` argument isn't needed anymore — remove it (it doesn't have any effect) */
+config?: ResolvedConfig | UserConfig): VikeConfig;
 type VikeConfig = Pick<VikeConfigInternal, 'config' | 'pages' | 'prerenderContext'> & {
     /** https://vike.dev/warning/internals */
     dangerouslyUseInternals: DangerouslyUseInternals<VikeConfigInternal>;

package/dist/esm/node/vite/shared/resolveVikeConfigInternal.js

@@ -3,7 +3,6 @@ export { getVikeConfig };
 // Internal usage
 export { getVikeConfigInternal };
 export { getVikeConfigInternalOptional };
-export { getVikeConfigInternalSync };
 export { setVikeConfigContext };
 export { isVikeConfigContextSet };
 export { reloadVikeConfig };
@@ -58,11 +57,6 @@ doNotRestartViteOnError = false) {
     const vikeConfig = await getOrResolveVikeConfig(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError);
     return vikeConfig;
 }
-// TO-DO/next-major-release: remove
-function getVikeConfigInternalSync() {
-    assert(globalObject.vikeConfigSync);
-    return globalObject.vikeConfigSync;
-}
 // TO-DO/eventually: this maybe(/probably?) isn't safe against race conditions upon file changes in development, thus:
 // - Like getGlobalContext() and getGlobalContextSync() — make getVikeConfig() async and provide a getVikeConfigSync() while discourage using it
 // Public usage
@@ -72,10 +66,17 @@ function getVikeConfigInternalSync() {
  * https://vike.dev/getVikeConfig
  */
 function getVikeConfig(
-// TO-DO/eventually: remove unused arguments (older versions used it and we didn't remove it yet to avoid a TypeScript breaking change)
-// - No rush: we can do it later since it's getVikeConfig() is a beta feature as documented at https://vike.dev/getVikeConfig
+/** @deprecated the `config` argument isn't needed anymore — remove it (it doesn't have any effect) */
 config) {
-    const vikeConfig = getVikeConfigInternalSync();
+    /* TO-DO/eventualy: add deprecation warning. We don't do it yet because of vike-server and vike-cloudflare which are using getVikeConfig() with the argument.
+    assertWarning(
+      config === undefined,
+      `getVikeConfig() doesn't accept any argument anymore — remove the argument (it doesn't have any effect)`,
+      { onlyOnce: true, showStackTrace: true },
+    )
+    */
+    assert(globalObject.vikeConfigSync);
+    const vikeConfig = globalObject.vikeConfigSync;
     assertUsage(vikeConfig, 'getVikeConfig() can only be used when Vite is loaded (i.e. during development or build) — Vite is never loaded in production.');
     const vikeConfigPublic = getProxyForPublicUsage(vikeConfig, 'vikeConfig');
     return vikeConfigPublic;

package/dist/esm/types/Config.d.ts

@@ -386,7 +386,7 @@ type ConfigBuiltIn = {
      *
      * https://vite.dev/config/
      */
-    vite?: InlineConfig;
+    vite?: InlineConfig | (() => InlineConfig | Promise<InlineConfig>);
     /** Permanent redirections (HTTP status code 301)
      *
      * https://vike.dev/redirects

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.244-commit-a8703f7";
+export declare const PROJECT_VERSION: "0.4.244-commit-aae383f";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.244-commit-a8703f7';
+export const PROJECT_VERSION = '0.4.244-commit-aae383f';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.244-commit-a8703f7",
+  "version": "0.4.244-commit-aae383f",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {

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

@@ -1,6 +0,0 @@
-export { skipLink };
-export { isLinkIgnored };
-export { isSameAsCurrentUrl };
-declare function skipLink(linkTag: HTMLElement): boolean;
-declare function isLinkIgnored(linkTag: HTMLElement): boolean;
-declare function isSameAsCurrentUrl(href: string): boolean;