ghost 5.130.0 → 6.0.0-alpha.1

package/yarn.lock

@@ -10005,23 +10005,6 @@ amdefine@>=0.0.4:
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==
 
-amperize@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/amperize/-/amperize-0.6.1.tgz#b90079db6d66d4dd33e6584ef88c4df493ed7e03"
-  integrity sha512-g36E/XJ5N98VyKh4opL894rlrBejh7aS6emet0HpLKg9IHfbXM3vDMBgwsTQO9M/kY+NZ9mpQU3SW9w8FDM6gw==
-  dependencies:
-    async "^3.0.1"
-    domutils "^2.0.0"
-    emits "^3.0.0"
-    htmlparser2 "^4.0.0"
-    image-size "^0.8.1"
-    lodash "^4.17.11"
-    probe-image-size "^5.0.0"
-    request "^2.83.0"
-    request-promise "^4.2.4"
-    uuid "^7.0.1"
-    validator "^12.0.0"
-
 animejs@3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/animejs/-/animejs-3.2.2.tgz#59be98c58834339d5847f4a70ddba74ac75b6afc"
@@ -10528,7 +10511,7 @@ async@^2.4.1:
   dependencies:
     lodash "^4.17.14"
 
-async@^3.0.0, async@^3.0.1, async@^3.2.3, async@^3.2.6:
+async@^3.0.0, async@^3.2.3, async@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
   integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
@@ -11593,7 +11576,7 @@ blank-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/blank-object/-/blank-object-1.0.2.tgz#f990793fbe9a8c8dd013fb3219420bec81d5f4b9"
   integrity sha512-kXQ19Xhoghiyw66CUiGypnuRpWlbHAzY/+NyvqTEdTfhfQGH1/dbEMYiXju7fYKIFePpzp/y9dsu5Cu/PkmawQ==
 
-bluebird@^3.1.1, bluebird@^3.4.1, bluebird@^3.4.6, bluebird@^3.5.0, bluebird@^3.5.5, bluebird@^3.7.2:
+bluebird@^3.1.1, bluebird@^3.4.1, bluebird@^3.4.6, bluebird@^3.5.5, bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -14852,7 +14835,7 @@ deep-is@^0.1.3, deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge@^4.0.0, deepmerge@^4.2.2:
+deepmerge@^4.2.2:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
@@ -15175,7 +15158,7 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-domhandler@^3.0.0, domhandler@^3.3.0:
+domhandler@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.3.0.tgz#6db7ea46e4617eb15cf875df68b2b8524ce0037a"
   integrity sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==
@@ -15219,7 +15202,7 @@ domutils@^1.5.1, domutils@^1.7.0:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^2.0.0, domutils@^2.4.2, domutils@^2.5.2:
+domutils@^2.4.2, domutils@^2.5.2:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
   integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
@@ -16883,11 +16866,6 @@ ember-truth-helpers@3.1.1, "ember-truth-helpers@^2.1.0 || ^3.0.0", ember-truth-h
   dependencies:
     ember-cli-babel "^7.22.1"
 
-emits@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emits/-/emits-3.0.0.tgz#32752bba95e1707b219562384ab9bb8b1fd62f70"
-  integrity sha512-WJSCMaN/qjIkzWy5Ayu0MDENFltcu4zTPPnWqdFPOVBtsENVTN+A3d76G61yuiVALsMK+76MejdPrwmccv/wag==
-
 emittery@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
@@ -19944,16 +19922,6 @@ htmlparser2@^3.10.1, htmlparser2@^3.9.1:
     inherits "^2.0.1"
     readable-stream "^3.1.1"
 
-htmlparser2@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz#9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"
-  integrity sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^3.0.0"
-    domutils "^2.0.0"
-    entities "^2.0.0"
-
 htmlparser2@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-5.0.1.tgz#7daa6fc3e35d6107ac95a4fc08781f091664f6e7"
@@ -20248,13 +20216,6 @@ image-size@1.2.1, image-size@^1.0.0:
   dependencies:
     queue "6.0.2"
 
