Skip to content
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.

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

Update gnome 46 types #265

Merged
merged 30 commits into from
Apr 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
bab232d
add gnome 46 the supported versions in the README
Totto16 Mar 25, 2024
bb46d77
also bump the version of the extension in the metadata.json file
Totto16 Mar 25, 2024
09f9077
update dependencies:
Totto16 Mar 25, 2024
0a250a4
bump types for core Gnome dependencies in the rollup config
Totto16 Mar 25, 2024
360735d
move to v14 types
Totto16 Mar 26, 2024
5c90b72
- remove own types, and solely use the @girs/gnome-shell types
Totto16 Mar 27, 2024
571873c
add "--failAfterWarnings" to the rollup command, since after the type…
Totto16 Mar 27, 2024
c94a1c0
adjust remaining type errors to be correctly types:
Totto16 Apr 17, 2024
d9e7015
fix some rollup warnings
Totto16 Apr 17, 2024
6fa5a54
- fix "gettext-parser" by downgrading it, it only allows ESM in this …
Totto16 Apr 17, 2024
89ab695
readd "--failAfterWarnings" to the rollup command, since the correct …
Totto16 Apr 17, 2024
e714cd0
remove unnecessary casts ("as unknown" or "as any")
Totto16 Apr 17, 2024
99dc073
fix README:
Totto16 Apr 17, 2024
b47c99a
add Ci
Totto16 Apr 17, 2024
1ac8ea6
- add prettier ignore
Totto16 Apr 17, 2024
cf8c2f6
make ci names prettier
Totto16 Apr 17, 2024
2dda23a
only run the ci on pushes to master, and on PRs
Totto16 Apr 17, 2024
7dacd09
use the beta types, fix issues with that
Totto16 Apr 18, 2024
5fb7c42
fix gnome 45 compatibility issues with St.ScrollView
Totto16 Apr 19, 2024
b19238a
fix Notification compatibility
Totto16 Apr 19, 2024
9bdeb79
add compatibility function for getting the horizontal and vertical ad…
Totto16 Apr 19, 2024
721def5
rename St1 to St
Totto16 Apr 19, 2024
15e7206
bump gnome-shell types
Totto16 Apr 19, 2024
60a9152
fix sed command invocation for the CI
Totto16 Apr 19, 2024
108a138
remove wrong steps from the CI config
Totto16 Apr 19, 2024
3bf84eb
fix final compatibility of Notifications
Totto16 Apr 20, 2024
6754b62
use strictest tsconfig rules
Totto16 Apr 20, 2024
0291b6b
fix all typescript errors
Totto16 Apr 20, 2024
4ba5f6c
fix eslint errors
Totto16 Apr 20, 2024
5acb8f5
commit changed comments in generated resource files
Totto16 Apr 20, 2024
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
38 changes: 38 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Yarn CI

on:
push:
branches:
- master
pull_request:

jobs:
build:
name: Yarn CI with Node ${{ matrix.node-version }}
runs-on: ubuntu-22.04

strategy:
matrix:
node-version:
- 20.x

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: yarn install

- name: Validate Formatting
run: yarn run prettier:check

- name: Build Extension
run: yarn run build

- name: Lint Extension
run: yarn run lint
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.github/
node_modules/
*.md
14 changes: 7 additions & 7 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
semi: true,
trailingComma: 'all',
singleQuote: true,
printWidth: 120,
tabWidth: 2,
};
module.exports = {
semi: true,
trailingComma: 'all',
singleQuote: true,
printWidth: 120,
tabWidth: 2,
};
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@
"titleBar.inactiveForeground": "#e7e7e799"
},
"peacock.color": "#5b1943"
}
}
8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

### Legacy versions

