@openstack_dev/gatsby-theme-marketing-oif-core 1.0.31 → 1.0.33-beta.1

package/.nvmrc

@@ -1 +1 @@
-18.20.2
+20.19.4

package/package.json

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

package/redirection-rules.js

@@ -1,13 +1,17 @@
 const fs = require("fs");
 const yaml = require("js-yaml");
 
+const HTTP_301 = 301;
+const HTTP_200 = 200;
+const BASE_10 = 10;
+
 require("dotenv").config({
-  path: `.env.${process.env.NODE_ENV}`,
+  path: `.env.${process.env.NODE_ENV}`
 });
 
 const NodeType = {
   Header: "header",
-  Route: "route",
+  Route: "route"
 };
 
 const tomlNodeExists = (formerToml, nodeType, route) => {
@@ -36,52 +40,60 @@ const buildRedirectionRules = () => {
   }
 
   let netlifyToml = "";
+  if (netlifyConfig?.headers?.length > 0) {
+    for (let i = 0; i < netlifyConfig.headers.length; i++) {
+      const header = netlifyConfig.headers[i];
 
-  for (let i = 0; i < netlifyConfig.headers.length; i++) {
-    const header = netlifyConfig.headers[i];
-
-    if (formerToml && tomlNodeExists(formerToml, NodeType.Header, header.for)) continue;
+      if (formerToml && tomlNodeExists(formerToml, NodeType.Header, header.for))
+        continue;
 
-    netlifyToml += `
+      netlifyToml += `
     [[headers]]
       # Define which paths this specific [[headers]] block will cover.
       for = "${header.for}"
         [headers.values]
           Authorization = "Basic ${authToken}"\n`;
+    }
   }
 
-  for (let i = 0; i < netlifyConfig.redirects.length; i++) {
-    const redirect = netlifyConfig.redirects[i];
-    // see https://docs.netlify.com/routing/redirects/redirect-options/#splats
-    const hasSplat = redirect.from.endsWith("*");
-    if (formerToml && tomlNodeExists(formerToml, NodeType.Route, redirect.from)) continue;
-
-    const httpRegExp = /^https?:\/\//;
-    const isAbsolute = httpRegExp.test(redirect.to);
-    const host = isAbsolute ? '' : redirectionHost;
-
-    // Status code logic correction:
-    // 200 for regular redirects (within the same site): for backward compatibility below v1.1.0
-    // 301 for absolute URLs (external redirects): permanent redirect
-    // If status is provided and is a valid number, has precedence over defaultStatus
-    const defaultStatus = isAbsolute ? 301 : 200;
-    const parsedStatus = parseInt(redirect.status, 10);
-    const status = !isNaN(parsedStatus) ? parsedStatus : defaultStatus;
-    const headers = [
-      `X-From = "netlify"`,
-      `X-Forwarded-Host = "${forwardedHost}"`,
-    ]
-    if (!isAbsolute) {
-      headers.unshift(`Authorization = "Basic ${authToken}"`);
-    }
+  if (netlifyConfig?.redirects?.length > 0) {
+    for (let i = 0; i < netlifyConfig.redirects.length; i++) {
+      const redirect = netlifyConfig.redirects[i];
+      // see https://docs.netlify.com/routing/redirects/redirect-options/#splats
+      const hasSplat = redirect.from.endsWith("*");
+      if (
+        formerToml &&
+        tomlNodeExists(formerToml, NodeType.Route, redirect.from)
+      )
+        continue;
+
+      const httpRegExp = /^https?:\/\//;
+      const isAbsolute = httpRegExp.test(redirect.to);
+      const host = isAbsolute ? "" : redirectionHost;
+
+      // Status code logic correction:
+      // 200 for regular redirects (within the same site): for backward compatibility below v1.1.0
+      // 301 for absolute URLs (external redirects): permanent redirect
+      // If status is provided and is a valid number, has precedence over defaultStatus
+      const defaultStatus = isAbsolute ? HTTP_301 : HTTP_200;
+      const parsedStatus = parseInt(redirect.status, BASE_10);
+      const status = !Number.isNaN(parsedStatus) ? parsedStatus : defaultStatus;
+      const headers = [
+        "X-From = \"netlify\"",
+        `X-Forwarded-Host = "${forwardedHost}"`
+      ];
+      if (!isAbsolute) {
+        headers.unshift(`Authorization = "Basic ${authToken}"`);
+      }
 
-    netlifyToml += `
+      netlifyToml += `
     [[redirects]]
       from = "${redirect.from}"
       to = "${host}${redirect.to}${hasSplat ? ":splat" : ""}"
       status = ${status}
       force = true
       headers = {${headers.join(", ")}}\n`;
+    }
   }
 
   if (!appendMode) {

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
 };