@newskit-render/feed 1.8.5 → 1.8.6-alpha.0

package/dist/esm/sitemap/resolvers/genericSitemapResolver.js

@@ -34,40 +34,39 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { createApolloClient, ClientTypes } from '@newskit-render/api';
 import { createPagesSitemap, createArticleSitemap, createSitemapIndex, } from '../../helpers/createSitemap';
 import { getDateList, setResponse } from '../../helpers/utils';
 import { queryArticleList } from '../../helpers/queryArticleList';
 import { queryPages } from '../../helpers/queryPages';
-import { GET_ARTICLE_LIST as GET_ARTICLE_LIST_SMALL } from '../queries';
+import { GET_ARTICLE_LIST } from '../queries';
+import { getApolloRestClient } from '../../helpers/client';
 export var genericSitemap = function (_a) {
     var res = _a.res, query = _a.query, publisher = _a.publisher, domain = _a.domain, publicationName = _a.publicationName, firstArticleDate = _a.firstArticleDate, customStaticPageCollection = _a.customStaticPageCollection, dataType = _a.dataType, _b = _a.priority, priority = _b === void 0 ? '0.7' : _b, _c = _a.changefreq, changefreq = _c === void 0 ? 'monthly' : _c;
     return __awaiter(void 0, void 0, void 0, function () {
         var apolloClient, pages, result_1, startDay, endDay, dates, articleListCollection, result_2, startDate, todayDate, dateCollection, result;
         return __generator(this, function (_d) {
             switch (_d.label) {
-                case 0: return [4 /*yield*/, createApolloClient(ClientTypes.nkapi)];
+                case 0:
+                    apolloClient = getApolloRestClient(publisher);
+                    if (!(dataType === 'pageList' || dataType === 'competitionList')) return [3 /*break*/, 2];
+                    return [4 /*yield*/, queryPages(apolloClient, dataType)];
                 case 1:
-                    apolloClient = _d.sent();
-                    if (!(dataType === 'pages' || dataType === 'competitions')) return [3 /*break*/, 3];
-                    return [4 /*yield*/, queryPages(publisher, apolloClient, dataType)];
-                case 2:
                     pages = _d.sent();
-                    result_1 = createPagesSitemap(pages, domain, changefreq, priority, dataType, publisher, customStaticPageCollection);
+                    result_1 = createPagesSitemap(pages, domain, publicationName, changefreq, priority, dataType, customStaticPageCollection);
                     setResponse(res, result_1);
                     return [2 /*return*/];
-                case 3:
-                    if (!(query && query.yyyy && query.mm && query.dd)) return [3 /*break*/, 5];
+                case 2:
+                    if (!(query && query.yyyy && query.mm && query.dd)) return [3 /*break*/, 4];
                     startDay = "".concat(query.yyyy, "-").concat(query.mm, "-").concat(query.dd, " 00:01:00");
-                    endDay = "".concat(query.yyyy, "-").concat(query.mm, "-").concat(query.dd, " 23:59:59:00");
+                    endDay = "".concat(query.yyyy, "-").concat(query.mm, "-").concat(query.dd, " 23:59:59");
                     dates = { from: startDay, to: endDay };
-                    return [4 /*yield*/, queryArticleList(publisher, dates, apolloClient, GET_ARTICLE_LIST_SMALL)];
-                case 4:
+                    return [4 /*yield*/, queryArticleList(dates, apolloClient, GET_ARTICLE_LIST)];
+                case 3:
                     articleListCollection = _d.sent();
                     result_2 = createArticleSitemap(articleListCollection, domain, publicationName, false, changefreq, priority);
                     setResponse(res, result_2);
                     return [2 /*return*/];
-                case 5:
+                case 4:
                     startDate = firstArticleDate
                         ? new Date(firstArticleDate)
                         : new Date(new Date().setDate(new Date().getDate() - 30));

package/dist/esm/sitemap/resolvers/genericSitemapResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"genericSitemapResolver.js","sourceRoot":"","sources":["../../../../src/sitemap/resolvers/genericSitemapResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACrE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAKrD,OAAO,EAAE,gBAAgB,IAAI,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAEvE,MAAM,CAAC,IAAM,cAAc,GAAG,UAAO,EAWd;QAVrB,GAAG,SAAA,EACH,KAAK,WAAA,EACL,SAAS,eAAA,EACT,MAAM,YAAA,EACN,eAAe,qBAAA,EACf,gBAAgB,sBAAA,EAChB,0BAA0B,gCAAA,EAC1B,QAAQ,cAAA,EACR,gBAAgB,EAAhB,QAAQ,mBAAG,KAAK,KAAA,EAChB,kBAAsB,EAAtB,UAAU,mBAAG,SAAS,KAAA;;;;;wBAED,qBAAM,kBAAkB,CAAC,WAAW,CAAC,KAAK,CAAC,EAAA;;oBAA1D,YAAY,GAAG,SAA2C;yBAE5D,CAAA,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,cAAc,CAAA,EAAnD,wBAAmD;oBACvC,qBAAM,UAAU,CAAC,SAAS,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAA;;oBAA3D,KAAK,GAAG,SAAmD;oBAC3D,WAAS,kBAAkB,CAC/B,KAAK,EACL,MAAM,EACN,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,0BAA0B,CAC3B,CAAA;oBACD,WAAW,CAAC,GAAG,EAAE,QAAM,CAAC,CAAA;oBACxB,sBAAM;;yBAGJ,CAAA,KAAK,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,CAAA,EAA3C,wBAA2C;oBACvC,QAAQ,GAAG,UAAG,KAAK,CAAC,IAAI,cAAI,KAAK,CAAC,EAAE,cAAI,KAAK,CAAC,EAAE,cAAW,CAAA;oBAC3D,MAAM,GAAG,UAAG,KAAK,CAAC,IAAI,cAAI,KAAK,CAAC,EAAE,cAAI,KAAK,CAAC,EAAE,iBAAc,CAAA;oBAC5D,KAAK,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,CAAA;oBAEd,qBAAM,gBAAgB,CAClD,SAAS,EACT,KAAK,EACL,YAAY,EACZ,sBAAsB,CACvB,EAAA;;oBALK,qBAAqB,GAAG,SAK7B;oBACK,WAAS,oBAAoB,CACjC,qBAAqB,EACrB,MAAM,EACN,eAAe,EACf,KAAK,EACL,UAAU,EACV,QAAQ,CACT,CAAA;oBAED,WAAW,CAAC,GAAG,EAAE,QAAM,CAAC,CAAA;oBACxB,sBAAM;;oBAGF,SAAS,GAAG,gBAAgB;wBAChC,CAAC,CAAC,IAAI,IAAI,CAAC,gBAAgB,CAAC;wBAC5B,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;oBACrD,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;oBACtB,cAAc,GAAG,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;oBAElD,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;oBAEzD,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;oBACxB,sBAAM;;;;CACP,CAAA"}
+{"version":3,"file":"genericSitemapResolver.js","sourceRoot":"","sources":["../../../../src/sitemap/resolvers/genericSitemapResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAE1D,MAAM,CAAC,IAAM,cAAc,GAAG,UAAO,EAWd;QAVrB,GAAG,SAAA,EACH,KAAK,WAAA,EACL,SAAS,eAAA,EACT,MAAM,YAAA,EACN,eAAe,qBAAA,EACf,gBAAgB,sBAAA,EAChB,0BAA0B,gCAAA,EAC1B,QAAQ,cAAA,EACR,gBAAgB,EAAhB,QAAQ,mBAAG,KAAK,KAAA,EAChB,kBAAsB,EAAtB,UAAU,mBAAG,SAAS,KAAA;;;;;;oBAEhB,YAAY,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAA;yBAE/C,CAAA,QAAQ,KAAK,UAAU,IAAI,QAAQ,KAAK,iBAAiB,CAAA,EAAzD,wBAAyD;oBAC7C,qBAAM,UAAU,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAA;;oBAAhD,KAAK,GAAG,SAAwC;oBAChD,WAAS,kBAAkB,CAC/B,KAAK,EACL,MAAM,EACN,eAAe,EACf,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,0BAA0B,CAC3B,CAAA;oBACD,WAAW,CAAC,GAAG,EAAE,QAAM,CAAC,CAAA;oBACxB,sBAAM;;yBAGJ,CAAA,KAAK,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,CAAA,EAA3C,wBAA2C;oBACvC,QAAQ,GAAG,UAAG,KAAK,CAAC,IAAI,cAAI,KAAK,CAAC,EAAE,cAAI,KAAK,CAAC,EAAE,cAAW,CAAA;oBAC3D,MAAM,GAAG,UAAG,KAAK,CAAC,IAAI,cAAI,KAAK,CAAC,EAAE,cAAI,KAAK,CAAC,EAAE,cAAW,CAAA;oBACzD,KAAK,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,CAAA;oBAEd,qBAAM,gBAAgB,CAClD,KAAK,EACL,YAAY,EACZ,gBAAgB,CACjB,EAAA;;oBAJK,qBAAqB,GAAG,SAI7B;oBACK,WAAS,oBAAoB,CACjC,qBAAqB,EACrB,MAAM,EACN,eAAe,EACf,KAAK,EACL,UAAU,EACV,QAAQ,CACT,CAAA;oBAED,WAAW,CAAC,GAAG,EAAE,QAAM,CAAC,CAAA;oBACxB,sBAAM;;oBAGF,SAAS,GAAG,gBAAgB;wBAChC,CAAC,CAAC,IAAI,IAAI,CAAC,gBAAgB,CAAC;wBAC5B,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;oBACrD,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;oBACtB,cAAc,GAAG,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;oBAElD,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;oBAEzD,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;oBACxB,sBAAM;;;;CACP,CAAA"}

package/dist/esm/sitemap/resolvers/newsSitemapResolver.js

@@ -37,8 +37,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 import { createArticleSitemap } from '../../helpers/createSitemap';
 import { getTwoDaysAgoDate, setResponse } from '../../helpers/utils';
 import { queryArticleList } from '../../helpers/queryArticleList';
-import { createApolloClient, ClientTypes } from '@newskit-render/api';
 import { GET_ARTICLE_LIST } from '../queries';
+import { getApolloRestClient } from '../../helpers/client';
 export var newsSitemap = function (_a) {
     var res = _a.res, publisher = _a.publisher, domain = _a.domain, publicationName = _a.publicationName, _b = _a.priority, priority = _b === void 0 ? '0.7' : _b, _c = _a.changefreq, changefreq = _c === void 0 ? 'monthly' : _c;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -49,11 +49,9 @@ export var newsSitemap = function (_a) {
                     dates = {
                         from: getTwoDaysAgoDate(),
                     };
-                    return [4 /*yield*/, createApolloClient(ClientTypes.nkapi)];
+                    apolloClient = getApolloRestClient(publisher);
+                    return [4 /*yield*/, queryArticleList(dates, apolloClient, GET_ARTICLE_LIST)];
                 case 1:
-                    apolloClient = _d.sent();
-                    return [4 /*yield*/, queryArticleList(publisher, dates, apolloClient, GET_ARTICLE_LIST)];
-                case 2:
                     articleListData = _d.sent();
                     html = createArticleSitemap(articleListData, domain, publicationName, true, changefreq, priority);
                     setResponse(res, html);

package/dist/esm/sitemap/resolvers/newsSitemapResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"newsSitemapResolver.js","sourceRoot":"","sources":["../../../../src/sitemap/resolvers/newsSitemapResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEjE,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,MAAM,CAAC,IAAM,WAAW,GAAG,UAAO,EAOlB;QANd,GAAG,SAAA,EACH,SAAS,eAAA,EACT,MAAM,YAAA,EACN,eAAe,qBAAA,EACf,gBAAgB,EAAhB,QAAQ,mBAAG,KAAK,KAAA,EAChB,kBAAsB,EAAtB,UAAU,mBAAG,SAAS,KAAA;;;;;;oBAEhB,KAAK,GAAG;wBACZ,IAAI,EAAE,iBAAiB,EAAE;qBAC1B,CAAA;oBAEoB,qBAAM,kBAAkB,CAAC,WAAW,CAAC,KAAK,CAAC,EAAA;;oBAA1D,YAAY,GAAG,SAA2C;oBACxC,qBAAM,gBAAgB,CAC5C,SAAS,EACT,KAAK,EACL,YAAY,EACZ,gBAAgB,CACjB,EAAA;;oBALK,eAAe,GAAG,SAKvB;oBAEK,IAAI,GAAG,oBAAoB,CAC/B,eAAe,EACf,MAAM,EACN,eAAe,EACf,IAAI,EACJ,UAAU,EACV,QAAQ,CACT,CAAA;oBACD,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;;;;;CACvB,CAAA"}
+{"version":3,"file":"newsSitemapResolver.js","sourceRoot":"","sources":["../../../../src/sitemap/resolvers/newsSitemapResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAE1D,MAAM,CAAC,IAAM,WAAW,GAAG,UAAO,EAOlB;QANd,GAAG,SAAA,EACH,SAAS,eAAA,EACT,MAAM,YAAA,EACN,eAAe,qBAAA,EACf,gBAAgB,EAAhB,QAAQ,mBAAG,KAAK,KAAA,EAChB,kBAAsB,EAAtB,UAAU,mBAAG,SAAS,KAAA;;;;;;oBAEhB,KAAK,GAAG;wBACZ,IAAI,EAAE,iBAAiB,EAAE;qBAC1B,CAAA;oBAEK,YAAY,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAA;oBAC3B,qBAAM,gBAAgB,CAC5C,KAAK,EACL,YAAY,EACZ,gBAAgB,CACjB,EAAA;;oBAJK,eAAe,GAAG,SAIvB;oBAEK,IAAI,GAAG,oBAAoB,CAC/B,eAAe,EACf,MAAM,EACN,eAAe,EACf,IAAI,EACJ,UAAU,EACV,QAAQ,CACT,CAAA;oBACD,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;;;;;CACvB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/feed",
-  "version": "1.8.5",
+  "version": "1.8.6-alpha.0",
   "description": "Newskit Render - Feed package",
   "author": "",
   "module": "dist/esm/index.js",
@@ -24,8 +24,10 @@
     "clean": "rm -rf node_modules & rm -f package-lock.json & rm -f yarn.lock"
   },
   "dependencies": {
-    "@apollo/client": "3.7.4",
+    "@apollo/client": "3.9.2",
+    "@nerdwallet/apollo-cache-policies": "3.3.0",
     "@newskit-render/api": "^1.11.0",
+    "apollo-link-rest": "^0.9.0",
     "graphql": "16.6.0",
     "lodash.escape": "4.0.1"
   },
@@ -42,7 +44,9 @@
     "jest-junit": "15.0.0",
     "next": "13.4.9",
     "prettier": "2.8.1",
+    "qs": "6.12.0",
     "react": "18.2.0",
+    "react-dom": "18.2.0",
     "ts-jest": "29.1.1",
     "typescript": "4.9.4"
   },