-image-size@^0.8.1:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.8.3.tgz#f0b568857e034f29baffd37013587f2c0cad8b46"
-  integrity sha512-SMtq1AJ+aqHB45c3FsB4ERK0UCiA2d3H1uq8s+8T0Pf8A3W4teyBQyaFaktH6xvZqh+npwlKU7i4fJo0r7TYTg==
-  dependencies:
-    queue "6.0.1"
-
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
@@ -24620,11 +24581,6 @@ next-themes@0.4.6:
   resolved "https://registry.yarnpkg.com/next-themes/-/next-themes-0.4.6.tgz#8d7e92d03b8fea6582892a50a928c9b23502e8b6"
   integrity sha512-pZvgD5L0IEvX5/9GWyHMf3m8BKiVQwsCMHfoFosXtXBMnaS0ZnIJ9ST4b4NqLVKDEm8QBxoNNGNaBv2JNF6XNA==
 
-next-tick@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
-  integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
-
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -27186,17 +27142,6 @@ probe-image-size@7.2.3:
     needle "^2.5.2"
     stream-parser "~0.3.1"
 
-probe-image-size@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/probe-image-size/-/probe-image-size-5.0.0.tgz#1b87d20340ab8fcdb4324ec77fbc8a5f53419878"
-  integrity sha512-V6uBYw5eBc5UVIE7MUZD6Nxg0RYuGDWLDenEn0B1WC6PcTvn1xdQ6HLDDuznefsiExC6rNrCz7mFRBo0f3Xekg==
-  dependencies:
-    deepmerge "^4.0.0"
-    inherits "^2.0.3"
-    next-tick "^1.0.0"
-    request "^2.83.0"
-    stream-parser "~0.3.1"
-
 proc-log@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8"
@@ -27611,13 +27556,6 @@ queue-tick@^1.0.1:
   resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142"
   integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==
 
-queue@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.1.tgz#abd5a5b0376912f070a25729e0b6a7d565683791"
-  integrity sha512-AJBQabRCCNr9ANq8v77RJEv73DPbn55cdTb+Giq4X0AVnNVZvMHlYp7XlQiN+1npCZj1DuSmaA2hYVUUDgxFDg==
-  dependencies:
-    inherits "~2.0.3"
-
 queue@6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65"
@@ -28409,24 +28347,7 @@ reqresnext@^1.7.0:
     lodash "^4.17.21"
     setprototypeof "^1.2.0"
 
-request-promise-core@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
-  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
-  dependencies:
-    lodash "^4.17.19"
-
-request-promise@^4.2.4:
-  version "4.2.6"
-  resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.6.tgz#7e7e5b9578630e6f598e3813c0f8eb342a27f0a2"
-  integrity sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ==
-  dependencies:
-    bluebird "^3.5.0"
-    request-promise-core "1.1.4"
-    stealthy-require "^1.1.1"
-    tough-cookie "^2.3.3"
-
-"request@>=2.76.0 <3.0.0", request@^2.83.0:
+"request@>=2.76.0 <3.0.0":
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -30010,11 +29931,6 @@ std-env@^3.3.3, std-env@^3.5.0:
   resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.9.0.tgz#1a6f7243b339dca4c9fd55e1c7504c77ef23e8f1"
   integrity sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==
 
-stealthy-require@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-  integrity sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==
-
 stop-iteration-iterator@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4"
@@ -31249,14 +31165,6 @@ totalist@^3.0.0:
   resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.0.tgz#4ef9c58c5f095255cdc3ff2a0a55091c57a3a1bd"
   integrity sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw==
 
-tough-cookie@^2.3.3, tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
 tough-cookie@^4.0.0, tough-cookie@^4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
@@ -31267,6 +31175,14 @@ tough-cookie@^4.0.0, tough-cookie@^4.1.4:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
@@ -32145,11 +32061,6 @@ validator@7.2.0:
   resolved "https://registry.yarnpkg.com/validator/-/validator-7.2.0.tgz#a63dcbaba51d4350bf8df20988e0d5a54d711791"
   integrity sha512-c8NGTUYeBEcUIGeMppmNVKHE7wwfm3mYbNZxV+c5mlv9fDHI7Ad3p07qfNrn/CvpdkK2k61fOLRO2sTEhgQXmg==
 
-validator@^12.0.0:
-  version "12.2.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-12.2.0.tgz#660d47e96267033fd070096c3b1a6f2db4380a0a"
-  integrity sha512-jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ==
-
 value-or-function@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-4.0.0.tgz#70836b6a876a010dc3a2b884e7902e9db064378d"
