refactor!: esm syntax for GNOME 45 #277

bennypowers · 2023-09-10T08:09:40Z

What I did

shuffle syntax to esm, per the migration guide.
replace _init calls with constructors
move ./widgets.js to ./preferences/widgets.js
- modules in the prefs.js module graph have different semantics so it's probably smart to keep 'em separated
refactor ./css/index.js to es2015 and add it to prettier
refactor some of the gettext code to suit the new hotness: we have to instantiate anything relying on metadata (like some of the message) in the Extension and ExtensionPreferences constructors now.
refactor the project structure such that the only modules in the project root are extention.js and prefs.js
refactor logger.js to use console.* methods
broke ThemeManager down into subclasses for prefs and extension, rather than passing in a flag

What I'm not sure about

~~the Session Modes docs haven't been updated yet so i'm pretty sure what i did here wrt session modes is broken~~
~~i think that in addition to refactoring logger to use console methods, it should be made a base class or class mixin, since settings is now available on BaseExtension#getSettings()~~

This initial commit shuffles the syntax to esm, per the [migration guide][guide]. It's very likely that some of the imports are incorrect, specifically those that require different URLs when imported from prefs.js. There are likely other bugs as well, so this should be considered a draft [guide]: https://gjs.guide/extensions/upgrading/gnome-shell-45.html#esm

also moves widgets module to ./preferences

imports are different depending on who the importer is separate out shared state inline gettext keys

bennypowers · 2023-09-11T13:12:11Z

**SOLVED**: prefs now launches

So far I get this when trying to launch prefs:

The settings of extension forge@jmmaranan.com had an error:

Error: Tried to construct an object without a GType

Stack trace:

PreferencesPage@file:///home/bennypowers/.local/share/gnome-shell/extensions/forge@jmmaranan.com/lib/prefs/widgets.js:15:8
SettingsPage@file:///home/bennypowers/.local/share/gnome-shell/extensions/forge@jmmaranan.com/lib/prefs/settings.js:13:5
fillPreferencesWindow@file:///home/bennypowers/.local/share/gnome-shell/extensions/forge@jmmaranan.com/prefs.js:48:16
_loadPrefs@resource:///org/gnome/Shell/Extensions/js/extensionPrefsDialog.js:36:18
async*_init@resource:///org/gnome/Shell/Extensions/js/extensionPrefsDialog.js:21:14
ExtensionPrefsDialog@resource:///org/gnome/Shell/Extensions/js/extensionPrefsDialog.js:12:4
OpenExtensionPrefsAsync@resource:///org/gnome/Shell/Extensions/js/extensionsService.js:139:33
async*LaunchExtensionPrefsAsync@resource:///org/gnome/Shell/Extensions/js/extensionsService.js:126:14
_handleMethodCall@resource:///org/gnome/gjs/modules/core/overrides/Gio.js:373:35
_wrapJSObject/<@resource:///org/gnome/gjs/modules/core/overrides/Gio.js:408:34
_init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:266:34

bennypowers · 2023-09-11T15:05:26Z

I'm basically stuck on the error in the previous comment.

@jmmaranan can you reproduce? I observed this in GNOME OS nightly

bennypowers · 2023-09-11T15:37:01Z

@fmuellner very kindly solved the previous error. Thank you!

Requiring Gdk.js, version none: Typelib file for namespace 'Gdk.js' (any version) not found

most probably needs a version query param on an import

bennypowers · 2023-09-11T15:55:39Z

JS ERROR: Extension forge@jmmaranan.com: Error: Tried to construct an object without a GType
ThemeManagerBase@file:///home/bennypowers/.local/share/gnome-shell/extensions/forge@jmmaranan.com/lib/shared/theme.js:34:5
ExtensionThemeManager@file:///home/bennypowers/.local/share/gnome-shell/extensions/forge@jmmaranan.com/lib/extension/extension-theme-manager.js:12:5
@file:///home/bennypowers/.local/share/gnome-shell/extensions/forge@jmmaranan.com/extension.js:41:11
ForgeExtension@file:///home/bennypowers/.local/share/gnome-shell/extensions/forge@jmmaranan.com/extension.js:34:16
_callExtensionInit@resource:///org/gnome/shell/ui/extensionSystem.js:537:17
async*loadExtension@resource:///org/gnome/shell/ui/extensionSystem.js:450:33
_loadExtensions@resource:///org/gnome/shell/ui/extensionSystem.js:724:24
async*_enableAllExtensions@resource:///org/gnome/shell/ui/extensionSystem.js:730:48
_sessionUpdated@resource:///org/gnome/shell/ui/extensionSystem.js:765:20
async*init@resource:///org/gnome/shell/ui/extensionSystem.js:69:14
_initializeUI@resource:///org/gnome/shell/ui/main.js:290:22
start@resource:///org/gnome/shell/ui/main.js:163:11
@resource:///org/gnome/shell/ui/init.js:11:47
@resource:///org/gnome/shell/ui/init.js:21:20

bennypowers · 2023-09-11T17:19:59Z

It runs!

still broken: launching settings from quick settings, and i don't think it's supposed to show both panel and quick settings... but it runs!

bennypowers · 2023-09-11T17:30:14Z

OK I believe this is ready to go

jmmaranan · 2023-09-12T01:14:14Z

Thank you so much for this! I am currently rebasing to Fedora 39

Closes forge-ext#278

bennypowers · 2023-09-14T09:31:02Z

@jmmaranan please carefully review 1575157, I'm not so familiar with that feature

