@quintype/framework 7.19.0-image-bandwidth-issue.2 → 7.19.0

package/CHANGELOG.md

@@ -2,6 +2,34 @@
 
 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.19.0](https://github.com/quintype/quintype-node-framework/compare/v7.10.5...v7.19.0) (2023-05-08)
+
+
+### Features
+
+* **amp:** Decode embed using utf 8 ([#345](https://github.com/quintype/quintype-node-framework/issues/345)) ([4e8a3b3](https://github.com/quintype/quintype-node-framework/commit/4e8a3b38b9be62571f96e69e8b976ff610daf068))
+* remove powered by quintype from the footer  ([#334](https://github.com/quintype/quintype-node-framework/issues/334)) ([3dbc1f3](https://github.com/quintype/quintype-node-framework/commit/3dbc1f3144536a439ad0ecaacd2313cb6bb528e1))
+
+
+### Bug Fixes
+
+*  custom pages cache ([#359](https://github.com/quintype/quintype-node-framework/issues/359)) ([b843967](https://github.com/quintype/quintype-node-framework/commit/b843967fb9126cacc5bf524eb1ca1e2c60c58fdc))
+* Amp chartbeat domain ([#344](https://github.com/quintype/quintype-node-framework/issues/344)) ([cbfd2f1](https://github.com/quintype/quintype-node-framework/commit/cbfd2f1a439fffbd4b9ba619d59df0165005a64a))
+* **amp:** Use correct dates for amp stories ([#338](https://github.com/quintype/quintype-node-framework/issues/338)) ([2182c50](https://github.com/quintype/quintype-node-framework/commit/2182c50fbeb5cc9003d766315bd518bbc287c8ee))
+* **ga:** update title before history push for ga tracking issue ([#347](https://github.com/quintype/quintype-node-framework/issues/347)) ([adb6dc8](https://github.com/quintype/quintype-node-framework/commit/adb6dc8425b097bf9717ea8ba745e69609ccbbb2))
+* package lock ([4d8b44a](https://github.com/quintype/quintype-node-framework/commit/4d8b44a28b65c0c15fcebcc2d7cbe4a9a12c27dd))
+* **redirects:** cache redirects ([#332](https://github.com/quintype/quintype-node-framework/issues/332)) ([ae820eb](https://github.com/quintype/quintype-node-framework/commit/ae820eb5fb205d3ae4ec4771ded953690705a3b9))
+* update version ([4d7166e](https://github.com/quintype/quintype-node-framework/commit/4d7166ea9fdac240e1aeb56883b991b50c1e72db))
+
+### [7.18.11](https://github.com/quintype/quintype-node-framework/compare/v7.18.10...v7.18.11) (2023-04-27)
+
+
+### Bug Fixes
+
+*  custom pages cache ([#359](https://github.com/quintype/quintype-node-framework/issues/359)) ([b843967](https://github.com/quintype/quintype-node-framework/commit/b843967fb9126cacc5bf524eb1ca1e2c60c58fdc))
+* package lock ([4d8b44a](https://github.com/quintype/quintype-node-framework/commit/4d8b44a28b65c0c15fcebcc2d7cbe4a9a12c27dd))
+* update version ([4d7166e](https://github.com/quintype/quintype-node-framework/commit/4d7166ea9fdac240e1aeb56883b991b50c1e72db))
+
 ### [7.18.10](https://github.com/quintype/quintype-node-framework/compare/v7.18.9...v7.18.10) (2023-04-05)
 
 ### [7.18.9](https://github.com/quintype/quintype-node-framework/compare/v7.18.1...v7.18.9) (2023-03-14)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.19.0-image-bandwidth-issue.2",
+  "version": "7.19.0",
   "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.12.0-image-bandwidth-issue.0",
+    "@quintype/amp": "^2.10.0",
     "@quintype/backend": "^2.3.3",
     "@quintype/components": "^3.3.0",
     "@quintype/prerender-node": "^3.2.26",

package/server/caching.js

@@ -61,5 +61,5 @@ exports.sorterToCacheKey = function sorterToCacheKey(
  * @returns {string} The cache key
  */
 exports.customUrlToCacheKey = function customUrlToCacheKey(publisherId, page) {
-  return `u/${publisherId}/${page.id}`;
+  return `sp/${publisherId}/${page.id}`;
 };

package/server/handlers/cdn-caching.js

@@ -20,7 +20,7 @@ exports.addCacheHeadersToResult = function addCacheHeadersToResult({
       res.setHeader(
         "Content-Security-Policy",
         `default-src data: 'unsafe-inline' 'unsafe-eval' https: http:;` +
-          `script-src data: 'unsafe-inline' 'unsafe-eval' https: http: blob:;` +
+          `script-src 'self' https://cdnjs.cloudflare.com;` +
           `style-src data: 'unsafe-inline' https: http: blob:;` +
           `img-src data: https: http: blob:;` +
           `font-src data: https: http:;` +
@@ -60,7 +60,7 @@ exports.addCacheHeadersToResult = function addCacheHeadersToResult({
       res.setHeader(
         "Content-Security-Policy",
         `default-src data: 'unsafe-inline' 'unsafe-eval' https: http:;` +
-          `script-src data: 'unsafe-inline' 'unsafe-eval' https: http: blob:;` +
+          `script-src 'self' https://cdnjs.cloudflare.com;` +
           `style-src data: 'unsafe-inline' https: http: blob:;` +
           `img-src data: https: http: blob:;` +
           `font-src data: https: http:;` +
@@ -80,7 +80,7 @@ exports.addCacheHeadersToResult = function addCacheHeadersToResult({
     res.setHeader(
       "Content-Security-Policy",
       `default-src data: 'unsafe-inline' 'unsafe-eval' https: http:;` +
-        `script-src data: 'unsafe-inline' 'unsafe-eval' https: http: blob:;` +
+        `script-src 'self' https://cdnjs.cloudflare.com;` +
         `style-src data: 'unsafe-inline' https: http: blob:;` +
         `img-src data: https: http: blob:;` +
         `font-src data: https: http:;` +

package/server/handlers/isomorphic-handler.js

@@ -15,7 +15,6 @@ const { customUrlToCacheKey } = require("../caching");
 const { addLightPageHeaders } = require("../impl/light-page-impl");
 const { getOneSignalScript } = require("./onesignal-script");
 const { getRedirectUrl } = require("../redirect-url-helper");
-const { Story } = require("../impl/api-client-impl");
 
 const ABORT_HANDLER = "__ABORT__";
 function abortHandler() {
@@ -38,7 +37,6 @@ function loadDataForIsomorphicRoute(
   async function loadDataForEachRoute() {
     const redirectToLowercaseSlugsValue =
       typeof redirectToLowercaseSlugs === "function" ? redirectToLowercaseSlugs(config) : redirectToLowercaseSlugs;
-
     for (const match of matchAllRoutes(url.pathname, routes)) {
       const params = Object.assign({}, url.query, otherParams, match.params);
       /* On story pages, if the slug contains any capital letters (latin), we want to
@@ -58,7 +56,6 @@ function loadDataForIsomorphicRoute(
           },
         };
       }
-
       const result = await loadData(match.pageType, params, config, client, {
         host,
         next: abortHandler,
@@ -71,18 +68,6 @@ function loadDataForIsomorphicRoute(
 
       if (result && result.data && result.data[ABORT_HANDLER]) continue;
 
-      // Multiple url redirection
-      const story = result.data.story;
-      if (story && story.redirect && `/${story.slug}` !== url.path) {
-        console.log("Inside Redirect IF", url.path);
-        return {
-          httpStatusCode: 301,
-          data: {
-            location: `/${story.slug}`,
-          },
-        };
-      }
-
       return result;
     }
   }
@@ -306,18 +291,8 @@ exports.handleIsomorphicDataLoad = function handleIsomorphicDataLoad(
   }
 
   function returnJson(result) {
-    const statusCode = result.httpStatusCode || 200;
-    if (statusCode == 301 && result.data && result.data.location) {
-      addCacheHeadersToResult({
-        res: res,
-        cacheKeys: [customUrlToCacheKey(config["publisher-id"], "redirect")],
-        cdnProvider: cdnProvider,
-        config: config,
-        sMaxAge,
-      });
-      return res.redirect(301, result.data.location);
-    }
     return new Promise(() => {
+      const statusCode = result.httpStatusCode || 200;
       res.status(statusCode < 500 ? 200 : 500);
       res.setHeader("Content-Type", "application/json");
       addCacheHeadersToResult({

package/test/integration/custom-route-handler-test.js

@@ -131,8 +131,8 @@ describe("Custom Route Handler", function () {
         "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400"
       )
       .expect("Vary", /Accept\-Encoding/)
-      .expect("Surrogate-Key", "u/42/101")
-      .expect("Cache-Tag", "u/42/101")
+      .expect("Surrogate-Key", "sp/42/101")
+      .expect("Cache-Tag", "sp/42/101")
       .expect(301, done);
   });
 
@@ -149,8 +149,8 @@ describe("Custom Route Handler", function () {
         "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400"
       )
       .expect("Vary", /Accept\-Encoding/)
-      .expect("Surrogate-Key", "u/42/102")
-      .expect("Cache-Tag", "u/42/102")
+      .expect("Surrogate-Key", "sp/42/102")
+      .expect("Cache-Tag", "sp/42/102")
       .expect(302, done);
   });
 
@@ -168,8 +168,8 @@ describe("Custom Route Handler", function () {
         "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400"
       )
       .expect("Vary", "Accept-Encoding")
-      .expect("Surrogate-Key", "u/42/103")
-      .expect("Cache-Tag", "u/42/103")
+      .expect("Surrogate-Key", "sp/42/103")
+      .expect("Cache-Tag", "sp/42/103")
       .expect(200)
       .then((res) => {
         const response = JSON.parse(res.text);
@@ -193,8 +193,8 @@ describe("Custom Route Handler", function () {
         "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400"
       )
       .expect("Vary", "Accept-Encoding")
-      .expect("Surrogate-Key", "u/42/104")
-      .expect("Cache-Tag", "u/42/104")
+      .expect("Surrogate-Key", "sp/42/104")
+      .expect("Cache-Tag", "sp/42/104")
       .expect(200)
       .then((res) => {
         assert.equal(
@@ -263,8 +263,8 @@ describe("Custom Route Handler", function () {
         "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400"
       )
       .expect("Vary", /Accept\-Encoding/)
-      .expect("Surrogate-Key", "u/42/105")
-      .expect("Cache-Tag", "u/42/105")
+      .expect("Surrogate-Key", "sp/42/105")
+      .expect("Cache-Tag", "sp/42/105")
       .expect(301, done);
   });
 
@@ -280,8 +280,8 @@ describe("Custom Route Handler", function () {
         "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400"
       )
       .expect("Vary", /Accept\-Encoding/)
-      .expect("Surrogate-Key", "u/42/105")
-      .expect("Cache-Tag", "u/42/105")
+      .expect("Surrogate-Key", "sp/42/105")
+      .expect("Cache-Tag", "sp/42/105")
       .expect("Content-Type", "text/plain; charset=utf-8")
       .expect(200, done);
   });
@@ -298,8 +298,8 @@ describe("Custom Route Handler", function () {
         "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400"
       )
       .expect("Vary", "Accept-Encoding")
-      .expect("Surrogate-Key", "u/42/104")
-      .expect("Cache-Tag", "u/42/104")
+      .expect("Surrogate-Key", "sp/42/104")
+      .expect("Cache-Tag", "sp/42/104")
       .expect("Content-Type", "text/html; charset=utf-8")
       .expect(200, done);
   });

package/test/integration/isomorphic-data-load-test.js

@@ -98,7 +98,9 @@ describe("Isomorphic Data Load", function () {
   });
 
   it("returns an appVersion on every response", function (done) {
-    const app = createApp((pageType, params, config, client) => Promise.resolve({ data: { pageType } }));
+    const app = createApp((pageType, params, config, client) =>
+      Promise.resolve({})
+    );
 
     supertest(app)
       .get("/route-data.json?path=%2F")

package/test/integration/isomorphic-handler-test.js

@@ -13,10 +13,6 @@ function getClientStub(hostname) {
         foo: "bar",
         "sketches-host": "https://www.foo.com",
       }),
-    getStoryBySlug: (slug) =>
-      Promise.resolve({
-        story: { slug: slug, id: "123", redirect: slug === "foo-bar" ? true : false },
-      }),
     baseUrl: "https://www.foo.com",
   };
 }
@@ -55,22 +51,9 @@ function createApp(loadData, routes, opts = {}, app = express()) {
 }
 
 describe("Isomorphic Handler", function () {
-  it("when the story headline is changed, it redirects story to updated story url", (done) => {
-    const app = createApp(
-      (pageType, params, config, client, { host }) =>
-        Promise.resolve({
-          pageType,
-          data: { text: "foobar", host, location: "/foobar", story: { redirect: true, slug: "foo-bar" } },
-        }),
-      [{ pageType: "story-page", path: "/foobar", params: { storySlug: "foo-bar" } }]
-    );
-    supertest(app).get("/foobar").expect("Location", "/foo-bar").expect(301, done);
-  });
-
   it("Renders the page if the route matches", function (done) {
     const app = createApp(
-      (pageType, params, config, client, { host }) =>
-        Promise.resolve({ pageType, data: { text: "foobar", host } }),
+      (pageType, params, config, client, { host }) => Promise.resolve({ pageType, data: { text: "foobar", host } }),
       [{ pageType: "home-page", path: "/", exact: true }]
     );
 
@@ -80,10 +63,7 @@ describe("Isomorphic Handler", function () {
       .expect(200)
       .then((res) => {
         const response = JSON.parse(res.text);
-        assert.equal(
-          '<div data-page-type="home-page">foobar</div>',
-          response.content
-        );
+        assert.equal('<div data-page-type="home-page">foobar</div>', response.content);
         assert.equal("foobar", response.store.qt.data.text);
         assert.equal("127.0.0.1", response.store.qt.data.host);
         assert.equal("home-page", response.store.qt.pageType);
@@ -93,8 +73,7 @@ describe("Isomorphic Handler", function () {
 
   it("Accepts an async pickComponent function", function (done) {
     const app = createApp(
-      (pageType, params, config, client, { host }) =>
-        Promise.resolve({ pageType, data: { text: "foobar" } }),
+      (pageType, params, config, client, { host }) => Promise.resolve({ pageType, data: { text: "foobar" } }),
       [{ pageType: "home-page", path: "/" }],
       {
         pickComponent: (pageType) => Promise.resolve(pickComponent(pageType)),
@@ -107,18 +86,14 @@ describe("Isomorphic Handler", function () {
       .expect(200)
       .then((res) => {
         const response = JSON.parse(res.text);
-        assert.equal(
-          '<div data-page-type="home-page">foobar</div>',
-          response.content
-        );
+        assert.equal('<div data-page-type="home-page">foobar</div>', response.content);
       })
       .then(done);
   });
 
   it("Passes all URL parameters to the load data function", function (done) {
     const app = createApp(
-      (pageType, params, config, client) =>
-        Promise.resolve({ pageType, data: { text: params.text } }),
+      (pageType, params, config, client) => Promise.resolve({ pageType, data: { text: params.text } }),
       [{ pageType: "home-page", path: "/" }]
     );
 
@@ -136,8 +111,7 @@ describe("Isomorphic Handler", function () {
   describe("preloading", function () {
     it("preloads the app.js", function (done) {
       const app = createApp(
-        (pageType, params, config, client) =>
-          Promise.resolve({ pageType, data: { text: "foobar" } }),
+        (pageType, params, config, client) => Promise.resolve({ pageType, data: { text: "foobar" } }),
         [{ pageType: "home-page", path: "/" }],
         {
           preloadJs: true,
@@ -171,10 +145,7 @@ describe("Isomorphic Handler", function () {
       .expect(404)
       .then((res) => {
         const response = JSON.parse(res.text);
-        assert.equal(
-          '<div data-page-type="not-found">foobar</div>',
-          response.content
-        );
+        assert.equal('<div data-page-type="not-found">foobar</div>', response.content);
         assert.equal(false, response.store.qt.disableIsomorphicComponent);
         assert.equal("127.0.0.1", response.store.qt.data.host);
       })
@@ -202,10 +173,7 @@ describe("Isomorphic Handler", function () {
       .expect(500)
       .then((res) => {
         const response = JSON.parse(res.text);
-        assert.equal(
-          '<div data-page-type="not-found">foobar</div>',
-          response.content
-        );
+        assert.equal('<div data-page-type="not-found">foobar</div>', response.content);
         assert.equal(true, response.store.qt.disableIsomorphicComponent);
       })
       .then(done, done);
@@ -240,10 +208,7 @@ describe("Isomorphic Handler", function () {
     supertest(app)
       .get("/")
       .expect("Content-Type", /html/)
-      .expect(
-        "Cache-Control",
-        "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400"
-      )
+      .expect("Cache-Control", "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400")
       .expect("Vary", "Accept-Encoding")
       .expect("Surrogate-Key", "foo bar")
       .expect("Cache-Tag", "foo,bar")
@@ -252,8 +217,7 @@ describe("Isomorphic Handler", function () {
 
   it("it redirects on a 301", function (done) {
     const app = createApp(
-      (pageType, params, config, client) =>
-        Promise.resolve({ httpStatusCode: 301, data: { location: "/foobar" } }),
+      (pageType, params, config, client) => Promise.resolve({ httpStatusCode: 301, data: { location: "/foobar" } }),
       [{ pageType: "home-page", path: "/" }]
     );
 
@@ -262,8 +226,7 @@ describe("Isomorphic Handler", function () {
 
   it("returns a 500 if render layout crashes", function (done) {
     const app = createApp(
-      (pageType, params, config, client) =>
-        Promise.resolve({ pageType, data: { text: "foobar" } }),
+      (pageType, params, config, client) => Promise.resolve({ pageType, data: { text: "foobar" } }),
       [{ pageType: "home-page", path: "/" }],
       {
         renderLayout: () => {
@@ -283,8 +246,7 @@ describe("Isomorphic Handler", function () {
     });
 
     const app = createApp(
-      (pageType, params, config, client) =>
-        Promise.resolve({ pageType, data: { text: "foobar" } }),
+      (pageType, params, config, client) => Promise.resolve({ pageType, data: { text: "foobar" } }),
       [{ pageType: "home-page", path: "/" }],
       {
         prerenderServiceUrl: "http://localhost:4000",
@@ -353,10 +315,7 @@ describe("Isomorphic Handler", function () {
         .expect(404)
         .then((res) => {
           const response = JSON.parse(res.text);
-          assert.equal(
-            '<div data-page-type="not-found">foobar</div>',
-            response.content
-          );
+          assert.equal('<div data-page-type="not-found">foobar</div>', response.content);
           assert.equal(false, response.store.qt.disableIsomorphicComponent);
           assert.equal("127.0.0.1", response.store.qt.data.host);
         })
@@ -365,8 +324,7 @@ describe("Isomorphic Handler", function () {
 
     it("Allows bypassing even data.abort is set", function (done) {
       const app = createApp(
-        (pageType, params, config, client, { next }) =>
-          next().then((n) => ({ data: n })),
+        (pageType, params, config, client, { next }) => next().then((n) => ({ data: n })),
         [{ pageType: "home-page", path: "/skip", exact: true }],
         {
           loadErrorData: (err, config, client, { host }) => ({
@@ -383,10 +341,7 @@ describe("Isomorphic Handler", function () {
         .expect(404)
         .then((res) => {
           const response = JSON.parse(res.text);
-          assert.equal(
-            '<div data-page-type="not-found">foobar</div>',
-            response.content
-          );
+          assert.equal('<div data-page-type="not-found">foobar</div>', response.content);
           assert.equal(false, response.store.qt.disableIsomorphicComponent);
           assert.equal("127.0.0.1", response.store.qt.data.host);
         })
@@ -399,9 +354,7 @@ describe("Isomorphic Handler", function () {
         { pageType: "home-page", path: "/" },
       ];
       const dataLoader = (pageType, _1, _2, _3, { host, next }) =>
-        pageType === "skip"
-          ? next()
-          : Promise.resolve({ pageType, data: { text: "foobar", host } });
+        pageType === "skip" ? next() : Promise.resolve({ pageType, data: { text: "foobar", host } });
 
       const app = createApp(dataLoader, overlappingRoutes);
 
@@ -411,10 +364,7 @@ describe("Isomorphic Handler", function () {
         .expect(200)
         .then((res) => {
           const response = JSON.parse(res.text);
-          assert.equal(
-            '<div data-page-type="home-page">foobar</div>',
-            response.content
-          );
+          assert.equal('<div data-page-type="home-page">foobar</div>', response.content);
           assert.equal("foobar", response.store.qt.data.text);
           assert.equal("127.0.0.1", response.store.qt.data.host);
           assert.equal("home-page", response.store.qt.pageType);
@@ -425,8 +375,7 @@ describe("Isomorphic Handler", function () {
 
   it("Passes the primaryHostUrl and currentHostUrl to the render", function (done) {
     const app = createApp(
-      (pageType, params, config, client, { host }) =>
-        Promise.resolve({ pageType, data: { text: "foobar", host } }),
+      (pageType, params, config, client, { host }) => Promise.resolve({ pageType, data: { text: "foobar", host } }),
       [{ pageType: "home-page", path: "/" }]
     );
 
@@ -461,10 +410,7 @@ describe("Isomorphic Handler", function () {
         .expect("Content-Type", /html/)
         .expect(200)
         .then((res) => {
-          assert.equal(
-            `http://127.0.0.1/amp/story/%2Ffoo%2Fbar`,
-            res.get("X-QT-Light-Pages-Url")
-          );
+          assert.equal(`http://127.0.0.1/amp/story/%2Ffoo%2Fbar`, res.get("X-QT-Light-Pages-Url"));
         })
         .then(done);
     });
@@ -487,10 +433,7 @@ describe("Isomorphic Handler", function () {
         .expect("Content-Type", /html/)
         .expect(200)
         .then((res) => {
-          assert.equal(
-            `http://127.0.0.1/amp/story/%2Ffoo%2Fbar`,
-            res.get("X-QT-Light-Pages-Url")
-          );
+          assert.equal(`http://127.0.0.1/amp/story/%2Ffoo%2Fbar`, res.get("X-QT-Light-Pages-Url"));
         })
         .then(done);
     });
@@ -505,8 +448,7 @@ describe("Isomorphic Handler", function () {
         [{ pageType: "story-page", path: "/*/:storySlug" }],
         {
           lightPages: () => false,
-          renderLightPage: (req, res, result) =>
-            res.send("<h1> Amp Page </h1>"),
+          renderLightPage: (req, res, result) => res.send("<h1> Amp Page </h1>"),
           shouldEncodeAmpUri: true,
         }
       );
@@ -569,10 +511,7 @@ describe("Isomorphic Handler", function () {
         .then((res) => {
           const cacheControl = res.header["cache-control"];
           const cacheTag = res.header["cache-tag"];
-          assert.equal(
-            cacheControl,
-            "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400"
-          );
+          assert.equal(cacheControl, "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400");
           assert.equal(cacheTag, "c/1/abcdefgh");
         })
         .then(done);
@@ -595,10 +534,7 @@ describe("Isomorphic Handler", function () {
         .then((res) => {
           const cacheControl = res.header["cache-control"];
           const cacheTag = res.header["cache-tag"];
-          assert.equal(
-            cacheControl,
-            "public,max-age=15,s-maxage=60,stale-while-revalidate=150,stale-if-error=3600"
-          );
+          assert.equal(cacheControl, "public,max-age=15,s-maxage=60,stale-while-revalidate=150,stale-if-error=3600");
           assert.equal(cacheTag, undefined);
         })
         .then(done);
@@ -632,7 +568,7 @@ describe("Isomorphic Handler", function () {
           assert.equal(
             contentSecurityPolicy,
             `default-src data: 'unsafe-inline' 'unsafe-eval' https: http:;` +
-              `script-src data: 'unsafe-inline' 'unsafe-eval' https: http: blob:;` +
+              `script-src 'self' https://cdnjs.cloudflare.com;` +
               `style-src data: 'unsafe-inline' https: http: blob:;` +
               `img-src data: https: http: blob:;` +
               `font-src data: https: http:;` +
@@ -667,19 +603,13 @@ describe("Isomorphic Handler", function () {
           const edgeCacheControl = res.header["edge-control"];
           const edgeCacheTag = res.header["edge-cache-tag"];
           const contentSecurityPolicy = res.header["content-security-policy"];
-          assert.equal(
-            cacheControl,
-            "public,max-age=15,s-maxage=60,stale-while-revalidate=150,stale-if-error=3600"
-          );
-          assert.equal(
-            edgeCacheControl,
-            "public,maxage=60,stale-while-revalidate=150,stale-if-error=3600"
-          );
+          assert.equal(cacheControl, "public,max-age=15,s-maxage=60,stale-while-revalidate=150,stale-if-error=3600");
+          assert.equal(edgeCacheControl, "public,maxage=60,stale-while-revalidate=150,stale-if-error=3600");
           assert.equal(edgeCacheTag, undefined);
           assert.equal(
             contentSecurityPolicy,
             `default-src data: 'unsafe-inline' 'unsafe-eval' https: http:;` +
-              `script-src data: 'unsafe-inline' 'unsafe-eval' https: http: blob:;` +
+              `script-src 'self' https://cdnjs.cloudflare.com;` +
               `style-src data: 'unsafe-inline' https: http: blob:;` +
               `img-src data: https: http: blob:;` +
               `font-src data: https: http:;` +
@@ -714,19 +644,13 @@ describe("Isomorphic Handler", function () {
           const edgeCacheControl = res.header["edge-control"];
           const edgeCacheTag = res.header["edge-cache-tag"];
           const contentSecurityPolicy = res.header["content-security-policy"];
-          assert.equal(
-            cacheControl,
-            "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400"
-          );
-          assert.equal(
-            edgeCacheControl,
-            "public,maxage=900,stale-while-revalidate=1000,stale-if-error=14400"
-          );
+          assert.equal(cacheControl, "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400");
+          assert.equal(edgeCacheControl, "public,maxage=900,stale-while-revalidate=1000,stale-if-error=14400");
           assert.equal(edgeCacheTag, "c/1/abcdefgh");
           assert.equal(
             contentSecurityPolicy,
             `default-src data: 'unsafe-inline' 'unsafe-eval' https: http:;` +
-              `script-src data: 'unsafe-inline' 'unsafe-eval' https: http: blob:;` +
+              `script-src 'self' https://cdnjs.cloudflare.com;` +
               `style-src data: 'unsafe-inline' https: http: blob:;` +
               `img-src data: https: http: blob:;` +
               `font-src data: https: http:;` +
@@ -761,19 +685,13 @@ describe("Isomorphic Handler", function () {
           const edgeCacheControl = res.header["edge-control"];
           const edgeCacheTag = res.header["edge-cache-tag"];
           const contentSecurityPolicy = res.header["content-security-policy"];
-          assert.equal(
-            cacheControl,
-            "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400"
-          );
-          assert.equal(
-            edgeCacheControl,
-            "public,maxage=900,stale-while-revalidate=1000,stale-if-error=14400"
-          );
+          assert.equal(cacheControl, "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400");
+          assert.equal(edgeCacheControl, "public,maxage=900,stale-while-revalidate=1000,stale-if-error=14400");
           assert.equal(edgeCacheTag, "c/1/abcdefgh");
           assert.equal(
             contentSecurityPolicy,
             `default-src data: 'unsafe-inline' 'unsafe-eval' https: http:;` +
-              `script-src data: 'unsafe-inline' 'unsafe-eval' https: http: blob:;` +
+              `script-src 'self' https://cdnjs.cloudflare.com;` +
               `style-src data: 'unsafe-inline' https: http: blob:;` +
               `img-src data: https: http: blob:;` +
               `font-src data: https: http:;` +
@@ -828,10 +746,7 @@ describe("Isomorphic Handler", function () {
         .expect(200)
         .then((res) => {
           const cacheControl = res.header["cache-control"];
-          assert.equal(
-            cacheControl,
-            "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400"
-          );
+          assert.equal(cacheControl, "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400");
         })
         .then(done);
     });
@@ -933,8 +848,7 @@ describe("Isomorphic Handler", function () {
       const app = express();
       mountQuintypeAt(app, "/foo");
       createApp(
-        (pageType, params, config, client, { host }) =>
-          Promise.resolve({ pageType, data: { text: "foobar", host } }),
+        (pageType, params, config, client, { host }) => Promise.resolve({ pageType, data: { text: "foobar", host } }),
         [{ pageType: "home-page", path: "/", exact: true }],
         {},
         app
@@ -946,10 +860,7 @@ describe("Isomorphic Handler", function () {
         .expect(200)
         .then((res) => {
           const response = JSON.parse(res.text);
-          assert.equal(
-            '<div data-page-type="home-page">foobar</div>',
-            response.content
-          );
+          assert.equal('<div data-page-type="home-page">foobar</div>', response.content);
           assert.equal("foobar", response.store.qt.data.text);
           assert.equal("127.0.0.1", response.store.qt.data.host);
           assert.equal("home-page", response.store.qt.pageType);
@@ -960,8 +871,7 @@ describe("Isomorphic Handler", function () {
       const app = express();
       mountQuintypeAt(app, "/foo");
       createApp(
-        (pageType, params, config, client, { host }) =>
-          Promise.resolve({ pageType, data: { text: "foobar", host } }),
+        (pageType, params, config, client, { host }) => Promise.resolve({ pageType, data: { text: "foobar", host } }),
         [{ pageType: "home-page", path: "/", exact: true }],
         {},
         app
@@ -974,8 +884,7 @@ describe("Isomorphic Handler", function () {
       const app = express();
       mountQuintypeAt(app, (hostname) => `/${hostname}`);
       createApp(
-        (pageType, params, config, client, { host }) =>
-          Promise.resolve({ pageType, data: { text: "foobar", host } }),
+        (pageType, params, config, client, { host }) => Promise.resolve({ pageType, data: { text: "foobar", host } }),
         [{ pageType: "home-page", path: "/", exact: true }],
         {},
         app
@@ -987,10 +896,7 @@ describe("Isomorphic Handler", function () {
         .expect(200)
         .then((res) => {
           const response = JSON.parse(res.text);
-          assert.equal(
-            '<div data-page-type="home-page">foobar</div>',
-            response.content
-          );
+          assert.equal('<div data-page-type="home-page">foobar</div>', response.content);
           assert.equal("foobar", response.store.qt.data.text);
           assert.equal("127.0.0.1", response.store.qt.data.host);
           assert.equal("home-page", response.store.qt.pageType);
@@ -1001,8 +907,7 @@ describe("Isomorphic Handler", function () {
       const app = express();
       mountQuintypeAt(app, (hostname) => undefined);
       createApp(
-        (pageType, params, config, client, { host }) =>
-          Promise.resolve({ pageType, data: { text: "foobar", host } }),
+        (pageType, params, config, client, { host }) => Promise.resolve({ pageType, data: { text: "foobar", host } }),
         [{ pageType: "home-page", path: "/", exact: true }],
         {},
         app
@@ -1014,10 +919,7 @@ describe("Isomorphic Handler", function () {
         .expect(200)
         .then((res) => {
           const response = JSON.parse(res.text);
-          assert.equal(
-            '<div data-page-type="home-page">foobar</div>',
-            response.content
-          );
+          assert.equal('<div data-page-type="home-page">foobar</div>', response.content);
           assert.equal("foobar", response.store.qt.data.text);
           assert.equal("127.0.0.1", response.store.qt.data.host);
           assert.equal("home-page", response.store.qt.pageType);

package/test/integration/url-redirect-test.js

@@ -651,8 +651,8 @@ describe("Redirect Routes Handler", function () {
         "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400"
       )
       .expect("Vary", /Accept\-Encoding/)
-      .expect("Surrogate-Key", "u/42/102")
-      .expect("Cache-Tag", "u/42/102")
+      .expect("Surrogate-Key", "sp/42/102")
+      .expect("Cache-Tag", "sp/42/102")
       .expect(302, done);
   });
 

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

@@ -678,7 +678,7 @@ describe("ApiClient", function () {
   describe("Custom urls", function () {
     it("returns cache keys", function () {
       const page = CustomPath.build({ id: 101 });
-      assert.deepStrictEqual(["u/1/101"], page.cacheKeys(1));
+      assert.deepStrictEqual(["sp/1/101"], page.cacheKeys(1));
     });
 
     it("returns cache keys as null if page is invalid", function () {