Skip to content

GitLab

T
tangled
Commit efc28278 authored by rbpotter's avatar rbpotter Committed by Commit Bot
Browse files
Options

Web UI: Add preprocessed resources and use in rollup 

Preprocess all shared JS module resources into:
<root_gen_dir>/ui/webui/resources/webui_preprocessed

and read all these resources from this directory when bundling with
rollup.

Bug: 1071641
Change-Id: Iaa88babb7aaa6f7235d2f23b24046c79798fad39
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2370090
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatardpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803379}
parent aaf0b5b5
Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 35 deletions
chrome/browser/resources/bookmarks/BUILD.gn
View file @ efc28278
......@@ -20,7 +20,7 @@ if (optimize_webui) {
deps = [
":unpak",
"../../../../ui/webui/resources:modulize",
"../../../../ui/webui/resources:preprocess",
]
excludes = [ "chrome://resources/js/cr.m.js" ]
}
......
chrome/browser/resources/chromeos/bluetooth_pairing_dialog/BUILD.gn
View file @ efc28278
......@@ -22,7 +22,7 @@ if (optimize_webui) {
deps = [
":unpak",
"../../../../../ui/webui/resources:modulize",
"../../../../../ui/webui/resources:preprocess",
]
excludes = [ "chrome://resources/js/cr.m.js" ]
......
chrome/browser/resources/downloads/BUILD.gn
View file @ efc28278
......@@ -25,7 +25,7 @@ if (optimize_webui) {
deps = [
":unpak",
"../../../../ui/webui/resources:modulize",
"../../../../ui/webui/resources:preprocess",
]
}
......
chrome/browser/resources/extensions/BUILD.gn
View file @ efc28278
......@@ -20,7 +20,7 @@ if (optimize_webui) {
deps = [
":unpak",
"../../../../ui/webui/resources:modulize",
"../../../../ui/webui/resources:preprocess",
]
excludes = [ "chrome://resources/js/cr.m.js" ]
}
......
chrome/browser/resources/history/BUILD.gn
View file @ efc28278
......@@ -27,7 +27,7 @@ if (optimize_webui) {
deps = [
":unpak",
"../../../../ui/webui/resources:modulize",
"../../../../ui/webui/resources:preprocess",
]
excludes = [ "chrome://resources/js/cr.m.js" ]
}
......
chrome/browser/resources/new_tab_page/BUILD.gn
View file @ efc28278
......@@ -322,7 +322,7 @@ if (optimize_webui) {
input = rebase_path("$target_gen_dir/unpak", root_build_dir)
deps = [
":unpak",
"//ui/webui/resources:modulize",
"../../../../ui/webui/resources:preprocess",
]
js_module_in_files = [ "new_tab_page.js" ]
js_out_files = [ "new_tab_page.rollup.js" ]
......
chrome/browser/resources/print_preview/BUILD.gn
View file @ efc28278
......@@ -8,7 +8,7 @@ import("//tools/grit/preprocess_grit.gni")
import("../optimize_webui.gni")
if (optimize_webui) {
preprocess_folder = "print_preview_preprocessed"
preprocess_folder = "preprocessed"
optimize_webui("build") {
host = "print"
......@@ -19,7 +19,7 @@ if (optimize_webui) {
deps = [
":preprocess",
":preprocess_generated",
"../../../../ui/webui/resources:modulize",
"../../../../ui/webui/resources:preprocess",
]
excludes = [
"chrome://resources/js/cr.m.js",
......
chrome/browser/resources/settings/BUILD.gn
View file @ efc28278
......@@ -31,7 +31,7 @@ if (optimize_webui) {
deps = [
":unpak",
"../../../../ui/webui/resources:modulize",
"../../../../ui/webui/resources:preprocess",
]
excludes = [ "chrome://resources/js/cr.m.js" ]
}
......
chrome/browser/resources/settings/chromeos/BUILD.gn
View file @ efc28278
......@@ -79,7 +79,7 @@ if (optimize_webui) {
deps = [
":unpak_nearby_v3",
":unpak_v3",
"../../../../../ui/webui/resources:modulize",
"../../../../../ui/webui/resources:preprocess",
]
excludes = [
"chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom-lite.js",
......
chrome/browser/resources/tools/rollup_plugin.js
View file @ efc28278
......@@ -12,19 +12,6 @@ const polymerUrl = 'chrome://resources/polymer/v3_0/';
const schemeRelativeResourcesUrl = '//resources/';
const schemeRelativePolymerUrl = '//resources/polymer/v3_0/';
// TODO: Determine whether it is worth maintaining this list vs always checking
// both directories for the existence of a file.
const nonGeneratedFiles = [
'action_link.js',
'certificate_manager_types.js',
'certificate_provisioning_browser_proxy.js',
'certificates_browser_proxy.js',
'color_utils.js',
'cr.m.js',
'cr_splitter.js',
'plural_string_proxy.js',
];
function normalizeSlashes(filepath) {
return filepath.replace(/\\/gi, '/');
}
......@@ -51,10 +38,10 @@ function combinePaths(origin, source) {
}
export default function plugin(srcPath, genPath, rootPath, host, excludes) {
const resourcesSrcPath = joinPaths(srcPath, 'ui/webui/resources/');
const polymerSrcPath =
joinPaths(srcPath, 'third_party/polymer/v3_0/components-chromium/');
const resourcesGenPath = joinPaths(genPath, 'ui/webui/resources/');
const resourcesPreprocessedPath =
joinPaths(genPath, 'ui/webui/resources/preprocessed/');
const rootUrl = 'chrome://' + host + '/';
return {
......@@ -90,12 +77,9 @@ export default function plugin(srcPath, genPath, rootPath, host, excludes) {
pathFromResources = source.slice(chromeResourcesUrl.length);
} else if (source.startsWith(schemeRelativeResourcesUrl)) {
pathFromResources = source.slice(schemeRelativeResourcesUrl.length);
} else if (!!origin && origin.startsWith(resourcesSrcPath)) {
pathFromResources =
combinePaths(relativePath(resourcesSrcPath, origin), source);
} else if (!!origin && origin.startsWith(resourcesGenPath)) {
pathFromResources =
combinePaths(relativePath(resourcesGenPath, origin), source);
} else if (!!origin && origin.startsWith(resourcesPreprocessedPath)) {
pathFromResources = combinePaths(
relativePath(resourcesPreprocessedPath, origin), source);
}
// Add prefix
......@@ -105,10 +89,7 @@ export default function plugin(srcPath, genPath, rootPath, host, excludes) {
return {id: fullPath, external: true};
}
const filename = path.basename(source);
return joinPaths(
nonGeneratedFiles.includes(filename) ? resourcesSrcPath :
resourcesGenPath,
pathFromResources);
return joinPaths(resourcesPreprocessedPath, pathFromResources);
}
// Not a resources or polymer path -> should be in the root directory.
......
ui/webui/resources/BUILD.gn
View file @ efc28278
......@@ -3,6 +3,189 @@
# found in the LICENSE file.
import("//third_party/closure_compiler/compile_js.gni")
import("//tools/grit/preprocess_grit.gni")
preprocess_folder = "preprocessed"
group("preprocess") {
deps = [
":preprocess_generated",
":preprocess_src",
]
}
preprocess_grit("preprocess_src") {
in_folder = "./"
out_folder = "$target_gen_dir/$preprocess_folder"
in_files = [
"js/action_link.js",
"js/color_utils.js",
"js/cr.m.js",
"js/plural_string_proxy.js",
]
if (!is_android) {
in_files += [
"cr_elements/cr_splitter/cr_splitter.js",
"cr_components/certificate_manager/certificates_browser_proxy.js",
"cr_components/certificate_manager/certificate_manager_types.js",
"cr_components/certificate_manager/certificate_provisioning_browser_proxy.js",
]
}
}
preprocess_grit("preprocess_generated") {
deps = [ ":modulize" ]
in_folder = target_gen_dir
out_folder = "$target_gen_dir/$preprocess_folder"
in_files = [
"js/assert.m.js",
"js/event_tracker.m.js",
"js/icon.m.js",
"js/load_time_data.m.js",
"js/parse_html_subset.m.js",
"js/promise_resolver.m.js",
"js/util.m.js",
"js/cr/event_target.m.js",
"js/cr/ui/drag_wrapper.m.js",
"js/cr/ui/focus_grid.m.js",
"js/cr/ui/focus_outline_manager.m.js",
"js/cr/ui/focus_row.m.js",
"js/cr/ui/keyboard_shortcut_list.m.js",
"js/cr/ui/store_client.m.js",
"js/cr/ui/store.m.js",
]
if (!is_android) {
in_files += [
"cr_components/certificate_manager/ca_trust_edit_dialog.js",
"cr_components/certificate_manager/certificate_delete_confirmation_dialog.js",
"cr_components/certificate_manager/certificate_entry.js",
"cr_components/certificate_manager/certificate_list.js",
"cr_components/certificate_manager/certificate_manager.js",
"cr_components/certificate_manager/certificate_password_decryption_dialog.js",
"cr_components/certificate_manager/certificate_password_encryption_dialog.js",
"cr_components/certificate_manager/certificate_provisioning_details_dialog.js",
"cr_components/certificate_manager/certificate_provisioning_entry.js",
"cr_components/certificate_manager/certificate_provisioning_list.js",
"cr_components/certificate_manager/certificates_error_dialog.js",
"cr_components/certificate_manager/certificate_shared_css.js",
"cr_components/certificate_manager/certificate_subentry.js",
"cr_components/managed_footnote/managed_footnote.m.js",
"cr_components/omnibox/cr_autocomplete_match_list.js",
"cr_elements/shared_vars_css.m.js",
"cr_elements/shared_style_css.m.js",
"cr_elements/search_highlight_style_css.m.js",
"cr_elements/md_select_css.m.js",
"cr_elements/icons.m.js",
"cr_elements/hidden_style_css.m.js",
"cr_elements/cr_scrollable_behavior.m.js",
"cr_elements/cr_page_host_style_css.m.js",
"cr_elements/cr_icons_css.m.js",
"cr_elements/cr_container_shadow_behavior.m.js",
"cr_elements/action_link_css.m.js",
"cr_elements/cr_grid/cr_grid.js",
"cr_elements/cr_view_manager/cr_view_manager.m.js",
"cr_elements/cr_toolbar/cr_toolbar_selection_overlay.m.js",
"cr_elements/cr_toolbar/cr_toolbar_search_field.m.js",
"cr_elements/cr_toolbar/cr_toolbar.m.js",
"cr_elements/cr_toggle/cr_toggle.m.js",
"cr_elements/cr_toast/cr_toast.m.js",
"cr_elements/cr_toast/cr_toast_manager.m.js",
"cr_elements/cr_tabs/cr_tabs.m.js",
"cr_elements/cr_slider/cr_slider.m.js",
"cr_elements/cr_search_field/cr_search_field.m.js",
"cr_elements/cr_search_field/cr_search_field_behavior.m.js",
"cr_elements/cr_radio_group/cr_radio_group.m.js",
"cr_elements/cr_radio_button/cr_radio_button_style_css.m.js",
"cr_elements/cr_radio_button/cr_radio_button.m.js",
"cr_elements/cr_radio_button/cr_radio_button_behavior.m.js",
"cr_elements/cr_radio_button/cr_card_radio_button.m.js",
"cr_elements/cr_profile_avatar_selector/cr_profile_avatar_selector.m.js",
"cr_elements/cr_profile_avatar_selector/cr_profile_avatar_selector_grid.m.js",
"cr_elements/cr_lottie/cr_lottie.m.js",
"cr_elements/cr_link_row/cr_link_row.m.js",
"cr_elements/cr_lazy_render/cr_lazy_render.m.js",
"cr_elements/cr_input/cr_input_style_css.m.js",
"cr_elements/cr_input/cr_input.m.js",
"cr_elements/cr_icon_button/cr_icon_button.m.js",
"cr_elements/cr_fingerprint/cr_fingerprint_progress_arc.m.js",
"cr_elements/cr_fingerprint/cr_fingerprint_icon.m.js",
"cr_elements/cr_expand_button/cr_expand_button.m.js",
"cr_elements/cr_drawer/cr_drawer.m.js",
"cr_elements/cr_dialog/cr_dialog.m.js",
"cr_elements/cr_checkbox/cr_checkbox.m.js",
"cr_elements/cr_button/cr_button.m.js",
"cr_elements/cr_action_menu/cr_action_menu.m.js",
"cr_elements/policy/cr_policy_indicator_behavior.m.js",
"cr_elements/policy/cr_policy_indicator.m.js",
"cr_elements/policy/cr_policy_pref_behavior.m.js",
"cr_elements/policy/cr_policy_pref_indicator.m.js",
"cr_elements/policy/cr_tooltip_icon.m.js",
"js/find_shortcut_behavior.m.js",
"js/i18n_behavior.m.js",
"js/list_property_update_behavior.m.js",
"js/search_highlight_utils.m.js",
"js/web_ui_listener_behavior.m.js",
"js/cr/ui/focus_row_behavior.m.js",
"js/cr/ui/focus_without_ink.m.js",
]
}
if (is_chromeos) {
in_files += [
"cr_components/chromeos/bluetooth/bluetooth_dialog.m.js",
"cr_components/chromeos/cellular_setup/base_page.m.js",
"cr_components/chromeos/cellular_setup/final_page.m.js",
"cr_components/chromeos/cellular_setup/mojo_interface_provider.m.js",
"cr_components/chromeos/cellular_setup/sim_detect_page.m.js",
"cr_components/chromeos/cellular_setup/webview_post_util.m.js",
"cr_components/chromeos/network/cr_policy_network_behavior_mojo.m.js",
"cr_components/chromeos/network/cr_policy_network_indicator_mojo.m.js",
"cr_components/chromeos/network_health/network_diagnostics.m.js",
"cr_components/chromeos/network_health/network_health_summary.m.js",
"cr_components/chromeos/network/mojo_interface_provider.m.js",
"cr_components/chromeos/network/network_apnlist.m.js",
"cr_components/chromeos/network/network_choose_mobile.m.js",
"cr_components/chromeos/network/network_config_element_behavior.m.js",
"cr_components/chromeos/network/network_config_input.m.js",
"cr_components/chromeos/network/network_config.m.js",
"cr_components/chromeos/network/network_config_select.m.js",
"cr_components/chromeos/network/network_config_toggle.m.js",
"cr_components/chromeos/network/network_icon.m.js",
"cr_components/chromeos/network/network_icons.m.js",
"cr_components/chromeos/network/network_ip_config.m.js",
"cr_components/chromeos/network/network_listener_behavior.m.js",
"cr_components/chromeos/network/network_list_item.m.js",
"cr_components/chromeos/network/network_list.m.js",
"cr_components/chromeos/network/network_list_types.m.js",
"cr_components/chromeos/network/network_nameservers.m.js",
"cr_components/chromeos/network/network_password_input.m.js",
"cr_components/chromeos/network/network_property_list_mojo.m.js",
"cr_components/chromeos/network/network_proxy_exclusions.m.js",
"cr_components/chromeos/network/network_proxy_input.m.js",
"cr_components/chromeos/network/network_proxy.m.js",
"cr_components/chromeos/network/network_select.m.js",
"cr_components/chromeos/network/network_shared_css.m.js",
"cr_components/chromeos/network/network_siminfo.m.js",
"cr_components/chromeos/network/onc_mojo.m.js",
"cr_components/chromeos/quick_unlock/lock_screen_constants.m.js",
"cr_components/chromeos/quick_unlock/pin_keyboard_icon.m.js",
"cr_components/chromeos/quick_unlock/pin_keyboard.m.js",
"cr_components/chromeos/quick_unlock/setup_pin_keyboard.m.js",
"cr_components/chromeos/smb_shares/add_smb_share_dialog.m.js",
"cr_components/chromeos/smb_shares/smb_browser_proxy.m.js",
"cr_elements/chromeos/cros_color_overrides.m.js",
"cr_elements/chromeos/cr_picture/cr_camera.m.js",
"cr_elements/chromeos/cr_picture/cr_picture_list.m.js",
"cr_elements/chromeos/cr_picture/cr_picture_pane.m.js",
"cr_elements/chromeos/cr_picture/cr_picture_types.m.js",
"cr_elements/chromeos/cr_picture/icons.m.js",
"cr_elements/chromeos/cr_picture/png.m.js",
"cr_elements/cr_searchable_drop_down/cr_searchable_drop_down.m.js",
]
}
}
group("closure_compile") {
deps = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment