remove all old exports

ansible-docker-iframely/templates/config.local.js.j2

@@ -1,5 +1,4 @@
-(function() {
-    var config = {
+    export default {
 
         // Specify a path for custom plugins. Custom plugins will override core plugins.
         // CUSTOM_PLUGINS_PATH: __dirname + '/yourcustom-plugin-folder',
@@ -259,7 +258,4 @@
               }
         }
         */
-    };
-
-    module.exports = config;
-})();
+    };

app.js

@@ -8,13 +8,12 @@ if (!CONFIG.baseAppUrl) {
   console.warn('Warning: CONFIG.baseAppUrl not set, default value used');
 }
 
-import * as path from 'path';
 import * as express from 'express';
 import * as jsonxml from 'jsontoxml';
 
 var NotFound = sysUtils.NotFound;
 
-var app = express();
+export const app = express();
 
 app.set('view engine', 'ejs');
 
@@ -174,6 +173,4 @@ app.get('/', function(req, res) {
 });
 
 process.title = "iframely";
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
-
-module.exports = app;
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";

config.js

@@ -12,7 +12,7 @@
     const json = JSON.parse(await readFile(new URL('./package.json', import.meta.url)));
     var version = json.version;
 
-    var config = {
+    const config = {
 
         baseAppUrl: "",
         port: 8061,
@@ -430,4 +430,4 @@
         config.HTTP2_RETRY_CODES[item] = 1;
     });
 
-    export default config;
+    export default config;

config.local.js.SAMPLE

@@ -1,5 +1,4 @@
-(function() {
-    var config = {
+    export default {
 
         // Specify a path for custom plugins. Custom plugins will override core plugins.
         // CUSTOM_PLUGINS_PATH: __dirname + '/yourcustom-plugin-folder',
@@ -325,7 +324,4 @@
         // Endpoint for prerender service, if you need it. Used to parse React apps. Very slow.
         // Tested with https://github.com/prerender/prerender
         // PRERENDER_URL: "https://domain/render?url="
-    };
-
-    module.exports = config;
-})();
+    };

config.test.js

@@ -1,7 +1,4 @@
-(function() {
-
-  var config = {
-
+export default {
     DEBUG: true,
     RICH_LOG_ENABLED: true,
 
@@ -11,7 +8,4 @@
     RESPONSE_TIMEOUT: 1 * 100, //ms
 
     IGNORE_DOMAINS_RE: /blacklisted.*/
-  };
-
-  module.exports = config;
-})();
+};

config.test_with_custom_plugins.js

@@ -1,6 +1,4 @@
-(function() {
-
-  var config = {
+  export default {
 
     CUSTOM_PLUGINS_PATH: __dirname + '/test/fixtures/custom-plugins',
 
@@ -14,7 +12,4 @@
     RESPONSE_TIMEOUT: 1 * 100, //ms
 
     IGNORE_DOMAINS_RE: /blacklisted.*/
-  };
-
-  module.exports = config;
-})();
+  };

lib/cache-engines/memcached.js

@@ -1,7 +1,9 @@
-(function(engine) {
-import * as sysUtils from '../../logging.js';
-import * as crypto from 'crypto';
-import * as Memcached from 'memcached';
+
+    import * as sysUtils from '../../logging.js';
+    import * as crypto from 'crypto';
+    import * as Memcached from 'memcached';
+    import * as _ from 'underscore';
+
     var memcached = new Memcached(CONFIG.MEMCACHED_OPTIONS && CONFIG.MEMCACHED_OPTIONS.locations, CONFIG.MEMCACHED_OPTIONS && CONFIG.MEMCACHED_OPTIONS.options);
 
     var timeout = CONFIG.MEMCACHED_OPTIONS && CONFIG.MEMCACHED_OPTIONS.options && CONFIG.MEMCACHED_OPTIONS.options.timeout;
@@ -13,7 +15,7 @@ import * as Memcached from 'memcached';
     }
 
     function _findKeyMeta(k) {
-import * as _ from 'underscore';
+
 
         var sk = safeKey(k);
 
@@ -51,7 +53,7 @@ import * as _ from 'underscore';
         });
     }
 
-    engine.set = function(_key, data, options) {
+    export function set(_key, data, options) {
 
         var key = (!options || !options.raw) ? safeKey(_key) : _key;
 
@@ -75,7 +77,7 @@ import * as _ from 'underscore';
         }
     };
 
-    engine.get = function(_key, cb) {
+    export function get(_key, cb) {
 
         var key = safeKey(_key);
 
@@ -127,8 +129,6 @@ import * as _ from 'underscore';
         });
     };
 
-    engine.getClient = function() {
+    export function getClient() {
         return memcached;
     };
-
-})(exports);

lib/cache-engines/no-cache.js

@@ -1,11 +1,7 @@
-(function(engine) {
-
-    engine.set = function(key, data) {
+    export function set(key, data) {
 
     };
 
-    engine.get = function(key, cb) {
+    export function get(key, cb) {
         cb(null, null);
-    };
-
-})(exports);
+    };

lib/cache-engines/redis.js

@@ -1,18 +1,16 @@
-(function(engine) {
-import * as sysUtils from '../../logging.js';
+    import * as sysUtils from '../../logging.js';
 
     var client;
 
     if (CONFIG.REDIS_MODE === 'cluster') {
-import * as RedisClustr from 'redis-clustr';
-
-        client = new RedisClustr(CONFIG.REDIS_CLUSTER_OPTIONS);
+        var pkg = await import('redis-clustr');
+        client = new pkg.RedisClustr(CONFIG.REDIS_CLUSTER_OPTIONS);
     } else {
-import * as redis from 'redis';
-        client = redis.createClient(CONFIG.REDIS_OPTIONS);
+        var pkg = await import('redis');
+        client = pkg.redis.createClient(CONFIG.REDIS_OPTIONS);
     }
 
-    engine.set = function(key, data, options) {
+    export function set(key, data, options) {
         var multi = client.multi();
         multi.set(key, JSON.stringify(data));
         multi.expire(key, options && options.ttl || CONFIG.CACHE_TTL);
@@ -24,7 +22,7 @@ import * as redis from 'redis';
         });
     };
 
-    engine.get = function(key, cb) {
+    export function get(key, cb) {
 
         client.get(key, function(error, data) {
 
@@ -45,6 +43,4 @@ import * as redis from 'redis';
 
             cb(null, parsedData);
         });
-    };
-
-})(exports);
+    };

