Adjust imports

package.json

@@ -83,7 +83,10 @@
     ]
   },
   "jest": {
-    "modulePaths": ["./src"]
+    "modulePaths": ["./src"],
+    "moduleNameMapper": {
+      "^jquery$": "cash-dom"
+    }
   },
   "scripts": {
     "lint": "eslint src",

src/asset_manager/view/FileUploader.js

@@ -1,3 +1,5 @@
+import _ from 'underscore';
+import Backbone from 'backbone';
 import fetch from 'utils/fetch';
 
 module.exports = Backbone.View.extend(

src/block_manager/view/BlockView.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 import { isObject } from 'underscore';
 import { on, off, hasDnd } from 'utils/mixins';
 

src/block_manager/view/CategoryView.js

@@ -1,4 +1,5 @@
-var Backbone = require('backbone');
+import _ from 'underscore';
+import Backbone from 'backbone';
 
 module.exports = Backbone.View.extend({
   template: _.template(`

src/commands/view/CommandAbstract.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 const $ = Backbone.$;
 
 module.exports = Backbone.View.extend({

src/css_composer/view/CssRulesView.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 const CssRuleView = require('./CssRuleView');
 const CssGroupRuleView = require('./CssGroupRuleView');
 const $ = Backbone.$;
@@ -6,7 +7,7 @@ const $ = Backbone.$;
 const getBlockId = (pfx, widthMedia) =>
   `${pfx}${widthMedia ? `-${widthMedia.replace('%', 'pc')}` : ''}`;
 
-module.exports = require('backbone').View.extend({
+module.exports = Backbone.View.extend({
   initialize(o) {
     const config = o.config || {};
     this.atRules = {};

src/device_manager/view/DevicesView.js

@@ -1,4 +1,5 @@
-var Backbone = require('backbone');
+import _ from 'underscore';
+import Backbone from 'backbone';
 
 module.exports = Backbone.View.extend({
   template: _.template(`

src/dom_components/view/ComponentView.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 import { isArray, isEmpty } from 'underscore';
 
 const ComponentsView = require('./ComponentsView');

src/dom_components/view/ComponentsView.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 import { isUndefined } from 'underscore';
 
 module.exports = Backbone.View.extend({

src/domain_abstract/ui/Input.js

@@ -1,3 +1,4 @@
+const Backbone = require('backbone');
 const $ = Backbone.$;
 
 module.exports = Backbone.View.extend({

src/domain_abstract/ui/InputColor.js

@@ -1,8 +1,10 @@
+import Backbone from 'backbone';
 import { isUndefined } from 'underscore';
+import ColorPicker from 'utils/ColorPicker';
 
-require('utils/ColorPicker');
 const Input = require('./Input');
 const $ = Backbone.$;
+ColorPicker($);
 
 module.exports = Input.extend({
   template() {

src/panels/view/ButtonView.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 import { isString, isObject, isFunction } from 'underscore';
 const $ = Backbone.$;
 

src/selector_manager/view/ClassTagsView.js

@@ -1,4 +1,5 @@
-var Backbone = require('backbone');
+import _ from 'underscore';
+import Backbone from 'backbone';
 var ClassTagView = require('./ClassTagView');
 
 module.exports = Backbone.View.extend({

src/style_manager/model/Layer.js

@@ -1,3 +1,5 @@
+import Backbone from 'backbone';
+
 module.exports = Backbone.Model.extend({
   defaults: {
     index: '',

src/style_manager/model/Layers.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 const Layer = require('./Layer');
 
 module.exports = Backbone.Collection.extend({

src/style_manager/view/LayerView.js

@@ -1,3 +1,5 @@
+import Backbone from 'backbone';
+
 module.exports = Backbone.View.extend({
   events: {
     click: 'active',

src/style_manager/view/PropertiesView.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 const PropertyView = require('./PropertyView');
 const PropertyIntegerView = require('./PropertyIntegerView');
 const PropertyRadioView = require('./PropertyRadioView');

src/style_manager/view/PropertyCompositeView.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 const PropertyView = require('./PropertyView');
 const $ = Backbone.$;
 

src/style_manager/view/PropertyFileView.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 const PropertyView = require('./PropertyView');
 const $ = Backbone.$;
 

src/style_manager/view/PropertyIntegerView.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 const InputNumber = require('domain_abstract/ui/InputNumber');
 const PropertyView = require('./PropertyView');
 const $ = Backbone.$;

src/style_manager/view/PropertySelectView.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 const $ = Backbone.$;
 
 module.exports = require('./PropertyView').extend({

src/style_manager/view/PropertyView.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 import { bindAll, isArray, isUndefined } from 'underscore';
 import { camelCase } from 'utils/mixins';
 

src/style_manager/view/SectorView.js

@@ -1,4 +1,5 @@
-var Backbone = require('backbone');
+import _ from 'underscore';
+import Backbone from 'backbone';
 var PropertiesView = require('./PropertiesView');
 
 module.exports = Backbone.View.extend({

src/style_manager/view/SectorsView.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 import { extend } from 'underscore';
 
 const SectorView = require('./SectorView');

src/trait_manager/view/TraitSelectView.js

@@ -1,5 +1,5 @@
 const TraitView = require('./TraitView');
-const $ = Backbone.$;
+const $ = require('backbone').$;
 
 module.exports = TraitView.extend({
   initialize(o) {

src/utils/ColorPicker.js

@@ -5,9 +5,7 @@
 // Author: Brian Grinstead
 // License: MIT
 
-(function(factory) {
-  factory(Backbone.$);
-})(function($, undefined) {
+export default function($, undefined) {
   'use strict';
 
   var defaultOpts = {
@@ -2531,4 +2529,4 @@
       $.fn.spectrum.processNativeColorInputs();
     }
   });
-});
+}

test/helper.js

@@ -1,5 +1,4 @@
 import _ from 'underscore';
-import expect from 'expect';
 import sinon from 'sinon';
 import { JSDOM } from 'jsdom';
 

test/main.test.js

@@ -3,7 +3,7 @@ import grapesjs from './../src';
 describe('Main', () => {
   describe('Startup', () => {
     it('Main object should be loaded', () => {
-      expect(grapesjs).toExist();
+      expect(grapesjs).toBeTruthy();
     });
   });
 

test/specs/css_composer/e2e/CssComposer.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 const $ = Backbone.$;
 
 module.exports = {

test/specs/dom_components/model/Component.js

@@ -1,3 +1,4 @@
+import Backbone from 'backbone';
 const DomComponents = require('dom_components');
 const Component = require('dom_components/model/Component');
 const ComponentImage = require('dom_components/model/ComponentImage');