Skip to content

Commit

Permalink
Move optimize_webui.gni under ui/webui/resources/tools
Browse files Browse the repository at this point in the history
This is a preparatory step to moving build_webui.gni to the same
folder.

The following sibling files were also moved accordingly:

- .style.yapf
- PRESUBMIT.py
- optimize_webui.py
- optimize_webui_test.py
- rollup_plugin.mjs

Bug: 1412915
R=avi@chromium.org

Change-Id: I00d75e45fc968080e4243b82abdd2e349010b493
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4245217
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1105444}
  • Loading branch information
tonikitoo authored and Chromium LUCI CQ committed Feb 15, 2023
1 parent 9c493bd commit 0109857
Show file tree
Hide file tree
Showing 24 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion ash/webui/file_manager/resources/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
# found in the LICENSE file.

import("//build/config/chromeos/ui_mode.gni")
import("//chrome/browser/resources/tools/optimize_webui.gni")
import("//chrome/common/features.gni")
import("//third_party/closure_compiler/compile_js.gni")
import("//tools/grit/grit_rule.gni")
import("//tools/grit/preprocess_if_expr.gni")
import("//tools/typescript/ts_library.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")

assert(is_chromeos_ash)

Expand Down
2 changes: 1 addition & 1 deletion ash/webui/help_app_ui/resources/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

import("//ash/webui/web_applications/system_apps.gni")
import("//build/config/chromeos/ui_mode.gni")
import("//chrome/browser/resources/tools/optimize_webui.gni")
import("//third_party/closure_compiler/compile_js.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")

assert(is_chromeos_ash, "Help App is ash-chrome only")

Expand Down
2 changes: 1 addition & 1 deletion ash/webui/media_app_ui/resources/js/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

import("//ash/webui/web_applications/system_apps.gni")
import("//build/config/chromeos/ui_mode.gni")
import("//chrome/browser/resources/tools/optimize_webui.gni")
import("//third_party/closure_compiler/compile_js.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")

