Merge branch 'main' of https://github.com/vikejs/vike-solid into phon…

…zammi/fix-123

examples/full/.testRun.ts

@@ -193,9 +193,9 @@ async function ensureWasClientSideRouted(pageIdFirst: `/pages/${string}`) {
 }
 function findFirstPageId(html: string) {
   expect(html).toContain('<script id="vike_pageContext" type="application/json">');
-  expect(html).toContain("_pageId");
-  expect(html.split("_pageId").length).toBe(2);
-  const match = partRegex`"_pageId":"${/([^"]+)/}"`.exec(html);
+  expect(html).toContain('"pageId"');
+  expect(html.split('"pageId"').length).toBe(2);
+  const match = partRegex`"pageId":"${/([^"]+)/}"`.exec(html);
   expect(match).toBeTruthy();
   const pageId = match![1];
   expect(pageId).toBeTruthy();

examples/full/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "node-fetch": "^3.3.2",
     "solid-js": "^1.8.22",
-    "vike": "^0.4.195",
+    "vike": "^0.4.197",
     "vike-solid": "workspace:*"
   },
   "devDependencies": {

examples/full/pages/stardust/+Layout.tsx

@@ -30,11 +30,6 @@ function Layout(props: FlowProps) {
   );
 }
 
-function Link(props: any) {
-  // We set `keep-scroll-position` to tell Vike to preserve the current scroll position
-  return <a keep-scroll-position="" style={{ marginRight: 10, ...props.style }} {...props} />;
-}
-
 function Counter() {
   const [count, setCount] = createSignal(0);
   return (

examples/full/pages/starship/+Layout.tsx

@@ -43,8 +43,7 @@ function Layout(props: FlowProps) {
 }
 
 function Link(props: any) {
-  // We set `keep-scroll-position` to tell Vike to preserve the current scroll position
-  return <a keep-scroll-position="" style={{ marginRight: 10, ...props.style }} {...props} />;
+  return <a style={{ marginRight: 10, ...props.style }} {...props} />;
 }
 
 function Counter() {

examples/full/pages/starship/+config.ts

@@ -0,0 +1,6 @@
+import type { Config } from "vike/types";
+
+export default {
+  // https://vike.dev/keepScrollPosition
+  keepScrollPosition: true,
+} satisfies Config;

examples/minimal/package.json

@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "solid-js": "^1.8.22",
-    "vike": "^0.4.195",
+    "vike": "^0.4.197",
     "vike-solid": "workspace:*"
   },
   "devDependencies": {

examples/solid-query/package.json

@@ -9,7 +9,7 @@
     "@tanstack/solid-query": "^5.56.2",
     "node-fetch": "^3.3.2",
     "solid-js": "^1.8.22",
-    "vike": "^0.4.195",
+    "vike": "^0.4.197",
     "vike-solid": "workspace:*",
     "vike-solid-query": "workspace:^"
   },

packages/vike-solid-query/package.json

@@ -47,7 +47,7 @@
     "rollup-plugin-dts": "^6.1.1",
     "solid-js": "^1.8.22",
     "typescript": "^5.6.2",
-    "vike": "^0.4.196",
+    "vike": "^0.4.197",
     "vike-solid": "workspace:*"
   },
   "typesVersions": {

packages/vike-solid/package.json

@@ -34,7 +34,7 @@
     "solid-js": "^1.8.22",
     "tslib": "^2.7.0",
     "typescript": "^5.6.2",
-    "vike": "^0.4.196",
+    "vike": "^0.4.197",
     "vite": "^5.4.7"
   },
   "exports": {