Merge remote-tracking branch 'fresh/main' into merge-fresh

Author: tobiasdiez

.github/dependabot.yml

@@ -1,19 +1,27 @@
+# Basic `dependabot.yml` file with
+# minimum configuration for three package managers
+
 version: 2
 updates:
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: friday
-    time: "18:00"
-  open-pull-requests-limit: 10
-  labels:
-  - type:dependency
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: friday
-    time: "18:00"
-  labels:
-  - type:dependency
+  # Enable version updates for npm
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: sunday
+
+  # Enable version updates for GitHub Actions
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the default location of `.github/workflows`
+    # You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: sunday
+  
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    schedule:
+      interval: weekly
+      day: sunday
+    labels: [ ]

.github/workflows/lint.yml

@@ -1,14 +1,27 @@
-name: Lint test
-on: [push]
+name: Lint
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  merge_group:
+  workflow_dispatch:
+
 jobs:
   run:
     name: Run
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 'lts/*'
-        cache: 'npm'
-    - run: npm install
-    - run: $(npm bin)/web-ext lint --self-hosted
+      - uses: actions/checkout@v6
+        with:
+          submodules: recursive
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 'lts/*'
+          cache: npm
+
+      - run: npm install
+
+      - run: npm run lint:eslint

.github/workflows/test.yaml

@@ -0,0 +1,27 @@
+name: Tests
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  merge_group:
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+      with:
+        submodules: true
+    - name: Set up Node.js
+      uses: actions/setup-node@v6
+    - name: Set up Python
+      uses: actions/setup-python@v6
+    - name: Run import_and_patch_translators
+      run: python3 scripts/import_and_patch_translators.py
+    - name: Install dependencies
+      run: npm install
+    - name: Run tests
+      run: npm test

.gitignore

@@ -212,3 +212,7 @@ fabric.properties
 # Support for Project snippet scope
 
 # End of https://www.toptal.com/developers/gitignore/api/intellij,visualstudiocode
+
+# Temporary files
+dist/
+test_cache/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "translators/zotero"]
+	path = translators/zotero
+	url = https://github.com/zotero/translators

CONTRIBUTING.md

@@ -0,0 +1,9 @@
+# Contributing
+
+Follow the typical steps to [contribute code](https://guides.github.com/activities/contributing-to-open-source/#contributing):
+
+1. Create your feature branch: `git checkout -b my-new-feature`
+2. Build and run the add-on as described above.
+3. Commit your changes: `git commit -am 'Add some feature'`
+4. Push to the branch: `git push origin my-new-feature`
+5. Submit a pull request.

Makefile

@@ -0,0 +1,27 @@
+DIST := dist
+CHROME_DIR := $(DIST)/chrome
+FIREFOX_DIR := $(DIST)/firefox
+CHROME_ZIP := $(CHROME_DIR)/jabref-browser-extension-chrome.zip
+FIREFOX_XPI := $(FIREFOX_DIR)/jabref-browser-extension-firefox.xpi
+
+.PHONY: all chrome firefox clean
+
+all: chrome firefox
+
+chrome: $(CHROME_ZIP)
+
+$(CHROME_ZIP):
+	mkdir -p $(CHROME_DIR)
+	zip -r $(CHROME_ZIP) . -x "dist/*" ".git/*" "scripts/*"
+
+firefox: $(FIREFOX_XPI)
+
+$(FIREFOX_XPI):
+	web-ext build --artifacts-dir $(FIREFOX_DIR)  --ignore-files dist/** --ignore-files scripts/** --ignore-files .git/**
+	mv $(FIREFOX_DIR)/jabref-browser-extension-*.zip $(FIREFOX_XPI)
+
+clean:
+	rm -rf $(DIST)
+
+lint:
+	web-ext lint --ignore-files dist/** --ignore-files scripts/** --ignore-files .git/** --ignore-files test.js

README.md

@@ -57,18 +57,7 @@ To update dependencies:
  - `npm outdated` gives an overview of outdated packages ([doc](https://docs.npmjs.com/cli/outdated))
  - `npm-upgrade` updates all packages 
  - `npm install` install updated packages
- - running
-   ```
-    git subtree pull --prefix zotero-connectors https://github.com/zotero/zotero-connectors.git master --squash
-    git subtree pull --prefix zotero-connectors/src/zotero https://github.com/zotero/zotero.git master --squash
-    git subtree pull --prefix zotero-connectors/src/translate https://github.com/zotero/translate.git master --squash
-    git subtree pull --prefix zotero-connectors/src/utilities https://github.com/zotero/utilities.git master --squash
-    git subtree pull --prefix zotero-scholar-citations https://github.com/MaxKuehn/zotero-scholar-citations.git master --squash
-   ```
-   updates the `zotero-connectors` submodule and the `zotero-scholar-citations` submodule  
-
- - `gulp update-external-scripts` copies and post-processes the scripts in the folders `zotero-connectors` and `zotero-scholar-citations` to the folder `external-scripts`
-
+ 
 ## Release of new version
 - Increase version number in `manifest.json`
 - `npm run build`