Skip to content

Commit

Permalink
Use gnome-shell types from @Girs
Browse files Browse the repository at this point in the history
  • Loading branch information
@swsnr
swsnr committed Jan 1, 2024
1 parent db00d08 commit 1e634b0
Show file tree
Hide file tree
Showing 7 changed files with 157 additions and 106 deletions.
4 changes: 1 addition & 3 deletions @types/gnome-shell/ambient.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,4 @@

import "@girs/gjs";
import "@girs/gjs/dom";
import "@girs/shell-13/ambient";
import "@girs/gtk-4.0/ambient";
import "@girs/adw-1/ambient";
import "@girs/gnome-shell/ambient";
58 changes: 0 additions & 58 deletions @types/gnome-shell/extensions/extension.d.ts
View file

This file was deleted.

35 changes: 0 additions & 35 deletions @types/gnome-shell/extensions/prefs.d.ts
View file

This file was deleted.

1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"@girs/gio-2.0": "^2.78.0-3.2.6",
"@girs/gjs": "^3.2.6",
"@girs/glib-2.0": "^2.78.0-3.2.6",
"@girs/gnome-shell": "^45.0.0-beta5",
"@girs/gtk-4.0": "^4.12.3-3.2.6",
"@girs/shell-13": "^13.0.0-3.2.6",
"@girs/st-13": "^13.0.0-3.2.6",
Expand Down
7 changes: 3 additions & 4 deletions src/prefs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ import Gio from "gi://Gio";
import Gtk from "gi://Gtk";
import Adw from "gi://Adw";

import {
ExtensionMetadata,
ExtensionPreferences,
} from "resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js";
import { ExtensionPreferences } from "resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js";

import type { ExtensionMetadata } from "@girs/gnome-shell/extensions/extension";

