zzos/react-native-devtools-frontend
1
0
Fork 0
mirror of https://github.com/react/react-native-devtools-frontend.git synced 2026-10-31 02:13:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix nesting of ts_library outputs

Browse Source 
For TypeScript-authored files, we would create the wrong output
in the `resources/inspector` directory. While `ts_library.py`
would copy to the correct location, `typescript.gni` disagreed.

The culprit is that we were only taking 1 directory from the
`target_gen_dir`, but this could be arbitrarily many. Instead,
we now compare to the full path of the generated front_end
directory.

To make sure that this works in a standalone and Chromium checkout,
we have to differentiate on `_devtools_location`. I also cleaned
that logic up by always prepending a slash at the end of a
Chromium checkout. As such, you can string interpolate without
having to worry about the extra space.

R=jacktfranklin@chromium.org,aerotwist@chromium.org

Bug: 1011811
Change-Id: I186396fe7a5001dc2930a37562640feedb6291a5
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2201650
Reviewed-by: Paul Lewis <aerotwist@chromium.org>
Commit-Queue: Tim van der Lippe <tvanderlippe@chromium.org>
This commit is contained in:
Tim van der Lippe
2020-05-15 09:32:48 +00:00
committed by Commit Bot
parent 6fb3b0178b
commit 376e9667e4
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third_party/typescript/typescript.gni
Vendored
+25 -11
View File
@@ -2,11 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
if (!defined(devtools_location)) {
if (!defined(_devtools_location)) {
if (defined(use_devtools_typescript) && use_devtools_typescript) {
devtools_location = ""
_devtools_location = ""
} else {
devtools_location = "third_party/devtools-frontend/src"
_devtools_location = "third_party/devtools-frontend/src/"
}
}
@@ -36,8 +36,13 @@ if (!defined(devtools_location)) {
# }
#
template("ts_library") {
# Introduce a new variable to make sure that string
# interpolation keeps on working. If we don't, GN
# doesn't know what is part of a variable and what
# is an actual string, without the `/` separator.
_devtools_location_prepend = "//$_devtools_location"
action(target_name) {
script = "//$devtools_location/third_party/typescript/ts_library.py"
script = _devtools_location_prepend + "third_party/typescript/ts_library.py"
forward_variables_from(invoker,
[
@@ -47,12 +52,13 @@ template("ts_library") {
])
inputs = [
"//$devtools_location/tsconfig.base.json",
"//$devtools_location/node_modules/typescript/lib/tsc.js",
"//$devtools_location/front_end/legacy/legacy-defs.d.ts",
"//$devtools_location/front_end/generated/protocol.d.ts",
"//$devtools_location/front_end/generated/protocol-proxy-api.d.ts",
"//$devtools_location/node_modules/@types/filesystem/index.d.ts",
_devtools_location_prepend + "tsconfig.base.json",
_devtools_location_prepend + "node_modules/typescript/lib/tsc.js",
_devtools_location_prepend + "front_end/legacy/legacy-defs.d.ts",
_devtools_location_prepend + "front_end/generated/protocol.d.ts",
_devtools_location_prepend +
"front_end/generated/protocol-proxy-api.d.ts",
_devtools_location_prepend + "node_modules/@types/filesystem/index.d.ts",
]
args = [
@@ -124,7 +130,15 @@ template("ts_library") {
# check that the file is TypeScript and not a unittest file
# add it to the outputs
if (_extension == "ts" && !_test_only) {
_front_end_module_name = get_path_info(target_gen_dir, "name")
# Figure out what the relative path is to the front_end folder.
# We have to get the full path to the target_gen_dir
# and compare that to the full location of the front_end
# folder in the gen_dir, to make sure nested packages
# resolve to the correct location.
_front_end_module_name = string_replace(
get_path_info(target_gen_dir, "abspath"),
root_gen_dir + "/" + _devtools_location + "front_end/",
"")
# Generate JavaScript files are temporarily copied into the old
# resources/inspector directory. See ts_library.py for more info