Moved @tryghost/importer-revue to core folder

fix https://linear.app/ghost/issue/ENG-2093/importer-revue

- this commit moves the lib code and tests to the core folder so we can
  colocate code in one place rather than splitting it out across
  packages, which increases the cognitive load and overhead

Author: daniellockyer

.docker/Dockerfile

@@ -94,7 +94,6 @@ COPY ghost/html-to-plaintext/package.json ghost/html-to-plaintext/package.json
 COPY ghost/i18n/package.json ghost/i18n/package.json
 COPY ghost/identity-token-service/package.json ghost/identity-token-service/package.json
 COPY ghost/importer-handler-content-files/package.json ghost/importer-handler-content-files/package.json
-COPY ghost/importer-revue/package.json ghost/importer-revue/package.json
 COPY ghost/in-memory-repository/package.json ghost/in-memory-repository/package.json
 COPY ghost/job-manager/package.json ghost/job-manager/package.json
 COPY ghost/link-redirects/package.json ghost/link-redirects/package.json

compose.yml

@@ -59,7 +59,6 @@ services:
       - node_modules_ghost_i18n:/home/ghost/ghost/i18n/node_modules:delegated
       - node_modules_ghost_identity-token-service:/home/ghost/ghost/identity-token-service/node_modules:delegated
       - node_modules_ghost_importer-handler-content-files:/home/ghost/ghost/importer-handler-content-files/node_modules:delegated
-      - node_modules_ghost_importer-revue:/home/ghost/ghost/importer-revue/node_modules:delegated
       - node_modules_ghost_in-memory-repository:/home/ghost/ghost/in-memory-repository/node_modules:delegated
       - node_modules_ghost_job-manager:/home/ghost/ghost/job-manager/node_modules:delegated
       - node_modules_ghost_link-redirects:/home/ghost/ghost/link-redirects/node_modules:delegated
@@ -219,7 +218,6 @@ volumes:
   node_modules_ghost_i18n: {}
   node_modules_ghost_identity-token-service: {}
   node_modules_ghost_importer-handler-content-files: {}
-  node_modules_ghost_importer-revue: {}
   node_modules_ghost_in-memory-repository: {}
   node_modules_ghost_job-manager: {}
   node_modules_ghost_link-redirects: {}

ghost/core/core/server/data/importer/import-manager.js

@@ -16,7 +16,7 @@ const RevueHandler = require('./handlers/revue');
 const JSONHandler = require('./handlers/json');
 const MarkdownHandler = require('./handlers/markdown');
 const ContentFileImporter = require('./importers/ContentFileImporter');
-const RevueImporter = require('@tryghost/importer-revue');
+const RevueImporter = require('./importers/importer-revue');
 const DataImporter = require('./importers/data');
 const urlUtils = require('../../../shared/url-utils');
 const {GhostMailer} = require('../../services/mail');
@@ -225,7 +225,7 @@ class ImportManager {
 
         try {
             await extract(filePath, tmpDir);
-            
+
             // Set permissions for all extracted files
             const files = glob.sync('**/*', {cwd: tmpDir, nodir: true});
             await Promise.all(files.map(file => fs.chmod(path.join(tmpDir, file), 0o644)));

…ost/importer-revue/lib/importer-revue.js …ata/importer/importers/importer-revue.jsghost/importer-revue/lib/importer-revue.js renamed to ghost/core/core/server/data/importer/importers/importer-revue.js ghost/importer-revue/lib/importer-revue.js renamed to ghost/core/core/server/data/importer/importers/importer-revue.js

@@ -3,7 +3,7 @@ const {slugify} = require('@tryghost/string');
 const papaparse = require('papaparse');
 const _ = require('lodash');
 
-const JSONToHTML = require('../lib/json-to-html');
+const JSONToHTML = require('./json-to-html');
 
 /**
  * Build posts out of the issue and item data

ghost/importer-revue/lib/json-to-html.js …/data/importer/importers/json-to-html.jsghost/importer-revue/lib/json-to-html.js renamed to ghost/core/core/server/data/importer/importers/json-to-html.js ghost/importer-revue/lib/json-to-html.js renamed to ghost/core/core/server/data/importer/importers/json-to-html.js

@@ -98,7 +98,6 @@
     "@tryghost/identity-token-service": "0.0.0",
     "@tryghost/image-transform": "1.3.0",
     "@tryghost/importer-handler-content-files": "0.0.0",
-    "@tryghost/importer-revue": "0.0.0",
     "@tryghost/job-manager": "0.0.0",
     "@tryghost/kg-card-factory": "5.1.0",
     "@tryghost/kg-converters": "1.1.0",
@@ -216,11 +215,13 @@
     "nconf": "0.12.1",
     "node-fetch": "2.7.0",
     "node-jose": "2.2.0",
+    "papaparse": "5.3.2",
     "path-match": "1.2.4",
     "probe-image-size": "7.2.3",
     "rss": "1.2.2",
     "sanitize-html": "2.14.0",
     "semver": "7.7.1",
+    "simple-dom": "1.4.0",
     "stoppable": "1.1.0",
     "superagent": "5.1.0",
     "superagent-throttle": "1.0.1",

ghost/core/package.json

@@ -1,8 +1,8 @@
 const assert = require('assert/strict');
 const sinon = require('sinon');
-const RevueImporter = require('../index');
 
-const JSONToHTML = require('../lib/json-to-html');
+const RevueImporter = require('../../../../../../core/server/data/importer/importers/importer-revue');
+const JSONToHTML = require('../../../../../../core/server/data/importer/importers/json-to-html');
 
 describe('Revue Importer', function () {
     afterEach(function () {

…porter-revue/test/importer-revue.test.js …importer/importers/RevueImporter.test.jsghost/importer-revue/test/importer-revue.test.js renamed to ghost/core/test/unit/server/data/importer/importers/RevueImporter.test.js ghost/importer-revue/test/importer-revue.test.js renamed to ghost/core/test/unit/server/data/importer/importers/RevueImporter.test.js

@@ -16,7 +16,7 @@ let ImageHandler = rewire('../../../../../core/server/data/importer/handlers/ima
 const MarkdownHandler = require('../../../../../core/server/data/importer/handlers/markdown');
 const RevueHandler = require('../../../../../core/server/data/importer/handlers/revue');
 const DataImporter = require('../../../../../core/server/data/importer/importers/data');
-const RevueImporter = require('@tryghost/importer-revue');
+const RevueImporter = require('../../../../../core/server/data/importer/importers/importer-revue');
 const configUtils = require('../../../../utils/configUtils');
 const logging = require('@tryghost/logging');