@quintype/framework 7.31.0-tiktok-task.0 → 7.31.1-fix-access-control.0

package/.vscode/settings.json

@@ -8,6 +8,6 @@
   "files.insertFinalNewline": true,
   "files.trimTrailingWhitespace": true,
   "editor.codeActionsOnSave": {
-    "source.organizeImports": "explicit"
+    "source.organizeImports": true
   }
 }

package/CHANGELOG.md

@@ -2,6 +2,46 @@
 
 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.31.0](https://github.com/quintype/quintype-node-framework/compare/v7.30.9...v7.31.0) (2024-11-22)
+
+
+### Features
+
+* **Preview:** support home & collection preview route ([#450](https://github.com/quintype/quintype-node-framework/issues/450)) ([0c34ec4](https://github.com/quintype/quintype-node-framework/commit/0c34ec406fbe8d9ee56de1215c2100b2bb3e6896))
+
+### [7.30.9](https://github.com/quintype/quintype-node-framework/compare/v7.30.8...v7.30.9) (2024-11-22)
+
+### [7.30.8](https://github.com/quintype/quintype-node-framework/compare/v7.30.7...v7.30.8) (2024-11-05)
+
+### [7.30.7](https://github.com/quintype/quintype-node-framework/compare/v7.30.6...v7.30.7) (2024-10-30)
+
+### [7.30.6](https://github.com/quintype/quintype-node-framework/compare/v7.30.5...v7.30.6) (2024-10-30)
+
+### [7.30.5](https://github.com/quintype/quintype-node-framework/compare/v7.30.4...v7.30.5) (2024-10-22)
+
+
+### Bug Fixes
+
+* **cache-tags:** fix amp cache tags ([#443](https://github.com/quintype/quintype-node-framework/issues/443)) ([009bbca](https://github.com/quintype/quintype-node-framework/commit/009bbcab7d42e70626d541ca80def10625ca021e))
+
+### [7.30.4](https://github.com/quintype/quintype-node-framework/compare/v7.30.3...v7.30.4) (2024-10-22)
+
+
+### Bug Fixes
+
+* **publish time:** fix amp publish time ([#441](https://github.com/quintype/quintype-node-framework/issues/441)) ([fe22c6b](https://github.com/quintype/quintype-node-framework/commit/fe22c6b78e435b32a03da79bdf616197d4ecdb39))
+
+### [7.30.3](https://github.com/quintype/quintype-node-framework/compare/v7.30.2...v7.30.3) (2024-09-30)
+
+### [7.30.2](https://github.com/quintype/quintype-node-framework/compare/v7.30.1...v7.30.2) (2024-09-13)
+
+
+### Bug Fixes
+
+* **Amp story:** pass amp optimizer toggle to preload hero image ([#439](https://github.com/quintype/quintype-node-framework/issues/439)) ([c943095](https://github.com/quintype/quintype-node-framework/commit/c943095a25000377f94b709df1b75ccfed3983df))
+
+### [7.30.1](https://github.com/quintype/quintype-node-framework/compare/v7.30.0...v7.30.1) (2024-08-14)
+
 ## [7.30.0](https://github.com/quintype/quintype-node-framework/compare/v7.29.1...v7.30.0) (2024-07-30)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.31.0-tiktok-task.0",
+  "version": "7.31.1-fix-access-control.0",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {
@@ -31,8 +31,8 @@
   "homepage": "https://github.com/quintype/quintype-node-framework#readme",
   "dependencies": {
     "@ampproject/toolbox-optimizer": "2.8.3",
-    "@quintype/amp": "^2.20.0-tiktok-task.0",
-    "@quintype/backend": "2.5.1",
+    "@quintype/amp": "^2.20.0",
+    "@quintype/backend": "^2.6.0",
     "@quintype/components": "^3.5.0",
     "@quintype/prerender-node": "^3.2.26",
     "@quintype/seo": "^1.46.1",

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

@@ -141,26 +141,38 @@ async function ampStoryPageHandler(
       });
       merge(mergedAdditionalConfig, additionalConfig, fetchedAdditionalConfig);
     }
-
+    const optimizeAmpHtml = get(domainSpecificOpts, ["featureConfig", "optimizeAmpHtml"], true);
     const ampHtml = ampifyStory({
       story,
       publisherConfig: config.config,
       ampConfig: ampConfig.ampConfig,
       additionalConfig: isEmpty(mergedAdditionalConfig) ? additionalConfig : mergedAdditionalConfig,
-      opts: { ...domainSpecificOpts, domainSlug },
+      opts: { ...domainSpecificOpts, domainSlug, optimizeAmpHtml },
       seo: seoTags ? seoTags.toString() : "",
     });
     if (ampHtml instanceof Error) return next(ampHtml);
 
     res.set("Content-Type", "text/html");
+
+    const pageCacheKey = `page/${config["publisher-id"]}/story-page`;
+    let cacheKeys = [storyToCacheKey(config["publisher-id"], story), pageCacheKey];
+
+    /* To cdn purge amp stories through custom tags, use getAdditionalCacheKeys function
+     to generate one or more cache tags, it should return cache tags as an array of strings. */
+    const getAdditionalCacheKeys = get(opts, ["featureConfig", "getAdditionalCacheKeys"]);
+    if (getAdditionalCacheKeys) {
+      const additionalCacheKeys = getAdditionalCacheKeys(config);
+      cacheKeys = cacheKeys.concat(additionalCacheKeys);
+    }
+
     addCacheHeadersToResult({
       res,
-      cacheKeys: storyToCacheKey(config["publisher-id"], story),
+      cacheKeys,
       cdnProvider,
       config,
+      sMaxAge: "86400",
     });
 
-    const optimizeAmpHtml = get(domainSpecificOpts, ["featureConfig", "optimizeAmpHtml"], true);
     const finalResponse = optimizeAmpHtml ? await optimize(ampHtml) : ampHtml;
 
     return res.send(finalResponse);

package/server/data-loader-helpers.js

@@ -23,16 +23,20 @@ exports.homeCollectionOrStories = function homeCollectionOrStories(
   customLayouts = [],
   defaultNestedLimit = null
 ) {
+  const {qtInternalAppsKey = "", previewId = "", ...rest} = params || {};
+
   return Collection.getCollectionBySlug(
     client,
     "home",
-    { "item-type": "collection", ...params },
+    { "item-type": "collection", ...rest },
     {
       depth,
       ...(getStoryLimits && { storyLimits: getStoryLimits() }),
       collectionOfCollectionsIndexes,
       customLayouts,
       defaultNestedLimit,
+      qtInternalAppsKey,
+      previewId
     }
   ).then((collection) => {
     if (collection) return collection;

package/server/generate-routes.js

@@ -165,6 +165,28 @@ exports.generateCommonRoutes = function generateSectionPageRoutes(
           },
         ]
       : [],
+      [
+        {
+          path: '/preview/:previewId/collection/home',
+          pageType: 'home-page-preview',
+          exact: true,
+          skipPWA: true,
+          params: {
+            collectionSlug: config.getHomeCollectionSlug(domainSlug)
+          }
+        }
+      ],
+      [
+        {
+          path: '/preview/:previewId/collection/:collectionSlug',
+          pageType: 'collection-page-preview',
+          exact: true,
+          skipPWA: skipPWA.home || false,
+          params: {
+            collectionSlug: config.getHomeCollectionSlug(domainSlug)
+          }
+        }
+      ],
     sectionPageRoutes ? sectionRoutes : [],
     storyPageRoutes ? storyRoutes : []
   );