gatsby-matrix-theme 53.28.7 → 53.28.8

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [53.28.8](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/compare/v53.28.7...v53.28.8) (2026-09-01)
+
+
+### Bug Fixes
+
+* match ssr skipRoutes on subfolder-prefixed pathnames ([a4e9239](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/a4e92399e1dcee8fcf7f16d29f77d30ea19b90f3))
+* match ssr skipRoutes when the market subfolder is the first route segment ([6c0467b](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/6c0467b81e963ec5eed51d22d2de7d550435128a))
+
+
+* Merge branch 'fix/critical-css-asset-prefix' into 'master' ([2b628c6](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/2b628c634d2efa3c54dc1af38aea72bf571480b9))
+
 ## [53.28.7](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/compare/v53.28.6...v53.28.7) (2026-09-01)
 
 

package/critical-css/publicPrefix.js

@@ -25,4 +25,22 @@ function composePublicPrefix({ assetPrefix, pathPrefix, prefixPaths }) {
   return '';
 }
 
-module.exports = { composePublicPrefix };
+/**
+ * pathOfPrefix — the path-only portion of a combined prefix: '' for none, '/apostas' for both
+ * `/apostas` and `https://www.meutimao.com.br/apostas`. Subfolder-served sites receive request
+ * pathnames WITH the subfolder (e.g. `/apostas/s`), so route matching must strip this first.
+ */
+function pathOfPrefix(prefix) {
+  if (!prefix) return '';
+  if (isURL(prefix)) {
+    try {
+      const url = new URL(prefix.startsWith('//') ? `http:${prefix}` : prefix);
+      return url.pathname.replace(/\/$/, '');
+    } catch (e) {
+      return '';
+    }
+  }
+  return prefix;
+}
+
+module.exports = { composePublicPrefix, pathOfPrefix };

package/critical-css/publicPrefix.test.js

@@ -1,4 +1,4 @@
-import { composePublicPrefix } from './publicPrefix';
+import { composePublicPrefix, pathOfPrefix } from './publicPrefix';
 
 // Mirrors Gatsby's getPublicPath (gatsby/dist/utils/get-public-path.js) — these cases are the
 // documented semantics of __PATH_PREFIX__ / webpack publicPath.
@@ -43,3 +43,27 @@ describe('composePublicPrefix', () => {
     );
   });
 });
+
+describe('pathOfPrefix', () => {
+  test('empty prefix has no path', () => {
+    expect(pathOfPrefix('')).toBe('');
+    expect(pathOfPrefix(undefined)).toBe('');
+  });
+
+  test('URL prefix with a subfolder yields the subfolder path', () => {
+    expect(pathOfPrefix('https://www.meutimao.com.br/apostas')).toBe('/apostas');
+    expect(pathOfPrefix('https://odia.ig.com.br/apostas')).toBe('/apostas');
+  });
+
+  test('URL prefix at the domain root yields no path', () => {
+    expect(pathOfPrefix('https://prelive.apostasbrz.com')).toBe('');
+  });
+
+  test('protocol-relative prefix yields its path', () => {
+    expect(pathOfPrefix('//cdn.example.com/sub')).toBe('/sub');
+  });
+
+  test('bare path prefix is returned as-is', () => {
+    expect(pathOfPrefix('/blog')).toBe('/blog');
+  });
+});

package/gatsby-ssr.js

@@ -26,6 +26,7 @@ const fs = require('fs');
 const path = require('path');
 const React = require('react');
 const { resolveConfig } = require('./critical-css/config');
+const { pathOfPrefix } = require('./critical-css/publicPrefix');
 
 // module chunks = every emitted stylesheet except the base (`styles.*`) and route shells
 // (`component---*`), which Gatsby already inlines render-blocking for the matched route.