const LICENSE = `Copyright Sebastian Wiesner <[email protected]>
Expand Down
6 changes: 0 additions & 6 deletions tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
"moduleResolution": "NodeNext",
"lib": ["ES2022"],
"removeComments": false,
"paths": {
// Our own types. First as they are seen in GNOME shell extensions,
// and then how they're seen by prefs.js.
"resource:///org/gnome/shell/*": ["./@types/gnome-shell/*"],
"resource:///org/gnome/Shell/Extensions/js/*": ["./@types/gnome-shell/*"]
},
"skipLibCheck": true
},
"include": [
Expand Down
152 changes: 152 additions & 0 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,18 @@ __metadata:
languageName: node
linkType: hard

"@girs/accountsservice-1.0@npm:^1.0.0-3.2.6":
version: 1.0.0-3.2.6
resolution: "@girs/accountsservice-1.0@npm:1.0.0-3.2.6"
dependencies:
"@girs/gio-2.0": "npm:^2.78.0-3.2.6"
"@girs/gjs": "npm:^3.2.6"
"@girs/glib-2.0": "npm:^2.78.0-3.2.6"
"@girs/gobject-2.0": "npm:^2.78.0-3.2.6"
checksum: cf15248793691a7672135aff220841b303bd0060b07326d85d289e08f4fd15f44185f93a2e4c38f06898ba6973ab0e3ce336d4d1f3de1be2c7dfa541fe3f6a77
languageName: node
linkType: hard

"@girs/adw-1@npm:^1.4.0-3.2.6":
version: 1.4.0-3.2.6
resolution: "@girs/adw-1@npm:1.4.0-3.2.6"
Expand Down Expand Up @@ -162,6 +174,18 @@ __metadata:
languageName: node
linkType: hard

"@girs/cogl-2.0@npm:^2.0.0-3.2.6":
version: 2.0.0-3.2.6
resolution: "@girs/cogl-2.0@npm:2.0.0-3.2.6"
dependencies:
"@girs/gjs": "npm:^3.2.6"
"@girs/gl-1.0": "npm:^1.0.0-3.2.6"
"@girs/glib-2.0": "npm:^2.78.0-3.2.6"
"@girs/gobject-2.0": "npm:^2.78.0-3.2.6"
checksum: 121962d6f4971a2aad09c885c6b48ebba3355af5c57ed086b240d97847d3c26a55b25d1e62ddda7f1204a4049586cb843761afe291426ab2bc4788236d8c1e6c
languageName: node
linkType: hard

"@girs/coglpango-13@npm:^13.0.0-3.2.6":
version: 13.0.0-3.2.6
resolution: "@girs/coglpango-13@npm:13.0.0-3.2.6"
Expand Down Expand Up @@ -259,6 +283,18 @@ __metadata:
languageName: node
linkType: hard

"@girs/gdm-1.0@npm:^1.0.0-3.2.6":
version: 1.0.0-3.2.6
resolution: "@girs/gdm-1.0@npm:1.0.0-3.2.6"
dependencies:
"@girs/gio-2.0": "npm:^2.78.0-3.2.6"
"@girs/gjs": "npm:^3.2.6"
"@girs/glib-2.0": "npm:^2.78.0-3.2.6"
"@girs/gobject-2.0": "npm:^2.78.0-3.2.6"
checksum: 5bfd8b66808d6998d4a76859c8131799a8ecc6812efd38e9b168a431d30e50229ffc855c46b38b1299ee04bf2e4ff4135581bedc0695310facc29fae3b8f8677
languageName: node
linkType: hard

"@girs/gio-2.0@npm:^2.78.0-3.2.6":
version: 2.78.0-3.2.6
resolution: "@girs/gio-2.0@npm:2.78.0-3.2.6"
Expand Down Expand Up @@ -311,6 +347,86 @@ __metadata:
languageName: node
linkType: hard

"@girs/gnome-shell@npm:^45.0.0-beta5":
version: 45.0.0-beta5
resolution: "@girs/gnome-shell@npm:45.0.0-beta5"
dependencies:
"@girs/accountsservice-1.0": "npm:^1.0.0-3.2.6"
"@girs/adw-1": "npm:^1.4.0-3.2.6"
"@girs/atk-1.0": "npm:^2.50.0-3.2.6"
"@girs/cally-13": "npm:^13.0.0-3.2.6"
"@girs/clutter-13": "npm:^13.0.0-3.2.6"
"@girs/cogl-2.0": "npm:^2.0.0-3.2.6"
"@girs/gcr-4": "npm:^4.1.0-3.2.6"
"@girs/gdm-1.0": "npm:^1.0.0-3.2.6"
"@girs/gio-2.0": "npm:^2.78.0-3.2.6"
"@girs/gjs": "npm:^3.2.6"
"@girs/glib-2.0": "npm:^2.78.0-3.2.6"
"@girs/gnomebg-4.0": "npm:^4.0.0-3.2.6"
"@girs/gnomebluetooth-3.0": "npm:^3.0.0-3.2.6"
"@girs/gnomedesktop-4.0": "npm:^4.0.0-3.2.6"
"@girs/gobject-2.0": "npm:^2.78.0-3.2.6"
"@girs/gtk-4.0": "npm:^4.12.3-3.2.6"
"@girs/gvc-1.0": "npm:^1.0.0-3.2.6"
"@girs/meta-13": "npm:^13.0.0-3.2.6"
"@girs/polkit-1.0": "npm:^1.0.0-3.2.6"
"@girs/shell-13": "npm:^13.0.0-3.2.6"
"@girs/shew-0": "npm:^0.0.0-3.2.6"
"@girs/st-13": "npm:^13.0.0-3.2.6"
"@girs/upowerglib-1.0": "npm:^0.99.1-3.2.6"
checksum: 81699023a1033457ceb78369f4e89361a4ae861cbc62059724ace1b8784ebbcda44c8378f50f5e40b3a0a8c275fa2eb4ae10b3dc4affd37976f8a45e8f0045c5
languageName: node
linkType: hard

"@girs/gnomebg-4.0@npm:^4.0.0-3.2.6":
version: 4.0.0-3.2.6
resolution: "@girs/gnomebg-4.0@npm:4.0.0-3.2.6"
dependencies:
"@girs/cairo-1.0": "npm:^1.0.0-3.2.6"
"@girs/freetype2-2.0": "npm:^2.0.0-3.2.6"
"@girs/gdesktopenums-3.0": "npm:^3.0.0-3.2.6"
"@girs/gdk-4.0": "npm:^4.0.0-3.2.6"
"@girs/gdkpixbuf-2.0": "npm:^2.0.0-3.2.6"
"@girs/gio-2.0": "npm:^2.78.0-3.2.6"
"@girs/gjs": "npm:^3.2.6"
"@girs/glib-2.0": "npm:^2.78.0-3.2.6"
"@girs/gmodule-2.0": "npm:^2.0.0-3.2.6"
"@girs/gnomedesktop-4.0": "npm:^4.0.0-3.2.6"
"@girs/gobject-2.0": "npm:^2.78.0-3.2.6"
"@girs/harfbuzz-0.0": "npm:^8.2.1-3.2.6"
"@girs/pango-1.0": "npm:^1.51.0-3.2.6"
"@girs/pangocairo-1.0": "npm:^1.0.0-3.2.6"
checksum: f761ec0d99ba96146952a9002d62f25e48be994e6d03138ce143e7e7d2d9894a6c4b1ce04e707f58c27c318bb7d161eb96da0078473aff2854d31b81cf273f74
languageName: node
linkType: hard

"@girs/gnomebluetooth-3.0@npm:^3.0.0-3.2.6":
version: 3.0.0-3.2.6
resolution: "@girs/gnomebluetooth-3.0@npm:3.0.0-3.2.6"
dependencies:
"@girs/gio-2.0": "npm:^2.78.0-3.2.6"
"@girs/gjs": "npm:^3.2.6"
"@girs/glib-2.0": "npm:^2.78.0-3.2.6"
"@girs/gobject-2.0": "npm:^2.78.0-3.2.6"
checksum: 9c90d38c368c5e12d37096dfcf90937fcc1655ddbe9cb366b46862adb660b69b2214138d453493bc6cb086965e33e2be2f3b624e1a39e2caae3f8dde73c42e6c
languageName: node
linkType: hard

"@girs/gnomedesktop-4.0@npm:^4.0.0-3.2.6":
version: 4.0.0-3.2.6
resolution: "@girs/gnomedesktop-4.0@npm:4.0.0-3.2.6"
dependencies:
"@girs/gdesktopenums-3.0": "npm:^3.0.0-3.2.6"
"@girs/gdkpixbuf-2.0": "npm:^2.0.0-3.2.6"
"@girs/gio-2.0": "npm:^2.78.0-3.2.6"
"@girs/gjs": "npm:^3.2.6"
"@girs/glib-2.0": "npm:^2.78.0-3.2.6"
"@girs/gmodule-2.0": "npm:^2.0.0-3.2.6"
"@girs/gobject-2.0": "npm:^2.78.0-3.2.6"
checksum: 3f02c08332ca319b20d26be0b8abfa6fa89d75005f9d29bb618c9fe7caa6f092a1a7c20a5055adb48a75a069ae6843fd9294945e8f0aa98abb677c619a020f08
languageName: node
linkType: hard

"@girs/gobject-2.0@npm:^2.78.0-3.2.6":
version: 2.78.0-3.2.6
resolution: "@girs/gobject-2.0@npm:2.78.0-3.2.6"
Expand Down Expand Up @@ -559,6 +675,29 @@ __metadata:
languageName: node
linkType: hard

"@girs/shew-0@npm:^0.0.0-3.2.6":
version: 0.0.0-3.2.6
resolution: "@girs/shew-0@npm:0.0.0-3.2.6"
dependencies:
"@girs/cairo-1.0": "npm:^1.0.0-3.2.6"
"@girs/freetype2-2.0": "npm:^2.0.0-3.2.6"
"@girs/gdk-4.0": "npm:^4.0.0-3.2.6"
"@girs/gdkpixbuf-2.0": "npm:^2.0.0-3.2.6"
"@girs/gio-2.0": "npm:^2.78.0-3.2.6"
"@girs/gjs": "npm:^3.2.6"
"@girs/glib-2.0": "npm:^2.78.0-3.2.6"
"@girs/gmodule-2.0": "npm:^2.0.0-3.2.6"
"@girs/gobject-2.0": "npm:^2.78.0-3.2.6"
"@girs/graphene-1.0": "npm:^1.0.0-3.2.6"
"@girs/gsk-4.0": "npm:^4.0.0-3.2.6"
"@girs/gtk-4.0": "npm:^4.12.3-3.2.6"
"@girs/harfbuzz-0.0": "npm:^8.2.1-3.2.6"
"@girs/pango-1.0": "npm:^1.51.0-3.2.6"
"@girs/pangocairo-1.0": "npm:^1.0.0-3.2.6"
checksum: 5ccfdb4fc5bf1c1335522f6f27dbd73f11ef31f5f9b0ed41d7a292dd49f60a4c648a50f76de7e0fac7e1e8722c2e17570af2005f18c3ba1e60d66e893d4fd3aa
languageName: node
linkType: hard

"@girs/st-13@npm:^13.0.0-3.2.6":
version: 13.0.0-3.2.6
resolution: "@girs/st-13@npm:13.0.0-3.2.6"
Expand Down Expand Up @@ -591,6 +730,18 @@ __metadata:
languageName: node
linkType: hard

"@girs/upowerglib-1.0@npm:^0.99.1-3.2.6":
version: 0.99.1-3.2.6
resolution: "@girs/upowerglib-1.0@npm:0.99.1-3.2.6"
dependencies:
"@girs/gio-2.0": "npm:^2.78.0-3.2.6"
"@girs/gjs": "npm:^3.2.6"
"@girs/glib-2.0": "npm:^2.78.0-3.2.6"
"@girs/gobject-2.0": "npm:^2.78.0-3.2.6"
checksum: 67c80a5ed78fe8123fa29e66d2982a59f851762559f3d7c688328ae82076c08232c058d36169c29fc2f69ebaf991360a094253fceb18fe7b106f13e1d1c07221
languageName: node
linkType: hard

"@girs/xfixes-4.0@npm:^4.0.0-3.2.6":
version: 4.0.0-3.2.6
resolution: "@girs/xfixes-4.0@npm:4.0.0-3.2.6"
Expand Down Expand Up @@ -1648,6 +1799,7 @@ __metadata:
"@girs/gio-2.0": "npm:^2.78.0-3.2.6"
"@girs/gjs": "npm:^3.2.6"
"@girs/glib-2.0": "npm:^2.78.0-3.2.6"
"@girs/gnome-shell": "npm:^45.0.0-beta5"
"@girs/gtk-4.0": "npm:^4.12.3-3.2.6"
"@girs/shell-13": "npm:^13.0.0-3.2.6"
"@girs/st-13": "npm:^13.0.0-3.2.6"
Expand Down

0 comments on commit 1e634b0

Please sign in to comment.