Skip to content

Commit d869912

Browse files
committed
Merge remote-tracking branch 'github/main' into issue-watch/26420
2 parents 44dba53 + a185dd9 commit d869912

7 files changed

Lines changed: 79 additions & 41 deletions

File tree

‎apps/web/src/components/ui/alert-dialog.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ function AlertDialogFooter({
110110
function AlertDialogTitle({ className, ...props }: AlertDialogPrimitive.Title.Props) {
111111
return (
112112
<AlertDialogPrimitive.Title
113-
className={cn("wrap-anywhere shrink-0 font-semibold text-xl leading-none", className)}
113+
className={cn("wrap-anywhere shrink-0 font-semibold text-xl leading-snug", className)}
114114
data-slot="alert-dialog-title"
115115
{...props}
116116
/>

‎apps/web/src/components/ui/dialog.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ function DialogFooter({
169169
function DialogTitle({ className, ...props }: DialogPrimitive.Title.Props) {
170170
return (
171171
<DialogPrimitive.Title
172-
className={cn("wrap-anywhere font-semibold text-xl leading-none", className)}
172+
className={cn("wrap-anywhere font-semibold text-xl leading-snug", className)}
173173
data-slot="dialog-title"
174174
{...props}
175175
/>

‎apps/web/src/components/ui/sheet.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ function SheetHeader({ className, ...props }: React.ComponentProps<"div">) {
142142
function SheetTitle({ className, ...props }: SheetPrimitive.Title.Props) {
143143
return (
144144
<SheetPrimitive.Title
145-
className={cn("font-semibold text-xl leading-none", className)}
145+
className={cn("font-semibold text-xl leading-snug", className)}
146146
data-slot="sheet-title"
147147
{...props}
148148
/>

‎patches/@[email protected]‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff --git a/lib/Schema.js b/lib/Schema.js
2+
index c24265b3c23237d846c7b8ff249cb6c23452ec31..744c7bce4de464d472b183b3c9c25987b67b3a5e 100644
3+
--- a/lib/Schema.js
4+
+++ b/lib/Schema.js
5+
@@ -7,6 +7,7 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
6+
return path;
7+
};
8+
import * as crypto from "node:crypto";
9+
+import * as NodePath from "node:path";
10+
import * as Artifacts from "alchemy/Artifacts";
11+
import { isResolved } from "alchemy/Diff";
12+
import { Interaction } from "alchemy/Interaction";
13+
@@ -150,7 +151,9 @@ Effect.tryPromise({
14+
// A `drizzle-kit/cli` command as an Effect, failing on a thrown or reported error.
15+
const command = (name) => Effect.fn(`drizzleKit.${name}`)(function* (options) {
16+
const cli = yield* importModule("drizzle-kit/cli");
17+
- const result = yield* callDrizzleKit(name, () => cli[name](options));
18+
+ // drizzle-kit reads snapshots as `./${path}`, which breaks an absolute `out`.
19+
+ const kitOptions = { ...options, out: NodePath.relative(process.cwd(), options.out) || "." };
20+
+ const result = yield* callDrizzleKit(name, () => cli[name](kitOptions));
21+
if (result.status === "error") {
22+
return yield* new DrizzleKitFailed({ command: name, cause: result.error });
23+
}

‎patches/[email protected]‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/lib/Artifacts.js b/lib/Artifacts.js
2+
index 648209c089f984dc45bd5eba0788130c9813a1d6..c66b5433427498ced6c91ee7c371ad8295f6205a 100644
3+
--- a/lib/Artifacts.js
4+
+++ b/lib/Artifacts.js
5+
@@ -81,8 +81,8 @@ export const cached = (id) => (eff) => Effect.gen(function* () {
6+
return cached;
7+
}
8+
yield* artifacts.set(id, Deferred.await(deferred));
9+
- const result = yield* eff;
10+
- yield* Deferred.succeed(deferred, result);
11+
+ // Settle waiters on failure too, or every later caller hangs.
12+
+ const result = yield* eff.pipe(Effect.onExit((exit) => Deferred.done(deferred, exit)));
13+
yield* artifacts.set(id, result);
14+
return result;
15+
});

‎pnpm-lock.yaml‎

Lines changed: 34 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pnpm-workspace.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,10 @@ patchedDependencies:
409409
# Observe the owned host exit independently of descendants retaining its stdio.
410410
"@muse-code/[email protected]": patches/@[email protected]
411411
412+
# drizzle-kit fails on an absolute `out`: https://github.com/alchemy-run/alchemy/issues/2980
413+
"@alchemy.run/[email protected]": patches/@[email protected]
414+
# A failed Artifacts.cached effect hangs every later caller: https://github.com/alchemy-run/alchemy/issues/2981
415+
412416

413417
peerDependencyRules:
414418
allowAny:

0 commit comments

Comments
 (0)