[WIP] extensions: Simplify code used for loading xlets, improve startup speed, fix backtrace uselessness.

files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js

@@ -8,12 +8,14 @@ const Util = imports.misc.util;
 const PopupMenu = imports.ui.popupMenu;
 const UPowerGlib = imports.gi.UPowerGlib;
 const Settings = imports.ui.settings;
-const Calendar = require('./calendar');
-const EventView = require('./eventView');
 const CinnamonDesktop = imports.gi.CinnamonDesktop;
 const Main = imports.ui.main;
 const Separator = imports.ui.separator;
 
+const Me = imports.ui.extension.getCurrentExtension();
+const Calendar = Me.imports.calendar;
+const EventView = Me.imports.eventView;
+
 const DAY_FORMAT = CinnamonDesktop.WallClock.lctime_format("cinnamon", "%A");
 const DATE_FORMAT_SHORT = CinnamonDesktop.WallClock.lctime_format("cinnamon", _("%B %-e, %Y"));
 const DATE_FORMAT_FULL = CinnamonDesktop.WallClock.lctime_format("cinnamon", _("%A, %B %-e, %Y"));

files/usr/share/cinnamon/applets/calendar@cinnamon.org/calendar.js

@@ -145,7 +145,7 @@ function _dateIntervalsOverlap(a0, a1, b0, b1)
         return true;
 }
 
