#6548: Load PixieBrix into existing tabs on install (#6851)

package.json

@@ -163,8 +163,9 @@
     "uuid": "^9.0.1",
     "webext-additional-permissions": "^2.4.0",
     "webext-base-css": "^1.4.4",
-    "webext-content-scripts": "^2.5.5",
+    "webext-content-scripts": "^2.6.0",
     "webext-detect-page": "^4.1.1",
+    "webext-inject-on-install": "^2.0.0-2",
     "webext-messenger": "^0.25.0-0",
     "webext-patterns": "^1.3.0",
     "webext-polyfill-kinda": "^1.0.2",

src/background/background.ts

@@ -17,6 +17,8 @@
 
 // extensionContext needs to be imported before webpack-target-webextension to
 // ensure the webpack path is correct
+// eslint-disable-next-line import/no-unassigned-import -- Automatic registration
+import "webext-inject-on-install";
 import "@/extensionContext";
 import "@/development/autoreload";
 import "@/development/errorsBadge";

src/background/browserAction.ts

@@ -19,7 +19,7 @@ import { ensureContentScript } from "@/background/contentScript";
 import { rehydrateSidebar } from "@/contentScript/messenger/api";
 import webextAlert from "./webextAlert";
 import { browserAction, type Tab } from "@/mv3/api";
-import { isScriptableUrl } from "@/permissions/permissionsUtils";
+import { isScriptableUrl } from "webext-content-scripts";
 import { memoizeUntilSettled } from "@/utils/promiseUtils";
 import { getExtensionConsoleUrl } from "@/utils/extensionUtils";
 import {

src/background/initBrowserCommands.ts

@@ -19,7 +19,7 @@ import { toggleQuickBar } from "@/contentScript/messenger/api";
 import { type Tab } from "@/mv3/api";
 import { type Target } from "@/types/messengerTypes";
 import { expectContext } from "@/utils/expectContext";
-import { isScriptableUrl } from "@/permissions/permissionsUtils";
+import { isScriptableUrl } from "webext-content-scripts";
 import { ensureContentScript } from "./contentScript";
 
 async function handleCommand(command: string, tab: Tab): Promise<void> {

src/background/navigation.ts

@@ -18,7 +18,8 @@
 import { reactivateTab, handleNavigate } from "@/contentScript/messenger/api";
 import { forEachTab } from "@/utils/extensionUtils";
 import { type Target } from "@/types/messengerTypes";
-import { canAccessTab, isScriptableUrl } from "@/permissions/permissionsUtils";
+import { canAccessTab } from "@/permissions/permissionsUtils";
+import { isScriptableUrl } from "webext-content-scripts";
 import { debounce } from "lodash";
 import { syncFlagOn } from "@/store/syncFlags";
 import { canAccessTab as canInjectTab, getTabUrl } from "webext-tools";

src/pageEditor/EditorLayout.tsx

@@ -27,7 +27,7 @@ import RestrictedPane from "@/pageEditor/panes/RestrictedPane";
 import InsertPane from "@/pageEditor/panes/insert/InsertPane";
 import useCurrentUrl from "./hooks/useCurrentUrl";
 import NonScriptablePage from "./NonScriptablePage";
-import { isScriptableUrl } from "@/permissions/permissionsUtils";
+import { isScriptableUrl } from "webext-content-scripts";
 import Loader from "@/components/Loader";
 import { selectIsStaleSession } from "@/store/sessionChanges/sessionChangesSelectors";
 import StaleSessionPane from "@/pageEditor/panes/StaleSessionPane";

src/permissions/permissionsUtils.ts

@@ -21,7 +21,7 @@ import {
   containsPermissions,
   openPopupPrompt,
 } from "@/background/messenger/api";
-import { isScriptableUrl as _isScriptableUrl } from "webext-content-scripts";
+import { isScriptableUrl } from "webext-content-scripts";
 import { isUrlPermittedByManifest } from "webext-additional-permissions";
 import {
   getTabUrl,
@@ -177,15 +177,6 @@ async function requestPermissionsFromUserGesture(
   return containsPermissions(permissions);
 }
 
-/**
- * Determines whether a URL can potentially execute a content script.
- * @since 1.7.36 this includes http urls
- *
- */
-export function isScriptableUrl(url?: string): boolean {
-  return url && _isScriptableUrl(url);
-}
-
 /**
  * Determines whether PixieBrix can access the tab, depending on permissions and
  * artificial protocol-based limitations