From f99143585702af1883ccaa166de03482a3754660 Mon Sep 17 00:00:00 2001 From: Ajay Date: Fri, 25 Aug 2023 21:29:39 -0400 Subject: [PATCH] Switch back to upstream content-scripts-register-polyfill --- package-lock.json | 96 +++++++++++++++++++++++------------------------ package.json | 7 +++- src/background.ts | 2 +- 3 files changed, 55 insertions(+), 50 deletions(-) diff --git a/package-lock.json b/package-lock.json index fedc69ef..4e986143 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ ], "license": "LGPL-3.0-or-later", "dependencies": { - "@ajayyy/content-scripts-register-polyfill": "^4.0.2-safari-fix", + "content-scripts-register-polyfill": "^4.0.2", "react": "^18.2.0", "react-dom": "^18.2.0" }, @@ -65,34 +65,6 @@ "node": ">=16" } }, - "node_modules/@ajayyy/content-scripts-register-polyfill": { - "version": "4.0.2-safari-fix", - "resolved": "https://registry.npmjs.org/@ajayyy/content-scripts-register-polyfill/-/content-scripts-register-polyfill-4.0.2-safari-fix.tgz", - "integrity": "sha512-okyqlFmLUmOZQrkZ6ChUbfcNXadamlaIGqzb6fi5MRnzvr+myoG4sK+whxhCY9hPmU///dqMGtV8FVom8sJpHA==", - "dependencies": { - "@ajayyy/webext-content-scripts": "^2.5.4-safari-fix", - "webext-patterns": "^1.3.0", - "webext-polyfill-kinda": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/fregante" - } - }, - "node_modules/@ajayyy/webext-content-scripts": { - "version": "2.5.4-safari-fix", - "resolved": "https://registry.npmjs.org/@ajayyy/webext-content-scripts/-/webext-content-scripts-2.5.4-safari-fix.tgz", - "integrity": "sha512-gn1PF4+dfld6whvmjjnYGvB26z9ja0SNIcgHVQl42Bh/lz89hviH8HWqi1p7XXN/p0BsOwJAx8jzqkmb2IAQvQ==", - "dependencies": { - "webext-patterns": "^1.3.0", - "webext-polyfill-kinda": "^1.0.2" - }, - "engines": { - "node": ">=16" - }, - "funding": { - "url": "https://github.com/sponsors/fregante" - } - }, "node_modules/@ampproject/remapping": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", @@ -4282,6 +4254,19 @@ "url": "https://github.com/yeoman/configstore?sponsor=1" } }, + "node_modules/content-scripts-register-polyfill": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/content-scripts-register-polyfill/-/content-scripts-register-polyfill-4.0.2.tgz", + "integrity": "sha512-8hDm+tu3BkxHZP7EUIIIo/495F6QNXF7cI9Lwr4PQaiohw2wWmi9k2SE4W4kNrAaLnFw6RZ2ev8EmrQb+sCoGQ==", + "dependencies": { + "webext-content-scripts": "^2.5.2", + "webext-patterns": "^1.3.0", + "webext-polyfill-kinda": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/fregante" + } + }, "node_modules/convert-source-map": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", @@ -12975,6 +12960,21 @@ "node": ">= 8" } }, + "node_modules/webext-content-scripts": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/webext-content-scripts/-/webext-content-scripts-2.5.5.tgz", + "integrity": "sha512-CIq1LA/nHIXE43v8qlpqNPcbsSzGuQBkeykbqOWvKJ1Rx/q7zgdZsLgxwyoonWiQcJczslVmGWCfdBY04JwIyw==", + "dependencies": { + "webext-patterns": "^1.3.0", + "webext-polyfill-kinda": "^1.0.2" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/fregante" + } + }, "node_modules/webext-patterns": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/webext-patterns/-/webext-patterns-1.3.0.tgz", @@ -13578,25 +13578,6 @@ } }, "dependencies": { - "@ajayyy/content-scripts-register-polyfill": { - "version": "4.0.2-safari-fix", - "resolved": "https://registry.npmjs.org/@ajayyy/content-scripts-register-polyfill/-/content-scripts-register-polyfill-4.0.2-safari-fix.tgz", - "integrity": "sha512-okyqlFmLUmOZQrkZ6ChUbfcNXadamlaIGqzb6fi5MRnzvr+myoG4sK+whxhCY9hPmU///dqMGtV8FVom8sJpHA==", - "requires": { - "@ajayyy/webext-content-scripts": "^2.5.4-safari-fix", - "webext-patterns": "^1.3.0", - "webext-polyfill-kinda": "^1.0.0" - } - }, - "@ajayyy/webext-content-scripts": { - "version": "2.5.4-safari-fix", - "resolved": "https://registry.npmjs.org/@ajayyy/webext-content-scripts/-/webext-content-scripts-2.5.4-safari-fix.tgz", - "integrity": "sha512-gn1PF4+dfld6whvmjjnYGvB26z9ja0SNIcgHVQl42Bh/lz89hviH8HWqi1p7XXN/p0BsOwJAx8jzqkmb2IAQvQ==", - "requires": { - "webext-patterns": "^1.3.0", - "webext-polyfill-kinda": "^1.0.2" - } - }, "@ampproject/remapping": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", @@ -16756,6 +16737,16 @@ "xdg-basedir": "^5.0.1" } }, + "content-scripts-register-polyfill": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/content-scripts-register-polyfill/-/content-scripts-register-polyfill-4.0.2.tgz", + "integrity": "sha512-8hDm+tu3BkxHZP7EUIIIo/495F6QNXF7cI9Lwr4PQaiohw2wWmi9k2SE4W4kNrAaLnFw6RZ2ev8EmrQb+sCoGQ==", + "requires": { + "webext-content-scripts": "v2.5.5", + "webext-patterns": "^1.3.0", + "webext-polyfill-kinda": "^1.0.0" + } + }, "convert-source-map": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", @@ -23107,6 +23098,15 @@ "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==", "dev": true }, + "webext-content-scripts": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/webext-content-scripts/-/webext-content-scripts-2.5.5.tgz", + "integrity": "sha512-CIq1LA/nHIXE43v8qlpqNPcbsSzGuQBkeykbqOWvKJ1Rx/q7zgdZsLgxwyoonWiQcJczslVmGWCfdBY04JwIyw==", + "requires": { + "webext-patterns": "^1.3.0", + "webext-polyfill-kinda": "^1.0.2" + } + }, "webext-patterns": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/webext-patterns/-/webext-patterns-1.3.0.tgz", diff --git a/package.json b/package.json index 295ddb21..1c4f20e2 100644 --- a/package.json +++ b/package.json @@ -4,10 +4,15 @@ "description": "", "main": "background.js", "dependencies": { - "@ajayyy/content-scripts-register-polyfill": "^4.0.2-safari-fix", + "content-scripts-register-polyfill": "^4.0.2", "react": "^18.2.0", "react-dom": "^18.2.0" }, + "overrides": { + "content-scripts-register-polyfill": { + "webext-content-scripts": "v2.5.5" + } + }, "devDependencies": { "@types/chrome": "^0.0.220", "@types/firefox-webext-browser": "^111.0.0", diff --git a/src/background.ts b/src/background.ts index 9f6ce8d0..d7d95819 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 "@ajayyy/content-scripts-register-polyfill"; +import "content-scripts-register-polyfill"; import { sendRealRequestToCustomServer, setupBackgroundRequestProxy } from "../maze-utils/src/background-request-proxy"; import { setupTabUpdates } from "../maze-utils/src/tab-updates"; import { generateUserID } from "../maze-utils/src/setup";