Bridge ES/legacy modules with .mjs re-export files

GSConnect · Sep 17, 2023 · 728e137 · 728e137
1 parent daa4960
commit 728e137
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 20 deletions.
diff --git a/src/config.mjs b/src/config.mjs
@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: GSConnect Developers https://github.com/GSConnect
+//
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import GLib from 'gi://GLib';
+
+const [filename] = GLib.filename_from_uri(import.meta.url);
+const dirname = GLib.path_get_dirname(filename);
+imports.searchPath.unshift(dirname);
+
+const Config = imports.config;
+export default Config;
diff --git a/src/extension.js b/src/extension.js
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 import Gio from 'gi://Gio';
-import GLib from 'gi://GLib';
 import GObject from 'gi://GObject';
 
 import * as Main from 'resource:///org/gnome/shell/ui/main.js';
@@ -19,18 +18,13 @@ import {
 import * as Utils from './shell/utils.js';
 
 // eslint-disable-next-line no-redeclare
+import Config from './config.mjs';
 import * as Clipboard from './shell/clipboard.js';
 import * as Device from './shell/device.js';
 import * as Keybindings from './shell/keybindings.js';
 import * as Notification from './shell/notification.js';
 import * as Input from './shell/input.js';
-
-// Enable legacy import support
-const [filename] = GLib.filename_from_uri(import.meta.url);
-const dirname = GLib.path_get_dirname(filename);
-imports.searchPath.unshift(dirname);
-const Config = imports.config;
-const Remote = imports.utils.remote;
+import Remote from './utils/remote.mjs';
 
 const QuickSettingsMenu = Main.panel.statusArea.quickSettings;
 

diff --git a/src/shell/input.js b/src/shell/input.js
@@ -3,13 +3,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 import Gio from 'gi://Gio';
-import GLib from 'gi://GLib';
 
-// Enable legacy import support
-const [filename] = GLib.filename_from_uri(import.meta.url);
-const dirname = GLib.path_get_dirname(GLib.path_get_dirname(filename));
-imports.searchPath.unshift(dirname);
-const Config = imports.config;
+import Config from '../config.mjs';
 
 export class LockscreenRemoteAccess {
 

diff --git a/src/shell/utils.js b/src/shell/utils.js
@@ -6,17 +6,13 @@ import Gio from 'gi://Gio';
 import GLib from 'gi://GLib';
 import Gtk from 'gi://Gtk';
 
+import Config from '../config.mjs';
+
 let St = null; // St is not available for prefs.js importing this file.
 try {
     St = (await import('gi://St')).default;
 } catch (e) { }
 
-// Enable legacy import support
-const [filename] = GLib.filename_from_uri(import.meta.url);
-const dirname = GLib.path_get_dirname(GLib.path_get_dirname(filename));
-imports.searchPath.unshift(dirname);
-const Config = imports.config;
-
 
 /**
  * Initialise and setup Config, GResources and GSchema.

diff --git a/src/utils/remote.mjs b/src/utils/remote.mjs
@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: GSConnect Developers https://github.com/GSConnect
+//
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import GLib from 'gi://GLib';
+
+const [filename] = GLib.filename_from_uri(import.meta.url);
+const dirname = GLib.path_get_dirname(filename);
+imports.searchPath.unshift(dirname);
+
+const Remote = imports.remote;
+export default Remote;