crelte 0.5.5 → 0.5.7

package/dist/routing/router/ClientRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientRouter.d.ts","sourceRoot":"","sources":["../../../src/routing/router/ClientRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,UAAU,EAAE,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAG7C,MAAM,MAAM,mBAAmB,GAAG;IACjC,kBAAkB,EAAE,OAAO,CAAC;CAC5B,GAAG,iBAAiB,CAAC;AAEtB,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,UAAU;IACnD,OAAO,CAAC,qBAAqB,CAAa;IAC1C,OAAO,CAAC,kBAAkB,CAAU;IAEpC,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;gBAE5B,KAAK,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,mBAAmB;IAQ/D;;OAEG;IACG,IAAI;IAuBV;;OAEG;IACG,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IA6ChD,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,GAAE,cAAmB;IAYpD,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,GAAE,cAAmB;IAiB7D,IAAI,IAAI,IAAI;IAIZ;;;OAGG;IACG,qBAAqB,CAC1B,GAAG,EAAE,OAAO,EACZ,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GACnC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IASxB,MAAM;IAgEN,QAAQ;IAgCR,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI;CAwEpD"}
+{"version":3,"file":"ClientRouter.d.ts","sourceRoot":"","sources":["../../../src/routing/router/ClientRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,UAAU,EAAE,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAG7C,MAAM,MAAM,mBAAmB,GAAG;IACjC,kBAAkB,EAAE,OAAO,CAAC;CAC5B,GAAG,iBAAiB,CAAC;AAEtB,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,UAAU;IACnD,OAAO,CAAC,qBAAqB,CAAa;IAC1C,OAAO,CAAC,kBAAkB,CAAU;IAEpC,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;gBAE5B,KAAK,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,mBAAmB;IAQ/D;;OAEG;IACG,IAAI;IA8BV;;OAEG;IACG,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IA6ChD,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,GAAE,cAAmB;IAYpD,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,GAAE,cAAmB;IAiB7D,IAAI,IAAI,IAAI;IAIZ;;;OAGG;IACG,qBAAqB,CAC1B,GAAG,EAAE,OAAO,EACZ,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GACnC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IASxB,MAAM;IAgEN,QAAQ;IAgCR,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI;CA8DpD"}

package/dist/routing/router/ClientRouter.js

@@ -21,6 +21,10 @@ export default class ClientRouter extends BaseRouter {
             disableScroll: true,
         });
         req.z_fillFromState(window.history.state);
