@backstage/core-app-api 1.4.0 → 1.4.1-next.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @backstage/core-app-api
 
+## 1.4.1-next.0
+
+### Patch Changes
+
+- dff4d8ddb1: Fixed an issue where an explicit port the frontend base URL could break the app.
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
 ## 1.4.0
 
 ### Minor Changes

package/dist/index.esm.js

@@ -2727,6 +2727,13 @@ var __privateSet = (obj, member, value, setter) => {
   return value;
 };
 var _getProviderCalled;
+function createLocalBaseUrl(fullUrl) {
+  const url = new URL(fullUrl);
+  url.protocol = document.location.protocol;
+  url.hostname = document.location.hostname;
+  url.port = document.location.port;
+  return url.toString().replace(/\/$/, "");
+}
 function useConfigLoader(configLoader, components, appThemeApi) {
   var _a;
   const hasConfig = Boolean(configLoader);
@@ -2748,13 +2755,6 @@ function useConfigLoader(configLoader, components, appThemeApi) {
   let configReader;
   if ((_a = config.value) == null ? void 0 : _a.length) {
     const urlConfigReader = ConfigReader.fromConfigs(config.value);
-    const getOrigin = (url) => new URL(url).origin;
-    const overrideOrigin = (fullUrl) => {
-      return new URL(
-        fullUrl.replace(getOrigin(fullUrl), ""),
-        document.location.origin
-      ).href.replace(/\/$/, "");
-    };
     const appBaseUrl = urlConfigReader.getOptionalString("app.baseUrl");
     const backendBaseUrl = urlConfigReader.getOptionalString("backend.baseUrl");
     let configs = config.value;
@@ -2763,17 +2763,17 @@ function useConfigLoader(configLoader, components, appThemeApi) {
       context: "relative-resolver"
     };
     if (appBaseUrl && backendBaseUrl) {
-      const appOrigin = getOrigin(appBaseUrl);
-      const backendOrigin = getOrigin(backendBaseUrl);
+      const appOrigin = new URL(appBaseUrl).origin;
+      const backendOrigin = new URL(backendBaseUrl).origin;
       if (appOrigin === backendOrigin) {
-        const newBackendBaseUrl = overrideOrigin(backendBaseUrl);
+        const newBackendBaseUrl = createLocalBaseUrl(backendBaseUrl);
         if (backendBaseUrl !== newBackendBaseUrl) {
           relativeResolverConfig.data.backend = { baseUrl: newBackendBaseUrl };
         }
       }
     }
     if (appBaseUrl) {
-      const newAppBaseUrl = overrideOrigin(appBaseUrl);
+      const newAppBaseUrl = createLocalBaseUrl(appBaseUrl);
       if (appBaseUrl !== newAppBaseUrl) {
         relativeResolverConfig.data.app = { baseUrl: newAppBaseUrl };
       }