Skip to content

Commit b7a4aaa

Browse files
Flo0807Flo0807
committed
Merge branch 'develop' into feature/use-description-list
2 parents 60ac4a3 + 0a0c752 commit b7a4aaa

File tree

8 files changed

+67
-63
lines changed

8 files changed

+67
-63
lines changed

‎.credo.exs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,20 @@ overwrite_checks = [
1212
{Credo.Check.Warning.LazyLogging, false}
1313
]
1414

15+
other_checks = [
16+
{PhoenixTest.Credo.NoOpenBrowser, []}
17+
]
18+
1519
all_checks =
1620
Code.eval_file("deps/credo/.credo.exs")
1721
|> get_in([Access.elem(0), :configs, Access.at(0), :checks])
1822
|> then(fn checks -> checks.enabled ++ checks.disabled end)
1923

2024
project_checks =
2125
Enum.reduce(overwrite_checks, all_checks, fn {check, config}, acc ->
22-
Keyword.replace(acc, check, config)
26+
Keyword.replace!(acc, check, config)
2327
end)
28+
|> Enum.concat(other_checks)
2429

2530
%{
2631
configs: [
@@ -35,7 +40,7 @@ project_checks =
3540
excluded: [~r"/_build/", ~r"/deps/", ~r"/node_modules/"]
3641
},
3742
plugins: [],
38-
requires: [],
43+
requires: ["./deps/phoenix_test/lib/phoenix_test/credo/**/*.ex"],
3944
strict: true,
4045
parse_timeout: 5000,
4146
color: true,

‎.github/renovate.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020
},
2121
"patch": {
2222
"automerge": true,
23-
"minimumReleaseAge": "14"
23+
"minimumReleaseAge": "14 days"
2424
},
2525
"pin": {
2626
"automerge": true,
27-
"minimumReleaseAge": "14"
27+
"minimumReleaseAge": "14 days"
2828
},
29+
"internalChecksFilter": "strict",
2930
"packageRules": [
3031
{
3132
"description": "Set Mix versioning strategy to update-lockfile",
@@ -50,7 +51,7 @@
5051
"matchManagers": ["github-actions"],
5152
"matchUpdateTypes": ["minor", "patch", "pin", "pinDigest"],
5253
"automerge": true,
53-
"minimumReleaseAge": 14
54+
"minimumReleaseAge": "14 days"
5455
},
5556
{
5657
"description": "Automerge some minor node package updates",
@@ -66,7 +67,7 @@
6667
"matchDatasources": ["npm"],
6768
"matchUpdateTypes": ["minor", "patch"],
6869
"automerge": true,
69-
"minimumReleaseAge": 14
70+
"minimumReleaseAge": "14 days"
7071
},
7172
{
7273
"description": "Label dependency updates in demo directory",

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ on:
77
- main
88
- develop
99
pull_request:
10-
branches:
11-
- main
12-
- develop
1310
release:
1411
types: [published]
1512
merge_group:

‎demo/config/test.exs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ config :phoenix_test,
99
endpoint: DemoWeb.Endpoint,
1010
otp_app: :demo,
1111
playwright: [
12-
cli: "node_modules/playwright/cli.js",
12+
# directory containing node_modules
13+
assets_dir: "./",
1314
browser: :chromium,
1415
browser_launch_timeout: 10_000,
1516
trace: System.get_env("PW_TRACE", "false") in ~w(t true)

‎demo/mix.exs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ defmodule Demo.MixProject do
4545
{:smokestack, "~> 0.9.2"},
4646
{:faker, "~> 0.18"},
4747
{:phoenix_test, "~> 0.8.0", only: :test, runtime: false},
48-
{:phoenix_test_playwright, "~> 0.7.0", only: :test, runtime: false},
48+
{:phoenix_test_playwright, "~> 0.8.0", only: :test, runtime: false},
4949
{:a11y_audit, "~> 0.2.3", only: :test},
5050
{:live_debugger, "~> 0.4", only: :dev},
5151
{:quokka, "~> 2.9", only: [:dev, :test], runtime: false},

‎demo/mix.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
6868
"phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},
6969
"phoenix_test": {:hex, :phoenix_test, "0.8.1", "9cf192e8ec696fd2391090ef095c78a01210a53b5ee9e87d184f9d87ead0af65", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:lazy_html, "~> 0.1.7", [hex: :lazy_html, repo: "hexpm", optional: false]}, {:mime, ">= 1.0.0", [hex: :mime, repo: "hexpm", optional: true]}, {:phoenix, ">= 1.7.10", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "013cc3cd2f0a03876adc83e4b69f61d7a7ca67e39b4f22449cca63c2e2758dbd"},
70-
"phoenix_test_playwright": {:hex, :phoenix_test_playwright, "0.7.1", "20992d444992f94e5b824d388cb9d849c6e42246a7568b604f8df40854b9e17d", [:mix], [{:ecto_sql, "~> 3.10", [hex: :ecto_sql, repo: "hexpm", optional: true]}, {:nimble_options, "~> 1.1", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_ecto, "~> 4.5", [hex: :phoenix_ecto, repo: "hexpm", optional: true]}, {:phoenix_live_view, "~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_test, "~> 0.6", [hex: :phoenix_test, repo: "hexpm", optional: false]}], "hexpm", "90266ce5b5d72a244e9a3bd00462e2450fcb0499f683b2ea0e59223e586fb6de"},
70+
"phoenix_test_playwright": {:hex, :phoenix_test_playwright, "0.8.0", "e2e0d21b95a99d236ea5db679e05c071c499298f8f63a949f01ff3b744a03bd3", [:mix], [{:ecto_sql, "~> 3.10", [hex: :ecto_sql, repo: "hexpm", optional: true]}, {:nimble_options, "~> 1.1", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_ecto, "~> 4.5", [hex: :phoenix_ecto, repo: "hexpm", optional: true]}, {:phoenix_live_view, "~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_test, "~> 0.8", [hex: :phoenix_test, repo: "hexpm", optional: false]}], "hexpm", "c283d20e85d034d79bd9c4234aa24533fa40c2a9ae97744854436c128092309a"},
7171
"plug": {:hex, :plug, "1.18.1", "5067f26f7745b7e31bc3368bc1a2b818b9779faa959b49c934c17730efc911cf", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "57a57db70df2b422b564437d2d33cf8d33cd16339c1edb190cd11b1a3a546cc2"},
7272
"plug_crypto": {:hex, :plug_crypto, "2.1.1", "19bda8184399cb24afa10be734f84a16ea0a2bc65054e23a62bb10f06bc89491", [:mix], [], "hexpm", "6470bce6ffe41c8bd497612ffde1a7e4af67f36a15eea5f921af71cf3e11247c"},
7373
"postgrex": {:hex, :postgrex, "0.21.1", "2c5cc830ec11e7a0067dd4d623c049b3ef807e9507a424985b8dcf921224cd88", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "27d8d21c103c3cc68851b533ff99eef353e6a0ff98dc444ea751de43eb48bdac"},

‎demo/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
"gettext": "mix gettext.extract --merge"
2424
},
2525
"devDependencies": {
26-
"@sentry/browser": "10.13.0",
26+
"@sentry/browser": "10.15.0",
2727
"npm-run-all2": "8.0.4",
28-
"playwright": "1.55.0",
28+
"playwright": "1.55.1",
2929
"postcss": "8.5.6",
3030
"standard": "17.1.2",
3131
"stylelint": "16.24.0",
3232
"stylelint-config-standard": "39.0.0",
3333
"topbar": "3.0.0"
3434
},
3535
"dependencies": {
36-
"daisyui": "5.1.14"
36+
"daisyui": "5.1.22"
3737
}
3838
}

‎demo/yarn.lock‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -153,51 +153,51 @@
153153
resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
154154
integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
155155

156-
"@sentry-internal/browser-utils@10.12.0":
157-
version "10.12.0"
158-
resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-10.12.0.tgz#aa3a05653e530d2693e307c0131571ee8a97b60d"
159-
integrity sha512-dozbx389jhKynj0d657FsgbBVOar7pX3mb6GjqCxslXF0VKpZH2Xks0U32RgDY/nK27O+o095IWz7YvjVmPkDw==
156+
"@sentry-internal/browser-utils@10.15.0":
157+
version "10.15.0"
158+
resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-10.15.0.tgz#9aac3f19e1678729e8580c8c561a3364d05b0f0a"
159+
integrity sha512-hJxo6rj3cMqiYlZd6PC8o/i2FG6hRnZdHcJkfm1HXgWCRgdCPilKghL6WU+B2H5dLyRKJ17nWjDAVQPRdCxO9w==
160160
dependencies:
161-
"@sentry/core" "10.12.0"
161+
"@sentry/core" "10.15.0"
162162

163-
"@sentry-internal/feedback@10.12.0":
164-
version "10.12.0"
165-
resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-10.12.0.tgz#a48039507f37fe62e19566128a894661a724ef0d"
166-
integrity sha512-0+7ceO6yQPPqfxRc9ue/xoPHKcnB917ezPaehGQNfAFNQB9PNTG1y55+8mRu0Fw+ANbZeCt/HyoCmXuRdxmkpg==
163+
"@sentry-internal/feedback@10.15.0":
164+
version "10.15.0"
165+
resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-10.15.0.tgz#3c0bdea017969ffd35853509b6629db67d4e3992"
166+
integrity sha512-EP+NvdU9yfmepGzQwz0jnqhd0DBxHzrP16TsJIVXJe93QJ+gumdN3XQ0lvYtEC9zHuU08DghRLjfI1kLRfGzdQ==
167167
dependencies:
168-
"@sentry/core" "10.12.0"
168+
"@sentry/core" "10.15.0"
169169

170-
"@sentry-internal/replay-canvas@10.12.0":
171-
version "10.12.0"
172-
resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-10.12.0.tgz#f79dde92bcba67b4f706db6c217467e14d6348c5"
173-
integrity sha512-W/z1/+69i3INNfPjD1KuinSNaRQaApjzwb37IFmiyF440F93hxmEYgXHk3poOlYYaigl2JMYbysGPWOiXnqUXA==
170+
"@sentry-internal/replay-canvas@10.15.0":
171+
version "10.15.0"
172+
resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-10.15.0.tgz#60c937fd30e9b2fafe86d146a62251c2f22c3484"
173+
integrity sha512-SXgUWArk+haUJ24W6pIm9IiwmIk3WxeQyFUxFfMUetSRb06CVAoNjPb0YuzKIeuFYJb6hDPGQ9UWhShnQpTmkw==
174174
dependencies:
175-
"@sentry-internal/replay" "10.12.0"
176-
"@sentry/core" "10.12.0"
175+
"@sentry-internal/replay" "10.15.0"
176+
"@sentry/core" "10.15.0"
177177

178-
"@sentry-internal/replay@10.12.0":
179-
version "10.12.0"
180-
resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-10.12.0.tgz#47ca89acdc621217991c7ed1d133fd37915a512d"
181-
integrity sha512-/1093gSNGN5KlOBsuyAl33JkzGiG38kCnxswQLZWpPpR6LBbR1Ddb18HjhDpoQNNEZybJBgJC3a5NKl43C2TSQ==
178+
"@sentry-internal/replay@10.15.0":
179+
version "10.15.0"
180+
resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-10.15.0.tgz#bb2c5dc53f029dcdbae0ef6a721b5f2fc406f94a"
181+
integrity sha512-vHBAFVdDfa51oqPWyRCK4fOIFhFeE2mVlqBWrBb+S3vCNcmtpvqJUq6o4sjSYcQzdZQpMSp5/Lj8Y3a8x/ed7w==
182182
dependencies:
183-
"@sentry-internal/browser-utils" "10.12.0"
184-
"@sentry/core" "10.12.0"
183+
"@sentry-internal/browser-utils" "10.15.0"
184+
"@sentry/core" "10.15.0"
185185

186-
"@sentry/browser@10.12.0":
187-
version "10.12.0"
188-
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-10.12.0.tgz#79dffc88e1f9241b9fdb5def5a7c6809f41230b3"
189-
integrity sha512-lKyaB2NFmr7SxPjmMTLLhQ7xfxaY3kdkMhpzuRI5qwOngtKt4+FtvNYHRuz+PTtEFv4OaHhNNbRn6r91gWguQg==
186+
"@sentry/browser@10.15.0":
187+
version "10.15.0"
188+
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-10.15.0.tgz#962ea86cfb3af54414ac16b3eb7ef210a738f0fb"
189+
integrity sha512-YV42VgW7xdmY23u7+nQLNJXDVilNTP0d5WWkHDxeI/uD6AAvn3GyKjx1YMG/KCulxva3dPDPEUunzDm3al26Sw==
190190
dependencies:
191-
"@sentry-internal/browser-utils" "10.12.0"
192-
"@sentry-internal/feedback" "10.12.0"
193-
"@sentry-internal/replay" "10.12.0"
194-
"@sentry-internal/replay-canvas" "10.12.0"
195-
"@sentry/core" "10.12.0"
191+
"@sentry-internal/browser-utils" "10.15.0"
192+
"@sentry-internal/feedback" "10.15.0"
193+
"@sentry-internal/replay" "10.15.0"
194+
"@sentry-internal/replay-canvas" "10.15.0"
195+
"@sentry/core" "10.15.0"
196196

197-
"@sentry/core@10.12.0":
198-
version "10.12.0"
199-
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-10.12.0.tgz#3f6a0f5c2f63f2c1761e3cf442a986d74adf6403"
200-
integrity sha512-Jrf0Yo7DvmI/ZQcvBnA0xKNAFkJlVC/fMlvcin+5IrFNRcqOToZ2vtF+XqTgjRZymXQNE8s1QTD7IomPHk0TAw==
197+
"@sentry/core@10.15.0":
198+
version "10.15.0"
199+
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-10.15.0.tgz#9b445d0d8bba1742eb76c53edb01b38e05702b00"
200+
integrity sha512-J7WsQvb9G6nsVgWkTHwyX7wR2djtEACYCx19hAnRbSGIg+ysVG+7Ti3RL4bz9/VXfcxsz346cleKc7ljhynYlQ==
201201

202202
"@types/json5@^0.0.29":
203203
version "0.0.29"
@@ -515,10 +515,10 @@ cssesc@^3.0.0:
515515
resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
516516
integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
517517

518-
[email protected].14:
519-
version "5.1.14"
520-
resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-5.1.14.tgz#243d171059ecba70f022b9527f90707f9965fbc2"
521-
integrity sha512-c9Op7tB8vLzzazFaLeyFsmmVMLrU8sYo1sHuStBGTbaAzLVxrulelGQBROo/lS2ZxWm/CnCb9NWdKbTL+MaKFA==
518+
[email protected].22:
519+
version "5.1.22"
520+
resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-5.1.22.tgz#21e9e205a6e927bd9865876e8139995bf4bd624d"
521+
integrity sha512-d91C+d53QTZIqjzaoQRYId7KJcXHAImmgtIUWukv7ebMpnkzbJVe/istaW3GGtTIl6YxQD0WwUcyQLgtbfuQwg==
522522

523523
data-view-buffer@^1.0.2:
524524
version "1.0.2"
@@ -2025,17 +2025,17 @@ pkg-conf@^3.1.0:
20252025
find-up "^3.0.0"
20262026
load-json-file "^5.2.0"
20272027

2028-
[email protected].0:
2029-
version "1.55.0"
2030-
resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.55.0.tgz#ec8a9f8ef118afb3e86e0f46f1393e3bea32adf4"
2031-
integrity sha512-GvZs4vU3U5ro2nZpeiwyb0zuFaqb9sUiAJuyrWpcGouD8y9/HLgGbNRjIph7zU9D3hnPaisMl9zG9CgFi/biIg==
2028+
[email protected].1:
2029+
version "1.55.1"
2030+
resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.55.1.tgz#5d3bb1846bc4289d364ea1a9dcb33f14545802e9"
2031+
integrity sha512-Z6Mh9mkwX+zxSlHqdr5AOcJnfp+xUWLCt9uKV18fhzA8eyxUd8NUWzAjxUh55RZKSYwDGX0cfaySdhZJGMoJ+w==
20322032

2033-
[email protected].0:
2034-
version "1.55.0"
2035-
resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.55.0.tgz#7aca7ac3ffd9e083a8ad8b2514d6f9ba401cc78b"
2036-
integrity sha512-sdCWStblvV1YU909Xqx0DhOjPZE4/5lJsIS84IfN9dAZfcl/CIZ5O8l3o0j7hPMjDvqoTF8ZUcc+i/GL5erstA==
2033+
[email protected].1:
2034+
version "1.55.1"
2035+
resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.55.1.tgz#8a9954e9e61ed1ab479212af9be336888f8b3f0e"
2036+
integrity sha512-cJW4Xd/G3v5ovXtJJ52MAOclqeac9S/aGGgRzLabuF8TnIb6xHvMzKIa6JmrRzUkeXJgfL1MhukP0NK6l39h3A==
20372037
dependencies:
2038-
playwright-core "1.55.0"
2038+
playwright-core "1.55.1"
20392039
optionalDependencies:
20402040
fsevents "2.3.2"
20412041

0 commit comments

Comments
 (0)