diff options
| -rw-r--r-- | src/resolver/dir_info.zig | 2 | ||||
| -rw-r--r-- | src/resolver/package_json.zig | 3 | ||||
| -rw-r--r-- | src/resolver/resolver.zig | 20 | ||||
| -rw-r--r-- | src/resolver/workspace.zig | 8 |
4 files changed, 0 insertions, 33 deletions
diff --git a/src/resolver/dir_info.zig b/src/resolver/dir_info.zig index f27baa922..396413327 100644 --- a/src/resolver/dir_info.zig +++ b/src/resolver/dir_info.zig @@ -5,7 +5,6 @@ const DirInfo = @This(); const Fs = @import("../fs.zig"); const TSConfigJSON = @import("./tsconfig_json.zig").TSConfigJSON; const PackageJSON = @import("./package_json.zig").PackageJSON; -const Workspace = @import("./workspace.zig").Workspace; pub const Index = allocators.IndexType; @@ -18,7 +17,6 @@ parent: Index = allocators.NotFound, enclosing_browser_scope: Index = allocators.NotFound, package_json_for_browser_field: ?*const PackageJSON = null, enclosing_tsconfig_json: ?*const TSConfigJSON = null, -enclosing_workspace: ?*const Workspace = null, enclosing_package_json: ?*PackageJSON = null, diff --git a/src/resolver/package_json.zig b/src/resolver/package_json.zig index f7c6294c1..e4fd627e7 100644 --- a/src/resolver/package_json.zig +++ b/src/resolver/package_json.zig @@ -19,7 +19,6 @@ pub const MacroImportReplacementMap = std.StringArrayHashMap(string); pub const MacroMap = std.StringArrayHashMapUnmanaged(MacroImportReplacementMap); const ScriptsMap = std.StringArrayHashMap(string); -const Workspace = @import("./workspace.zig").Workspace; pub const PackageJSON = struct { pub const LoadFramework = enum { @@ -65,7 +64,6 @@ pub const PackageJSON = struct { always_bundle: []string = &.{}, macros: MacroMap = MacroMap{}, - workspace_root: bool = false, // Present if the "browser" field is present. This field is intended to be // used by bundlers and lets you redirect the paths of certain 3rd-party @@ -698,7 +696,6 @@ pub const PackageJSON = struct { } } - package_json.workspace_root = json.asProperty("workspaces") != null; // used by `bun run` if (include_scripts) { diff --git a/src/resolver/resolver.zig b/src/resolver/resolver.zig index 06b486bb0..125987d37 100644 --- a/src/resolver/resolver.zig +++ b/src/resolver/resolver.zig @@ -18,7 +18,6 @@ const HTTPWatcher = if (isTest) void else @import("../http.zig").Watcher; const Wyhash = std.hash.Wyhash; const ResolvePath = @import("./resolve_path.zig"); const NodeFallbackModules = @import("../node_fallbacks.zig"); -const Workspace = @import("./workspace.zig").Workspace; const Mutex = @import("../lock.zig").Lock; const StringBoolMap = std.StringHashMap(bool); @@ -2561,7 +2560,6 @@ pub const Resolver = struct { info.package_json_for_browser_field = parent.?.package_json_for_browser_field; info.enclosing_tsconfig_json = parent.?.enclosing_tsconfig_json; info.enclosing_package_json = parent.?.package_json orelse parent.?.enclosing_package_json; - info.enclosing_workspace = parent.enclosing_workspace; // Make sure "absRealPath" is the real path of the directory (resolving any symlinks) if (!r.opts.preserve_symlinks) { @@ -2605,24 +2603,6 @@ pub const Resolver = struct { } info.enclosing_package_json = pkg; - const is_root = pkg.workspace_root or entries.hasComptimeQuery(".pnpm-workspace.yaml"); - - pkg.workspace_root = is_root; - - if (is_root) { - var workspace = r.allocator.create(Workspace) catch unreachable; - workspace.* = Workspace{ - .import_base_path = info.abs_path, - .package_json = pkg, - }; - - if (info.abs_real_path.len > 0) { - workspace.import_base_path = info.abs_real_path; - } - - info.enclosing_workspace = workspace; - } - if (r.debug_logs) |*logs| { logs.addNoteFmt("Resolved package.json in \"{s}\"", .{ path, diff --git a/src/resolver/workspace.zig b/src/resolver/workspace.zig deleted file mode 100644 index 938a49016..000000000 --- a/src/resolver/workspace.zig +++ /dev/null @@ -1,8 +0,0 @@ -pub const Workspace = struct { - import_base_path: string, - package_json: *PackageJSON, - - // package_path_matchers: []const string, - // package_prefixes: []const string, - -}; |