assert(is_chromeos_ash)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import("//third_party/closure_compiler/compile_js.gni")
import("//tools/grit/preprocess_if_expr.gni")
import("//tools/polymer/html_to_js.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
import("../../tools/optimize_webui.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")

preprocess_folder = "preprocessed"
preprocess_gen_manifest = "preprocessed_gen_manifest.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import("//third_party/closure_compiler/compile_js.gni")
import("//tools/grit/preprocess_if_expr.gni")
import("//tools/polymer/html_to_js.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
import("../../tools/optimize_webui.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")

preprocess_folder = "preprocessed"
preprocess_gen_manifest = "preprocessed_gen_manifest.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import("//third_party/closure_compiler/compile_js.gni")
import("//tools/grit/preprocess_if_expr.gni")
import("//tools/polymer/html_to_js.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
import("../../tools/optimize_webui.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")

preprocess_folder = "preprocessed"
preprocess_manifest = "preprocessed_manifest.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import("//third_party/closure_compiler/compile_js.gni")
import("//tools/grit/preprocess_if_expr.gni")
import("//tools/polymer/html_to_js.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
import("../../tools/optimize_webui.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")

preprocess_folder = "preprocessed"
preprocess_manifest = "preprocessed_manifest.json"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/resources/gaia_auth_host/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import("//third_party/closure_compiler/compile_js.gni")
import("//tools/grit/grit_rule.gni")
import("//tools/grit/preprocess_if_expr.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
import("../tools/optimize_webui.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")

grd_prefix = "gaia_auth_host"
manifest_existing_files = "gaia_auth_host_existing_manifest.json"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/resources/new_tab_page/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//chrome/browser/resources/tools/optimize_webui.gni")
import("//chrome/common/features.gni")
import("//tools/grit/grit_rule.gni")
import("//tools/polymer/html_to_wrapper.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")
import("//ui/webui/webui_features.gni")
import("./new_tab_page.gni")
import("./preprocess_if_expr_sourcemaps.gni")
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/resources/pdf/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import("//tools/polymer/css_to_wrapper.gni")
import("//tools/polymer/html_to_wrapper.gni")
import("//tools/typescript/ts_library.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
import("../tools/optimize_webui.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")
import("./pdf.gni")

assert(enable_pdf, "enable_pdf check failed")
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/resources/settings/chromeos/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import("//tools/polymer/css_to_wrapper.gni")
import("//tools/polymer/html_to_wrapper.gni")
import("//tools/typescript/ts_library.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")
import("//ui/webui/webui_features.gni")
import("../../tools/optimize_webui.gni")
import("./os_settings.gni")

assert(is_chromeos_ash, "ChromeOS Settings is ChromeOS only")
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/resources/tools/build_webui.gni
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import("//tools/polymer/css_to_wrapper.gni")
import("//tools/polymer/html_to_wrapper.gni")
import("//tools/typescript/ts_library.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
import("../tools/optimize_webui.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")

if (use_blink) {
import("//chrome/common/features.gni")
Expand Down
2 changes: 1 addition & 1 deletion docs/webui_build_configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ excludes: Paths of files that are not bundled. Often used for large mojo files

#### **Example**
```
import("//chrome/browser/resources/tools/optimize_webui.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")
import ("//chrome/common/features.gni")
# optimize_webui should generally only be called when the optimize_webui
Expand Down
2 changes: 1 addition & 1 deletion third_party/lottie/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//chrome/browser/resources/tools/optimize_webui.gni")
import("//third_party/closure_compiler/compile_js.gni")
import("//third_party/node/node.gni")
import("//ui/webui/resources/tools/generate_grd.gni")

assert(!is_android && !is_ios)
Expand Down
2 changes: 1 addition & 1 deletion third_party/material_web_components/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//chrome/browser/resources/tools/optimize_webui.gni")
import("//tools/typescript/ts_library.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")

# Optimize webui assumes that all resources hosted on chrome://resources are
# in this directory and does not provide a way to override this assumption. To
Expand Down
2 changes: 1 addition & 1 deletion ui/file_manager/file_manager/foreground/js/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//chrome/browser/resources/tools/optimize_webui.gni")
import("//third_party/closure_compiler/compile_js.gni")
import("//third_party/closure_compiler/js_unit_tests.gni")
import("//ui/file_manager/base/gn/js_test_type_check.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")

visibility = [
"//ui/file_manager/file_manager/externs/*",
Expand Down
2 changes: 1 addition & 1 deletion ui/file_manager/image_loader/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//chrome/browser/resources/tools/optimize_webui.gni")
import("//third_party/closure_compiler/compile_js.gni")
import("//third_party/closure_compiler/js_unit_tests.gni")
import("//ui/file_manager/base/gn/js_test_type_check.gni")
import("//ui/webui/resources/tools/optimize_webui.gni")

js_type_check("closure_compile_jsmodules") {
closure_flags = default_closure_args + [
Expand Down
2 changes: 2 additions & 0 deletions ui/webui/resources/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ def allow_js(f):
return presubmit_support.DisallowNewJsFiles(input_api, output_api,
lambda f: not allow_js(f))

# TODO(https://crbug.com/1416240): Move CheckGenerateGrd() below to
# //ui/webui/resources/tools/PRESUBMIT.py.
def CheckGenerateGrd(input_api, output_api):
affected = input_api.AffectedFiles()
affected_files = [input_api.os_path.basename(f.LocalPath()) for f in affected]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

USE_PYTHON3 = True


def _CheckChangeOnUploadOrCommit(input_api, output_api):
results = []
webui_sources = set(['optimize_webui.py', 'rollup_plugin.js'])
Expand All @@ -28,4 +29,3 @@ def CheckChangeOnUpload(input_api, output_api):

def CheckChangeOnCommit(input_api, output_api):
return _CheckChangeOnUploadOrCommit(input_api, output_api)

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import("//third_party/node/node.gni")

template("optimize_webui") {
node(target_name) {
script = "//chrome/browser/resources/tools/optimize_webui.py"
script = "//ui/webui/resources/tools/optimize_webui.py"

forward_variables_from(invoker, [ "visibility" ])

Expand Down Expand Up @@ -79,7 +79,7 @@ template("optimize_webui") {
}
args += [ "--external_paths" ] + external_paths

inputs += [ "//chrome/browser/resources/tools/rollup_plugin.mjs" ]
inputs += [ "//ui/webui/resources/tools/rollup_plugin.mjs" ]
args += [ "--js_module_in_files" ] + invoker.js_module_in_files

if (defined(invoker.out_manifest)) {
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 0109857

Please sign in to comment.