mirror of
https://github.com/oven-sh/bun
synced 2026-02-09 18:38:55 +00:00
Fixes ENG-21287
Build times, from `bun run build && echo '//' >> src/main.zig && time
bun run build`
|Platform|0.14.1|0.15.2|Speedup|
|-|-|-|-|
|macos debug asan|126.90s|106.27s|1.19x|
|macos debug noasan|60.62s|50.85s|1.19x|
|linux debug asan|292.77s|241.45s|1.21x|
|linux debug noasan|146.58s|130.94s|1.12x|
|linux debug use_llvm=false|n/a|78.27s|1.87x|
|windows debug asan|177.13s|142.55s|1.24x|
Runtime performance:
- next build memory usage may have gone up by 5%. Otherwise seems the
same. Some code with writers may have gotten slower, especially one
instance of a counting writer and a few instances of unbuffered writers
that now have vtable overhead.
- File size reduced by 800kb (from 100.2mb to 99.4mb)
Improvements:
- `@export` hack is no longer needed for watch
- native x86_64 backend for linux builds faster. to use it, set use_llvm
false and no_link_obj false. also set `ASAN_OPTIONS=detect_leaks=0`
otherwise it will spam the output with tens of thousands of lines of
debug info errors. may need to use the zig lldb fork for debugging.
- zig test-obj, which we will be able to use for zig unit tests
Still an issue:
- false 'dependency loop' errors remain in watch mode
- watch mode crashes observed
Follow-up:
- [ ] search `comptime Writer: type` and `comptime W: type` and remove
- [ ] remove format_mode in our zig fork
- [ ] remove deprecated.zig autoFormatLabelFallback
- [ ] remove deprecated.zig autoFormatLabel
- [ ] remove deprecated.BufferedWriter and BufferedReader
- [ ] remove override_no_export_cpp_apis as it is no longer needed
- [ ] css Parser(W) -> Parser, and remove all the comptime writer: type
params
- [ ] remove deprecated writer fully
Files that add lines:
```
649 src/deprecated.zig
167 scripts/pack-codegen-for-zig-team.ts
54 scripts/cleartrace-impl.js
46 scripts/cleartrace.ts
43 src/windows.zig
18 src/fs.zig
17 src/bun.js/ConsoleObject.zig
16 src/output.zig
12 src/bun.js/test/debug.zig
12 src/bun.js/node/node_fs.zig
8 src/env_loader.zig
7 src/css/printer.zig
7 src/cli/init_command.zig
7 src/bun.js/node.zig
6 src/string/escapeRegExp.zig
6 src/install/PnpmMatcher.zig
5 src/bun.js/webcore/Blob.zig
4 src/crash_handler.zig
4 src/bun.zig
3 src/install/lockfile/bun.lock.zig
3 src/cli/update_interactive_command.zig
3 src/cli/pack_command.zig
3 build.zig
2 src/Progress.zig
2 src/install/lockfile/lockfile_json_stringify_for_debugging.zig
2 src/css/small_list.zig
2 src/bun.js/webcore/prompt.zig
1 test/internal/ban-words.test.ts
1 test/internal/ban-limits.json
1 src/watcher/WatcherTrace.zig
1 src/transpiler.zig
1 src/shell/builtin/cp.zig
1 src/js_printer.zig
1 src/io/PipeReader.zig
1 src/install/bin.zig
1 src/css/selectors/selector.zig
1 src/cli/run_command.zig
1 src/bun.js/RuntimeTranspilerStore.zig
1 src/bun.js/bindings/JSRef.zig
1 src/bake/DevServer.zig
```
Files that remove lines:
```
-1 src/test/recover.zig
-1 src/sql/postgres/SocketMonitor.zig
-1 src/sql/mysql/MySQLRequestQueue.zig
-1 src/sourcemap/CodeCoverage.zig
-1 src/css/values/color_js.zig
-1 src/compile_target.zig
-1 src/bundler/linker_context/convertStmtsForChunk.zig
-1 src/bundler/bundle_v2.zig
-1 src/bun.js/webcore/blob/read_file.zig
-1 src/ast/base.zig
-2 src/sql/postgres/protocol/ArrayList.zig
-2 src/shell/builtin/mkdir.zig
-2 src/install/PackageManager/patchPackage.zig
-2 src/install/PackageManager/PackageManagerDirectories.zig
-2 src/fmt.zig
-2 src/css/declaration.zig
-2 src/css/css_parser.zig
-2 src/collections/baby_list.zig
-2 src/bun.js/bindings/ZigStackFrame.zig
-2 src/ast/E.zig
-3 src/StandaloneModuleGraph.zig
-3 src/deps/picohttp.zig
-3 src/deps/libuv.zig
-3 src/btjs.zig
-4 src/threading/Futex.zig
-4 src/shell/builtin/touch.zig
-4 src/meta.zig
-4 src/install/lockfile.zig
-4 src/css/selectors/parser.zig
-5 src/shell/interpreter.zig
-5 src/css/error.zig
-5 src/bun.js/web_worker.zig
-5 src/bun.js.zig
-6 src/cli/test_command.zig
-6 src/bun.js/VirtualMachine.zig
-6 src/bun.js/uuid.zig
-6 src/bun.js/bindings/JSValue.zig
-9 src/bun.js/test/pretty_format.zig
-9 src/bun.js/api/BunObject.zig
-14 src/install/install_binding.zig
-14 src/fd.zig
-14 src/bun.js/node/path.zig
-14 scripts/pack-codegen-for-zig-team.sh
-17 src/bun.js/test/diff_format.zig
```
`git diff --numstat origin/main...HEAD | awk '{ print ($1-$2)"\t"$3 }' |
sort -rn`
---------
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Dylan Conway <dylan.conway567@gmail.com>
Co-authored-by: Meghan Denny <meghan@bun.com>
Co-authored-by: tayor.fish <contact@taylor.fish>
218 lines
8.5 KiB
Zig
218 lines
8.5 KiB
Zig
pub const LinkCommand = struct {
|
|
pub fn exec(ctx: Command.Context) !void {
|
|
try link(ctx);
|
|
}
|
|
};
|
|
|
|
fn link(ctx: Command.Context) !void {
|
|
const cli = try CommandLineArguments.parse(ctx.allocator, .link);
|
|
var manager, const original_cwd = PackageManager.init(ctx, cli, .link) catch |err| brk: {
|
|
if (err == error.MissingPackageJSON) {
|
|
try attemptToCreatePackageJSON();
|
|
break :brk try PackageManager.init(ctx, cli, .link);
|
|
}
|
|
|
|
return err;
|
|
};
|
|
defer ctx.allocator.free(original_cwd);
|
|
|
|
if (manager.options.shouldPrintCommandName()) {
|
|
Output.prettyln("<r><b>bun link <r><d>v" ++ Global.package_json_version_with_sha ++ "<r>\n", .{});
|
|
Output.flush();
|
|
}
|
|
|
|
if (manager.options.positionals.len == 1) {
|
|
// bun link
|
|
|
|
var lockfile: Lockfile = undefined;
|
|
var name: string = "";
|
|
var package = Lockfile.Package{};
|
|
|
|
// Step 1. parse the nearest package.json file
|
|
{
|
|
const package_json_source = &(bun.sys.File.toSource(manager.original_package_json_path, ctx.allocator, .{}).unwrap() catch |err| {
|
|
Output.errGeneric("failed to read \"{s}\" for linking: {s}", .{ manager.original_package_json_path, @errorName(err) });
|
|
Global.crash();
|
|
});
|
|
lockfile.initEmpty(ctx.allocator);
|
|
|
|
var resolver: void = {};
|
|
try package.parse(&lockfile, manager, ctx.allocator, manager.log, package_json_source, void, &resolver, Features.folder);
|
|
name = lockfile.str(&package.name);
|
|
if (name.len == 0) {
|
|
if (manager.options.log_level != .silent) {
|
|
Output.prettyErrorln("<r><red>error:<r> package.json missing \"name\" <d>in \"{s}\"<r>", .{package_json_source.path.text});
|
|
}
|
|
Global.crash();
|
|
} else if (!strings.isNPMPackageName(name)) {
|
|
if (manager.options.log_level != .silent) {
|
|
Output.prettyErrorln("<r><red>error:<r> invalid package.json name \"{s}\" <d>in \"{s}\"<r>", .{
|
|
name,
|
|
package_json_source.path.text,
|
|
});
|
|
}
|
|
Global.crash();
|
|
}
|
|
}
|
|
|
|
// Step 2. Setup the global directory
|
|
var node_modules: std.fs.Dir = brk: {
|
|
Bin.Linker.ensureUmask();
|
|
var explicit_global_dir: string = "";
|
|
if (ctx.install) |install_| {
|
|
explicit_global_dir = install_.global_dir orelse explicit_global_dir;
|
|
}
|
|
manager.global_dir = try Options.openGlobalDir(explicit_global_dir);
|
|
|
|
try manager.setupGlobalDir(ctx);
|
|
|
|
break :brk manager.global_dir.?.makeOpenPath("node_modules", .{}) catch |err| {
|
|
if (manager.options.log_level != .silent)
|
|
Output.prettyErrorln("<r><red>error:<r> failed to create node_modules in global dir due to error {s}", .{@errorName(err)});
|
|
Global.crash();
|
|
};
|
|
};
|
|
|
|
// Step 3a. symlink to the node_modules folder
|
|
{
|
|
// delete it if it exists
|
|
node_modules.deleteTree(name) catch {};
|
|
|
|
// create scope if specified
|
|
if (name[0] == '@') {
|
|
if (strings.indexOfChar(name, '/')) |i| {
|
|
node_modules.makeDir(name[0..i]) catch |err| brk: {
|
|
if (err == error.PathAlreadyExists) break :brk;
|
|
if (manager.options.log_level != .silent)
|
|
Output.prettyErrorln("<r><red>error:<r> failed to create scope in global dir due to error {s}", .{@errorName(err)});
|
|
Global.crash();
|
|
};
|
|
}
|
|
}
|
|
|
|
if (comptime Environment.isWindows) {
|
|
// create the junction
|
|
const top_level = Fs.FileSystem.instance.topLevelDirWithoutTrailingSlash();
|
|
var link_path_buf: bun.PathBuffer = undefined;
|
|
@memcpy(
|
|
link_path_buf[0..top_level.len],
|
|
top_level,
|
|
);
|
|
link_path_buf[top_level.len] = 0;
|
|
const link_path = link_path_buf[0..top_level.len :0];
|
|
const global_path = manager.globalLinkDirPath();
|
|
const dest_path = Path.joinAbsStringZ(global_path, &.{name}, .windows);
|
|
switch (bun.sys.sys_uv.symlinkUV(
|
|
link_path,
|
|
dest_path,
|
|
bun.windows.libuv.UV_FS_SYMLINK_JUNCTION,
|
|
)) {
|
|
.err => |err| {
|
|
Output.prettyErrorln("<r><red>error:<r> failed to create junction to node_modules in global dir due to error {f}", .{err});
|
|
Global.crash();
|
|
},
|
|
.result => {},
|
|
}
|
|
} else {
|
|
// create the symlink
|
|
node_modules.symLink(Fs.FileSystem.instance.topLevelDirWithoutTrailingSlash(), name, .{ .is_directory = true }) catch |err| {
|
|
if (manager.options.log_level != .silent)
|
|
Output.prettyErrorln("<r><red>error:<r> failed to create symlink to node_modules in global dir due to error {s}", .{@errorName(err)});
|
|
Global.crash();
|
|
};
|
|
}
|
|
}
|
|
|
|
// Step 3b. Link any global bins
|
|
if (package.bin.tag != .none) {
|
|
var link_target_buf: bun.PathBuffer = undefined;
|
|
var link_dest_buf: bun.PathBuffer = undefined;
|
|
var link_rel_buf: bun.PathBuffer = undefined;
|
|
|
|
var node_modules_path = bun.AbsPath(.{}).initFdPath(.fromStdDir(node_modules)) catch |err| {
|
|
if (manager.options.log_level != .silent) {
|
|
Output.err(err, "failed to link binary", .{});
|
|
}
|
|
Global.crash();
|
|
};
|
|
defer node_modules_path.deinit();
|
|
|
|
var bin_linker = Bin.Linker{
|
|
.bin = package.bin,
|
|
.node_modules_path = &node_modules_path,
|
|
.global_bin_path = manager.options.bin_path,
|
|
.target_node_modules_path = &node_modules_path,
|
|
.target_package_name = strings.StringOrTinyString.init(name),
|
|
|
|
// .destination_dir_subpath = destination_dir_subpath,
|
|
.package_name = strings.StringOrTinyString.init(name),
|
|
.string_buf = lockfile.buffers.string_bytes.items,
|
|
.extern_string_buf = lockfile.buffers.extern_strings.items,
|
|
.seen = null,
|
|
.abs_target_buf = &link_target_buf,
|
|
.abs_dest_buf = &link_dest_buf,
|
|
.rel_buf = &link_rel_buf,
|
|
};
|
|
bin_linker.link(true);
|
|
|
|
if (bin_linker.err) |err| {
|
|
if (manager.options.log_level != .silent)
|
|
Output.prettyErrorln("<r><red>error:<r> failed to link bin due to error {s}", .{@errorName(err)});
|
|
Global.crash();
|
|
}
|
|
}
|
|
|
|
Output.flush();
|
|
|
|
// Done
|
|
if (manager.options.log_level != .silent)
|
|
Output.prettyln(
|
|
\\<r><green>Success!<r> Registered "{[name]s}"
|
|
\\
|
|
\\To use {[name]s} in a project, run:
|
|
\\ <cyan>bun link {[name]s}<r>
|
|
\\
|
|
\\Or add it in dependencies in your package.json file:
|
|
\\ <cyan>"{[name]s}": "link:{[name]s}"<r>
|
|
\\
|
|
,
|
|
.{
|
|
.name = name,
|
|
},
|
|
);
|
|
|
|
Output.flush();
|
|
Global.exit(0);
|
|
} else {
|
|
// bun link lodash
|
|
try manager.updatePackageJSONAndInstallWithManager(ctx, original_cwd);
|
|
}
|
|
}
|
|
|
|
const string = []const u8;
|
|
|
|
const std = @import("std");
|
|
|
|
const bun = @import("bun");
|
|
const Environment = bun.Environment;
|
|
const Global = bun.Global;
|
|
const Output = bun.Output;
|
|
const Path = bun.path;
|
|
const strings = bun.strings;
|
|
const Command = bun.cli.Command;
|
|
const File = bun.sys.File;
|
|
|
|
const Fs = bun.fs;
|
|
const FileSystem = Fs.FileSystem;
|
|
|
|
const Bin = bun.install.Bin;
|
|
const Features = bun.install.Features;
|
|
|
|
const Lockfile = bun.install.Lockfile;
|
|
const Package = Lockfile.Package;
|
|
|
|
const PackageManager = bun.install.PackageManager;
|
|
const CommandLineArguments = PackageManager.CommandLineArguments;
|
|
const Options = PackageManager.Options;
|
|
const attemptToCreatePackageJSON = PackageManager.attemptToCreatePackageJSON;
|