Move to Zig modules

build.zig

@@ -12,13 +12,29 @@ pub fn build(b: *Build) void {
     // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall.
     const optimize = b.standardOptimizeOption(.{});
 
+    const wcwidth = b.dependency("wcwidth", .{
+        .target = target,
+        .optimize = optimize,
+    });
+
+    const linenoise = b.addModule("linenoise", .{
+        .source_file = .{ .path = "src/main.zig" },
+        .dependencies = &.{
+            .{
+                .name = "wcwidth",
+                .module = wcwidth.module("wcwidth"),
+            },
+        },
+    });
+
     // Static library
     const lib = b.addStaticLibrary(.{
         .name = "linenoise",
         .root_source_file = FileSource.relative("src/c.zig"),
         .target = target,
         .optimize = optimize,
     });
+    lib.addModule("wcwidth", wcwidth.module("wcwidth"));
     lib.linkLibC();
     lib.install();
 
@@ -29,7 +45,6 @@ pub fn build(b: *Build) void {
         .target = target,
         .optimize = optimize,
     });
-
     const test_step = b.step("test", "Run library tests");
     test_step.dependOn(&main_tests.step);
 
@@ -40,9 +55,7 @@ pub fn build(b: *Build) void {
         .target = target,
         .optimize = optimize,
     });
-    example.addAnonymousModule("linenoise", .{
-        .source_file = FileSource.relative("src/main.zig"),
-    });
+    example.addModule("linenoise", linenoise);
 
     var example_run = example.run();
 
@@ -51,7 +64,7 @@ pub fn build(b: *Build) void {
 
     // C example
     var c_example = b.addExecutable(.{
-        .name =  "example",
+        .name = "example",
         .root_source_file = FileSource.relative("examples/example.c"),
         .target = target,
         .optimize = optimize,

build.zig.zon

@@ -0,0 +1,10 @@
+.{
+    .name = "linenoise",
+    .version = "0.1.0",
+    .dependencies = .{
+        .wcwidth = .{
+            .url = "https://github.com/joachimschmidt557/zig-wcwidth/archive/f7296a31e83fe26240137404b56e64b9997afe04.tar.gz",
+            .hash = "12208294054b53630bc7a693cf2d8be329b434350986575b30f1ca657b982498f9a3",
+        },
+    },
+}

src/unicode.zig

@@ -2,7 +2,7 @@ const std = @import("std");
 const Allocator = std.mem.Allocator;
 const expectEqualSlices = std.testing.expectEqualSlices;
 
-const wcwidth = @import("zig-wcwidth/src/main.zig").wcwidth;
+const wcwidth = @import("wcwidth").wcwidth;
 
 pub fn width(s: []const u8) usize {
     var result: usize = 0;