Current section
14 Versions
Jump to
Current section
14 Versions
Compare versions
20
files changed
+57
additions
-1480
deletions
| @@ -80,6 +80,5 @@ locals_without_parens = [ | |
| 80 80 | [ |
| 81 81 | locals_without_parens: locals_without_parens, |
| 82 82 | export: [locals_without_parens: locals_without_parens], |
| 83 | - plugins: [Combo.HTML.Formatter], |
| 84 83 | inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"] |
| 85 84 | ] |
| @@ -1,5 +1,9 @@ | |
| 1 1 | # Changelog |
| 2 2 | |
| 3 | + ## v0.10.0 |
| 4 | + |
| 5 | + - remove CEEx formatter |
| 6 | + |
| 3 7 | ## v0.9.0 |
| 4 8 | |
| 5 9 | - [`Combo.Router`] remove catch-all functions in route helpers, because we can find the type violation by using Elixir compiler. |
| @@ -1,9 +1,9 @@ | |
| 1 1 | {<<"links">>, |
| 2 2 | [{<<"Source">>,<<"https://github.com/combo-lab/combo">>}, |
| 3 3 | {<<"Changelog">>, |
| 4 | - <<"https://github.com/combo-lab/combo/blob/v0.9.0/CHANGELOG.md">>}]}. |
| 4 | + <<"https://github.com/combo-lab/combo/blob/v0.10.0/CHANGELOG.md">>}]}. |
| 5 5 | {<<"name">>,<<"combo">>}. |
| 6 | - {<<"version">>,<<"0.9.0">>}. |
| 6 | + {<<"version">>,<<"0.10.0">>}. |
| 7 7 | {<<"description">>, |
| 8 8 | <<"A web framework, that combines the good parts of modern web development.">>}. |
| 9 9 | {<<"elixir">>,<<"~> 1.18">>}. |
| @@ -34,11 +34,8 @@ | |
| 34 34 | <<"lib/combo/template/exs_engine.ex">>,<<"lib/combo/template/ceex_engine">>, |
| 35 35 | <<"lib/combo/template/ceex_engine/slot.ex">>, |
| 36 36 | <<"lib/combo/template/ceex_engine/syntax_error.ex">>, |
| 37 | - <<"lib/combo/template/ceex_engine/formatter.ex">>, |
| 38 37 | <<"lib/combo/template/ceex_engine/compiler.ex">>, |
| 39 38 | <<"lib/combo/template/ceex_engine/declarative_assigns.ex">>, |
| 40 | - <<"lib/combo/template/ceex_engine/formatter">>, |
| 41 | - <<"lib/combo/template/ceex_engine/formatter/html_algebra.ex">>, |
| 42 39 | <<"lib/combo/template/ceex_engine/assigns.ex">>, |
| 43 40 | <<"lib/combo/template/ceex_engine/sigil.ex">>, |
| 44 41 | <<"lib/combo/template/ceex_engine/tokenizer.ex">>, |
| @@ -54,14 +51,13 @@ | |
| 54 51 | <<"lib/combo/env.ex">>,<<"lib/combo/config.ex">>,<<"lib/combo/safe_html">>, |
| 55 52 | <<"lib/combo/safe_html/escape.ex">>,<<"lib/combo/safe_html/safe.ex">>, |
| 56 53 | <<"lib/combo/url_param.ex">>,<<"lib/combo/token.ex">>,<<"lib/combo/html">>, |
| 57 | - <<"lib/combo/html/form_field.ex">>,<<"lib/combo/html/formatter.ex">>, |
| 58 | - <<"lib/combo/html/components.ex">>,<<"lib/combo/html/form_data.ex">>, |
| 59 | - <<"lib/combo/html/form.ex">>,<<"lib/combo/controller.ex">>, |
| 60 | - <<"lib/combo/url_builder.ex">>,<<"lib/combo/controller">>, |
| 61 | - <<"lib/combo/controller/pipeline.ex">>,<<"lib/combo/code_reloader.ex">>, |
| 62 | - <<"lib/combo/router.ex">>,<<"lib/combo/channel">>, |
| 63 | - <<"lib/combo/channel/server.ex">>,<<"lib/combo/conn.ex">>, |
| 64 | - <<"lib/combo/socket.ex">>,<<"lib/combo/static">>, |
| 54 | + <<"lib/combo/html/form_field.ex">>,<<"lib/combo/html/components.ex">>, |
| 55 | + <<"lib/combo/html/form_data.ex">>,<<"lib/combo/html/form.ex">>, |
| 56 | + <<"lib/combo/controller.ex">>,<<"lib/combo/url_builder.ex">>, |
| 57 | + <<"lib/combo/controller">>,<<"lib/combo/controller/pipeline.ex">>, |
| 58 | + <<"lib/combo/code_reloader.ex">>,<<"lib/combo/router.ex">>, |
| 59 | + <<"lib/combo/channel">>,<<"lib/combo/channel/server.ex">>, |
| 60 | + <<"lib/combo/conn.ex">>,<<"lib/combo/socket.ex">>,<<"lib/combo/static">>, |
| 65 61 | <<"lib/combo/static/cache.ex">>,<<"lib/combo/static/compressor">>, |
| 66 62 | <<"lib/combo/static/compressor/gzip.ex">>, |
| 67 63 | <<"lib/combo/static/compressor.ex">>,<<"lib/combo/static/digester.ex">>, |
| @@ -74,7 +74,7 @@ defmodule Combo.CodeReloader.Server do | |
| 74 74 | froms = all_waiting([from], endpoint) |
| 75 75 | |
| 76 76 | {backup, res, out} = |
| 77 | - with_build_lock(fn -> |
| 77 | + Mix.Project.with_build_lock(fn -> |
| 78 78 | purge_fallback? = |
| 79 79 | if Combo.CodeReloader.MixListener.started?() do |
| 80 80 | Combo.CodeReloader.MixListener.purge(apps) |
| @@ -194,27 +194,21 @@ defmodule Combo.CodeReloader.Server do | |
| 194 194 | end |
| 195 195 | end |
| 196 196 | |
| 197 | - if Version.match?(System.version(), ">= 1.18.0-dev") do |
| 198 | - defp warn_missing_mix_listener do |
| 199 | - if Mix.Project.get() != Combo.MixProject do |
| 200 | - IO.warn(""" |
| 201 | - a Mix listener expected by Combo.CodeReloader is missing. |
| 197 | + defp warn_missing_mix_listener do |
| 198 | + if Mix.Project.get() != Combo.MixProject do |
| 199 | + IO.warn(""" |
| 200 | + a Mix listener expected by Combo.CodeReloader is missing. |
| 202 201 | |
| 203 | - Please add the listener to your mix.exs configuration, like so: |
| 202 | + Please add the listener to your mix.exs configuration, like so: |
| 204 203 | |
| 205 | - def project do |
| 206 | - [ |
| 207 | - ..., |
| 208 | - listeners: [Combo.CodeReloader] |
| 209 | - ] |
| 210 | - end |
| 204 | + def project do |
| 205 | + [ |
| 206 | + ..., |
| 207 | + listeners: [Combo.CodeReloader] |
| 208 | + ] |
| 209 | + end |
| 211 210 | |
| 212 | - """) |
| 213 | - end |
| 214 | - end |
| 215 | - else |
| 216 | - defp warn_missing_mix_listener do |
| 217 | - :ok |
| 211 | + """) |
| 218 212 | end |
| 219 213 | end |
| 220 214 | |
| @@ -352,10 +346,7 @@ defmodule Combo.CodeReloader.Server do | |
| 352 346 | | compile_args |
| 353 347 | ] |
| 354 348 | |
| 355 | - {status, diagnostics} = |
| 356 | - with_logger_app(config, fn -> |
| 357 | - run_compilers(compilers, args, :noop, []) |
| 358 | - end) |
| 349 | + {status, diagnostics} = run_compilers(compilers, args, :noop, []) |
| 359 350 | |
| 360 351 | Proxy.diagnostics(Process.group_leader(), diagnostics) |
| 361 352 | |
| @@ -450,24 +441,4 @@ defmodule Combo.CodeReloader.Server do | |
| 450 441 | {:noop, []} |
| 451 442 | end |
| 452 443 | end |
| 453 | - |
| 454 | - # TODO: remove once we depend on Elixir 1.17 |
| 455 | - defp with_logger_app(config, fun) do |
| 456 | - app = Keyword.fetch!(config, :app) |
| 457 | - logger_config_app = Application.get_env(:logger, :compile_time_application) |
| 458 | - |
| 459 | - try do |
| 460 | - Logger.configure(compile_time_application: app) |
| 461 | - fun.() |
| 462 | - after |
| 463 | - Logger.configure(compile_time_application: logger_config_app) |
| 464 | - end |
| 465 | - end |
| 466 | - |
| 467 | - # TODO: remove once we depend on Elixir 1.18 |
| 468 | - if Code.ensure_loaded?(Mix.Project) and function_exported?(Mix.Project, :with_build_lock, 1) do |
| 469 | - defp with_build_lock(fun), do: Mix.Project.with_build_lock(fun) |
| 470 | - else |
| 471 | - defp with_build_lock(fun), do: fun.() |
| 472 | - end |
| 473 444 | end |
| @@ -1,7 +1,6 @@ | |
| 1 1 | defmodule Combo.Endpoint.Config do |
| 2 2 | @moduledoc false |
| 3 3 | |
| 4 | - require Logger |
| 5 4 | use GenServer |
| 6 5 | |
| 7 6 | @doc """ |
Loading more files…