-class Calendar {
+var Calendar = class Calendar {
     constructor(settings, events_manager) {
         this.events_manager = events_manager;
         this._weekStart = Cinnamon.util_get_week_start();

files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js

@@ -290,7 +290,7 @@ class EventDataList {
     }
 }
 
-class EventsManager {
+var EventsManager = class EventsManager {
     constructor(settings, desktop_settings) {
         this.settings = settings;
         this.desktop_settings = desktop_settings;

files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/appGroup.js

@@ -12,16 +12,17 @@ const Mainloop = imports.mainloop;
 const {SignalManager} = imports.misc.signalManager;
 const {unref} = imports.misc.util;
 
-const createStore = require('./state');
-const {AppMenuButtonRightClickMenu, HoverMenuController, AppThumbnailHoverMenu} = require('./menus');
+const Me = imports.ui.extension.getCurrentExtension();
+const {createStore} = Me.imports.state;
+const {AppMenuButtonRightClickMenu, HoverMenuController, AppThumbnailHoverMenu} = Me.imports.menus;
 const {
     FLASH_INTERVAL,
     FLASH_MAX_COUNT,
     MAX_BUTTON_WIDTH,
     BUTTON_BOX_ANIMATION_TIME,
     RESERVE_KEYS,
     TitleDisplay
-} = require('./constants');
+} = Me.imports.constants;
 
 const _reLetterRtl = new RegExp("\\p{Script=Hebrew}|\\p{Script=Arabic}", "u");
 const _reLetter = new RegExp("\\p{L}", "u");
@@ -60,7 +61,7 @@ const getFocusState = function(metaWindow) {
     return false;
 };
 
-class AppGroup {
+var AppGroup = class AppGroup {
     constructor(params) {
         this.state = params.state;
         this.workspaceState = params.workspaceState;
@@ -1237,5 +1238,3 @@ class AppGroup {
         }
     }
 }
-
-module.exports = AppGroup;

files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/applet.js

@@ -14,14 +14,15 @@ const {AppletSettings} = imports.ui.settings;
 const {SignalManager} = imports.misc.signalManager;
 const {throttle, unref, trySpawnCommandLine} = imports.misc.util;
 
-const createStore = require('./state');
-const AppGroup = require('./appGroup');
-const Workspace = require('./workspace');
+const Me = imports.ui.extension.getCurrentExtension();
+const {createStore} = Me.imports.state;
+const {AppGroup} = Me.imports.appGroup;
+const {Workspace} = Me.imports.workspace;
 const {
-  RESERVE_KEYS,
-  TitleDisplay,
-  autoStartStrDir
-}  = require('./constants');
+    RESERVE_KEYS,
+    TitleDisplay,
+    autoStartStrDir
+} = Me.imports.constants;
 
 class PinnedFavs {
     constructor(params) {

files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/constants.js

@@ -1,29 +1,24 @@
-const CLOSE_BTN_SIZE = 22;
-const constants = {
-    CLOSE_BTN_SIZE,
-    CLOSED_BUTTON_STYLE: 'padding: 0px; width: ' + CLOSE_BTN_SIZE + 'px; height: '
-        + CLOSE_BTN_SIZE + 'px; max-width: ' + CLOSE_BTN_SIZE
-        + 'px; max-height: ' + CLOSE_BTN_SIZE + 'px; ' + '-cinnamon-close-overlap: 0px;' +
-        'background-size: ' + CLOSE_BTN_SIZE + 'px ' + CLOSE_BTN_SIZE + 'px;',
-    THUMBNAIL_ICON_SIZE: 16,
-    OPACITY_OPAQUE: 255,
-    BUTTON_BOX_ANIMATION_TIME: 150,
-    MAX_BUTTON_WIDTH: 150, // Pixels
-    FLASH_INTERVAL: 500,
-    FLASH_MAX_COUNT: 4,
-    RESERVE_KEYS: ['willUnmount'],
-    TitleDisplay: {
-        None: 1,
-        App: 2,
-        Title: 3,
-        Focused: 4
-    },
-    FavType: {
-        favorites: 0,
-        pinnedApps: 1,
-        none: 2
-    },
-    autoStartStrDir: './.config/autostart',
+var CLOSE_BTN_SIZE = 22;
+var CLOSED_BUTTON_STYLE = 'padding: 0px; width: ' + CLOSE_BTN_SIZE + 'px; height: '
+    + CLOSE_BTN_SIZE + 'px; max-width: ' + CLOSE_BTN_SIZE
+    + 'px; max-height: ' + CLOSE_BTN_SIZE + 'px; ' + '-cinnamon-close-overlap: 0px;' +
+    'background-size: ' + CLOSE_BTN_SIZE + 'px ' + CLOSE_BTN_SIZE + 'px;';
+var THUMBNAIL_ICON_SIZE = 16;
+var OPACITY_OPAQUE = 255;
+var BUTTON_BOX_ANIMATION_TIME = 150;
+var MAX_BUTTON_WIDTH = 150; // Pixels
+var FLASH_INTERVAL = 500;
+var FLASH_MAX_COUNT = 4;
+var RESERVE_KEYS = ['willUnmount'];
+var TitleDisplay = {
+    None: 1,
+    App: 2,
+    Title: 3,
+    Focused: 4
 };
-
-module.exports = constants;
+var FavType = {
+    favorites: 0,
+    pinnedApps: 1,
+    none: 2
+};
+var autoStartStrDir = './.config/autostart';

files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/menus.js

@@ -10,14 +10,15 @@ const WindowUtils = imports.misc.windowUtils;
 const Mainloop = imports.mainloop;
 
 const {tryFn, unref, trySpawnCommandLine, spawn_async, getDesktopActionIcon} = imports.misc.util;
+const Me = imports.ui.extension.getCurrentExtension();
 const {
     CLOSE_BTN_SIZE,
     CLOSED_BUTTON_STYLE,
     OPACITY_OPAQUE,
     RESERVE_KEYS,
     FavType,
     autoStartStrDir
-} = require('./constants');
+} = Me.imports.constants;
 
 const convertRange = function(value, r1, r2) {
     return ((value - r1[0]) * (r2[1] - r2[0])) / (r1[1] - r1[0]) + r2[0];
@@ -39,7 +40,7 @@ const setOpacity = (peekTime, window_actor, targetOpacity, cb) => {
     window_actor.ease(easeConfig);
 };
 
-class AppMenuButtonRightClickMenu extends Applet.AppletPopupMenu {
+var AppMenuButtonRightClickMenu = class AppMenuButtonRightClickMenu extends Applet.AppletPopupMenu {
     constructor(params, orientation) {
         super(params, orientation);
         this.state = params.state;
@@ -413,7 +414,7 @@ class AppMenuButtonRightClickMenu extends Applet.AppletPopupMenu {
     }
 }
 
-class HoverMenuController extends PopupMenu.PopupMenuManager {
+var HoverMenuController = class HoverMenuController extends PopupMenu.PopupMenuManager {
     constructor(actor, groupState) {
         super({actor}, false); // owner, shouldGrab
         this.groupState = groupState;
@@ -860,7 +861,7 @@ class WindowThumbnail {
     }
 }
 
-class AppThumbnailHoverMenu extends PopupMenu.PopupMenu {
+var AppThumbnailHoverMenu = class AppThumbnailHoverMenu extends PopupMenu.PopupMenu {
     _init(state, groupState) {
         super._init.call(this, groupState.trigger('getActor'), state.orientation, 0.5);
         this.state = state;
@@ -1227,9 +1228,3 @@ class AppThumbnailHoverMenu extends PopupMenu.PopupMenu {
         unref(this, RESERVE_KEYS);
     }
 }
-
-module.exports = {
-    AppMenuButtonRightClickMenu,
-    HoverMenuController,
-    AppThumbnailHoverMenu
-};

files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/state.js

@@ -137,7 +137,7 @@ function clone(object, refs = [], cache = null) {
  * to be used at the end of the application life cycle.
  *
  */
-function createStore(state = {}, listeners = [], connections = 0) {
+var createStore = function(state = {}, listeners = [], connections = 0) {
     const publicAPI = Object.freeze({
         get,
         set,
@@ -316,6 +316,4 @@ function createStore(state = {}, listeners = [], connections = 0) {
     }
 
     return getAPIWithObject(state);
-}
-
-module.exports = createStore;
+};

files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/workspace.js

@@ -3,11 +3,12 @@ const Main = imports.ui.main;
 const {SignalManager} = imports.misc.signalManager;
 const {unref} = imports.misc.util;
 
-const createStore = require('./state');
-const AppGroup = require('./appGroup');
-const {RESERVE_KEYS} = require('./constants');
+const Me = imports.ui.extension.getCurrentExtension();
+const {createStore} = Me.imports.state;
+const {AppGroup} = Me.imports.appGroup;
+const {RESERVE_KEYS} = Me.imports.constants;
 
-class Workspace {
+var Workspace = class Workspace {
     constructor(params) {
         this.state = params.state;
         this.state.connect({
@@ -428,5 +429,3 @@ class Workspace {
         unref(this, RESERVE_KEYS);
     }
 }
-
-module.exports = Workspace;

files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js

@@ -34,7 +34,8 @@ const USER_DESKTOP_PATH = FileUtils.getUserDesktopDir();
 const PRIVACY_SCHEMA = "org.cinnamon.desktop.privacy";
 const REMEMBER_RECENT_KEY = "remember-recent-files";
 
-const AppUtils = require('./appUtils');
+const Me = imports.ui.extension.getCurrentExtension();
+const AppUtils = Me.imports.appUtils;
 
 let appsys = Cinnamon.AppSystem.get_default();