reorganize extension directory to fix grd paths

copy locale resources to bundle resources dir on mac

.gitignore

@@ -3,7 +3,7 @@
 /.idea/
 /browser/resources/brave_extension/
 /components/brave_webtorrent/extension/out/
-/components/brave_rewards/extension/out/
+/components/brave_rewards/extension/brave_rewards/out/
 /dist/
 /out/
 /vendor

BUILD.gn

@@ -44,6 +44,14 @@ group("brave") {
   ]
 }
 
+group("framework_bundle_data") {
+  if (is_mac) {
+    public_deps = [
+      "vendor/brave-extension:brave_extension_framework_bundle_data",
+      "components/brave_rewards/extension:framework_bundle_data",
+    ]
+  }
+}
 group("brave_tests") {
   testonly = true
 

brave_paks.gni

@@ -57,15 +57,15 @@ template("brave_extra_paks") {
       "$root_gen_dir/brave/brave_generated_resources.pak",
       "$root_gen_dir/brave/brave_unscaled_resources.pak",
       "$root_gen_dir/components/brave_components_resources.pak",
+      "$root_gen_dir/brave/components/brave_rewards/extension/brave_rewards_resources.pak",
       "$target_gen_dir/browser/resources/brave_extension.pak",
-      "$target_gen_dir/components/brave_rewards/brave_rewards_resources.pak",
       "$target_gen_dir/components/brave_webtorrent/brave_webtorrent_resources.pak",
     ]
 
     deps = [
       "//brave/app:brave_generated_resources_grit",
       "//brave/app/theme:brave_unscaled_resources",
-      "//brave/components/brave_rewards:resources",
+      "//brave/components/brave_rewards/extension:resources",
       "//brave/components/brave_webtorrent:resources",
       "//brave/components/resources:brave_components_resources_grit",
       "//brave/browser/resources:brave_extension_grit",

browser/extensions/BUILD.gn

@@ -33,7 +33,7 @@ source_set("extensions") {
   deps = [
     "//brave/browser/resources:brave_extension_grit",
     "//brave/common/extensions/api",
-    "//brave/components/brave_rewards:resources",
+    "//brave/components/brave_rewards/extension:resources",
     "//brave/components/brave_webtorrent:resources",
     "//chrome/browser",
     "//content/public/browser",

browser/extensions/brave_component_extension_resource_manager.cc

@@ -5,7 +5,7 @@
 #include "brave/browser/extensions/brave_component_extension_resource_manager.h"
 
 #include "brave/browser/resources/grit/brave_extension_resources_map.h"
-#include "brave/components/brave_rewards/grit/brave_rewards_resources_map.h"
+#include "brave/components/brave_rewards/extension/grit/brave_rewards_resources_map.h"
 #include "brave/components/brave_webtorrent/grit/brave_webtorrent_resources_map.h"
 
 namespace extensions {

browser/extensions/brave_component_loader.cc

@@ -7,7 +7,7 @@
 #include "base/command_line.h"
 #include "brave/common/brave_switches.h"
 #include "brave/components/brave_rewards/browser/buildflags/buildflags.h"
-#include "brave/components/brave_rewards/grit/brave_rewards_resources.h"
+#include "brave/components/brave_rewards/extension/grit/brave_rewards_resources.h"
 #include "brave/components/brave_webtorrent/grit/brave_webtorrent_resources.h"
 #include "components/grit/brave_components_resources.h"
 

browser/resources/resource_ids

@@ -22,7 +22,5 @@
     "includes": [36500],
   },
   # brave webtorrent 37500
-  "brave/components/brave_rewards/resources.grd": {
-    "includes": [38000],
-  },
+  # brave rewards 38000
 }

chromium_src/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc

@@ -8,7 +8,7 @@
 
 #include "brave/common/extensions/extension_constants.h"
 #include "components/grit/brave_components_resources.h"
-#include "brave/components/brave_rewards/grit/brave_rewards_resources.h"
+#include "brave/components/brave_rewards/extension/grit/brave_rewards_resources.h"
 #include "brave/components/brave_webtorrent/grit/brave_webtorrent_resources.h"
 
 namespace extensions {

components/brave_rewards/BUILD.gn

@@ -1,18 +0,0 @@
-import("//tools/grit/grit_rule.gni")
-import("//tools/grit/repack.gni")
-
-grit("resources") {
-  source = "resources.grd"
-  outputs = [
-    "grit/brave_rewards_resources_map.cc",
-    "grit/brave_rewards_resources_map.h",
-    "grit/brave_rewards_resources.h",
-    "brave_rewards_resources.pak",
-  ]
-
-  deps = [
-    "//brave/components/brave_rewards/extension:brave_rewards_panel"
-  ]
-
-  resource_ids = ""
-}

components/brave_rewards/extension/BUILD.gn

@@ -1,28 +1,27 @@
-import("//brave/components/common/typescript.gni")
+import("//tools/grit/grit_rule.gni")
+import("//tools/grit/repack.gni")
 
-transpile_web_ui("brave_rewards_panel") {
-  inputs = [
-    "actions/rewards_panel_actions.ts",
-    "background.ts",
-    "background/actions/rewardsPanelActions.ts",
-    "background/api/locale_api.ts",
-    "background/api/tabs_api.ts",
-    "background/events/rewardsEvents.ts",
-    "background/reducers/index.ts",
-    "background/reducers/rewards_panel_reducer.ts",
-    "background/store.ts",
-    "brave_rewards_panel.html",
-    "brave_rewards_panel.tsx",
-    "components/app.tsx",
-    "constants/rewards_panel_types.ts",
-    "constants/rewardsPanelState.ts",
+grit("resources") {
+  source = "resources.grd"
+  outputs = [
+    "grit/brave_rewards_resources_map.cc",
+    "grit/brave_rewards_resources_map.h",
+    "grit/brave_rewards_resources.h",
+    "brave_rewards_resources.pak",
   ]
 
-  bundle_names = [
-    "brave_rewards_panel.bundle.js",
-    "brave_rewards_panel_background.bundle.js"
+  deps = [
+    "//brave/components/brave_rewards/extension/brave_rewards"
   ]
 
-  output_dir =
-    "$root_gen_dir/../../../brave/components/brave_rewards/extension/out"
+  resource_ids = ""
+
+  output_dir = "$root_gen_dir/brave/components/brave_rewards/extension"
+}
+
+if (is_mac) {
+  bundle_data("framework_bundle_data") {
+    sources = [ "brave_rewards/_locales" ]
+    outputs = [ "{{bundle_resources_dir}}/brave_rewards/{{source_file_part}}" ]
+  }
 }

components/brave_rewards/extension/_locales/en_GB/messages.json

@@ -1,38 +0,0 @@
-{
-  "braveRewards": {
-    "message": "Brave Rewards",
-    "description": "Description"
-  },
-  "welcomeButtonTextOne": {
-    "message": "Start Earning Now!",
-    "description": "Description"
-  },
-  "welcomeButtonTextTwo": {
-    "message": "Join Rewards",
-    "description": "Description"
-  },
-  "welcomeDescOne": {
-    "message": "You can now earn tokens for watching privacy focused Brave Ads. Your contribution stays the same.",
-    "description": "Description"
-  },
-  "welcomeDescTwo": {
-    "message": "Earn tokens for watching Ads and pay it forward to your favorite content creators.",
-    "description": "Description"
-  },
-  "welcomeFooterTextOne": {
-    "message": "Check out what’s improved",
-    "description": "Description"
-  },
-  "welcomeFooterTextTwo": {
-    "message": "Learn More",
-    "description": "Description"
-  },
-  "welcomeHeaderOne": {
-    "message": "Brave Payments is now Brave Rewards with many upgrades.",
-    "description": "Description"
-  },
-  "welcomeHeaderTwo": {
-    "message": "You are about to start a very Brave way to browse the web.",
-    "description": "Description"
-  }
-}

components/brave_rewards/extension/brave_rewards/BUILD.gn

@@ -0,0 +1,34 @@
+import("//brave/components/common/typescript.gni")
+
+group("brave_rewards") {
+  deps = [
+    ":brave_rewards_panel",
+  ]
+}
+
+transpile_web_ui("brave_rewards_panel") {
+  inputs = [
+    "actions/rewards_panel_actions.ts",
+    "background.ts",
+    "background/actions/rewardsPanelActions.ts",
+    "background/api/locale_api.ts",
+    "background/api/tabs_api.ts",
+    "background/events/rewardsEvents.ts",
+    "background/reducers/index.ts",
+    "background/reducers/rewards_panel_reducer.ts",
+    "background/store.ts",
+    "brave_rewards_panel.html",
+    "brave_rewards_panel.tsx",
+    "components/app.tsx",
+    "constants/rewards_panel_types.ts",
+    "constants/rewardsPanelState.ts",
+  ]
+
+  bundle_names = [
+    "brave_rewards_panel.bundle.js",
+    "brave_rewards_panel_background.bundle.js"
+  ]
+
+  output_dir =
+    "$root_gen_dir/../../../brave/components/brave_rewards/extension/brave_rewards/out"
+}

components/brave_rewards/extension/brave_rewards/manifest.json

@@ -5,28 +5,28 @@
   "description": "Brave Rewards Extension",
   "default_locale": "en",
   "background" : {
-    "scripts": ["extension/out/brave_rewards_panel_background.bundle.js"],
+    "scripts": ["out/brave_rewards_panel_background.bundle.js"],
     "persistent": true
   },
   "permissions": ["tabs"],
   "browser_action": {
-    "default_popup": "extension/brave_rewards_panel.html",
+    "default_popup": "brave_rewards_panel.html",
     "default_icon": {
-      "16": "extension/img/bat-16.png",
-      "32": "extension/img/bat-32.png",
-      "48": "extension/img/bat-48.png",
-      "64": "extension/img/bat-64.png",
-      "128": "extension/img/bat-128.png",
-      "256": "extension/img/bat-256.png"
+      "16": "img/bat-16.png",
+      "32": "img/bat-32.png",
+      "48": "img/bat-48.png",
+      "64": "img/bat-64.png",
+      "128": "img/bat-128.png",
+      "256": "img/bat-256.png"
     }
   },
   "icons": {
-    "16": "extension/img/bat-16.png",
-    "32": "extension/img/bat-32.png",
-    "48": "extension/img/bat-48.png",
-    "64": "extension/img/bat-64.png",
-    "128": "extension/img/bat-128.png",
-    "256": "extension/img/bat-256.png"
+    "16": "img/bat-16.png",
+    "32": "img/bat-32.png",
+    "48": "img/bat-48.png",
+    "64": "img/bat-64.png",
+    "128": "img/bat-128.png",
+    "256": "img/bat-256.png"
   },
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmqLJHCRq1BdVqkYZuPiH3UxlEnF6ZZGq2ba8IOIuuAjGd3xFjA1yxKhuJWt17mCUonB04jG+BmxDQNj29gHhBHKwV20Zw4HNQeyXsThx6op4lfL0ypiZX727Dvcd2zn48eP+0hT/2oP3szHvsPDHrZUPwXcL6ButcJYWsO18OlIMPK4L3B/l37nOeAs2OVlSrrKFu7uiAfGj70kJYvAQdHEtCsuTsWX3ApZ6MM49XTYD5TyKvXJXHagsiDmqeAZPAgPrk32ES43deqZYWorWOCFHuRzjJUwNRJBJn59IP4DK5X1Y+Uc7VjZDk9EUft+BI8UT6M+Ok8EDaDZZI57c5QIDAQAB"
 }

components/brave_rewards/extension/resources.grd

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grit base_dir="../" latest_public_release="0" current_release="1" output_all_resource_defines="true">
+<grit latest_public_release="0" current_release="1" output_all_resource_defines="true">
   <outputs>
     <output filename="grit/brave_rewards_resources.h" type="rc_header">
       <emit emit_type='prepend'></emit>
@@ -10,18 +10,17 @@
   </outputs>
   <release seq="1">
     <includes first_id="38000">
-      <include name="IDR_BRAVE_REWARDS" file="brave_rewards/extension/manifest.json" type="BINDATA" />
-      <include name="IDR_BRAVE_REWARDS_LOCALES_EN" file="brave_rewards/extension/_locales/en/messages.json" type="BINDATA" />
-      <include name="IDR_BRAVE_REWARDS_LOCALES_EN_GB" file="brave_rewards/extension/_locales/en_GB/messages.json" type="BINDATA" />
-      <include name="IDR_BRAVE_REWARDS_PANEL_HTML" file="brave_rewards/extension/brave_rewards_panel.html" type="BINDATA" />
-      <include name="IDR_BRAVE_REWARDS_PANEL_BUNDLE_JS" file="brave_rewards/extension/out/brave_rewards_panel.bundle.js" type="BINDATA" />
-      <include name="IDR_BRAVE_REWARDS_PANEL_BACKGROUND_JS" file="brave_rewards/extension/out/brave_rewards_panel_background.bundle.js" type="BINDATA" />
-      <include name="IDR_BRAVE_REWARDS_ICON_16" file="brave_rewards/extension/img/bat-16.png" type="BINDATA" />
-      <include name="IDR_BRAVE_REWARDS_ICON_32" file="brave_rewards/extension/img/bat-32.png" type="BINDATA" />
-      <include name="IDR_BRAVE_REWARDS_ICON_48" file="brave_rewards/extension/img/bat-48.png" type="BINDATA" />
-      <include name="IDR_BRAVE_REWARDS_ICON_64" file="brave_rewards/extension/img/bat-64.png" type="BINDATA" />
-      <include name="IDR_BRAVE_REWARDS_ICON_128" file="brave_rewards/extension/img/bat-128.png" type="BINDATA" />
-      <include name="IDR_BRAVE_REWARDS_ICON_256" file="brave_rewards/extension/img/bat-256.png" type="BINDATA" />
+      <include name="IDR_BRAVE_REWARDS" file="brave_rewards/manifest.json" type="BINDATA" />
+      <include name="IDR_BRAVE_REWARDS_LOCALES_EN" file="brave_rewards/_locales/en/messages.json" type="BINDATA" />
+      <include name="IDR_BRAVE_REWARDS_PANEL_HTML" file="brave_rewards/brave_rewards_panel.html" type="BINDATA" />
+      <include name="IDR_BRAVE_REWARDS_PANEL_BUNDLE_JS" file="brave_rewards/out/brave_rewards_panel.bundle.js" type="BINDATA" />
+      <include name="IDR_BRAVE_REWARDS_PANEL_BACKGROUND_JS" file="brave_rewards/out/brave_rewards_panel_background.bundle.js" type="BINDATA" />
+      <include name="IDR_BRAVE_REWARDS_ICON_16" file="brave_rewards/img/bat-16.png" type="BINDATA" />
+      <include name="IDR_BRAVE_REWARDS_ICON_32" file="brave_rewards/img/bat-32.png" type="BINDATA" />
+      <include name="IDR_BRAVE_REWARDS_ICON_48" file="brave_rewards/img/bat-48.png" type="BINDATA" />
+      <include name="IDR_BRAVE_REWARDS_ICON_64" file="brave_rewards/img/bat-64.png" type="BINDATA" />
+      <include name="IDR_BRAVE_REWARDS_ICON_128" file="brave_rewards/img/bat-128.png" type="BINDATA" />
+      <include name="IDR_BRAVE_REWARDS_ICON_256" file="brave_rewards/img/bat-256.png" type="BINDATA" />
     </includes>
   </release>
 </grit>

components/definitions/chromel.d.ts

@@ -8,6 +8,13 @@ declare namespace chrome {
   function send (stat: string, args?: any[]): void
 }
 
+declare namespace chrome.dns {
+  function resolve (hostname: string, callback: any): void
+}
+
 declare namespace chrome.braveRewards {
+  const onWalletCreated: {
+    addListener: (callback: () => void) => void
+  }
   const createWallet: () => {}
 }

components/webpack/dev.config.js

@@ -11,8 +11,8 @@ module.exports = {
     brave_welcome: path.join(__dirname, '../brave_welcome_ui/brave_welcome'),
     brave_webtorrent: path.join(__dirname, '../brave_webtorrent/extension/brave_webtorrent'),
     brave_webtorrent_background: path.join(__dirname, '../brave_webtorrent/extension/background'),
-    brave_rewards_panel: path.join(__dirname, '../brave_rewards/extension/brave_rewards_panel'),
-    brave_rewards_panel_background: path.join(__dirname, '../brave_rewards/extension/background'),
+    brave_rewards_panel: path.join(__dirname, '../brave_rewards/extension/brave_rewards/brave_rewards_panel'),
+    brave_rewards_panel_background: path.join(__dirname, '../brave_rewards/extension/brave_rewards/background'),
   },
   output: {
     path: process.env.TARGET_GEN_DIR,

patches/chrome-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 4865a69fe984b428c4b6591d11d778e6c2669d2d..2665bac61335b60ef60d0f8eca15acbf5405a295 100644
+index 4865a69fe984b428c4b6591d11d778e6c2669d2d..49e92b60ff1cafb14cccf620af09cd517e212f38 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -181,6 +181,10 @@ if (!is_android && !is_mac) {
@@ -92,7 +92,7 @@ index 4865a69fe984b428c4b6591d11d778e6c2669d2d..2665bac61335b60ef60d0f8eca15acbf
        deps += [ ":default_apps" ]
      }
 +    if (brave_chromium_build) {
-+      deps += [ "//brave/vendor/brave-extension:brave_extension_framework_bundle_data", ]
++      deps += [ "//brave:framework_bundle_data", ]
 +      if (defined(chrome_framework_version)) { framework_contents += [ "Frameworks", ] }
 +    }