@backstage/core-app-api 1.2.1-next.2 → 1.2.1-next.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @backstage/core-app-api
 
+## 1.2.1-next.3
+
+### Patch Changes
+
+- 6870b43dd1: Fix for the automatic rewriting of base URLs.
+- 653d7912ac: Made `WebStorage` notify its subscribers when `localStorage` values change in other tabs/windows
+- Updated dependencies
+  - @backstage/config@1.0.5-next.1
+  - @backstage/core-plugin-api@1.2.0-next.2
+  - @backstage/types@1.0.2-next.1
+  - @backstage/version-bridge@1.0.3-next.0
+
 ## 1.2.1-next.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -535,16 +535,19 @@ declare class WebStorage implements StorageApi {
     private readonly namespace;
     private readonly errorApi;
     constructor(namespace: string, errorApi: ErrorApi);
+    private static hasSubscribed;
     static create(options: {
         errorApi: ErrorApi;
         namespace?: string;
     }): WebStorage;
+    private static addStorageEventListener;
     get<T>(key: string): T | undefined;
     snapshot<T extends JsonValue>(key: string): StorageValueSnapshot<T>;
     forBucket(name: string): WebStorage;
     set<T>(key: string, data: T): Promise<void>;
     remove(key: string): Promise<void>;
     observe$<T extends JsonValue>(key: string): Observable<StorageValueSnapshot<T>>;
+    private handleStorageChange;
     private getKeyName;
     private notifyChanges;
     private subscribers;

package/dist/index.esm.js

@@ -1613,7 +1613,7 @@ class OAuthRequestManager {
 }
 
 const buckets = /* @__PURE__ */ new Map();
-class WebStorage {
+const _WebStorage = class {
   constructor(namespace, errorApi) {
     this.namespace = namespace;
     this.errorApi = errorApi;
@@ -1627,7 +1627,17 @@ class WebStorage {
   }
   static create(options) {
     var _a;
-    return new WebStorage((_a = options.namespace) != null ? _a : "", options.errorApi);
+    return new _WebStorage((_a = options.namespace) != null ? _a : "", options.errorApi);
+  }
+  static addStorageEventListener() {
+    window.addEventListener("storage", (event) => {
+      var _a;
+      for (const [bucketPath, webStorage] of buckets.entries()) {
+        if ((_a = event.key) == null ? void 0 : _a.startsWith(bucketPath)) {
+          webStorage.handleStorageChange(event.key);
+        }
+      }
+    });
   }
   get(key) {
     return this.snapshot(key).value;
@@ -1656,7 +1666,7 @@ class WebStorage {
   forBucket(name) {
     const bucketPath = `${this.namespace}/${name}`;
     if (!buckets.has(bucketPath)) {
-      buckets.set(bucketPath, new WebStorage(bucketPath, this.errorApi));
+      buckets.set(bucketPath, new _WebStorage(bucketPath, this.errorApi));
     }
     return buckets.get(bucketPath);
   }
@@ -1669,8 +1679,21 @@ class WebStorage {
     this.notifyChanges(key);
   }
   observe$(key) {
+    if (!_WebStorage.hasSubscribed) {
+      _WebStorage.addStorageEventListener();
+      _WebStorage.hasSubscribed = true;
+    }
     return this.observable.filter(({ key: messageKey }) => messageKey === key);
   }
+  handleStorageChange(eventKey) {
+    if (!(eventKey == null ? void 0 : eventKey.startsWith(this.namespace))) {
+      return;
+    }
+    const trimmedKey = eventKey == null ? void 0 : eventKey.slice(`${this.namespace}/`.length);
+    if (!trimmedKey.includes("/")) {
+      this.notifyChanges(decodeURIComponent(trimmedKey));
+    }
+  }
   getKeyName(key) {
     return `${this.namespace}/${encodeURIComponent(key)}`;
   }
@@ -1680,7 +1703,9 @@ class WebStorage {
       subscription.next(snapshot);
     }
   }
-}
+};
+let WebStorage = _WebStorage;
+WebStorage.hasSubscribed = false;
 
 function traverseElementTree(options) {
   const collectors = {};
@@ -2540,7 +2565,7 @@ function useConfigLoader(configLoader, components, appThemeApi) {
       return new URL(
         fullUrl.replace(getOrigin(fullUrl), ""),
         document.location.origin
-      ).href;
+      ).href.replace(/\/$/, "");
     };
     const appBaseUrl = urlConfigReader.getOptionalString("app.baseUrl");
     const backendBaseUrl = urlConfigReader.getOptionalString("backend.baseUrl");
@@ -2553,15 +2578,17 @@ function useConfigLoader(configLoader, components, appThemeApi) {
       const appOrigin = getOrigin(appBaseUrl);
       const backendOrigin = getOrigin(backendBaseUrl);
       if (appOrigin === backendOrigin) {
-        relativeResolverConfig.data.backend = {
-          baseUrl: overrideOrigin(backendBaseUrl)
-        };
+        const newBackendBaseUrl = overrideOrigin(backendBaseUrl);
+        if (backendBaseUrl !== newBackendBaseUrl) {
+          relativeResolverConfig.data.backend = { baseUrl: newBackendBaseUrl };
+        }
       }
     }
     if (appBaseUrl) {
-      relativeResolverConfig.data.app = {
-        baseUrl: overrideOrigin(appBaseUrl)
-      };
+      const newAppBaseUrl = overrideOrigin(appBaseUrl);
+      if (appBaseUrl !== newAppBaseUrl) {
+        relativeResolverConfig.data.app = { baseUrl: newAppBaseUrl };
+      }
     }
     if (Object.keys(relativeResolverConfig.data).length) {
       configs = configs.concat([relativeResolverConfig]);