fix: use imports + use Array.isArray

lib/decoration.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const _ = require('underscore-plus')
-const { Emitter } = require('atom')
+import { Emitter } from 'atom'
 
 let idCounter = 0
 const nextId = function () { return idCounter++ }
@@ -21,7 +20,7 @@ export default class Decoration {
    * @return {boolean} whether the decoration properties match the type
    */
   static isType (decorationProperties, type) {
-    if (_.isArray(decorationProperties.type)) {
+    if (Array.isArray(decorationProperties.type)) {
       if (decorationProperties.type.indexOf(type) >= 0) { return true }
       return false
     } else {

lib/decorators/element.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { registerOrUpdateElement } = require('atom-utils-plus')
+import { registerOrUpdateElement } from 'atom-utils-plus'
 
 /**
  * Generates a decorator function to convert a class into a custom element

lib/main.js

@@ -1,13 +1,12 @@
 'use strict'
 
+import include from './decorators/include'
+import PluginManagement from './mixins/plugin-management'
 
-const include = require('./decorators/include')
-const PluginManagement = require('./mixins/plugin-management')
-
-const { Emitter, CompositeDisposable } = require('atom')
-const MinimapElement = require('./minimap-element')
-const Minimap = require('./minimap')
-const MinimapPluginGeneratorElement = require('./minimap-plugin-generator-element')
+import { Emitter, CompositeDisposable } from 'atom'
+import MinimapElement from './minimap-element'
+import Minimap from './minimap'
+import MinimapPluginGeneratorElement from './minimap-plugin-generator-element'
 
 /**
  * The `Minimap` package provides an eagle-eye view of text buffers.
@@ -381,6 +380,6 @@ Main.initClass()
  *
  * @access private
  */
-const main =  new Main()
+const main = new Main()
 
 export default main

lib/minimap-element.js

@@ -1,13 +1,16 @@
 'use strict'
 
-const { CompositeDisposable, Disposable } = require('atom')
-const { EventsDelegation, AncestorsMethods } = require('atom-utils-plus')
-const DOMStylesReader = require('./mixins/dom-styles-reader')
-const CanvasDrawer = require('./mixins/canvas-drawer')
-const include = require('./decorators/include')
-const element = require('./decorators/element')
-const elementResizeDetector = require('element-resize-detector')({ strategy: 'scroll' })
-const MinimapQuickSettingsElement = require('./minimap-quick-settings-element')
+import { CompositeDisposable, Disposable } from 'atom'
+import { EventsDelegation, AncestorsMethods } from 'atom-utils-plus'
+import elementResizeDetectorImport from 'element-resize-detector'
+
+import DOMStylesReader from './mixins/dom-styles-reader'
+import CanvasDrawer from './mixins/canvas-drawer'
+import include from './decorators/include'
+import element from './decorators/element'
+
+import MinimapQuickSettingsElement from './minimap-quick-settings-element'
+const elementResizeDetector = elementResizeDetectorImport({ strategy: 'scroll' })
 
 let overlayStyle
 let Main // TODO: lazy loaded because of race confitions

lib/minimap-plugin-generator-element.js

@@ -1,10 +1,10 @@
 'use strict'
 
-const _ = require('underscore-plus')
-const fs = require('fs-plus')
-const path = require('path')
-const { BufferedProcess } = require('atom')
-const element = require('./decorators/element')
+import _ from 'underscore-plus'
+import fs from 'fs-plus'
+import path from 'path'
+import { BufferedProcess } from 'atom'
+import element from './decorators/element'
 
 /**
  * @access private

lib/minimap-quick-settings-element.js

@@ -1,11 +1,11 @@
 'use strict'
 
-const { CompositeDisposable, Emitter } = require('atom')
-const { EventsDelegation, SpacePenDSL } = require('atom-utils-plus')
+import { CompositeDisposable, Emitter } from 'atom'
+import { EventsDelegation, SpacePenDSL } from 'atom-utils-plus'
 
-const Main = require('./main')
-const element = require('./decorators/element')
-const include = require('./decorators/include')
+import * as Main from './main'
+import element from './decorators/element'
+import include from './decorators/include'
 
 /**
  * @access private

lib/minimap.js

@@ -1,11 +1,11 @@
 'use strict'
 
-const include = require('./decorators/include')
-const DecorationManagement = require('./mixins/decoration-management')
+import include from './decorators/include'
+import DecorationManagement from './mixins/decoration-management'
 
-const { Emitter, CompositeDisposable } = require('atom')
-const StableAdapter = require('./adapters/stable-adapter')
-const LegacyAdapter = require('./adapters/legacy-adapter')
+import { Emitter, CompositeDisposable } from 'atom'
+import StableAdapter from './adapters/stable-adapter'
+import LegacyAdapter from './adapters/legacy-adapter'
 
 let nextModelId = 1
 

lib/mixins/canvas-drawer.js

@@ -1,9 +1,9 @@
 'use strict'
 
-const _ = require('underscore-plus')
-const Mixin = require('mixto')
+import { escapeRegExp } from 'underscore-plus'
+import Mixin from 'mixto'
 
-const CanvasLayer = require('../canvas-layer')
+import CanvasLayer from '../canvas-layer'
 
 let Main // TODO: lazy loaded because of race confitions
 
@@ -503,7 +503,7 @@ export default class CanvasDrawer extends Mixin {
     if (regexp.length !== 0) {
       return RegExp(regexp.filter((s) => {
         return typeof s === 'string'
-      }).map(_.escapeRegExp).join('|'), 'g')
+      }).map(escapeRegExp).join('|'), 'g')
     } else {
       return null
     }

lib/mixins/decoration-management.js

@@ -1,9 +1,9 @@
 'use strict'
 
-const { Emitter } = require('atom')
-const { escapeRegExp } = require('underscore-plus')
-const path = require('path')
-const Decoration = require('../decoration')
+import { Emitter } from 'atom'
+import { escapeRegExp } from 'underscore-plus'
+import path from 'path'
+import Decoration from '../decoration'
 
 /**
  * The mixin that provides the decorations API to the minimap editor

lib/mixins/dom-styles-reader.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const Mixin = require('mixto')
+import Mixin from 'mixto'
 
 /**
  * This mixin is used by the `CanvasDrawer` in `MinimapElement` to

lib/mixins/plugin-management.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const Mixin = require('mixto')
-const { CompositeDisposable } = require('atom')
+import Mixin from 'mixto'
+import { CompositeDisposable } from 'atom'
 
 /**
  * Provides methods to manage minimap plugins.