diff options
| author | 2022-12-01 21:37:25 -0800 | |
|---|---|---|
| committer | 2022-12-01 21:37:25 -0800 | |
| commit | 7b70ed52fafa75421c9bb6119b3d40571536cb75 (patch) | |
| tree | 77c27b977881f4d8bdc043e18040052a203bf3f8 /src/resolver | |
| parent | 8cf1707cd3192814b5eb3ff99b175e211d6b1779 (diff) | |
| download | bun-7b70ed52fafa75421c9bb6119b3d40571536cb75.tar.gz bun-7b70ed52fafa75421c9bb6119b3d40571536cb75.tar.zst bun-7b70ed52fafa75421c9bb6119b3d40571536cb75.zip | |
[bun bun] Fix incorrect package.hash
Diffstat (limited to '')
| -rw-r--r-- | src/resolver/package_json.zig | 6 | ||||
| -rw-r--r-- | src/resolver/resolver.zig | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/resolver/package_json.zig b/src/resolver/package_json.zig index af7e46470..d475f2761 100644 --- a/src/resolver/package_json.zig +++ b/src/resolver/package_json.zig @@ -568,10 +568,12 @@ pub const PackageJSON = struct { input_path: string, dirname_fd: StoredFileDescriptorType, package_id: ?Install.PackageID, - comptime include_scripts: bool, + comptime include_scripts_: @Type(.EnumLiteral), comptime include_dependencies: @Type(.EnumLiteral), - comptime generate_hash: bool, + comptime generate_hash_: @Type(.EnumLiteral), ) ?PackageJSON { + const generate_hash = generate_hash_ == .generate_hash; + const include_scripts = include_scripts_ == .include_scripts; // TODO: remove this extra copy const parts = [_]string{ input_path, "package.json" }; diff --git a/src/resolver/resolver.zig b/src/resolver/resolver.zig index 513a4e216..1e4c19e8f 100644 --- a/src/resolver/resolver.zig +++ b/src/resolver/resolver.zig @@ -2106,9 +2106,9 @@ pub const Resolver = struct { file, dirname_fd, package_id, - true, + .ignore_scripts, if (allow_dependencies) .local else .none, - false, + .generate_hash, ) orelse return null; } else { pkg = PackageJSON.parse( @@ -2116,9 +2116,9 @@ pub const Resolver = struct { file, dirname_fd, package_id, - true, + .include_scripts, if (allow_dependencies) .local else .none, - true, + .generate_hash, ) orelse return null; } |
