@quintype/framework 7.7.0-beta-amp-cta.2 → 7.7.1

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 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.7.1](https://github.com/quintype/quintype-node-framework/compare/v7.7.0...v7.7.1) (2022-07-06)
+
+## [7.7.0](https://github.com/quintype/quintype-node-framework/compare/v7.4.1...v7.7.0) (2022-07-05)
+
+
+### 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))
+
+### [7.6.2](https://github.com/quintype/quintype-node-framework/compare/v7.6.1...v7.6.2) (2022-07-01)
+
+### [7.6.1](https://github.com/quintype/quintype-node-framework/compare/v7.6.0...v7.6.1) (2022-06-30)
+
 ## [7.6.0](https://github.com/quintype/quintype-node-framework/compare/v7.4.0...v7.6.0) (2022-06-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.7.0-beta-amp-cta.2",
+  "version": "7.7.1",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {
@@ -9,7 +9,7 @@
   },
   "scripts": {
     "prepublishOnly": "npm test && ./bin-dev-scripts/standard-version-release.sh",
-    "test": "NODE_ENV=test npx mocha --recursive --require ./test/babel",
+    "test": "NODE_ENV=test npx mocha --timeout 5000 --recursive --require ./test/babel",
     "watch-test": "NODE_ENV=test npx mocha --recursive --watch --require ./test/babel",
     "coverage": "nyc --all npm test",
     "coverage-html": "nyc --all --reporter=html npm test",
@@ -31,7 +31,7 @@
   "homepage": "https://github.com/quintype/quintype-node-framework#readme",
   "dependencies": {
     "@ampproject/toolbox-optimizer": "2.8.3",
-    "@quintype/amp": "^2.4.22-cta-feature.2",
+    "@quintype/amp": "^2.4.23",
     "@quintype/backend": "^2.3.1",
     "@quintype/components": "^3.0.0",
     "@quintype/prerender-node": "^3.2.24",

package/server/amp/handlers/story-page.js

@@ -34,22 +34,21 @@ async function ampStoryPageHandler(
     ampLibrary = require("@quintype/amp"),
     additionalConfig = require("../../publisher-config"),
     InfiniteScrollAmp = require("../helpers/infinite-scroll"),
+    isVisualStory = false,
     ...rest
   }
 ) {
   try {
     const opts = cloneDeep(rest);
-
     const redirectUrls = opts && opts.redirectUrls;
     const getEnableAmp = get(opts, ["enableAmp"], true);
-
     const enableAmp = typeof getEnableAmp === "function" ? opts.enableAmp(config) : getEnableAmp;
 
     if (typeof redirectUrls === "function" || (redirectUrls && Object.keys(redirectUrls).length > 0)) {
       await getRedirectUrl(req, res, next, { redirectUrls, config });
     }
 
-    if (!enableAmp) {
+    if (!isVisualStory && !enableAmp) {
       return res.redirect(301, `/${req.params[0]}`);
     }
 

package/server/handlers/custom-route-handler.js

@@ -2,6 +2,7 @@ const urlLib = require("url");
 const ejs = require("ejs");
 const fs = require("fs");
 const path = require("path");
+const set = require("lodash/set");
 
 const staticPageTemplateStr = fs.readFileSync(path.join(__dirname, "../views/static-page.ejs"), { encoding: "utf-8" });
 const staticPageTemplate = ejs.compile(staticPageTemplateStr);
@@ -29,7 +30,9 @@ function writeStaticPageResponse(res, url, page, result, { config, renderLayout,
   });
 
   const seoInstance = typeof seo === "function" ? seo(config) : seo;
-  const seoTags = seoInstance && seoInstance.getMetaTags(config, page.type, {}, { url });
+
+  const seoTags =
+    seoInstance && seoInstance.getMetaTags(config, page.type, set(result, ["data", "page"], page), { url });
 
   res.status(page["status-code"] || 200);
 

package/server/routes.js

@@ -630,5 +630,5 @@ exports.ampRoutes = (app, opts = {}) => {
   getWithConfig(app, "/amp/story/*", ampStoryPageHandler, opts);
   getWithConfig(app, "/amp/api/v1/amp-infinite-scroll", storyPageInfiniteScrollHandler, opts);
   getWithConfig(app, "/amp/api/v1/bookend.json", bookendHandler, opts);
-  getWithConfig(app, "/ampstories/*", ampStoryPageHandler, opts);
+  getWithConfig(app, "/ampstories/*", ampStoryPageHandler, { ...opts, isVisualStory: true });
 };