Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/wxt-demo/src/entrypoints/content.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ export default defineContentScript({
matches: ['*://*.example.com/*'],

async main() {
console.log(getAppConfig());
console.log('Injecting...');
await injectScript('/unlisted.js', {
keepInDom: true,
Expand Down
3 changes: 3 additions & 0 deletions packages/wxt/src/core/utils/create-file-reloader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ export function createFileReloader(server: WxtDevServer) {

// Perform reloads
if (hasNewEntrypoints || changes.type === 'extension-reload') {
// `server.reloadExtension()` only reloads the background/manifest
// reload content scripts into tabs which are already open.
reloadContentScripts(newOutput.steps, server);
server.reloadExtension();
wxt.logger.success(`Reloaded extension`);
} else if (changes.type === 'html-reload') {
Expand Down
2 changes: 2 additions & 0 deletions packages/wxt/src/utils/internal/dev-server-websocket.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { Browser } from '@wxt-dev/browser';
import { logger } from './logger';

interface WebSocketMessage {
Expand Down Expand Up @@ -76,5 +77,6 @@ export interface ReloadContentScriptPayload {
matches: string[];
js?: string[];
css?: string[];
world?: Browser.scripting.RegisteredContentScript['world'];
};
}
9 changes: 7 additions & 2 deletions packages/wxt/src/virtual/background-entrypoint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,17 @@ import { getDevServerWebSocket } from '../utils/internal/dev-server-websocket';
import { logger } from '../utils/internal/logger';
import { browser } from 'wxt/browser';
import { keepServiceWorkerAlive } from './utils/keep-service-worker-alive';
import { reloadContentScript } from './utils/reload-content-scripts';
import {
reloadContentScript,
waitForPendingContentScriptReloads,
} from './utils/reload-content-scripts';

if (import.meta.env.COMMAND === 'serve') {
try {
const ws = getDevServerWebSocket();
ws.addWxtEventListener('wxt:reload-extension', () => {
ws.addWxtEventListener('wxt:reload-extension', async () => {
// Wait for content script reloads to finish before killing the background.
await waitForPendingContentScriptReloads();
browser.runtime.reload();
});
ws.addWxtEventListener('wxt:reload-content-script', (event) => {
Expand Down
25 changes: 18 additions & 7 deletions packages/wxt/src/virtual/utils/reload-content-scripts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@ import { logger } from '../../utils/internal/logger';
import { MatchPattern } from 'wxt/utils/match-patterns';
import type { ReloadContentScriptPayload } from '../../utils/internal/dev-server-websocket';

export function reloadContentScript(payload: ReloadContentScriptPayload) {
const pendingReloads = new Set<Promise<unknown>>();

export function reloadContentScript(payload: ReloadContentScriptPayload): void {
const manifest = browser.runtime.getManifest();
if (manifest.manifest_version == 2) {
void reloadContentScriptMv2(payload);
} else {
void reloadContentScriptMv3(payload);
}
const promise =
manifest.manifest_version == 2
? reloadContentScriptMv2(payload)
: reloadContentScriptMv3(payload);
pendingReloads.add(promise);
promise.finally(() => pendingReloads.delete(promise));
}

export async function waitForPendingContentScriptReloads(): Promise<void> {
await Promise.allSettled(pendingReloads);
}

export async function reloadContentScriptMv3({
Expand Down Expand Up @@ -96,7 +103,11 @@ async function reloadTabsForContentScript(contentScript: ContentScript) {
await Promise.all(
matchingTabs.map(async (tab) => {
try {
await browser.tabs.reload(tab.id!);
await browser.scripting.executeScript({
target: { tabId: tab.id! },
files: contentScript.js!,
world: contentScript.world,
});
} catch (err) {
logger.warn('Failed to reload tab:', err);
}
Expand Down