@@ -32524,10 +32435,10 @@ webpack-virtual-modules@^0.5.0:
   resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz#362f14738a56dae107937ab98ea7062e8bdd3b6c"
   integrity sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==
 
-webpack@5.100.1:
-  version "5.100.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.100.1.tgz#d8a7e7761d253b961248ed9ed7661c51698593de"
-  integrity sha512-YJB/ESPUe2Locd0NKXmw72Dx8fZQk1gTzI6rc9TAT4+Sypbnhl8jd8RywB1bDsDF9Dy1RUR7gn3q/ZJTd0OZZg==
+webpack@5.100.2:
+  version "5.100.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.100.2.tgz#e2341facf9f7de1d702147c91bcb65b693adf9e8"
+  integrity sha512-QaNKAvGCDRh3wW1dsDjeMdDXwZm2vqq3zn6Pvq4rHOEOGSaUMgOOjG2Y9ZbIGzpfkJk9ZYTHpDqgDfeBDcnLaw==
   dependencies:
     "@types/eslint-scope" "^3.7.7"
     "@types/estree" "^1.0.8"

package/core/built/admin/assets/img/amp-d7b72aae3315fda95921fb575dfca100.svg

@@ -1,4 +0,0 @@
-<svg width="256" height="256" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
-    <title>amp</title>
-    <path d="m171.887 116.28-53.696 89.36h-9.728l9.617-58.227-30.2.047a4.854 4.854 0 0 1-4.855-4.855c0-1.152 1.07-3.102 1.07-3.102l53.52-89.254 9.9.043-9.86 58.317 30.413-.043a4.854 4.854 0 0 1 4.855 4.855c0 1.088-.427 2.044-1.033 2.854l.004.004-.007.001zM128 0C57.306 0 0 57.3 0 128s57.306 128 128 128 128-57.306 128-128S198.7 0 128 0z" fill="#0379C4" fill-rule="evenodd"/>
-</svg>

package/core/frontend/apps/amp/index.js

