✨ Pass NODE_PATH to esbuild for node_modules support.

Author: hayleigh-dot-dev

manifest.toml

@@ -316,7 +316,7 @@ fn bundle_tailwind(
 }
 
 fn exec_tailwind(root: String, options: List(String)) -> Result(String, Error) {
-  cmd.exec("./build/.lustre/bin/tailwind", in: root, with: options)
+  cmd.exec("./build/.lustre/bin/tailwind", in: root, env: [], with: options)
   |> result.map_error(fn(pair) { BundleError(pair.1) })
 }
 

src/lustre_dev_tools/cli/build.gleam

@@ -9,6 +9,7 @@ import gleam/dynamic.{type Dynamic}
 @external(erlang, "lustre_dev_tools_ffi", "exec")
 pub fn exec(
   run command: String,
+  env env: List(#(String, String)),
   with args: List(String),
   in in: String,
 ) -> Result(String, #(Int, String))

src/lustre_dev_tools/cmd.gleam

@@ -259,7 +259,12 @@ fn set_file_permissions(file: String) -> Result(Nil, Error) {
 }
 
 fn exec_esbuild(root: String, options: List(String)) -> Result(String, Error) {
-  cmd.exec("./build/.lustre/bin/esbuild", in: root, with: options)
+  cmd.exec(
+    "./build/.lustre/bin/esbuild",
+    in: root,
+    env: [#("NODE_PATH", "./node_modules")],
+    with: options,
+  )
   |> result.map_error(fn(pair) { BundleError(pair.1) })
 }
 

src/lustre_dev_tools/esbuild.gleam

@@ -49,7 +49,9 @@ fn do_otp_version() -> String
 /// Compile the current project running the `gleam build` command.
 ///
 pub fn build() -> Result(Nil, Error) {
-  cmd.exec(run: "gleam", in: ".", with: ["build", "--target", "javascript"])
+  cmd.exec(run: "gleam", in: ".", env: [], with: [
+    "build", "--target", "javascript",
+  ])
   |> result.map_error(fn(err) { BuildError(pair.second(err)) })
   |> result.replace(Nil)
 }
@@ -60,7 +62,7 @@ pub fn interface() -> Result(Interface, Error) {
   let args = ["export", "package-interface", "--out", out]
 
   use _ <- result.try(
-    cmd.exec(run: "gleam", in: ".", with: args)
+    cmd.exec(run: "gleam", in: ".", env: [], with: args)
     |> result.map_error(fn(err) { BuildError(pair.second(err)) }),
   )
 

src/lustre_dev_tools/project.gleam

@@ -1,44 +1,45 @@
 -module(lustre_dev_tools_ffi).
--export([
-    check_live_reloading/0,
-    fs_start_link/2,
-    get_cwd/0,
-    get_cpu/0,
-    get_esbuild/1,
-    get_tailwind/1,
-    get_os/0,
-    otp_version/0,
-    unzip_esbuild/1,
-    exec/3
-]).
+
+-export([check_live_reloading/0, fs_start_link/2, get_cwd/0, get_cpu/0, get_esbuild/1,
+         get_tailwind/1, get_os/0, otp_version/0, unzip_esbuild/1, exec/4]).
 
 otp_version() ->
     Version = erlang:system_info(otp_release),
     list_to_binary(Version).
 
 get_cwd() ->
     case file:get_cwd() of
-        {ok, Cwd} -> {ok, unicode:characters_to_binary(Cwd)};
-        {error, Reason} -> {error, Reason}
+        {ok, Cwd} ->
+            {ok, unicode:characters_to_binary(Cwd)};
+        {error, Reason} ->
+            {error, Reason}
     end.
 
 get_os() ->
     case os:type() of
-        {win32, _} -> <<"win32">>;
-        {unix, darwin} -> <<"darwin">>;
-        {unix, linux} -> <<"linux">>;
-        {_, Unknown} -> atom_to_binary(Unknown, utf8)
+        {win32, _} ->
+            <<"win32">>;
+        {unix, darwin} ->
+            <<"darwin">>;
+        {unix, linux} ->
+            <<"linux">>;
+        {_, Unknown} ->
+            atom_to_binary(Unknown, utf8)
     end.
 
 get_cpu() ->
     case erlang:system_info(os_type) of
         {unix, _} ->
-            [Arch, _] = string:split(erlang:system_info(system_architecture), "-"),
+            [Arch, _] =
+                string:split(
+                    erlang:system_info(system_architecture), "-"),
             list_to_binary(Arch);
         {win32, _} ->
             case erlang:system_info(wordsize) of
-                4 -> <<"ia32">>;
-                8 -> <<"x64">>
+                4 ->
+                    <<"ia32">>;
+                8 ->
+                    <<"x64">>
             end
     end.
 
@@ -47,72 +48,87 @@ get_esbuild(Url) ->
     ssl:start(),
 
     case httpc:request(get, {Url, []}, [], [{body_format, binary}]) of
-        {ok, {{_, 200, _}, _, Zip}} -> {ok, Zip};
-        {ok, Res} -> {error, Res};
-        {error, Err} -> {error, Err}
+        {ok, {{_, 200, _}, _, Zip}} ->
+            {ok, Zip};
+        {ok, Res} ->
+            {error, Res};
+        {error, Err} ->
+            {error, Err}
     end.
 
 get_tailwind(Url) ->
     inets:start(),
     ssl:start(),
 
     case httpc:request(get, {Url, []}, [], [{body_format, binary}]) of
-        {ok, {{_, 200, _}, _, Bin}} -> {ok, Bin};
-        {ok, Res} -> {error, Res};
-        {error, Err} -> {error, Err}
+        {ok, {{_, 200, _}, _, Bin}} ->
+            {ok, Bin};
+        {ok, Res} ->
+            {error, Res};
+        {error, Err} ->
+            {error, Err}
     end.
 
 unzip_esbuild(Zip) ->
     Filepath =
         case os:type() of
-            {win32, _} -> "package/esbuild.exe";
-            _ -> "package/bin/esbuild"
+            {win32, _} ->
+                "package/esbuild.exe";
+            _ ->
+                "package/bin/esbuild"
         end,
 
-    Result =
-        erl_tar:extract({binary, Zip}, [
-            memory, compressed, {files, [Filepath]}
-        ]),
+    Result = erl_tar:extract({binary, Zip}, [memory, compressed, {files, [Filepath]}]),
 
     case Result of
-        {ok, [{_, Esbuild}]} -> {ok, Esbuild};
-        {ok, Res} -> {error, Res};
-        {error, Err} -> {error, Err}
+        {ok, [{_, Esbuild}]} ->
+            {ok, Esbuild};
+        {ok, Res} ->
+            {error, Res};
+        {error, Err} ->
+            {error, Err}
     end.
 
-exec(Command, Args, Cwd) ->
+exec(Command, Env, Args, Cwd) ->
     Command_ = binary_to_list(Command),
+    Env_ = lists:map(fun({K, V}) -> {binary_to_list(K), binary_to_list(V)} end, Env),
     Args_ = lists:map(fun(Arg) -> binary_to_list(Arg) end, Args),
     Cwd_ = binary_to_list(Cwd),
 
-    Name = case Command_ of
-      "./" ++ _ -> {spawn_executable, Command_};
-      "/" ++ _ -> {spawn_executable, Command_};
-      _ -> {spawn_executable, os:find_executable(Command_)}
-    end,
-
-    Port = open_port(Name, [
-        exit_status,
-        binary,
-        hide,
-        stream,
-        eof,
-        stderr_to_stdout, % We need this to hide the process' stdout
-        {args, Args_},
-        {cd, Cwd_}
-    ]),
+    Name =
+        case Command_ of
+            "./" ++ _ ->
+                {spawn_executable, Command_};
+            "/" ++ _ ->
+                {spawn_executable, Command_};
+            _ ->
+                {spawn_executable, os:find_executable(Command_)}
+        end,
+
+    Port =
+        open_port(Name,
+                  [exit_status,
+                   binary,
+                   hide,
+                   stream,
+                   eof,
+                   stderr_to_stdout, % We need this to hide the process' stdout
+                   {env, Env_},
+                   {args, Args_},
+                   {cd, Cwd_}]),
 
     do_exec(Port, []).
 
 do_exec(Port, Acc) ->
     receive
-        {Port, {data, Data}} -> do_exec(Port, [Data | Acc]);
+        {Port, {data, Data}} ->
+            do_exec(Port, [Data | Acc]);
         {Port, {exit_status, 0}} ->
-          port_close(Port),
-          {ok, list_to_binary(lists:reverse(Acc))};
+            port_close(Port),
+            {ok, list_to_binary(lists:reverse(Acc))};
         {Port, {exit_status, Code}} ->
-          port_close(Port),
-          {error, {Code, list_to_binary(lists:reverse(Acc))}}
+            port_close(Port),
+            {error, {Code, list_to_binary(lists:reverse(Acc))}}
     end.
 
 fs_start_link(Id, Path) ->
@@ -135,21 +151,32 @@ fs_start_link(Id, Path) ->
 check_live_reloading() ->
     Watcher =
         case os:type() of
-            {unix, darwin} -> fsevents;
-            {unix, linux} -> inotifywait;
-            {unix, freebsd} -> inotifywait;
-            {unix, openbsd} -> inotifywait;
-            {unix, sunos} -> undefined;
-            {unix, _} -> kqueue;
-            {win32, nt} -> inotifywait_win32;
-            _ -> undefined
+            {unix, darwin} ->
+                fsevents;
+            {unix, linux} ->
+                inotifywait;
+            {unix, freebsd} ->
+                inotifywait;
+            {unix, openbsd} ->
+                inotifywait;
+            {unix, sunos} ->
+                undefined;
+            {unix, _} ->
+                kqueue;
+            {win32, nt} ->
+                inotifywait_win32;
+            _ ->
+                undefined
         end,
 
     case Watcher of
-        undefined -> {error, no_file_watcher_supported_for_os};
+        undefined ->
+            {error, no_file_watcher_supported_for_os};
         _ ->
             case Watcher:find_executable() of
-                false -> {error, {no_file_watcher_installed, Watcher}};
-                _ -> {ok, nil}
+                false ->
+                    {error, {no_file_watcher_installed, Watcher}};
+                _ ->
+                    {ok, nil}
             end
     end.