From a55c098897729e25fe3e27611c1b2ceccc564d9d Mon Sep 17 00:00:00 2001 From: Gil Vicente Bernardo Pinto Date: Wed, 20 Sep 2023 18:24:03 -0300 Subject: [PATCH] migrate import to ESM --- src/barLevel2.js | 8 ++++++-- src/prefs40/misc.js | 4 +++- src/slider2.js | 12 +++++++----- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/barLevel2.js b/src/barLevel2.js index a8f5dabd..3a58bb59 100644 --- a/src/barLevel2.js +++ b/src/barLevel2.js @@ -8,8 +8,12 @@ * See for details. */ -const {Atk, Clutter, GObject, St} = imports.gi; -const Config = imports.misc.config; +import Clutter from 'gi://Clutter'; +import Atk from 'gi://Atk'; +import St from 'gi://St'; +import GObject from 'gi://GObject'; + +import * as Config from 'resource:///org/gnome/shell/misc/config.js'; /* exported BarLevel2 */ var BarLevel2 = GObject.registerClass({ diff --git a/src/prefs40/misc.js b/src/prefs40/misc.js index 896019e6..26cad921 100644 --- a/src/prefs40/misc.js +++ b/src/prefs40/misc.js @@ -1,4 +1,6 @@ -const Gio = imports.gi.Gio; +import Gio from 'gi://Gio'; + + /* exported extensionUtils */ var extensionUtils = { diff --git a/src/slider2.js b/src/slider2.js index 645f73df..80c1bc9e 100644 --- a/src/slider2.js +++ b/src/slider2.js @@ -8,14 +8,16 @@ * See for details. */ -const {Atk, Clutter, GObject} = imports.gi; -const ExtensionUtils = imports.misc.extensionUtils; -const Config = imports.misc.config; +import Clutter from 'gi://Clutter'; +import Atk from 'gi://Atk'; +import St from 'gi://St'; +import GObject from 'gi://GObject'; -const Me = ExtensionUtils.getCurrentExtension(); -const BarLevel2 = Me.imports.src.barLevel2; +import * as Config from 'resource:///org/gnome/shell/misc/config.js'; + +import { barLevel2 } from "./src/barLevel2.js" /* exported Slider2 */ var Slider2 = GObject.registerClass({ GTypeName: "Slider2",