aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-08-12 02:01:29 -0700
committerGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-08-12 02:01:29 -0700
commit86642cbdd528bbf37708dbb30a815c9a68b6aea1 (patch)
tree4d38971bfd19ad3e95ecd880ba9788f6b846fdba /src
parent882c96339839b49fe7da6f0dc3741089836c9204 (diff)
downloadbun-86642cbdd528bbf37708dbb30a815c9a68b6aea1.tar.gz
bun-86642cbdd528bbf37708dbb30a815c9a68b6aea1.tar.zst
bun-86642cbdd528bbf37708dbb30a815c9a68b6aea1.zip
Support tsconfig.json "paths" (instead of just "baseUrl")
Former-commit-id: 02db9729e1d0cddf9343135f46bf843a3d3a34f8
Diffstat (limited to 'src')
-rw-r--r--src/resolver/tsconfig_json.zig4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resolver/tsconfig_json.zig b/src/resolver/tsconfig_json.zig
index 8b380d89f..33e53e77a 100644
--- a/src/resolver/tsconfig_json.zig
+++ b/src/resolver/tsconfig_json.zig
@@ -150,13 +150,13 @@ pub const TSConfigJSON = struct {
switch (paths_prop.expr.data) {
.e_object => {
var paths = paths_prop.expr.getObject();
- result.base_url_for_paths = result.base_url;
+ result.base_url_for_paths = if (result.base_url.len > 0) result.base_url else ".";
result.paths = PathsMap.init(allocator);
for (paths.properties) |property| {
const key_prop = property.key orelse continue;
const key = (key_prop.asString(allocator)) orelse continue;
- if (!TSConfigJSON.isValidTSConfigPathNoBaseURLPattern(key, log, &source, allocator, key_prop.loc)) {
+ if (!TSConfigJSON.isValidTSConfigPathPattern(key, log, &source, key_prop.loc, allocator)) {
continue;
}