+        if (req.inLivePreview()) {
+            const scrollY = parseInt(sessionStorage.getItem('live-preview-scroll') ?? '');
+            req.scrollY = Number.isInteger(scrollY) ? scrollY : null;
+        }
         window.history.scrollRestoration = 'manual';
         if (req.scrollY) {
             // restore scroll position instantly (instead of waiting until svelte
@@ -187,19 +191,8 @@ export default class ClientRouter extends BaseRouter {
             return;
         // scroll to target
         let scrollTo = null;
-        // if the route is a live preview init and we have a scrollY stored
-        // scroll to that
-        if (req.inLivePreview()) {
-            const scrollY = sessionStorage.getItem('live-preview-scroll');
-            if (scrollY) {
-                scrollTo = {
-                    top: parseInt(scrollY),
-                    behavior: 'instant',
-                };
-            }
-            // if we have a hash and the route was not visited
-        }
-        else if (req.hash &&
+        // if we have a hash and the route was not visited
+        if (req.hash &&
             ((req.origin === 'init' && typeof req.scrollY !== 'number') ||
                 req.origin === 'click')) {
             const el = document.getElementById(req.hash.substring(1));

package/dist/vite/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vite/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,MAAM,EAMN,MAAM,MAAM,CAAC;AAwId,MAAM,MAAM,aAAa,GAAG;IAC3B,kEAAkE;IAClE,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,MAAM,CAyK3D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vite/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,MAAM,EAMN,MAAM,MAAM,CAAC;AA8Id,MAAM,MAAM,aAAa,GAAG;IAC3B,kEAAkE;IAClE,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,MAAM,CAyK3D"}

package/dist/vite/index.js

@@ -22,16 +22,21 @@ function usedSsrComponents(code, id, options, svelte5) {
     const file = relative('.', id);
     let idx;
     if (svelte5) {
-        // this will not catch all cases, but it should be enough
-        // since almost all components will have props
-        const initFnSign = '($$renderer, $$props) {';
-        idx = code.indexOf(initFnSign);
+        const defFnSign = 'export default function ';
+        idx = code.indexOf(defFnSign);
         if (idx < 0)
             return;
-        const renderCompSign = '$$renderer.component(($$renderer) => {';
-        idx = code.indexOf(renderCompSign, idx);
-        if (idx < 0)
+        const withPropsIdx = code.indexOf('($$renderer, $$props) {', idx);
+        const noPropsIdx = code.indexOf('($$renderer) {', idx);
+        idx = withPropsIdx >= 0 ? withPropsIdx : noPropsIdx;
+        if (idx < 0) {
+            console.error('could not find svelte5 init', id);
             return;
+        }
+        const renderCompSign = '$$renderer.component(($$renderer) => {';
+        const renderCompIdx = code.indexOf(renderCompSign, idx);
+        if (renderCompIdx >= 0)
+            idx = renderCompIdx;
         // Find the end of the line where the pattern was found
         idx = code.indexOf('\n', idx);
         if (idx < 0)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "crelte",
-	"version": "0.5.5",
+	"version": "0.5.7",
 	"author": "Crelte <support@crelte.com>",
 	"type": "module",
 	"scripts": {

package/src/routing/router/ClientRouter.ts

@@ -36,6 +36,13 @@ export default class ClientRouter extends BaseRouter {
 		});
 		req.z_fillFromState(window.history.state);
 
+		if (req.inLivePreview()) {
+			const scrollY = parseInt(
+				sessionStorage.getItem('live-preview-scroll') ?? '',
+			);
+			req.scrollY = Number.isInteger(scrollY) ? scrollY : null;
+		}
+
 		window.history.scrollRestoration = 'manual';
 		if (req.scrollY) {
 			// restore scroll position instantly (instead of waiting until svelte
@@ -253,18 +260,8 @@ export default class ClientRouter extends BaseRouter {
 			| { intoView: HTMLElement; behavior: ScrollBehavior }
 			| null = null;
 
-		// if the route is a live preview init and we have a scrollY stored
-		// scroll to that
-		if (req.inLivePreview()) {
-			const scrollY = sessionStorage.getItem('live-preview-scroll');
-			if (scrollY) {
-				scrollTo = {
-					top: parseInt(scrollY),
-					behavior: 'instant',
-				};
-			}
-			// if we have a hash and the route was not visited
-		} else if (
+		// if we have a hash and the route was not visited
+		if (
 			req.hash &&
 			((req.origin === 'init' && typeof req.scrollY !== 'number') ||
 				req.origin === 'click')

package/src/vite/index.ts

@@ -48,15 +48,21 @@ function usedSsrComponents(
 
 	let idx;
 	if (svelte5) {
-		// this will not catch all cases, but it should be enough
-		// since almost all components will have props
-		const initFnSign = '($$renderer, $$props) {';
-		idx = code.indexOf(initFnSign);
+		const defFnSign = 'export default function ';
+		idx = code.indexOf(defFnSign);
 		if (idx < 0) return;
 
+		const withPropsIdx = code.indexOf('($$renderer, $$props) {', idx);
+		const noPropsIdx = code.indexOf('($$renderer) {', idx);
+		idx = withPropsIdx >= 0 ? withPropsIdx : noPropsIdx;
+		if (idx < 0) {
+			console.error('could not find svelte5 init', id);
+			return;
+		}
+
 		const renderCompSign = '$$renderer.component(($$renderer) => {';
-		idx = code.indexOf(renderCompSign, idx);
-		if (idx < 0) return;
+		const renderCompIdx = code.indexOf(renderCompSign, idx);
+		if (renderCompIdx >= 0) idx = renderCompIdx;
 
 		// Find the end of the line where the pattern was found
 		idx = code.indexOf('\n', idx);