vike 0.4.219 → 0.4.220

package/dist/cjs/node/api/prepareViteApiCall.js

@@ -63,19 +63,19 @@ async function enhanceViteConfig(viteConfig, operation) {
     const viteInfo = await getInfoFromVite(viteConfig, operation);
     await assertViteRoot2(viteInfo.root, viteInfo.viteConfigEnhanced, operation);
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig2)(viteInfo.root, operation === 'dev', viteInfo.vikeVitePluginOptions);
-    const viteConfigEnhanced = addViteSettingsSetByUser(viteInfo.viteConfigEnhanced, vikeConfig);
+    const viteConfigEnhanced = addViteSettingsSetByVikeConfig(viteInfo.viteConfigEnhanced, vikeConfig);
     return {
         viteConfigEnhanced,
         vikeConfigGlobal: vikeConfig.vikeConfigGlobal
     };
 }
-function addViteSettingsSetByUser(viteConfigEnhanced, vikeConfig) {
+function addViteSettingsSetByVikeConfig(viteConfigEnhanced, vikeConfig) {
     const viteConfigs = vikeConfig.global.from.configsCumulative.vite;
     if (!viteConfigs)
         return viteConfigEnhanced;
     viteConfigs.values.forEach((v) => {
         (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(v.value), `${v.definedAt} should be an object`);
-        viteConfigEnhanced = (0, vite_1.mergeConfig)(v.value, viteConfigEnhanced ?? {});
+        viteConfigEnhanced = (0, vite_1.mergeConfig)(viteConfigEnhanced ?? {}, v.value);
     });
     return viteConfigEnhanced;
 }

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

@@ -80,7 +80,7 @@ function commonConfig(vikeVitePluginOptions) {
                     // VITE_CONFIG
                     const configFromEnvVar = (0, getEnvVarObject_js_1.getEnvVarObject)('VITE_CONFIG');
                     if (configFromEnvVar)
-                        configFromVike = (0, vite_1.mergeConfig)(configFromEnvVar, configFromVike);
+                        configFromVike = (0, vite_1.mergeConfig)(configFromVike, configFromEnvVar);
                     return configFromVike;
                 }
             }

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.219';
+exports.PROJECT_VERSION = '0.4.220';

package/dist/cjs/utils/assertSetup.js

