From a9114473751fd022a5208618a8c9bb488651a48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 14 Jul 2023 02:07:41 +0200 Subject: [PATCH] js: Port to ESM The shell pulled the trigger and switched to ESM for all its imports, follow suit. Part-of: --- extensions/apps-menu/extension.js | 10 +++++----- extensions/auto-move-windows/extension.js | 3 +-- extensions/drive-menu/extension.js | 8 ++++---- extensions/launch-new-instance/extension.js | 3 +-- extensions/light-style/extension.js | 2 +- extensions/native-window-placement/extension.js | 6 +++--- extensions/places-menu/extension.js | 6 +++--- extensions/places-menu/placeDisplay.js | 6 +++--- extensions/screenshot-window-sizer/extension.js | 2 +- extensions/user-theme/extension.js | 2 +- extensions/window-list/extension.js | 8 ++++---- extensions/window-list/windowPicker.js | 17 ++++++++--------- extensions/window-list/workspaceIndicator.js | 8 ++++---- extensions/windowsNavigator/extension.js | 11 +++++------ extensions/workspace-indicator/extension.js | 8 ++++---- 15 files changed, 48 insertions(+), 52 deletions(-) diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js index b9364442..b6185338 100644 --- a/extensions/apps-menu/extension.js +++ b/extensions/apps-menu/extension.js @@ -9,14 +9,14 @@ import Gtk from 'gi://Gtk'; import Meta from 'gi://Meta'; import Shell from 'gi://Shell'; import St from 'gi://St'; -const {EventEmitter} = imports.misc.signals; +import {EventEmitter} from 'resource:///org/gnome/shell/misc/signals.js'; import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js'; -const DND = imports.ui.dnd; -const Main = imports.ui.main; -const PanelMenu = imports.ui.panelMenu; -const PopupMenu = imports.ui.popupMenu; +import * as DND from 'resource:///org/gnome/shell/ui/dnd.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 PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js'; const appSys = Shell.AppSystem.get_default(); diff --git a/extensions/auto-move-windows/extension.js b/extensions/auto-move-windows/extension.js index d439cf1e..1b0cb43c 100644 --- a/extensions/auto-move-windows/extension.js +++ b/extensions/auto-move-windows/extension.js @@ -4,8 +4,7 @@ import Shell from 'gi://Shell'; import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js'; - -const Main = imports.ui.main; +import * as Main from 'resource:///org/gnome/shell/ui/main.js'; class WindowMover { constructor(settings) { diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js index cb9986fe..7d42ab25 100644 --- a/extensions/drive-menu/extension.js +++ b/extensions/drive-menu/extension.js @@ -7,10 +7,10 @@ import St from 'gi://St'; import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js'; -const Main = imports.ui.main; -const PanelMenu = imports.ui.panelMenu; -const PopupMenu = imports.ui.popupMenu; -const ShellMountOperation = imports.ui.shellMountOperation; +import * as Main from 'resource:///org/gnome/shell/ui/main.js'; +import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js'; +import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js'; +import * as ShellMountOperation from 'resource:///org/gnome/shell/ui/shellMountOperation.js'; Gio._promisify(Gio.File.prototype, 'query_filesystem_info_async'); diff --git a/extensions/launch-new-instance/extension.js b/extensions/launch-new-instance/extension.js index b542fad2..b4b0d8ae 100644 --- a/extensions/launch-new-instance/extension.js +++ b/extensions/launch-new-instance/extension.js @@ -1,7 +1,6 @@ +import {AppIcon} from 'resource:///org/gnome/shell/ui/appDisplay.js'; import {InjectionManager} from 'resource:///org/gnome/shell/extensions/extension.js'; -const {AppIcon} = imports.ui.appDisplay; - export default class Extension { constructor() { this._injectionManager = new InjectionManager(); diff --git a/extensions/light-style/extension.js b/extensions/light-style/extension.js index e37b40ec..5825093d 100644 --- a/extensions/light-style/extension.js +++ b/extensions/light-style/extension.js @@ -17,7 +17,7 @@ import St from 'gi://St'; -const Main = imports.ui.main; +import * as Main from 'resource:///org/gnome/shell/ui/main.js'; export default class Extension { _updateColorScheme(scheme) { diff --git a/extensions/native-window-placement/extension.js b/extensions/native-window-placement/extension.js index 85430479..9877a8fe 100644 --- a/extensions/native-window-placement/extension.js +++ b/extensions/native-window-placement/extension.js @@ -3,9 +3,9 @@ import Clutter from 'gi://Clutter'; import {Extension, InjectionManager} from 'resource:///org/gnome/shell/extensions/extension.js'; -const Main = imports.ui.main; -const {WindowPreview} = imports.ui.windowPreview; -const Workspace = imports.ui.workspace; +import * as Main from 'resource:///org/gnome/shell/ui/main.js'; +import {WindowPreview} from 'resource:///org/gnome/shell/ui/windowPreview.js'; +import * as Workspace from 'resource:///org/gnome/shell/ui/workspace.js'; // testing settings for natural window placement strategy: const WINDOW_PLACEMENT_NATURAL_ACCURACY = 20; // accuracy of window translate moves (KDE-default: 20) diff --git a/extensions/places-menu/extension.js b/extensions/places-menu/extension.js index 83e63dc1..de8593e7 100644 --- a/extensions/places-menu/extension.js +++ b/extensions/places-menu/extension.js @@ -5,9 +5,9 @@ import St from 'gi://St'; import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js'; -const Main = imports.ui.main; -const PanelMenu = imports.ui.panelMenu; -const PopupMenu = imports.ui.popupMenu; +import * as Main from 'resource:///org/gnome/shell/ui/main.js'; +import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js'; +import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js'; import {PlacesManager} from './placeDisplay.js'; diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js index ffd86eb3..0be170fe 100644 --- a/extensions/places-menu/placeDisplay.js +++ b/extensions/places-menu/placeDisplay.js @@ -2,12 +2,12 @@ import Gio from 'gi://Gio'; import GLib from 'gi://GLib'; import Shell from 'gi://Shell'; -const {EventEmitter} = imports.misc.signals; +import {EventEmitter} from 'resource:///org/gnome/shell/misc/signals.js'; import {gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js'; -const Main = imports.ui.main; -const ShellMountOperation = imports.ui.shellMountOperation; +import * as Main from 'resource:///org/gnome/shell/ui/main.js'; +import * as ShellMountOperation from 'resource:///org/gnome/shell/ui/shellMountOperation.js'; const N_ = x => x; diff --git a/extensions/screenshot-window-sizer/extension.js b/extensions/screenshot-window-sizer/extension.js index 05d9dbcc..4312a5a5 100644 --- a/extensions/screenshot-window-sizer/extension.js +++ b/extensions/screenshot-window-sizer/extension.js @@ -25,7 +25,7 @@ import St from 'gi://St'; import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js'; -const Main = imports.ui.main; +import * as Main from 'resource:///org/gnome/shell/ui/main.js'; const MESSAGE_FADE_TIME = 2000; diff --git a/extensions/user-theme/extension.js b/extensions/user-theme/extension.js index a2a6cbca..f006fdfe 100644 --- a/extensions/user-theme/extension.js +++ b/extensions/user-theme/extension.js @@ -5,7 +5,7 @@ import Gio from 'gi://Gio'; import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js'; -const Main = imports.ui.main; +import * as Main from 'resource:///org/gnome/shell/ui/main.js'; import {getThemeDirs, getModeThemeDirs} from './util.js'; diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js index 6f6417c6..71672695 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -9,10 +9,10 @@ import St from 'gi://St'; import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js'; -const DND = imports.ui.dnd; -const Main = imports.ui.main; -const Overview = imports.ui.overview; -const PopupMenu = imports.ui.popupMenu; +import * as DND from 'resource:///org/gnome/shell/ui/dnd.js'; +import * as Main from 'resource:///org/gnome/shell/ui/main.js'; +import * as Overview from 'resource:///org/gnome/shell/ui/overview.js'; +import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js'; import {WindowPicker, WindowPickerToggle} from './windowPicker.js'; import {WorkspaceIndicator} from './workspaceIndicator.js'; diff --git a/extensions/window-list/windowPicker.js b/extensions/window-list/windowPicker.js index 907606ce..6cafba61 100644 --- a/extensions/window-list/windowPicker.js +++ b/extensions/window-list/windowPicker.js @@ -4,18 +4,17 @@ import Shell from 'gi://Shell'; import St from 'gi://St'; import {Extension, InjectionManager} from 'resource:///org/gnome/shell/extensions/extension.js'; +import * as Layout from 'resource:///org/gnome/shell/ui/layout.js'; +import * as Main from 'resource:///org/gnome/shell/ui/main.js'; +import {WorkspacesDisplay} from 'resource:///org/gnome/shell/ui/workspacesView.js'; +import * as Workspace from 'resource:///org/gnome/shell/ui/workspace.js'; -const Layout = imports.ui.layout; -const Main = imports.ui.main; -const {WorkspacesDisplay} = imports.ui.workspacesView; -const Workspace = imports.ui.workspace; - -const {VIGNETTE_BRIGHTNESS} = imports.ui.lightbox; -const { +import {VIGNETTE_BRIGHTNESS} from 'resource:///org/gnome/shell/ui/lightbox.js'; +import { SIDE_CONTROLS_ANIMATION_TIME, OverviewAdjustment, - ControlsState, -} = imports.ui.overviewControls; + ControlsState +} from 'resource:///org/gnome/shell/ui/overviewControls.js'; class MyWorkspacesDisplay extends WorkspacesDisplay { static { diff --git a/extensions/window-list/workspaceIndicator.js b/extensions/window-list/workspaceIndicator.js index 4e50c288..aa2548d7 100644 --- a/extensions/window-list/workspaceIndicator.js +++ b/extensions/window-list/workspaceIndicator.js @@ -6,10 +6,10 @@ import St from 'gi://St'; import {gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js'; -const DND = imports.ui.dnd; -const Main = imports.ui.main; -const PanelMenu = imports.ui.panelMenu; -const PopupMenu = imports.ui.popupMenu; +import * as DND from 'resource:///org/gnome/shell/ui/dnd.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 PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js'; const TOOLTIP_OFFSET = 6; const TOOLTIP_ANIMATION_TIME = 150; diff --git a/extensions/windowsNavigator/extension.js b/extensions/windowsNavigator/extension.js index 32544b9b..e089df22 100644 --- a/extensions/windowsNavigator/extension.js +++ b/extensions/windowsNavigator/extension.js @@ -3,13 +3,12 @@ import Clutter from 'gi://Clutter'; import Graphene from 'gi://Graphene'; import St from 'gi://St'; +import * as Main from 'resource:///org/gnome/shell/ui/main.js'; +import * as OverviewControls from 'resource:///org/gnome/shell/ui/overviewControls.js'; import {InjectionManager} from 'resource:///org/gnome/shell/extensions/extension.js'; - -const Main = imports.ui.main; -const OverviewControls = imports.ui.overviewControls; -const {WindowPreview} = imports.ui.windowPreview; -const {Workspace} = imports.ui.workspace; -const {WorkspacesView} = imports.ui.workspacesView; +import {WindowPreview} from 'resource:///org/gnome/shell/ui/windowPreview.js'; +import {Workspace} from 'resource:///org/gnome/shell/ui/workspace.js'; +import {WorkspacesView} from 'resource:///org/gnome/shell/ui/workspacesView.js'; const WINDOW_SLOT = 4; diff --git a/extensions/workspace-indicator/extension.js b/extensions/workspace-indicator/extension.js index 78037d91..dd6ed1ce 100644 --- a/extensions/workspace-indicator/extension.js +++ b/extensions/workspace-indicator/extension.js @@ -7,10 +7,10 @@ import St from 'gi://St'; import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js'; -const DND = imports.ui.dnd; -const Main = imports.ui.main; -const PanelMenu = imports.ui.panelMenu; -const PopupMenu = imports.ui.popupMenu; +import * as DND from 'resource:///org/gnome/shell/ui/dnd.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 PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js'; const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences'; const WORKSPACE_KEY = 'workspace-names';