Current section

14 Versions

Jump to

Compare versions

49 files changed
+1157 additions
-495 deletions
  @@ -78,5 +78,6 @@ locals_without_parens = [
78 78 [
79 79 locals_without_parens: locals_without_parens,
80 80 export: [locals_without_parens: locals_without_parens],
81 - plugins: [Combo.HTML.Formatter]
81 + plugins: [Combo.HTML.Formatter],
82 + inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"]
82 83 ]
  @@ -1 +1,8 @@
1 1 # Changelog
2 +
3 + ## Unreleased
4 +
5 + ## v0.4.0
6 +
7 + - add `Combo.Proxy`
8 + - rename `Combo.Param` to `Combo.URLParam`
  @@ -1,7 +1,7 @@
1 1 The MIT License
2 2
3 - Copyright (c) 2014-2025 Chris McCord
4 - Copyright (c) 2025-now Zeke Dou
3 + Copyright (c) Zeke Dou
4 + Copyright (c) Chris McCord
5 5
6 6 Permission is hereby granted, free of charge, to any person obtaining a copy
7 7 of this software and associated documentation files (the "Software"), to deal
  @@ -1,12 +1,17 @@
1 1 # Combo
2 2
3 + [![CI](https://github.com/combo-lab/combo/actions/workflows/ci.yml/badge.svg)](https://github.com/combo-lab/combo/actions/workflows/ci.yml)
4 + [![Hex.pm](https://img.shields.io/hexpm/v/combo.svg)](https://hex.pm/packages/combo)
5 +
3 6 A web framework, that combines the good parts of modern web development.
4 7
5 - [![Build Status](https://github.com/combo-lab/combo/workflows/CI/badge.svg)](https://github.com/combo-lab/combo/actions/workflows/ci.yml) [![Hex.pm](https://img.shields.io/hexpm/v/combo.svg)](https://hex.pm/packages/combo)
8 + ## Getting started
9 +
10 + Read the [documentation](https://hexdocs.pm/combo).
6 11
7 12 ## About
8 13
9 - Combo started as a fork of Phoenix. Its goals includes:
14 + Combo started as a fork of [Phoenix](https://github.com/phoenixframework/phoenix). Its goals includes:
10 15
11 16 - being a typical MVC framework.
12 17 - integrating with the modern frontend tooling.
  @@ -21,10 +26,6 @@ To archive the goals, it:
21 26
22 27 Although Combo is forked from Phoenix and will continue to track upstream changes in the future, full compatibility between the two is not guaranteed.
23 28
24 - ## Getting started
25 -
26 - Read the [documentation](https://hexdocs.pm/combo).
27 -
28 29 ## Contributing
29 30
30 31 We appreciate any contribution to Combo. Check our [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md) and [CONTRIBUTING.md](CONTRIBUTING.md) guides for more information. We usually keep a list of features and bugs in the [issue tracker](https://github.com/combo-lab/combo/issues).
  @@ -1,9 +1,9 @@
1 1 {<<"links">>,
2 - [{<<"GitHub">>,<<"https://github.com/combo-lab/combo">>},
2 + [{<<"Source">>,<<"https://github.com/combo-lab/combo">>},
3 3 {<<"Changelog">>,
4 - <<"https://github.com/combo-lab/combo/blob/v0.3.0/CHANGELOG.md">>}]}.
4 + <<"https://github.com/combo-lab/combo/blob/v0.4.0/CHANGELOG.md">>}]}.
5 5 {<<"name">>,<<"combo">>}.
6 - {<<"version">>,<<"0.3.0">>}.
6 + {<<"version">>,<<"0.4.0">>}.
7 7 {<<"description">>,
8 8 <<"A web framework, that combines the good parts of modern web development.">>}.
9 9 {<<"elixir">>,<<"~> 1.18">>}.
  @@ -15,14 +15,16 @@
15 15 <<"lib/mix/tasks/combo_gen_secret.ex">>,<<"lib/mix/tasks/combo_serve.ex">>,
16 16 <<"lib/mix/tasks/combo_routes.ex">>,<<"lib/mix/tasks/combo.ex">>,
17 17 <<"lib/mix/tasks/combo_static_digest.ex">>,<<"lib/combo.ex">>,
18 - <<"lib/combo">>,<<"lib/combo/filtered_params.ex">>,
18 + <<"lib/combo">>,<<"lib/combo/proxy.ex">>,<<"lib/combo/filtered_params.ex">>,
19 19 <<"lib/combo/naming.ex">>,<<"lib/combo/html.ex">>,
20 20 <<"lib/combo/channel.ex">>,<<"lib/combo/verified_routes.ex">>,
21 21 <<"lib/combo/safe_html.ex">>,<<"lib/combo/code_reloader">>,
22 22 <<"lib/combo/code_reloader/proxy.ex">>,
23 23 <<"lib/combo/code_reloader/mix_listener.ex">>,
24 - <<"lib/combo/code_reloader/server.ex">>,<<"lib/combo/param.ex">>,
25 - <<"lib/combo/live_reloader.ex">>,<<"lib/combo/cache.ex">>,
24 + <<"lib/combo/code_reloader/server.ex">>,<<"lib/combo/live_reloader.ex">>,
25 + <<"lib/combo/proxy">>,<<"lib/combo/proxy/dispatcher.ex">>,
26 + <<"lib/combo/proxy/config.ex">>,<<"lib/combo/proxy/error_plug.ex">>,
27 + <<"lib/combo/proxy/backend.ex">>,<<"lib/combo/cache.ex">>,
26 28 <<"lib/combo/test">>,<<"lib/combo/test/html_test.ex">>,
27 29 <<"lib/combo/test/html_test">>,<<"lib/combo/test/html_test/dom.ex">>,
28 30 <<"lib/combo/test/channel_test.ex">>,<<"lib/combo/test/conn_test.ex">>,
  @@ -53,7 +55,7 @@
53 55 <<"lib/combo/template/eex_engine.ex">>,<<"lib/combo/template/engine.ex">>,
54 56 <<"lib/combo/env.ex">>,<<"lib/combo/config.ex">>,<<"lib/combo/safe_html">>,
55 57 <<"lib/combo/safe_html/escape.ex">>,<<"lib/combo/safe_html/safe.ex">>,
56 - <<"lib/combo/token.ex">>,<<"lib/combo/html">>,
58 + <<"lib/combo/url_param.ex">>,<<"lib/combo/token.ex">>,<<"lib/combo/html">>,
57 59 <<"lib/combo/html/form_field.ex">>,<<"lib/combo/html/formatter.ex">>,
58 60 <<"lib/combo/html/components.ex">>,<<"lib/combo/html/form_data.ex">>,
59 61 <<"lib/combo/html/form.ex">>,<<"lib/combo/controller.ex">>,
  @@ -124,10 +126,10 @@
124 126 {<<"optional">>,false},
125 127 {<<"requirement">>,<<"~> 0.4 or ~> 1.0">>},
126 128 {<<"repository">>,<<"hexpm">>}],
127 - [{<<"name">>,<<"phoenix_pubsub">>},
128 - {<<"app">>,<<"phoenix_pubsub">>},
129 + [{<<"name">>,<<"combo_pubsub">>},
130 + {<<"app">>,<<"combo_pubsub">>},
129 131 {<<"optional">>,false},
130 - {<<"requirement">>,<<"~> 2.1">>},
132 + {<<"requirement">>,<<"~> 0.1">>},
131 133 {<<"repository">>,<<"hexpm">>}],
132 134 [{<<"name">>,<<"websock_adapter">>},
133 135 {<<"app">>,<<"websock_adapter">>},
Loading more files…