migrate gi, ui and Me imports to new ESM format

2026-04-14 00:04:17 +09:00 · 2023-08-13 02:49:56 +02:00
parent c317661f61
commit b87ac15d66
16 changed files with 196 additions and 211 deletions
--- a/appIcons.js
+++ b/appIcons.js
@@ -22,39 +22,38 @@
 */


-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
-const GObject = imports.gi.GObject;
+import Clutter from 'gi://Clutter';
+import Gio from 'gi://Gio';
+import GLib from 'gi://GLib';
+import Gtk from 'gi://Gtk';
+import GObject from 'gi://GObject';
 const Signals = imports.signals;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+import Meta from 'gi://Meta';
+import Shell from 'gi://Shell';
+import St from 'gi://St';
 const Mainloop = imports.mainloop;

-const Config = imports.misc.config;
-const AppDisplay = imports.ui.appDisplay;
-const AppMenu = imports.ui.appMenu;
+import * as Config from 'resource:///org/gnome/shell/misc/config.js';
+import * as AppDisplay from 'resource:///org/gnome/shell/ui/appDisplay.js';
+import * as AppMenu from 'resource:///org/gnome/shell/ui/appMenu.js';
 if (Config.PACKAGE_VERSION < '42') {
 const AppMenu = imports.ui.appDisplay;
 }
-const AppFavorites = imports.ui.appFavorites;
-const Dash = imports.ui.dash;
-const DND = imports.ui.dnd;
-const IconGrid = imports.ui.iconGrid;
-const Main = imports.ui.main;
-const PopupMenu = imports.ui.popupMenu;
-const Util = imports.misc.util;
-const Workspace = imports.ui.workspace;
-const BoxPointer = imports.ui.boxpointer;
-const ExtensionUtils = imports.misc.extensionUtils
+import * as AppFavorites from 'resource:///org/gnome/shell/ui/appFavorites.js';
+import * as Dash from 'resource:///org/gnome/shell/ui/dash.js';
+import * as DND from 'resource:///org/gnome/shell/ui/dnd.js';
+import * as IconGrid from 'resource:///org/gnome/shell/ui/iconGrid.js';
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+import * as Util from 'resource:///org/gnome/shell/misc/util.js';
+import * as Workspace from 'resource:///org/gnome/shell/ui/workspace.js';
+import * as BoxPointer from 'resource:///org/gnome/shell/ui/boxpointer.js';
+import * as ExtensionUtils from 'resource:///org/gnome/shell/misc/extensionUtils.js';

-const Me = ExtensionUtils.getCurrentExtension();
-const Utils = Me.imports.utils;
-const PanelSettings = Me.imports.panelSettings;
-const Taskbar = Me.imports.taskbar;
-const Progress = Me.imports.progress;
+import * as Utils from './utils.js';
+import * as PanelSettings from './panelSettings.js';
+import * as Taskbar from './taskbar.js';
+import * as Progress from './progress.js';
 const _ = imports.gettext.domain(Utils.TRANSLATION_DOMAIN).gettext;

 //timeout names
--- a/desktopIconsIntegration.js
+++ b/desktopIconsIntegration.js
@@ -55,11 +55,10 @@
 *
 *******************************************************************************/

-const GLib = imports.gi.GLib;
-const Main = imports.ui.main;
+import GLib from 'gi://GLib';
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';

-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
+import * as ExtensionUtils from 'resource:///org/gnome/shell/misc/extensionUtils.js';;

 const IDENTIFIER_UUID = "130cbc66-235c-4bd6-8571-98d2d8bba5e2";

--- a/extension.js
+++ b/extension.js
@@ -18,21 +18,20 @@
 */


-const Main = imports.ui.main;
-const Meta = imports.gi.Meta;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const WindowManager = imports.ui.windowManager;
-const ExtensionUtils = imports.misc.extensionUtils;
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+import Meta from 'gi://Meta';
+import Gio from 'gi://Gio';
+import GLib from 'gi://GLib';
+import Shell from 'gi://Shell';
+import St from 'gi://St';
+import * as WindowManager from 'resource:///org/gnome/shell/ui/windowManager.js';
+import * as ExtensionUtils from 'resource:///org/gnome/shell/misc/extensionUtils.js';;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;

-const Me = ExtensionUtils.getCurrentExtension();
-const { PanelManager } = Me.imports.panelManager;
-const Utils = Me.imports.utils;
-const AppIcons = Me.imports.appIcons;
+import { PanelManager } from './panelManager.js';
+import * as Utils from './utils.js';
+import * as AppIcons from './appIcons.js';

 const UBUNTU_DOCK_UUID = 'ubuntu-dock@ubuntu.com';

