Merge branch 'release/v0.2.1'

Author: addon-owner

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@adnbn/inject-script",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A lightweight, TypeScript-ready library for injecting JavaScript functions or external scripts into Chrome extension tabs and frames (Manifest V2 & V3).",
   "keywords": [
     "browser",
@@ -41,7 +41,7 @@
     "build:watch": "tsup --watch"
   },
   "dependencies": {
-    "@adnbn/browser": "^0.1.5",
+    "@adnbn/browser": "^0.1.7",
     "nanoid": "^5.1.5"
   },
   "devDependencies": {

package.json

@@ -32,11 +32,11 @@ export default class extends AbstractInjectScript {
                 if (message?.type !== type) return;
 
                 const {result, error} = message?.data;
-                const {frameId, documentId} = sender;
+                const {frameId, documentId = ""} = sender;
 
                 frameCount -= 1;
 
-                if (frameId == null || documentId == null) {
+                if (frameId == null) {
                     throw new Error("frameId or documentId is missing in sender");
                 }
 

src/InjectScriptV2.ts

@@ -1,4 +1,4 @@
-import {executeScript} from "@adnbn/browser";
+import {executeScript, getBrowserInfo} from "@adnbn/browser";
 
 import AbstractInjectScript from "./AbstractInjectScript";
 
@@ -18,7 +18,7 @@ export default class extends AbstractInjectScript {
         args?: A
     ): Promise<InjectionResult<Awaited<R>>[]> {
         return executeScript({
-            target: this.target,
+            target: await this.target(),
             world: this._options.world,
             injectImmediately: this.injectImmediately,
             func,
@@ -28,20 +28,30 @@ export default class extends AbstractInjectScript {
 
     public async file(fileList: string | string[]): Promise<void> {
         await executeScript({
-            target: this.target,
+            target: await this.target(),
             world: this._options.world,
             injectImmediately: this.injectImmediately,
             files: typeof fileList === "string" ? [fileList] : fileList,
         });
     }
 
-    protected get target(): InjectionTarget {
-        return {
+    protected async target(): Promise<InjectionTarget> {
+        const target = {
             tabId: this._options.tabId,
             allFrames: this.allFrames,
             frameIds: this.frameIds,
-            documentIds: this.documentIds,
         };
+
+        try {
+            const {name} = await getBrowserInfo();
+
+            // Firefox does not support `documentIds` in the target
+            if (name === "Firefox") {
+                return target;
+            }
+        } catch (err) {}
+
+        return {...target, documentIds: this.documentIds};
     }
 
     protected get documentIds(): string[] | undefined {