Convert AMD and CommonJS odules to ES6

[MAILPOET-1829]

assets/js/src/admin.js

@@ -1,11 +1,8 @@
-define([
+import jQuery from 'jquery';
-  'jquery'
+
-],
-function admin(jQuery) {
   jQuery(function adminDomReady($) {
     // dom ready
     $(function domReady() {
 
     });
   });
-});

assets/js/src/ajax.js

@@ -11,7 +11,10 @@ function requestFailed(errorMessage, xhr) {
   };
 }
 
-define(['mailpoet', 'jquery', 'underscore'], function ajax(mp, jQuery, _) {
+import mp from 'mailpoet';
+import jQuery from 'jquery';
+import _ from 'underscore';
+
   var MailPoet = mp;
 
   MailPoet.Ajax = {
@@ -84,4 +87,3 @@ define(['mailpoet', 'jquery', 'underscore'], function ajax(mp, jQuery, _) {
       return deferred;
     }
   };
-});

assets/js/src/analytics_event.js

@@ -51,9 +51,9 @@ function cacheEvent(forced, name, data) {
   });
 }
 
-define(
+import mp from 'mailpoet';
-  ['mailpoet', 'underscore'],
+import _ from 'underscore';
-  function analyticsEvent(mp, _) {
+
     var MailPoet = mp;
 
     function initializeMixpanelWhenLoaded() {
@@ -69,5 +69,3 @@ define(
     MailPoet.forceTrackEvent = _.partial(cacheEvent, true);
 
     initializeMixpanelWhenLoaded();
-  }
-);

assets/js/src/date.js

@@ -1,14 +1,6 @@
-define(
+import mp from 'mailpoet';
-  [
+import jQuery from 'jquery';
-    'mailpoet',
+import Moment from 'moment';
-    'jquery',
-    'moment'
-  ], function ( // eslint-disable-line func-names
-    mp,
-    jQuery,
-    Moment
-  ) {
-    'use strict';
 
     var MailPoet = mp;
 
@@ -168,4 +160,3 @@ define(
         return convertedFormat.join('');
       }
     };
-  });

assets/js/src/handlebars_helpers.js

@@ -1,4 +1,5 @@
-define(['handlebars'], function handlebarsHelpers(Handlebars) {
+import Handlebars from 'handlebars';
+
   // Handlebars helpers
   Handlebars.registerHelper('concat', function concatHelper() {
     var size = (arguments.length - 1);
@@ -169,4 +170,3 @@ define(['handlebars'], function handlebarsHelpers(Handlebars) {
   });
 
   window.Handlebars = Handlebars;
-});

assets/js/src/help-tooltip.js

@@ -1,7 +1,7 @@
-var TooltipComponent = require('help-tooltip.jsx').default;
+import TooltipComponent from 'help-tooltip.jsx';
-var React = require('react');
+import React from 'react';
-var ReactDOM = require('react-dom');
+import ReactDOM from 'react-dom';
-var MailPoet = require('mailpoet');
+import MailPoet from 'mailpoet';
 
 MailPoet.helpTooltip = {
   show: function show(domContainerNode, opts) {

assets/js/src/i18n.js

@@ -1,10 +1,4 @@
-define(
+import mp from 'mailpoet';
-  [
-    'mailpoet'
-  ], function i18n(
-    mp
-  ) {
-    'use strict';
 
     var MailPoet = mp;
 
@@ -21,4 +15,3 @@ define(
         return translations;
       }
     };
-  });

assets/js/src/iframe.js

@@ -1,5 +1,4 @@
-define(['mailpoet'], function iframeModule(mp) {
+import mp from 'mailpoet';
-  'use strict';
 
   var MailPoet = mp;
   MailPoet.Iframe = {
@@ -22,5 +21,4 @@ define(['mailpoet'], function iframeModule(mp) {
     }
   };
 
-  return MailPoet;
+export default MailPoet;
-});

assets/js/src/jquery.serialize_object.js

@@ -1,11 +1,6 @@
 /* eslint no-restricted-globals: 0 */
-define(
+import jQuery from 'jquery';
-  [
+
-    'jquery'
-  ],
-  function ( // eslint-disable-line func-names
-    jQuery
-  ) {
     var $ = jQuery;
     // Combination of jQuery.deparam and jQuery.serializeObject by Ben Alman.
     /*!
@@ -100,6 +95,4 @@ define(
       return obj;
     };
 
-    return $;
+export default $;
-  }
-);

assets/js/src/mailpoet.js

@@ -1,12 +1,10 @@
-define([], function mailpoet() {
   // A placeholder for MailPoet object
   var MailPoet = {};
 
   // Expose MailPoet globally
   window.MailPoet = MailPoet;
 
-  return MailPoet;
+export default MailPoet;
-});
 
 require('ajax'); // side effect - extends MailPoet object
 require('date'); // side effect - extends MailPoet object

assets/js/src/mailpoet_public.js

@@ -1,12 +1,10 @@
-define([], function mailpoet() {
   // A placeholder for MailPoet object
   var MailPoet = {};
 
   // Expose MailPoet globally
   window.MailPoet = MailPoet;
 
-  return MailPoet;
+export default MailPoet;
-});
 
 require('ajax'); // side effect - extends MailPoet object
 require('i18n'); // side effect - extends MailPoet object

assets/js/src/mailpoet_tests.js

@@ -1,12 +1,10 @@
-define([], function mailpoet() {
   // A placeholder for MailPoet object
   var MailPoet = {};
 
   // Expose MailPoet globally
   window.MailPoet = MailPoet;
 
-  return MailPoet;
+export default MailPoet;
-});
 
 require('i18n'); // side effect - extends MailPoet object
 require('notice'); // side effect - extends MailPoet object

assets/js/src/modal.js

@@ -1,7 +1,6 @@
 /* eslint-disable func-names */
-define(['mailpoet', 'jquery'],
+import mp from 'mailpoet';
-  function (mp, jQuery) {
+import jQuery from 'jquery';
-    'use strict';
 
     var MailPoet = mp;
     var closeModalImage = '<svg viewBox="0 0 23 23" xmlns="http://www.w3.org/2000/svg">'
@@ -643,4 +642,3 @@ define(['mailpoet', 'jquery'],
         return this;
       }
     };
-  });

assets/js/src/mp2migrator.js

@@ -1,6 +1,6 @@
 /* eslint-disable func-names */
-define(['mailpoet', 'jquery'], function (mp, jQuery) {
+import mp from 'mailpoet';
-  'use strict';
+import jQuery from 'jquery';
 
   var MailPoet = mp;
   MailPoet.MP2Migrator = {
@@ -212,4 +212,3 @@ define(['mailpoet', 'jquery'], function (mp, jQuery) {
     // Update the display
     MailPoet.MP2Migrator.updateDisplay();
   });
-});

assets/js/src/newsletter_editor/App.js

@@ -1,8 +1,7 @@
-define([
+import Backbone from 'backbone';
-  'backbone',
+import Marionette from 'backbone.marionette';
-  'backbone.marionette',
+import BackboneRadio from 'backbone.radio'; // eslint-disable-line func-names
-  'backbone.radio'
+
-], function (Backbone, Marionette, BackboneRadio) { // eslint-disable-line func-names
   var Radio = BackboneRadio;
 
   var AppView = Marionette.View.extend({
@@ -36,5 +35,4 @@ define([
   var app = new EditorApplication();
   window.EditorApplication = app;
 
-  return app;
+export default app;
-});

assets/js/src/newsletter_editor/behaviors/BehaviorsLookup.js

@@ -4,9 +4,8 @@
  *
  * For more check: http://marionettejs.com/docs/marionette.behaviors.html#behaviorslookup
  */
-define([
+import BackboneMarionette from 'backbone.marionette'; // eslint-disable-line func-names
-  'backbone.marionette'
+
-], function (BackboneMarionette) { // eslint-disable-line func-names
   var Marionette = BackboneMarionette;
   var BehaviorsLookup = {};
   Marionette.Behaviors.behaviorsLookup = function () { // eslint-disable-line func-names
@@ -15,5 +14,4 @@ define([
 
   window.BehaviorsLookup = BehaviorsLookup;
 
-  return BehaviorsLookup;
+export default BehaviorsLookup;
-});

assets/js/src/newsletter_editor/behaviors/ColorPickerBehavior.js

@@ -3,12 +3,11 @@
  *
  * Adds a color picker integration with the view
  */
-define([
+import Marionette from 'backbone.marionette';
-  'backbone.marionette',
+import BehaviorsLookup from 'newsletter_editor/behaviors/BehaviorsLookup';
-  'newsletter_editor/behaviors/BehaviorsLookup',
+import MailPoet from 'mailpoet';
-  'mailpoet',
+import 'spectrum'; // eslint-disable-line func-names
-  'spectrum'
+
-], function (Marionette, BehaviorsLookup, MailPoet) { // eslint-disable-line func-names
   var BL = BehaviorsLookup;
 
   BL.ColorPickerBehavior = Marionette.Behavior.extend({
@@ -44,4 +43,3 @@ define([
       });
     }
   });
-});

assets/js/src/newsletter_editor/behaviors/ContainerDropZoneBehavior.js

@@ -6,13 +6,12 @@
  * Allows CollectionView instances that use this behavior to act as drop zones and
  * accept droppables
  */
-define([
+import Marionette from 'backbone.marionette';
-  'backbone.marionette',
+import _ from 'underscore';
-  'underscore',
+import jQuery from 'jquery';
-  'jquery',
+import BL from 'newsletter_editor/behaviors/BehaviorsLookup';
-  'newsletter_editor/behaviors/BehaviorsLookup',
+import interact from 'interact';
-  'interact'
+
-], function (Marionette, _, jQuery, BL, interact) {
   var BehaviorsLookup = BL;
 
   BehaviorsLookup.ContainerDropZoneBehavior = Marionette.Behavior.extend({
@@ -482,4 +481,3 @@ define([
       return this.getCollectionView().collection;
     }
   });
-});

assets/js/src/newsletter_editor/behaviors/DraggableBehavior.js

@@ -4,14 +4,13 @@
  * Allows View instances to be draggable.
  * Part of the drag&drop behavior.
  */
-define([
+import Marionette from 'backbone.marionette';
-  'backbone.marionette',
+import _ from 'underscore';
-  'underscore',
+import jQuery from 'jquery';
-  'jquery',
+import BehaviorsLookup from 'newsletter_editor/behaviors/BehaviorsLookup';
-  'newsletter_editor/behaviors/BehaviorsLookup',
+import interact from 'interact';
-  'interact',
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App'
+
-], function DraggableBehavior(Marionette, _, jQuery, BehaviorsLookup, interact, App) {
   var BL = BehaviorsLookup;
 
   BL.DraggableBehavior = Marionette.Behavior.extend({
@@ -148,4 +147,3 @@ define([
       };
     }
   });
-});

assets/js/src/newsletter_editor/behaviors/MediaManagerBehavior.js

@@ -4,12 +4,11 @@
  *
  * Adds a media manager integration with the view
  */
-define([
+import Marionette from 'backbone.marionette';
-  'backbone.marionette',
+import _ from 'underscore';
-  'underscore',
+import BehaviorsLookup from 'newsletter_editor/behaviors/BehaviorsLookup';
-  'newsletter_editor/behaviors/BehaviorsLookup',
+import jQuery from 'jquery';
-  'jquery'
+
-], function (Marionette, _, BehaviorsLookup, jQuery) {
   var BL = BehaviorsLookup;
 
   BL.MediaManagerBehavior = Marionette.Behavior.extend({
@@ -310,4 +309,3 @@ define([
       }
     }
   });
-});

assets/js/src/newsletter_editor/behaviors/ResizableBehavior.js

@@ -3,11 +3,10 @@
  *
  * Allows resizing elements within a block
  */
-define([
+import Marionette from 'backbone.marionette';
-  'backbone.marionette',
+import BehaviorsLookup from 'newsletter_editor/behaviors/BehaviorsLookup';
-  'newsletter_editor/behaviors/BehaviorsLookup',
+import interact from 'interact';
-  'interact'
+
-], function ResizableBehavior(Marionette, BehaviorsLookup, interact) {
   var BL = BehaviorsLookup;
 
   BL.ResizableBehavior = Marionette.Behavior.extend({
@@ -81,4 +80,3 @@ define([
       }
     }
   });
-});

assets/js/src/newsletter_editor/behaviors/ShowSettingsBehavior.js

@@ -3,11 +3,10 @@
  *
  * Opens up settings of a BlockView if contents are clicked upon
  */
-define([
+import Marionette from 'backbone.marionette';
-  'backbone.marionette',
+import jQuery from 'jquery';
-  'jquery',
+import BehaviorsLookup from 'newsletter_editor/behaviors/BehaviorsLookup'; // eslint-disable-line func-names
-  'newsletter_editor/behaviors/BehaviorsLookup'
+
-], function (Marionette, jQuery, BehaviorsLookup) { // eslint-disable-line func-names
   var BL = BehaviorsLookup;
 
   BL.ShowSettingsBehavior = Marionette.Behavior.extend({
@@ -28,4 +27,3 @@ define([
         && jQuery(element).is(this.options.ignoreFrom);
     }
   });
-});

assets/js/src/newsletter_editor/behaviors/SortableBehavior.js

@@ -3,11 +3,10 @@
  *
  * Allows sorting elements within a collection
  */
-define([
+import Marionette from 'backbone.marionette';
-  'backbone.marionette',
+import _ from 'underscore';
-  'underscore',
+import BehaviorsLookup from 'newsletter_editor/behaviors/BehaviorsLookup'; // eslint-disable-line func-names
-  'newsletter_editor/behaviors/BehaviorsLookup'
+
-], function (Marionette, _, BehaviorsLookup) { // eslint-disable-line func-names
   var BL = BehaviorsLookup;
 
   BL.SortableBehavior = Marionette.Behavior.extend({
@@ -38,4 +37,3 @@ define([
       }
     }
   });
-});

assets/js/src/newsletter_editor/behaviors/TextEditorBehavior.js

@@ -3,12 +3,11 @@
  *
  * Adds TinyMCE text editing capabilities to a view
  */
-define([
+import Marionette from 'backbone.marionette';
-  'backbone.marionette',
+import _ from 'underscore';
-  'underscore',
+import BehaviorsLookup from 'newsletter_editor/behaviors/BehaviorsLookup';
-  'newsletter_editor/behaviors/BehaviorsLookup',
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App'
+
-], function textEditorBehavior(Marionette, _, BehaviorsLookup, App) {
   var BL = BehaviorsLookup;
 
   BL.TextEditorBehavior = Marionette.Behavior.extend({
@@ -90,4 +89,3 @@ define([
       }));
     }
   });
-});

assets/js/src/newsletter_editor/blocks/automatedLatestContent.js

@@ -7,28 +7,15 @@
  * This block depends on blocks.button and blocks.divider for block model and
  * block settings view.
  */
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import BaseBlock from 'newsletter_editor/blocks/base';
-  'newsletter_editor/blocks/base',
+import ButtonBlock from 'newsletter_editor/blocks/button';
-  'newsletter_editor/blocks/button',
+import DividerBlock from 'newsletter_editor/blocks/divider';
-  'newsletter_editor/blocks/divider',
+import CommunicationComponent from 'newsletter_editor/components/communication';
-  'newsletter_editor/components/communication',
+import MailPoet from 'mailpoet';
-  'mailpoet',
+import SuperModel from 'backbone.supermodel';
-  'backbone.supermodel',
+import _ from 'underscore';
-  'underscore',
+import jQuery from 'jquery';
-  'jquery'
-], function (
-  App,
-  BaseBlock,
-  ButtonBlock,
-  DividerBlock,
-  CommunicationComponent,
-  MailPoet,
-  SuperModel,
-  _,
-  jQuery
-) {
-  'use strict';
 
   var Module = {};
   var base = BaseBlock;
@@ -400,5 +387,4 @@ define([
     Application._ALCSupervisor.refresh();
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/blocks/automatedLatestContentLayout.js

@@ -2,28 +2,15 @@
 /**
  * Automated latest content block with image alignment.
  */
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import BaseBlock from 'newsletter_editor/blocks/base';
-  'newsletter_editor/blocks/base',
+import ButtonBlock from 'newsletter_editor/blocks/button';
-  'newsletter_editor/blocks/button',
+import DividerBlock from 'newsletter_editor/blocks/divider';
-  'newsletter_editor/blocks/divider',
+import CommunicationComponent from 'newsletter_editor/components/communication';
-  'newsletter_editor/components/communication',
+import MailPoet from 'mailpoet';
-  'mailpoet',
+import SuperModel from 'backbone.supermodel';
-  'backbone.supermodel',
+import _ from 'underscore';
-  'underscore',
+import jQuery from 'jquery';
-  'jquery'
-], function (
-  App,
-  BaseBlock,
-  ButtonBlock,
-  DividerBlock,
-  CommunicationComponent,
-  MailPoet,
-  SuperModel,
-  _,
-  jQuery
-) {
-  'use strict';
 
   var Module = {};
   var base = BaseBlock;
@@ -412,5 +399,4 @@ define([
     Application._ALCLayoutSupervisor.refresh();
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/blocks/base.js

@@ -4,16 +4,13 @@
  * a BlockModel and a BlockView.
  * BlockToolsView, BlockSettingsView and BlockWidgetView are optional.
  */
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import Marionette from 'backbone.marionette';
-  'backbone.marionette',
+import SuperModel from 'backbone.supermodel';
-  'backbone.supermodel',
+import _ from 'underscore';
-  'underscore',
+import jQuery from 'jquery';
-  'jquery',
+import MailPoet from 'mailpoet';
-  'mailpoet',
+import 'modal';
-  'modal'
-], function base(App, Marionette, SuperModel, _, jQuery, MailPoet) {
-  'use strict';
 
   var Module = {};
   var AugmentedView = Marionette.View.extend({});
@@ -331,5 +328,4 @@ define([
     }
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/blocks/button.js

@@ -2,14 +2,11 @@
 /**
  * Button content block
  */
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import BaseBlock from 'newsletter_editor/blocks/base';
-  'newsletter_editor/blocks/base',
+import MailPoet from 'mailpoet';
-  'mailpoet',
+import _ from 'underscore';
-  'underscore',
+import jQuery from 'jquery';
-  'jquery'
-], function (App, BaseBlock, MailPoet, _, jQuery) {
-  'use strict';
 
   var Module = {};
   var base = BaseBlock;
@@ -145,5 +142,4 @@ define([
     });
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/blocks/container.js

@@ -4,15 +4,12 @@
  * This is a special kind of block, as it can contain content blocks, as well
  * as other containers.
  */
-define([
+import Backbone from 'backbone';
-  'backbone',
+import Marionette from 'backbone.marionette';
-  'backbone.marionette',
+import _ from 'underscore';
-  'underscore',
+import jQuery from 'jquery';
-  'jquery',
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import BaseBlock from 'newsletter_editor/blocks/base';
-  'newsletter_editor/blocks/base'
-], function (Backbone, Marionette, _, jQuery, App, BaseBlock) {
-  'use strict';
 
   var Module = {};
   var base = BaseBlock;
@@ -445,5 +442,4 @@ define([
     });
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/blocks/divider.js

@@ -1,14 +1,11 @@
-'use strict';
-
 /**
  * Divider content block
  */
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import BaseBlock from 'newsletter_editor/blocks/base';
-  'newsletter_editor/blocks/base',
+import _ from 'underscore';
-  'underscore',
+import jQuery from 'jquery';
-  'jquery'
+
-], function dividerBlock(App, BaseBlock, _, jQuery) {
   var Module = {};
   var base = BaseBlock;
 
@@ -152,5 +149,4 @@ define([
     });
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/blocks/footer.js

@@ -1,14 +1,11 @@
-'use strict';
-
 /**
  * Footer content block
  */
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import BaseBlock from 'newsletter_editor/blocks/base';
-  'newsletter_editor/blocks/base',
+import _ from 'underscore';
-  'underscore',
+import MailPoet from 'mailpoet';
-  'mailpoet'
+
-], function footerBlock(App, BaseBlock, _, MailPoet) {
   var Module = {};
   var base = BaseBlock;
 
@@ -125,5 +122,4 @@ define([
     });
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/blocks/header.js

@@ -1,14 +1,11 @@
-'use strict';
-
 /**
  * Header content block
  */
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import BaseBlock from 'newsletter_editor/blocks/base';
-  'newsletter_editor/blocks/base',
+import _ from 'underscore';
-  'underscore',
+import MailPoet from 'mailpoet';
-  'mailpoet'
+
-], function headerBlock(App, BaseBlock, _, MailPoet) {
   var Module = {};
   var base = BaseBlock;
 
@@ -125,5 +122,4 @@ define([
     });
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/blocks/image.js

@@ -2,14 +2,11 @@
 /**
  * Image content block
  */
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import BaseBlock from 'newsletter_editor/blocks/base';
-  'newsletter_editor/blocks/base',
+import _ from 'underscore';
-  'underscore',
+import MailPoet from 'mailpoet';
-  'mailpoet',
+import jQuery from 'jquery';
-  'jquery'
-], function (App, BaseBlock, _, MailPoet, jQuery) {
-  'use strict';
 
   var Module = {};
   var base = BaseBlock;
@@ -171,5 +168,4 @@ define([
     });
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/blocks/posts.js

@@ -11,33 +11,18 @@
  * This block depends on blocks.button and blocks.divider for block model and
  * block settings view.
  */
-define([
+import Backbone from 'backbone';
-  'backbone',
+import Marionette from 'backbone.marionette';
-  'backbone.marionette',
+import Radio from 'backbone.radio';
-  'backbone.radio',
+import _ from 'underscore';
-  'underscore',
+import jQuery from 'jquery';
-  'jquery',
+import MailPoet from 'mailpoet';
-  'mailpoet',
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import CommunicationComponent from 'newsletter_editor/components/communication';
-  'newsletter_editor/components/communication',
+import BaseBlock from 'newsletter_editor/blocks/base';
-  'newsletter_editor/blocks/base',
+import ButtonBlock from 'newsletter_editor/blocks/button';
-  'newsletter_editor/blocks/button',
+import DividerBlock from 'newsletter_editor/blocks/divider';
-  'newsletter_editor/blocks/divider',
+import 'select2';
-  'select2'
-], function (
-  Backbone,
-  Marionette,
-  Radio,
-  _,
-  jQuery,
-  MailPoet,
-  App,
-  CommunicationComponent,
-  BaseBlock,
-  ButtonBlock,
-  DividerBlock
-) {
-  'use strict';
 
   var Module = {};
   var base = BaseBlock;
@@ -614,5 +599,4 @@ define([
     });
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/blocks/social.js

@@ -2,16 +2,13 @@
 /**
  * Social icons content block
  */
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import BaseBlock from 'newsletter_editor/blocks/base';
-  'newsletter_editor/blocks/base',
+import Backbone from 'backbone';
-  'backbone',
+import Marionette from 'backbone.marionette';
-  'backbone.marionette',
+import SuperModel from 'backbone.supermodel';
-  'backbone.supermodel',
+import _ from 'underscore';
-  'underscore',
+import jQuery from 'jquery';
-  'jquery'
-], function (App, BaseBlock, Backbone, Marionette, SuperModel, _, jQuery) {
-  'use strict';
 
   var Module = {};
   var base = BaseBlock;
@@ -297,5 +294,4 @@ define([
     });
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/blocks/spacer.js

@@ -1,13 +1,10 @@
-'use strict';
-
 /**
  * Spacer content block
  */
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import BaseBlock from 'newsletter_editor/blocks/base';
-  'newsletter_editor/blocks/base',
+import _ from 'underscore';
-  'underscore'
+
-], function spacerBlock(App, BaseBlock, _) {
   var Module = {};
   var base = BaseBlock;
 
@@ -99,5 +96,4 @@ define([
     });
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/blocks/text.js

@@ -1,14 +1,11 @@
-'use strict';
-
 /**
  * Text content block
  */
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import BaseBlock from 'newsletter_editor/blocks/base';
-  'newsletter_editor/blocks/base',
+import _ from 'underscore';
-  'underscore',
+import MailPoet from 'mailpoet';
-  'mailpoet'
+
-], function textBlock(App, BaseBlock, _, MailPoet) {
   var Module = {};
   var base = BaseBlock;
 
@@ -108,5 +105,4 @@ define([
   });
 
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/components/communication.js

@@ -1,10 +1,9 @@
 /* eslint-disable func-names */
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import _ from 'underscore';
-  'underscore',
+import MailPoet from 'mailpoet';
-  'mailpoet',
+import 'ajax';
-  'ajax'
+
-], function (App, _, MailPoet) {
   var Module = {};
 
   Module._query = function (args) {
@@ -103,5 +102,4 @@ define([
     Module.getPostTypes();
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/components/config.js

@@ -1,8 +1,7 @@
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import SuperModel from 'backbone.supermodel';
-  'backbone.supermodel',
+import _ from 'underscore'; // eslint-disable-line func-names
-  'underscore'
+
-], function (App, SuperModel, _) { // eslint-disable-line func-names
   var Module = {};
 
   Module.ConfigModel = SuperModel.extend({
@@ -39,5 +38,4 @@ define([
     Application.setConfig(config);
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/components/content.js

@@ -1,11 +1,8 @@
-'use strict';
+import App from 'newsletter_editor/App';
+import SuperModel from 'backbone.supermodel';
+import _ from 'underscore';
+import MailPoet from 'mailpoet';
 
-define([
-  'newsletter_editor/App',
-  'backbone.supermodel',
-  'underscore',
-  'mailpoet'
-], function content(App, SuperModel, _, MailPoet) {
   var Module = {};
 
   // Holds newsletter entry fields, such as subject or creation datetime.
@@ -102,5 +99,4 @@ define([
   });
 
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/components/heading.js

@@ -1,13 +1,10 @@
-'use strict';
+import App from 'newsletter_editor/App';
+import Backbone from 'backbone';
+import Marionette from 'backbone.marionette';
+import _ from 'underscore';
+import jQuery from 'jquery';
+import MailPoet from 'mailpoet'; // eslint-disable-line func-names
 
-define([
-  'newsletter_editor/App',
-  'backbone',
-  'backbone.marionette',
-  'underscore',
-  'jquery',
-  'mailpoet'
-], function (App, Backbone, Marionette, _, jQuery, MailPoet) { // eslint-disable-line func-names
   var Module = {};
 
   Module.HeadingView = Marionette.View.extend({
@@ -41,5 +38,4 @@ define([
     });
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/components/save.js

@@ -1,32 +1,15 @@
 /* eslint-disable func-names */
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import CommunicationComponent from 'newsletter_editor/components/communication';
-  'newsletter_editor/components/communication',
+import MailPoet from 'mailpoet';
-  'mailpoet',
+import Notice from 'notice';
-  'notice',
+import Backbone from 'backbone';
-  'backbone',
+import Marionette from 'backbone.marionette';
-  'backbone.marionette',
+import $ from 'jquery';
-  'jquery',
+import Blob from 'blob';
-  'blob',
+import FileSaver from 'file-saver';
-  'file-saver',
+import Thumbnail from 'common/thumbnail.jsx';
-  'common/thumbnail.jsx',
+import _ from 'underscore';
-  'underscore',
-  'jquery'
-], function (
-  App,
-  CommunicationComponent,
-  MailPoet,
-  Notice,
-  Backbone,
-  Marionette,
-  jQuery,
-  Blob,
-  FileSaver,
-  Thumbnail,
-  _,
-  $
-) {
-  'use strict';
 
   var Module = {};
   var saveTimeout;
@@ -359,5 +342,4 @@ define([
     BeforeStartApp._appView.showChildView('bottomRegion', bottomSaveView);
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/components/sidebar.js

@@ -1,24 +1,12 @@
 /* eslint-disable func-names */
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import CommunicationComponent from 'newsletter_editor/components/communication';
-  'newsletter_editor/components/communication',
+import MailPoet from 'mailpoet';
-  'mailpoet',
+import Backbone from 'backbone';
-  'backbone',
+import Marionette from 'backbone.marionette';
-  'backbone.marionette',
+import SuperModel from 'backbone.supermodel';
-  'backbone.supermodel',
+import _ from 'underscore';
-  'underscore',
+import jQuery from 'jquery';
-  'jquery'
-], function (
-  App,
-  CommunicationComponent,
-  MailPoet,
-  Backbone,
-  Marionette,
-  SuperModel,
-  _,
-  jQuery
-) {
-  'use strict';
 
   var Module = {};
   var SidebarView;
@@ -408,5 +396,4 @@ define([
     });
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/newsletter_editor/components/styles.js

@@ -1,12 +1,8 @@
+import App from 'newsletter_editor/App';
+import Marionette from 'backbone.marionette';
+import SuperModel from 'backbone.supermodel';
+import _ from 'underscore'; // eslint-disable-line func-names
 
-'use strict';
-
-define([
-  'newsletter_editor/App',
-  'backbone.marionette',
-  'backbone.supermodel',
-  'underscore'
-], function (App, Marionette, SuperModel, _) { // eslint-disable-line func-names
   var Module = {};
 
   Module.StylesModel = SuperModel.extend({
@@ -88,5 +84,4 @@ define([
     StartApp._appView.showChildView('stylesRegion', stylesView);
   });
 
-  return Module;
+export default Module;
-});

assets/js/src/notice.js

@@ -1,6 +1,6 @@
-'use strict';
+import mp from 'mailpoet';
+import jQuery from 'jquery'; // eslint-disable-line func-names
 
-define(['mailpoet', 'jquery'], function (mp, jQuery) { // eslint-disable-line func-names
   /*= ==========================================================================================
 
       MailPoet Notice:
@@ -219,4 +219,3 @@ define(['mailpoet', 'jquery'], function (mp, jQuery) { // eslint-disable-line fu
       }, options));
     }
   };
-});

assets/js/src/num.js

@@ -1,10 +1,4 @@
-define(
+import mp from 'mailpoet';
-  [
-    'mailpoet'
-  ], function ( // eslint-disable-line func-names
-    mp
-  ) {
-    'use strict';
 
     var MailPoet = mp;
     MailPoet.Num = {
@@ -18,4 +12,3 @@ define(
           );
       }
     };
-  });

assets/js/src/public.js

@@ -1,12 +1,7 @@
-define([
+import MailPoet from 'mailpoet';
-  'mailpoet',
+import jQuery from 'jquery';
-  'jquery',
+import 'parsleyjs';
-  'parsleyjs'
+
-],
-function ( // eslint-disable-line func-names
-  MailPoet,
-  jQuery
-) {
   jQuery(function ($) { // eslint-disable-line func-names
     window.reCaptchaCallback = function reCaptchaCallback() {
       $('.mailpoet_recaptcha').each(function () { // eslint-disable-line func-names
@@ -116,4 +111,3 @@ function ( // eslint-disable-line func-names
       });
     });
   });
-});

assets/js/src/settings/reinstall_from_scratch.js

@@ -1,10 +1,5 @@
-define(
+import MailPoet from 'mailpoet';
-  [
+
-    'mailpoet'
-  ],
-  function reinstallFromScratch(
-    MailPoet
-  ) {
     var element;
     function eventHandler() {
       if (confirm(MailPoet.I18n.t('reinstallConfirmation'))) { // eslint-disable-line
@@ -40,5 +35,3 @@ define(
     if (element) {
       element.addEventListener('click', eventHandler, false);
     }
-  }
-);

assets/js/src/settings/settings.jsx

@@ -1,7 +1,7 @@
-const React = require('react');
+import React from 'react';
-const ReactDOM = require('react-dom');
+import ReactDOM from 'react-dom';
-const DefaultSender = require('settings/default_sender.jsx').default;
+import DefaultSender from 'settings/default_sender.jsx';
-const SignupConfirmationSender = require('settings/signup_confirmation_sender.jsx').default;
+import SignupConfirmationSender from 'settings/signup_confirmation_sender.jsx';
 
 const settingsSenderContainer = document.getElementById('settings_sender_container');
 

assets/js/src/settings/tabs.js

@@ -1,14 +1,7 @@
-define(
+import Backbone from 'backbone';
-  [
+import jQuery from 'jquery';
-    'backbone',
+import mp from 'mailpoet';
-    'jquery',
+
-    'mailpoet'
-  ],
-  function ( // eslint-disable-line func-names
-    Backbone,
-    jQuery,
-    mp
-  ) {
     var MailPoet = mp;
     if (jQuery('#mailpoet_settings').length === 0) {
       return;
@@ -86,5 +79,3 @@ define(
     jQuery(document).ready(function () { // eslint-disable-line func-names
       if (!Backbone.History.started) Backbone.history.start();
     });
-  }
-);

assets/js/src/subscribers/importExport/export.js

@@ -1,16 +1,8 @@
-define(
+import _ from 'underscore';
-  [
+import jQuery from 'jquery';
-    'underscore',
+import MailPoet from 'mailpoet';
-    'jquery',
+import Handlebars from 'handlebars';
-    'mailpoet',
+
-    'handlebars'
-  ],
-  function exportSubscribers(
-    _,
-    jQuery,
-    MailPoet,
-    Handlebars
-  ) {
     if (!jQuery('#mailpoet_subscribers_export').length) {
       return;
     }
@@ -151,5 +143,3 @@ define(
         });
       });
     });
-  }
-);

tests/javascript/newsletter_editor/blocks/automatedLatestContent.spec.js

@@ -3,19 +3,12 @@ const sinon = global.sinon;
 const Backbone = global.Backbone;
 const jQuery = global.jQuery;
 
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import AutomatedLatestContentBlock from 'newsletter_editor/blocks/automatedLatestContent';
-  'newsletter_editor/blocks/automatedLatestContent',
+import ContainerBlock from 'newsletter_editor/blocks/container';
-  'newsletter_editor/blocks/container',
+import AutomatedLatestContentInjector from 'amd-inject-loader!newsletter_editor/blocks/automatedLatestContent';
-  'amd-inject-loader!newsletter_editor/blocks/automatedLatestContent',
+import Communication from 'newsletter_editor/components/communication';
-  'newsletter_editor/components/communication'
+
-], function (
-  App,
-  AutomatedLatestContentBlock,
-  ContainerBlock,
-  AutomatedLatestContentInjector,
-  Communication
-) {
   var EditorApplication = App;
   var CommunicationComponent = Communication;
 
@@ -583,4 +576,3 @@ define([
       });
     });
   });
-});

tests/javascript/newsletter_editor/blocks/button.spec.js

@@ -1,10 +1,9 @@
 const expect = global.expect;
 const sinon = global.sinon;
 
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import ButtonBlock from 'newsletter_editor/blocks/button';
-  'newsletter_editor/blocks/button'
+
-], function (App, ButtonBlock) {
   var EditorApplication = App;
   var sandbox;
 
@@ -508,4 +507,3 @@ define([
       });
     });
   });
-});

tests/javascript/newsletter_editor/blocks/container.spec.js

@@ -2,10 +2,9 @@ const expect = global.expect;
 const sinon = global.sinon;
 const Backbone = global.Backbone;
 
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import ContainerBlock from 'newsletter_editor/blocks/container';
-  'newsletter_editor/blocks/container'
+
-], function (App, ContainerBlock) {
   var EditorApplication = App;
 
   describe('Container', function () {
@@ -285,4 +284,3 @@ define([
       });
     });
   });
-});

tests/javascript/newsletter_editor/blocks/divider.spec.js

@@ -1,10 +1,9 @@
 const expect = global.expect;
 const sinon = global.sinon;
 
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import DividerBlock from 'newsletter_editor/blocks/divider';
-  'newsletter_editor/blocks/divider'
+
-], function (App, DividerBlock) {
   var EditorApplication = App;
   var sandbox;
 
@@ -246,4 +245,3 @@ define([
       });
     });
   });
-});

tests/javascript/newsletter_editor/blocks/footer.spec.js

@@ -1,10 +1,9 @@
 const expect = global.expect;
 const sinon = global.sinon;
 
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import FooterBlock from 'newsletter_editor/blocks/footer';
-  'newsletter_editor/blocks/footer'
+
-], function (App, FooterBlock) {
   var EditorApplication = App;
 
   describe('Footer', function () {
@@ -229,4 +228,3 @@ define([
       });
     });
   });
-});

tests/javascript/newsletter_editor/blocks/header.spec.js

@@ -1,10 +1,9 @@
 const expect = global.expect;
 const sinon = global.sinon;
 
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import HeaderBlock from 'newsletter_editor/blocks/header';
-  'newsletter_editor/blocks/header'
+
-], function (App, HeaderBlock) {
   var EditorApplication = App;
 
   describe('Header', function () {
@@ -229,4 +228,3 @@ define([
       });
     });
   });
-});

tests/javascript/newsletter_editor/blocks/image.spec.js

@@ -1,10 +1,9 @@
 const expect = global.expect;
 const sinon = global.sinon;
 
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import ImageBlock from 'newsletter_editor/blocks/image';
-  'newsletter_editor/blocks/image'
+
-], function (App, ImageBlock) {
   var EditorApplication = App;
 
   describe('Image', function () {
@@ -271,4 +270,3 @@ define([
       });
     });
   });
-});

tests/javascript/newsletter_editor/blocks/posts.spec.js

@@ -3,12 +3,11 @@ const sinon = global.sinon;
 const Backbone = global.Backbone;
 const jQuery = global.jQuery;
 
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import Communication from 'newsletter_editor/components/communication';
-  'newsletter_editor/components/communication',
+import PostsBlock from 'newsletter_editor/blocks/posts';
-  'newsletter_editor/blocks/posts',
+import ContainerBlock from 'newsletter_editor/blocks/container';
-  'newsletter_editor/blocks/container'
+
-], function (App, Communication, PostsBlock, ContainerBlock) {
   var EditorApplication = App;
   var CommunicationComponent = Communication;
 
@@ -489,4 +488,3 @@ define([
       });
     });
   });
-});

tests/javascript/newsletter_editor/blocks/social.spec.js

@@ -1,11 +1,10 @@
 const expect = global.expect;
 const sinon = global.sinon;
 
-define([
+import EditorApplication from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import SocialBlock from 'newsletter_editor/blocks/social';
-  'newsletter_editor/blocks/social',
+import Backbone from 'backbone';
-  'backbone'
+
-], function (EditorApplication, SocialBlock, Backbone) {
   describe('Social', function () {
     describe('block model', function () {
       var model;
@@ -325,4 +324,3 @@ define([
       });
     });
   });
-});

tests/javascript/newsletter_editor/blocks/spacer.spec.js

@@ -1,10 +1,9 @@
 const expect = global.expect;
 const sinon = global.sinon;
 
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import SpacerBlock from 'newsletter_editor/blocks/spacer';
-  'newsletter_editor/blocks/spacer'
+
-], function (App, SpacerBlock) {
   var EditorApplication = App;
 
   describe('Spacer', function () {
@@ -170,4 +169,3 @@ define([
       });
     });
   });
-});

tests/javascript/newsletter_editor/blocks/text.spec.js

@@ -1,10 +1,9 @@
 const expect = global.expect;
 const sinon = global.sinon;
 
-define([
+import EditorApplication from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import TextBlock from 'newsletter_editor/blocks/text';
-  'newsletter_editor/blocks/text'
+
-], function (EditorApplication, TextBlock) {
   describe('Text', function () {
     describe('model', function () {
       var model;
@@ -83,4 +82,3 @@ define([
       });
     });
   });
-});

tests/javascript/newsletter_editor/components/communication.spec.js

@@ -2,11 +2,10 @@ const expect = global.expect;
 const jQuery = global.jQuery;
 const sinon = global.sinon;
 
-define([
+import EditorApplication from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import Communication from 'newsletter_editor/components/communication';
-  'newsletter_editor/components/communication',
+import CommunicationInjector from 'amd-inject-loader!newsletter_editor/components/communication';
-  'amd-inject-loader!newsletter_editor/components/communication'
+
-], function (EditorApplication, Communication, CommunicationInjector) {
   describe('getPostTypes', function () {
     it('fetches post types from the server', function () {
       var module = CommunicationInjector({
@@ -320,4 +319,3 @@ define([
       mock.verify();
     });
   });
-});

tests/javascript/newsletter_editor/components/config.spec.js

@@ -1,9 +1,8 @@
 const expect = global.expect;
 
-define([
+import EditorApplication from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import ConfigComponent from 'newsletter_editor/components/config';
-  'newsletter_editor/components/config'
+
-], function (EditorApplication, ConfigComponent) {
   describe('Config', function () {
     it('loads and stores configuration', function () {
       var model;
@@ -14,4 +13,3 @@ define([
       expect(model.get('testConfig')).to.equal('testValue');
     });
   });
-});

tests/javascript/newsletter_editor/components/content.spec.js

@@ -3,10 +3,9 @@ const sinon = global.sinon;
 const Backbone = global.Backbone;
 const _ = global._;
 
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import ContentComponent from 'newsletter_editor/components/content';
-  'newsletter_editor/components/content'
+
-], function (App, ContentComponent) {
   var EditorApplication = App;
 
   describe('Content', function () {
@@ -123,4 +122,3 @@ define([
       });
     });
   });
-});

tests/javascript/newsletter_editor/components/heading.spec.js

@@ -1,10 +1,9 @@
 const expect = global.expect;
 const Backbone = global.Backbone;
 
-define([
+import EditorApplication from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import HeadingComponent from 'newsletter_editor/components/heading';
-  'newsletter_editor/components/heading'
+
-], function (EditorApplication, HeadingComponent) {
   describe('Heading', function () {
     describe('view', function () {
       var view;
@@ -46,4 +45,3 @@ define([
       });
     });
   });
-});

tests/javascript/newsletter_editor/components/save.spec.js

@@ -1,12 +1,11 @@
 const expect = global.expect;
 const sinon = global.sinon;
 
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import SaveComponent from 'newsletter_editor/components/save';
-  'newsletter_editor/components/save',
+import SaveInjector from 'amd-inject-loader!newsletter_editor/components/save';
-  'amd-inject-loader!newsletter_editor/components/save',
+import jQuery from 'jquery';
-  'jquery'
+
-], function (App, SaveComponent, SaveInjector, jQuery) {
   var EditorApplication = App;
 
   describe('Save', function () {
@@ -244,4 +243,3 @@ define([
       });
     });
   });
-});

tests/javascript/newsletter_editor/components/sidebar.spec.js

@@ -1,10 +1,9 @@
 const expect = global.expect;
 const Backbone = global.Backbone;
 
-define([
+import EditorApplication from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import SidebarComponent from 'newsletter_editor/components/sidebar';
-  'newsletter_editor/components/sidebar'
+
-], function (EditorApplication, SidebarComponent) {
   describe('Sidebar', function () {
     describe('content view', function () {
       var view;
@@ -194,4 +193,3 @@ define([
       });
     });
   });
-});

tests/javascript/newsletter_editor/components/styles.spec.js

@@ -1,10 +1,9 @@
 const expect = global.expect;
 const sinon = global.sinon;
 
-define([
+import App from 'newsletter_editor/App';
-  'newsletter_editor/App',
+import StylesComponent from 'newsletter_editor/components/styles';
-  'newsletter_editor/components/styles'
+
-], function (App, StylesComponent) {
   var EditorApplication = App;
 
   describe('Styles', function () {
@@ -48,4 +47,3 @@ define([
       });
     });
   });
-});