--- a/intellihide.js
+++ b/intellihide.js
@@ -15,21 +15,20 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-const Clutter = imports.gi.Clutter;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+import Clutter from 'gi://Clutter';
+import Meta from 'gi://Meta';
+import Shell from 'gi://Shell';
+import St from 'gi://St';

-var GrabHelper = imports.ui.grabHelper;
-const Layout = imports.ui.layout;
-const Main = imports.ui.main;
-const OverviewControls = imports.ui.overviewControls;
-const PointerWatcher = imports.ui.pointerWatcher;
+import * as GrabHelper from 'resource:///org/gnome/shell/ui/grabHelper.js';
+import * as Layout from 'resource:///org/gnome/shell/ui/layout.js';
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+import * as OverviewControls from 'resource:///org/gnome/shell/ui/overviewControls.js';
+import * as PointerWatcher from 'resource:///org/gnome/shell/ui/pointerWatcher.js';

-const Me = imports.misc.extensionUtils.getCurrentExtension();
-const Panel = Me.imports.panel;
-const Proximity = Me.imports.proximity;
-const Utils = Me.imports.utils;
+import * as Panel from './panel.js';
+import * as Proximity from './proximity.js';
+import * as Utils from './utils.js';

 //timeout intervals
 const CHECK_POINTER_MS = 200;
--- a/overview.js
+++ b/overview.js
@@ -20,19 +20,18 @@
 * Some code was also adapted from the upstream Gnome Shell source code.
 */

-const Me = imports.misc.extensionUtils.getCurrentExtension();
-const Intellihide = Me.imports.intellihide;
-const Utils = Me.imports.utils;
+import * as Intellihide from './intellihide.js';
+import * as Utils from './utils.js';

-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const Main = imports.ui.main;
-const Workspace = imports.ui.workspace;
-const { WindowPreview } = imports.ui.windowPreview;
+import Clutter from 'gi://Clutter';
+import Gio from 'gi://Gio';
+import Shell from 'gi://Shell';
+import St from 'gi://St';
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+import * as Workspace from 'resource:///org/gnome/shell/ui/workspace.js';
+import { WindowPreview } from 'resource:///org/gnome/shell/ui/windowPreview.js';

-const Meta = imports.gi.Meta;
+import Meta from 'gi://Meta';

 const GS_HOTKEYS_KEY = 'switch-to-application-';

--- a/panel.js
+++ b/panel.js
@@ -27,38 +27,37 @@
 * Some code was also adapted from the upstream Gnome Shell source code.
 */

-const Me = imports.misc.extensionUtils.getCurrentExtension();
-const Clutter = imports.gi.Clutter;
-const Config = imports.misc.config;
-const Gtk = imports.gi.Gtk;
-const GObject = imports.gi.GObject;
+import Clutter from 'gi://Clutter';
+import * as Config from 'resource:///org/gnome/shell/misc/config.js';
+import Gtk from 'gi://Gtk';
+import GObject from 'gi://GObject';
 const Gi = imports._gi;
-const AppIcons = Me.imports.appIcons;
-const Utils = Me.imports.utils;
-const { Taskbar, TaskbarItemContainer } = Me.imports.taskbar;
-const Pos = Me.imports.panelPositions;
-const PanelSettings = Me.imports.panelSettings;
-const { PanelStyle } = Me.imports.panelStyle;
-const Main = imports.ui.main;
+import * as AppIcons from './appIcons.js';
+import * as Utils from './utils.js';
+import { Taskbar, TaskbarItemContainer } from './taskbar.js';
+import * as Pos from './panelPositions.js';
+import * as PanelSettings from './panelSettings.js';
+import { PanelStyle } from './panelStyle.js';
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
 const Mainloop = imports.mainloop;
-const Dash = imports.ui.dash;
-const CtrlAltTab = imports.ui.ctrlAltTab;
-const GSPanel = imports.ui.panel;
-const PanelMenu = imports.ui.panelMenu;
-const St = imports.gi.St;
-const GLib = imports.gi.GLib;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
-const DND = imports.ui.dnd;
-const Shell = imports.gi.Shell;
-const PopupMenu = imports.ui.popupMenu;
-const IconGrid = imports.ui.iconGrid;
-const DateMenu = imports.ui.dateMenu;
-const Volume = imports.ui.status.volume;
-const Progress = Me.imports.progress;
+import * as Dash from 'resource:///org/gnome/shell/ui/dash.js';
+import * as CtrlAltTab from 'resource:///org/gnome/shell/ui/ctrlAltTab.js';
+import * as GSPanel from 'resource:///org/gnome/shell/ui/panel.js';
+import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
+import St from 'gi://St';
+import GLib from 'gi://GLib';
+import Meta from 'gi://Meta';
+import Pango from 'gi://Pango';
+import * as DND from 'resource:///org/gnome/shell/ui/dnd.js';
+import Shell from 'gi://Shell';
+import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+import * as IconGrid from 'resource:///org/gnome/shell/ui/iconGrid.js';
+import * as DateMenu from 'resource:///org/gnome/shell/ui/dateMenu.js';
+import * as Volume from 'resource:///org/gnome/shell/ui/volume.js';
+import * as Progress from './progress.js';

