Compare commits

...

13 Commits
5.3.0 ... 5.3.1

Author SHA1 Message Date
Ajay
504f5c565b Fix oss attribution workflow 2023-03-18 00:31:07 -04:00
Ajay
94e168f803 bump version 2023-03-18 00:28:39 -04:00
Ajay
43e07fe725 Fix Invidious support on Firefox 2023-03-18 00:28:26 -04:00
Ajay Ramachandran
3ace3b9650 Merge pull request #1674 from ajayyy/dependabot/npm_and_yarn/cacheable-request-and-got-10.2.7
Bump cacheable-request and got
2023-03-07 22:46:42 -05:00
Ajay Ramachandran
037d468c30 Merge pull request #1664 from ajayyy/dependabot/npm_and_yarn/http-cache-semantics-4.1.1
Bump http-cache-semantics from 4.1.0 to 4.1.1
2023-03-07 22:46:35 -05:00
Ajay Ramachandran
bf13c12443 Merge pull request #1661 from mchangrh/dependency-upgrade
Dependency upgrade
2023-03-07 22:45:10 -05:00
Michael C
a1f3892bd1 update dependencies 2023-03-07 22:11:28 -05:00
Ajay Ramachandran
9550a66291 Merge pull request #1691 from mchangrh/prettify-ci
update CI to prettify oss-attribution
2023-03-07 22:04:36 -05:00
Michael C
a024352b15 update GHA 2023-03-07 22:00:26 -05:00
Michael C
ef222ce229 upgrade dependencies
- remove speed-measure-webpack-plugin since it was there only for POC
2023-03-07 22:00:26 -05:00
Michael C
b310152f7f update CI to prettify oss-attribution
- also fix TS warnings in invidiousCI.ts
2023-03-07 21:55:48 -05:00
dependabot[bot]
241c17eb7e Bump cacheable-request and got
Bumps [cacheable-request](https://github.com/jaredwray/cacheable-request) and [got](https://github.com/sindresorhus/got). These dependencies needed to be updated together.

Updates `cacheable-request` from 7.0.2 to 10.2.7
- [Release notes](https://github.com/jaredwray/cacheable-request/releases)
- [Commits](https://github.com/jaredwray/cacheable-request/commits)

Updates `got` from 12.1.0 to 12.5.3
- [Release notes](https://github.com/sindresorhus/got/releases)
- [Commits](https://github.com/sindresorhus/got/compare/v12.1.0...v12.5.3)

---
updated-dependencies:
- dependency-name: cacheable-request
  dependency-type: indirect
- dependency-name: got
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-12 14:27:25 +00:00
dependabot[bot]
4e6246a710 Bump http-cache-semantics from 4.1.0 to 4.1.1
Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/kornelski/http-cache-semantics/releases)
- [Commits](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: http-cache-semantics
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-04 06:11:03 +00:00
9 changed files with 3011 additions and 2069 deletions

View File

@@ -22,10 +22,13 @@ jobs:
npm i -g oss-attribution-generator
generate-attribution
mv ./oss-attribution/attribution.txt ./public/oss-attribution/attribution.txt
- name: Prettify attributions
run: |
cd ci && npx ts-node prettify.ts
- name: Create pull request to update list
uses: peter-evans/create-pull-request@b4d51739f96fca8047ad065eccef63442d8e99f7
# v4.2.0
uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
# v4.2.3
with:
commit-message: Update OSS Attribution
author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

View File

@@ -18,8 +18,8 @@ jobs:
run: npm run ci:invidious
- name: Create pull request to update list
uses: peter-evans/create-pull-request@b4d51739f96fca8047ad065eccef63442d8e99f7
# v4.2.0
uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
# v4.2.3
with:
commit-message: Update Invidious List
author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

View File

@@ -16,10 +16,10 @@ if (!existsSync(join(__dirname, "data.json"))) {
import * as data from "../ci/data.json";
type instanceMap = {
name: string,
url: string,
dailyRatios: {ratio: string, label: string }[],
thirtyDayUptime: string
name: string;
url: string;
dailyRatios: {ratio: string; label: string }[];
thirtyDayUptime: string;
}[]
// only https servers

6
ci/prettify.ts Normal file
View File

@@ -0,0 +1,6 @@
import { writeFile } from 'fs';
import * as license from "../oss-attribution/licenseInfos.json";
const result = JSON.stringify(license, null, 2);
writeFile("../oss-attribution/licenseInfos.json", result, err => { if (err) return console.log(err) } );

View File

@@ -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",

File diff suppressed because one or more lines are too long

4905
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -4,39 +4,38 @@
"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"
},
"devDependencies": {
"@types/chrome": "^0.0.199",
"@types/firefox-webext-browser": "^94.0.1",
"@types/jest": "^29.2.0",
"@types/react": "^18.0.21",
"@types/react-dom": "^18.0.6",
"@types/selenium-webdriver": "^4.1.6",
"@types/chrome": "^0.0.220",
"@types/firefox-webext-browser": "^111.0.0",
"@types/jest": "^29.4.0",
"@types/react": "^18.0.28",
"@types/react-dom": "^18.0.11",
"@types/selenium-webdriver": "^4.1.13",
"@types/wicg-mediasession": "^1.1.4",
"@typescript-eslint/eslint-plugin": "^5.40.1",
"@typescript-eslint/parser": "^5.40.1",
"@typescript-eslint/eslint-plugin": "^5.54.1",
"@typescript-eslint/parser": "^5.54.1",
"chromedriver": "^110.0.0",
"concurrently": "^7.4.0",
"concurrently": "^7.6.0",
"copy-webpack-plugin": "^11.0.0",
"eslint": "^8.25.0",
"eslint-plugin-react": "^7.31.10",
"fork-ts-checker-webpack-plugin": "^7.2.13",
"jest": "^29.2.1",
"jest-environment-jsdom": "^29.2.1",
"rimraf": "^3.0.2",
"eslint": "^8.35.0",
"eslint-plugin-react": "^7.32.2",
"fork-ts-checker-webpack-plugin": "^7.3.0",
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.5.0",
"rimraf": "^4.3.1",
"schema-utils": "^4.0.0",
"selenium-webdriver": "^4.5.0",
"speed-measure-webpack-plugin": "^1.5.0",
"ts-jest": "^29.0.3",
"ts-loader": "^9.4.1",
"selenium-webdriver": "^4.8.1",
"ts-jest": "^29.0.5",
"ts-loader": "^9.4.2",
"ts-node": "^10.9.1",
"typescript": "4.8",
"web-ext": "^7.3.1",
"webpack": "^5.74.0",
"typescript": "4.9",
"web-ext": "^7.5.0",
"webpack": "^5.75.0",
"webpack-cli": "^4.10.0",
"webpack-merge": "^5.8.0"
},

View File

@@ -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,