[webui-cc] Default enable source maps on coverage builder
Early adopters of WebUI code coverage have quality checked the coverage
metrics and haven't found any issues. We feel confident source maps are
ready for general rollout.
To support load_time_data_deprecated.js being passed to build_webui this
CL pipes JS files through the create_js_source_maps step.
Change-Id: I6d923870d026d0aaa3f5b56882f609da59e7fb8e
Fixed: b/265971775
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4500455
Auto-Submit: Tibor Goldschwendt <[email protected]>
Commit-Queue: Tibor Goldschwendt <[email protected]>
Reviewed-by: Demetrios Papadopoulos <[email protected]>
Commit-Queue: Demetrios Papadopoulos <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1139186}
diff --git a/chrome/browser/resources/history/BUILD.gn b/chrome/browser/resources/history/BUILD.gn
index 2232bb6..e31d6e35 100644
--- a/chrome/browser/resources/history/BUILD.gn
+++ b/chrome/browser/resources/history/BUILD.gn
@@ -68,6 +68,4 @@
"lazy_load.js",
]
}
-
- enable_source_maps = enable_webui_inline_sourcemaps
}
diff --git a/chrome/browser/resources/new_tab_page/BUILD.gn b/chrome/browser/resources/new_tab_page/BUILD.gn
index cb3ee5e..73d7ecf 100644
--- a/chrome/browser/resources/new_tab_page/BUILD.gn
+++ b/chrome/browser/resources/new_tab_page/BUILD.gn
@@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//chrome/common/features.gni")
-import("//ui/webui/webui_features.gni")
import("./new_tab_page.gni")
import("//ui/webui/resources/tools/build_webui.gni")
@@ -121,8 +120,6 @@
"chrome://resources/mojo/url/mojom/url.mojom-webui.js",
] + mojo_js_files
}
-
- enable_source_maps = enable_webui_inline_sourcemaps
}
if (optimize_webui) {
diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
index d9b29bd..d003eb0 100644
--- a/chrome/browser/resources/settings/BUILD.gn
+++ b/chrome/browser/resources/settings/BUILD.gn
@@ -6,7 +6,6 @@
import("//chrome/common/features.gni")
import("//crypto/features.gni")
import("//ui/webui/resources/tools/build_webui.gni")
-import("//ui/webui/webui_features.gni")
import("./settings.gni")
assert(!is_android, "Android does not use these settings")
@@ -448,6 +447,4 @@
"$root_gen_dir/chrome/browser/resources/settings_shared/tsc",
root_build_dir) ]
}
-
- enable_source_maps = enable_webui_inline_sourcemaps
}
diff --git a/chrome/browser/resources/side_panel/bookmarks/BUILD.gn b/chrome/browser/resources/side_panel/bookmarks/BUILD.gn
index a24b97c..0376be7 100644
--- a/chrome/browser/resources/side_panel/bookmarks/BUILD.gn
+++ b/chrome/browser/resources/side_panel/bookmarks/BUILD.gn
@@ -69,6 +69,4 @@
rebase_path(
"$root_gen_dir/chrome/browser/resources/side_panel/shared/tsc/*",
target_gen_dir) ]
-
- enable_source_maps = enable_webui_inline_sourcemaps
}
diff --git a/chrome/browser/resources/side_panel/customize_chrome/BUILD.gn b/chrome/browser/resources/side_panel/customize_chrome/BUILD.gn
index 5d8723b0..7b84eec 100644
--- a/chrome/browser/resources/side_panel/customize_chrome/BUILD.gn
+++ b/chrome/browser/resources/side_panel/customize_chrome/BUILD.gn
@@ -63,6 +63,4 @@
rebase_path(
"$root_gen_dir/chrome/browser/resources/side_panel/shared/tsc/*",
target_gen_dir) ]
-
- enable_source_maps = enable_webui_inline_sourcemaps
}
diff --git a/chrome/browser/resources/side_panel/user_notes/BUILD.gn b/chrome/browser/resources/side_panel/user_notes/BUILD.gn
index 1035169..cdbf4f8 100644
--- a/chrome/browser/resources/side_panel/user_notes/BUILD.gn
+++ b/chrome/browser/resources/side_panel/user_notes/BUILD.gn
@@ -39,6 +39,4 @@
"//ui/webui/resources/js:build_ts",
"//ui/webui/resources/mojo:build_ts",
]
-
- enable_source_maps = enable_webui_inline_sourcemaps
}
diff --git a/docs/webui_build_configuration.md b/docs/webui_build_configuration.md
index cffae3f..dcb823a 100644
--- a/docs/webui_build_configuration.md
+++ b/docs/webui_build_configuration.md
@@ -205,9 +205,10 @@
flaky build errors.
manifest_excludes: List of input files to exclude from the output
the manifest file.
-enable_source_maps: Defaults to "false". Setting it to "true" turns on TS
- compiler's 'inlineSourceMap' and 'inlineSources' flags.
- Non-inlined source maps are currently not supported.
+enable_source_maps: Defaults to the value of the enable_webui_inline_sourcemaps
+ GN flag. Setting it to "true" turns on TS compiler's
+ 'inlineSourceMap' and 'inlineSources' flags. Non-inlined
+ source maps are currently not supported.
```
#### **Example**
diff --git a/ui/webui/resources/cr_components/history_clusters/BUILD.gn b/ui/webui/resources/cr_components/history_clusters/BUILD.gn
index 5c963f94..1fcde0c 100644
--- a/ui/webui/resources/cr_components/history_clusters/BUILD.gn
+++ b/ui/webui/resources/cr_components/history_clusters/BUILD.gn
@@ -67,6 +67,4 @@
]
generate_grdp = true
grd_resource_path_prefix = rebase_path(".", "//ui/webui/resources")
-
- enable_source_maps = enable_webui_inline_sourcemaps
}
diff --git a/ui/webui/resources/tools/build_webui.gni b/ui/webui/resources/tools/build_webui.gni
index 73643b3..bad7ce61 100644
--- a/ui/webui/resources/tools/build_webui.gni
+++ b/ui/webui/resources/tools/build_webui.gni
@@ -43,7 +43,7 @@
minify = optimize
bundle = optimize && defined(invoker.optimize_webui_in_files)
- enable_source_maps = false
+ enable_source_maps = enable_webui_inline_sourcemaps
if (defined(invoker.enable_source_maps)) {
assert(!invoker.enable_source_maps || !optimize)
enable_source_maps = invoker.enable_source_maps
@@ -181,8 +181,15 @@
# ":html_wrapper_files".
inline_sourcemaps = true
- sources =
- filter_include(get_target_outputs(":preprocess_ts_files"), [ "*.ts" ])
+ sources = filter_include(
+ get_target_outputs(":preprocess_ts_files"),
+ [
+ "*.ts",
+
+ # TODO(crbug.com/1173575): Remove once we no longer pass JS
+ # files to build_webui.
+ "*.js",
+ ])
originals = []
outputs = []
diff --git a/ui/webui/webui_features.gni b/ui/webui/webui_features.gni
index 5e28a4a..46d04bb4 100644
--- a/ui/webui/webui_features.gni
+++ b/ui/webui/webui_features.gni
@@ -13,7 +13,7 @@
# Enable the WebUI version of the browser's tab strip.
enable_webui_tab_strip = is_chromeos || is_linux || is_win
- # Whether to inline source maps during build. This is an experimental feature
- # currently only being used for New Tab Page being tracked at crbug/1337530.
+ # Whether to inline source maps during build. Cannot be enabled when
+ # `optimize_webui=true`.
enable_webui_inline_sourcemaps = false
}
