imports

app/scripts/app.js

@@ -1,28 +1,30 @@
-const Backbone = require('backbone');
-const AppModel = require('./models/app-model');
-const AppView = require('./views/app-view');
-const AppSettingsModel = require('./models/app-settings-model');
-const UpdateModel = require('./models/update-model');
-const RuntimeDataModel = require('./models/runtime-data-model');
-const FileInfoCollection = require('./collections/file-info-collection');
-const KeyHandler = require('./comp/browser/key-handler');
-const IdleTracker = require('./comp/browser/idle-tracker');
-const PopupNotifier = require('./comp/browser/popup-notifier');
-const SingleInstanceChecker = require('./comp/app/single-instance-checker');
-const AppRightsChecker = require('./comp/app/app-rights-checker');
-const Alerts = require('./comp/ui/alerts');
-const Updater = require('./comp/app/updater');
-const AuthReceiver = require('./comp/browser/auth-receiver');
-const ExportApi = require('./comp/app/export-api');
-const SettingsManager = require('./comp/settings/settings-manager');
-const PluginManager = require('./plugins/plugin-manager');
-const Launcher = require('./comp/launcher');
-const FeatureTester = require('./comp/browser/feature-tester');
-const FocusDetector = require('./comp/browser/focus-detector');
-const Timeouts = require('./const/timeouts');
-const Features = require('./util/features');
-const KdbxwebInit = require('./util/kdbxweb/kdbxweb-init');
-const Locale = require('./util/locale');
+import Backbone from 'backbone';
+import { FileInfoCollection } from 'collections/file-info-collection';
+import { AppRightsChecker } from 'comp/app/app-rights-checker';
+import { ExportApi } from 'comp/app/export-api';
+import { SingleInstanceChecker } from 'comp/app/single-instance-checker';
+import { Updater } from 'comp/app/updater';
+import { AuthReceiver } from 'comp/browser/auth-receiver';
+import { FeatureTester } from 'comp/browser/feature-tester';
+import { FocusDetector } from 'comp/browser/focus-detector';
+import { IdleTracker } from 'comp/browser/idle-tracker';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { PopupNotifier } from 'comp/browser/popup-notifier';
+import { Launcher } from 'comp/launcher';
+import { SettingsManager } from 'comp/settings/settings-manager';
+import { Alerts } from 'comp/ui/alerts';
+import { Timeouts } from 'const/timeouts';
+import { AppModel } from 'models/app-model';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { RuntimeDataModel } from 'models/runtime-data-model';
+import { UpdateModel } from 'models/update-model';
+import { PluginManager } from 'plugins/plugin-manager';
+import { Features } from 'util/features';
+import { KdbxwebInit } from 'util/kdbxweb/kdbxweb-init';
+import { Locale } from 'util/locale';
+import { AppView } from 'views/app-view';
+import 'view-engine/backbone-view-ext';
+import 'hbs-helpers';
 
 const ready = (Launcher && Launcher.ready) || $;
 
@@ -30,7 +32,6 @@ ready(() => {
     if (AuthReceiver.receive() || Features.isFrame) {
         return;
     }
-    loadMixins();
 
     const appModel = new AppModel();
 
@@ -45,11 +46,6 @@ ready(() => {
             appModel.appLogger.error('Error starting app', e);
         });
 
-    function loadMixins() {
-        require('./view-engine/backbone-view-ext');
-        require('./hbs-helpers');
-    }
-
     function ensureCanRun() {
         return FeatureTester.test().catch(e => {
             Alerts.error({
@@ -146,7 +142,10 @@ ready(() => {
         Updater.init();
         SingleInstanceChecker.init();
         AppRightsChecker.init();
-        setTimeout(() => PluginManager.instance.runAutoUpdate(), Timeouts.AutoUpdatePluginsAfterStart);
+        setTimeout(
+            () => PluginManager.instance.runAutoUpdate(),
+            Timeouts.AutoUpdatePluginsAfterStart
+        );
     }
 
     function showView() {

app/scripts/auto-type/auto-type-emitter-factory.js

@@ -1,13 +1,14 @@
-const Launcher = require('../comp/launcher');
+import { Launcher } from 'comp/launcher';
 
 const AutoTypeEmitterFactory = {
     create(callback) {
         if (Launcher && Launcher.autoTypeSupported) {
-            const AutoTypeEmitter = require('./emitter/auto-type-emitter-' + Launcher.platform());
+            const { AutoTypeEmitter } = require('./emitter/auto-type-emitter-' +
+                Launcher.platform());
             return new AutoTypeEmitter(callback);
         }
         return null;
     }
 };
 
-module.exports = AutoTypeEmitterFactory;
+export { AutoTypeEmitterFactory };

app/scripts/auto-type/auto-type-filter.js

@@ -1,5 +1,5 @@
-const EntryCollection = require('../collections/entry-collection');
-const Ranking = require('../util/data/ranking');
+import { EntryCollection } from 'collections/entry-collection';
+import { Ranking } from 'util/data/ranking';
 
 const urlPartsRegex = /^(\w+:\/\/)?(?:(?:www|wwws|secure)\.)?([^\/]+)\/?(.*)/;
 
@@ -87,4 +87,4 @@ AutoTypeFilter.prototype.getEntryRank = function(entry) {
     return rank;
 };
 
-module.exports = AutoTypeFilter;
+export { AutoTypeFilter };

app/scripts/auto-type/auto-type-helper-factory.js

@@ -1,13 +1,13 @@
-const Launcher = require('../comp/launcher');
+import { Launcher } from 'comp/launcher';
 
 const AutoTypeHelperFactory = {
     create() {
         if (Launcher && Launcher.autoTypeSupported) {
-            const AutoTypeHelper = require('./helper/auto-type-helper-' + Launcher.platform());
+            const { AutoTypeHelper } = require('./helper/auto-type-helper-' + Launcher.platform());
             return new AutoTypeHelper();
         }
         return null;
     }
 };
 
-module.exports = AutoTypeHelperFactory;
+export { AutoTypeHelperFactory };

app/scripts/auto-type/auto-type-obfuscator.js

@@ -1,4 +1,4 @@
-const Logger = require('../util/logger');
+import { Logger } from 'util/logger';
 
 const logger = new Logger('auto-type-obfuscator');
 logger.setLevel(localStorage.autoTypeDebug ? Logger.Level.All : Logger.Level.Warn);
@@ -203,4 +203,4 @@ AutoTypeObfuscator.prototype.deleteText = function(backward) {
     }
 };
 
-module.exports = AutoTypeObfuscator;
+export { AutoTypeObfuscator };

app/scripts/auto-type/auto-type-parser.js

@@ -1,4 +1,4 @@
-const AutoTypeRunner = require('./auto-type-runner');
+import { AutoTypeRunner } from 'auto-type/auto-type-runner';
 
 const AutoTypeParser = function(sequence) {
     this.sequence = sequence;
@@ -124,4 +124,4 @@ AutoTypeParser.prototype.addOp = function(op, sep, arg) {
     });
 };
 
-module.exports = AutoTypeParser;
+export { AutoTypeParser };

app/scripts/auto-type/auto-type-runner.js

@@ -1,7 +1,7 @@
-const AutoTypeObfuscator = require('./auto-type-obfuscator');
-const AutoTypeEmitterFactory = require('./auto-type-emitter-factory');
-const StringFormat = require('../util/formatting/string-format');
-const Logger = require('../util/logger');
+import { AutoTypeEmitterFactory } from 'auto-type/auto-type-emitter-factory';
+import { AutoTypeObfuscator } from 'auto-type/auto-type-obfuscator';
+import { StringFormat } from 'util/formatting/string-format';
+import { Logger } from 'util/logger';
 
 const emitterLogger = new Logger('auto-type-emitter');
 emitterLogger.setLevel(localStorage.autoTypeDebug ? Logger.Level.All : Logger.Level.Warn);
@@ -529,4 +529,4 @@ AutoTypeRunner.prototype.resetEmitterMod = function(targetState) {
     }, this);
 };
 
-module.exports = AutoTypeRunner;
+export { AutoTypeRunner };

app/scripts/auto-type/emitter/auto-type-emitter-darwin.js

@@ -1,5 +1,5 @@
-const Launcher = require('../../comp/launcher');
-const AutoTypeNativeHelper = require('../helper/auto-type-native-helper');
+import { AutoTypeNativeHelper } from 'auto-type/helper/auto-type-native-helper';
+import { Launcher } from 'comp/launcher';
 
 // http://eastmanreference.com/complete-list-of-applescript-key-codes/
 const KeyMap = {
@@ -126,4 +126,4 @@ AutoTypeEmitter.prototype.runScript = function(script) {
     });
 };
 
-module.exports = AutoTypeEmitter;
+export { AutoTypeEmitter };

app/scripts/auto-type/emitter/auto-type-emitter-linux.js

@@ -1,5 +1,5 @@
-const Launcher = require('../../comp/launcher');
-const Locale = require('../../util/locale');
+import { Launcher } from 'comp/launcher';
+import { Locale } from 'util/locale';
 
 // https://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h
 const KeyMap = {
@@ -144,4 +144,4 @@ AutoTypeEmitter.prototype.runScript = function(script, callback) {
     });
 };
 
-module.exports = AutoTypeEmitter;
+export { AutoTypeEmitter };

app/scripts/auto-type/emitter/auto-type-emitter-win32.js

@@ -1,5 +1,5 @@
-const Launcher = require('../../comp/launcher');
-const AutoTypeNativeHelper = require('../helper/auto-type-native-helper');
+import { AutoTypeNativeHelper } from 'auto-type/helper/auto-type-native-helper';
+import { Launcher } from 'comp/launcher';
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/dd375731(v=vs.85).aspx
 const KeyMap = {
@@ -128,4 +128,4 @@ AutoTypeEmitter.prototype.runScript = function(script) {
     });
 };
 
-module.exports = AutoTypeEmitter;
+export { AutoTypeEmitter };

app/scripts/auto-type/helper/auto-type-helper-darwin.js

@@ -1,4 +1,4 @@
-const Launcher = require('../../comp/launcher');
+import { Launcher } from 'comp/launcher';
 
 const ForeMostAppScript =
     'tell application "System Events"\n' +
@@ -89,4 +89,4 @@ AutoTypeHelper.exec = function(script, callback) {
     });
 };
 
