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

wip

Browse Source
This commit is contained in:
Jarred Sumner
2025-06-08 03:31:05 -07:00
parent 3b07c92738
commit ceb72cb050
2 changed files with 57 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/bundler/bundle_v2.zig
View File

@@ -167,7 +167,13 @@ pub const BundleV2 = struct {
}
}
fn ensureClientTranspiler(this: *BundleV2) !*Transpiler {
fn ensureClientTranspiler(this: *BundleV2) void {
if (this.client_transpiler == null) {
_ = this.initializeClientTranspiler() catch bun.outOfMemory();
}
}
fn initializeClientTranspiler(this: *BundleV2) !*Transpiler {
@branchHint(.cold);
const allocator = this.graph.allocator;
@@ -212,10 +218,10 @@ pub const BundleV2 = struct {
///
/// Note that .log, .allocator, and other things are shared
/// between the three transpiler configurations
pub inline fn transpilerForTarget(this: *BundleV2, target: options.Target) *Transpiler {
pub inline fn transpilerForTarget(noalias this: *BundleV2, target: options.Target) *Transpiler {
if (!this.transpiler.options.server_components and this.linker.dev_server == null) {
if (target == .browser and this.transpiler.options.target.isServerSide()) {
return this.client_transpiler orelse this.ensureClientTranspiler() catch bun.outOfMemory();
return this.client_transpiler orelse this.initializeClientTranspiler() catch bun.outOfMemory();
}
return this.transpiler;
@@ -714,6 +720,7 @@ pub const BundleV2 = struct {
}
this.incrementScanCounter();
const source_index = Index.source(this.graph.input_files.len);
const loader = brk: {
const loader = path.loader(&this.transpiler.options.loaders) orelse .file;
break :brk loader;
@@ -957,7 +964,27 @@ pub const BundleV2 = struct {
const resolved = this.transpiler.resolveEntryPoint(entry_point) catch
continue;
_ = try this.enqueueEntryItem(null, resolved, true, this.transpiler.options.target);
_ = try this.enqueueEntryItem(
null,
resolved,
true,
brk: {
const main_target = this.transpiler.options.target;
if (main_target.isServerSide()) {
if (resolved.pathConst()) |path| {
if (path.loader(&this.transpiler.options.loaders)) |loader| {
if (loader == .html) {
this.ensureClientTranspiler();
break :brk .browser;
}
}
}
}
break :brk main_target;
},
);
}
},
.dev_server => {
@@ -1163,8 +1190,8 @@ pub const BundleV2 = struct {
}
pub fn enqueueParseTask(
this: *BundleV2,
resolve_result: *const _resolver.Result,
noalias this: *BundleV2,
noalias resolve_result: *const _resolver.Result,
source: *const Logger.Source,
loader: Loader,
known_target: options.Target,
@@ -1173,7 +1200,7 @@ pub const BundleV2 = struct {
this.graph.ast.append(bun.default_allocator, JSAst.empty) catch unreachable;
this.graph.input_files.append(bun.default_allocator, .{
.source = source,
.source = source.*,
.loader = loader,
.side_effects = loader.sideEffects(),
}) catch bun.outOfMemory();
@@ -3260,7 +3287,7 @@ pub const BundleV2 = struct {
graph.entry_points.append(graph.allocator, new_input_file.source.index) catch bun.outOfMemory();
if (this.client_transpiler == null) {
_ = this.ensureClientTranspiler() catch bun.outOfMemory();
this.ensureClientTranspiler();
}
}

29
src/deps/uws/BodyReaderMixin.zig
View File

@@ -31,7 +31,7 @@ pub fn BodyReaderMixin(
};
}
fn onAborted(mixin: *Mixin, _: Response) void {
mixin.body.deinit();
mixin.body.clearAndFree();
onError(@fieldParentPtr(field, mixin));
}
};
@@ -41,32 +41,47 @@ pub fn BodyReaderMixin(
fn onData(ctx: *@This(), resp: uws.AnyResponse, chunk: []const u8, last: bool) !void {
if (last) {
var body = ctx.body; // stack copy so onBody can free everything
resp.clearAborted();
// Free everything after
var body = ctx.body;
ctx.body = .init(ctx.body.allocator);
resp.clearOnData();
if (body.items.len > 0) {
try body.appendSlice(chunk);
try onBody(@fieldParentPtr(field, ctx), ctx.body.items, resp);
try onBody(@fieldParentPtr(field, ctx), body.items, resp);
} else {
try onBody(@fieldParentPtr(field, ctx), chunk, resp);
}
body.deinit();
} else {
try ctx.body.appendSlice(chunk);
}
}
fn onOOM(ctx: *@This(), r: uws.AnyResponse) void {
var body = ctx.body;
ctx.body = .init(ctx.body.allocator);
body.deinit();
r.clearAborted();
r.clearOnData();
r.clearOnWritable();
r.writeStatus("500 Internal Server Error");
r.endWithoutBody(false);
ctx.body.deinit();
onError(@fieldParentPtr(field, ctx));
}
fn onInvalid(ctx: *@This(), r: uws.AnyResponse) void {
var body = ctx.body;
ctx.body = .init(body.allocator);
body.deinit();
r.clearAborted();
r.clearOnData();
r.clearOnWritable();
r.writeStatus("400 Bad Request");
r.endWithoutBody(false);
ctx.body.deinit();
onError(@fieldParentPtr(field, ctx));
}
};