Skip to content

Commit

Permalink
move to v14 types
Browse files Browse the repository at this point in the history
  • Loading branch information
Totto16 committed Mar 26, 2024
1 parent 6d2e977 commit d9568d8
Show file tree
Hide file tree
Showing 29 changed files with 727 additions and 1,260 deletions.
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,24 @@
"devDependencies": {
"@commitlint/cli": "^19.2.1",
"@commitlint/config-conventional": "^19.1.0",
"@girs/adw-1": "^1.4.0-3.2.2",
"@girs/clutter-13": "^13.0.0-3.2.5",
"@girs/gda-5.0": "^5.0.0-3.2.2",
"@girs/gda-6.0": "^6.0.0-3.2.5",
"@girs/gdk-4.0": "^4.0.0-3.2.2",
"@girs/gdkpixbuf-2.0": "^2.0.0-3.2.2",
"@girs/gio-2.0": "^2.77.0-3.2.2",
"@girs/glib-2.0": "^2.77.0-3.2.2",
"@girs/gnome-shell": "^3.0.0",
"@girs/gobject-2.0": "^2.77.0-3.2.2",
"@girs/graphene-1.0": "^1.0.0-3.2.2",
"@girs/gsound-1.0": "^1.0.0-3.2.2",
"@girs/gtk-4.0": "^4.12.0-3.2.2",
"@girs/meta-13": "^13.0.0-3.2.5",
"@girs/pango-1.0": "^1.51.0-3.2.2",
"@girs/shell-13": "^13.0.0-3.2.5",
"@girs/soup-3.0": "^3.4.2-3.2.2",
"@girs/st-13": "^13.0.0-3.2.5",
"@girs/adw-1": "1.4.3-3.3.0",
"@girs/clutter-14": "14.0.0-3.3.0",
"@girs/gda-5.0": "5.0.0-3.3.0",
"@girs/gda-6.0": "6.0.0-3.3.0",
"@girs/gdk-4.0": "4.0.0-3.3.0",
"@girs/gdkpixbuf-2.0": "2.0.0-3.3.0",
"@girs/gio-2.0": "2.78.0-3.3.0",
"@girs/glib-2.0": "2.78.0-3.3.0",
"@girs/gnome-shell": "46.0.0-beta1",
"@girs/gobject-2.0": "2.78.0-3.3.0",
"@girs/graphene-1.0": "1.0.0-3.3.0",
"@girs/gsound-1.0": "1.0.0-3.3.0",
"@girs/gtk-4.0": "4.12.5-3.3.0",
"@girs/meta-14": "14.0.0-3.3.0",
"@girs/pango-1.0": "1.51.0-3.3.0",
"@girs/shell-14": "14.0.0-3.3.0",
"@girs/soup-3.0": "3.4.4-3.3.0",
"@girs/st-14": "14.0.0-3.3.0",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-typescript": "^11.1.6",
Expand Down
1 change: 0 additions & 1 deletion rollup.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ const importsGeneral = {
'gi://Shell?version=14': { name: 'gi://Shell' },
'gi://St?version=14': { name: 'gi://St' },


// non core dependencies (can have version specifier!)
'gi://Gda?version=5.0': { name: 'gi://Gda?version>=5.0' }, // We officially support (it's also typed!) both 5.0 and 6.0
'gi://GSound?version=1.0': { name: 'gi://GSound' },
Expand Down
2 changes: 1 addition & 1 deletion src/components/codePanoItem.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Gio from '@girs/gio-2.0';
import Pango from '@girs/pango-1.0';
import St1 from '@girs/st-13';
import St1 from '@girs/st-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import { PanoItem } from '@pano/components/panoItem';
import { ClipboardContent, ClipboardManager, ContentType } from '@pano/utils/clipboardManager';
Expand Down
4 changes: 2 additions & 2 deletions src/components/colorPanoItem.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Clutter from '@girs/clutter-13';
import Clutter from '@girs/clutter-14';
import Gio from '@girs/gio-2.0';
import St1 from '@girs/st-13';
import St1 from '@girs/st-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import { PanoItem } from '@pano/components/panoItem';
import { ClipboardContent, ClipboardManager, ContentType } from '@pano/utils/clipboardManager';
Expand Down
4 changes: 2 additions & 2 deletions src/components/emojiPanoItem.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Clutter from '@girs/clutter-13';
import Clutter from '@girs/clutter-14';
import Gio from '@girs/gio-2.0';
import Pango from '@girs/pango-1.0';
import St1 from '@girs/st-13';
import St1 from '@girs/st-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import { PanoItem } from '@pano/components/panoItem';
import { ClipboardContent, ClipboardManager, ContentType } from '@pano/utils/clipboardManager';
Expand Down
4 changes: 2 additions & 2 deletions src/components/filePanoItem.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Clutter from '@girs/clutter-13';
import Clutter from '@girs/clutter-14';
import Gio from '@girs/gio-2.0';
import Pango from '@girs/pango-1.0';
import St1 from '@girs/st-13';
import St1 from '@girs/st-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import { PanoItem } from '@pano/components/panoItem';
import { ClipboardContent, ClipboardManager, ContentType, FileOperation } from '@pano/utils/clipboardManager';
Expand Down
4 changes: 2 additions & 2 deletions src/components/imagePanoItem.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Clutter from '@girs/clutter-13';
import Clutter from '@girs/clutter-14';
import Gio from '@girs/gio-2.0';
import St1 from '@girs/st-13';
import St1 from '@girs/st-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import { PanoItem } from '@pano/components/panoItem';
import { ClipboardContent, ClipboardManager, ContentType } from '@pano/utils/clipboardManager';
Expand Down
2 changes: 1 addition & 1 deletion src/components/indicator/clearHistoryDialog.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Clutter from '@girs/clutter-13';
import Clutter from '@girs/clutter-14';
import type St from '@girs/st-13';
import * as dialog from '@gnome-shell/ui/dialog';
import * as modalDialog from '@gnome-shell/ui/modalDialog';
Expand Down
4 changes: 2 additions & 2 deletions src/components/indicator/settingsMenu.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Clutter from '@girs/clutter-13';
import Clutter from '@girs/clutter-14';
import Gio from '@girs/gio-2.0';
import GObject from '@girs/gobject-2.0';
import St1 from '@girs/st-13';
import St1 from '@girs/st-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import * as panelMenu from '@gnome-shell/ui/panelMenu';
import * as popupMenu from '@gnome-shell/ui/popupMenu';
Expand Down
4 changes: 2 additions & 2 deletions src/components/linkPanoItem.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Clutter from '@girs/clutter-13';
import Clutter from '@girs/clutter-14';
import Gio from '@girs/gio-2.0';
import GLib from '@girs/glib-2.0';
import St1 from '@girs/st-13';
import St1 from '@girs/st-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import { PanoItem } from '@pano/components/panoItem';
import { ClipboardContent, ClipboardManager, ContentType } from '@pano/utils/clipboardManager';
Expand Down
6 changes: 3 additions & 3 deletions src/components/monitorBox.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Clutter from '@girs/clutter-13';
import Clutter from '@girs/clutter-14';
import GObject from '@girs/gobject-2.0';
import Shell from '@girs/shell-13';
import St1 from '@girs/st-13';
import Shell from '@girs/shell-14';
import St1 from '@girs/st-14';
import * as layout from '@gnome-shell/ui/layout';
import * as lightbox from '@gnome-shell/ui/lightbox';
import * as main from '@gnome-shell/ui/main';
Expand Down
8 changes: 4 additions & 4 deletions src/components/panoItem.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import Clutter from '@girs/clutter-13';
import Clutter from '@girs/clutter-14';
import Gio from '@girs/gio-2.0';
import GLib from '@girs/glib-2.0';
import GObject from '@girs/gobject-2.0';
import Graphene from '@girs/graphene-1.0';
import Meta from '@girs/meta-13';
import Shell from '@girs/shell-13';
import St1 from '@girs/st-13';
import Meta from '@girs/meta-14';
import Shell from '@girs/shell-14';
import St1 from '@girs/st-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import { PanoItemHeader } from '@pano/components/panoItemHeader';
import { ClipboardManager } from '@pano/utils/clipboardManager';
Expand Down
6 changes: 3 additions & 3 deletions src/components/panoItemHeader.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Clutter from '@girs/clutter-13';
import Clutter from '@girs/clutter-14';
import Gio from '@girs/gio-2.0';
import GLib from '@girs/glib-2.0';
import GObject from '@girs/gobject-2.0';
import Shell from '@girs/shell-13';
import St1 from '@girs/st-13';
import Shell from '@girs/shell-14';
import St1 from '@girs/st-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import { registerGObjectClass, SignalsDefinition } from '@pano/utils/gjs';
import { ICON_PACKS, IPanoItemType } from '@pano/utils/panoItemType';
Expand Down
6 changes: 3 additions & 3 deletions src/components/panoScrollView.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Clutter from '@girs/clutter-13';
import Clutter from '@girs/clutter-14';
import Gio from '@girs/gio-2.0';
import GObject from '@girs/gobject-2.0';
import Shell from '@girs/shell-13';
import St1 from '@girs/st-13';
import Shell from '@girs/shell-14';
import St1 from '@girs/st-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import { PanoItem } from '@pano/components/panoItem';
import { SearchBox } from '@pano/components/searchBox';
Expand Down
8 changes: 4 additions & 4 deletions src/components/searchBox.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Clutter from '@girs/clutter-13';
import Clutter from '@girs/clutter-14';
import Gio from '@girs/gio-2.0';
import GObject from '@girs/gobject-2.0';
import Meta from '@girs/meta-13';
import Shell from '@girs/shell-13';
import St1 from '@girs/st-13';
import Meta from '@girs/meta-14';
import Shell from '@girs/shell-14';
import St1 from '@girs/st-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import { registerGObjectClass, SignalRepresentationType, SignalsDefinition } from '@pano/utils/gjs';
import { getPanoItemTypes, ICON_PACKS } from '@pano/utils/panoItemType';
Expand Down
2 changes: 1 addition & 1 deletion src/components/textPanoItem.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Gio from '@girs/gio-2.0';
import Pango from '@girs/pango-1.0';
import St1 from '@girs/st-13';
import St1 from '@girs/st-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import { PanoItem } from '@pano/components/panoItem';
import { ClipboardContent, ClipboardManager, ContentType } from '@pano/utils/clipboardManager';
Expand Down
6 changes: 3 additions & 3 deletions src/containers/panoWindow.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Clutter from '@girs/clutter-13';
import Clutter from '@girs/clutter-14';
import Gio from '@girs/gio-2.0';
import Shell from '@girs/shell-13';
import St1 from '@girs/st-13';
import Shell from '@girs/shell-14';
import St1 from '@girs/st-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import { MonitorBox } from '@pano/components/monitorBox';
import { PanoScrollView } from '@pano/components/panoScrollView';
Expand Down
2 changes: 1 addition & 1 deletion src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import './styles/stylesheet.css';

import Gio from '@girs/gio-2.0';
import GLib from '@girs/glib-2.0';
import Shell from '@girs/shell-13';
import Shell from '@girs/shell-14';
import { Extension, ExtensionMetadata } from '@gnome-shell/extensions/extension';
import PanoIndicator from '@pano/components/indicator';
import { PanoWindow } from '@pano/containers/panoWindow';
Expand Down
2 changes: 1 addition & 1 deletion src/types/misc/animationUtils/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type Clutter from '@girs/clutter-13';
import type Clutter from '@girs/clutter-14';

export function wiggle(
actor: Clutter.Actor,
Expand Down
2 changes: 1 addition & 1 deletion src/types/st/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/ban-types */
import Clutter from '@girs/clutter-13';
import Clutter from '@girs/clutter-14';

type AnimatableActorFields =
| 'fixed_x'
Expand Down
2 changes: 1 addition & 1 deletion src/types/ui/layout/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type Clutter from '@girs/clutter-13';
import type Clutter from '@girs/clutter-14';

export {
Geometry,
Expand Down
4 changes: 2 additions & 2 deletions src/types/ui/lightbox/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type Clutter from '@girs/clutter-13';
import type St1 from '@girs/st-13';
import type Clutter from '@girs/clutter-14';
import type St1 from '@girs/st-14';

export interface LightboxParams extends St1.Bin.ConstructorProperties {
active?: boolean;
Expand Down
2 changes: 1 addition & 1 deletion src/types/ui/messageTray/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
Urgency,
} from '@girs/gnome-shell/src/ui/messageTray';
import GObject from '@girs/gobject-2.0';
import St1 from '@girs/st-13';
import St1 from '@girs/st-14';
export namespace Notification {
export interface Params {
gicon?: Gio.Icon | St1.ImageContent | null;
Expand Down
2 changes: 1 addition & 1 deletion src/types/ui/modalDialog/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export {
} from '@girs/gnome-shell/src/ui/modalDialog';

import { State } from '@girs/gnome-shell/src/ui/modalDialog';
import type Shell from '@girs/shell-13';
import type Shell from '@girs/shell-14';
import type St from '@girs/st-13';

import { Dialog } from '../dialog';
Expand Down
6 changes: 3 additions & 3 deletions src/utils/clipboardManager.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Gio from '@girs/gio-2.0';
import GLib from '@girs/glib-2.0';
import GObject from '@girs/gobject-2.0';
import Meta from '@girs/meta-13';
import Shell from '@girs/shell-13';
import St1 from '@girs/st-13';
import Meta from '@girs/meta-14';
import Shell from '@girs/shell-14';
import St1 from '@girs/st-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import { registerGObjectClass, SignalRepresentationType } from '@pano/utils/gjs';
import { debounce, getCurrentExtensionSettings, logger } from '@pano/utils/shell';
Expand Down
4 changes: 2 additions & 2 deletions src/utils/keyManager.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Gio from '@girs/gio-2.0';
import Meta from '@girs/meta-13';
import Shell from '@girs/shell-13';
import Meta from '@girs/meta-14';
import Shell from '@girs/shell-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import { getCurrentExtensionSettings } from '@pano/utils/shell';
import { wm } from '@pano/utils/ui';
Expand Down
2 changes: 1 addition & 1 deletion src/utils/panoItemFactory.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Cogl from '@girs/cogl-13';
import Cogl from '@girs/cogl-14';
import GdkPixbuf from '@girs/gdkpixbuf-2.0';
import Gio from '@girs/gio-2.0';
import GLib from '@girs/glib-2.0';
Expand Down
8 changes: 4 additions & 4 deletions src/utils/ui.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import Clutter from '@girs/clutter-13';
import Cogl from '@girs/cogl-13';
import Clutter from '@girs/clutter-14';
import Cogl from '@girs/cogl-14';
import GdkPixbuf from '@girs/gdkpixbuf-2.0';
import Gio from '@girs/gio-2.0';
import GLib from '@girs/glib-2.0';
import Shell from '@girs/shell-13';
import St1 from '@girs/st-13';
import Shell from '@girs/shell-14';
import St1 from '@girs/st-14';
import { ExtensionBase } from '@gnome-shell/extensions/extension';
import * as animationUtils from '@gnome-shell/misc/animationUtils';
import * as layout from '@gnome-shell/ui/layout';
Expand Down
Loading

0 comments on commit d9568d8

Please sign in to comment.