fix merge fails

This commit is contained in:
Half-Shot
2025-09-25 12:06:19 +01:00
parent 8d2c466e74
commit 717fd0aa3f

View File

@@ -343,8 +343,6 @@ let urlParamCache: {
export const getUrlParams = (
search = window.location.search,
hash = window.location.hash,
/** Skipping the cache might be needed in tests, to allow recomputing based on mocked platform changes. */
skipCache = false,
): UrlParams => {
if (
urlParamCache.search === search &&
@@ -543,15 +541,12 @@ export const computeUrlParams = (search = "", hash = ""): UrlParams => {
intentAndPlatformDerivedConfiguration,
);
const params = {
return {
...properties,
...intentPreset,
...pickBy(configuration, (v?: unknown) => v !== undefined),
...intentAndPlatformDerivedConfiguration,
};
urlParamCache = { search, hash, params };
return params;
};
/**