lib/loader/pluginLoader.js

@@ -162,10 +162,6 @@
                 return;
             }
 
-            if (!plugin) {
-                console.error("Error loading plugin", pluginPath);
-            }
-
             if (notPlugin || plugin.notPlugin) {
                 // Skip utils modules.
                 return;

lib/plugins/system/htmlparser/CollectingHandlerForMutliTarget.js

@@ -5,7 +5,7 @@
 *
 * */
 
-function CollectingHandlerForMutliTarget(cbsArray){
+export function CollectingHandlerForMutliTarget(cbsArray){
     this._cbsArray = cbsArray || [];
     this.events = [];
 }
@@ -143,6 +143,4 @@ CollectingHandlerForMutliTarget.prototype._emitEventsFor = function(cbs) {
     }
 };
 
-module.exports = CollectingHandlerForMutliTarget;
-
-module.exports.notPlugin = true;
+export const notPlugin = true;

lib/plugins/system/meta/HTMLMetaHandler.js

@@ -2,7 +2,7 @@ import { decodeHTML5 } from 'entities';
 import * as _ from 'underscore';
 import * as url from 'url';
 import * as utils from '../../../utils.js';
-import * as ldParser from './ld-json.js';
+import { ldParser } from './ld-json.js';
 
 var getCharset = utils.getCharset;
 var encodeText = utils.encodeText;
@@ -23,7 +23,7 @@ var LINK_REL_ARRAY_VALUES = [
     'alternative'
 ];
 
-function HTMLMetaHandler(uri, contentType, callback) {
+export function HTMLMetaHandler(uri, contentType, callback) {
     this._uri = uri;
     this._charset = getCharset(contentType);
     this._callback = callback;
@@ -582,6 +582,4 @@ function merge(parentObj, props, value) {
     }
 }
 
-module.exports = HTMLMetaHandler;
-
-module.exports.notPlugin = true;
+export const notPlugin = true;

lib/plugins/system/meta/ld-json.js

@@ -1,7 +1,7 @@
 import * as sysUtils from '../../../../logging.js';
 import * as utils from '../../../utils.js';
 
-module.exports = function(result, decode, uri) {
+export function ldParser(result, decode, uri) {
 
     var ld = result["ld-json"];
     delete result["ld-json"];
@@ -51,4 +51,4 @@ module.exports = function(result, decode, uri) {
     }    
 };
 
-module.exports.notPlugin = true;
+export const notPlugin = true;

lib/plugins/system/meta/utils.js

@@ -1,4 +1,4 @@
-exports.getMetaCacheKey = function(url, whitelistRecord, options) {
+export function getMetaCacheKey(url, whitelistRecord, options) {
 
     var meta_key = 'meta:' + url;
 
@@ -15,4 +15,4 @@ exports.getMetaCacheKey = function(url, whitelistRecord, options) {
     return meta_key;
 };
 
-module.exports.notPlugin = true;
+export const notPlugin = true;

lib/plugins/system/oembed/oembedUtils.js

@@ -11,7 +11,7 @@ var getCharset = utils.getCharset;
 var encodeText = utils.encodeText;
 var lowerCaseKeys = utils.lowerCaseKeys;
 
-exports.notPlugin = true;
+export const notPlugin = true;
 
 /**
  * @private
@@ -84,7 +84,7 @@ function lookupStaticProviders(uri) {
     return links;
 }
 
-module.exports.findOembedLinks = function(uri, meta) {
+export function findOembedLinks(uri, meta) {
     // Filter oembed from meta.
 
     // allow misspelled discovery links
@@ -126,7 +126,7 @@ module.exports.findOembedLinks = function(uri, meta) {
  * @param {String} uri Full oEmbed endpoint plus URL and any needed format parameter.
  * @param {Function} callback Completion callback function. The callback gets two arguments (error, oembed) where oembed is json parsed oEmbed object.
  * */
-module.exports.getOembed = function(uri, options, callback) {
+ export function getOembed(uri, options, callback) {
 
     if (typeof options === 'function') {
         callback = options;

modules/tests-ui/models.js

@@ -1,6 +1,3 @@
-    if (!CONFIG.tests) {
-        return;
-    }
     import * as moment from 'moment';
 
     var mongoose, db;
@@ -166,7 +163,7 @@
         return moment(this.created_at).format("DD-MM-YY HH:mm");
     };
 
-    exports.PluginTest = db.model('PluginTest', PluginTestSchema);
-    exports.PageTestLog = db.model('PageTestLog', PageTestLogSchema);
-    exports.TestUrlsSet = db.model('TestUrlsSet', TestUrlsSetSchema);
-    exports.TestingProgress = db.model('TestingProgress', TestingProgressSchema);
+    export const PluginTest = db.model('PluginTest', PluginTestSchema);
+    export const PageTestLog = db.model('PageTestLog', PageTestLogSchema);
+    export const TestUrlsSet = db.model('TestUrlsSet', TestUrlsSetSchema);
+    export const TestingProgress = db.model('TestingProgress', TestingProgressSchema);