@@ -1,30 +0,0 @@
-const path = require('path');
-
-const router = require('./lib/router');
-const urlUtils = require('../../../shared/url-utils');
-
-// Dirty requires
-const settingsCache = require('../../../shared/settings-cache');
-
-function ampRouter(req, res) {
-    if (settingsCache.get('amp') === true) {
-        return router.apply(this, arguments);
-    } else {
-        // routeKeywords.amp: 'amp'
-        let redirectUrl = req.originalUrl.replace(/\/amp\//, '/');
-
-        urlUtils.redirect301(res, redirectUrl);
-    }
-}
-
-module.exports = {
-    activate: function activate(ghost) {
-        // routeKeywords.amp: 'amp'
-        let ampRoute = '*/amp/';
-
-        ghost.routeService.registerRouter(ampRoute, ampRouter);
-        ghost.helperService.registerDir(path.resolve(__dirname, './lib/helpers'));
-        // we use the {{ghost_head}} helper, but call it {{amp_ghost_head}}, so it's consistent
-        ghost.helperService.registerAlias('amp_ghost_head', 'ghost_head');
-    }
-};

package/core/frontend/apps/amp/lib/helpers/amp_analytics.js

@@ -1,32 +0,0 @@
-// # Amp Components Helper
-// Usage: `{{amp_analytics}}`
-//
-// Outputs inline scripts used for analytics
-const {settingsCache} = require('../../../../services/proxy');
-const {SafeString} = require('../../../../services/handlebars');
-
-function ampComponents() {
-    let components = [];
-
-    const ampGtagId = settingsCache.get('amp_gtag_id');
-    if (ampGtagId) {
-        components.push(`
-            <amp-analytics type="gtag" data-credentials="include">
-                <script type="application/json">
-                    {
-                        "vars" : {
-                            "gtag_id": "${ampGtagId}",
-                            "config" : {
-                                "${ampGtagId}": { "groups": "default" }
-                            }
-                        }
-                    }
-                </script>
-            </amp-analytics>
-        `);
-    }
-
-    return new SafeString(components.join('\n'));
-}
-
-module.exports = ampComponents;

package/core/frontend/apps/amp/lib/helpers/amp_components.js

@@ -1,48 +0,0 @@
-// # Amp Components Helper
-// Usage: `{{amp_components}}`
-//
-// Reads through the AMP HTML and adds neccessary scripts
-// for each extended component
-// If more components need to be added, we can add more scripts.
-// Here's the list of all supported extended components: https://www.ampproject.org/docs/reference/extended.html
-// By default supported AMP HTML tags (no additional script tag necessary):
-// amp-img, amp-ad, amp-embed, amp-video and amp-pixel.
-// (less) dirty requires
-const {settingsCache} = require('../../../../services/proxy');
-const {SafeString} = require('../../../../services/handlebars');
-
-function ampComponents() {
-    let components = [];
-    let html = this.post && this.post.html || this.html;
-
-    if (!html) {
-        return;
-    }
-
-    if (html.indexOf('.gif') !== -1) {
-        components.push('<script async custom-element="amp-anim" src="https://cdn.ampproject.org/v0/amp-anim-0.1.js"></script>');
-    }
-
-    let iframeCount = (html.match(/(<iframe)(.*?\s*?)(<\/iframe>)/gi) || []).length;
-    let youtubeCount = (html.match(/(<iframe)(.*?\s*?)(youtu.be\/|youtube(-nocookie)?.com\/(v\/|.*u\/\w\/|embed\/|.*v=))(.*?\s*?)(<\/iframe>)/gi) || []).length;
-
-    if (youtubeCount) {
-        components.push('<script async custom-element="amp-youtube" src="https://cdn.ampproject.org/v0/amp-youtube-0.1.js"></script>');
-    }
-
-    if (iframeCount > youtubeCount) {
-        components.push('<script async custom-element="amp-iframe" src="https://cdn.ampproject.org/v0/amp-iframe-0.1.js"></script>');
-    }
-
-    if (html.indexOf('<audio') !== -1) {
-        components.push('<script async custom-element="amp-audio" src="https://cdn.ampproject.org/v0/amp-audio-0.1.js"></script>');
-    }
-
-    if (settingsCache.get('amp_gtag_id')) {
-        components.push('<script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>');
-    }
-
-    return new SafeString(components.join('\n'));
-}
-
-module.exports = ampComponents;

package/core/frontend/apps/amp/lib/helpers/amp_content.js

@@ -1,214 +0,0 @@
-// # Amp Content Helper
-// Usage: `{{amp_content}}`
-//
-// Turns content html into a safestring so that the user doesn't have to
-// escape it or tell handlebars to leave it alone with a triple-brace.
-//
-// Converts normal HTML into AMP HTML with Amperize module and uses a cache to return it from
-// there if available. The cacheId is a combination of `updated_at` and the `slug`.
-const {DateTime} = require('luxon');
-const errors = require('@tryghost/errors');
-const logging = require('@tryghost/logging');
-
-const {SafeString} = require('../../../../services/handlebars');
-
-const amperizeCache = {};
-let allowedAMPTags = [];
-let allowedAMPAttributes = {};
-let amperize = null;
-let ampHTML = '';
-let cleanHTML = '';
-
-allowedAMPTags = ['html', 'body', 'article', 'section', 'nav', 'aside', 'h1', 'h2',
-    'h3', 'h4', 'h5', 'h6', 'header', 'footer', 'address', 'p', 'hr',
-    'pre', 'blockquote', 'ol', 'ul', 'li', 'dl', 'dt', 'dd', 'figure',
-    'figcaption', 'div', 'main', 'a', 'em', 'strong', 'small', 's', 'cite',
-    'q', 'dfn', 'abbr', 'data', 'time', 'code', 'var', 'samp', 'kbd', 'sub',
-    'sup', 'i', 'b', 'u', 'mark', 'ruby', 'rb', 'rt', 'rtc', 'rp', 'bdi',
-    'bdo', 'span', 'br', 'wbr', 'ins', 'del', 'source', 'track', 'svg', 'g',
-    'path', 'glyph', 'glyphref', 'marker', 'view', 'circle', 'line', 'polygon',
-    'polyline', 'rect', 'text', 'textpath', 'tref', 'tspan', 'clippath',
-    'filter', 'lineargradient', 'radialgradient', 'mask', 'pattern', 'vkern',
-    'hkern', 'defs', 'stop', 'use', 'foreignobject', 'symbol', 'desc', 'title',
-    'table', 'caption', 'colgroup', 'col', 'tbody', 'thead', 'tfoot', 'tr', 'td',
-    'th', 'button', 'noscript', 'acronym', 'center', 'dir', 'hgroup', 'listing',
-    'multicol', 'nextid', 'nobr', 'spacer', 'strike', 'tt', 'xmp', 'amp-img',
-    'amp-video', 'amp-ad', 'amp-embed', 'amp-anim', 'amp-iframe', 'amp-youtube',
-    'amp-pixel', 'amp-audio', 'O:P'];
-
-allowedAMPAttributes = {
-    '*': ['itemid', 'itemprop', 'itemref', 'itemscope', 'itemtype', 'accesskey', 'class', 'dir', 'draggable',
-        'id', 'lang', 'tabindex', 'title', 'translate', 'aria-*', 'role', 'placeholder', 'fallback', 'lightbox',
-        'overflow', 'amp-access', 'amp-access-*', 'i-amp-access-id', 'data-*'],
-    h1: ['align'],
-    h2: ['align'],
-    h3: ['align'],
-    h4: ['align'],
-    h5: ['align'],
-    h6: ['align'],
-    p: ['align'],
-    blockquote: ['align'],
-    ol: ['reversed', 'start', 'type'],
-    li: ['value'],
-    div: ['align'],
-    a: ['href', 'hreflang', 'rel', 'role', 'tabindex', 'target', 'download', 'media', 'type', 'border', 'name'],
-    time: ['datetime'],
-    bdo: ['dir'],
-    ins: ['datetime'],
-    del: ['datetime'],
-    source: ['src', 'srcset', 'sizes', 'media', 'type', 'kind', 'label', 'srclang'],
-    track: ['src', 'default', 'kind', 'label', 'srclang'],
-    svg: ['*'],
-    g: ['*'],
-    glyph: ['*'],
-    glyphref: ['*'],
-    marker: ['*'],
-    path: ['*'],
-    view: ['*'],
-    circle: ['*'],
-    line: ['*'],
-    polygon: ['*'],
-    polyline: ['*'],
-    rect: ['*'],
-    text: ['*'],
-    textpath: ['*'],
-    tref: ['*'],
-    tspan: ['*'],
-    clippath: ['*'],
-    filter: ['*'],
-    hkern: ['*'],
-    lineargradient: ['*'],
-    mask: ['*'],
-    pattern: ['*'],
-    radialgradient: ['*'],
-    stop: ['*'],
-    vkern: ['*'],
-    defs: ['*'],
-    symbol: ['*'],
-    use: ['*'],
-    foreignobject: ['*'],
-    desc: ['*'],
-    title: ['*'],
-    table: ['sortable', 'align', 'border', 'bgcolor', 'cellpadding', 'cellspacing', 'width'],
-    colgroup: ['span'],
-    col: ['span'],
-    tr: ['align', 'bgcolor', 'height', 'valign'],
-    td: ['align', 'bgcolor', 'height', 'valign', 'colspan', 'headers', 'rowspan'],
-    th: ['align', 'bgcolor', 'height', 'valign', 'colspan', 'headers', 'rowspan', 'abbr', 'scope', 'sorted'],
-    button: ['disabled', 'name', 'role', 'tabindex', 'type', 'value', 'formtarget'],
-    // built ins
-    'amp-img': ['media', 'noloading', 'alt', 'attribution', 'placeholder', 'src', 'srcset', 'width', 'height', 'layout'],
-    'amp-pixel': ['src'],
-    'amp-video': ['src', 'srcset', 'media', 'noloading', 'width', 'height', 'layout', 'alt', 'attribution',
-        'autoplay', 'controls', 'loop', 'muted', 'poster', 'preload'],
-    'amp-embed': ['media', 'noloading', 'width', 'height', 'layout', 'type', 'data-*', 'json'],
-    'amp-ad': ['media', 'noloading', 'width', 'height', 'layout', 'type', 'data-*', 'json'],
-    // extended components we support
-    'amp-anim': ['media', 'noloading', 'alt', 'attribution', 'placeholder', 'src', 'srcset', 'width', 'height', 'layout'],
-    'amp-audio': ['src', 'width', 'height', 'autoplay', 'loop', 'muted', 'controls'],
-    'amp-iframe': ['src', 'srcdoc', 'width', 'height', 'layout', 'frameborder', 'allowfullscreen', 'allowtransparency',
-        'sandbox', 'referrerpolicy'],
-    'amp-youtube': ['src', 'layout', 'frameborder', 'autoplay', 'loop', 'data-videoid', 'data-live-channelid', 'width', 'height']
-};
-
-function getAmperizeHTML(html, post) {
-    if (!html) {
-        return;
-    }
-
-    let Amperize = require('amperize');
-
-    amperize = amperize || new Amperize();
-
-    let cacheDateTime;
-    let postDateTime;
-
-    if (amperizeCache[post.id]) {
-        const {updated_at: ampCacheUpdatedAt} = amperizeCache[post.id];
-        const {updated_at: postUpdatedAt} = post;
-
-        cacheDateTime = DateTime.fromJSDate(new Date(ampCacheUpdatedAt));
-        postDateTime = DateTime.fromJSDate(new Date(postUpdatedAt));
-    }
-
-    if (!amperizeCache[post.id] || cacheDateTime.diff(postDateTime).valueOf() < 0) {
-        return new Promise((resolve) => {
-            amperize.parse(html, (err, res) => {
-                if (err) {
-                    if (err.src) {
-                        // This is a valid 500 GhostError because it means the amperize parser is unable to handle some Ghost HTML.
-                        logging.error(new errors.InternalServerError({
-                            message: `AMP HTML couldn't be parsed: ${err.src}`,
-                            code: 'AMP_PARSER_ERROR',
-                            err: err,
-                            context: post.url,
-                            help: 'Please share this error on GitHub or https://forum.ghost.org'
-                        }));
-                    } else {
-                        logging.error(new errors.InternalServerError({err, code: 'AMP_PARSER_ERROR'}));
-                    }
-
-                    // save it in cache to prevent multiple calls to Amperize until
-                    // content is updated.
-                    amperizeCache[post.id] = {updated_at: post.updated_at, amp: html};
-                    // return the original html on an error
-                    return resolve(html);
-                }
-
-                amperizeCache[post.id] = {updated_at: post.updated_at, amp: res};
-                return resolve(amperizeCache[post.id].amp);
-            });
-        });
-    }
-
-    return Promise.resolve(amperizeCache[post.id].amp);
-}
-
-module.exports = async function amp_content() { // eslint-disable-line camelcase
-    let sanitizeHtml = require('sanitize-html');
-    let cheerio = require('cheerio');
-
-    try {
-        const response = await getAmperizeHTML(this.html, this);
-        let $ = null;
-
-        // our Amperized HTML
-        ampHTML = response ?? '';
-
-        // Use cheerio to traverse through HTML and make little clean-ups
-        $ = cheerio.load(ampHTML);
-
-        // We have to remove source children in video, as source is allowed for audio,
-        // but causes validation errors in video, because video will be stripped out.
-        // @TODO: remove this, when Amperize support video transform
-        $('video').children('source').remove();
-        $('video').children('track').remove();
-
-        // Case: AMP parsing failed and we returned the regular HTML,
-        // then we have to remove remaining, invalid HTML tags.
-        $('audio').children('source').remove();
-        $('audio').children('track').remove();
-
-        $('amp-youtube').attr('layout', 'responsive');
-        $('amp-youtube').attr('height', '350');
-        $('amp-youtube').attr('width', '600');
-
-        ampHTML = $.html();
-
-        // @TODO: remove this, when Amperize supports HTML sanitizing
-        cleanHTML = sanitizeHtml(ampHTML, {
-            allowedTags: allowedAMPTags,
-            allowedAttributes: allowedAMPAttributes,
-            selfClosing: ['source', 'track', 'br']
-        });
-
-        return new SafeString(cleanHTML);
-    } catch (error) {
-        logging.error(error);
-
-        // Return an empty safe string
-        return new SafeString('');
-    }
-};
-
-module.exports.async = true;

package/core/frontend/apps/amp/lib/helpers/amp_style.js

@@ -1,8 +0,0 @@
-const {SafeString, escapeExpression} = require('../../../../services/handlebars');
-
-module.exports = function amp_style(options) { // eslint-disable-line camelcase
-    if (options.data.site.accent_color) {
-        const accentColor = escapeExpression(options.data.site.accent_color);
-        return new SafeString(`:root {--ghost-accent-color: ${accentColor};}`);
-    }
-};