@@ -121,7 +121,7 @@ function getEnvDescription() {
 // https://github.com/cloudflare/workers-sdk/issues/7886
 function assertNodeEnvIsNotUndefinedString() {
     const nodeEnv = getNodeEnv();
-    (0, assert_js_1.assertWarning)(nodeEnv !== 'undefined', `${picocolors_1.default.cyan('process.env.NODE_ENV==="undefined"')} which is unexpected: ${picocolors_1.default.cyan('process.env.NODE_ENV')} can be set to the *value* ${picocolors_1.default.cyan('undefined')} (i.e. ${picocolors_1.default.cyan('process.env.NODE_ENV===undefined')}) but it shouldn't be set to the *string* ${picocolors_1.default.cyan('"undefined"')} ${picocolors_1.default.underline('https://vike.dev/NODE_ENV')}`, { onlyOnce: true });
+    (0, assert_js_1.assertWarning)(nodeEnv !== 'undefined', `${picocolors_1.default.cyan('process.env.NODE_ENV==="undefined"')} which is unexpected: ${picocolors_1.default.cyan('process.env.NODE_ENV')} is allowed to be the *value* ${picocolors_1.default.cyan('undefined')} (i.e. ${picocolors_1.default.cyan('process.env.NODE_ENV===undefined')}) but it shouldn't be the *string* ${picocolors_1.default.cyan('"undefined"')} ${picocolors_1.default.underline('https://vike.dev/NODE_ENV')}`, { onlyOnce: true });
 }
 function isNodeEnvDev() {
     const nodeEnv = getNodeEnv();
@@ -141,6 +141,20 @@ function getNodeEnv() {
     catch {
         return undefined;
     }
+    /*
+    // Should we show the following warning? So far I don't think so because of the following. Maybe we can show it once we enable users to disable warnings.
+    // - The warning isn't always actionable, e.g. if it's a tool that dynamically sets `process.env.NODE_ENV`.
+    // - We assume that tools use `process.env.NODE_ENV` and not someting like `const { env } = process; env.NODE_ENV`. Thus, in practice, `val` overrides `val2` so having `val!==val2` isn't an issue.
+    {
+      const val2 = process.env['NODE' + '_ENV']
+      if (val2)
+        assertWarning(
+          val === val2,
+          `Dynamically setting process.env.NODE_ENV to ${val2} hasn't any effect because process.env.NODE_ENV is being statically replaced to ${val}.`,
+          { onlyOnce: true }
+        )
+    }
+    //*/
     return val;
 }
 function setNodeEnvProduction() {

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

@@ -1,2 +1,6 @@
 export { initOnLinkClick };
+export { getCurrentLinkClick };
 declare function initOnLinkClick(): void;
+declare function getCurrentLinkClick(): {
+    href: string;
+} | undefined;

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

@@ -1,9 +1,11 @@
 // Code adapted from https://github.com/HenrikJoreteg/internal-nav-helper/blob/5199ec5448d0b0db7ec63cf76d88fa6cad878b7d/src/index.js#L11-L29
 export { initOnLinkClick };
-import { assert } from './utils.js';
+export { getCurrentLinkClick };
+import { getGlobalObject } from './utils.js';
 import { isSameAsCurrentUrl, skipLink } from './skipLink.js';
 import { renderPageClientSide } from './renderPageClientSide.js';
 import { scrollToHashOrTop } from './setScrollPosition.js';
+const globalObject = getGlobalObject('initOnLinkClick.ts', {});
 function initOnLinkClick() {
     document.addEventListener('click', onClick);
 }
@@ -14,10 +16,16 @@ async function onClick(ev) {
     if (!linkTag)
         return;
     const href = linkTag.getAttribute('href');
+    if (href === null)
+        return;
+    globalObject.currentLinkClick = { href };
+    setTimeout(() => {
+        delete globalObject.currentLinkClick;
+    }, 0);
     // 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('#') && isSameAsCurrentUrl(href)) {
         // Prevent Firefox from setting `window.history.state` to `null`
         ev.preventDefault();
         // Replicate the browser's native behavior
@@ -26,7 +34,6 @@ async function onClick(ev) {
     }
     if (skipLink(linkTag))
         return;
-    assert(href);
     ev.preventDefault();
     let scrollTarget;
     {
@@ -53,3 +60,6 @@ function findLinkTag(target) {
     }
     return target;
 }
+function getCurrentLinkClick() {
+    return globalObject.currentLinkClick;
+}

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

@@ -4,6 +4,8 @@ import { assertWarning, getGlobalObject } from './utils.js';
 import { onPopStateBegin } from './history.js';
 import { renderPageClientSide } from './renderPageClientSide.js';
 import { setScrollPosition } from './setScrollPosition.js';
+import { getCurrentLinkClick } from './initOnLinkClick.js';
+import { isSamePageHashLink } from './skipLink.js';
 const globalObject = getGlobalObject('initOnPopState.ts', { listeners: [] });
 function initOnPopState() {
     // - The popstate event is trigged upon:
@@ -16,7 +18,13 @@ function initOnPopState() {
     //     - `location.hash = 'some-hash'`
     // - The `event` argument of `window.addEventListener('popstate', (event) => /*...*/)` is useless: the History API doesn't provide the previous state (the popped state), see https://stackoverflow.com/questions/48055323/is-history-state-always-the-same-as-popstate-event-state
     window.addEventListener('popstate', async () => {
+        const currentLinkClick = getCurrentLinkClick();
         const { isNewState, previous, current } = onPopStateBegin();
+        // We use currentLinkClick.href instead of current.url because current.url missing text links such as #:~:text=With%20frontmatter-,Global%20metadata,-What%20is%20global (e.g. Chrome strips the `#:~:text=` part from the URL before the popstate event).
+        if (currentLinkClick && isSamePageHashLink(currentLinkClick.href)) {
+            // Let the browser handle hash links
+            return;
+        }
         const scrollTarget = current.state.scrollPosition || undefined;
         const isUserPushStateNavigation = current.state.triggeredBy === 'user' || previous.state.triggeredBy === 'user';
         const isHashNavigation = removeHash(current.url) === removeHash(previous.url) && current.url !== previous.url;

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

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

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

@@ -1,5 +1,6 @@
 export { skipLink };
 export { isSameAsCurrentUrl };
+export { isSamePageHashLink };
 import { normalizeClientSideUrl } from '../shared/normalizeClientSideUrl.js';
 import { getBaseServer } from './getBaseServer.js';
 import { assert, parseUrl, isBaseServer, isUrl, isUrlExternal } from './utils.js';

package/dist/esm/client/shared/normalizeClientSideUrl.js

@@ -2,9 +2,8 @@ export { normalizeClientSideUrl };
 import { assert, parseUrl } from './utils.js';
 /** Resolves relative URLs */
 function normalizeClientSideUrl(url, options) {
-    // This function doesn't work for `url === '#some-hash'` because `searchOriginal` is `null` even if window.location.href has a search string.
-    // - Thus the resolved absolute URL would be missing the search string.
-    // - It makes sense that `parseUrl()` returns `searchOriginal === null` since there isn't any search string in `url`.
+    // This function doesn't work for `url === '#some-hash'` because `searchOriginal` will be missing: if window.location.href has a search string then it's going to be missing in the returned `urlCurrent` value because `parseUrl(url)` returns `searchOriginal: null` since there isn't any search string in `url`.
+    // - Maybe `const { searchOriginal } = parseUrl(window.location.href)` can be a fix. (Let's check how `normalizeClientSideUrl()` is being used.)
     assert(!url.startsWith('#'));
     const { searchOriginal, hashOriginal, pathname } = parseUrl(url, '/');
     let urlCurrent = `${pathname}${searchOriginal || ''}`;

package/dist/esm/node/api/prepareViteApiCall.js

@@ -25,19 +25,19 @@ async function enhanceViteConfig(viteConfig, operation) {
     const viteInfo = await getInfoFromVite(viteConfig, operation);
     await assertViteRoot2(viteInfo.root, viteInfo.viteConfigEnhanced, operation);
     const vikeConfig = await getVikeConfig2(viteInfo.root, operation === 'dev', viteInfo.vikeVitePluginOptions);
-    const viteConfigEnhanced = addViteSettingsSetByUser(viteInfo.viteConfigEnhanced, vikeConfig);
+    const viteConfigEnhanced = addViteSettingsSetByVikeConfig(viteInfo.viteConfigEnhanced, vikeConfig);
     return {
         viteConfigEnhanced,
         vikeConfigGlobal: vikeConfig.vikeConfigGlobal
     };
 }
-function addViteSettingsSetByUser(viteConfigEnhanced, vikeConfig) {
+function addViteSettingsSetByVikeConfig(viteConfigEnhanced, vikeConfig) {
     const viteConfigs = vikeConfig.global.from.configsCumulative.vite;
     if (!viteConfigs)
         return viteConfigEnhanced;
     viteConfigs.values.forEach((v) => {
         assertUsage(isObject(v.value), `${v.definedAt} should be an object`);
-        viteConfigEnhanced = mergeConfig(v.value, viteConfigEnhanced ?? {});
+        viteConfigEnhanced = mergeConfig(viteConfigEnhanced ?? {}, v.value);
     });
     return viteConfigEnhanced;
 }

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

@@ -75,7 +75,7 @@ function commonConfig(vikeVitePluginOptions) {
                     // VITE_CONFIG
                     const configFromEnvVar = getEnvVarObject('VITE_CONFIG');
                     if (configFromEnvVar)
-                        configFromVike = mergeConfig(configFromEnvVar, configFromVike);
+                        configFromVike = mergeConfig(configFromVike, configFromEnvVar);
                     return configFromVike;
                 }
             }

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.219";
+export declare const PROJECT_VERSION: "0.4.220";

package/dist/esm/utils/PROJECT_VERSION.js

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

package/dist/esm/utils/assertSetup.js

@@ -116,7 +116,7 @@ function getEnvDescription() {
 // https://github.com/cloudflare/workers-sdk/issues/7886
 function assertNodeEnvIsNotUndefinedString() {
     const nodeEnv = getNodeEnv();
-    assertWarning(nodeEnv !== 'undefined', `${pc.cyan('process.env.NODE_ENV==="undefined"')} which is unexpected: ${pc.cyan('process.env.NODE_ENV')} can be set to the *value* ${pc.cyan('undefined')} (i.e. ${pc.cyan('process.env.NODE_ENV===undefined')}) but it shouldn't be set to the *string* ${pc.cyan('"undefined"')} ${pc.underline('https://vike.dev/NODE_ENV')}`, { onlyOnce: true });
+    assertWarning(nodeEnv !== 'undefined', `${pc.cyan('process.env.NODE_ENV==="undefined"')} which is unexpected: ${pc.cyan('process.env.NODE_ENV')} is allowed to be the *value* ${pc.cyan('undefined')} (i.e. ${pc.cyan('process.env.NODE_ENV===undefined')}) but it shouldn't be the *string* ${pc.cyan('"undefined"')} ${pc.underline('https://vike.dev/NODE_ENV')}`, { onlyOnce: true });
 }
 function isNodeEnvDev() {
     const nodeEnv = getNodeEnv();
@@ -136,6 +136,20 @@ function getNodeEnv() {
     catch {
         return undefined;
     }
+    /*
+    // Should we show the following warning? So far I don't think so because of the following. Maybe we can show it once we enable users to disable warnings.
+    // - The warning isn't always actionable, e.g. if it's a tool that dynamically sets `process.env.NODE_ENV`.
+    // - We assume that tools use `process.env.NODE_ENV` and not someting like `const { env } = process; env.NODE_ENV`. Thus, in practice, `val` overrides `val2` so having `val!==val2` isn't an issue.
+    {
+      const val2 = process.env['NODE' + '_ENV']
+      if (val2)
+        assertWarning(
+          val === val2,
+          `Dynamically setting process.env.NODE_ENV to ${val2} hasn't any effect because process.env.NODE_ENV is being statically replaced to ${val}.`,
+          { onlyOnce: true }
+        )
+    }
+    //*/
     return val;
 }
 function setNodeEnvProduction() {

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.219";
+    projectVersion: "0.4.220";
 };

package/package.json

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