ghost 4.18.0 → 4.20.1

package/core/server/data/migrations/versions/4.20/02-remove-offers-table.js

@@ -0,0 +1,30 @@
+const utils = require('../../utils');
+
+const migration = utils.addTable('offers', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    active: {type: 'boolean', nullable: false, defaultTo: true},
+    name: {type: 'string', maxlength: 191, nullable: false, unique: true},
+    code: {type: 'string', maxlength: 191, nullable: false, unique: true},
+    product_id: {type: 'string', maxlength: 24, nullable: false, references: 'products.id'},
+    stripe_coupon_id: {type: 'string', maxlength: 255, nullable: false, unique: true},
+    interval: {type: 'string', maxlength: 50, nullable: false},
+    currency: {type: 'string', maxlength: 50, nullable: true},
+    discount_type: {type: 'string', maxlength: 50, nullable: false},
+    discount_amount: {type: 'integer', nullable: false},
+    duration: {type: 'string', maxlength: 50, nullable: false},
+    duration_in_months: {type: 'integer', nullable: true},
+    portal_title: {type: 'string', maxlength: 191, nullable: false},
+    portal_description: {type: 'string', maxlength: 2000, nullable: true},
+    created_at: {type: 'dateTime', nullable: false},
+    updated_at: {type: 'dateTime', nullable: true}
+});
+
+// This reverses an "addTable" migration so that we
+// drop the table going forwards and re-add it going back
+const up = migration.down;
+const down = migration.up;
+
+migration.up = up;
+migration.down = down;
+
+module.exports = migration;

package/core/server/data/migrations/versions/4.20/03-add-offers-table.js

@@ -0,0 +1,21 @@
+const utils = require('../../utils');
+
+module.exports = utils.addTable('offers', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    active: {type: 'boolean', nullable: false, defaultTo: true},
+    name: {type: 'string', maxlength: 191, nullable: false, unique: true},
+    code: {type: 'string', maxlength: 191, nullable: false, unique: true},
+    product_id: {type: 'string', maxlength: 24, nullable: false, references: 'products.id'},
+    stripe_coupon_id: {type: 'string', maxlength: 255, nullable: true, unique: true},
+    interval: {type: 'string', maxlength: 50, nullable: false},
+    currency: {type: 'string', maxlength: 50, nullable: true},
+    discount_type: {type: 'string', maxlength: 50, nullable: false},
+    discount_amount: {type: 'integer', nullable: false},
+    duration: {type: 'string', maxlength: 50, nullable: false},
+    duration_in_months: {type: 'integer', nullable: true},
+    portal_title: {type: 'string', maxlength: 191, nullable: false},
+    portal_description: {type: 'string', maxlength: 2000, nullable: true},
+    created_at: {type: 'dateTime', nullable: false},
+    updated_at: {type: 'dateTime', nullable: true}
+});
+

package/core/server/data/migrations/versions/4.20/04-add-offer-redemptions-table.js

@@ -0,0 +1,9 @@
+const {addTable} = require('../../utils');
+
+module.exports = addTable('offer_redemptions', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    offer_id: {type: 'string', maxlength: 24, nullable: false, references: 'offers.id', cascadeDelete: true},
+    member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
+    subscription_id: {type: 'string', maxlength: 24, nullable: false, references: 'members_stripe_customers_subscriptions.id', cascadeDelete: true},
+    created_at: {type: 'dateTime', nullable: false}
+});

package/core/server/data/migrations/versions/4.20/05-remove-not-null-constraint-from-portal-title.js