-const Intellihide = Me.imports.intellihide;
-const Transparency = Me.imports.transparency;
+import * as Intellihide from './intellihide.js';
+import * as Transparency from './transparency.js';
 const _ = imports.gettext.domain(Me.imports.utils.TRANSLATION_DOMAIN).gettext;

 let tracker = Shell.WindowTracker.get_default();
--- a/panelManager.js
+++ b/panelManager.js
@@ -27,33 +27,32 @@
 * Some code was also adapted from the upstream Gnome Shell source code.
 */

-const Me = imports.misc.extensionUtils.getCurrentExtension();
-const { Overview } = Me.imports.overview;
-const { Panel, panelBoxes } = Me.imports.panel;
-const PanelSettings = Me.imports.panelSettings;
-const Proximity = Me.imports.proximity;
-const Taskbar = Me.imports.taskbar;
-const Utils = Me.imports.utils;
-const DesktopIconsIntegration = Me.imports.desktopIconsIntegration;
+import { Overview } from './overview.js';
+import { Panel, panelBoxes } from './panel.js';
+import * as PanelSettings from './panelSettings.js';
+import * as Proximity from './proximity.js';
+import * as Taskbar from './taskbar.js';
+import * as Utils from './utils.js';
+import * as DesktopIconsIntegration from './desktopIconsIntegration.js';

 const Gi = imports._gi;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Clutter = imports.gi.Clutter;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+import GLib from 'gi://GLib';
+import GObject from 'gi://GObject';
+import Clutter from 'gi://Clutter';
+import Meta from 'gi://Meta';
+import Shell from 'gi://Shell';
+import St from 'gi://St';

