Merge pull request #309 from wanhose/v6.4.1

6.4.1
This commit is contained in:
wanhose 2023-10-07 13:21:16 +02:00 committed by GitHub
commit 9c3f73a1ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 1473 additions and 1440 deletions

File diff suppressed because one or more lines are too long

View File

@ -8,4 +8,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"
yarnPath: .yarn/releases/yarn-3.5.1.cjs
yarnPath: .yarn/releases/yarn-3.6.3.cjs

View File

@ -8,14 +8,14 @@
"prepare": "husky install"
},
"devDependencies": {
"@commitlint/cli": "^17.6.3",
"@commitlint/config-conventional": "^17.6.3",
"@commitlint/cli": "^17.7.2",
"@commitlint/config-conventional": "^17.7.0",
"husky": "^8.0.3",
"lint-staged": "^13.2.2",
"prettier": "^2.8.8"
"lint-staged": "^14.0.1",
"prettier": "^3.0.3"
},
"workspaces": [
"packages/*"
],
"packageManager": "yarn@3.5.1"
"packageManager": "yarn@3.6.3"
}

View File

@ -5,36 +5,35 @@
"build": "rimraf build && tsc",
"dev": "nodemon",
"lint": "eslint src/**/*.ts --fix",
"start": "NODE_PATH=build node build/index.js"
"start": "NODE_PATH=build node build/index.js --env-file .env"
},
"dependencies": {
"@fastify/cors": "^8.2.1",
"@fastify/rate-limit": "^8.0.0",
"dotenv": "^16.0.3",
"fastify": "^4.17.0",
"node-fetch": "^2.6.7",
"nodemailer": "^6.9.2",
"octokit": "^2.0.16"
"@fastify/cors": "^8.4.0",
"@fastify/rate-limit": "^8.0.3",
"fastify": "^4.23.2",
"node-fetch": "^2.7.0",
"nodemailer": "^6.9.5",
"octokit": "^3.1.1"
},
"devDependencies": {
"@tsconfig/node16": "^1.0.4",
"@types/node": "^16.18.11",
"@types/node-fetch": "^2.6.4",
"@types/nodemailer": "^6.4.8",
"@typescript-eslint/eslint-plugin": "^5.59.6",
"@typescript-eslint/parser": "^5.59.6",
"eslint": "^8.41.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"nodemon": "^2.0.22",
"rimraf": "^5.0.1",
"@tsconfig/node20": "^20.1.2",
"@types/node": "^20.7.1",
"@types/node-fetch": "^2.6.6",
"@types/nodemailer": "^6.4.11",
"@typescript-eslint/eslint-plugin": "^6.7.3",
"@typescript-eslint/parser": "^6.7.3",
"eslint": "^8.50.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.0",
"nodemon": "^3.0.1",
"rimraf": "^5.0.5",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.0.4"
"typescript": "^5.2.2"
},
"engines": {
"node": "16.x"
"node": "20.8.0"
},
"packageManager": "yarn@3.2.1",
"packageManager": "yarn@3.6.3",
"license": "MIT"
}

View File

@ -1,7 +1,3 @@
import dotenv from 'dotenv';
dotenv.config();
export default {
github: {
owner: 'wanhose',

View File

@ -8,6 +8,6 @@
"rootDir": "src",
"useUnknownInCatchVariables": false
},
"extends": "@tsconfig/node16/tsconfig.json",
"extends": "@tsconfig/node20/tsconfig.json",
"include": ["src/**/*.ts"]
}

View File

@ -6,16 +6,16 @@
"lint": "eslint src/**/*.js --fix"
},
"devDependencies": {
"@types/chrome": "^0.0.236",
"eslint": "^8.41.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"@types/chrome": "^0.0.246",
"eslint": "^8.50.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.0",
"minify": "^9.2.0",
"rimraf": "^5.0.1"
"rimraf": "^5.0.5"
},
"engines": {
"node": "16.x"
"node": "20.8.0"
},
"packageManager": "yarn@3.2.1",
"packageManager": "yarn@3.6.3",
"license": "MIT"
}

View File

@ -1,7 +1,7 @@
{
"manifest_version": 3,
"name": "Cookie Dialog Monster",
"version": "6.4.0",
"version": "6.4.1",
"default_locale": "en",
"description": "__MSG_appDesc__",
"icons": {
@ -26,7 +26,17 @@
"*://*.sharepoint.com/*",
"*://*.youtube.com/embed/*",
"*://*.youtube-nocookie.com/embed/*",
"https://translate.google.ca/*",
"https://translate.google.co.in/*",
"https://translate.google.co.jp/*",
"https://translate.google.co.uk/*",
"https://translate.google.com.au/*",
"https://translate.google.com.br/*",
"https://translate.google.com/*",
"https://translate.google.de/*",
"https://translate.google.es/*",
"https://translate.google.fr/*",
"https://translate.google.it/*",
"https://www.cookie-dialog-monster.com/*"
],
"js": ["scripts/content.js", "scripts/dialog.js"],

View File

@ -66,10 +66,8 @@ function clean(elements, skipMatch) {
function forceClean(element) {
const elements = [...element.querySelectorAll(data.elements)];
if (elements.length) {
fix();
clean(elements, true);
}
if (elements.length && !preview) clean(elements, true);
}
/**
@ -138,7 +136,7 @@ function match(element, skipMatch) {
}
/**
* @description Fixes scroll issues
* @description Fixes data, consent page and scroll issues
* @returns {void}
*/
@ -233,10 +231,8 @@ async function runSetup(skipReadyStateHack) {
const observer = new MutationObserver((mutations) => {
const elements = mutations.map((mutation) => Array.from(mutation.addedNodes)).flat();
if (data?.elements.length && !preview) {
fix();
clean(elements);
}
if (data?.elements.length && !preview) clean(elements);
});
/**

View File

@ -102,11 +102,12 @@ async function handleContentLoaded() {
async function handleDeleteClick(event) {
const filterInputElement = document.getElementById('filter-input');
const { value } = event.currentTarget.parentElement.dataset;
const itemElement = document.querySelector(`[data-value="${value}"]`);
const state = { enabled: true };
await dispatch({ hostname: value, state, type: 'SET_HOSTNAME_STATE' });
exclusionList = exclusionList.filter((exclusionValue) => exclusionValue !== value);
itemElement.remove();
itemElement?.remove();
updateList(filterInputElement.value.trim());
}
@ -117,12 +118,16 @@ async function handleDeleteClick(event) {
function handleExportClick() {
const anchor = document.createElement('a');
const now = new Date();
const day = now.getUTCDay().toString().padStart(2, '0');
const month = now.getUTCMonth().toString().padStart(2, '0');
const year = now.getUTCFullYear();
const text = exclusionList.join('\n');
const blob = new Blob([text], { type: 'octet/stream' });
const url = window.URL.createObjectURL(blob);
anchor.href = url;
anchor.download = `${new Date().valueOf()}.cdm`;
anchor.download = `${year}${month}${day}.cdm`;
anchor.click();
window.URL.revokeObjectURL(url);
}

View File

@ -7,13 +7,13 @@
},
"devDependencies": {
"minify": "^9.2.0",
"rimraf": "^5.0.1",
"serve": "^14.2.0",
"tailwindcss": "^3.3.2"
"rimraf": "^5.0.5",
"serve": "^14.2.1",
"tailwindcss": "^3.3.3"
},
"engines": {
"node": "16.x"
"node": "20.8.0"
},
"packageManager": "yarn@3.2.1",
"packageManager": "yarn@3.6.3",
"license": "MIT"
}

2312
yarn.lock

File diff suppressed because it is too large Load Diff