add safari support,tested and is working

.github/workflows/build.yml

@@ -41,7 +41,42 @@ jobs:
           path: artifacts/chrome.zip
       - name: Check reproducibility from src-zip
         run: make test-reproducibility-chrome
+  build-safari:
+    runs-on: macos-latest
 
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Build Safari
+        run: make build-safari
+
+      - name: Check reproducibility from src-zip
+        run: make test-reproducibility-safari
+
+      - name: Convert Chrome Extension to Safari
+        run: |
+          xcrun safari-web-extension-converter ./build \
+            --project-location . \
+            --bundle-identifier net.activitywatch.activitywatchwebwatcher \
+            --macos-only \
+            --force
+
+      - name: Build Xcode Project
+        run: |
+          xcodebuild -project "ActivityWatch Web Watcher/ActivityWatch Web Watcher.xcodeproj" -list
+          xcodebuild -project "ActivityWatch Web Watcher/ActivityWatch Web Watcher.xcodeproj" \
+                     -scheme "ActivityWatch Web Watcher" \
+                     -configuration Release \
+                     clean build
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: safari
+          path: |
+            ~/Library/Developer/Xcode/DerivedData/**/Build/Products/Release/
+            artifacts/safari.zip
   typecheck:
     runs-on: ubuntu-latest
 

Makefile

@@ -30,6 +30,12 @@ build-firefox: install update-firefox zip-build-firefox
 update-firefox:
 	VITE_TARGET_BROWSER=firefox npx vite build
 
+# Add Safari build targets
+build-safari: install update-safari zip-build-safari
+
+update-safari:
+	VITE_TARGET_BROWSER=safari npx vite build
+
 #---------
 ## Zipping
 
@@ -40,6 +46,9 @@ zip-build-chrome:
 zip-build-firefox:
 	mkdir -p artifacts && cd build && zip -FS ../artifacts/firefox.zip -r *
 
+zip-build-safari:
+	mkdir -p artifacts && cd build && zip -FS ../artifacts/safari.zip -r *
+
 # To build a source archive, wanted by Mozilla reviewers. Include media subdir.
 # NOTE: we include the .git in the media archive so that it lines up with the output
 # of vite
@@ -85,3 +94,14 @@ test-reproducibility-firefox: zip-src build-firefox test-reproducibility-setup
 		"$$(wc -c artifacts/reproducibility-firefox.zip | awk '{print $$1}')" \
 		|| (echo "❌ Build artifacts are not the same size" && exit 1)
 	@echo "✅ Build artifacts are the same size"
+
+# Tests whether the zipped src reliably builds the same as the archive
+test-reproducibility-safari: zip-src build-safari test-reproducibility-setup
+	@echo "Building from src-zip..."
+	@(cd build/aw-watcher-web && make build-safari && cp artifacts/safari.zip ../../artifacts/reproducibility-safari.zip)
+	@rm -r build/aw-watcher-web
+	@echo "Checking..."
+	@test "$$(wc -c artifacts/safari.zip | awk '{print $$1}')" = \
+		"$$(wc -c artifacts/reproducibility-safari.zip | awk '{print$$1}')" \
+		|| (echo "❌ Build artifacts are not the same size" && exit 1)
+	@echo "✅ Build artifacts are the same size"

README.md

@@ -86,6 +86,40 @@ This will create zip files in the `artifacts` directory:
 - `artifacts/firefox.zip` for Firefox
 - `artifacts/chrome.zip` for Chrome
 
+## if you want to build safari version
+
+1. First follow the steps above to build the extension:
+
+```sh
+make install
+make build-safari
+```
+
+2. Convert the extension to Safari format:
+
+```sh
+xcrun safari-web-extension-converter ./build
+```
+
+after finished, xcode will open automatically.
+
+3. In Xcode:
+
+- Select build target of macOS
+- Build the project (⌘B)
+- Run the extension (⌘R)
+
+4. Enable the extension in Safari:
+    - Open Safari
+    - Go to Safari > Settings > Extensions
+    - Enable "aw-watcher-web"
+
+> [!NOTE]
+>
+> - You need Xcode installed to build Safari extensions
+> - The extension needs to be signed with your Apple Developer account
+> - Safari extensions require macOS 11.0 or later
+
 ### Installing the Development Build
 
 #### Chrome

src/consent/main.ts

@@ -3,7 +3,10 @@ import { setConsentStatus, setEnabled } from '../storage'
 
 const consentRefused = document.getElementById('consent-refused')!
 consentRefused.addEventListener('click', () => {
-  browser.management.uninstallSelf()
+  // Conditionally uninstall if not Safari
+  if (import.meta.env.VITE_TARGET_BROWSER !== 'safari') {
+    browser.management.uninstallSelf()
+  }
   window.close()
 })
 

src/manifest.json

@@ -1,6 +1,7 @@
 {
     "{{chrome}}.manifest_version": 3,
     "{{firefox}}.manifest_version": 2,
+    "{{safari}}.manifest_version": 3,
 
     "name": "ActivityWatch Web Watcher",
     "description": "Log the current tab and your browser activity with ActivityWatch.",
@@ -17,11 +18,16 @@
         "default_icon": "logo-128.png",
         "default_popup": "src/popup/index.html"
     },
+    "{{safari}}.action": {
+        "default_icon": { "128": "logo-128.png" },
+        "default_popup": "src/popup/index.html"
+    },
 
     "background": {
         "{{chrome}}.service_worker": "src/background/main.ts",
         "{{firefox}}.scripts": ["src/background/main.ts"],
-        "{{firefox}}.persistent": true
+        "{{firefox}}.persistent": true,
+        "{{safari}}.service_worker": "src/background/main.ts"
     },
 
     "options_ui": {
@@ -44,7 +50,15 @@
         "activeTab",
         "storage"
     ],
+    "{{safari}}.permissions": [
+        "tabs",
+        "alarms",
+        "notifications",
+        "activeTab",
+        "storage"
+    ],
     "{{chrome}}.host_permissions": ["<all_urls>"],
+    "{{safari}}.host_permissions": ["<all_urls>"],
 
     "{{firefox}}.browser_specific_settings": {
         "gecko": {

src/settings/index.html

@@ -16,6 +16,7 @@
         <select id="browser" name="browser">
           <option value="chrome">Chrome</option>
           <option value="firefox">Firefox</option>
+          <option value="safari">Safari</option>
           <option value="opera">Opera</option>
           <option value="brave">Brave</option>
           <option value="edge">Edge</option>