jmmaranan · 2023-09-14T21:59:04Z

I was not able to rebase to FC39 last time (I should never have installed any other packages). So I'll just download an ISO into Boxes.

For that commit, it is used to reposition the mouse during key navigation. But it has not worked since they started removing some API methods. I think starting from GNOME 40

bennypowers · 2023-09-15T05:02:45Z

According to @fmuellner, in Extensions chat:

... gdkDisplay is always null, so you won't do anything
(and if it didn't return null, you'd run into the issue of trying to use gdk3 with gdk4)

So this might actually be an improvement, if it works 🤔

jmmaranan

@bennypowers - the po/forge.pot is not being produced after the changes to the Makefile. Please point the inputfiles for the xgettext command from ./extensions.js to each js file from lib/prefs/. xgettext is expecting files that contain _("translation string"), extensions.js does not have those.

jmmaranan · 2023-09-16T14:04:57Z

More comments:

The icons on preferences are broken.
Not part of ESM changes but can the dropdown toggles on preferences be fixed? Changing the toggle does not persist or nor apply the changes. It was broken last time after moving to libadwaita widgets.

bennypowers · 2023-09-18T08:46:32Z

I believe translations and icons are fixed. can we defer the dropdown bug to a separate pr?

jmmaranan · 2023-09-18T09:52:48Z

Looks good to me

jmmaranan and others added 7 commits August 13, 2023 11:52

Update to gnome 45

a25e990

refactor!: css to module

3026e58

fix: passing metadata and settings

7429674

fix: gjs imports in prefs

cc64e61

also moves widgets module to ./preferences

chore: makefile:debug for esm

ad6d901

refactor: logger

2f8924f

bennypowers changed the base branch from gnome-45-esm to main September 10, 2023 13:08

bennypowers added 21 commits September 10, 2023 23:22

refactor: GObject class reg in static blocks

1368b7d

refactor: named import

ac37af1

fix: make Logger methods static

53ec09e

fix: imports

1bff546

fix: imports

538598a

style: lint

9635625

fix: isGnomeGTE predicate

0d9469f

fix: panel imports

72824e8

fix: sessionMode

9c3bcc4

fix!: separate extensions and prefs modules

7799041

imports are different depending on who the importer is separate out shared state inline gettext keys

fix: css ast imports

6927fe4

fix: shared state

379559f

fix: widgets import

60ff21d

fix: gettext call

2f654cb

fix: missing imports

f6c9ad0

chore: typechecker config

7fe9f26

fix: typechecking, imports

d1518fd

fix: settings pages

477d271

fix: thememanager

eb8c43a

fix: theme manager

5797a2f

fix: gobject subclasses

9384905

fix: amazingly particular module bug

bb4b115

fix: import specs

4007fac

bennypowers added 5 commits September 11, 2023 18:59

fix: extension fields

bc196ac

fix: gettext calls

1abe577

fix: gobject subclass

6bc9b7d

fix: extension props

cfbf170

fix: launches!

0077f29

fix: launch prefs from quick settings

041820f

bennypowers added 2 commits September 14, 2023 12:00

fix: remove gdk imports from shell process

1575157

Closes forge-ext#278

chore: add devdeps

608293b

jmmaranan reviewed Sep 16, 2023

View reviewed changes

bennypowers added 3 commits September 18, 2023 10:49

fix: recompile messages from sources

bb10d40

chore: contributors

815249d

fix: prefs icons

214beff

jmmaranan self-requested a review September 18, 2023 09:53

jmmaranan approved these changes Sep 18, 2023

View reviewed changes

jmmaranan merged commit 6b354ba into forge-ext:main Sep 18, 2023

bennypowers deleted the gnome-45-esm branch September 18, 2023 10:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor!: esm syntax for GNOME 45 #277

refactor!: esm syntax for GNOME 45 #277

bennypowers commented Sep 10, 2023 •

edited

bennypowers commented Sep 11, 2023 •

edited

bennypowers commented Sep 11, 2023

bennypowers commented Sep 11, 2023

bennypowers commented Sep 11, 2023

bennypowers commented Sep 11, 2023

bennypowers commented Sep 11, 2023

jmmaranan commented Sep 12, 2023

bennypowers commented Sep 14, 2023

jmmaranan commented Sep 14, 2023

bennypowers commented Sep 15, 2023

jmmaranan left a comment •

edited

jmmaranan commented Sep 16, 2023

bennypowers commented Sep 18, 2023

jmmaranan commented Sep 18, 2023

refactor!: esm syntax for GNOME 45 #277

refactor!: esm syntax for GNOME 45 #277

Conversation

bennypowers commented Sep 10, 2023 • edited

What I did

What I'm not sure about

bennypowers commented Sep 11, 2023 • edited

bennypowers commented Sep 11, 2023

bennypowers commented Sep 11, 2023

bennypowers commented Sep 11, 2023

bennypowers commented Sep 11, 2023

bennypowers commented Sep 11, 2023

jmmaranan commented Sep 12, 2023

bennypowers commented Sep 14, 2023

jmmaranan commented Sep 14, 2023

bennypowers commented Sep 15, 2023

jmmaranan left a comment • edited

Choose a reason for hiding this comment

jmmaranan commented Sep 16, 2023

bennypowers commented Sep 18, 2023

jmmaranan commented Sep 18, 2023

bennypowers commented Sep 10, 2023 •

edited

bennypowers commented Sep 11, 2023 •

edited

jmmaranan left a comment •

edited