diff --git a/lib/mix/tasks/frontend.build.css.compile.ex b/lib/mix/tasks/frontend.build.css.compile.ex index 0ba2d8e..0bc6973 100644 --- a/lib/mix/tasks/frontend.build.css.compile.ex +++ b/lib/mix/tasks/frontend.build.css.compile.ex @@ -1,7 +1,7 @@ defmodule Mix.Tasks.Frontend.Build.Css.Compile do - use FBU.BuildTask + use MBU.BuildTask import MebeWeb.FrontendConfs - import FBU.TaskUtils + import MBU.TaskUtils @shortdoc "Build the SCSS sources" @@ -13,11 +13,7 @@ defmodule Mix.Tasks.Frontend.Build.Css.Compile do "-o", out_path(), "--source-map", - "true", - "--include-path", - Path.join([node_path(), "boostrap-sass", "assets", "stylesheets"]), - "--precision", - "8" + "true" ] def scss_file(), do: Path.join([src_path(), "css", "app.scss"]) diff --git a/lib/mix/tasks/frontend.build.css.copy.ex b/lib/mix/tasks/frontend.build.css.copy.ex index dd4bd48..ba8518b 100644 --- a/lib/mix/tasks/frontend.build.css.copy.ex +++ b/lib/mix/tasks/frontend.build.css.copy.ex @@ -1,5 +1,5 @@ defmodule Mix.Tasks.Frontend.Build.Css.Copy do - use FBU.BuildTask + use MBU.BuildTask import MebeWeb.FrontendConfs @shortdoc "Copy compiled CSS to target dir" diff --git a/lib/mix/tasks/frontend.build.css.ex b/lib/mix/tasks/frontend.build.css.ex index d3418a7..0c13dac 100644 --- a/lib/mix/tasks/frontend.build.css.ex +++ b/lib/mix/tasks/frontend.build.css.ex @@ -1,6 +1,6 @@ defmodule Mix.Tasks.Frontend.Build.Css do - use FBU.BuildTask - import FBU.TaskUtils + use MBU.BuildTask + import MBU.TaskUtils @shortdoc "Build the frontend CSS" diff --git a/lib/mix/tasks/frontend.build.css.minify.ex b/lib/mix/tasks/frontend.build.css.minify.ex index 66a8f51..b6d4211 100644 --- a/lib/mix/tasks/frontend.build.css.minify.ex +++ b/lib/mix/tasks/frontend.build.css.minify.ex @@ -1,7 +1,7 @@ defmodule Mix.Tasks.Frontend.Build.Css.Minify do - use FBU.BuildTask + use MBU.BuildTask import MebeWeb.FrontendConfs - import FBU.TaskUtils + import MBU.TaskUtils @shortdoc "Minify built CSS files" @preferred_cli_env :prod diff --git a/lib/mix/tasks/frontend.build.ex b/lib/mix/tasks/frontend.build.ex index 7c39786..83d2bfc 100644 --- a/lib/mix/tasks/frontend.build.ex +++ b/lib/mix/tasks/frontend.build.ex @@ -1,6 +1,6 @@ defmodule Mix.Tasks.Frontend.Build do - use FBU.BuildTask - import FBU.TaskUtils + use MBU.BuildTask + import MBU.TaskUtils @shortdoc "Build the frontend" diff --git a/lib/mix/tasks/frontend.build.js.bundle.ex b/lib/mix/tasks/frontend.build.js.bundle.ex index b55d2f2..49ce7c6 100644 --- a/lib/mix/tasks/frontend.build.js.bundle.ex +++ b/lib/mix/tasks/frontend.build.js.bundle.ex @@ -1,7 +1,7 @@ defmodule Mix.Tasks.Frontend.Build.Js.Bundle do - use FBU.BuildTask + use MBU.BuildTask import MebeWeb.FrontendConfs - import FBU.TaskUtils + import MBU.TaskUtils @shortdoc "Bundle the JavaScript sources into app.js" diff --git a/lib/mix/tasks/frontend.build.js.copy.ex b/lib/mix/tasks/frontend.build.js.copy.ex index feffbed..1776828 100644 --- a/lib/mix/tasks/frontend.build.js.copy.ex +++ b/lib/mix/tasks/frontend.build.js.copy.ex @@ -1,5 +1,5 @@ defmodule Mix.Tasks.Frontend.Build.Js.Copy do - use FBU.BuildTask + use MBU.BuildTask import MebeWeb.FrontendConfs @shortdoc "Copy bundled JS to target dir" diff --git a/lib/mix/tasks/frontend.build.js.ex b/lib/mix/tasks/frontend.build.js.ex index 71e8cd1..f34654c 100644 --- a/lib/mix/tasks/frontend.build.js.ex +++ b/lib/mix/tasks/frontend.build.js.ex @@ -1,6 +1,6 @@ defmodule Mix.Tasks.Frontend.Build.Js do - use FBU.BuildTask - import FBU.TaskUtils + use MBU.BuildTask + import MBU.TaskUtils @shortdoc "Build the frontend JavaScript" diff --git a/lib/mix/tasks/frontend.build.js.minify.ex b/lib/mix/tasks/frontend.build.js.minify.ex index 9745139..e637151 100644 --- a/lib/mix/tasks/frontend.build.js.minify.ex +++ b/lib/mix/tasks/frontend.build.js.minify.ex @@ -1,7 +1,7 @@ defmodule Mix.Tasks.Frontend.Build.Js.Minify do - use FBU.BuildTask + use MBU.BuildTask import MebeWeb.FrontendConfs - import FBU.TaskUtils + import MBU.TaskUtils @shortdoc "Minify built JS files" @preferred_cli_env :prod diff --git a/lib/mix/tasks/frontend.build.js.transpile.ex b/lib/mix/tasks/frontend.build.js.transpile.ex index 7287f04..0b8237c 100644 --- a/lib/mix/tasks/frontend.build.js.transpile.ex +++ b/lib/mix/tasks/frontend.build.js.transpile.ex @@ -1,7 +1,7 @@ defmodule Mix.Tasks.Frontend.Build.Js.Transpile do - use FBU.BuildTask + use MBU.BuildTask import MebeWeb.FrontendConfs - import FBU.TaskUtils + import MBU.TaskUtils @shortdoc "Transpile JS sources to ES5" diff --git a/lib/mix/tasks/frontend.clean.ex b/lib/mix/tasks/frontend.clean.ex index edf0be2..b6dc121 100644 --- a/lib/mix/tasks/frontend.clean.ex +++ b/lib/mix/tasks/frontend.clean.ex @@ -1,5 +1,5 @@ defmodule Mix.Tasks.Frontend.Clean do - use FBU.BuildTask + use MBU.BuildTask import MebeWeb.FrontendConfs @shortdoc "Clean build artifacts" diff --git a/lib/mix/tasks/frontend.watch.ex b/lib/mix/tasks/frontend.watch.ex index 7950975..fab4fce 100644 --- a/lib/mix/tasks/frontend.watch.ex +++ b/lib/mix/tasks/frontend.watch.ex @@ -1,6 +1,6 @@ defmodule Mix.Tasks.Frontend.Watch do - use FBU.BuildTask - import FBU.TaskUtils + use MBU.BuildTask + import MBU.TaskUtils alias Mix.Tasks.Frontend.Build.Js.Transpile, as: TranspileJS alias Mix.Tasks.Frontend.Build.Js.Bundle, as: BundleJS alias Mix.Tasks.Frontend.Build.Js.Copy, as: CopyJS @@ -23,13 +23,13 @@ defmodule Mix.Tasks.Frontend.Watch do watch( "JSBundle", TranspileJS.out_path(), - fn _, _ -> run_task(BundleJS, deps: false) end + BundleJS ), watch( "JSCopy", BundleJS.out_path(), - fn _, _ -> run_task(CopyJS, deps: false) end + CopyJS ), exec( @@ -43,7 +43,7 @@ defmodule Mix.Tasks.Frontend.Watch do watch( "CSSCopy", CompileCSS.out_path(), - fn _, _ -> run_task(CopyCSS, deps: false) end + CopyCSS ) ] |> listen(watch: true) diff --git a/mix.exs b/mix.exs index f3dcb9d..31dffb9 100644 --- a/mix.exs +++ b/mix.exs @@ -40,7 +40,7 @@ defmodule MebeWeb.Mixfile do {:earmark, "~> 1.2.0"}, {:slugger, github: "h4cc/slugger", ref: "98e907f85d34e6c8a94270249318bdad6f838198"}, {:calendar, "~> 0.17.2"}, - {:fbu, github: "Nicd/fbu"} + {:mbu, "~> 0.2.4"} ] end end diff --git a/mix.lock b/mix.lock index 3cf7052..c544a80 100644 --- a/mix.lock +++ b/mix.lock @@ -3,10 +3,10 @@ "cowboy": {:hex, :cowboy, "1.0.4", "a324a8df9f2316c833a470d918aaf73ae894278b8aa6226ce7a9bf699388f878", [:make, :rebar], [{:cowlib, "~> 1.0.0", [hex: :cowlib, optional: false]}, {:ranch, "~> 1.0", [hex: :ranch, optional: false]}]}, "cowlib": {:hex, :cowlib, "1.0.2", "9d769a1d062c9c3ac753096f868ca121e2730b9a377de23dec0f7e08b1df84ee", [:make], []}, "earmark": {:hex, :earmark, "1.2.0", "bf1ce17aea43ab62f6943b97bd6e3dc032ce45d4f787504e3adf738e54b42f3a", [:mix], []}, - "fbu": {:git, "https://github.com/Nicd/fbu.git", "6b1729f4a7c8607fcd115be5a48fbba9865d0eed", []}, "fs": {:hex, :fs, "2.12.0", "ad631efacc9a5683c8eaa1b274e24fa64a1b8eb30747e9595b93bec7e492e25e", [:rebar3], []}, "hackney": {:hex, :hackney, "1.7.1", "e238c52c5df3c3b16ce613d3a51c7220a784d734879b1e231c9babd433ac1cb4", [:rebar3], [{:certifi, "1.0.0", [hex: :certifi, optional: false]}, {:idna, "4.0.0", [hex: :idna, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, optional: false]}]}, "idna": {:hex, :idna, "4.0.0", "10aaa9f79d0b12cf0def53038547855b91144f1bfcc0ec73494f38bb7b9c4961", [:rebar3], []}, + "mbu": {:hex, :mbu, "0.2.4", "abb1a660d90ed90fd5e7d1027ffcecffed2057fbeedc7a1aae4832231021fd5f", [:mix], [{:fs, "~> 2.12.0", [hex: :fs, optional: false]}]}, "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], []}, "mime": {:hex, :mime, "1.1.0", "01c1d6f4083d8aa5c7b8c246ade95139620ef8effb009edde934e0ec3b28090a", [:mix], []}, "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], []},