@openstack_dev/gatsby-theme-marketing-oif-core 1.0.32 → 1.0.33-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openstack_dev/gatsby-theme-marketing-oif-core",
-  "version": "1.0.32",
+  "version": "1.0.33-beta.2",
   "description": "Base theme for Marketing Sites",
   "author": "smarcet",
   "keywords": [

package/src/cms/config/index.js

@@ -1,3 +1,4 @@
+import { withPrefix } from "gatsby";
 import configurationsCollection from "./collections/configurationsCollection";
 
 const CMS_BACKEND_REPO = process.env.GATSBY_CMS_BACKEND_REPO;
@@ -5,6 +6,9 @@ const CMS_BACKEND_BRANCH = process.env.GATSBY_CMS_BACKEND_BRANCH || "main";
 
 export const collections = [configurationsCollection];
 
+// Gatsby sets __PATH_PREFIX__ at runtime ("" in dev, "/marketplace" in prod builds)
+const publicFolder = withPrefix("/img");
+
 const config = {
   backend: {
     name: "github",
@@ -22,7 +26,7 @@ const config = {
   // missing, but will improve performance and avoid a load error.
   load_config_file: false,
   media_folder: "static/img",
-  public_folder: "/img",
+  public_folder: publicFolder,
   collections
 };
 

package/src/components/Link.js

@@ -3,40 +3,73 @@ import { Link as GatsbyLink } from "gatsby";
 // Since DOM elements <a> cannot receive activeClassName
 // and partiallyActive, destructure the prop here and
 // pass it only to GatsbyLink
-function Link({
-  children, to, activeClassName, partiallyActive, ...other
-}) {
+function Link({ children, to, activeClassName, partiallyActive, ...other }) {
   // Tailor the following test to your environment.
-  // This example assumes that any internal link (intended for Gatsby)
-  // will start with exactly one slash, and that anything else is external.
-  const internal = /^\/(?!\/)/.test(to);
-  // Use Gatsby Link for internal links, and <a> for others
+
   const email = /\S+@\S+\.\S+/.test(to);
+  const isAbsoluteUrl = /^(https?:)?\/\//i.test(to);
+  const isHash = to.startsWith("#");
+
+  // Gatsby pathPrefix at runtime ("" in dev, "/marketplace" in your build)
+  const prefix =
+    typeof __PATH_PREFIX__ !== "undefined" && __PATH_PREFIX__
+      ? __PATH_PREFIX__
+      : "";
+
+  console.log(`Link::render prefix ${prefix}`);
+  // Internal for Gatsby routing *only if*:
+  // - it’s a single-slash path
+  // - and it’s inside the current prefix (or there is no prefix)
+  const isSingleSlashPath = /^\/(?!\/)/.test(to);
+
+  // If we're running with /marketplace prefix, only /marketplace/* should be Gatsby-internal
+  const internal =
+    isSingleSlashPath &&
+    (!prefix || to === prefix || to.startsWith(`${prefix}/`));
 
+  // Use Gatsby Link for internal links, and <a> for others
   if (internal) {
     return (
       <GatsbyLink
         to={to}
         activeClassName={activeClassName}
         partiallyActive={partiallyActive}
-        // eslint-disable-next-line react/jsx-props-no-spreading
         {...other}
       >
         {children}
       </GatsbyLink>
     );
   }
+
   if (email) {
     const href = /^mailto:/.test(to) ? to : `mailto:${to}`;
     return (
-      // eslint-disable-next-line react/jsx-props-no-spreading
       <a href={href} {...other}>
         {children}
       </a>
     );
   }
+
+  // For absolute URLs keep new tab behavior
+  if (isAbsoluteUrl) {
+    return (
+      <a href={to} target="_blank" rel="noreferrer" {...other}>
+        {children}
+      </a>
+    );
+  }
+
+  // Hash or base-site root paths like /software should be same-tab
+  if (isHash || isSingleSlashPath) {
+    return (
+      <a href={to} {...other}>
+        {children}
+      </a>
+    );
+  }
+
+  // Fallback
   return (
-    // eslint-disable-next-line react/jsx-props-no-spreading
     <a href={to} target="_blank" rel="noreferrer" {...other}>
       {children}
     </a>