@quintype/framework 7.4.1-test-amp.0 → 7.4.2-internal-api.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.4.1](https://github.com/quintype/quintype-node-framework/compare/v7.4.0...v7.4.1) (2022-06-02)
+
+
+### 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.4.0](https://github.com/quintype/quintype-node-framework/compare/v7.2.0...v7.4.0) (2022-05-23)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.4.1-test-amp.0",
+  "version": "7.4.2-internal-api.1",
   "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.22-test-madrid.0",
+    "@quintype/amp": "^2.4.21",
     "@quintype/backend": "^2.3.1",
     "@quintype/components": "^3.0.0",
     "@quintype/prerender-node": "^3.2.24",

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

@@ -1,6 +1,7 @@
 const urlLib = require("url");
 const set = require("lodash/set");
 const get = require("lodash/get");
+const isEmpty = require("lodash/isEmpty");
 const cloneDeep = require("lodash/cloneDeep");
 const merge = require("lodash/merge");
 const { Story, AmpConfig } = require("../../impl/api-client-impl");
@@ -103,6 +104,7 @@ async function ampStoryPageHandler(
         infiniteScrollInlineConfig
       );
     }
+    const mergedAdditionalConfig = {};
     if (opts.getAdditionalConfig && opts.getAdditionalConfig instanceof Function) {
       const fetchedAdditionalConfig = await opts.getAdditionalConfig({
         story,
@@ -110,14 +112,14 @@ async function ampStoryPageHandler(
         ampApiConfig: ampConfig.ampConfig,
         publisherConfig: additionalConfig,
       });
-      merge(additionalConfig, fetchedAdditionalConfig);
+      merge(mergedAdditionalConfig, additionalConfig, fetchedAdditionalConfig);
     }
 
     const ampHtml = ampifyStory({
       story,
       publisherConfig: config.config,
       ampConfig: ampConfig.ampConfig,
-      additionalConfig,
+      additionalConfig: isEmpty(mergedAdditionalConfig) ? additionalConfig : mergedAdditionalConfig,
       opts: { ...domainSpecificOpts, domainSlug },
       seo: seoTags ? seoTags.toString() : "",
     });

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

@@ -35,7 +35,7 @@ function createTemporaryClient(config, hostname) {
     hostname.includes(str)
   );
   if (matchedString)
-    return new Client(`https://${hostname.replace(matchedString, "")}`, true);
+    return new Client(`http://${hostname.replace(matchedString, ".internal")}`, true);
 }
 
 function itemToCacheKey(publisherId, item, depth) {

package/test/unit/api-client-test.js

@@ -27,7 +27,7 @@ describe("ApiClient", function () {
         {},
         "foo-web.staging.quintype.io"
       );
-      assert.equal("https://foo.staging.quintype.io", client.baseUrl);
+      assert.equal("http://foo.internal.staging.quintype.io", client.baseUrl);
     });
 
     it("creates a temporary client if it matches a string with a .", function () {
@@ -36,7 +36,7 @@ describe("ApiClient", function () {
         {},
         "foo.madrid.quintype.io"
       );
-      assert.equal("https://foo.quintype.io", client.baseUrl);
+      assert.equal("http://foo.internal.quintype.io", client.baseUrl);
     });
 
     it("creates a temporary client if host_to_api_host_is set", function () {