@@ -0,0 +1,41 @@
+const logging = require('@tryghost/logging');
+const {createNonTransactionalMigration} = require('../../utils');
+const {addUnique} = require('../../../schema/commands');
+
+module.exports = createNonTransactionalMigration(
+    async function up(knex) {
+        logging.info('Dropping NOT NULL constraint for: portal_title in table: offers');
+
+        await knex.schema.table('offers', function (table) {
+            table.dropColumn('portal_title');
+        });
+
+        await knex.schema.table('offers', function (table) {
+            table.string('portal_title', 191).nullable();
+        });
+
+        if (knex.client.config.client === 'sqlite3') {
+            for (const column of ['name', 'code', 'stripe_coupon_id']) {
+                await addUnique('offers', column, knex);
+            }
+        }
+    },
+    async function down(knex) {
+        logging.info('Adding NOT NULL constraint for: portal_title in table: offers');
+
+        await knex.schema.table('offers', function (table) {
+            table.dropColumn('portal_title');
+        });
+
+        await knex.schema.table('offers', function (table) {
+            table.string('portal_title', 191).notNullable();
+        });
+
+        if (knex.client.config.client === 'sqlite3') {
+            for (const column of ['name', 'code', 'stripe_coupon_id']) {
+                await addUnique('offers', column, knex);
+            }
+        }
+    }
+);
+

package/core/server/data/schema/fixtures/utils.js

