Bug 1797888 - Relocate AppUpdater.jsm to toolkit/mozapps/update. r=na…

…lexander,application-update-reviewers,bytesized Thunderbird now has an identical copy of AppUpdater.jsm in its repository. Moving it into toolkit will make ongoing maintenance easier. Differential Revision: https://phabricator.services.mozilla.com/D161718
iaxat · Nov 9, 2022 · 8417e21 · 8417e21
1 parent aa0e32e
commit 8417e21
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 8 deletions.
diff --git a/browser/base/content/aboutDialog-appUpdater.js b/browser/base/content/aboutDialog-appUpdater.js
@@ -16,7 +16,7 @@ ChromeUtils.defineESModuleGetters(this, {
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  AppUpdater: "resource:///modules/AppUpdater.jsm",
+  AppUpdater: "resource://gre/modules/AppUpdater.jsm",
   DownloadUtils: "resource://gre/modules/DownloadUtils.jsm",
 });
 

diff --git a/browser/components/urlbar/UrlbarProviderInterventions.sys.mjs b/browser/components/urlbar/UrlbarProviderInterventions.sys.mjs
@@ -20,7 +20,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  AppUpdater: "resource:///modules/AppUpdater.jsm",
+  AppUpdater: "resource://gre/modules/AppUpdater.jsm",
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
   Sanitizer: "resource:///modules/Sanitizer.jsm",
 });

diff --git a/browser/modules/moz.build b/browser/modules/moz.build
@@ -119,7 +119,6 @@ XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
 
 EXTRA_JS_MODULES += [
     "AboutNewTab.jsm",
-    "AppUpdater.jsm",
     "AsyncTabSwitcher.jsm",
     "BrowserUIUtils.jsm",
     "BrowserUsageTelemetry.jsm",

diff --git a/browser/modules/AppUpdater.jsm → toolkit/mozapps/update/AppUpdater.jsm b/browser/modules/AppUpdater.jsm → toolkit/mozapps/update/AppUpdater.jsm
diff --git a/toolkit/mozapps/update/BackgroundTask_backgroundupdate.sys.mjs b/toolkit/mozapps/update/BackgroundTask_backgroundupdate.sys.mjs
@@ -20,7 +20,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  AppUpdater: "resource:///modules/AppUpdater.jsm",
+  AppUpdater: "resource://gre/modules/AppUpdater.jsm",
   ExtensionUtils: "resource://gre/modules/ExtensionUtils.jsm",
 });
 

diff --git a/toolkit/mozapps/update/moz.build b/toolkit/mozapps/update/moz.build
@@ -24,6 +24,7 @@ EXTRA_COMPONENTS += [
 ]
 
 EXTRA_JS_MODULES += [
+    "AppUpdater.jsm",
     "UpdateListener.jsm",
     "UpdateService.jsm",
     "UpdateServiceStub.jsm",

diff --git a/toolkit/mozapps/update/tests/browser/browser_aboutDialog_AppUpdater_stop_internal_error.js b/toolkit/mozapps/update/tests/browser/browser_aboutDialog_AppUpdater_stop_internal_error.js
@@ -4,7 +4,7 @@
 "use strict";
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  AppUpdater: "resource:///modules/AppUpdater.jsm",
+  AppUpdater: "resource://gre/modules/AppUpdater.jsm",
   sinon: "resource://testing-common/Sinon.jsm",
 });
 

diff --git a/toolkit/mozapps/update/tests/browser/browser_aboutDialog_internalError.js b/toolkit/mozapps/update/tests/browser/browser_aboutDialog_internalError.js
@@ -4,7 +4,7 @@
 "use strict";
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  AppUpdater: "resource:///modules/AppUpdater.jsm",
+  AppUpdater: "resource://gre/modules/AppUpdater.jsm",
   sinon: "resource://testing-common/Sinon.jsm",
 });
 

diff --git a/toolkit/mozapps/update/tests/browser/browser_aboutPrefs_internalError.js b/toolkit/mozapps/update/tests/browser/browser_aboutPrefs_internalError.js
@@ -4,7 +4,7 @@
 "use strict";
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  AppUpdater: "resource:///modules/AppUpdater.jsm",
+  AppUpdater: "resource://gre/modules/AppUpdater.jsm",
   sinon: "resource://testing-common/Sinon.jsm",
 });
 

diff --git a/tools/esmify/map.json b/tools/esmify/map.json
@@ -222,7 +222,7 @@
   "resource:///modules/AboutNewTab.jsm": "browser/modules/AboutNewTab.jsm",
   "resource:///modules/AboutNewTabService.jsm":
     "browser/components/newtab/AboutNewTabService.jsm",
-  "resource:///modules/AppUpdater.jsm": "browser/modules/AppUpdater.jsm",
+  "resource://gre/modules/AppUpdater.jsm": "toolkit/mozapps/update/AppUpdater.jsm",
   "resource:///modules/AsyncTabSwitcher.jsm":
     "browser/modules/AsyncTabSwitcher.jsm",
   "resource:///modules/AttributionCode.jsm":