-
-
Notifications
You must be signed in to change notification settings - Fork 128
Manifest v3 update #528
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.
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
Draft
natpicone
wants to merge
2
commits into
master
Choose a base branch
from
manifest-upd
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Manifest v3 update #528
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 35 additions & 11 deletions
46
src/modules/webext/chromium/chromium-background/chromium-background.module.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,40 @@ | ||
| import angular from 'angular'; | ||
| import { NgModule } from 'angular-ts-decorators'; | ||
| import { WebExtBackgroundModule } from '../../webext-background/webext-background.module'; | ||
| /** | ||
| * Chromium background entry point for MV3 service worker. | ||
| * Replaces the AngularJS bootstrap with a manual DI container. | ||
| */ | ||
|
|
||
| import browser from 'webextension-polyfill'; | ||
| import { WebExtV160UpgradeProviderService } from '../../shared/webext-upgrade/webext-v1.6.0-upgrade-provider.service'; | ||
| import { setupAngularShim } from '../../webext-background/angular-shims'; | ||
| import { createBackgroundContainer } from '../../webext-background/background-container'; | ||
| import { ChromiumBookmarkService } from '../shared/chromium-bookmark/chromium-bookmark.service'; | ||
| import { ChromiumPlatformService } from '../shared/chromium-platform/chromium-platform.service'; | ||
|
|
||
| @NgModule({ | ||
| id: 'ChromiumBackgroundModule', | ||
| imports: [WebExtBackgroundModule], | ||
| providers: [ChromiumBookmarkService, ChromiumPlatformService] | ||
| }) | ||
| class ChromiumBackgroundModule {} | ||
| // Set up angular shim before any service code runs | ||
| setupAngularShim(); | ||
|
|
||
| // Mark this as the background context | ||
| // eslint-disable-next-line no-undef, no-restricted-globals | ||
| (self as any).__xbs_isBackground = true; | ||
|
|
||
| // Create the DI container with Chromium-specific services | ||
| const { backgroundSvc } = createBackgroundContainer({ | ||
| BookmarkServiceClass: ChromiumBookmarkService, | ||
| PlatformServiceClass: ChromiumPlatformService, | ||
| UpgradeProviderServiceClass: WebExtV160UpgradeProviderService | ||
| }); | ||
|
|
||
| // Register event handlers synchronously (required for MV3 service workers) | ||
| let startupInitiated = false; | ||
|
|
||
| browser.runtime.onInstalled.addListener((details) => { | ||
| if (startupInitiated) return; | ||
| startupInitiated = true; | ||
| backgroundSvc.onInstall(details.reason); | ||
| }); | ||
|
|
||
| angular.element(document).ready(() => { | ||
| angular.bootstrap(document, [(ChromiumBackgroundModule as NgModule).module.name]); | ||
| browser.runtime.onStartup.addListener(() => { | ||
| if (startupInitiated) return; | ||
| startupInitiated = true; | ||
| backgroundSvc.init(); | ||
| }); | ||
53 changes: 28 additions & 25 deletions
53
src/modules/webext/firefox/firefox-background/firefox-background.module.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,40 @@ | ||
| import angular from 'angular'; | ||
| import { NgModule } from 'angular-ts-decorators'; | ||
| /** | ||
| * Firefox background entry point for MV3 background scripts. | ||
| * Replaces the AngularJS bootstrap with a manual DI container. | ||
| */ | ||
|
|
||
| import browser from 'webextension-polyfill'; | ||
| import { WebExtBackgroundModule } from '../../webext-background/webext-background.module'; | ||
| import { WebExtV160UpgradeProviderService } from '../../shared/webext-upgrade/webext-v1.6.0-upgrade-provider.service'; | ||
| import { setupAngularShim } from '../../webext-background/angular-shims'; | ||
| import { createBackgroundContainer } from '../../webext-background/background-container'; | ||
| import { FirefoxBookmarkService } from '../shared/firefox-bookmark/firefox-bookmark.service'; | ||
| import { FirefoxPlatformService } from '../shared/firefox-platform/firefox-platform.service'; | ||
|
|
||
| @NgModule({ | ||
| id: 'FirefoxBackgroundModule', | ||
| imports: [WebExtBackgroundModule], | ||
| providers: [FirefoxBookmarkService, FirefoxPlatformService] | ||
| }) | ||
| class FirefoxBackgroundModule {} | ||
| // Set up angular shim before any service code runs | ||
| setupAngularShim(); | ||
|
|
||
|
Comment on lines
+13
to
15
|
||
| (FirefoxBackgroundModule as NgModule).module.config([ | ||
| '$compileProvider', | ||
| '$httpProvider', | ||
| ($compileProvider: ng.ICompileProvider, $httpProvider: ng.IHttpProvider) => { | ||
| $compileProvider.debugInfoEnabled(false); | ||
| $httpProvider.interceptors.push('ApiRequestInterceptorFactory'); | ||
| } | ||
| ]); | ||
| // Mark this as the background context | ||
| // eslint-disable-next-line no-undef, no-restricted-globals | ||
| (self as any).__xbs_isBackground = true; | ||
|
|
||
| angular.element(document).ready(() => { | ||
| angular.bootstrap(document, [(FirefoxBackgroundModule as NgModule).module.name]); | ||
| // Create the DI container with Firefox-specific services | ||
| const { backgroundSvc } = createBackgroundContainer({ | ||
| BookmarkServiceClass: FirefoxBookmarkService, | ||
| PlatformServiceClass: FirefoxPlatformService, | ||
| UpgradeProviderServiceClass: WebExtV160UpgradeProviderService | ||
| }); | ||
|
|
||
| // Set synchronous event handlers | ||
| // Register event handlers synchronously (required for MV3 background scripts) | ||
| let startupInitiated = false; | ||
|
|
||
| browser.runtime.onInstalled.addListener((details) => { | ||
| // Store event details as element data | ||
| const element = document.querySelector('#install'); | ||
| angular.element(element).data('details', details); | ||
| (document.querySelector('#install') as HTMLButtonElement).click(); | ||
| if (startupInitiated) return; | ||
| startupInitiated = true; | ||
| backgroundSvc.onInstall(details.reason); | ||
| }); | ||
|
|
||
| browser.runtime.onStartup.addListener(() => { | ||
| (document.querySelector('#startup') as HTMLButtonElement).click(); | ||
| if (startupInitiated) return; | ||
| startupInitiated = true; | ||
| backgroundSvc.init(); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
setupAngularShim() is called in the module body, but all imports (including services that may reference
angularor import the real AngularJS package) are evaluated before this runs. If the intent is to rely on the shim in the MV3 background context, move shim setup to a side-effect import that executes before other modules, or ensure background dependencies do not importangularat all.This issue also appears on line 27 of the same file.