Get last updates and update to gnome 42

.eslintrc.yml

@@ -0,0 +1,35 @@
+ignorePatterns:
+  - _build/**
+
+extends:
+ - ./lint/eslintrc-gjs.yml
+ - ./lint/eslintrc-shell.yml
+
+overrides:
+  - files: ./*.js
+    globals:
+      global: readonly
+      _: readonly
+      C_: readonly
+      N_: readonly
+      ngettext: readonly
+
+    rules:
+      prefer-const: error
+      prefer-destructuring: warn
+      guard-for-in: error
+      max-len:
+        - error
+        - code: 110
+          ignoreUrls: true
+          ignoreTemplateLiterals: true
+
+      comma-dangle:
+        - error
+        - arrays: always-multiline
+          objects: always-multiline
+          imports: always-multiline
+          functions: never
+
+parserOptions:
+  sourceType: module

.github/workflows/make.yml

@@ -0,0 +1,32 @@
+---
+name: Make
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+      - ubuntu-dock
+      - make_ci
+
+jobs:
+  make:
+    name: Make
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v4
+
+      - name: Install dependencies.
+        run: sudo apt-get install -y sassc gettext
+
+      - name: Make
+        run: make
+
+      - name: Install modules
+        run: sudo npm install eslint -g
+
+      - name: Make Check
+        run: make check
+
+      - name: Make Install
+        run: make install

.gitignore

@@ -5,4 +5,5 @@ [email protected]
 *.mo
 po/dashtodock.pot
 stylesheet.css
+Settings.ui.h
 _build

Makefile

@@ -1,10 +1,48 @@
 # Basic Makefile
 
 UUID = [email protected]
-BASE_MODULES = extension.js metadata.json COPYING README.md
-EXTRA_MODULES = dash.js docking.js appIcons.js appIconIndicators.js fileManager1API.js launcherAPI.js locations.js windowPreview.js intellihide.js prefs.js theming.js utils.js dbusmenuUtils.js Settings.ui
-EXTRA_MEDIA = logo.svg glossy.svg highlight_stacked_bg.svg highlight_stacked_bg_h.svg
-TOLOCALIZE =  prefs.js appIcons.js locations.js
+BASE_MODULES = extension.js \
+               metadata.json \
+               COPYING \
+               README.md \
+               $(NULL)
+
+EXTRA_MODULES = \
+                appSpread.js \
+                dash.js \
+                docking.js \
+                appIcons.js \
+				appIconsDecorator.js \
+                appIconIndicators.js \
+                fileManager1API.js \
+                imports.js \
+                launcherAPI.js \
+                locations.js \
+                locationsWorker.js \
+                notificationsMonitor.js \
+                windowPreview.js \
+                intellihide.js \
+                prefs.js \
+                theming.js \
+                utils.js \
+                dbusmenuUtils.js \
+                desktopIconsIntegration.js \
+                Settings.ui \
+                $(NULL)
+
+EXTRA_MEDIA = logo.svg \
+              glossy.svg \
+              highlight_stacked_bg.svg \
+              highlight_stacked_bg_h.svg \
+              $(NULL)
+
+TOLOCALIZE =  prefs.js \
+			  docking.js \
+              appIcons.js \
+              appIconsDecorator.js \
+              locations.js \
+              $(NULL)
+
 MSGSRC = $(wildcard po/*.po)
 ifeq ($(strip $(DESTDIR)),)
 	INSTALLTYPE = local
@@ -48,9 +86,9 @@ mergepo: potfile
 
 ./po/dashtodock.pot: $(TOLOCALIZE) Settings.ui
 	mkdir -p po
-	xgettext -k --keyword=__ --keyword=N__ --add-comments='Translators:' -o po/dashtodock.pot --package-name "Dash to Dock" --from-code=utf-8 $(TOLOCALIZE)
+	xgettext --keyword=__ --keyword=N__ --add-comments='Translators:' -o po/dashtodock.pot --package-name "Dash to Dock" --from-code=utf-8 $(TOLOCALIZE)
 	intltool-extract --type=gettext/glade Settings.ui
-	xgettext -k --keyword=_ --keyword=N_ --join-existing -o po/dashtodock.pot Settings.ui.h
+	xgettext --keyword=_ --keyword=N_ --join-existing -o po/dashtodock.pot Settings.ui.h
 
 ./po/%.mo: ./po/%.po
 	msgfmt -c $< -o $@
@@ -82,7 +120,7 @@ endif
 	-rm -fR _build
 	echo done
 
-zip-file: _build
+zip-file: _build check
 	cd _build ; \
 	zip -qr "$(UUID)$(VSTRING).zip" .
 	mv _build/$(UUID)$(VSTRING).zip ./
@@ -92,6 +130,7 @@ _build: all
 	-rm -fR ./_build
 	mkdir -p _build
 	cp $(BASE_MODULES) $(EXTRA_MODULES) _build
+	cp -a dependencies _build
 	cp stylesheet.css _build
 	mkdir -p _build/media
 	cd media ; cp $(EXTRA_MEDIA) ../_build/media/
@@ -106,3 +145,14 @@ _build: all
 		cp $$l $$lf/LC_MESSAGES/dashtodock.mo; \
 	done;
 	sed -i 's/"version": -1/"version": "$(VERSION)"/'  _build/metadata.json;
+
+ifeq ($(strip $(ESLINT)),)
+    ESLINT = eslint
+endif
+
+ifneq ($(strip $(ESLINT_TAP)),)
+    ESLINT_ARGS = -f tap
+endif
+
+check:
+	ESLINT_USE_FLAT_CONFIG=false $(ESLINT) $(ESLINT_ARGS) .

README.md

@@ -16,10 +16,10 @@ The extension can be installed directly from source, either for the convenience
 
 To compile the stylesheet you'll need an implementation of SASS. Dash to Dock supports `dart-sass` (`sass`), `sassc`, and `ruby-sass`. Every distro should have at least one of these implementations, we recommend using `dart-sass` (`sass`) or `sassc` over `ruby-sass` as `ruby-sass` is deprecated.
 
-By default, Dash to Dock will attempt to build with `dart-sass`. To change this behavior set the `SASS` environment variable to either `sassc` or `ruby`.
+By default, Dash to Dock will attempt to build with `sassc`. To change this behavior set the `SASS` environment variable to either `dart` or `ruby`.
 
 ```bash
-export SASS=sassc
+export SASS=dart
 # or...
 export SASS=ruby
 ```
@@ -32,10 +32,18 @@ Next use `make` to install the extension into your home directory. A Shell reloa
 
 ```bash
 git clone https://github.com/micheleg/dash-to-dock.git
-make
-make install
+make -C dash-to-dock install
 ```
 
+If `msgfmt` is not available on your system, you will see an error message like the following:
+
+```bash
+make: msgfmt: No such file or directory
+```
+
+In this case install the `gettext` package from your distribution's repository.
+
+
 ## Bug Reporting
 
 Bugs should be reported to the Github bug tracker [https://github.com/micheleg/dash-to-dock/issues](https://github.com/micheleg/dash-to-dock/issues).