aboutsummaryrefslogtreecommitdiff
path: root/src/resolver/resolver.zig
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-08-14 21:28:13 -0700
committerGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-08-14 21:28:13 -0700
commitd95ffe63023c09ea792d4f0379374f7c6c7975e6 (patch)
tree6dfb29fd239d81fbca04182b718376efb08721dc /src/resolver/resolver.zig
parent76bb26de8302f4dd1c833496cb7b5f2f4e808ce8 (diff)
downloadbun-d95ffe63023c09ea792d4f0379374f7c6c7975e6.tar.gz
bun-d95ffe63023c09ea792d4f0379374f7c6c7975e6.tar.zst
bun-d95ffe63023c09ea792d4f0379374f7c6c7975e6.zip
.env works
Former-commit-id: 45ee7874f2c8566c3034743161031b0859423f41
Diffstat (limited to '')
-rw-r--r--src/resolver/resolver.zig3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/resolver/resolver.zig b/src/resolver/resolver.zig
index 0c97ea6c8..9ff5a4eab 100644
--- a/src/resolver/resolver.zig
+++ b/src/resolver/resolver.zig
@@ -376,6 +376,7 @@ pub fn NewResolver(cache_files: bool) type {
package: string,
pair: *PackageJSON.FrameworkRouterPair,
comptime preference: PackageJSON.LoadFramework,
+ comptime load_defines: bool,
) !void {
// TODO: make this only parse package.json once
@@ -384,7 +385,7 @@ pub fn NewResolver(cache_files: bool) type {
const pkg: *const PackageJSON = result.package_json orelse r.packageJSONForResolvedNodeModuleWithIgnoreMissingName(&result, true) orelse return error.MissingPackageJSON;
const json: Expr = (try r.caches.json.parseJSON(r.log, pkg.source, r.allocator)) orelse return error.JSONParseError;
- pkg.loadFrameworkWithPreference(pair, json, r.allocator, preference);
+ pkg.loadFrameworkWithPreference(pair, json, r.allocator, load_defines, preference);
const dir = pkg.source.path.name.dirWithTrailingSlash();
var buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
if (pair.framework.client.len > 0) {