@stoplight/elements-dev-portal 1.6.15 → 1.6.16

package/components/NodeContent/NodeContent.d.ts

@@ -12,3 +12,7 @@ export declare type NodeContentProps = {
     refResolver?: ReferenceResolver;
 };
 export declare const NodeContent: ({ node, Link, hideTryIt, hideTryItPanel, hideMocking, hideExport, tryItCredentialsPolicy, tryItCorsProxy, refResolver, }: NodeContentProps) => JSX.Element;
+export declare const getNodeUriParts: (uri: string) => {
+    fileUri: string;
+    pointer: string;
+};

package/index.esm.js

@@ -66,7 +66,15 @@ const LinkComponent = ({ children, href }) => {
     }
     if (href && ctx) {
         const [node, Link] = ctx;
-        const resolvedUri = resolve(dirname(node.uri), href);
+        const { fileUri } = getNodeUriParts(node.uri);
+        const { fileUri: hrefFileUri } = getNodeUriParts(href);
+        let resolvedUri;
+        if (hrefFileUri) {
+            resolvedUri = resolve(dirname(fileUri), href);
+        }
+        else {
+            resolvedUri = resolve(fileUri, href);
+        }
         const [resolvedUriWithoutAnchor, hash] = resolvedUri.split('#');
         const decodedUrl = decodeURIComponent(href);
         const decodedResolvedUriWithoutAnchor = decodeURIComponent(resolvedUriWithoutAnchor);
@@ -85,7 +93,15 @@ function getBundledUrl(url) {
     searchParams.append('deref', 'optimizedBundle');
     bundledUrl.search = searchParams.toString();
     return bundledUrl.toString();
-}
+}
+const getNodeUriParts = (uri) => {
+    const parts = uri.split(/(\.yaml|\.yml|\.json|\.md)/);
+    if (parts.length === 1) {
+        return { fileUri: '', pointer: parts[0] || '' };
+    }
+    const fileUri = `${parts[0] || ''}${parts[1] || ''}`;
+    return { fileUri, pointer: parts[2] || '' };
+};
 
 const SearchImpl = ({ isLoading, search, searchResults, isOpen, onClose, onClick, onSearch }) => {
     const listBoxRef = React.useRef(null);
@@ -202,7 +218,7 @@ const UpgradeToStarter = () => (React__default.createElement(Flex, { as: "a", hr
     React__default.createElement(Icon, { icon: faExclamationTriangle, size: "4x" }),
     React__default.createElement(Box, { pt: 3 }, "Please upgrade your Stoplight Workspace to the Starter Plan to use Elements Dev Portal in production.")));
 
-const appVersion = '1.6.15';
+const appVersion = '1.6.16';
 
 class ResponseError extends Error {
     constructor(message, responseCode) {

package/index.js

@@ -93,7 +93,15 @@ const LinkComponent = ({ children, href }) => {
     }
     if (href && ctx) {
         const [node, Link] = ctx;
-        const resolvedUri = path.resolve(path.dirname(node.uri), href);
+        const { fileUri } = getNodeUriParts(node.uri);
+        const { fileUri: hrefFileUri } = getNodeUriParts(href);
+        let resolvedUri;
+        if (hrefFileUri) {
+            resolvedUri = path.resolve(path.dirname(fileUri), href);
+        }
+        else {
+            resolvedUri = path.resolve(fileUri, href);
+        }
         const [resolvedUriWithoutAnchor, hash] = resolvedUri.split('#');
         const decodedUrl = decodeURIComponent(href);
         const decodedResolvedUriWithoutAnchor = decodeURIComponent(resolvedUriWithoutAnchor);
@@ -112,7 +120,15 @@ function getBundledUrl(url) {
     searchParams.append('deref', 'optimizedBundle');
     bundledUrl.search = searchParams.toString();
     return bundledUrl.toString();
-}
+}
+const getNodeUriParts = (uri) => {
+    const parts = uri.split(/(\.yaml|\.yml|\.json|\.md)/);
+    if (parts.length === 1) {
+        return { fileUri: '', pointer: parts[0] || '' };
+    }
+    const fileUri = `${parts[0] || ''}${parts[1] || ''}`;
+    return { fileUri, pointer: parts[2] || '' };
+};
 
 const SearchImpl = ({ isLoading, search, searchResults, isOpen, onClose, onClick, onSearch }) => {
     const listBoxRef = React__namespace.useRef(null);
@@ -229,7 +245,7 @@ const UpgradeToStarter = () => (React__default["default"].createElement(mosaic.F
     React__default["default"].createElement(mosaic.Icon, { icon: freeSolidSvgIcons.faExclamationTriangle, size: "4x" }),
     React__default["default"].createElement(mosaic.Box, { pt: 3 }, "Please upgrade your Stoplight Workspace to the Starter Plan to use Elements Dev Portal in production.")));
 
-const appVersion = '1.6.15';
+const appVersion = '1.6.16';
 
 class ResponseError extends Error {
     constructor(message, responseCode) {

package/index.mjs

@@ -66,7 +66,15 @@ const LinkComponent = ({ children, href }) => {
     }
     if (href && ctx) {
         const [node, Link] = ctx;
-        const resolvedUri = resolve(dirname(node.uri), href);
+        const { fileUri } = getNodeUriParts(node.uri);
+        const { fileUri: hrefFileUri } = getNodeUriParts(href);
+        let resolvedUri;
+        if (hrefFileUri) {
+            resolvedUri = resolve(dirname(fileUri), href);
+        }
+        else {
+            resolvedUri = resolve(fileUri, href);
+        }
         const [resolvedUriWithoutAnchor, hash] = resolvedUri.split('#');
         const decodedUrl = decodeURIComponent(href);
         const decodedResolvedUriWithoutAnchor = decodeURIComponent(resolvedUriWithoutAnchor);
@@ -85,7 +93,15 @@ function getBundledUrl(url) {
     searchParams.append('deref', 'optimizedBundle');
     bundledUrl.search = searchParams.toString();
     return bundledUrl.toString();
-}
+}
+const getNodeUriParts = (uri) => {
+    const parts = uri.split(/(\.yaml|\.yml|\.json|\.md)/);
+    if (parts.length === 1) {
+        return { fileUri: '', pointer: parts[0] || '' };
+    }
+    const fileUri = `${parts[0] || ''}${parts[1] || ''}`;
+    return { fileUri, pointer: parts[2] || '' };
+};
 
 const SearchImpl = ({ isLoading, search, searchResults, isOpen, onClose, onClick, onSearch }) => {
     const listBoxRef = React.useRef(null);
@@ -202,7 +218,7 @@ const UpgradeToStarter = () => (React__default.createElement(Flex, { as: "a", hr
     React__default.createElement(Icon, { icon: faExclamationTriangle, size: "4x" }),
     React__default.createElement(Box, { pt: 3 }, "Please upgrade your Stoplight Workspace to the Starter Plan to use Elements Dev Portal in production.")));
 
-const appVersion = '1.6.15';
+const appVersion = '1.6.16';
 
 class ResponseError extends Error {
     constructor(message, responseCode) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoplight/elements-dev-portal",
-  "version": "1.6.15",
+  "version": "1.6.16",
   "description": "UI components for composing beautiful developer documentation.",
   "keywords": [],
   "main": "./index.js",

package/version.d.ts

@@ -1 +1 @@
-export declare const appVersion = "1.6.15";
+export declare const appVersion = "1.6.16";