-module.exports = AutoTypeHelper;
+export { AutoTypeHelper };

app/scripts/auto-type/helper/auto-type-helper-linux.js

@@ -1,4 +1,4 @@
-const Launcher = require('../../comp/launcher');
+import { Launcher } from 'comp/launcher';
 
 const AutoTypeHelper = function() {};
 
@@ -20,4 +20,4 @@ AutoTypeHelper.prototype.getActiveWindowInfo = function(callback) {
     });
 };
 
-module.exports = AutoTypeHelper;
+export { AutoTypeHelper };

app/scripts/auto-type/helper/auto-type-helper-win32.js

@@ -1,5 +1,5 @@
-const Launcher = require('../../comp/launcher');
-const AutoTypeNativeHelper = require('./auto-type-native-helper');
+import { AutoTypeNativeHelper } from 'auto-type/helper/auto-type-native-helper';
+import { Launcher } from 'comp/launcher';
 
 const AutoTypeHelper = function() {};
 
@@ -22,4 +22,4 @@ AutoTypeHelper.prototype.getActiveWindowInfo = function(callback) {
     });
 };
 
-module.exports = AutoTypeHelper;
+export { AutoTypeHelper };

app/scripts/auto-type/helper/auto-type-native-helper.js

@@ -1,5 +1,5 @@
-const Launcher = require('../../comp/launcher');
-const Logger = require('../../util/logger');
+import { Launcher } from 'comp/launcher';
+import { Logger } from 'util/logger';
 
 const logger = new Logger('auto-type');
 
@@ -18,4 +18,4 @@ const AutoTypeNativeHelper = {
     }
 };
 
-module.exports = AutoTypeNativeHelper;
+export { AutoTypeNativeHelper };

app/scripts/auto-type/index.js

@@ -1,14 +1,14 @@
-const Backbone = require('backbone');
-const AutoTypeParser = require('./auto-type-parser');
-const AutoTypeFilter = require('./auto-type-filter');
-const AutoTypeHelperFactory = require('./auto-type-helper-factory');
-const Launcher = require('../comp/launcher');
-const Alerts = require('../comp/ui/alerts');
-const AutoTypeSelectView = require('../views/auto-type/auto-type-select-view');
-const Logger = require('../util/logger');
-const Locale = require('../util/locale');
-const Timeouts = require('../const/timeouts');
-const AppSettingsModel = require('../models/app-settings-model');
+import Backbone from 'backbone';
+import { AutoTypeFilter } from 'auto-type/auto-type-filter';
+import { AutoTypeHelperFactory } from 'auto-type/auto-type-helper-factory';
+import { AutoTypeParser } from 'auto-type/auto-type-parser';
+import { Launcher } from 'comp/launcher';
+import { Alerts } from 'comp/ui/alerts';
+import { Timeouts } from 'const/timeouts';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Locale } from 'util/locale';
+import { Logger } from 'util/logger';
+import { AutoTypeSelectView } from 'views/auto-type/auto-type-select-view';
 
 const logger = new Logger('auto-type');
 const clearTextAutoTypeLog = localStorage.autoTypeDebug;
@@ -282,4 +282,4 @@ const AutoType = {
     }
 };
 
-module.exports = AutoType;
+export { AutoType };

app/scripts/collections/entry-collection.js

