From 2fc6f09a055eccfa5af61281e3600d89b6cb698a Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 28 Nov 2023 01:37:36 +0000
Subject: [PATCH] Bug 1863400 - Part 3: Move some about:welcome modules into
 browser/components/aboutwelcome folder. r=pdahiya

Depends on D193117

Differential Revision: https://phabricator.services.mozilla.com/D193118
---
 browser/components/aboutwelcome/jar.mn                      | 6 ++++++
 .../lib => aboutwelcome/modules}/AboutWelcomeDefaults.jsm   | 0
 .../lib => aboutwelcome/modules}/AboutWelcomeTelemetry.jsm  | 0
 browser/components/aboutwelcome/moz.build                   | 2 ++
 browser/components/newtab/jar.mn                            | 1 -
 5 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 browser/components/aboutwelcome/jar.mn
 rename browser/components/{newtab/aboutwelcome/lib => aboutwelcome/modules}/AboutWelcomeDefaults.jsm (100%)
 rename browser/components/{newtab/aboutwelcome/lib => aboutwelcome/modules}/AboutWelcomeTelemetry.jsm (100%)

diff --git a/browser/components/aboutwelcome/jar.mn b/browser/components/aboutwelcome/jar.mn
new file mode 100644
index 000000000000..ed55846c91fe
--- /dev/null
+++ b/browser/components/aboutwelcome/jar.mn
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+browser.jar:
+  res/activity-stream/aboutwelcome/lib/ (./modules/*)
diff --git a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm b/browser/components/aboutwelcome/modules/AboutWelcomeDefaults.jsm
similarity index 100%
rename from browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
rename to browser/components/aboutwelcome/modules/AboutWelcomeDefaults.jsm
diff --git a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm b/browser/components/aboutwelcome/modules/AboutWelcomeTelemetry.jsm
similarity index 100%
rename from browser/components/newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm
rename to browser/components/aboutwelcome/modules/AboutWelcomeTelemetry.jsm
diff --git a/browser/components/aboutwelcome/moz.build b/browser/components/aboutwelcome/moz.build
index 2af97e607a6e..77ba7a5fed79 100644
--- a/browser/components/aboutwelcome/moz.build
+++ b/browser/components/aboutwelcome/moz.build
@@ -15,3 +15,5 @@ FINAL_TARGET_FILES.actors += [
     "actors/AboutWelcomeChild.sys.mjs",
     "actors/AboutWelcomeParent.sys.mjs",
 ]
+
+JAR_MANIFESTS += ["jar.mn"]
diff --git a/browser/components/newtab/jar.mn b/browser/components/newtab/jar.mn
index 5f1dec37f51e..154b84b0fae9 100644
--- a/browser/components/newtab/jar.mn
+++ b/browser/components/newtab/jar.mn
@@ -10,7 +10,6 @@ browser.jar:
   content/activity-stream/aboutwelcome/aboutwelcome.css (./aboutwelcome/content/aboutwelcome.css)
   res/activity-stream/aboutwelcome/aboutwelcome.bundle.js (./aboutwelcome/content/aboutwelcome.bundle.js)
   res/activity-stream/aboutwelcome/aboutwelcome.html (./aboutwelcome/content/aboutwelcome.html)
-  res/activity-stream/aboutwelcome/lib/ (./aboutwelcome/lib/*)
   res/activity-stream/schemas/BackgroundTaskMessagingExperiment.schema.json (./content-src/asrouter/schemas/BackgroundTaskMessagingExperiment.schema.json)
   res/activity-stream/schemas/MessagingExperiment.schema.json (./content-src/asrouter/schemas/MessagingExperiment.schema.json)
   res/activity-stream/vendor/Redux.sys.mjs (./vendor/Redux.sys.mjs)