-const AppDisplay = imports.ui.appDisplay;
-const BoxPointer = imports.ui.boxpointer;
-const Dash = imports.ui.dash;
-const IconGrid = imports.ui.iconGrid;
-const LookingGlass = imports.ui.lookingGlass;
-const Main = imports.ui.main;
-const PanelMenu = imports.ui.panelMenu;
-const Layout = imports.ui.layout;
-const WM = imports.ui.windowManager;
-const { SecondaryMonitorDisplay, WorkspacesView } = imports.ui.workspacesView;
+import * as AppDisplay from 'resource:///org/gnome/shell/ui/appDisplay.js';
+import * as BoxPointer from 'resource:///org/gnome/shell/ui/boxpointer.js';
+import * as Dash from 'resource:///org/gnome/shell/ui/dash.js';
+import * as IconGrid from 'resource:///org/gnome/shell/ui/iconGrid.js';
+import * as LookingGlass from 'resource:///org/gnome/shell/ui/lookingGlass.js';
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
+import * as Layout from 'resource:///org/gnome/shell/ui/layout.js';
+import * as WM from 'resource:///org/gnome/shell/ui/windowManager.js';
+import { SecondaryMonitorDisplay, WorkspacesView } from 'resource:///org/gnome/shell/ui/workspacesView.js';

 var PanelManager = class {

--- a/panelSettings.js
+++ b/panelSettings.js
@@ -15,8 +15,7 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-const Me = imports.misc.extensionUtils.getCurrentExtension();
-const Pos = Me.imports.panelPositions;
+import * as Pos from './panelPositions.js';

 /** Return object representing a settings value that is stored as JSON. */
 function getSettingsJson(settings, setting) {
--- a/panelStyle.js
+++ b/panelStyle.js
@@ -21,16 +21,15 @@
 * mathematical.coffee@gmail.com
 */

-const Me = imports.misc.extensionUtils.getCurrentExtension();
-const ExtensionUtils = imports.misc.extensionUtils;
-const Main = imports.ui.main;
+import * as ExtensionUtils from 'resource:///org/gnome/shell/misc/extensionUtils.js';;
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
 const Mainloop = imports.mainloop;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
+import St from 'gi://St';
+import Shell from 'gi://Shell';

-const Panel = Me.imports.panel;
-const Taskbar = Me.imports.taskbar;
-const Utils = Me.imports.utils;
+import * as Panel from './panel.js';
+import * as Taskbar from './taskbar.js';
+import * as Utils from './utils.js';

 var PanelStyle = class {

--- a/prefs.js
+++ b/prefs.js
@@ -20,22 +20,21 @@
 * Some code was also adapted from the upstream Gnome Shell source code.
 */

-const GdkPixbuf = imports.gi.GdkPixbuf;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Gtk = imports.gi.Gtk;
-const Adw = imports.gi.Adw;
-const Gdk = imports.gi.Gdk;
+import GdkPixbuf from 'gi://GdkPixbuf';
+import Gio from 'gi://Gio';
+import GLib from 'gi://GLib';
+import GObject from 'gi://GObject';
+import Gtk from 'gi://Gtk';
+import Adw from 'gi://Adw';
+import Gdk from 'gi://Gdk';
 const Mainloop = imports.mainloop;

-const Me = imports.misc.extensionUtils.getCurrentExtension();
-const ExtensionUtils = imports.misc.extensionUtils;
+import * as ExtensionUtils from 'resource:///org/gnome/shell/misc/extensionUtils.js';;
 const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']);
 const _ = Gettext.gettext;
 const N_ = function(e) { return e };
-const PanelSettings = Me.imports.panelSettings;
-const Pos = Me.imports.panelPositions;
+import * as PanelSettings from './panelSettings.js';
+import * as Pos from './panelPositions.js';

 const SCALE_UPDATE_TIMEOUT = 500;
 const DEFAULT_PANEL_SIZES = [ 128, 96, 64, 48, 32, 24, 16 ];
--- a/progress.js
+++ b/progress.js
@@ -19,14 +19,13 @@
 * This file is based on code from the Dash to Dock extension by micheleg
 */

-const Me = imports.misc.extensionUtils.getCurrentExtension();
-const Gio = imports.gi.Gio;
+import Gio from 'gi://Gio';
 const Cairo = imports.cairo;
-const Clutter = imports.gi.Clutter;
-const Pango = imports.gi.Pango;
-const St = imports.gi.St;
+import Clutter from 'gi://Clutter';
+import Pango from 'gi://Pango';
+import St from 'gi://St';
 const Signals = imports.signals;
-const Utils = Me.imports.utils;
+import * as Utils from './utils.js';


 var ProgressManager = class {
--- a/proximity.js
+++ b/proximity.js
@@ -15,13 +15,12 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-const Meta = imports.gi.Meta;
+import Meta from 'gi://Meta';

-const Layout = imports.ui.layout;
-const Main = imports.ui.main;
+import * as Layout from 'resource:///org/gnome/shell/ui/layout.js';
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';

-const Me = imports.misc.extensionUtils.getCurrentExtension();
-const Utils = Me.imports.utils;
+import * as Utils from './utils.js';

 //timeout intervals
 const MIN_UPDATE_MS = 200;
--- a/taskbar.js
+++ b/taskbar.js
@@ -22,35 +22,34 @@
 */


-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Gtk = imports.gi.Gtk;
+import Clutter from 'gi://Clutter';
+import Gio from 'gi://Gio';
+import GLib from 'gi://GLib';
+import GObject from 'gi://GObject';
+import Gtk from 'gi://Gtk';
 const Signals = imports.signals;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+import Meta from 'gi://Meta';
+import Shell from 'gi://Shell';
+import St from 'gi://St';
 const Mainloop = imports.mainloop;

 const SearchController = imports.ui.main.overview._overview._controls._searchController;
 const AppDisplay = imports.ui.main.overview._overview._controls.appDisplay;
-const AppFavorites = imports.ui.appFavorites;
-const Dash = imports.ui.dash;
-const DND = imports.ui.dnd;
-const IconGrid = imports.ui.iconGrid;
-const Main = imports.ui.main;
-const PopupMenu = imports.ui.popupMenu;
-const Workspace = imports.ui.workspace;
+import * as AppFavorites from 'resource:///org/gnome/shell/ui/appFavorites.js';
+import * as Dash from 'resource:///org/gnome/shell/ui/dash.js';
+import * as DND from 'resource:///org/gnome/shell/ui/dnd.js';
+import * as IconGrid from 'resource:///org/gnome/shell/ui/iconGrid.js';
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+import * as Workspace from 'resource:///org/gnome/shell/ui/workspace.js';

-const Me = imports.misc.extensionUtils.getCurrentExtension();
-const AppIcons = Me.imports.appIcons;
-const Panel = Me.imports.panel;
-const PanelManager = Me.imports.panelManager;
-const PanelSettings = Me.imports.panelSettings;
-const Pos = Me.imports.panelPositions;
-const Utils = Me.imports.utils;
-const WindowPreview = Me.imports.windowPreview;
+import * as AppIcons from './appIcons.js';
+import * as Panel from './panel.js';
+import * as PanelManager from './panelManager.js';
+import * as PanelSettings from './panelSettings.js';
+import * as Pos from './panelPositions.js';
+import * as Utils from './utils.js';
+import * as WindowPreview from './windowPreview.js';

 var DASH_ANIMATION_TIME = Dash.DASH_ANIMATION_TIME / (Dash.DASH_ANIMATION_TIME > 1 ? 1000 : 1);
 var DASH_ITEM_HOVER_TIMEOUT = Dash.DASH_ITEM_HOVER_TIMEOUT;
--- a/transparency.js
+++ b/transparency.js
@@ -15,17 +15,16 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-const Clutter = imports.gi.Clutter;
-const GdkPixbuf = imports.gi.GdkPixbuf;
-const Main = imports.ui.main;
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
-const Config = imports.misc.config;
+import Clutter from 'gi://Clutter';
+import GdkPixbuf from 'gi://GdkPixbuf';
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+import Meta from 'gi://Meta';
+import St from 'gi://St';
+import * as Config from 'resource:///org/gnome/shell/misc/config.js';

-const Me = imports.misc.extensionUtils.getCurrentExtension();
-const Panel = Me.imports.panel;
-const Proximity = Me.imports.proximity;
-const Utils = Me.imports.utils;
+import * as Panel from './panel.js';
+import * as Proximity from './proximity.js';
+import * as Utils from './utils.js';

 var DynamicTransparency = class {

--- a/utils.js
+++ b/utils.js
@@ -21,20 +21,20 @@
 * Some code was also adapted from the upstream Gnome Shell source code.
 */

-const Clutter = imports.gi.Clutter;
-const GdkPixbuf = imports.gi.GdkPixbuf;
+import Clutter from 'gi://Clutter';
+import GdkPixbuf from 'gi://GdkPixbuf';
 const Gi = imports._gi;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+import Gio from 'gi://Gio';
+import GLib from 'gi://GLib';
+import Gtk from 'gi://Gtk';
+import Meta from 'gi://Meta';
+import Shell from 'gi://Shell';
+import St from 'gi://St';
 const Mainloop = imports.mainloop;
-const Config = imports.misc.config;
-const Util = imports.misc.util;
-const Main = imports.ui.main;
-const MessageTray = imports.ui.messageTray;
+import * as Config from 'resource:///org/gnome/shell/misc/config.js';
+import * as Util from 'resource:///org/gnome/shell/misc/util.js';
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+import * as MessageTray from 'resource:///org/gnome/shell/ui/messageTray.js';

 var TRANSLATION_DOMAIN = imports.misc.extensionUtils.getCurrentExtension().metadata['gettext-domain'];
 var SCROLL_TIME = Util.SCROLL_TIME / (Util.SCROLL_TIME > 1 ? 1000 : 1);
--- a/windowPreview.js
+++ b/windowPreview.js
@@ -15,24 +15,23 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-const GObject = imports.gi.GObject;
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const Graphene = imports.gi.Graphene;
-const Gtk = imports.gi.Gtk;
-const Main = imports.ui.main;
+import GObject from 'gi://GObject';
+import Clutter from 'gi://Clutter';
+import GLib from 'gi://GLib';
+import Graphene from 'gi://Graphene';
+import Gtk from 'gi://Gtk';
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const PopupMenu = imports.ui.popupMenu;
+import Meta from 'gi://Meta';
+import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
 const Signals = imports.signals;
-const St = imports.gi.St;
-const WindowManager = imports.ui.windowManager;
-const Workspace = imports.ui.workspace;
+import St from 'gi://St';
+import * as WindowManager from 'resource:///org/gnome/shell/ui/windowManager.js';
+import * as Workspace from 'resource:///org/gnome/shell/ui/workspace.js';

-const Me = imports.misc.extensionUtils.getCurrentExtension();
-const Panel = Me.imports.panel;
-const Taskbar = Me.imports.taskbar;
-const Utils = Me.imports.utils;
+import * as Panel from './panel.js';
+import * as Taskbar from './taskbar.js';
+import * as Utils from './utils.js';

 //timeout intervals
 const ENSURE_VISIBLE_MS = 200;