Merge pull request #313 from brave/revert-309-component_resources

Revert "let each component handle its own transpiling"
brave · Aug 7, 2018 · c3d0cb0 · c3d0cb0
2 parents 409515d + ff40756
commit c3d0cb0
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 131 deletions.
diff --git a/components/brave_adblock_ui/BUILD.gn b/components/brave_adblock_ui/BUILD.gn
diff --git a/components/brave_new_tab_ui/BUILD.gn b/components/brave_new_tab_ui/BUILD.gn
diff --git a/components/brave_rewards_ui/BUILD.gn b/components/brave_rewards_ui/BUILD.gn
diff --git a/components/brave_welcome_ui/BUILD.gn b/components/brave_welcome_ui/BUILD.gn
diff --git a/components/common/typescript.gni b/components/common/typescript.gni
diff --git a/components/resources/BUILD.gn b/components/resources/BUILD.gn
@@ -1,20 +1,48 @@
 import("//tools/grit/grit_rule.gni")
 
+transpile_includes = [
+  # Brave Adblock Page
+  "../brave_adblock_ui/brave_adblock.html",
+  # Brave New Tab
+  "../brave_new_tab_ui/brave_new_tab.html",
+  # Brave Rewards
+  "../brave_rewards_ui/brave_rewards.html",
+  # Brave Welcome Page
+  "../brave_welcome_ui/brave_welcome.html"
+]
+
+action("transpile_web_uis") {
+  script = "//brave/script/transpile-web-ui.py"
+  inputs = transpile_includes
+  outputs = [
+    "$target_out_dir/brave_new_tab.bundle.js",
+    "$target_out_dir/brave_rewards.bundle.js",
+    "$target_out_dir/brave_welcome.bundle.js",
+    "$target_out_dir/brave_adblock.bundle.js",
+  ]
+  gen_dir = rebase_path(root_gen_dir, "//")
+  args = [
+    "--target_gen_dir=$gen_dir"
+  ]
+  if (is_official_build) {
+    args += [
+      "--production",
+    ]
+  }
+}
+
 grit("brave_components_resources_grit") {
   source = "brave_components_resources.grd"
 
   output_name = "brave_components_resources_new"
+  inputs = get_target_outputs(":transpile_web_uis")
+  inputs += transpile_includes
 
   outputs = [
     "grit/brave_components_resources.h",
     "brave_components_resources.pak",
   ]
-  deps = [
-    "//brave/components/brave_adblock_ui",
-    "//brave/components/brave_new_tab_ui",
-    "//brave/components/brave_rewards_ui",
-    "//brave/components/brave_welcome_ui",
-  ]
+  deps = [ ":transpile_web_uis" ]
   grit_flags = [
     "-E",
     "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),

diff --git a/components/webpack/dev.config.js b/components/webpack/dev.config.js
@@ -11,7 +11,7 @@ module.exports = {
     brave_welcome: path.join(__dirname, '../brave_welcome_ui/brave_welcome')
   },
   output: {
-    path: process.env.TARGET_GEN_DIR,
+    path: path.join(__dirname, '..', '..', '..', process.env.TARGET_GEN_DIR, 'brave'),
     filename: '[name].bundle.js',
     chunkFilename: '[id].chunk.js'
   },

diff --git a/components/webpack/prod.config.js b/components/webpack/prod.config.js
@@ -11,7 +11,7 @@ module.exports = {
     brave_welcome: path.join(__dirname, '../brave_welcome_ui/brave_welcome')
   },
   output: {
-    path: process.env.TARGET_GEN_DIR,
+    path: path.join(__dirname, '..', '..', '..', process.env.TARGET_GEN_DIR, 'brave'),
     filename: '[name].bundle.js',
     chunkFilename: '[id].chunk.js'
   },