From 43e07fe72523e1f1e7838cd50ab4617fd253956a Mon Sep 17 00:00:00 2001 From: Ajay Date: Sat, 18 Mar 2023 00:28:26 -0400 Subject: [PATCH 1/3] Fix Invidious support on Firefox --- package-lock.json | 2 +- package.json | 2 +- src/background.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index fb1b654f..02765509 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ ], "license": "LGPL-3.0-or-later", "dependencies": { - "@ajayyy/maze-utils": "^1.1.7", + "@ajayyy/maze-utils": "1.1.7", "content-scripts-register-polyfill": "^4.0.2", "react": "^18.2.0", "react-dom": "^18.2.0" diff --git a/package.json b/package.json index d4399fa3..355ff258 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "", "main": "background.js", "dependencies": { - "@ajayyy/maze-utils": "^1.1.7", + "@ajayyy/maze-utils": "1.1.7", "content-scripts-register-polyfill": "^4.0.2", "react": "^18.2.0", "react-dom": "^18.2.0" diff --git a/src/background.ts b/src/background.ts index f79cfcaf..382b3453 100644 --- a/src/background.ts +++ b/src/background.ts @@ -2,7 +2,7 @@ import * as CompileConfig from "../config.json"; import Config from "./config"; import { Registration } from "./types"; -import registerContentScript from 'content-scripts-register-polyfill/ponyfill.js'; +import "content-scripts-register-polyfill"; import { sendRealRequestToCustomServer, setupBackgroundRequestProxy } from "@ajayyy/maze-utils/lib/background-request-proxy"; import { setupTabUpdates } from "@ajayyy/maze-utils/lib/tab-updates"; import { generateUserID } from "@ajayyy/maze-utils/lib/setup"; @@ -132,7 +132,7 @@ function registerFirefoxContentScript(options: Registration) { const oldRegistration = contentScriptRegistrations[options.id]; if (oldRegistration) oldRegistration.unregister(); - registerContentScript({ + chrome.contentScripts.register({ allFrames: options.allFrames, js: options.js, css: options.css, From 94e168f8037314a51de4b1ba04bef1d2b532684a Mon Sep 17 00:00:00 2001 From: Ajay Date: Sat, 18 Mar 2023 00:28:39 -0400 Subject: [PATCH 2/3] bump version --- manifest/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest/manifest.json b/manifest/manifest.json index 1bd58147..7cb2a0cc 100644 --- a/manifest/manifest.json +++ b/manifest/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_fullName__", "short_name": "SponsorBlock", - "version": "5.3.0", + "version": "5.3.1", "default_locale": "en", "description": "__MSG_Description__", "homepage_url": "https://sponsor.ajay.app", From 504f5c565b7c5265596e8229ce9da6752da4cd7a Mon Sep 17 00:00:00 2001 From: Ajay Date: Sat, 18 Mar 2023 00:31:07 -0400 Subject: [PATCH 3/3] Fix oss attribution workflow --- .github/workflows/update-oss-attribution.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-oss-attribution.yml b/.github/workflows/update-oss-attribution.yml index 2781f29c..635a6d7f 100644 --- a/.github/workflows/update-oss-attribution.yml +++ b/.github/workflows/update-oss-attribution.yml @@ -24,7 +24,7 @@ jobs: mv ./oss-attribution/attribution.txt ./public/oss-attribution/attribution.txt - name: Prettify attributions run: | - cd ci && ts-node prettify.ts + cd ci && npx ts-node prettify.ts - name: Create pull request to update list uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04