mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-02 15:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

When there are errors while generating the .jsb, fail the build.

Browse Source 
Former-commit-id: 734f021602ac59aeaef9d7583a927ede94ab644a
This commit is contained in:
Jarred Sumner
2021-08-11 21:46:23 -07:00
parent 3e0a78bc0d
commit 160f83cf9e
4 changed files with 163 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/cli.zig
View File

@@ -460,11 +460,15 @@ pub const Cli = struct {
route_conf_: ?Api.LoadedRouteConfig,
router: ?Router,
) void {
try alloc.setup(std.heap.c_allocator);
var stdout_ = std.io.getStdOut();
var stderr_ = std.io.getStdErr();
var output_source = Output.Source.init(stdout_, stderr_);
Output.Source.set(&output_source);
if (FeatureFlags.parallel_jsb) {
try alloc.setup(std.heap.c_allocator);
var stdout_ = std.io.getStdOut();
var stderr_ = std.io.getStdErr();
var output_source = Output.Source.init(stdout_, stderr_);
Output.Source.set(&output_source);
Output.enable_ansi_colors = stderr_.isTty();
}
defer Output.flush();
defer {
@@ -472,7 +476,7 @@ pub const Cli = struct {
wait_group.done();
}
}
Output.enable_ansi_colors = stderr_.isTty();
_generate(logs, std.heap.c_allocator, transform_args, _filepath, server_conf, route_conf_, router) catch return;
}
};
@@ -513,34 +517,38 @@ pub const Cli = struct {
{
// Always generate the client-only bundle
// we can revisit this decision if people ask
var node_modules = try bundler.ServeBundler.GenerateNodeModuleBundle.generate(
var node_modules_ = try bundler.ServeBundler.GenerateNodeModuleBundle.generate(
&this_bundler,
allocator,
loaded_framework,
loaded_route_config,
filepath,
);
if (server_bundler_generator_thread) |thread| {
wait_group.wait();
}
var elapsed = @divTrunc(std.time.nanoTimestamp() - start_time, @as(i128, std.time.ns_per_ms));
var bundle = NodeModuleBundle.init(node_modules, allocator);
if (log_.errors > 0) {
try log_.print(Output.errorWriter());
} else {
bundle.printSummary();
const indent = comptime " ";
Output.prettyln(indent ++ "<d>{d:6}ms elapsed", .{@intCast(u32, elapsed)});
if (server_bundler_generator_thread != null) {
Output.prettyln(indent ++ "<r>Saved to ./{s}, ./{s}", .{ filepath, server_bundle_filepath });
if (node_modules_) |node_modules| {
if (log_.errors > 0) {
try log_.print(Output.errorWriter());
} else {
Output.prettyln(indent ++ "<r>Saved to ./{s}", .{filepath});
}
var elapsed = @divTrunc(std.time.nanoTimestamp() - start_time, @as(i128, std.time.ns_per_ms));
var bundle = NodeModuleBundle.init(node_modules, allocator);
bundle.printSummary();
const indent = comptime " ";
Output.prettyln(indent ++ "<d>{d:6}ms elapsed", .{@intCast(u32, elapsed)});
try log_.printForLogLevel(Output.errorWriter());
if (server_bundler_generator_thread != null) {
Output.prettyln(indent ++ "<r>Saved to ./{s}, ./{s}", .{ filepath, server_bundle_filepath });
} else {
Output.prettyln(indent ++ "<r>Saved to ./{s}", .{filepath});
}
try log_.printForLogLevel(Output.errorWriter());
}
} else {
try log_.print(Output.errorWriter());
}
}
return;