@quintype/framework 7.5.0 → 7.7.0-beta-amp-cta.0

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [7.6.0](https://github.com/quintype/quintype-node-framework/compare/v7.4.0...v7.6.0) (2022-06-28)
+
+
+### Features
+
+* **api-client:** Implement wildcard_to_api_host ⚡  ([#308](https://github.com/quintype/quintype-node-framework/issues/308)) ([9c585f4](https://github.com/quintype/quintype-node-framework/commit/9c585f49fece1cba7271a47465633ca9c40034ff))
+
+
+### Bug Fixes
+
+* **amp:** Incorrect localised content displayed across publishers ([#304](https://github.com/quintype/quintype-node-framework/issues/304)) ([c47d929](https://github.com/quintype/quintype-node-framework/commit/c47d9294c022100a95ba5ca1d755dd4731b6b580))
+
 ## [7.5.0](https://github.com/quintype/quintype-node-framework/compare/v7.4.1...v7.5.0) (2022-06-27)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.5.0",
+  "version": "7.7.0-beta-amp-cta.0",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {
@@ -31,7 +31,7 @@
   "homepage": "https://github.com/quintype/quintype-node-framework#readme",
   "dependencies": {
     "@ampproject/toolbox-optimizer": "2.8.3",
-    "@quintype/amp": "^2.4.21",
+    "@quintype/amp": "^2.4.22-cta-feature.1",
     "@quintype/backend": "^2.3.1",
     "@quintype/components": "^3.0.0",
     "@quintype/prerender-node": "^3.2.24",

package/server/impl/api-client-impl.js

@@ -29,9 +29,9 @@ function createTemporaryClient(config, hostname) {
     return new Client(configuredHosts[hostname], true);
   }
 
-  const matchedMadridUrl = (config.wildcard_to_api_host || []).find((str) => hostname.includes(str));
+  const matchedWildcardUrl = (config.wildcard_to_api_host || []).find((str) => hostname.includes(str));
 
-  if (matchedMadridUrl) return new Client(`http://${hostname.replace(matchedMadridUrl, ".internal")}`, true);
+  if (matchedWildcardUrl) return new Client(`http://${hostname.replace(matchedWildcardUrl, ".internal")}`, true);
 
   const matchedString = (config.host_to_automatic_api_host || []).find((str) => hostname.includes(str));
 

package/server/routes.js

@@ -6,7 +6,7 @@
  * @category Server
  * @module routes
  */
-
+const { match } = require("path-to-regexp");
 const { generateServiceWorker } = require("./handlers/generate-service-worker");
 const {
   handleIsomorphicShell,
@@ -70,7 +70,10 @@ exports.upstreamQuintypeRoutes = function upstreamQuintypeRoutes(
   parseInt(_sMaxAge) > 0 &&
     apiProxy.on("proxyRes", function (proxyRes, req) {
       const pathName = get(req, ["originalUrl"], "").split("?")[0];
-      const checkForExcludeRoutes = excludeRoutes.includes(pathName);
+      const checkForExcludeRoutes = excludeRoutes.some((path) => {
+        const matchFn = match(path, { decode: decodeURIComponent });
+        return matchFn(pathName);
+      });
       const getCacheControl = get(proxyRes, ["headers", "cache-control"], "");
       if (!checkForExcludeRoutes && getCacheControl.includes("public")) {
         proxyRes.headers["cache-control"] = getCacheControl.replace(/s-maxage=\d*/g, `s-maxage=${_sMaxAge}`);
@@ -87,7 +90,13 @@ exports.upstreamQuintypeRoutes = function upstreamQuintypeRoutes(
   });
 
   // Mention the routes which don't want to override the s-maxage value
-  const excludeRoutes = ["/qlitics.js", "/api/v1/breaking-news"];
+  const excludeRoutes = [
+    "/qlitics.js",
+    "/api/v1/breaking-news",
+    "/stories.rss",
+    "/api/v1/collections/:slug.rss",
+    "/api/v1/advanced-search",
+  ];
 
   app.all("/api/*", sketchesProxy);
   app.all("/login", sketchesProxy);