Skip to content

fix(wxt): tolerate the content script reload race in MV3 dev #2610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bompus wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(wxt): tolerate the content script reload race in MV3 dev #2610

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 23 additions & 6 deletions packages/wxt/src/virtual/utils/reload-content-scripts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,30 @@ export async function reloadManifestContentScriptMv3(
]);
} else {
logger.debug('Registering new content script...');
await browser.scripting.registerContentScripts([
{
...contentScript,
try {
await browser.scripting.registerContentScripts([
{
...contentScript,
id,
css: contentScript.css ?? [],
},
]);
} catch (err) {
// Two reload events for the same entrypoint can both read an empty
// registration above and both register; the loser throws "Duplicate
// script ID". The winner is registering this same script and reloads
// the tabs once it lands, so the loser has nothing left to do. It must
// not fall back to updateContentScripts (the winner's registration is
// not complete yet, so that throws "not fully registered") and must not
// reload tabs (they would come back before the script is registered).
const message = String((err as Error)?.message ?? err);
if (!message.includes('Duplicate script ID')) throw err;
logger.debug(
'Lost a registration race, the concurrent register owns it',
id,
css: contentScript.css ?? [],
},
]);
);
return;
}
}

await reloadTabsForContentScript(contentScript);
Expand Down