@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const EntryModel = require('../models/entry-model');
-const Comparators = require('../util/data/comparators');
+import Backbone from 'backbone';
+import { EntryModel } from 'models/entry-model';
+import { Comparators } from 'util/data/comparators';
 
 const EntryCollection = Backbone.Collection.extend({
     model: EntryModel,
@@ -50,4 +50,4 @@ const EntryCollection = Backbone.Collection.extend({
     }
 });
 
-module.exports = EntryCollection;
+export { EntryCollection };

app/scripts/collections/file-collection.js

@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const FileModel = require('../models/file-model');
+import Backbone from 'backbone';
+import { FileModel } from 'models/file-model';
 
 const FileCollection = Backbone.Collection.extend({
     model: FileModel,
@@ -21,4 +21,4 @@ const FileCollection = Backbone.Collection.extend({
     }
 });
 
-module.exports = FileCollection;
+export { FileCollection };

app/scripts/collections/file-info-collection.js

@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const FileInfoModel = require('../models/file-info-model');
-const SettingsStore = require('../comp/settings/settings-store');
+import Backbone from 'backbone';
+import { SettingsStore } from 'comp/settings/settings-store';
+import { FileInfoModel } from 'models/file-info-model';
 
 const FileInfoCollection = Backbone.Collection.extend({
     model: FileInfoModel,
@@ -40,4 +40,4 @@ const FileInfoCollection = Backbone.Collection.extend({
 
 FileInfoCollection.instance = new FileInfoCollection();
 
-module.exports = FileInfoCollection;
+export { FileInfoCollection };

app/scripts/collections/group-collection.js

@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const GroupModel = require('../models/group-model');
+import Backbone from 'backbone';
+import { GroupModel } from 'models/group-model';
 
 const GroupCollection = Backbone.Collection.extend({
     model: GroupModel
 });
 
-module.exports = GroupCollection;
+export { GroupCollection };

app/scripts/collections/menu/menu-item-collection.js

@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const MenuItemModel = require('../../models/menu/menu-item-model');
+import Backbone from 'backbone';
+import { MenuItemModel } from 'models/menu/menu-item-model';
 
 const MenuItemCollection = Backbone.Collection.extend({
     model: MenuItemModel
 });
 
-module.exports = MenuItemCollection;
+export { MenuItemCollection };

app/scripts/collections/menu/menu-option-collection.js

@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const MenuOptionModel = require('../../models/menu/menu-option-model');
+import Backbone from 'backbone';
+import { MenuOptionModel } from 'models/menu/menu-option-model';
 
 const MenuOptionCollection = Backbone.Collection.extend({
     model: MenuOptionModel
 });
 
-module.exports = MenuOptionCollection;
+export { MenuOptionCollection };

app/scripts/collections/menu/menu-section-collection.js

@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const MenuSectionModel = require('../../models/menu/menu-section-model');
+import Backbone from 'backbone';
+import { MenuSectionModel } from 'models/menu/menu-section-model';
 
 const MenuSectionCollection = Backbone.Collection.extend({
     model: MenuSectionModel
 });
 
-module.exports = MenuSectionCollection;
+export { MenuSectionCollection };

app/scripts/comp/app/app-rights-checker.js

@@ -1,8 +1,8 @@
-const Features = require('../../util/features');
-const Alerts = require('../ui/alerts');
-const AppSettingsModel = require('../../models/app-settings-model');
-const Launcher = require('../launcher');
-const Locale = require('../../util/locale');
+import { Launcher } from 'comp/launcher';
+import { Alerts } from 'comp/ui/alerts';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Features } from 'util/features';
+import { Locale } from 'util/locale';
 
 const AppRightsChecker = {
     AppPath: '/Applications/KeeWeb.app',
@@ -77,4 +77,4 @@ const AppRightsChecker = {
     }
 };
 
-module.exports = AppRightsChecker;
+export { AppRightsChecker };

app/scripts/comp/app/drag-drop-info.js

@@ -2,4 +2,4 @@ const DragDropInfo = {
     dragObject: null
 };
 
-module.exports = DragDropInfo;
+export { DragDropInfo };

app/scripts/comp/app/dropbox-chooser.js

@@ -1,4 +1,4 @@
-const AppSettingsModel = require('../../models/app-settings-model');
+import { AppSettingsModel } from 'models/app-settings-model';
 
 const ChooserAppKey = 'qp7ctun6qt5n9d6';
 
@@ -104,4 +104,4 @@ DropboxChooser.prototype.readFile = function(url) {
     xhr.send();
 };
 
-module.exports = DropboxChooser;
+export { DropboxChooser };

app/scripts/comp/app/export-api.js

@@ -1,4 +1,4 @@
-const AppSettingsModel = require('../../models/app-settings-model');
+import { AppSettingsModel } from 'models/app-settings-model';
 
 const ExportApi = {
     settings: {
@@ -14,4 +14,4 @@ const ExportApi = {
     }
 };
 
-module.exports = ExportApi;
+export { ExportApi };

app/scripts/comp/app/generator-presets.js

@@ -1,5 +1,5 @@
-const AppSettingsModel = require('../../models/app-settings-model');
-const Locale = require('../../util/locale');
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Locale } from 'util/locale';
 
 const GeneratorPresets = {
     get defaultPreset() {
@@ -165,4 +165,4 @@ const GeneratorPresets = {
     }
 };
 
-module.exports = GeneratorPresets;
+export { GeneratorPresets };

app/scripts/comp/app/runtime-info.js

@@ -1,4 +1,4 @@
-const Launcher = require('../launcher');
+import { Launcher } from 'comp/launcher';
 
 const RuntimeInfo = {
     version: '@@VERSION',
@@ -9,4 +9,4 @@ const RuntimeInfo = {
     launcher: Launcher ? Launcher.name + ' v' + Launcher.version : ''
 };
 
-module.exports = RuntimeInfo;
+export { RuntimeInfo };

app/scripts/comp/app/shortcuts.js

@@ -1,8 +1,8 @@
-const Features = require('../../util/features');
-const Keys = require('../../const/keys');
-const StringFormat = require('../../util/formatting/string-format');
-const AppSettingsModel = require('../../models/app-settings-model');
-const Launcher = require('../launcher');
+import { Launcher } from 'comp/launcher';
+import { Keys } from 'const/keys';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Features } from 'util/features';
+import { StringFormat } from 'util/formatting/string-format';
 
 let allowedKeys;
 
@@ -128,4 +128,4 @@ const Shortcuts = {
     }
 };
 
-module.exports = Shortcuts;
+export { Shortcuts };

app/scripts/comp/app/single-instance-checker.js

@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const Launcher = require('../launcher');
+import Backbone from 'backbone';
+import { Launcher } from 'comp/launcher';
 
 const LocalStorageKeyName = 'instanceCheck';
 const LocalStorageResponseKeyName = 'instanceMaster';
@@ -40,4 +40,4 @@ const SingleInstanceChecker = {
     }
 };
 
-module.exports = SingleInstanceChecker;
+export { SingleInstanceChecker };

app/scripts/comp/app/updater.js

@@ -1,13 +1,13 @@
-const Backbone = require('backbone');
-const RuntimeInfo = require('../app/runtime-info');
-const Links = require('../../const/links');
-const Launcher = require('../launcher');
-const AppSettingsModel = require('../../models/app-settings-model');
-const UpdateModel = require('../../models/update-model');
-const Transport = require('../browser/transport');
-const Logger = require('../../util/logger');
-const SemVer = require('../../util/data/semver');
-const publicKey = require('public-key.pem').default;
+import Backbone from 'backbone';
+import { RuntimeInfo } from 'comp/app/runtime-info';
+import { Transport } from 'comp/browser/transport';
+import { Launcher } from 'comp/launcher';
+import { Links } from 'const/links';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { UpdateModel } from 'models/update-model';
+import { SemVer } from 'util/data/semver';
+import { Logger } from 'util/logger';
+import publicKey from 'public-key.pem';
 
 const logger = new Logger('updater');
 
@@ -273,4 +273,4 @@ const Updater = {
     }
 };
 
-module.exports = Updater;
+export { Updater };

app/scripts/comp/browser/auth-receiver.js

@@ -1,5 +1,5 @@
-const Features = require('../../util/features');
-const Storage = require('../../storage');
+import { Storage } from 'storage';
+import { Features } from 'util/features';
 
 const AuthReceiver = {
     receive() {
@@ -36,4 +36,4 @@ const AuthReceiver = {
     }
 };
 
-module.exports = AuthReceiver;
+export { AuthReceiver };

app/scripts/comp/browser/copy-paste.js

@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const Launcher = require('../launcher');
-const AppSettingsModel = require('../../models/app-settings-model');
+import Backbone from 'backbone';
+import { Launcher } from 'comp/launcher';
+import { AppSettingsModel } from 'models/app-settings-model';
 
 const CopyPaste = {
     simpleCopy: !!(Launcher && Launcher.clipboardSupported),
@@ -68,4 +68,4 @@ const CopyPaste = {
     }
 };
 
-module.exports = CopyPaste;
+export { CopyPaste };

app/scripts/comp/browser/feature-tester.js

@@ -1,5 +1,5 @@
-const kdbxweb = require('kdbxweb');
-const Features = require('../../util/features');
+import kdbxweb from 'kdbxweb';
+import { Features } from 'util/features';
 
 const FeatureTester = {
     test() {
@@ -63,4 +63,4 @@ const FeatureTester = {
     }
 };
 
-module.exports = FeatureTester;
+export { FeatureTester };

app/scripts/comp/browser/focus-detector.js

@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const Features = require('../../util/features');
-const Launcher = require('../launcher');
+import Backbone from 'backbone';
+import { Launcher } from 'comp/launcher';
+import { Features } from 'util/features';
 
 const FocusDetector = {
     init() {
@@ -33,4 +33,4 @@ const FocusDetector = {
     }
 };
 
-module.exports = FocusDetector;
+export { FocusDetector };

app/scripts/comp/browser/idle-tracker.js

@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const AppSettingsModel = require('../../models/app-settings-model');
+import Backbone from 'backbone';
+import { AppSettingsModel } from 'models/app-settings-model';
 
 const IdleTracker = {
     actionTime: Date.now(),
@@ -20,4 +20,4 @@ const IdleTracker = {
 
 Backbone.on('power-monitor-resume', IdleTracker.checkIdle, IdleTracker);
 
-module.exports = IdleTracker;
+export { IdleTracker };

app/scripts/comp/browser/key-handler.js

@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const Keys = require('../../const/keys');
-const IdleTracker = require('./idle-tracker');
+import Backbone from 'backbone';
+import { IdleTracker } from 'comp/browser/idle-tracker';
+import { Keys } from 'const/keys';
 
 const shortcutKeyProp = navigator.platform.indexOf('Mac') >= 0 ? 'metaKey' : 'ctrlKey';
 
@@ -132,4 +132,4 @@ const KeyHandler = {
 
 _.extend(KeyHandler, Backbone.Events);
 
-module.exports = KeyHandler;
+export { KeyHandler };

app/scripts/comp/browser/popup-notifier.js

@@ -1,11 +1,11 @@
-const Backbone = require('backbone');
-const Alerts = require('../ui/alerts');
-const Launcher = require('../launcher');
-const AuthReceiver = require('./auth-receiver');
-const Links = require('../../const/links');
-const Timeouts = require('../../const/timeouts');
-const Locale = require('../../util/locale');
-const Logger = require('../../util/logger');
+import Backbone from 'backbone';
+import { AuthReceiver } from 'comp/browser/auth-receiver';
+import { Launcher } from 'comp/launcher';
+import { Alerts } from 'comp/ui/alerts';
+import { Links } from 'const/links';
+import { Timeouts } from 'const/timeouts';
+import { Locale } from 'util/locale';
+import { Logger } from 'util/logger';
 
 const PopupNotifier = {
     logger: null,
@@ -157,4 +157,4 @@ const PopupNotifier = {
     }
 };
 
-module.exports = PopupNotifier;
+export { PopupNotifier };

app/scripts/comp/browser/secure-input.js

@@ -1,4 +1,4 @@
-const kdbxweb = require('kdbxweb');
+import kdbxweb from 'kdbxweb';
 
 const SecureInput = function() {
     this.el = null;
@@ -97,4 +97,4 @@ Object.defineProperty(SecureInput.prototype, 'value', {
     }
 });
 
-module.exports = SecureInput;
+export { SecureInput };

app/scripts/comp/browser/transport.js

@@ -1,5 +1,5 @@
-const Launcher = require('../launcher');
-const Logger = require('../../util/logger');
+import { Launcher } from 'comp/launcher';
+import { Logger } from 'util/logger';
 
 const logger = new Logger('transport');
 
@@ -89,4 +89,4 @@ const Transport = {
     }
 };
 
-module.exports = Transport;
+export { Transport };

app/scripts/comp/format/kdbx-to-html.js

@@ -1,10 +1,10 @@
-const kdbxweb = require('kdbxweb');
-const StringFormat = require('../../util/formatting/string-format');
-const DateFormat = require('../../util/formatting/date-format');
-const Locale = require('../../util/locale');
-const MdToHtml = require('../../util/formatting/md-to-html');
-const Links = require('../../const/links');
-const RuntimeInfo = require('../app/runtime-info');
+import kdbxweb from 'kdbxweb';
+import { RuntimeInfo } from 'comp/app/runtime-info';
+import { Links } from 'const/links';
+import { DateFormat } from 'util/formatting/date-format';
+import { MdToHtml } from 'util/formatting/md-to-html';
+import { StringFormat } from 'util/formatting/string-format';
+import { Locale } from 'util/locale';
 
 const Templates = {
     db: require('templates/export/db.hbs'),
@@ -123,4 +123,4 @@ const KdbxToHtml = {
     }
 };
 
-module.exports = KdbxToHtml;
+export { KdbxToHtml };

app/scripts/comp/format/otp-qr-reader.js

@@ -1,11 +1,11 @@
-const Backbone = require('backbone');
-const Alerts = require('../ui/alerts');
-const Locale = require('../../util/locale');
-const Logger = require('../../util/logger');
-const Features = require('../../util/features');
-const Shortcuts = require('../../comp/app/shortcuts');
-const Otp = require('../../util/data/otp');
-const QrCode = require('jsqrcode');
+import Backbone from 'backbone';
+import QrCode from 'jsqrcode';
+import { Shortcuts } from 'comp/app/shortcuts';
+import { Alerts } from 'comp/ui/alerts';
+import { Otp } from 'util/data/otp';
+import { Features } from 'util/features';
+import { Locale } from 'util/locale';
+import { Logger } from 'util/logger';
 
 const logger = new Logger('otp-qr-reader');
 
@@ -63,10 +63,6 @@ const OtpQrReader = {
                 }
             }
         });
-        // transparent window with QR scanner - is it better? check usability of this
-        // var BrowserWindow = require('../../comp/launcher').remReq('browser-window');
-        // new BrowserWindow({ width: 800, height: 600, show: false, alwaysOnTop: true, backgroundColor: '#80FFFFFF',
-        //     transparent: true }).show();
     },
 
     selectFile() {
@@ -181,4 +177,4 @@ const OtpQrReader = {
 
 _.extend(OtpQrReader, Backbone.Events);
 
-module.exports = OtpQrReader;
+export { OtpQrReader };

app/scripts/comp/launcher/index.js

@@ -1,9 +1,9 @@
 let Launcher;
 
 if (window.process && window.process.versions && window.process.versions.electron) {
-    Launcher = require('./launcher-electron');
+    Launcher = require('./launcher-electron').Launcher;
 } else if (window.cordova) {
-    // Launcher = require('./launcher-cordova'); // commented out, while we don't support cordova
+    // Launcher = require('./launcher-cordova').Launcher; // commented out, while we don't support cordova
 }
 
-module.exports = Launcher;
+export { Launcher };

app/scripts/comp/launcher/launcher-cordova.js

@@ -1,6 +1,6 @@
 /* global FingerprintAuth */
 
-const Backbone = require('backbone');
+import Backbone from 'backbone';
 
 const Launcher = {
     name: 'cordova',
@@ -295,4 +295,4 @@ const Launcher = {
     }
 };
 
-module.exports = Launcher;
+export { Launcher };

app/scripts/comp/launcher/launcher-electron.js

@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const Locale = require('../../util/locale');
-const Logger = require('../../util/logger');
+import Backbone from 'backbone';
+import { Locale } from 'util/locale';
+import { Logger } from 'util/logger';
 
 const logger = new Logger('launcher');
 
@@ -309,4 +309,4 @@ if (window.launcherOpenedFile) {
 }
 Backbone.on('app-ready', () => setTimeout(() => Launcher.checkOpenFiles(), 0));
 
-module.exports = Launcher;
+export { Launcher };

app/scripts/comp/settings/settings-manager.js

@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const Locale = require('../../util/locale');
-const Features = require('../../util/features');
+import Backbone from 'backbone';
+import { Features } from 'util/features';
+import { Locale } from 'util/locale';
 
 const appleThemes = {
     macdark: 'setGenThemeMacDark'
@@ -97,4 +97,4 @@ const SettingsManager = {
     }
 };
 
-module.exports = SettingsManager;
+export { SettingsManager };

app/scripts/comp/settings/settings-store.js

@@ -1,6 +1,6 @@
-const Launcher = require('../launcher');
-const StringFormat = require('../../util/formatting/string-format');
-const Logger = require('../../util/logger');
+import { Launcher } from 'comp/launcher';
+import { StringFormat } from 'util/formatting/string-format';
+import { Logger } from 'util/logger';
 
 const logger = new Logger('settings');
 
@@ -61,4 +61,4 @@ const SettingsStore = {
     }
 };
 
-module.exports = SettingsStore;
+export { SettingsStore };

app/scripts/comp/ui/alerts.js

@@ -1,5 +1,5 @@
-const ModalView = require('../../views/modal-view');
-const Locale = require('../../util/locale');
+import { Locale } from 'util/locale';
+import { ModalView } from 'views/modal-view';
 
 const Alerts = {
     alertDisplayed: false,
@@ -117,4 +117,4 @@ const Alerts = {
     }
 };
 
-module.exports = Alerts;
+export { Alerts };

app/scripts/const/colors.js

@@ -20,4 +20,4 @@ const Colors = {
     }
 };
 
-module.exports = Colors;
+export { Colors };

app/scripts/const/icon-map.js

@@ -70,4 +70,4 @@ const IconMap = [
     'mobile'
 ];
 
-module.exports = IconMap;
+export { IconMap };

app/scripts/const/keys.js

@@ -116,4 +116,4 @@ const Keys = {
     DOM_VK_META: 224
 };
 
-module.exports = Keys;
+export { Keys };

app/scripts/const/links.js

@@ -17,4 +17,4 @@ const Links = {
     PluginDevelopStart: 'https://github.com/keeweb/keeweb/wiki/Plugins'
 };
 
-module.exports = Links;
+export { Links };

app/scripts/const/timeouts.js

@@ -14,4 +14,4 @@ const Timeouts = {
     LinkDownloadRevoke: 10 * 1000 * 60
 };
 
-module.exports = Timeouts;
+export { Timeouts };

app/scripts/hbs-helpers/add.js

@@ -1,4 +1,4 @@
-const Handlebars = require('hbs');
+import Handlebars from 'hbs';
 
 // inspired by https://stackoverflow.com/questions/22103989/adding-offset-to-index-when-looping-through-items-in-handlebars/39588001#39588001
 Handlebars.registerHelper('add', (lvalue, rvalue) => parseInt(lvalue) + parseInt(rvalue));

app/scripts/hbs-helpers/cmp.js

@@ -1,4 +1,4 @@
-const Handlebars = require('hbs');
+import Handlebars from 'hbs';
 
 Handlebars.registerHelper('cmp', function(lvalue, rvalue, op, options) {
     let cond;

app/scripts/hbs-helpers/ifemptyoreq.js

@@ -1,4 +1,4 @@
-const Handlebars = require('hbs');
+import Handlebars from 'hbs';
 
 Handlebars.registerHelper('ifemptyoreq', function(lvalue, rvalue, options) {
     return !lvalue || lvalue === rvalue ? options.fn(this) : options.inverse(this);

app/scripts/hbs-helpers/ifeq.js

@@ -1,4 +1,4 @@
-const Handlebars = require('hbs');
+import Handlebars from 'hbs';
 
 Handlebars.registerHelper('ifeq', function(lvalue, rvalue, options) {
     return lvalue === rvalue ? options.fn(this) : options.inverse(this);

app/scripts/hbs-helpers/ifneq.js

@@ -1,4 +1,4 @@
-const Handlebars = require('hbs');
+import Handlebars from 'hbs';
 
 Handlebars.registerHelper('ifneq', function(lvalue, rvalue, options) {
     return lvalue !== rvalue ? options.fn(this) : options.inverse(this);

app/scripts/hbs-helpers/index.js

@@ -1,6 +1,6 @@
-require('./add');
-require('./cmp');
-require('./ifeq');
-require('./ifneq');
-require('./ifemptyoreq');
-require('./res');
+import 'hbs-helpers/add';
+import 'hbs-helpers/cmp';
+import 'hbs-helpers/ifeq';
+import 'hbs-helpers/ifneq';
+import 'hbs-helpers/ifemptyoreq';
+import 'hbs-helpers/res';

app/scripts/hbs-helpers/res.js

@@ -1,5 +1,5 @@
-const Handlebars = require('hbs');
-const Locale = require('../util/locale');
+import Handlebars from 'hbs';
+import { Locale } from 'util/locale';
 
 Handlebars.registerHelper('res', function(key, options) {
     let value = Locale[key];

app/scripts/models/app-model.js

@@ -1,27 +1,26 @@
-const Backbone = require('backbone');
-const AppSettingsModel = require('./app-settings-model');
-const MenuModel = require('./menu/menu-model');
-const EntryModel = require('./entry-model');
-const GroupModel = require('./group-model');
-const FileCollection = require('../collections/file-collection');
-const EntryCollection = require('../collections/entry-collection');
-const FileInfoCollection = require('../collections/file-info-collection');
-const FileModel = require('./file-model');
-const FileInfoModel = require('./file-info-model');
-const Storage = require('../storage');
-const Timeouts = require('../const/timeouts');
-const IdGenerator = require('../util/generators/id-generator');
-const Logger = require('../util/logger');
-const Features = require('../util/features');
-const DateFormat = require('../util/formatting/date-format');
-const UrlFormat = require('../util/formatting/url-format');
-const AutoType = require('../auto-type');
-const Launcher = require('../comp/launcher');
-const RuntimeInfo = require('../comp/app/runtime-info');
-const PluginManager = require('../plugins/plugin-manager');
-const Locale = require('../util/locale');
-
-require('../util/kdbxweb/protected-value-ex');
+import { AutoType } from 'auto-type';
+import Backbone from 'backbone';
+import { Storage } from 'storage';
+import { EntryCollection } from 'collections/entry-collection';
+import { FileCollection } from 'collections/file-collection';
+import { FileInfoCollection } from 'collections/file-info-collection';
+import { RuntimeInfo } from 'comp/app/runtime-info';
+import { Launcher } from 'comp/launcher';
+import { Timeouts } from 'const/timeouts';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { EntryModel } from 'models/entry-model';
+import { FileInfoModel } from 'models/file-info-model';
+import { FileModel } from 'models/file-model';
+import { GroupModel } from 'models/group-model';
+import { MenuModel } from 'models/menu/menu-model';
+import { PluginManager } from 'plugins/plugin-manager';
+import { Features } from 'util/features';
+import { DateFormat } from 'util/formatting/date-format';
+import { UrlFormat } from 'util/formatting/url-format';
+import { IdGenerator } from 'util/generators/id-generator';
+import { Locale } from 'util/locale';
+import { Logger } from 'util/logger';
+import 'util/kdbxweb/protected-value-ex';
 
 const AppModel = Backbone.Model.extend({
     defaults: {},
@@ -1163,4 +1162,4 @@ const AppModel = Backbone.Model.extend({
     }
 });
 
-module.exports = AppModel;
+export { AppModel };

app/scripts/models/app-settings-model.js

@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const SettingsStore = require('../comp/settings/settings-store');
+import Backbone from 'backbone';
+import { SettingsStore } from 'comp/settings/settings-store';
 
 const AppSettingsModel = Backbone.Model.extend({
     defaults: {
@@ -80,4 +80,4 @@ const AppSettingsModel = Backbone.Model.extend({
 
 AppSettingsModel.instance = new AppSettingsModel();
 
-module.exports = AppSettingsModel;
+export { AppSettingsModel };

app/scripts/models/attachment-model.js

@@ -1,4 +1,4 @@
-const Backbone = require('backbone');
+import Backbone from 'backbone';
 
 const AttachmentModel = Backbone.Model.extend({
     defaults: {},
@@ -168,4 +168,4 @@ AttachmentModel.fromAttachment = function(att) {
     return model;
 };
 
-module.exports = AttachmentModel;
+export { AttachmentModel };

app/scripts/models/entry-model.js

@@ -1,12 +1,12 @@
-const Backbone = require('backbone');
-const AttachmentModel = require('./attachment-model');
-const IconMap = require('../const/icon-map');
-const Color = require('../util/data/color');
-const IconUrlFormat = require('../util/formatting/icon-url-format');
-const Otp = require('../util/data/otp');
-const kdbxweb = require('kdbxweb');
-const Ranking = require('../util/data/ranking');
-const KdbxToHtml = require('../comp/format/kdbx-to-html');
+import Backbone from 'backbone';
+import kdbxweb from 'kdbxweb';
+import { KdbxToHtml } from 'comp/format/kdbx-to-html';
+import { IconMap } from 'const/icon-map';
+import { AttachmentModel } from 'models/attachment-model';
+import { Color } from 'util/data/color';
+import { Otp } from 'util/data/otp';
+import { Ranking } from 'util/data/ranking';
+import { IconUrlFormat } from 'util/formatting/icon-url-format';
 
 const EntryModel = Backbone.Model.extend({
     defaults: {},
@@ -731,4 +731,4 @@ EntryModel.newEntry = function(group, file) {
     return model;
 };
 
-module.exports = EntryModel;
+export { EntryModel };

app/scripts/models/file-info-model.js

@@ -1,4 +1,4 @@
-const Backbone = require('backbone');
+import Backbone from 'backbone';
 
 const FileInfoModel = Backbone.Model.extend({
     defaults: {
@@ -31,4 +31,4 @@ const FileInfoModel = Backbone.Model.extend({
     }
 });
 
-module.exports = FileInfoModel;
+export { FileInfoModel };

app/scripts/models/file-model.js

@@ -1,11 +1,11 @@
-const Backbone = require('backbone');
-const GroupCollection = require('../collections/group-collection');
-const GroupModel = require('./group-model');
-const IconUrlFormat = require('../util/formatting/icon-url-format');
-const Logger = require('../util/logger');
-const KdbxToHtml = require('../comp/format/kdbx-to-html');
-const kdbxweb = require('kdbxweb');
-const demoFileData = require('demo.kdbx');
+import Backbone from 'backbone';
+import kdbxweb from 'kdbxweb';
+import demoFileData from 'demo.kdbx';
+import { GroupCollection } from 'collections/group-collection';
+import { KdbxToHtml } from 'comp/format/kdbx-to-html';
+import { GroupModel } from 'models/group-model';
+import { IconUrlFormat } from 'util/formatting/icon-url-format';
+import { Logger } from 'util/logger';
 
 const logger = new Logger('file');
 
@@ -713,4 +713,4 @@ FileModel.createKeyFileWithHash = function(hash) {
     return kdbxweb.Credentials.createKeyFileWithHash(hash);
 };
 
-module.exports = FileModel;
+export { FileModel };

app/scripts/models/group-model.js

@@ -1,11 +1,12 @@
-const MenuItemModel = require('./menu/menu-item-model');
-const EntryModel = require('../models/entry-model');
-const IconMap = require('../const/icon-map');
-const IconUrlFormat = require('../util/formatting/icon-url-format');
-const kdbxweb = require('kdbxweb');
+import kdbxweb from 'kdbxweb';
+import { IconMap } from 'const/icon-map';
+import { EntryModel } from 'models/entry-model';
+import { MenuItemModel } from 'models/menu/menu-item-model';
+import { IconUrlFormat } from 'util/formatting/icon-url-format';
+import { GroupCollection } from 'collections/group-collection';
+import { EntryCollection } from 'collections/entry-collection';
+
 const KdbxIcons = kdbxweb.Consts.Icons;
-let GroupCollection;
-let EntryCollection;
 
 const DefaultAutoTypeSequence = '{USERNAME}{TAB}{PASSWORD}{ENTER}';
 
@@ -23,15 +24,6 @@ const GroupModel = MenuItemModel.extend({
         autoTypeSeq: null
     }),
 
-    initialize() {
-        if (!GroupCollection) {
-            GroupCollection = require('../collections/group-collection');
-        }
-        if (!EntryCollection) {
-            EntryCollection = require('../collections/entry-collection');
-        }
-    },
-
     setGroup(group, file, parentGroup) {
         const isRecycleBin = group.uuid.equals(file.db.meta.recycleBinUuid);
         const id = file.subId(group.uuid.id);
@@ -362,4 +354,4 @@ GroupModel.newGroup = function(group, file) {
     return model;
 };
 
-module.exports = GroupModel;
+export { GroupModel };

app/scripts/models/menu/groups-menu-model.js

@@ -1,5 +1,5 @@
-const MenuSectionModel = require('./menu-section-model');
-const GroupCollection = require('../../collections/group-collection');
+import { GroupCollection } from 'collections/group-collection';
+import { MenuSectionModel } from 'models/menu/menu-section-model';
 
 const GroupsMenuModel = MenuSectionModel.extend({
     defaults: _.extend({}, MenuSectionModel.prototype.defaults, {
@@ -12,8 +12,8 @@ const GroupsMenuModel = MenuSectionModel.extend({
     },
 
     _loadItemCollectionType() {
-        return require('../../collections/group-collection');
+        return require('collections/group-collection').GroupCollection;
     }
 });
 
-module.exports = GroupsMenuModel;
+export { GroupsMenuModel };

app/scripts/models/menu/menu-item-model.js

@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const MenuOptionCollection = require('../../collections/menu/menu-option-collection');
+import Backbone from 'backbone';
+import { MenuOptionCollection } from 'collections/menu/menu-option-collection';
 let ItemCollection;
 
 const MenuItemModel = Backbone.Model.extend({
@@ -29,7 +29,7 @@ const MenuItemModel = Backbone.Model.extend({
     },
 
     _loadItemCollectionType() {
-        return require('../../collections/menu/menu-item-collection');
+        return require('collections/menu/menu-item-collection').MenuItemCollection;
     },
 
     addItem(item) {
@@ -67,4 +67,4 @@ const MenuItemModel = Backbone.Model.extend({
     }
 });
 
-module.exports = MenuItemModel;
+export { MenuItemModel };

app/scripts/models/menu/menu-model.js

@@ -1,11 +1,11 @@
-const Backbone = require('backbone');
-const MenuSectionCollection = require('../../collections/menu/menu-section-collection');
-const MenuSectionModel = require('./menu-section-model');
-const GroupsMenuModel = require('./groups-menu-model');
-const Locale = require('../../util/locale');
-const StringFormat = require('../../util/formatting/string-format');
-const Keys = require('../../const/keys');
-const Colors = require('../../const/colors');
+import Backbone from 'backbone';
+import { MenuSectionCollection } from 'collections/menu/menu-section-collection';
+import { Colors } from 'const/colors';
+import { Keys } from 'const/keys';
+import { GroupsMenuModel } from 'models/menu/groups-menu-model';
+import { MenuSectionModel } from 'models/menu/menu-section-model';
+import { StringFormat } from 'util/formatting/string-format';
+import { Locale } from 'util/locale';
 
 const MenuModel = Backbone.Model.extend({
     defaults: {
@@ -220,4 +220,4 @@ const MenuModel = Backbone.Model.extend({
     }
 });
 
-module.exports = MenuModel;
+export { MenuModel };

app/scripts/models/menu/menu-option-model.js

@@ -1,4 +1,4 @@
-const Backbone = require('backbone');
+import Backbone from 'backbone';
 
 const MenuOptionModel = Backbone.Model.extend({
     defaults: {
@@ -10,4 +10,4 @@ const MenuOptionModel = Backbone.Model.extend({
     }
 });
 
-module.exports = MenuOptionModel;
+export { MenuOptionModel };

app/scripts/models/menu/menu-section-model.js

@@ -1,7 +1,7 @@
-const Backbone = require('backbone');
-const MenuItemCollection = require('../../collections/menu/menu-item-collection');
+import Backbone from 'backbone';
+import { MenuItemCollection } from 'collections/menu/menu-item-collection';
 
-const MenuItemModel = Backbone.Model.extend({
+const MenuSectionModel = Backbone.Model.extend({
     defaults: {
         items: null,
         scrollable: false,
@@ -56,4 +56,4 @@ const MenuItemModel = Backbone.Model.extend({
     }
 });
 
-module.exports = MenuItemModel;
+export { MenuSectionModel };

app/scripts/models/runtime-data-model.js

@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const SettingsStore = require('../comp/settings/settings-store');
+import Backbone from 'backbone';
+import { SettingsStore } from 'comp/settings/settings-store';
 
 const RuntimeDataModel = Backbone.Model.extend({
     defaults: {},
@@ -27,4 +27,4 @@ const RuntimeDataModel = Backbone.Model.extend({
 
 RuntimeDataModel.instance = new RuntimeDataModel();
 
-module.exports = RuntimeDataModel;
+export { RuntimeDataModel };

app/scripts/models/update-model.js

@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const SettingsStore = require('../comp/settings/settings-store');
+import Backbone from 'backbone';
+import { SettingsStore } from 'comp/settings/settings-store';
 
 const UpdateModel = Backbone.Model.extend({
     defaults: {
@@ -47,4 +47,4 @@ const UpdateModel = Backbone.Model.extend({
 
 UpdateModel.instance = new UpdateModel();
 
-module.exports = UpdateModel;
+export { UpdateModel };

app/scripts/plugins/plugin-api.js

@@ -16,4 +16,4 @@ const PluginApi = {
     }
 };
 
-module.exports = PluginApi;
+export { PluginApi };

app/scripts/plugins/plugin-collection.js

@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const Plugin = require('./plugin');
+import Backbone from 'backbone';
+import { Plugin } from 'plugins/plugin';
 
 const PluginCollection = Backbone.Collection.extend({
     model: Plugin
 });
 
-module.exports = PluginCollection;
+export { PluginCollection };

app/scripts/plugins/plugin-gallery.js

@@ -1,9 +1,9 @@
-const Backbone = require('backbone');
-const kdbxweb = require('kdbxweb');
-const Links = require('../const/links');
-const SignatureVerifier = require('../util/data/signature-verifier');
-const Logger = require('../util/logger');
-const SettingsStore = require('../comp/settings/settings-store');
+import Backbone from 'backbone';
+import kdbxweb from 'kdbxweb';
+import { SettingsStore } from 'comp/settings/settings-store';
+import { Links } from 'const/links';
+import { SignatureVerifier } from 'util/data/signature-verifier';
+import { Logger } from 'util/logger';
 
 const PluginGallery = {
     logger: new Logger('plugin-gallery'),
@@ -85,4 +85,4 @@ const PluginGallery = {
     }
 };
 
-module.exports = PluginGallery;
+export { PluginGallery };

app/scripts/plugins/plugin-manager.js

@@ -1,11 +1,11 @@
-const Backbone = require('backbone');
-const Plugin = require('./plugin');
-const PluginCollection = require('./plugin-collection');
-const PluginGallery = require('./plugin-gallery');
-const SettingsStore = require('../comp/settings/settings-store');
-const RuntimeInfo = require('../comp/app/runtime-info');
-const SignatureVerifier = require('../util/data/signature-verifier');
-const Logger = require('../util/logger');
+import Backbone from 'backbone';
+import { RuntimeInfo } from 'comp/app/runtime-info';
+import { SettingsStore } from 'comp/settings/settings-store';
+import { Plugin } from 'plugins/plugin';
+import { PluginCollection } from 'plugins/plugin-collection';
+import { PluginGallery } from 'plugins/plugin-gallery';
+import { SignatureVerifier } from 'util/data/signature-verifier';
+import { Logger } from 'util/logger';
 
 const PluginManager = Backbone.Model.extend({
     UpdateInterval: 1000 * 60 * 60 * 24 * 7,
@@ -235,4 +235,4 @@ const PluginManager = Backbone.Model.extend({
 
 PluginManager.instance = new PluginManager();
 
-module.exports = PluginManager;
+export { PluginManager };

app/scripts/plugins/plugin.js

@@ -1,15 +1,15 @@
-const kdbxweb = require('kdbxweb');
-const Backbone = require('backbone');
-const PluginApi = require('./plugin-api');
-const ThemeVars = require('./theme-vars');
-const Logger = require('../util/logger');
-const SettingsManager = require('../comp/settings/settings-manager');
-const IoCache = require('../storage/io-cache');
-const AppSettingsModel = require('../models/app-settings-model');
-const BaseLocale = require('../locales/base.json');
-const SignatureVerifier = require('../util/data/signature-verifier');
-const SemVer = require('../util/data/semver');
-const RuntimeInfo = require('../comp/app/runtime-info');
+import Backbone from 'backbone';
+import kdbxweb from 'kdbxweb';
+import BaseLocale from 'locales/base.json';
+import { RuntimeInfo } from 'comp/app/runtime-info';
+import { SettingsManager } from 'comp/settings/settings-manager';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { PluginApi } from 'plugins/plugin-api';
+import { ThemeVars } from 'plugins/theme-vars';
+import { IoCache } from 'storage/io-cache';
+import { SemVer } from 'util/data/semver';
+import { SignatureVerifier } from 'util/data/signature-verifier';
+import { Logger } from 'util/logger';
 
 const commonLogger = new Logger('plugin');
 const io = new IoCache({
@@ -692,4 +692,4 @@ function httpGet(url, binary) {
     });
 }
 
-module.exports = Plugin;
+export { Plugin };

app/scripts/plugins/theme-vars.js

@@ -1,6 +1,7 @@
+import { Color } from 'util/data/color';
+
 const ThemeVarsScss = require('raw-loader!../../styles/base/_theme-vars.scss').default;
 const ThemeDefaults = require('../../styles/themes/_theme-defaults.scss');
-const Color = require('../util/data/color');
 
 const ThemeVars = {
     themeDefaults: null,
@@ -118,4 +119,4 @@ const ThemeVars = {
     }
 };
 
-module.exports = ThemeVars;
+export { ThemeVars };

app/scripts/presenters/entry-presenter.js

@@ -1,5 +1,5 @@
-const DateFormat = require('../util/formatting/date-format');
-const Locale = require('../util/locale');
+import { DateFormat } from 'util/formatting/date-format';
+import { Locale } from 'util/locale';
 
 const EntryPresenter = function(descField, noColor, activeEntryId) {
     this.entry = null;
@@ -88,4 +88,4 @@ EntryPresenter.prototype = {
     }
 };
 
-module.exports = EntryPresenter;
+export { EntryPresenter };

app/scripts/storage/impl/storage-cache.js

@@ -1,5 +1,5 @@
-const StorageBase = require('../storage-base');
-const IoBrowserCache = require('../io-browser-cache');
+import { IoBrowserCache } from 'storage/io-browser-cache';
+import { StorageBase } from 'storage/storage-base';
 
 const StorageCache = StorageBase.extend({
     name: 'cache',
@@ -29,4 +29,4 @@ const StorageCache = StorageBase.extend({
     }
 });
 
-module.exports = StorageCache;
+export { StorageCache };

app/scripts/storage/impl/storage-dropbox.js

@@ -1,6 +1,6 @@
-const StorageBase = require('../storage-base');
-const UrlFormat = require('../../util/formatting/url-format');
-const Features = require('../../util/features');
+import { StorageBase } from 'storage/storage-base';
+import { Features } from 'util/features';
+import { UrlFormat } from 'util/formatting/url-format';
 
 const DropboxKeys = {
     AppFolder: 'qp7ctun6qt5n9d6',
@@ -376,4 +376,4 @@ const StorageDropbox = StorageBase.extend({
     }
 });
 
-module.exports = StorageDropbox;
+export { StorageDropbox };

app/scripts/storage/impl/storage-file-cache.js

@@ -1,5 +1,5 @@
-const StorageBase = require('../storage-base');
-const Launcher = require('../../comp/launcher');
+import { Launcher } from 'comp/launcher';
+import { StorageBase } from 'storage/storage-base';
 
 const StorageFileCache = StorageBase.extend({
     name: 'cache',
@@ -104,4 +104,4 @@ const StorageFileCache = StorageBase.extend({
     }
 });
 
-module.exports = StorageFileCache;
+export { StorageFileCache };

app/scripts/storage/impl/storage-file.js

@@ -1,5 +1,5 @@
-const StorageBase = require('../storage-base');
-const Launcher = require('../../comp/launcher');
+import { Launcher } from 'comp/launcher';
+import { StorageBase } from 'storage/storage-base';
 
 const fileWatchers = {};
 
@@ -178,4 +178,4 @@ const StorageFile = StorageBase.extend({
     }
 });
 
-module.exports = StorageFile;
+export { StorageFile };

app/scripts/storage/impl/storage-gdrive.js

@@ -1,5 +1,5 @@
-const StorageBase = require('../storage-base');
-const Locale = require('../../util/locale');
+import { StorageBase } from 'storage/storage-base';
+import { Locale } from 'util/locale';
 
 const GDriveClientId = {
     Local: '783608538594-36tkdh8iscrq8t8dq87gghubnhivhjp5.apps.googleusercontent.com',
@@ -255,4 +255,4 @@ const StorageGDrive = StorageBase.extend({
     }
 });
 
-module.exports = StorageGDrive;
+export { StorageGDrive };

app/scripts/storage/impl/storage-onedrive.js

@@ -1,4 +1,4 @@
-const StorageBase = require('../storage-base');
+import { StorageBase } from 'storage/storage-base';
 
 const OneDriveClientId = {
     Production: '000000004818ED3A',
@@ -277,4 +277,4 @@ if (document.querySelectorAll(selector).length === 1) document.querySelector(sel
     }
 });
 
-module.exports = StorageOneDrive;
+export { StorageOneDrive };

app/scripts/storage/impl/storage-webdav.js

@@ -1,4 +1,4 @@
-const StorageBase = require('../storage-base');
+import { StorageBase } from 'storage/storage-base';
 
 const StorageWebDav = StorageBase.extend({
     name: 'webdav',
@@ -386,4 +386,4 @@ const StorageWebDav = StorageBase.extend({
     }
 });
 
-module.exports = StorageWebDav;
+export { StorageWebDav };

app/scripts/storage/index.js

@@ -1,11 +1,11 @@
-const Launcher = require('../comp/launcher');
-const StorageFile = require('./impl/storage-file');
-const StorageFileCache = require('./impl/storage-file-cache');
-const StorageCache = require('./impl/storage-cache');
-const StorageDropbox = require('./impl/storage-dropbox');
-const StorageGDrive = require('./impl/storage-gdrive');
-const StorageOneDrive = require('./impl/storage-onedrive');
-const StorageWebDav = require('./impl/storage-webdav');
+import { Launcher } from 'comp/launcher';
+import { StorageCache } from 'storage/impl/storage-cache';
+import { StorageDropbox } from 'storage/impl/storage-dropbox';
+import { StorageFile } from 'storage/impl/storage-file';
+import { StorageFileCache } from 'storage/impl/storage-file-cache';
+import { StorageGDrive } from 'storage/impl/storage-gdrive';
+import { StorageOneDrive } from 'storage/impl/storage-onedrive';
+import { StorageWebDav } from 'storage/impl/storage-webdav';
 
 const BuiltInStorage = {
     file: new StorageFile(),
@@ -19,9 +19,9 @@ const ThirdPartyStorage = {
     webdav: new StorageWebDav()
 };
 
-const storage = BuiltInStorage;
+const Storage = BuiltInStorage;
 if (!Launcher || Launcher.thirdPartyStoragesSupported) {
-    _.extend(storage, ThirdPartyStorage);
+    _.extend(Storage, ThirdPartyStorage);
 }
 
-module.exports = storage;
+export { Storage };

app/scripts/storage/io-browser-cache.js

@@ -137,4 +137,4 @@ _.extend(IoBrowserCache.prototype, {
     }
 });
 
-module.exports = IoBrowserCache;
+export { IoBrowserCache };

app/scripts/storage/io-cache.js

@@ -1,5 +1,7 @@
-const Launcher = require('../comp/launcher');
+import { Launcher } from 'comp/launcher';
+import { IoFileCache } from 'storage/io-file-cache';
+import { IoBrowserCache } from 'storage/io-browser-cache';
 
-const IoCache = Launcher ? require('./io-file-cache') : require('./io-browser-cache');
+const IoCache = Launcher ? IoFileCache : IoBrowserCache;
 
-module.exports = IoCache;
+export { IoCache };

app/scripts/storage/io-file-cache.js

@@ -1,4 +1,4 @@
-const Launcher = require('../comp/launcher');
+import { Launcher } from 'comp/launcher';
 
 const IoFileCache = function(config) {
     this.basePath = null;
@@ -99,4 +99,4 @@ _.extend(IoFileCache.prototype, {
     }
 });
 
-module.exports = IoFileCache;
+export { IoFileCache };

app/scripts/storage/storage-base.js

@@ -1,9 +1,9 @@
-const Backbone = require('backbone');
-const Logger = require('../util/logger');
-const AppSettingsModel = require('../models/app-settings-model');
-const RuntimeDataModel = require('../models/runtime-data-model');
-const Links = require('../const/links');
-const Features = require('../util/features');
+import Backbone from 'backbone';
+import { Links } from 'const/links';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { RuntimeDataModel } from 'models/runtime-data-model';
+import { Features } from 'util/features';
+import { Logger } from 'util/logger';
 
 const MaxRequestRetries = 3;
 
@@ -267,4 +267,4 @@ _.extend(StorageBase.prototype, {
 
 StorageBase.extend = Backbone.Model.extend;
 
-module.exports = StorageBase;
+export { StorageBase };

app/scripts/util/data/color.js

@@ -1,4 +1,4 @@
-const Colors = require('../../const/colors');
+import { Colors } from 'const/colors';
 
 const KnownColors = {};
 
@@ -130,4 +130,4 @@ function hex(num) {
     return str.length < 2 ? '0' + str : str;
 }
 
-module.exports = Color;
+export { Color };

app/scripts/util/data/comparators.js

@@ -37,4 +37,4 @@ const Comparators = {
     }
 };
 
-module.exports = Comparators;
+export { Comparators };

app/scripts/util/data/otp.js

@@ -1,4 +1,4 @@
-const Logger = require('../logger');
+import { Logger } from 'util/logger';
 
 const logger = new Logger('otp');
 
@@ -148,4 +148,4 @@ Otp.makeUrl = function(secret, period, digits) {
     );
 };
 
-module.exports = Otp;
+export { Otp };

app/scripts/util/data/ranking.js

@@ -33,4 +33,4 @@ function indexOf(target, search) {
 
 window.Ranking = Ranking;
 
-module.exports = Ranking;
+export { Ranking };

app/scripts/util/data/semver.js

@@ -16,4 +16,4 @@ const SemVer = {
     }
 };
 
-module.exports = SemVer;
+export { SemVer };

app/scripts/util/data/signature-verifier.js

@@ -1,6 +1,6 @@
-const Logger = require('../logger');
-const publicKey = require('public-key.pem').default;
-const kdbxweb = require('kdbxweb');
+import kdbxweb from 'kdbxweb';
+import { Logger } from 'util/logger';
+import publicKey from 'public-key.pem';
 
 const SignatureVerifier = {
     logger: new Logger('signature-verifier'),
@@ -62,4 +62,4 @@ const SignatureVerifier = {
     }
 };
 
-module.exports = SignatureVerifier;
+export { SignatureVerifier };

app/scripts/util/features.js

@@ -37,4 +37,4 @@ const Features = {
     }
 };
 
-module.exports = Features;
+export { Features };