Skip to content

Commit

Permalink
Merge branch 'main' into build-decofile
Browse files Browse the repository at this point in the history
  • Loading branch information
mcandeia authored Dec 2, 2024
2 parents 33c323b + 54d296b commit 49a9606
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions blocks/flag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,11 @@ const flagBlock: Block<BlockModule<FlagFunc>> = {
},
};
if (isMultivariate(flag)) {
const value = (flag?.variants ?? []).find((variant) =>
const value = ((flag?.variants ?? []).find((variant) =>
typeof variant?.rule === "function" && variant?.rule(ctx)
)?.value ?? (flag?.variants ?? [])[flag?.variants?.length - 1];
) as Variant<unknown>)?.value ??
((flag?.variants ?? [])[flag?.variants?.length - 1] as Variant<unknown>)
?.value;
return isDeferred(value) ? value() : value;
}
const matchValue = typeof flag?.matcher === "function"
Expand Down
2 changes: 1 addition & 1 deletion deno.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@deco/deco",
"version": "1.107.2-beta.3",
"version": "1.107.2",
"lock": false,
"exports": {
".": "./mod.ts",
Expand Down
2 changes: 1 addition & 1 deletion dev/deno.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@deco/dev",
"version": "1.107.2-beta.3",
"version": "1.107.2",
"exports": {
".": "./mod.ts",
"./tailwind": "./tailwind.ts"
Expand Down
2 changes: 1 addition & 1 deletion scripts/deno.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@deco/scripts",
"version": "1.107.2-beta.3",
"version": "1.107.2",
"exports": {
"./release": "./release.ts",
"./update": "./update.run.ts",
Expand Down

0 comments on commit 49a9606

Please sign in to comment.