@quintype/framework 6.1.3-amp-logo.3 → 6.1.5-webpack5.2

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 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.
 
+### [6.1.4](https://github.com/quintype/quintype-node-framework/compare/v6.1.2...v6.1.4) (2021-10-04)
+
+### [6.1.3](https://github.com/quintype/quintype-node-framework/compare/v6.1.2...v6.1.3) (2021-10-04)
+
 ### [6.1.2](https://github.com/quintype/quintype-node-framework/compare/v6.1.1...v6.1.2) (2021-09-17)
 
 ### [6.1.1](https://github.com/quintype/quintype-node-framework/compare/v6.1.0...v6.1.1) (2021-09-08)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "6.1.3-amp-logo.3",
+  "version": "6.1.5-webpack5.2",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "scripts": {
@@ -26,76 +26,75 @@
   },
   "homepage": "https://github.com/quintype/quintype-node-framework#readme",
   "dependencies": {
-    "@ampproject/toolbox-optimizer": "2.8.0",
-    "@quintype/amp": "^2.4.12-visual-story-logo.3",
+    "@ampproject/toolbox-optimizer": "2.8.3",
+    "@quintype/amp": "^2.4.12",
     "@quintype/backend": "^2.1.0",
-    "@quintype/components": "^2.31.2",
+    "@quintype/components": "^2.31.8-webpack5.1",
     "@quintype/prerender-node": "^3.2.24",
     "@quintype/seo": "^1.38.1",
     "atob": "^2.1.2",
     "cluster": "^0.7.7",
     "compression": "^1.7.4",
-    "ejs": "^2.6.1",
-    "elastic-apm-node": "^3.14.0",
-    "express": "^4.16.4",
-    "firebase": "^6.0.2",
+    "ejs": "^3.1.6",
+    "express": "^4.17.1",
+    "firebase": "^9.1.1",
     "get-youtube-id": "^1.0.1",
     "grpc": "^1.21.1",
-    "http-proxy": "^1.17.0",
-    "js-yaml": "^3.13.1",
-    "lodash": "^4.17.15",
+    "http-proxy": "^1.18.1",
+    "js-yaml": "^4.1.0",
+    "lodash": "^4.17.21",
     "mocha-snapshots": "^4.2.0",
-    "morgan": "^1.9.1",
+    "morgan": "^1.10.0",
     "path-to-regexp": "^6.2.0",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
-    "react-redux": "^7.0.1",
-    "react-router": "^5.0.0",
-    "redux": "^4.0.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-redux": "^7.2.5",
+    "react-router": "^5.2.1",
+    "redux": "^4.1.1",
     "request-promise": "^4.2.6",
-    "sleep-promise": "^8.0.1",
-    "winston": "3.2.1"
+    "sleep-promise": "^9.1.0",
+    "winston": "3.3.3"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.14.5",
-    "@loadable/component": "^5.14.1",
-    "@loadable/server": "^5.14.2",
-    "@quintype/build": "^3.13.0",
+    "@babel/eslint-parser": "^7.15.7",
+    "@loadable/component": "^5.15.0",
+    "@loadable/server": "^5.15.1",
+    "@quintype/build": "^3.13.1",
     "babel-plugin-quintype-assets": "^1.1.1",
-    "babel-plugin-react-css-modules": "^5.2.4",
+    "babel-plugin-react-css-modules": "^5.2.6",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-es2015-tree-shaking": "^1.0.1",
     "babel-preset-react": "^6.24.1",
     "babel-register": "^6.26.0",
-    "better-docs": "^1.3.0",
-    "eslint": "^5.16.0",
-    "eslint-config-prettier": "^4.1.0",
-    "eslint-config-standard": "^12.0.0",
-    "eslint-plugin-import": "^2.17.2",
-    "eslint-plugin-node": "^8.0.1",
-    "eslint-plugin-prettier": "^3.0.1",
-    "eslint-plugin-promise": "^4.1.1",
-    "eslint-plugin-react": "^7.12.4",
-    "eslint-plugin-standard": "^4.0.1",
-    "gh-pages": "^2.1.1",
-    "history": "^4.9.0",
-    "husky": "^4.3.8",
-    "jsdoc": "^3.6.3",
-    "jsdom": "^14.0.0",
+    "better-docs": "^2.3.2",
+    "eslint": "^7.32.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-react": "^7.26.1",
+    "eslint-plugin-standard": "^4.1.0",
+    "gh-pages": "^3.2.3",
+    "history": "^5.0.1",
+    "husky": "^7.0.2",
+    "jsdoc": "^3.6.7",
+    "jsdom": "^17.0.0",
     "jsdom-global": "3.0.2",
-    "lint-staged": "^8.1.5",
-    "mocha": "^6.1.4",
-    "nyc": "^14.1.1",
-    "onchange": "^4.1.0",
+    "lint-staged": "^11.2.0",
+    "mocha": "^9.1.2",
+    "nyc": "^15.1.0",
+    "onchange": "^7.1.0",
     "path": "^0.12.7",
-    "prettier": "^2.2.1",
-    "standard-version": "^8.0.1",
-    "supertest": "^4.0.2"
+    "prettier": "^2.4.1",
+    "standard-version": "^9.3.1",
+    "supertest": "^6.1.6"
   },
   "peerDependencies": {
-    "@quintype/seo": "^1.22.0"
+    "@quintype/seo": "^1.39.0"
   },
   "nyc": {
     "exclude": [

package/server/amp/handlers/infinite-scroll.js

@@ -1,20 +1,10 @@
 const { AmpConfig } = require("../../impl/api-client-impl");
 const InfiniteScrollAmp = require("../helpers/infinite-scroll");
 const { setCorsHeaders } = require("../helpers");
-const { handleSpanInstance } = require("../../utils/apm");
 
 // eslint-disable-next-line consistent-return
-async function storyPageInfiniteScrollHandler(
-  req,
-  res,
-  next,
-  { client, config }
-) {
-  const apmInstance = handleSpanInstance({ isStart: true, title: "storyPageInfiniteScrollHandler" });
-  const ampConfig = await config.memoizeAsync(
-    "amp-config",
-    async () => await AmpConfig.getAmpConfig(client)
-  );
+async function storyPageInfiniteScrollHandler(req, res, next, { client, config }) {
+  const ampConfig = await config.memoizeAsync("amp-config", async () => await AmpConfig.getAmpConfig(client));
 
   const infiniteScrollAmp = new InfiniteScrollAmp({
     ampConfig,
@@ -26,7 +16,7 @@ async function storyPageInfiniteScrollHandler(
   if (jsonResponse instanceof Error) return next(jsonResponse);
   res.set("Content-Type", "application/json; charset=utf-8");
   setCorsHeaders({ req, res, next, publisherConfig: config });
-  handleSpanInstance({ apmInstance });
+
   if (!res.headersSent) return res.send(jsonResponse);
 }
 

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

@@ -7,7 +7,6 @@ const { Story, AmpConfig } = require("../../impl/api-client-impl");
 const { optimize, getDomainSpecificOpts } = require("../helpers");
 const { storyToCacheKey } = require("../../caching");
 const { addCacheHeadersToResult } = require("../../handlers/cdn-caching");
-const { handleSpanInstance } = require("../../utils/apm");
 
 /**
  * ampStoryPageHandler gets all the things needed and calls "ampifyStory" function (which comes from ampLib)
@@ -37,7 +36,6 @@ async function ampStoryPageHandler(
   }
 ) {
   try {
-    const apmInstance = handleSpanInstance({ isStart: true, title: "ampStoryPageHandler" });
     const opts = cloneDeep(rest);
     const domainSpecificOpts = getDomainSpecificOpts(opts, domainSlug);
     const url = urlLib.parse(req.url, true);
@@ -120,7 +118,7 @@ async function ampStoryPageHandler(
 
     const optimizeAmpHtml = get(domainSpecificOpts, ["featureConfig", "optimizeAmpHtml"], true);
     const finalResponse = optimizeAmpHtml ? await optimize(ampHtml) : ampHtml;
-    handleSpanInstance({ apmInstance });
+
     return res.send(finalResponse);
   } catch (e) {
     return next(e);

package/server/amp/handlers/visual-stories-bookend.js

@@ -1,5 +1,4 @@
 const get = require("lodash/get");
-const { handleSpanInstance } = require("../../utils/apm");
 
 function getStoryUrl(story, config) {
   if (get(story, ["story-template"]) === "news-elsewhere") {
@@ -8,16 +7,7 @@ function getStoryUrl(story, config) {
   return `${config["sketches-host"]}/${story.slug}`;
 }
 
-async function bookendHandler(
-  req,
-  res,
-  next,
-  { config, client, sMaxAge = "900" }
-) {
-  const apmInstance = handleSpanInstance({
-    isStart: true,
-    title: "bookendHandler",
-  });
+async function bookendHandler(req, res, next, { config, client, sMaxAge = "900" }) {
   const { storyId, sectionId } = req.query;
   if (!storyId || !sectionId) {
     res.status(400).json({
@@ -28,10 +18,7 @@ async function bookendHandler(
     return;
   }
 
-  const relatedStoriesResponse = await client.getRelatedStories(
-    storyId,
-    sectionId
-  );
+  const relatedStoriesResponse = await client.getRelatedStories(storyId, sectionId);
   const relatedStories = relatedStoriesResponse["related-stories"];
 
   if (!relatedStories.length) {
@@ -39,11 +26,7 @@ async function bookendHandler(
     return;
   }
 
-  const fbAppId = get(
-    config,
-    ["public-integrations", "facebook", "app-id"],
-    ""
-  );
+  const fbAppId = get(config, ["public-integrations", "facebook", "app-id"], "");
 
   const jsonPayLoad = {
     bookendVersion: "v1.0",
@@ -85,12 +68,9 @@ async function bookendHandler(
     ),
   };
 
-  res.header(
-    "Cache-Control",
-    `public,max-age=15,s-maxage=${sMaxAge},stale-while-revalidate=1000,stale-if-error=14400`
-  );
+  res.header("Cache-Control", `public,max-age=15,s-maxage=${sMaxAge},stale-while-revalidate=1000,stale-if-error=14400`);
   res.header("Vary", "Accept-Encoding");
-  handleSpanInstance({ apmInstance });
+
   res.json(jsonPayLoad);
 }
 

package/server/amp/helpers/get-domain-specific-opts.js

@@ -1,6 +1,5 @@
 const merge = require("lodash/merge");
 const cloneDeep = require("lodash/cloneDeep");
-const { handleSpanInstance } = require("../../utils/apm");
 
 /**
  * Pick the correct opts for the subdomain
@@ -14,12 +13,11 @@ const { handleSpanInstance } = require("../../utils/apm");
 function getDomainSpecificOpts(opts = {}, domainSlug = null) {
   if (!domainSlug || !opts.domains || !opts.domains[domainSlug]) return opts;
 
-  const apmInstance = handleSpanInstance({ isStart: true, title: "getDomainSpecificOpts" });
   const clone = cloneDeep(opts);
   delete clone.domains;
   const domainSpecificOpts = opts.domains[domainSlug];
   const mergedOptions = merge(clone, domainSpecificOpts);
-  handleSpanInstance({ apmInstance });
+
   return mergedOptions;
 }
 

package/server/amp/helpers/infinite-scroll.js

@@ -1,5 +1,3 @@
-const { handleSpanInstance } = require("../../utils/apm");
-
 class InfiniteScrollAmp {
   constructor({ ampConfig, client, publisherConfig, queryParams }) {
     this.client = client;
@@ -42,20 +40,20 @@ class InfiniteScrollAmp {
   async getResponse({ itemsTaken }) {
     const { "story-id": storyId } = this.queryParams;
     if (!storyId) return new Error(`Query param "story-id" missing`);
-    const apmInstance = handleSpanInstance({ isStart: true, title: "infinite scroll - get collection response" });
+
     const collection = await this.client.getCollectionBySlug(this.collSlug);
     if (!collection || collection.error)
       return new Error(`Infinite scroll collection ${this.collSlug} returned falsy value`);
     const filteredItems = this.getFilteredCollItems(collection, storyId);
     const slicedItems = filteredItems.slice(itemsTaken);
     const formattedData = this.formatData({ itemsArr: slicedItems });
-    handleSpanInstance({ apmInstance });
+
     return JSON.stringify(formattedData);
   }
 
   async getInitialInlineConfig({ itemsToTake, storyId }) {
     if (!itemsToTake || !storyId) return new Error("Required params for getInitialInlineConfig missing");
-    const apmInstance = handleSpanInstance({ isStart: true, title: "getInitialInlineConfig" });
+
     const collection = await this.client.getCollectionBySlug(this.collSlug);
     if (!collection || (collection.items && !collection.items.length) || collection.error) return null;
     const filteredItems = this.getFilteredCollItems(collection, storyId);
@@ -64,7 +62,7 @@ class InfiniteScrollAmp {
       itemsArr: slicedItems,
       type: "inline",
     });
-    handleSpanInstance({ apmInstance });
+
     return JSON.stringify(formattedData);
   }
 }

package/server/amp/helpers/optimize-amp-html.js

@@ -1,5 +1,4 @@
 const AmpOptimizer = require("@ampproject/toolbox-optimizer");
-const { handleSpanInstance } = require("../../utils/apm");
 
 const ampOptimizer = AmpOptimizer.create({
   autoAddMandatoryTags: false,
@@ -8,9 +7,8 @@ const ampOptimizer = AmpOptimizer.create({
 });
 
 async function optimize(ampHtml) {
-  const apmInstance = handleSpanInstance({ isStart: true, title: "optimize amp html" });
   const optimizedAmp = ampOptimizer.transformHtml(ampHtml);
-  handleSpanInstance({ apmInstance });
+
   return optimizedAmp;
 }
 

package/server/handlers/isomorphic-handler.js

@@ -15,7 +15,7 @@ const { customUrlToCacheKey } = require("../caching");
 const { addLightPageHeaders } = require("../impl/light-page-impl");
 const { getOneSignalScript } = require("./onesignal-script");
 const { getRedirectUrl } = require("../redirect-url-helper");
-const { handleSpanInstance } = require("../utils/apm");
+
 const ABORT_HANDLER = "__ABORT__";
 function abortHandler() {
   return Promise.resolve({ pageType: ABORT_HANDLER, [ABORT_HANDLER]: true });
@@ -420,10 +420,6 @@ exports.handleIsomorphicRoute = function handleIsomorphicRoute(
     sMaxAge,
   }
 ) {
-  const apmInstance = handleSpanInstance({
-    isStart: true,
-    title: "handleIsomorphicRoute",
-  });
   const url = urlLib.parse(req.url, true);
 
   function writeResponse(result) {
@@ -487,7 +483,7 @@ exports.handleIsomorphicRoute = function handleIsomorphicRoute(
   if (typeof redirectUrls === "function" || (redirectUrls && Object.keys(redirectUrls).length > 0)) {
     getRedirectUrl(req, res, next, { redirectUrls, config });
   }
-  handleSpanInstance({ apmInstance });
+
   return loadDataForIsomorphicRoute(loadData, loadErrorData, url, generateRoutes(config, domainSlug), {
     config,
     client,
@@ -538,13 +534,9 @@ exports.handleStaticRoute = function handleStaticRoute(
     sMaxAge,
   }
 ) {
-  const apmInstance = handleSpanInstance({
-    isStart: true,
-    title: "handleStaticRoute",
-  });
   const url = urlLib.parse(path);
   pageType = pageType || "static-page";
-  handleSpanInstance({ apmInstance });
+
   return loadDataForPageType(loadData, loadErrorData, pageType, renderParams, {
     config,
     client,

package/server/publisher-config.js

@@ -13,6 +13,6 @@
 const fs = require("fs");
 const yaml = require("js-yaml");
 
-const publisher = yaml.safeLoad(fs.readFileSync("config/publisher.yml"));
+const publisher = yaml.load(fs.readFileSync("config/publisher.yml"));
 
 module.exports = publisher;

package/server/static-configuration.js

@@ -18,7 +18,7 @@ module.exports = fs
   .readdirSync("config")
   .filter((x) => x.match(/\.yml$/))
   .reduce((acc, x) => {
-    acc[x.replace(/\.yml$/, "")] = yaml.safeLoad(
+    acc[x.replace(/\.yml$/, "")] = yaml.load(
       fs.readFileSync(`config/${x}`)
     );
     return acc;

package/server/utils/apm.js

@@ -1,25 +1,7 @@
-/*
- *  ************************************************************************
- *  *  © [2015 - 2020] Quintype Technologies India Private Limited
- *  *  All Rights Reserved.
- *  *************************************************************************
- */
-
-const apm = require("elastic-apm-node");
-
-const handleSpanInstance = ({ apmInstance, isStart, title }) => {
-  if (!process.env.APM_SERVICE_NAME && !process.env.APM_SECRET_TOKEN) {
-    return;
-  }
-
-  if (isStart && !apmInstance) {
-    return apm.startSpan(title);
-  }
-
-  if (apmInstance) apmInstance.end();
-  return true;
+const handleSpanInstance = (_) => {
+    return true;
 };
 
 module.exports = {
-  handleSpanInstance,
+    handleSpanInstance
 };