release: 1.0.12 (#364)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: sebastienfontaine

fix-csp.js

@@ -0,0 +1,88 @@
+import fs from 'fs';
+import path from 'path';
+
+function updateManifest(distFolder) {
+	// Define the path to the manifest.json file
+	const manifestPath = path.join(distFolder, 'manifest.json');
+
+	// Find the content.js-YYY file in the dist/assets directory
+	const assetsFolder = path.join(distFolder, 'assets');
+	let contentJsFile = null;
+
+	// Check if the manifest.json file exists
+	if (!fs.existsSync(manifestPath)) {
+		console.log(`Error: manifest.json not found in ${distFolder}.`);
+		return;
+	}
+
+	// Check if the assets folder exists
+	if (!fs.existsSync(assetsFolder)) {
+		console.log(`Error: assets folder not found in ${distFolder}.`);
+		return;
+	}
+
+	// Iterate over files in the assets folder to find the content.js file
+	const files = fs.readdirSync(assetsFolder);
+	for (const filename of files) {
+		if (
+			!filename.startsWith('content.js-loader') &&
+			filename.startsWith('content.js-') &&
+			filename.endsWith('.js')
+		) {
+			contentJsFile = filename;
+			break;
+		}
+	}
+
+	// If the content.js file was not found, return with an error message
+	if (contentJsFile === null) {
+		console.log('Error: content.js-YYY file not found in the assets folder.');
+		return;
+	}
+
+	// Read the manifest.json file
+	let manifestData;
+	try {
+		const data = fs.readFileSync(manifestPath, 'utf-8');
+		manifestData = JSON.parse(data);
+	} catch (e) {
+		console.log(`Error reading manifest.json: ${e.message}`);
+		return;
+	}
+
+	// Update the content_scripts entry in the manifest
+	let updated = false;
+	if (manifestData.content_scripts) {
+		for (const script of manifestData.content_scripts) {
+			if (script.js) {
+				// Find any entry matching the pattern content.js-loader-*.js
+				for (let i = 0; i < script.js.length; i++) {
+					if (/assets\/content\.js-loader-.*\.js/.test(script.js[i])) {
+						script.js[i] = `assets/${contentJsFile}`;
+						updated = true;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	if (!updated) {
+		console.log('No matching content.js-loader-XXX.js entry found in manifest.json.');
+		return;
+	}
+
+	// Write the updated manifest.json file back to the file system
+	try {
+		fs.writeFileSync(manifestPath, JSON.stringify(manifestData, null, 2));
+	} catch (e) {
+		console.log(`Error writing to manifest.json: ${e.message}`);
+		return;
+	}
+
+	console.log(`Updated manifest.json to use ${contentJsFile} in content_scripts.`);
+}
+
+// Run the script
+const distFolder = './dist'; // Replace this path with the path to your 'dist' folder
+updateManifest(distFolder);

manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Tab Modifier",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Take control of your tabs",
   "homepage_url": "https://github.com/furybee/chrome-tab-modifier",
   "action": {
@@ -28,7 +28,9 @@
   "web_accessible_resources": [{
     "resources": [
       "assets/*",
-      "assets/*/*"
+      "assets/*/*",
+      "vendor/*",
+      "vendor/*/*"
     ],
     "matches": [
       "<all_urls>"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tab-modifier",
   "private": true,
-  "version": "1.0.11",
+  "version": "1.0.12",
   "type": "module",
   "scripts": {
     "test": "vitest --run",
@@ -10,9 +10,10 @@
     "coverage": "npx vitest --run --coverage.enabled true",
     "dev": "rm -rf ./dist && vite",
     "tsc": "vue-tsc",
-    "build": "rm -rf ./dist && vite build",
+    "build": "rm -rf ./dist && vite build && yarn fix-csp",
     "preview": "vite preview",
-    "build-zip": "rm -rf ./dist && rm -f tab-modifier.zip && yarn build && cd ./dist && zip -r ../tab-modifier.zip *"
+    "fix-csp": "node fix-csp.js",
+    "build-zip": "rm -rf ./dist && rm -f tab-modifier.zip && yarn build && yarn fix-csp && cd ./dist && zip -r ../tab-modifier.zip *"
   },
   "dependencies": {
     "mitt": "^3.0.1",
@@ -23,11 +24,11 @@
   "devDependencies": {
     "@crxjs/vite-plugin": "^2.0.0-beta.23",
     "@types/chrome": "^0.0.268",
-    "@typescript-eslint/eslint-plugin": "^7.14.1",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.4.0",
     "@vitejs/plugin-vue": "^5.0.5",
-    "@vitest/coverage-v8": "^1.6.0",
-    "@vitest/ui": "^1.6.0",
+    "@vitest/coverage-v8": "^2.0.5",
+    "@vitest/ui": "^2.0.5",
     "@vue/cli-plugin-eslint": "^5.0.8",
     "@vue/eslint-config-typescript": "^13.0.0",
     "autoprefixer": "^10.4.19",
@@ -42,11 +43,11 @@
     "eslint-plugin-vue": "^9.26.0",
     "jsdom": "^24.1.0",
     "postcss": "^8.4.38",
-    "prettier": "^3.3.2",
+    "prettier": "^3.3.3",
     "tailwindcss": "^3.4.4",
     "typescript": "*",
-    "vite": "^5.2.0",
-    "vitest": "^1.6.0",
+    "vite": "^5.4.2",
+    "vitest": "^2.0.5",
     "vue-eslint-parser": "^9.4.2",
     "vue-tsc": "^2.0.24"
   }

src/content.js

@@ -1,12 +1,58 @@
-import { _getRuleFromUrl } from './common/storage.ts';
+function _getStorageAsync() {
+	return new Promise((resolve, reject) => {
+		chrome.storage.local.get(STORAGE_KEY, (items) => {
+			if (chrome.runtime.lastError) {
+				reject(new Error(chrome.runtime.lastError.message));
+			} else {
+				resolve(items[STORAGE_KEY]);
+			}
+		});
+	});
+}
+
+async function _getRuleFromUrl(url) {
+	const tabModifier = await _getStorageAsync();
+	if (!tabModifier) {
+		return;
+	}
+
+	const foundRule = tabModifier.rules.find((r) => {
+		const detectionType = r.detection ?? 'CONTAINS';
+		const urlFragment = r.url_fragment;
+
+		switch (detectionType) {
+			case 'CONTAINS':
+				return url.includes(urlFragment);
+			case 'STARTS':
+			case 'STARTS_WITH':
+				return url.startsWith(urlFragment);
+			case 'ENDS':
+			case 'ENDS_WITH':
+				return url.endsWith(urlFragment);
+			case 'REGEX':
+			case 'REGEXP':
+				return new RegExp(urlFragment).test(url);
+			case 'EXACT':
+				return url === urlFragment;
+			default:
+				return false;
+		}
+	});
+
+	if (!foundRule) {
+		return;
+	}
+
+	return foundRule;
+}
 
 const STORAGE_KEY = 'tab_modifier';
 
-export function updateTitle(title, tag, value) {
+function updateTitle(title, tag, value) {
 	return value ? title.replace(tag, decodeURI(value)) : title;
 }
 
-export function getTextBySelector(selector) {
+function getTextBySelector(selector) {
 	let el = null;
 
 	if (selector.includes('*')) {
@@ -52,7 +98,7 @@ export function getTextBySelector(selector) {
 	return value.trim();
 }
 
-export function processTitle(currentUrl, currentTitle, rule) {
+function processTitle(currentUrl, currentTitle, rule) {
 	let title = rule.tab.title;
 	const matches = title.match(/\{([^}]+)}/g);
 
@@ -109,7 +155,7 @@ export function processTitle(currentUrl, currentTitle, rule) {
 	return title;
 }
 
-export function processIcon(newIcon) {
+function processIcon(newIcon) {
 	const icons = document.querySelectorAll('head link[rel*="icon"]');
 
 	icons.forEach((icon) => {
@@ -135,7 +181,7 @@ export function processIcon(newIcon) {
 	return true;
 }
 
-export async function applyRule(ruleParam, updateTitle) {
+async function applyRule(ruleParam, updateTitle) {
 	const rule = ruleParam ?? (await _getRuleFromUrl(location.href));
 	updateTitle = updateTitle ?? true;
 

src/content.test.js src/content.test.js.baksrc/content.test.js renamed to src/content.test.js.bak

@@ -1,18 +1,15 @@
-import { defineConfig } from 'vite'
-import vue from '@vitejs/plugin-vue'
-import { crx, ManifestV3Export } from '@crxjs/vite-plugin'
-import manifest from './manifest.json' assert { type: 'json' }
+import { defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue';
+import { crx, ManifestV3Export } from '@crxjs/vite-plugin';
+import manifest from './manifest.json' assert { type: 'json' };
 
 export default defineConfig({
-  server: {
-    strictPort: true,
-    port: 5173,
-    hmr: {
-      clientPort: 5173
-    }
-  },
-  plugins: [
-    vue(),
-    crx({ manifest: manifest as unknown as ManifestV3Export }),
-  ]
-})
+	server: {
+		strictPort: true,
+		port: 5173,
+		hmr: {
+			clientPort: 5173,
+		},
+	},
+	plugins: [vue(), crx({ manifest: manifest as unknown as ManifestV3Export })],
+});