Add ESLint check

.github/workflows/js-lint-test.yml

@@ -5,6 +5,7 @@ on:
  branches:
  - master
  - 'feature/*'
+ - ESlint
  pull_request:
  branches:
  - master
@@ -15,15 +16,20 @@ jobs:
 
  steps:
  - name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Set up Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
  with:
- node-version: '14'
+ node-version: '20'
+ cache: 'npm'
 
  - name: Install dependencies
  run: npm install
+
+ - name: Run eslint
+ run: npx eslint
+ continue-on-error: true
 
  - name: Run JSLint
  run: npx jslint "**/*.js"

.gitignore

@@ -0,0 +1 @@
+node_modules

background.js

@@ -85,9 +85,9 @@
  chrome.storage.local.get('limit_page_width', function (result) {
  if (result.limit_page_width === false) {
  chrome.storage.local.set({no_page_margin: true});
  chrome.storage.local.remove(['limit_page_width'], (i) => {});
  chrome.storage.local.get('player_size', function (r) {
  if (r.player_size == 'full_window' || 'fit_to_window') {
  chrome.storage.local.set({player_size: 'max_width'});
  }
  });
@@ -170,7 +170,7 @@
  });
  });
 }
 chrome.runtime.onInstalled.addListener(function (details) {
  chrome.storage.local.get(function (items) {
  var language = items.language;
  updateContextMenu(language);
@@ -253,38 +253,38 @@
  //console.log(sender);
 
  switch(message.action || message.name || message) {
- case 'play':
- tabPrune(function () {
- for (let id in tabConnected) {
- id = Number(id);
- if (id != sender.tab.id) {
- chrome.tabs.sendMessage(id, {action: "another-video-started-playing"});
- }
+ case 'play':
+ tabPrune(function () {
+ for (let id in tabConnected) {
+ id = Number(id);
+ if (id != sender.tab.id) {
+ chrome.tabs.sendMessage(id, {action: "another-video-started-playing"});
  }
- });
- break
+ }
+ });
+ break
 
-  case 'options-page-connected':
-  sendResponse({
-  isTab: sender.hasOwnProperty('tab')
-  });
-  break
+ case 'options-page-connected':
+ sendResponse({
+ isTab: sender.hasOwnProperty('tab')
+ });
+ break
 
-  case 'tab-connected':
-  tabConnected[sender.tab.id] = true;
-  sendResponse({
-  tabId: sender.tab.id
-  });
-  break
+ case 'tab-connected':
+ tabConnected[sender.tab.id] = true;
+ sendResponse({
+ tabId: sender.tab.id
+ });
+ break
 
-  case 'fixPopup':
-  //~ get the current focused tab and convert it to a URL-less popup (with same state and size)
-  chrome.windows.getLastFocused(w => {
-  chrome.tabs.query({
-  windowId: w.id,
-  active: true
-  }, ts => {
-  const tID = ts[0]?.id,
+ case 'fixPopup':
+ //~ get the current focused tab and convert it to a URL-less popup (with same state and size)
+ chrome.windows.getLastFocused(w => {
+ chrome.tabs.query({
+ windowId: w.id,
+ active: true
+ }, ts => {
+ const tID = ts[0]?.id,
  data = { type: 'popup',
  state: w.state,
  width: parseInt(message.width, 10),
@@ -293,42 +293,42 @@
  top: 20
  }
 
-  if (tID) {data.tabId = tID;}
-  chrome.windows.create(data, pw => {});
+ if (tID) {data.tabId = tID;}
+ chrome.windows.create(data, pw => {});
 
- //append to title?
- chrome.tabs.onUpdated.addListener(function listener(tabId, changeInfo) {
- if (tabId === tID && changeInfo.status === 'complete' && !message.title.startsWith("undefined")) {
- chrome.tabs.onUpdated.removeListener(listener);
- chrome.scripting.executeScript({ target: { tabId: tID }, func: () => { document.title = `${message.title} - ImprovedTube`; } }); //manifest3
- // chrome.tabs.executeScript(tID, {code: `document.title = "${message.title} - ImprovedTube";`}); //manifest2
- }
- });
+ //append to title?
+ chrome.tabs.onUpdated.addListener(function listener(tabId, changeInfo) {
+ if (tabId === tID && changeInfo.status === 'complete' && !message.title.startsWith("undefined")) {
+ chrome.tabs.onUpdated.removeListener(listener);
+ chrome.scripting.executeScript({ target: { tabId: tID }, func: () => { document.title = `${message.title} - ImprovedTube`; } }); //manifest3
+ // chrome.tabs.executeScript(tID, {code: `document.title = "${message.title} - ImprovedTube";`}); //manifest2
+ }
  });
  });
- break
- case 'download':
- chrome.permissions.request({
- permissions: ['downloads'],
- origins: ['https://www.youtube.com/*']
- }, function (granted) {
- if (granted) {
- try {
- var blob = new Blob([JSON.stringify(message.value)], {
- type: 'application/json;charset=utf-8'
- });
- chrome.downloads.download({
- url: URL.createObjectURL(blob),
- filename: message.filename,
- saveAs: true
- });
- } catch (error) {
- console.error(error);
- }
- } else {
- console.error('Permission is not granted.');
- }})
- break
+ });
+ break
+ case 'download':
+ chrome.permissions.request({
+ permissions: ['downloads'],
+ origins: ['https://www.youtube.com/*']
+ }, function (granted) {
+ if (granted) {
+ try {
+ var blob = new Blob([JSON.stringify(message.value)], {
+ type: 'application/json;charset=utf-8'
+ });
+ chrome.downloads.download({
+ url: URL.createObjectURL(blob),
+ filename: message.filename,
+ saveAs: true
+ });
+ } catch (error) {
+ console.error(error);
+ }
+ } else {
+ console.error('Permission is not granted.');
+ }})
+ break
  }
 });
 /*-----# UNINSTALL URL-----------------------------------*/

eslint.config.mjs

@@ -0,0 +1,39 @@
+import globals from "globals";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+ baseDirectory: __dirname,
+ recommendedConfig: js.configs.recommended,
+ allConfig: js.configs.all
+});
+
+export default [...compat.extends("eslint:recommended"), {
+ languageOptions: {
+ globals: {
+ ...globals.browser,
+ ...globals.node,
+ ...globals.webextensions,
+ ...globals.jest,
+ ...globals.worker,
+ ...globals.wsh
+ }
+ },
+ rules: {
+ indent: ["error", "tab"],
+ "no-empty": ["error", { "allowEmptyCatch": true }],
+ "no-unused-vars": ["error", { "caughtErrors": "none" }],
+ "no-undef": ["off"],
+ "max-len": ["error", {
+ code: 255,
+ ignoreUrls: true,
+ ignoreStrings: true,
+ ignoreComments: true,
+ ignoreRegExpLiterals: true
+ }]
+ }
+}];

jest.config.js

@@ -1,8 +1,8 @@
 module.exports = {
- testPathIgnorePatterns: [
- "/node_modules/"
- ],
- testMatch: [
- "**/tests/**/*.js"
- ]
+ testPathIgnorePatterns: [
+ "/node_modules/"
+ ],
+ testMatch: [
+ "**/tests/**/*.js"
+ ]
 };

js&css/extension/init.js

@@ -180,34 +180,34 @@
  }
 
  switch(message.type) {
- case 'channel':
- if (!extension.storage.data.blocklist.channels || typeof extension.storage.data.blocklist.channels !== 'object') {
- extension.storage.data.blocklist.channels = {};
- }
- if (message.added) {
- extension.storage.data.blocklist.channels[message.id] = {
- title: message.title,
- preview: message.preview,
- when: message.when
- }
- } else {
- delete extension.storage.data.blocklist.channels[message.id];
+ case 'channel':
+ if (!extension.storage.data.blocklist.channels || typeof extension.storage.data.blocklist.channels !== 'object') {
+ extension.storage.data.blocklist.channels = {};
+ }
+ if (message.added) {
+ extension.storage.data.blocklist.channels[message.id] = {
+ title: message.title,
+ preview: message.preview,
+ when: message.when
  }
- break
+ } else {
+ delete extension.storage.data.blocklist.channels[message.id];
+ }
+ break
 
- case 'video':
- if (!extension.storage.data.blocklist.videos || typeof extension.storage.data.blocklist.videos !== 'object') {
- extension.storage.data.blocklist.videos = {};
- }
- if (message.added) {
- extension.storage.data.blocklist.videos[message.id] = {
- title: message.title,
- when: message.when
- }
- } else {
- delete extension.storage.data.blocklist.videos[message.id];
+ case 'video':
+ if (!extension.storage.data.blocklist.videos || typeof extension.storage.data.blocklist.videos !== 'object') {
+ extension.storage.data.blocklist.videos = {};
+ }
+ if (message.added) {
+ extension.storage.data.blocklist.videos[message.id] = {
+ title: message.title,
+ when: message.when
  }
- break
+ } else {
+ delete extension.storage.data.blocklist.videos[message.id];
+ }
+ break
  }
 
  chrome.storage.local.set({
@@ -241,8 +241,8 @@
  }
 });
 
 document.addEventListener('it-play', function (event) {
  var videos = document.querySelectorAll('video');
  try {chrome.runtime.sendMessage({action: 'play'})} 
- catch(error){console.log(error); setTimeout(function () { try { chrome.runtime.sendMessage({action: 'play'}, function (response) { console.log(response) } ); } catch { } }, 321) }
+ catch(error){console.log(error); setTimeout(function () { try { chrome.runtime.sendMessage({action: 'play'}, function (response) { console.log(response) } ); } catch { } }, 321) }
  });