@@ -47,7 +47,7 @@ const matchObj = function matchObj(match, item) {
     const matchedObj = {};
 
     if (_.isArray(match)) {
-        _.each(match, function (matchProp) {
+        _.each(match, (matchProp) => {
             matchedObj[matchProp] = item.get(matchProp);
         });
     } else {
@@ -76,115 +76,9 @@ const fetchRelationData = function fetchRelationData(relation, options) {
     return Promise.props(props);
 };
 
-/**
- * ### Add Fixtures for Model
- * Takes a model fixture, with a name and some entries and processes these
- * into a sequence of promises to get each fixture added.
- *
- * @param {{name, entries}} modelFixture
- * @returns {Promise.<*>}
+/*
+ * Find methods - use the local fixtures
  */
-const addFixturesForModel = function addFixturesForModel(modelFixture, options = {}) {
-    // Clone the fixtures as they get changed in this function.
-    // The initial blog posts will be added a `published_at` property, which
-    // would change the fixturesHash.
-    modelFixture = _.cloneDeep(modelFixture);
-    // The Post model fixtures need a `published_at` date, where at least the seconds
-    // are different, otherwise `prev_post` and `next_post` helpers won't workd with
-    // them.
-    if (modelFixture.name === 'Post') {
-        _.forEach(modelFixture.entries, function (post, index) {
-            if (!post.published_at) {
-                post.published_at = moment().add(index, 'seconds');
-            }
-        });
-    }
-
-    return Promise.mapSeries(modelFixture.entries, function (entry) {
-        let data = {};
-
-        // CASE: if id is specified, only query by id
-        if (entry.id) {
-            data.id = entry.id;
-        } else if (entry.slug) {
-            data.slug = entry.slug;
-        } else {
-            data = _.cloneDeep(entry);
-        }
-
-        if (modelFixture.name === 'Post') {
-            data.status = 'all';
-        }
-
-        return models[modelFixture.name].findOne(data, options).then(function (found) {
-            if (!found) {
-                return models[modelFixture.name].add(entry, options);
-            }
-        });
-    }).then(function (results) {
-        return {expected: modelFixture.entries.length, done: _.compact(results).length};
-    });
-};
-
-/**
- * ## Add Fixtures for Relation
- * Takes a relation fixtures object, with a from, to and some entries and processes these
- * into a sequence of promises, to get each fixture added.
- *
- * @param {{from, to, entries}} relationFixture
- * @returns {Promise.<*>}
- */
-const addFixturesForRelation = function addFixturesForRelation(relationFixture, options) {
-    const ops = [];
-    let max = 0;
-
-    return fetchRelationData(relationFixture, options).then(function getRelationOps(data) {
-        _.each(relationFixture.entries, function processEntries(entry, key) {
-            const fromItem = data.from.find(matchFunc(relationFixture.from.match, key));
-
-            // CASE: You add new fixtures e.g. a new role in a new release.
-            // As soon as an **older** migration script wants to add permissions for any resource, it iterates over the
-            // permissions for each role. But if the role does not exist yet, it won't find the matching db entry and breaks.
-            if (!fromItem) {
-                logging.warn('Skip: Target database entry not found for key: ' + key);
-                return Promise.resolve();
-            }
-
-            _.each(entry, function processEntryValues(value, entryKey) {
-                let toItems = data.to.filter(matchFunc(relationFixture.to.match, entryKey, value));
-                max += toItems.length;
-
-                // Remove any duplicates that already exist in the collection
-                toItems = _.reject(toItems, function (item) {
-                    return fromItem
-                        .related(relationFixture.from.relation)
-                        .find((model) => {
-                            const objectToMatch = matchObj(relationFixture.to.match, item);
-                            return Object.keys(objectToMatch).every(function (keyToCheck) {
-                                return model.get(keyToCheck) === objectToMatch[keyToCheck];
-                            });
-                        });
-                });
-
-                if (toItems && toItems.length > 0) {
-                    ops.push(function addRelationItems() {
-                        return baseUtils.attach(
-                            models[relationFixture.from.Model || relationFixture.from.model],
-                            fromItem.id,
-                            relationFixture.from.relation,
-                            toItems,
-                            options
-                        );
-                    });
-                }
-            });
-        });
-
-        return sequence(ops);
-    }).then(function (result) {
-        return {expected: max, done: _(result).map('length').sum()};
-    });
-};
 
 /**
  * ### Find Model Fixture
@@ -194,7 +88,7 @@ const addFixturesForRelation = function addFixturesForRelation(relationFixture,
  * @returns {Object} model fixture
  */
 const findModelFixture = function findModelFixture(modelName) {
-    return _.find(fixtures.models, function (modelFixture) {
+    return _.find(fixtures.models, (modelFixture) => {
         return modelFixture.name === modelName;
     });
 };
@@ -232,7 +126,7 @@ const findModelFixtures = function findModelFixtures(modelName, matchExpr) {
  * @returns {Object} relation fixture
  */
 const findRelationFixture = function findRelationFixture(from, to) {
-    return _.find(fixtures.relations, function (relation) {
+    return _.find(fixtures.relations, (relation) => {
         return relation.from.model === from && relation.to.model === to;
     });
 };
@@ -247,8 +141,8 @@ const findPermissionRelationsForObject = function findPermissionRelationsForObje
     // Make a copy and delete any entries we don't want
     const foundRelation = _.cloneDeep(findRelationFixture('Role', 'Permission'));
 
-    _.each(foundRelation.entries, function (entry, key) {
-        _.each(entry, function (perm, obj) {
+    _.each(foundRelation.entries, (entry, key) => {
+        _.each(entry, (perm, obj) => {
             if (obj !== objName) {
                 delete entry[obj];
             }
@@ -262,53 +156,166 @@ const findPermissionRelationsForObject = function findPermissionRelationsForObje
     return foundRelation;
 };
 
-const removeFixturesForModel = function removeFixturesForModel(modelFixture, options) {
-    return Promise.mapSeries(modelFixture.entries, function (entry) {
-        return models[modelFixture.name].findOne(entry.id ? {id: entry.id} : entry, options).then(function (found) {
-            if (found) {
-                return models[modelFixture.name].destroy(_.extend(options, {id: found.id}));
+/*
+ * Add and Remove Functions, require access to models
+ */
+
+/**
+ * ### Add Fixtures for Model
+ * Takes a model fixture, with a name and some entries and processes these
+ * into a sequence of promises to get each fixture added.
+ *
+ * @param {{name, entries}} modelFixture
+ * @returns {Promise<any>}
+ */
+const addFixturesForModel = async function addFixturesForModel(modelFixture, options = {}) {
+    // Clone the fixtures as they get changed in this function.
+    // The initial blog posts will be added a `published_at` property, which
+    // would change the fixturesHash.
+    modelFixture = _.cloneDeep(modelFixture);
+    // The Post model fixtures need a `published_at` date, where at least the seconds
+    // are different, otherwise `prev_post` and `next_post` helpers won't workd with
+    // them.
+    if (modelFixture.name === 'Post') {
+        _.forEach(modelFixture.entries, (post, index) => {
+            if (!post.published_at) {
+                post.published_at = moment().add(index, 'seconds');
             }
         });
-    }).then(function (results) {
-        return {expected: modelFixture.entries.length, done: results.length};
+    }
+
+    const results = await Promise.mapSeries(modelFixture.entries, async (entry) => {
+        let data = {};
+
+        // CASE: if id is specified, only query by id
+        if (entry.id) {
+            data.id = entry.id;
+        } else if (entry.slug) {
+            data.slug = entry.slug;
+        } else {
+            data = _.cloneDeep(entry);
+        }
+
+        if (modelFixture.name === 'Post') {
+            data.status = 'all';
+        }
+
+        const found = await models[modelFixture.name].findOne(data, options);
+        if (!found) {
+            return models[modelFixture.name].add(entry, options);
+        }
     });
+
+    return {expected: modelFixture.entries.length, done: _.compact(results).length};
 };
 
-const removeFixturesForRelation = function removeFixturesForRelation(relationFixture, options) {
-    return fetchRelationData(relationFixture, options).then(function getRelationOps(data) {
-        const ops = [];
-
-        _.each(relationFixture.entries, function processEntries(entry, key) {
-            const fromItem = data.from.find(matchFunc(relationFixture.from.match, key));
-
-            _.each(entry, function processEntryValues(value, entryKey) {
-                const toItems = data.to.filter(matchFunc(relationFixture.to.match, entryKey, value));
-
-                if (toItems && toItems.length > 0) {
-                    ops.push(function detachRelation() {
-                        return baseUtils.detach(
-                            models[relationFixture.from.Model || relationFixture.from.model],
-                            fromItem.id,
-                            relationFixture.from.relation,
-                            toItems,
-                            options
-                        );
+/**
+ * ## Add Fixtures for Relation
+ * Takes a relation fixtures object, with a from, to and some entries and processes these
+ * into a sequence of promises, to get each fixture added.
+ *
+ * @param {{from, to, entries}} relationFixture
+ * @returns {Promise<any>}
+ */
+const addFixturesForRelation = async function addFixturesForRelation(relationFixture, options) {
+    const ops = [];
+    let max = 0;
+
+    const data = await fetchRelationData(relationFixture, options);
+
+    _.each(relationFixture.entries, (entry, key) => {
+        const fromItem = data.from.find(matchFunc(relationFixture.from.match, key));
+
+        // CASE: You add new fixtures e.g. a new role in a new release.
+        // As soon as an **older** migration script wants to add permissions for any resource, it iterates over the
+        // permissions for each role. But if the role does not exist yet, it won't find the matching db entry and breaks.
+        if (!fromItem) {
+            logging.warn('Skip: Target database entry not found for key: ' + key);
+            return Promise.resolve();
+        }
+
+        _.each(entry, (value, entryKey) => {
+            let toItems = data.to.filter(matchFunc(relationFixture.to.match, entryKey, value));
+            max += toItems.length;
+
+            // Remove any duplicates that already exist in the collection
+            toItems = _.reject(toItems, (item) => {
+                return fromItem
+                    .related(relationFixture.from.relation)
+                    .find((model) => {
+                        const objectToMatch = matchObj(relationFixture.to.match, item);
+                        return Object.keys(objectToMatch).every((keyToCheck) => {
+                            return model.get(keyToCheck) === objectToMatch[keyToCheck];
+                        });
                     });
-                }
             });
+
+            if (toItems && toItems.length > 0) {
+                ops.push(function addRelationItems() {
+                    return baseUtils.attach(
+                        models[relationFixture.from.Model || relationFixture.from.model],
+                        fromItem.id,
+                        relationFixture.from.relation,
+                        toItems,
+                        options
+                    );
+                });
+            }
         });
+    });
+
+    const result = await sequence(ops);
+    return {expected: max, done: _(result).map('length').sum()};
+};
 
-        return sequence(ops);
+const removeFixturesForModel = async function removeFixturesForModel(modelFixture, options) {
+    const results = await Promise.mapSeries(modelFixture.entries, async (entry) => {
+        const found = models[modelFixture.name].findOne(entry.id ? {id: entry.id} : entry, options);
+        if (found) {
+            return models[modelFixture.name].destroy(_.extend(options, {id: found.id}));
+        }
     });
+
+    return {expected: modelFixture.entries.length, done: results.length};
+};
+
+const removeFixturesForRelation = async function removeFixturesForRelation(relationFixture, options) {
+    const data = await fetchRelationData(relationFixture, options);
+    const ops = [];
+
+    _.each(relationFixture.entries, (entry, key) => {
+        const fromItem = data.from.find(matchFunc(relationFixture.from.match, key));
+
+        _.each(entry, (value, entryKey) => {
+            const toItems = data.to.filter(matchFunc(relationFixture.to.match, entryKey, value));
+
+            if (toItems && toItems.length > 0) {
+                ops.push(function detachRelation() {
+                    return baseUtils.detach(
+                        models[relationFixture.from.Model || relationFixture.from.model],
+                        fromItem.id,
+                        relationFixture.from.relation,
+                        toItems,
+                        options
+                    );
+                });
+            }
+        });
+    });
+
+    return await sequence(ops);
 };
 
 module.exports = {
-    addFixturesForModel: addFixturesForModel,
-    addFixturesForRelation: addFixturesForRelation,
+    // find
     findModelFixtureEntry: findModelFixtureEntry,
     findModelFixtures: findModelFixtures,
     findRelationFixture: findRelationFixture,
     findPermissionRelationsForObject: findPermissionRelationsForObject,
+
+    // add / remove
+    addFixturesForModel: addFixturesForModel,
+    addFixturesForRelation: addFixturesForRelation,
     removeFixturesForModel: removeFixturesForModel,
     removeFixturesForRelation: removeFixturesForRelation
 };

package/core/server/data/schema/schema.js

@@ -386,17 +386,18 @@ module.exports = {
     },
     offers: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        active: {type: 'boolean', nullable: false, defaultTo: true},
         name: {type: 'string', maxlength: 191, nullable: false, unique: true},
         code: {type: 'string', maxlength: 191, nullable: false, unique: true},
         product_id: {type: 'string', maxlength: 24, nullable: false, references: 'products.id'},
-        stripe_coupon_id: {type: 'string', maxlength: 255, nullable: false, unique: true},
+        stripe_coupon_id: {type: 'string', maxlength: 255, nullable: true, unique: true},
         interval: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['month', 'year']]}},
         currency: {type: 'string', maxlength: 50, nullable: true},
         discount_type: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['percent', 'amount']]}},
         discount_amount: {type: 'integer', nullable: false},
         duration: {type: 'string', maxlength: 50, nullable: false},
         duration_in_months: {type: 'integer', nullable: true},
-        portal_title: {type: 'string', maxlength: 191, nullable: false},
+        portal_title: {type: 'string', maxlength: 191, nullable: true},
         portal_description: {type: 'string', maxlength: 2000, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
         updated_at: {type: 'dateTime', nullable: true}
@@ -528,6 +529,13 @@ module.exports = {
         plan_amount: {type: 'integer', nullable: false},
         plan_currency: {type: 'string', maxLength: 3, nullable: false}
     },
+    offer_redemptions: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        offer_id: {type: 'string', maxlength: 24, nullable: false, references: 'offers.id', cascadeDelete: true},
+        member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
+        subscription_id: {type: 'string', maxlength: 24, nullable: false, references: 'members_stripe_customers_subscriptions.id', cascadeDelete: true},
+        created_at: {type: 'dateTime', nullable: false}
+    },
     members_subscribe_events: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         member_id: {type: 'string', maxlength: 24, nullable: false, unique: false, references: 'members.id', cascadeDelete: true},
@@ -671,7 +679,11 @@ module.exports = {
             nullable: false,
             validations: {
                 isIn: [[
-                    'select'
+                    'select',
+                    'boolean',
+                    'color',
+                    'text',
+                    'image'
                 ]]
             }
         },

package/core/server/frontend/ghost.min.css

@@ -0,0 +1 @@
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;font-family:sans-serif}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}.darkgrey{color:#343f44}.midgrey{color:#738a94}.lightgrey{color:#e5eff5}.blue{color:#3eb0ef}.red{color:#f05230}.orange{color:#fecd35}.green{color:#a4d037}.darkgrey-hover:hover{color:#343f44}.midgrey-hover:hover{color:#738a94}.lightgrey-hover:hover{color:#e5eff5}.blue-hover:hover{color:#3eb0ef}.red-hover:hover{color:#f05230}.orange-hover:hover{color:#fecd35}.green-hover:hover{color:#a4d037}*,:after,:before{box-sizing:border-box}html{-webkit-tap-highlight-color:rgba(0,0,0,0);font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;font-size:62.5%;letter-spacing:.2px;line-height:1.65;overflow:hidden}body,html{height:100%;width:100%}body{color:#343f44;font-size:1.4rem;overflow:auto;overflow-x:hidden}.gh-view{-ms-flex-positive:1;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;flex-grow:1}h1,h2{text-rendering:optimizeLegibility;color:#343f44;font-size:2.9rem;line-height:1.15em;margin:0 0 .3em;text-indent:-1px}@media (max-width:500px){h1{font-size:2.4rem}}.gh-input{-webkit-appearance:none;border:1px solid #d6e3eb;border-radius:4px;color:#4b5b62;display:block;font-size:1.6rem;font-weight:300;height:40px;line-height:1em;padding:10px 12px;transition:border-color .15s linear;-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text;width:100%}.gh-input:focus{border-color:#b4cbda;outline:0}.gh-btn{fill:#829aa8;-webkit-font-smoothing:subpixel-antialiased;border:1px solid #d6e3eb;border-radius:5px;color:#829aa8;display:inline-block;outline:none;text-decoration:none!important;text-shadow:0 1px 0 #fff;transition:all .2s ease;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.gh-btn span{border-radius:4px;display:block;font-size:1.3rem;font-weight:400;height:33px;letter-spacing:.2px;line-height:33px;padding:0 12px;text-align:center}.gh-btn:hover{border-color:#b4cbda}.gh-btn-hover-blue:hover{border-color:#3eb0ef;color:#3eb0ef}.gh-btn-blue{fill:#fff;background:linear-gradient(#3da1d6,#2288bf);border:0;box-shadow:0 1px 0 rgba(0,0,0,.12);color:#fff;padding:1px;text-shadow:0 -1px 0 rgba(0,0,0,.1);transition:none!important}.gh-btn-blue span{background:linear-gradient(#4ab6f0,#2fa5e4 60%,#2fa5e4 90%,#38a9e5);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.gh-btn-blue:active,.gh-btn-blue:focus{background:#1e78a9}.gh-btn-blue:active span,.gh-btn-blue:focus span{background:#29a0e0;box-shadow:none}.gh-btn-block{display:block;width:100%}.gh-input-icon{display:block;position:relative}.gh-input-icon svg{fill:color(var(--midgrey) l(15%));height:14px;left:10px;position:absolute;top:50%;transform:translateY(-7px);width:auto;z-index:2}.gh-input-icon input{padding-left:35px}.gh-app{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100%;overflow:hidden}.gh-viewport{max-height:100%;overflow:hidden}.gh-main,.gh-viewport{-ms-flex-positive:1;display:-ms-flexbox;display:flex;flex-grow:1}.gh-main{background:#fff;overflow-y:auto;position:relative}.gh-flow{-ms-flex-positive:1;-ms-flex-direction:column;flex-direction:column;flex-grow:1;min-height:100%;overflow-y:auto}.gh-flow,.gh-flow-head{display:-ms-flexbox;display:flex}.gh-flow-head{-ms-flex-negative:0;-ms-flex-pack:justify;flex-shrink:0;justify-content:space-between;padding-bottom:20px;padding-top:4vh}.gh-flow-content-wrap{-ms-flex-positive:1;-ms-flex-negative:0;-ms-flex-pack:center;flex-grow:1;flex-shrink:0;justify-content:center;margin:0 5%;padding-bottom:8vh}.gh-flow-back,.gh-flow-content-wrap{-ms-flex-align:center;align-items:center;display:-ms-flexbox;display:flex}.gh-flow-back{border:1px solid transparent;border-radius:4px;color:#7d878a;font-weight:100;left:0;margin:0 0 0 3%;padding:2px 9px 2px 5px;position:absolute;top:0;transition:all .3s ease}.gh-flow-back svg{height:12px;line-height:14px;margin-right:4px}.gh-flow-back svg path{stroke:#7d878a;stroke-width:1.2px}.gh-flow-back:hover{border:1px solid #dae1e3}.gh-flow-back-plain{-ms-flex-align:center;align-items:center;color:#7d878a;display:-ms-flexbox;display:flex;font-weight:300;left:0;margin:0 0 0 3%;padding:2px 9px 2px 5px;position:absolute;text-decoration:none;top:0;transition:all .3s ease}.gh-flow-back-plain svg{height:12px;line-height:14px;margin-right:4px}.gh-flow-back-plain svg path{stroke:#7d878a;stroke-width:1.2px}.gh-flow-back-plain:hover{color:#15212a}.gh-flow-nav{-ms-flex:1;flex:1;position:relative}.gh-flow-content{color:#738a94;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;font-size:1.9rem;font-weight:100;line-height:1.5em;max-width:700px;text-align:center;width:100%}.gh-flow-content .gh-input-icon input{padding-left:35px}.gh-flow-content-unsubscribe{font-weight:300}@media (max-width:500px){.gh-flow-head-unsubscribe{padding-top:2.8vh}.gh-flow-content{font-size:4vw}.gh-flow-content-unsubscribe{font-size:1.8rem;line-height:1.6em}}.gh-flow-content header{margin:0 auto;max-width:520px}.gh-flow-content h1{font-size:4.2rem;font-weight:100}@media (max-width:600px){.gh-flow-content h1{font-size:7vw}}.gh-flow-content .gh-btn{display:block;margin:20px auto 0;max-width:400px}.gh-flow-content .form-group{margin-bottom:2.5rem}.gh-flow-content input{border:1px solid #dae1e3;font-size:1.6rem;font-weight:100;line-height:1.4em;padding:10px}.gh-flow-em{font-weight:500}.gh-signin{background:#f8fbfd;border:1px solid #dae1e3;border-radius:5px;margin:30px auto;max-width:400px;padding:40px;position:relative;text-align:left;width:100%}.gh-signin .form-group{margin-bottom:1.5rem}.gh-signin .gh-btn{margin:0}.error-content{flex-grow:1;justify-content:center;padding:8vw;user-select:text}.error-content,.error-details{align-items:center;display:flex}.error-details{margin-bottom:4rem}.error-ghost{height:115px;margin:15px}@media (max-width:630px){.error-ghost{display:none}}.error-code{color:#c5d2d9;font-size:10vw;font-weight:600;letter-spacing:-.4vw;line-height:.9em;margin:0}.error-description{border:none;color:#54666d;font-size:2.3rem;font-weight:300;line-height:1.3em;margin:0;padding:0}.error-message{align-items:center;display:flex;flex-direction:column;margin:15px}.error-message a{font-size:1.4rem;line-height:1;margin:8px 0}.error-link{background-color:transparent;color:#5ba4e5;text-decoration:none;transition:background .3s,color .3s}.error-stack{background-color:hsla(0,0%,100%,.3);margin:1rem auto;max-width:800px;padding:2rem}.error-stack-list{list-style-type:none;margin:0;padding:0}.error-stack-list li{display:block}.error-stack-list li:before{color:#bbb;content:"\21AA";display:inline-block;font-size:1.2rem;margin-right:.5rem}.error-stack-function{font-weight:700}

package/core/server/lib/image/blog-icon.js

@@ -3,15 +3,15 @@ const Promise = require('bluebird');
 const _ = require('lodash');
 const path = require('path');
 const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
 
 const messages = {
     error: 'Could not fetch icon dimensions.'
 };
 
 class BlogIcon {
-    constructor({config, tpl, urlUtils, settingsCache, storageUtils}) {
+    constructor({config, urlUtils, settingsCache, storageUtils}) {
         this.config = config;
-        this.tpl = tpl;
         this.urlUtils = urlUtils;
         this.settingsCache = settingsCache;
         this.storageUtils = storageUtils;
@@ -27,10 +27,10 @@ class BlogIcon {
     getIconDimensions(storagePath) {
         return new Promise((resolve, reject) => {
             let dimensions;
-    
+
             try {
                 dimensions = sizeOf(storagePath);
-    
+
                 if (dimensions.images) {
                     dimensions.width = _.maxBy(dimensions.images, function (w) {
                         return w.width;
@@ -39,14 +39,14 @@ class BlogIcon {
                         return h.height;
                     }).height;
                 }
-    
+
                 return resolve({
                     width: dimensions.width,
                     height: dimensions.height
                 });
             } catch (err) {
                 return reject(new errors.ValidationError({
-                    message: this.tpl(messages.error, {
+                    message: tpl(messages.error, {
                         file: storagePath,
                         error: err.message
                     })
@@ -64,7 +64,7 @@ class BlogIcon {
      */
     isIcoImageType(icon) {
         const blogIcon = icon || this.settingsCache.get('icon');
-    
+
         return blogIcon.match(/.ico$/i) ? true : false;
     }
 
@@ -77,7 +77,7 @@ class BlogIcon {
      */
     getIconType(icon) {
         const blogIcon = icon || this.settingsCache.get('icon');
-    
+
         return this.isIcoImageType(blogIcon) ? 'x-icon' : 'png';
     }
 
@@ -90,7 +90,7 @@ class BlogIcon {
      */
     getIconUrl(absolut) {
         const blogIcon = this.settingsCache.get('icon');
-    
+
         if (absolut) {
             if (blogIcon) {
                 return this.isIcoImageType(blogIcon) ? this.urlUtils.urlFor({relativeUrl: '/favicon.ico'}, true) : this.urlUtils.urlFor({relativeUrl: '/favicon.png'}, true);
@@ -115,7 +115,7 @@ class BlogIcon {
      */
     getIconPath() {
         const blogIcon = this.settingsCache.get('icon');
-    
+
         if (blogIcon) {
             return this.storageUtils.getLocalFileStoragePath(blogIcon);
         } else {

package/core/server/lib/image/image-size.js

@@ -6,6 +6,7 @@ const path = require('path');
 const Promise = require('bluebird');
 const _ = require('lodash');
 const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
 
 const messages = {
     invalidDimensions: 'Could not fetch image dimensions.'
@@ -17,9 +18,8 @@ const FETCH_ONLY_FORMATS = [
 ];
 
 class ImageSize {
-    constructor({config, tpl, storage, storageUtils, validator, urlUtils, request}) {
+    constructor({config, storage, storageUtils, validator, urlUtils, request}) {
         this.config = config;
-        this.tpl = tpl;
         this.storage = storage;
         this.storageUtils = storageUtils;
         this.validator = validator;
@@ -216,7 +216,7 @@ class ImageSize {
         // get the storage readable filePath
         filePath = this.storageUtils.getLocalFileStoragePath(imagePath);
 
-        return this.storage.getStorage()
+        return this.storage.getStorage('images')
             .read({path: filePath})
             .then((buf) => {
                 debug('Image fetched (storage):', filePath);
@@ -267,7 +267,7 @@ class ImageSize {
         }
 
         const originalImagePath = path.join(dir, `${imageName}_o${imageNumber || ''}${ext}`);
-        const originalImageExists = await this.storage.getStorage().exists(originalImagePath);
+        const originalImageExists = await this.storage.getStorage('images').exists(originalImagePath);
 
         return this.getImageSizeFromStoragePath(originalImageExists ? originalImagePath : imagePath);
     }
@@ -320,7 +320,7 @@ class ImageSize {
                 });
             } catch (err) {
                 return reject(new errors.ValidationError({
-                    message: this.tpl(messages.invalidDimensions, {
+                    message: tpl(messages.invalidDimensions, {
                         file: imagePath,
                         error: err.message
                     })