vike 0.4.199-commit-3be497f → 0.4.199-commit-6991a96
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/utils/PROJECT_VERSION.js +1 -1
- package/dist/esm/client/client-routing-runtime/initOnPopState.js +3 -4
- package/dist/esm/client/client-routing-runtime/renderPageClientSide.d.ts +0 -2
- package/dist/esm/client/client-routing-runtime/renderPageClientSide.js +1 -8
- package/dist/esm/utils/PROJECT_VERSION.d.ts +1 -1
- package/dist/esm/utils/PROJECT_VERSION.js +1 -1
- package/dist/esm/utils/projectInfo.d.ts +1 -1
- package/package.json +1 -1
|
@@ -21,7 +21,6 @@ function initOnPopState() {
|
|
|
21
21
|
const currentState = getState();
|
|
22
22
|
globalObject.previousState = currentState;
|
|
23
23
|
const scrollTarget = currentState.historyState?.scrollPosition || undefined;
|
|
24
|
-
const isUserLandPushStateNavigation = currentState.historyState?.triggeredBy === 'user';
|
|
25
24
|
const isHashNavigation = currentState.urlWithoutHash === previousState.urlWithoutHash;
|
|
26
25
|
const isBackwardNavigation = !currentState.historyState?.timestamp || !previousState.historyState?.timestamp
|
|
27
26
|
? null
|
|
@@ -46,19 +45,19 @@ function initOnPopState() {
|
|
|
46
45
|
// - Alternative: we completely take over hash navigation and reproduce the browser's native behavior upon hash navigation.
|
|
47
46
|
// - By using the `hashchange` event.
|
|
48
47
|
// - Problem: conflict if user wants to override the browser's default behavior? E.g. for smooth scrolling, or when using hashes for saving states of some fancy animations.
|
|
49
|
-
if (isHashNavigation
|
|
48
|
+
if (isHashNavigation) {
|
|
50
49
|
if (!isHashNavigationNew) {
|
|
51
50
|
setScrollPosition(scrollTarget);
|
|
52
51
|
}
|
|
53
52
|
return;
|
|
54
53
|
}
|
|
55
54
|
let abort;
|
|
56
|
-
globalObject.listeners.forEach(listener => {
|
|
55
|
+
globalObject.listeners.forEach((listener) => {
|
|
57
56
|
abort || (abort = listener({ _experimental: { previousState } }));
|
|
58
57
|
});
|
|
59
58
|
if (abort)
|
|
60
59
|
return;
|
|
61
|
-
await renderPageClientSide({ scrollTarget, isBackwardNavigation
|
|
60
|
+
await renderPageClientSide({ scrollTarget, isBackwardNavigation });
|
|
62
61
|
});
|
|
63
62
|
}
|
|
64
63
|
/** Control client-side navigation.
|
|
@@ -12,8 +12,6 @@ type RenderArgs = {
|
|
|
12
12
|
overwriteLastHistoryEntry?: boolean;
|
|
13
13
|
pageContextsFromRewrite?: PageContextFromRewrite[];
|
|
14
14
|
redirectCount?: number;
|
|
15
|
-
/** Whether the navigation was triggered by the user land calling `history.pushState()` */
|
|
16
|
-
isUserLandPushStateNavigation?: boolean;
|
|
17
15
|
isClientSideNavigation?: boolean;
|
|
18
16
|
};
|
|
19
17
|
declare function renderPageClientSide(renderArgs: RenderArgs): Promise<void>;
|
|
@@ -30,7 +30,7 @@ const globalObject = getGlobalObject('renderPageClientSide.ts', (() => {
|
|
|
30
30
|
})());
|
|
31
31
|
const { firstRenderStartPromise } = globalObject;
|
|
32
32
|
async function renderPageClientSide(renderArgs) {
|
|
33
|
-
const { urlOriginal = getCurrentUrl(), overwriteLastHistoryEntry = false, isBackwardNavigation, pageContextsFromRewrite = [], redirectCount = 0,
|
|
33
|
+
const { urlOriginal = getCurrentUrl(), overwriteLastHistoryEntry = false, isBackwardNavigation, pageContextsFromRewrite = [], redirectCount = 0, isClientSideNavigation = true } = renderArgs;
|
|
34
34
|
let { scrollTarget } = renderArgs;
|
|
35
35
|
const { previousPageContext } = globalObject;
|
|
36
36
|
addLinkPrefetchHandlers_unwatch();
|
|
@@ -117,13 +117,6 @@ async function renderPageClientSide(renderArgs) {
|
|
|
117
117
|
redirectHard(urlOriginal);
|
|
118
118
|
return;
|
|
119
119
|
}
|
|
120
|
-
const isSamePage = pageContextFromRoute.pageId &&
|
|
121
|
-
previousPageContext?.pageId &&
|
|
122
|
-
pageContextFromRoute.pageId === previousPageContext.pageId;
|
|
123
|
-
if (isUserLandPushStateNavigation && isSamePage) {
|
|
124
|
-
// Skip's Vike's rendering; let the user handle the navigation
|
|
125
|
-
return;
|
|
126
|
-
}
|
|
127
120
|
// TODO/eventually: create helper assertPageContextFromHook()
|
|
128
121
|
assert(!('urlOriginal' in pageContextFromRoute));
|
|
129
122
|
objectAssign(pageContext, pageContextFromRoute);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const PROJECT_VERSION: "0.4.199-commit-
|
|
1
|
+
export declare const PROJECT_VERSION: "0.4.199-commit-6991a96";
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// Automatically updated by @brillout/release-me
|
|
2
|
-
export const PROJECT_VERSION = '0.4.199-commit-
|
|
2
|
+
export const PROJECT_VERSION = '0.4.199-commit-6991a96';
|