@@ -83,11 +84,25 @@ exports.onRenderBody = ({ setHeadComponents, pathname, pathPrefix }, pluginOptio
   try {
     const cfg = resolveConfig(pluginOptions);
     if (!cfg.enabled) return;
-    if (!cfg.skipRoutes.includes(firstSegment(pathname))) return;
 
     // pathPrefix here is Gatsby's combined __PATH_PREFIX__ (assetPrefix + pathPrefix) on
     // --prefix-paths builds — required for subfolder-served sites, '' on root-served ones.
     const prefix = typeof pathPrefix === 'string' ? pathPrefix.replace(/\/+$/, '') : '';
+
+    // Subfolder sites carry the subfolder IN the route: gatsby-core-theme creates the search page
+    // at `${market.path_prefix}/s` (e.g. `/apostas/s`), on every environment — so the first path
+    // segment is the market subfolder, not the route name. Match skipRoutes against the first two
+    // raw segments (route name is at most one market subfolder deep) and, for deeper asset-prefix
+    // subfolders, against the pathname with the prefix's path part stripped.
+    const basePath = pathOfPrefix(prefix);
+    const rawPath = String(pathname || '').split('?')[0];
+    const strippedPath =
+      basePath && (rawPath === basePath || rawPath.startsWith(`${basePath}/`))
+        ? rawPath.slice(basePath.length)
+        : rawPath;
+    const segments = rawPath.split('/').filter(Boolean).slice(0, 2);
+    segments.push(firstSegment(strippedPath));
+    if (!segments.some((seg) => cfg.skipRoutes.includes(seg))) return;
     const links = getModuleCssLinks(prefix);
     if (links.length) setHeadComponents(links);
   } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "53.28.7",
+  "version": "53.28.8",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",

package/storybook/public/project.json

@@ -1,2 +1 @@
-{"generatedAt":1788249952220,"builder":{"name":"webpack5"},"hasCustomBabel":false,"hasCustomWebpack":true,"hasStaticDirs":false,"hasStorybookEslint":false,"refCount":0,"metaFramework":{"name":"Gatsby","packageName":"gatsby","version":"5.13.6"},"monorepo":"Workspaces","packageManager":{"type":"yarn","version":"1.22.19"},"storybookVersion":"6.5.16","language":"javascript","storybookPackages":{"@storybook/addon-actions":{"version":"6.5.16"},"@storybook/builder-webpack5":{"version":"6.5.16"},"@storybook/manager-webpack5":{"version":"6.5.16"},"@storybook/react":{"version":"6.5.16"}},"framework":{"name":"react"},"addons":{"@storybook/addon-links":{"version":"6.5.16"},"@storybook/addon-essentials":{"version":"6.5.16"}}}
-don-measure":{"version":"6.5.16-alpha.0"},"@storybook/addon-outline":{"version":"6.5.16-alpha.0"},"@storybook/addon-storyshots":{"version":"6.5.16-alpha.0"},"@storybook/addon-storyshots-puppeteer":{"version":"6.5.16-alpha.0"},"@storybook/addon-storysource":{"version":"6.5.16-alpha.0"},"@storybook/addon-toolbars":{"version":"6.5.16-alpha.0"},"@storybook/addon-viewport":{"version":"6.5.16-alpha.0"},"@storybook/addons":{"version":"6.5.16-alpha.0"},"@storybook/angular":{"version":"6.5.16-alpha.0"},"@storybook/api":{"version":"6.5.16-alpha.0"},"@storybook/babel-plugin-require-context-hook":{"version":"1.0.1"},"@storybook/channel-postmessage":{"version":"6.5.16-alpha.0"},"@storybook/channel-websocket":{"version":"6.5.16-alpha.0"},"@storybook/channels":{"version":"6.5.16-alpha.0"},"@storybook/cli":{"version":"6.5.16-alpha.0"},"@storybook/client-api":{"version":"6.5.16-alpha.0"},"@storybook/client-logger":{"version":"6.5.16-alpha.0"},"@storybook/codemod":{"version":"6.5.16-alpha.0"},"@storybook/components":{"version":"6.5.16-alpha.0"},"@storybook/core":{"version":"6.5.16-alpha.0"},"@storybook/core-events":{"version":"6.5.16-alpha.0"},"@storybook/csf-tools":{"version":"6.5.16-alpha.0"},"@storybook/docs-tools":{"version":"6.5.16-alpha.0"},"@storybook/ember":{"version":"6.5.16-alpha.0"},"@storybook/eslint-config-storybook":{"version":"2.4.0"},"@storybook/html":{"version":"6.5.16-alpha.0"},"@storybook/instrumenter":{"version":"6.5.16-alpha.0"},"@storybook/jest":{"version":"0.0.5"},"@storybook/linter-config":{"version":"2.5.0"},"@storybook/node-logger":{"version":"6.5.16-alpha.0"},"@storybook/postinstall":{"version":"6.5.16-alpha.0"},"@storybook/preact":{"version":"6.5.16-alpha.0"},"@storybook/preview-web":{"version":"6.5.16-alpha.0"},"@storybook/react":{"version":"6.5.16-alpha.0"},"@storybook/router":{"version":"6.5.16-alpha.0"},"@storybook/semver":{"version":"7.3.2"},"@storybook/server":{"version":"6.5.16-alpha.0"},"@storybook/source-loader":{"version":"6.5.16-alpha.0"},"@storybook/store":{"version":"6.5.16-alpha.0"},"@storybook/svelte":{"version":"6.5.16-alpha.0"},"@storybook/telemetry":{"version":"6.5.16-alpha.0"},"@storybook/testing-library":{"version":"0.0.7"},"@storybook/theming":{"version":"6.5.16-alpha.0"},"@storybook/ui":{"version":"6.5.16-alpha.0"},"@storybook/vue":{"version":"6.5.16-alpha.0"},"@storybook/web-components":{"version":"6.5.16-alpha.0"},"eslint-plugin-storybook":{"version":"0.3.5"}},"framework":{"name":"angular"},"addons":{"@storybook/addon-links":{"version":"6.5.16-alpha.0"},"@storybook/addon-essentials":{"version":"6.5.16-alpha.0"}}}
+{"generatedAt":1788264822388,"builder":{"name":"webpack5"},"hasCustomBabel":false,"hasCustomWebpack":true,"hasStaticDirs":false,"hasStorybookEslint":false,"refCount":0,"metaFramework":{"name":"Gatsby","packageName":"gatsby","version":"5.13.6"},"monorepo":"Workspaces","packageManager":{"type":"yarn","version":"1.22.19"},"storybookVersion":"6.5.16","language":"javascript","storybookPackages":{"@storybook/addon-actions":{"version":"6.5.16"},"@storybook/builder-webpack5":{"version":"6.5.16"},"@storybook/manager-webpack5":{"version":"6.5.16"},"@storybook/react":{"version":"6.5.16"}},"framework":{"name":"react"},"addons":{"@storybook/addon-links":{"version":"6.5.16"},"@storybook/addon-essentials":{"version":"6.5.16"}}}