diff --git a/core/server/data/importer/importers/data/posts.js b/core/server/data/importer/importers/data/posts.js index 959861b78e..61703dffe3 100644 --- a/core/server/data/importer/importers/data/posts.js +++ b/core/server/data/importer/importers/data/posts.js @@ -2,7 +2,7 @@ const debug = require('ghost-ignition').debug('importer:posts'); const _ = require('lodash'); const uuid = require('uuid'); const BaseImporter = require('./base'); -const renderers = require('../../../../lib/mobiledoc/renderers'); +const mobiledocLib = require('../../../../lib/mobiledoc'); const validation = require('../../../validation'); const postsMetaSchema = require('../../../schema').tables.posts_meta; const metaAttrs = _.keys(_.omit(postsMetaSchema, ['id'])); @@ -200,11 +200,11 @@ class PostsImporter extends BaseImporter { mobiledoc = JSON.parse(model.mobiledoc); if (!mobiledoc.cards || !_.isArray(mobiledoc.cards)) { - model.mobiledoc = renderers.mobiledocHtmlRenderer.blankStructure(); + model.mobiledoc = mobiledocLib.blankDocument; mobiledoc = model.mobiledoc; } } catch (err) { - mobiledoc = renderers.mobiledocHtmlRenderer.blankStructure(); + mobiledoc = mobiledocLib.blankDocument; } mobiledoc.cards.forEach((card) => { @@ -216,7 +216,7 @@ class PostsImporter extends BaseImporter { }); model.mobiledoc = JSON.stringify(mobiledoc); - model.html = renderers.mobiledocHtmlRenderer.render(JSON.parse(model.mobiledoc)); + model.html = mobiledocLib.renderers.mobiledocHtmlRenderer.render(JSON.parse(model.mobiledoc)); } this.sanitizePostsMeta(model); }); diff --git a/core/server/data/migrations/versions/2.0/2-update-posts.js b/core/server/data/migrations/versions/2.0/2-update-posts.js index c7712e774a..bcdb50e522 100644 --- a/core/server/data/migrations/versions/2.0/2-update-posts.js +++ b/core/server/data/migrations/versions/2.0/2-update-posts.js @@ -1,7 +1,7 @@ const _ = require('lodash'), Promise = require('bluebird'), common = require('../../../../lib/common'), - renderers = require('../../../../lib/mobiledoc/renderers'), + mobiledocLib = require('../../../../lib/mobiledoc'), message1 = 'Updating posts: apply new editor format and set comment_id field.', message2 = 'Updated posts: apply new editor format and set comment_id field.', message3 = 'Rollback: Updating posts: use old editor format', @@ -50,18 +50,18 @@ module.exports.up = (options) => { mobiledoc = JSON.parse(post.mobiledoc || null); if (!mobiledoc) { - mobiledoc = renderers.mobiledocHtmlRenderer.blankStructure(); + mobiledoc = mobiledocLib.blankDocument; } } catch (err) { common.logging.warn(`Invalid mobiledoc structure for ${post.id}. Falling back to blank structure.`); - mobiledoc = renderers.mobiledocHtmlRenderer.blankStructure(); + mobiledoc = mobiledocLib.blankDocument; } // CASE: convert all old editor posts to the new editor format // CASE: if mobiledoc field is null, we auto set a blank structure in the model layer // CASE: if html field is null, we auto generate the html in the model layer if (mobiledoc && post.html && post.html.match(/^