@backstage/core-components 0.10.0-next.2 → 0.10.0-next.3

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @backstage/core-components
 
+## 0.10.0-next.3
+
+### Patch Changes
+
+- 7f5e79961d: Fix relative `sub-paths` by concatenating the app's base path with them.
+- a70869e775: Updated dependency `msw` to `^0.43.0`.
+- 693990d4fe: Updated dependency `@react-hookz/web` to `^15.0.0`.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.0.4-next.0
+
 ## 0.10.0-next.2
 
 ### Minor Changes

package/dist/index.esm.js

@@ -3,14 +3,15 @@ import Snackbar from '@material-ui/core/Snackbar';
 import IconButton from '@material-ui/core/IconButton';
 import CloseIcon from '@material-ui/icons/Close';
 import { Alert } from '@material-ui/lab';
-import { useApi, alertApiRef, useAnalytics, errorApiRef, storageApiRef, useApp, oauthRequestApiRef, useApiHolder, configApiRef, useElementFilter, attachComponentData, discoveryApiRef } from '@backstage/core-plugin-api';
+import { useApi, alertApiRef, useAnalytics, configApiRef, errorApiRef, storageApiRef, useApp, oauthRequestApiRef, useApiHolder, useElementFilter, attachComponentData, discoveryApiRef } from '@backstage/core-plugin-api';
 import pluralize from 'pluralize';
 import { makeStyles, createStyles, useTheme, darken, lighten, withStyles, styled, ThemeProvider } from '@material-ui/core/styles';
 import MaterialAvatar from '@material-ui/core/Avatar';
 import Button$1 from '@material-ui/core/Button';
 import classNames from 'classnames';
 import Link$1 from '@material-ui/core/Link';
-import { Link as Link$2, useSearchParams, useLocation, useResolvedPath, resolvePath } from 'react-router-dom';
+import { Link as Link$2, useSearchParams, useLocation, useResolvedPath as useResolvedPath$1, resolvePath } from 'react-router-dom';
+import { trimEnd, isEqual, orderBy, isMatch, transform } from 'lodash';
 import Tooltip from '@material-ui/core/Tooltip';
 import CopyIcon from '@material-ui/icons/FileCopy';
 import useCopyToClipboard from 'react-use/lib/useCopyToClipboard';
@@ -86,7 +87,6 @@ import TableCell from '@material-ui/core/TableCell';
 import TableRow from '@material-ui/core/TableRow';
 import ListItemIcon from '@material-ui/core/ListItemIcon';
 import Popover from '@material-ui/core/Popover';
-import { isEqual, orderBy, isMatch, transform } from 'lodash';
 import qs from 'qs';
 import MuiBrokenImageIcon from '@material-ui/icons/BrokenImage';
 import { Helmet } from 'react-helmet';
@@ -224,6 +224,31 @@ const useStyles$R = makeStyles({
   }
 }, { name: "Link" });
 const isExternalUri = (uri) => /^([a-z+.-]+):/.test(uri);
+const useBaseUrl = () => {
+  try {
+    const config = useApi(configApiRef);
+    return config.getOptionalString("app.baseUrl");
+  } catch {
+    return void 0;
+  }
+};
+const useBasePath = () => {
+  var _a;
+  const base = "http://dummy.dev";
+  const url = (_a = useBaseUrl()) != null ? _a : "/";
+  const { pathname } = new URL(url, base);
+  return trimEnd(pathname, "/");
+};
+const useResolvedPath = (uri) => {
+  let resolvedPath = String(uri);
+  const basePath = useBasePath();
+  const external = isExternalUri(resolvedPath);
+  const startsWithBasePath = resolvedPath.startsWith(basePath);
+  if (!external && !startsWithBasePath) {
+    resolvedPath = basePath.concat(resolvedPath);
+  }
+  return resolvedPath;
+};
 const getNodeText = (node) => {
   var _a;
   if (node instanceof Array) {
@@ -240,7 +265,7 @@ const getNodeText = (node) => {
 const Link = React.forwardRef(({ onClick, noTrack, ...props }, ref) => {
   const classes = useStyles$R();
   const analytics = useAnalytics();
-  const to = String(props.to);
+  const to = useResolvedPath(props.to);
   const linkText = getNodeText(props.children) || to;
   const external = isExternalUri(to);
   const newWindow = external && !!/^https?:/.exec(to);
@@ -251,19 +276,20 @@ const Link = React.forwardRef(({ onClick, noTrack, ...props }, ref) => {
     }
   };
   return external ? /* @__PURE__ */ React.createElement(Link$1, {
+    ...newWindow ? { target: "_blank", rel: "noopener" } : {},
+    ...props,
     ref,
     href: to,
     onClick: handleClick,
-    ...newWindow ? { target: "_blank", rel: "noopener" } : {},
-    ...props,
     className: classNames(classes.externalLink, props.className)
   }, props.children, /* @__PURE__ */ React.createElement("span", {
     className: classes.visuallyHidden
   }, ", Opens in a new window")) : /* @__PURE__ */ React.createElement(Link$1, {
+    ...props,
     ref,
     component: Link$2,
-    onClick: handleClick,
-    ...props
+    to,
+    onClick: handleClick
   });
 });
 
@@ -3596,7 +3622,7 @@ const SidebarSubmenuItem = (props) => {
   const closeSubmenu = () => {
     setIsHoveredOn(false);
   };
-  const toLocation = useResolvedPath(to != null ? to : "");
+  const toLocation = useResolvedPath$1(to != null ? to : "");
   const currentLocation = useLocation();
   let isActive = isLocationMatch(currentLocation, toLocation);
   const [showDropDown, setShowDropDown] = useState(false);
@@ -3946,7 +3972,7 @@ const WorkaroundNavLink = React.forwardRef(function WorkaroundNavLinkWithRef({
   ...rest
 }, ref) {
   let { pathname: locationPathname } = useLocation();
-  let { pathname: toPathname } = useResolvedPath(to);
+  let { pathname: toPathname } = useResolvedPath$1(to);
   if (!caseSensitive) {
     locationPathname = locationPathname.toLocaleLowerCase("en-US");
     toPathname = toPathname.toLocaleLowerCase("en-US");