Merge branch 'main' into master

jsHelper/expFeatures.js

@@ -166,7 +166,8 @@
 			}
 			isFallback = false;
 			notice.remove();
-			remoteConfiguration = Spicetify?.RemoteConfigResolver?.remoteConfiguration ?? (await Spicetify.Platform?.RemoteConfigDebugAPI.getProperties());
+			remoteConfiguration =
+				Spicetify?.RemoteConfigResolver.value?.remoteConfiguration ?? (await Spicetify.Platform?.RemoteConfigDebugAPI.getProperties());
 		})();
 
 		for (const key of Object.keys(overrideList)) {

jsHelper/spicetifyWrapper.js

@@ -306,6 +306,51 @@ window.Spicetify = {
 	Platform: {},
 };
 
+// Based on https://blog.aziz.tn/2025/01/spotify-fix-lagging-issue-on-scrolling.html
+function applyScrollingFix() {
+	const scrollableElements = Array.from(document.querySelectorAll("*")).filter((el) => {
+		if (
+			el.id === "context-menu" ||
+			el.closest("#context-menu") ||
+			el.getAttribute("role") === "dialog" ||
+			el.classList.contains("popup") ||
+			el.getAttribute("aria-haspopup") === "true"
+		)
+			return false;
+
+		const style = window.getComputedStyle(el);
+		return style.overflow === "auto" || style.overflow === "scroll" || style.overflowY === "auto" || style.overflowY === "scroll";
+	});
+
+	for (const el of scrollableElements) {
+		if (!el.hasAttribute("data-scroll-optimized")) {
+			el.style.willChange = "transform";
+			el.style.transform = "translate3d(0, 0, 0)";
+			el.setAttribute("data-scroll-optimized", "true");
+		}
+	}
+}
+
+const observer = new MutationObserver(applyScrollingFix);
+
+observer.observe(document.body, {
+	childList: true,
+	subtree: true,
+	attributes: false,
+});
+
+const originalPushState = history.pushState;
+history.pushState = function (...args) {
+	originalPushState.apply(this, args);
+	setTimeout(applyScrollingFix, 100);
+};
+
+window.addEventListener("popstate", () => {
+	setTimeout(applyScrollingFix, 100);
+});
+
+applyScrollingFix();
+
 (function waitForPlatform() {
 	if (!Spicetify._platform) {
 		setTimeout(waitForPlatform, 50);

spicetify.go

@@ -111,6 +111,7 @@ func init() {
 	}
 
 	utils.MigrateConfigFolder()
+	utils.MigrateFolders()
 	cmd.InitConfig(quiet)
 
 	if len(commands) < 1 {

src/apply/apply.go

@@ -361,10 +361,10 @@ func insertHomeConfig(jsPath string, flags Flag) {
 				return fmt.Sprintf("%sSpicetifyHomeConfig.arrange(%s)%s", submatches[1], submatches[2], submatches[3])
 			})
 
-		// >= 1.2.45
+		// >= 1.2.40
 		utils.ReplaceOnce(
 			&content,
-			`(&&"HomeShortsSectionData".*\],)([a-zA-Z])(\}\)\()`,
+			`(&&"HomeShortsSectionData".*?[\],}])([a-zA-Z])(\}\)?\()`,
 			func(submatches ...string) string {
 				return fmt.Sprintf("%sSpicetifyHomeConfig.arrange(%s)%s", submatches[1], submatches[2], submatches[3])
 			})

src/utils/path-utils.go

@@ -24,6 +24,52 @@ func MigrateConfigFolder() {
 	}
 }
 
+func MigrateFolders() {
+	backupPath := filepath.Join(GetSpicetifyFolder(), "Backup")
+	extractedPath := filepath.Join(GetSpicetifyFolder(), "Extracted")
+
+	if _, err := os.Stat(backupPath); err == nil {
+		newBackupPath := GetStateFolder("Backup")
+		oldAbs, err := filepath.Abs(backupPath)
+		if err != nil {
+			Fatal(err)
+		}
+		newAbs, err := filepath.Abs(newBackupPath)
+		if err != nil {
+			Fatal(err)
+		}
+
+		if oldAbs != newAbs {
+			PrintBold("Migrating spicetify state (Backup, Extracted) folders")
+			err := Copy(backupPath, newBackupPath, true, nil)
+			if err != nil {
+				Fatal(err)
+			}
+			os.RemoveAll(backupPath)
+		}
+	}
+
+	if _, err := os.Stat(extractedPath); err == nil {
+		newExtractedPath := GetStateFolder("Extracted")
+		oldAbs, err := filepath.Abs(extractedPath)
+		if err != nil {
+			Fatal(err)
+		}
+		newAbs, err := filepath.Abs(newExtractedPath)
+		if err != nil {
+			Fatal(err)
+		}
+		if oldAbs != newAbs {
+			PrintBold("Migrating spicetify state (Backup, Extracted) folders")
+			err := Copy(extractedPath, newExtractedPath, true, nil)
+			if err != nil {
+				Fatal(err)
+			}
+			os.RemoveAll(extractedPath)
+		}
+	}
+}
+
 func ReplaceEnvVarsInString(input string) string {
 	var replacements []string
 	for _, v := range os.Environ() {