Rewrite publish workflow

Author: patuwwy

.github/workflows/main.yml

@@ -15,16 +15,33 @@ jobs:
 
       - name: Cleanup
         run: |
-          rm output -rf
+          rm -rf output
 
-      - name: Zip the extension
+      - name: Prepare output directory
         run: |
-          mkdir output
-          VERSION=$(jq -r '.version' ./app/manifest.json)
-          zip -r ./output/ShaderToy-Chrome-Plugin-$VERSION.zip ./app
+          mkdir -p output
+          VERSION=$(cat ./manifests/version.txt)
+          echo $VERSION
+
+      - name: Zip the Chrome extension
+        run: |
+          cp ./app/* ./output/ -r
+          cp ./manifest/manifest-chrome.json ./output/manifest.json
+          jq --arg version "$VERSION" '.version = $version' ./output/manifest.json > ./output/manifest.json.tmp && mv ./output/manifest.json.tmp ./output/manifest.json
+          zip -r ./output/ShaderToy-Chrome-Plugin-$VERSION.zip ./output
           echo $VERSION >> ./output/version.txt
 
-      - name: Upload output as artifact
+      - name: Zip the Firefox extension
+        env:
+          FIREFOX_EXTENSION_ID: ${{ secrets.FIREFOX_EXTENSION_ID }}
+        run: |
+          cp ./app/* ./output/ -r
+          cp ./manifest/manifest-firefox.json ./output/manifest.json
+          jq --arg id "$FIREFOX_EXT_ID" '.browser_specific_settings.gecko.id = $id' ./output/manifest.json > ./output/manifest.json.tmp && mv ./output/manifest.json.tmp ./output/manifest.json
+          jq --arg version "$VERSION" '.version = $version' ./output/manifest.json > ./output/manifest.json.tmp && mv ./output/manifest.json.tmp ./output/manifest.json
+          zip -r ./output/ShaderToy-Firefox-Plugin-$VERSION.zip ./output
+
+      - name: Upload output as artifacts
         uses: actions/upload-artifact@v4
         with:
           name: output
@@ -41,17 +58,25 @@ jobs:
 
       - name: Install Dependencies for Publishing
         run: |
-          npm install -g chrome-webstore-upload-cli
+          npm install --save-dev publish-browser-extension
 
       - name: Upload & Publish Extension to Chrome Store
+        env:
+          CHROME_CLIENT_ID: ${{ secrets.CHROME_CLIENT_ID }}
+          CHROME_CLIENT_SECRET: ${{ secrets.CHROME_CLIENT_SECRET }}
+          CHROME_REFRESH_TOKEN: ${{ secrets.CHROME_REFRESH_TOKEN }}
+          CHROME_EXTENSION_ID: ${{ secrets.CHROME_EXTENSION_ID }}
+          CHROME_PUBLISH_TARGET: trustedTesters
+          CHROME_SKIP_SUBMIT_REVIEW: true
+          FIREFOX_EXTENSION_ID: ${{ secrets.FIREFOX_EXTENSION_ID }}
+          FIREFOX_JWT_ISSUER: ${{ secrets.FIREFOX_JWT_ISSUER }}
+          FIREFOX_JWT_SECRET: ${{ secrets.FIREFOX_JWT_SECRET }}
+
         run: |
           VERSION=$(cat ./output/version.txt)
-          chrome-webstore-upload upload \\
-            --source ./output/ShaderToy-Chrome-Plugin-$VERSION.zip \\
-            --extension-id $APP_ID \\
-            --client-id $CLIENT_ID \\
-            --client-secret $CLIENT_SECRET \\
-            --refresh-token $REFRESH_TOKEN
+          npx publish-extension \
+            --chrome-zip ./output/ShaderToy-Chrome-Plugin-$VERSION.zip \
+            --firefox-zip ./output/ShaderToy-Firefox-Plugin-$VERSION.zip
 
   release:
     runs-on: self-hosted
@@ -65,4 +90,4 @@ jobs:
       - name: Publish Release on GitHub
         run: |
           VERSION=$(cat ./output/version.txt)
-          gh release create $VERSION ./output/ShaderToy-Chrome-Plugin-$VERSION.zip --title "$VERSION" --notes "Release of version $VERSION"
+          gh release create $VERSION ./output/ShaderToy-Chrome-Plugin-$VERSION.zip --title "$VERSION" --notes "Release of version $VERSION (chrome)"

app/manifest.json manifests/manifest-chrome.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 3,
     "name": "Shadertoy unofficial plugin.",
-    "version": "0.14.271",
+    "version": "",
     "description": "Shadertoy.com unofficial plugin.",
     "homepage_url": "https://github.com/patuwwy/ShaderToy-Chrome-Plugin",
     "background": {

manifests/manifest-firefox.json

@@ -0,0 +1,57 @@
+{
+    "manifest_version": 3,
+    "name": "Shadertoy unofficial plugin.",
+    "version": "",
+    "description": "Shadertoy.com unofficial plugin.",
+    "homepage_url": "https://github.com/patuwwy/ShaderToy-Chrome-Plugin",
+    "browser_specific_settings": {
+        "gecko": {
+            "id": ""
+        }
+    },
+    "background": {
+        "scripts": [
+            "background.js"
+        ]
+    },
+    "host_permissions": ["https://www.shadertoy.com/*"],
+    "icons": {
+        "128": "assets/icon_active_128.png"
+    },
+    "action": {
+        "default_title": "ShaderToy plugin",
+        "default_icon": "assets/icon_active_128.png",
+        "default_popup": "popup.html"
+    },
+    "content_scripts": [
+        {
+            "matches": ["https://www.shadertoy.com/*"],
+            "exclude_matches": ["https://www.shadertoy.com/signin"],
+            "js": ["contentscript.js"],
+            "css": ["style.css"],
+            "run_at": "document_end"
+        }
+    ],
+    "web_accessible_resources": [
+        {
+            "resources": [
+                "popup.js",
+                "shadertoy-plugin.js",
+                "shadertoy-plugin-common.js",
+                "add-ons/shadertoy-plugin-codemirror.js",
+                "add-ons/shadertoy-plugin-parameters.js",
+                "add-ons/shadertoy-plugin-bbcode.js",
+                "add-ons/monaco/loader.min.js",
+                "add-ons/monaco/min/vs/editor/editor.main.js",
+                "add-ons/monaco/min/vs/editor/editor.main.css",
+                "add-ons/monaco/min/vs/base/worker/workerMain.js",
+                "shadertoy-plugin-profile.js",
+                "shadertoy-plugin-home.js",
+                "scripts/jszip-3.1.5.js",
+                "scripts/node-sanitize-filename.js"
+            ],
+            "matches": ["https://www.shadertoy.com/*"]
+        }
+    ]
+
+}

manifests/version.txt

@@ -0,0 +1 @@
+0.14.273