Skip to content

chore: update GNOME 48 types #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 24, 2025
Merged

chore: update GNOME 48 types #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf51340
chore: update @girs dependencies to newest gnome 48 types
Totto16 Mar 23, 2025
7a6f23b
chore: bump dependencies
Totto16 Mar 23, 2025
b76bd20
fix: adjust the Meta.Cursor types to the new updated types
Totto16 Mar 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 33 additions & 35 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,69 +38,67 @@
},
"engineStrict": true,
"devDependencies": {
"@commitlint/cli": "^19.7.1",
"@commitlint/config-conventional": "^19.7.1",
"@girs/adw-1": "1.7.0-4.0.0-beta.21",
"@girs/clutter-16": "^16.0.0-4.0.0-beta.21",
"@girs/gda-5.0": "5.0.0-4.0.0-beta.21",
"@girs/gda-6.0": "6.0.0-4.0.0-beta.21",
"@girs/gdk-4.0": "4.0.0-4.0.0-beta.21",
"@girs/gdkpixbuf-2.0": "2.0.0-4.0.0-beta.21",
"@girs/gio-2.0": "2.83.3-4.0.0-beta.21",
"@girs/glib-2.0": "2.83.3-4.0.0-beta.21",
"@girs/gnome-shell": "48.0.0-next.2",
"@girs/gobject-2.0": "2.83.3-4.0.0-beta.21",
"@girs/graphene-1.0": "1.0.0-4.0.0-beta.21",
"@girs/gsound-1.0": "1.0.0-4.0.0-beta.21",
"@girs/gtk-4.0": "4.17.5-4.0.0-beta.21",
"@girs/meta-16": "^16.0.0-4.0.0-beta.21",
"@girs/pango-1.0": "1.56.0-4.0.0-beta.21",
"@girs/shell-16": "^16.0.0-4.0.0-beta.21",
"@girs/soup-3.0": "3.6.4-4.0.0-beta.21",
"@girs/st-16": "16.0.0-4.0.0-beta.21",
"@rollup/plugin-commonjs": "^28.0.2",
"@rollup/plugin-node-resolve": "^16.0.0",
"@commitlint/cli": "^19.8.0",
"@commitlint/config-conventional": "^19.8.0",
"@girs/adw-1": "1.8.0-4.0.0-beta.23",
"@girs/clutter-16": "^16.0.0-4.0.0-beta.23",
"@girs/gda-5.0": "5.0.0-4.0.0-beta.23",
"@girs/gda-6.0": "6.0.0-4.0.0-beta.23",
"@girs/gdk-4.0": "4.0.0-4.0.0-beta.23",
"@girs/gdkpixbuf-2.0": "2.0.0-4.0.0-beta.23",
"@girs/gio-2.0": "2.84.0-4.0.0-beta.23",
"@girs/glib-2.0": "2.84.0-4.0.0-beta.23",
"@girs/gnome-shell": "48.0.1",
"@girs/gobject-2.0": "2.84.0-4.0.0-beta.23",
"@girs/graphene-1.0": "1.0.0-4.0.0-beta.23",
"@girs/gsound-1.0": "1.0.0-4.0.0-beta.23",
"@girs/gtk-4.0": "4.18.3-4.0.0-beta.23",
"@girs/meta-16": "^16.0.0-4.0.0-beta.23",
"@girs/pango-1.0": "1.56.4-4.0.0-beta.23",
"@girs/shell-16": "^16.0.0-4.0.0-beta.23",
"@girs/soup-3.0": "3.6.4-4.0.0-beta.23",
"@girs/st-16": "16.0.0-4.0.0-beta.23",
"@rollup/plugin-commonjs": "^28.0.3",
"@rollup/plugin-node-resolve": "^16.0.1",
"@rollup/plugin-typescript": "^12.1.2",
"@tsconfig/strictest": "^2.0.5",
"@types/eslint": "^9.6.1",
"@types/eslint__js": "^8.42.3",
"@types/eslint__eslintrc": "^2.1.2",
"@types/events": "^3.0.3",
"@types/gettext-parser": "^8.0.0",
"@types/highlight.js": "^10.1.0",
"@types/is-url": "^1.2.32",
"@types/jasmine": "^5.1.6",
"@types/jasmine": "^5.1.7",
"@types/prismjs": "^1.26.5",
"@typescript-eslint/eslint-plugin": "^8.24.1",
"@typescript-eslint/parser": "^8.24.1",
"@types/node": "^22.13.4",
"@typescript-eslint/eslint-plugin": "^8.27.0",
"@typescript-eslint/parser": "^8.27.0",
"@types/node": "^22.13.11",
"cross-env": "^7.0.3",
"eslint": "^9.20.1",
"eslint-config-prettier": "^10.0.1",
"eslint": "^9.23.0",
"eslint-config-prettier": "^10.1.1",
"eslint-plugin-prettier": "^5.2.3",
"eslint-plugin-simple-import-sort": "^12.1.1",
"fill-pot-po": "^4.0.2",
"gettext-extractor": "^3.8.0",
"gettext-parser": "^8.0.0",
"glob": "^11.0.1",
"husky": "^9.1.7",
"prettier": "^3.5.1",
"rollup": "^4.34.8",
"prettier": "^3.5.3",
"rollup": "^4.37.0",
"rollup-plugin-cleanup": "^3.2.1",
"rollup-plugin-copy": "^3.5.0",
"rollup-plugin-styler": "^2.0.0",
"ts-node": "^10.9.2",
"typescript": "^5.7.3",
"typescript": "^5.8.2",
"chalk": "4.1.2"
},
"dependencies": {
"date-fns": "^2.30.0",
"hex-color-converter": "^0.2.1",
"highlight.js": "^11.9.0",
"highlight.js": "^11.11.1",
"htmlparser2": "^9.1.0",
"is-url": "^1.2.4",
"pretty-bytes": "^6.1.1",
"prismjs": "^1.29.0",
"prismjs": "^1.30.0",
"validate-color": "https://gitpkg.now.sh/dreamyguy/validate-color/src/validate-color"
},
"packageManager": "yarn@1.22.22"
Expand Down
8 changes: 4 additions & 4 deletions src/utils/shell_compatibility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ function metaSupportsUnredirectForDisplay() {

// Meta.Cursor.POINTING_HAND was renamed to Meta.Cursor.POINTER in GNOME 48 (Meta 16)

interface NewMetaCursor {
POINTER: Meta.Cursor | null | undefined;
interface LegacyMetaCursor {
POINTING_HAND: Meta.Cursor | null | undefined;
}

export const MetaCursorPointer: Meta.Cursor = (() => {
const pointer = (Meta.Cursor as unknown as NewMetaCursor).POINTER;
const pointer = (Meta.Cursor as unknown as LegacyMetaCursor).POINTING_HAND;

if (pointer !== undefined && pointer !== null) {
return pointer;
}

return Meta.Cursor.POINTING_HAND;
return Meta.Cursor.POINTER;
})();

// actual compatibility functions
Expand Down
Loading