Since Gnome 45 we had to break compatibility with previous Gnome versions, these only receive critical bug / security fixes and ar not maintained actively
Since Gnome 45 we had to break compatibility with previous Gnome versions, these only receive critical bug / security fixes and ar not maintained actively. See [here](https://github.com/oae/gnome-shell-pano/tree/legacy)

- Gnome Shell 42
- Gnome Shell 43
Expand All @@ -93,7 +93,7 @@ Since Gnome 45 we had to break compatibility with previous Gnome versions, these
### Current version

- Gnome Shell 45

- Gnome Shell 46

## Installation

Expand Down Expand Up @@ -161,10 +161,6 @@ busctl --user call org.gnome.Shell /io/elhan/Pano io.elhan.Pano show # shows pan

## Development

### Dependencies

- Fedora: `sudo dnf install cogl-devel gsound-devel libgda-devel`

### Build

- This extension is written in Typescript and uses rollup to compile it into javascript.
Expand Down
77 changes: 40 additions & 37 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"scripts": {
"build": "yarn run build:ts && yarn run gen:locale && yarn run build:extension",
"gen:locale": "yarn run ts-node scripts/generateLocale.ts",
"build:ts": "yarn run clean:ts && rollup -c && sed -i '/setTimeout/d' dist/thirdparty/prismjs.js && sed -i 's/var\\ /let\\ /g' dist/{extension,prefs}.js",
"build:ts": "yarn run clean:ts && rollup -c --failAfterWarnings && sed -i '/setTimeout/d' dist/thirdparty/prismjs.js && sed -i 's/var\\ /let\\ /g' dist/extension.js dist/prefs.js",
"clean:ts": "rm -rf ./dist",
"build:extension": "yarn run build:schema",
"build:schema": "yarn run clean:schema && glib-compile-schemas ./resources/schemas --targetdir=./dist/schemas/",
Expand All @@ -17,7 +17,9 @@
"test": "echo \"Error: no test specified\" && exit 1",
"lint": "eslint --ext .ts src/",
"shell:restart": "busctl --user call org.gnome.Shell /io/elhan/Pano io.elhan.Pano restart",
"build-and-restart": "yarn run build && yarn run shell:restart"
"build-and-restart": "yarn run build && yarn run shell:restart",
"prettier:check": "prettier --check .",
"prettier:fix": "prettier --write ."
},
"commitlint": {
"extends": [
Expand All @@ -31,59 +33,60 @@
}
},
"devDependencies": {
"@commitlint/cli": "^18.4.1",
"@commitlint/config-conventional": "^18.4.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",
"@commitlint/cli": "^19.2.2",
"@commitlint/config-conventional": "^19.2.2",
"@girs/adw-1": "1.5.0-4.0.0-beta.2",
"@girs/clutter-14": "14.0.0-4.0.0-beta.2",
"@girs/gda-5.0": "5.0.0-4.0.0-beta.2",
"@girs/gda-6.0": "6.0.0-4.0.0-beta.2",
"@girs/gdk-4.0": "4.0.0-4.0.0-beta.2",
"@girs/gdkpixbuf-2.0": "2.0.0-4.0.0-beta.2",
"@girs/gio-2.0": "2.80.0-4.0.0-beta.2",
"@girs/glib-2.0": "2.80.0-4.0.0-beta.2",
"@girs/gnome-shell": "46.0.0-4.0.0-beta.3",
"@girs/gobject-2.0": "2.80.0-4.0.0-beta.2",
"@girs/graphene-1.0": "1.0.0-4.0.0-beta.2",
"@girs/gsound-1.0": "1.0.0-4.0.0-beta.2",
"@girs/gtk-4.0": "4.14.1-4.0.0-beta.2",
"@girs/meta-14": "14.0.0-4.0.0-beta.2",
"@girs/pango-1.0": "1.51.2-4.0.0-beta.2",
"@girs/shell-14": "14.0.0-4.0.0-beta.2",
"@girs/soup-3.0": "3.4.4-4.0.0-beta.2",
"@girs/st-14": "14.0.0-4.0.0-beta.2",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-typescript": "^11.1.5",
"@rollup/plugin-typescript": "^11.1.6",
"@types/events": "^3.0.3",
"@types/gettext-parser": "^4.0.4",
"@types/highlight.js": "^10.1.0",
"@types/is-url": "^1.2.32",
"@types/prismjs": "^1.26.3",
"@typescript-eslint/eslint-plugin": "^6.10.0",
"@typescript-eslint/parser": "^6.10.0",
"@typescript-eslint/eslint-plugin": "^7.7.0",
"@typescript-eslint/parser": "^7.7.0",
"cross-env": "^7.0.3",
"eslint": "^8.53.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-simple-import-sort": "^10.0.0",
"fill-pot-po": "^2.2.8",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-simple-import-sort": "^12.1.0",
"fill-pot-po": "^3.0.4",
"gettext-extractor": "^3.8.0",
"gettext-parser": "^7.0.1",
"glob": "^10.3.10",
"husky": "^4.3.8",
"prettier": "^3.0.3",
"rollup": "^4.4.0",
"glob": "^10.3.12",
"husky": "^9.0.11",
"prettier": "^3.2.5",
"rollup": "^4.14.3",
"rollup-plugin-cleanup": "^3.2.1",
"rollup-plugin-copy": "^3.5.0",
"rollup-plugin-styles": "^4.0.0",
"ts-node": "^10.9.1",
"typescript": "^5.2.2"
"ts-node": "^10.9.2",
"typescript": "^5.4.5",
"@tsconfig/strictest": "^2.0.5"
},
"dependencies": {
"date-fns": "^2.30.0",
"hex-color-converter": "^0.2.1",
"highlight.js": "^11.9.0",
"htmlparser2": "^9.0.0",
"htmlparser2": "^9.1.0",
"is-url": "^1.2.4",
"pretty-bytes": "^6.1.1",
"prismjs": "^1.29.0",
Expand Down
7 changes: 2 additions & 5 deletions resources/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@
"description": "Next-gen Clipboard manager for Gnome Shell\n\nYou need libgda and gsound for this extension to work.\n\nFedora: sudo dnf install libgda libgda-sqlite\nArch Linux: sudo pacman -S libgda (libgda6 for gnome-43 or later)\nUbuntu/Debian: sudo apt install gir1.2-gda-5.0 gir1.2-gsound-1.0\nopenSUSE: sudo zypper install libgda-6_0-sqlite typelib-1_0-Gda-6_0 typelib-1_0-GSound-1_0",
"uuid": "[email protected]",
"gettext-domain": "[email protected]",
"version": 1000,
"version": 1001,
"donations": {
"github": "oae"
},
"settings-schema": "org.gnome.shell.extensions.pano",
"url": "https://github.com/oae/gnome-shell-pano",
"shell-version": [
"45",
"46"
]
"shell-version": ["45", "46"]
}
34 changes: 17 additions & 17 deletions resources/po/ar.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"X-Generator: fill-pot-po/2.2.8\n"
"X-Generator: fill-pot-po/3.0.4\n"

#: src/components/indicator/clearHistoryDialog.ts:23
msgid "Cancel"
Expand All @@ -13,7 +13,7 @@ msgid "Clear"
msgstr "إزالة"

#: src/components/indicator/clearHistoryDialog.ts:35
#: src/components/indicator/settingsMenu.ts:94
#: src/components/indicator/settingsMenu.ts:101
#: src/prefs/dangerZone/clearHistory.ts:14
msgid "Clear History"
msgstr "إزالة السجل"
Expand All @@ -23,19 +23,19 @@ msgstr "إزالة السجل"
msgid "Are you sure you want to clear history?"
msgstr "هل أنت متأكد من رغبتك بإزالة السجل؟"

#: src/components/indicator/settingsMenu.ts:61
#: src/components/indicator/settingsMenu.ts:67
msgid "Incognito Mode"
msgstr "الوضع المخفي"

#: src/components/indicator/settingsMenu.ts:101
#: src/components/indicator/settingsMenu.ts:108
msgid "Settings"
msgstr "الإعدادات"

#: src/components/linkPanoItem.ts:38
msgid "No Description"
msgstr ""

#: src/components/searchBox.ts:68
#: src/components/searchBox.ts:69
msgid "Type to search, Tab to cycle"
msgstr ""

Expand Down Expand Up @@ -539,11 +539,11 @@ msgstr "مزامنة التحديد الرئيسي"
msgid "Sync primary selection with clipboard selection"
msgstr "مزامنة التحديد الرئيسي مع تحديد الحافظة"

#: src/prefs/general/watchExclusions.ts:14
#: src/prefs/general/watchExclusions.ts:15
msgid "Watch Exclusions"
msgstr "راقب الاستثناءات"

#: src/prefs/general/watchExclusions.ts:15
#: src/prefs/general/watchExclusions.ts:16
msgid "When enabled, Pano will not track clipboard from excluded apps"
msgstr "عند التمكين لن يتعقب بانو حافظة التطبيقات المستثناة"

Expand All @@ -555,39 +555,39 @@ msgstr ""
msgid "Wiggles the indicator on panel"
msgstr ""

#: src/utils/panoItemFactory.ts:392
#: src/utils/panoItemFactory.ts:406
msgid "Image Copied"
msgstr ""

#: src/utils/panoItemFactory.ts:393
#: src/utils/panoItemFactory.ts:407
msgid "Width: %spx, Height: %spx, Size: %s"
msgstr ""

#: src/utils/panoItemFactory.ts:397
#: src/utils/panoItemFactory.ts:411
msgid "Text Copied"
msgstr ""

#: src/utils/panoItemFactory.ts:399
#: src/utils/panoItemFactory.ts:413
msgid "Code Copied"
msgstr ""

#: src/utils/panoItemFactory.ts:401
#: src/utils/panoItemFactory.ts:415
msgid "Emoji Copied"
msgstr ""

#: src/utils/panoItemFactory.ts:409
#: src/utils/panoItemFactory.ts:423
msgid "Link Copied"
msgstr ""

#: src/utils/panoItemFactory.ts:429
#: src/utils/panoItemFactory.ts:443
msgid "Color Copied"
msgstr ""

#: src/utils/panoItemFactory.ts:436
#: src/utils/panoItemFactory.ts:450
msgid "File %s"
msgstr ""

#: src/utils/panoItemFactory.ts:437
#: src/utils/panoItemFactory.ts:451
msgid "There are %s file(s)"
msgstr ""

Expand Down Expand Up @@ -619,6 +619,6 @@ msgstr ""
msgid "Color"
msgstr ""

#: src/utils/ui.ts:24
#: src/utils/ui.ts:27
msgid "Pano"
msgstr ""
Loading