-
+
-
diff --git a/apps/web/components/dashboard/header/ProcessingStatusIndicator.tsx b/apps/web/components/dashboard/header/ProcessingStatusIndicator.tsx
index 957d5ab9e..c2b94fea6 100644
--- a/apps/web/components/dashboard/header/ProcessingStatusIndicator.tsx
+++ b/apps/web/components/dashboard/header/ProcessingStatusIndicator.tsx
@@ -481,7 +481,7 @@ export default function ProcessingStatusIndicator() {
{extraSections}
-
);
}
diff --git a/apps/web/components/shared/sidebar/SidebarVersion.test.tsx b/apps/web/components/shared/sidebar/SidebarVersion.test.tsx
index 9843efbac..bf66c5dc2 100644
--- a/apps/web/components/shared/sidebar/SidebarVersion.test.tsx
+++ b/apps/web/components/shared/sidebar/SidebarVersion.test.tsx
@@ -1,7 +1,7 @@
// @vitest-environment jsdom
import React from "react";
-import { render } from "@testing-library/react";
+import { fireEvent, render } from "@testing-library/react";
import { beforeEach, describe, expect, it, vi } from "vitest";
import SidebarVersion from "./SidebarVersion";
@@ -11,6 +11,7 @@ const mocks = vi.hoisted(() => ({
appBuild: "aaaaaaa",
deployedBuild: "bbbbbbb" as string | null,
updateStatus: "ready" as "current" | "available" | "ready",
+ activateUpdate: vi.fn(),
},
}));
@@ -41,6 +42,7 @@ vi.mock("@/lib/i18n/client", () => ({
build: `Build ${values?.build ?? ""}`,
update_available: `Update available · ${values?.build ?? ""}`,
update_ready: `Update ready · ${values?.build ?? ""}`,
+ update_now: "Update now",
};
return translations[key] ?? key;
},
@@ -52,19 +54,27 @@ describe("SidebarVersion", () => {
mocks.lifecycle.appBuild = "aaaaaaa";
mocks.lifecycle.deployedBuild = "bbbbbbb";
mocks.lifecycle.updateStatus = "ready";
+ mocks.lifecycle.activateUpdate.mockReset();
});
it("shows the running app build and a ready deployed update", () => {
const { container } = render(
);
- expect(container.textContent).toContain("absolutepraya/marka");
expect(container.textContent).toContain("Build aaaaaaa");
- expect(container.textContent).toContain("Update ready · bbbbbbb");
+ expect(container.textContent).toContain("Update now");
+ expect(container.querySelector("button")).not.toBeNull();
+ fireEvent.click(container.querySelector("button")!);
+ expect(mocks.lifecycle.activateUpdate).toHaveBeenCalledOnce();
const buildLink = container.querySelector(
'a[href="https://github.com/absolutepraya/marka/commit/aaaaaaa"]',
);
expect(buildLink).not.toBeNull();
+ expect(
+ container.querySelector(
+ 'a[href="https://github.com/absolutepraya/marka"]',
+ ),
+ ).toBeNull();
});
it("shows an available update before its worker is ready", () => {
@@ -75,6 +85,7 @@ describe("SidebarVersion", () => {
expect(container.textContent).toContain("Build aaaaaaa");
expect(container.textContent).toContain("Update available · bbbbbbb");
expect(container.textContent).not.toContain("Update ready");
+ expect(container.querySelector("button")).toBeNull();
});
it("does not show an update line when the deployed build matches", () => {
@@ -86,6 +97,7 @@ describe("SidebarVersion", () => {
expect(container.textContent).toContain("Build aaaaaaa");
expect(container.textContent).not.toContain("Update available");
expect(container.textContent).not.toContain("Update ready");
+ expect(container.querySelector("button")).toBeNull();
});
it("renders a non-SHA build without a commit link", () => {
@@ -98,4 +110,15 @@ describe("SidebarVersion", () => {
expect(container.textContent).toContain("Build development");
expect(container.querySelector('a[href*="/commit/"]')).toBeNull();
});
+
+ it("keeps the profile build footer small and subdued", () => {
+ const { container } = render(
);
+
+ const buildLink = container.querySelector('a[href*="/commit/"]');
+ expect(buildLink?.className).toContain("text-xs");
+ expect(buildLink?.className).toContain("opacity-50");
+ expect(buildLink?.querySelector("svg")?.className.baseVal).toContain(
+ "size-3",
+ );
+ });
});
diff --git a/apps/web/components/shared/sidebar/SidebarVersion.tsx b/apps/web/components/shared/sidebar/SidebarVersion.tsx
index 36d19511b..90e34335b 100644
--- a/apps/web/components/shared/sidebar/SidebarVersion.tsx
+++ b/apps/web/components/shared/sidebar/SidebarVersion.tsx
@@ -4,7 +4,8 @@ import React from "react";
import Link from "next/link";
import { usePwaLifecycle } from "@/components/pwa/ServiceWorkerRegistration";
import { useTranslation } from "@/lib/i18n/client";
-import { GitBranch, Github } from "lucide-react";
+import { GitBranch, RefreshCw } from "lucide-react";
+import { Button } from "@/components/ui/button";
const FORK_REPO = "absolutepraya/marka";
const FORK_REPO_URL = `https://github.com/${FORK_REPO}`;
@@ -25,7 +26,8 @@ export default function SidebarVersion({
placement = "sidebar",
}: SidebarVersionProps) {
const { t } = useTranslation("profile_menu");
- const { appBuild, deployedBuild, updateStatus } = usePwaLifecycle();
+ const { appBuild, deployedBuild, updateStatus, activateUpdate } =
+ usePwaLifecycle();
const visibleBuild = displayBuild(appBuild);
const newerBuild =
deployedBuild && deployedBuild !== appBuild
@@ -33,45 +35,51 @@ export default function SidebarVersion({
: null;
const containerClassName =
placement === "profile"
- ? "flex min-w-0 flex-col gap-0.5 px-2 py-1 text-xs leading-tight"
- : "mt-auto flex min-w-0 flex-col gap-0.5 border-t pt-4 text-xs leading-tight";
+ ? "flex min-w-0 flex-col items-end gap-0.5 px-2 py-1 text-xs leading-tight"
+ : "flex min-w-0 flex-col gap-0.5 text-xs leading-tight";
+ const buildClassName =
+ placement === "profile"
+ ? "flex min-w-0 items-center gap-1 font-mono text-xs text-muted-foreground opacity-50 transition-colors hover:text-foreground"
+ : "flex min-w-0 items-center gap-1.5 font-mono text-muted-foreground transition-colors hover:text-foreground";
+ const buildIconClassName = placement === "profile" ? "size-3" : "size-3.5";
const buildLabel = t("build", { build: visibleBuild });
return (
-
-
- {FORK_REPO}
-
{isCommitSha(appBuild) ? (
-
+
{buildLabel}
) : (
-
-
+
+
{buildLabel}
)}
- {newerBuild && (
-
- {updateStatus === "ready"
- ? t("update_ready", { build: newerBuild })
- : t("update_available", { build: newerBuild })}
-
+ {newerBuild && updateStatus === "ready" ? (
+
+ ) : (
+ newerBuild && (
+
+ {t("update_available", { build: newerBuild })}
+
+ )
)}
);
diff --git a/apps/web/components/ui/avatar.tsx b/apps/web/components/ui/avatar.tsx
index 48ec676b0..e577940fe 100644
--- a/apps/web/components/ui/avatar.tsx
+++ b/apps/web/components/ui/avatar.tsx
@@ -25,7 +25,7 @@ const AvatarImage = React.forwardRef<
>(({ className, ...props }, ref) => (
));
diff --git a/apps/web/components/ui/dialog.test.ts b/apps/web/components/ui/dialog.test.ts
index 54e70610d..5977949a0 100644
--- a/apps/web/components/ui/dialog.test.ts
+++ b/apps/web/components/ui/dialog.test.ts
@@ -184,3 +184,28 @@ describe("revealFocusedTextEntry", () => {
expect(dialog.scrollTop).toBe(0);
});
});
+
+describe("DialogContent bottom sheets", () => {
+ it("marks bottom sheets for gesture-handle safe space", () => {
+ const view = render(
+ React.createElement(
+ Dialog,
+ { open: true },
+ React.createElement(
+ DialogContent,
+ { position: "bottom" },
+ React.createElement(DialogTitle, null, "Bottom sheet"),
+ React.createElement(
+ DialogDescription,
+ null,
+ "Bottom sheet description",
+ ),
+ ),
+ ),
+ );
+
+ expect(view.getByRole("dialog").className).toContain(
+ "dialog-vv-bottom-safe-area",
+ );
+ });
+});
diff --git a/apps/web/components/ui/dialog.tsx b/apps/web/components/ui/dialog.tsx
index 5bdf35702..ba8fc2086 100644
--- a/apps/web/components/ui/dialog.tsx
+++ b/apps/web/components/ui/dialog.tsx
@@ -295,7 +295,9 @@ const DialogContent = React.forwardRef<
{
await waitUntilQueueEmpty();
- expect(testState.results).toEqual([
- 200, 100, 300, 201, 101, 301, 102, 103,
+ const groupByValue = (value: number) =>
+ value >= 300 ? "C" : value >= 200 ? "B" : "A";
+ expect(testState.results.map(groupByValue)).toEqual([
+ "B",
+ "A",
+ "C",
+ "B",
+ "A",
+ "C",
+ "A",
+ "A",
+ ]);
+ expect(
+ testState.results.filter((value) => value >= 200 && value < 300).sort(),
+ ).toEqual([200, 201]);
+ expect(testState.results.filter((value) => value < 200).sort()).toEqual([
+ 100, 101, 102, 103,
+ ]);
+ expect(testState.results.filter((value) => value >= 300).sort()).toEqual([
+ 300, 301,
]);
}, 60000);
@@ -454,7 +472,9 @@ describe("Restate Queue Provider", () => {
await waitUntilQueueEmpty();
// Priority 0 (higher) should run before priority 1 (lower)
- expect(testState.results).toEqual([200, 201, 100, 101]);
+ expect(testState.results).toHaveLength(4);
+ expect(testState.results.slice(0, 2).sort()).toEqual([200, 201]);
+ expect(testState.results.slice(2).sort()).toEqual([100, 101]);
}, 60000);
it("should handle jobs without groupId", async () => {
diff --git a/scripts/dev-infra.sh b/scripts/dev-infra.sh
index ffcde824f..e38f8aeef 100644
--- a/scripts/dev-infra.sh
+++ b/scripts/dev-infra.sh
@@ -7,13 +7,21 @@ LEGACY_MEILI_CONTAINER="karakeep-dev-meilisearch"
LEGACY_CHROME_CONTAINER="karakeep-dev-chrome"
MEILI_VOLUME="marka-dev-meilisearch-data"
MEILI_PORT="7700"
-CHROME_PORT="9222"
+CHROME_PORT="${MARKA_DEV_CHROME_PORT:-9250}"
MEILI_IMAGE="getmeili/meilisearch:v1.41.0"
CHROME_IMAGE="ghcr.io/karakeep-app/karakeep-chrome:release"
+CHROME_CONTAINER_WAS_ADOPTED=false
info() { printf '==> %s\n' "$*"; }
die() { printf 'ERROR: %s\n' "$*" >&2; exit 1; }
+if ! [[ "$CHROME_PORT" =~ ^[0-9]+$ ]]; then
+ die "MARKA_DEV_CHROME_PORT must be between 1 and 65535."
+fi
+if ((10#$CHROME_PORT < 1 || 10#$CHROME_PORT > 65535)); then
+ die "MARKA_DEV_CHROME_PORT must be between 1 and 65535."
+fi
+
require_docker() {
command -v docker >/dev/null 2>&1 || die "Docker is not installed. Install Docker first."
docker info >/dev/null 2>&1 || die "Docker is installed but the current user cannot reach the Docker daemon. Start Docker and retry."
@@ -31,6 +39,9 @@ adopt_legacy_container() {
local legacy="$1" current="$2"
if container_exists "$legacy" && ! container_exists "$current"; then
docker rename "$legacy" "$current" >/dev/null || die "Failed to rename legacy $legacy container to $current."
+ if [[ "$legacy" == "$LEGACY_CHROME_CONTAINER" ]]; then
+ CHROME_CONTAINER_WAS_ADOPTED=true
+ fi
info "Renamed legacy $legacy container to $current"
fi
}
@@ -55,6 +66,10 @@ ensure_available_port() {
fi
}
+chrome_host_port() {
+ docker inspect -f '{{range $p, $bindings := .HostConfig.PortBindings}}{{if eq $p "9222/tcp"}}{{(index $bindings 0).HostPort}}{{end}}{{end}}' "$CHROME_CONTAINER" 2>/dev/null || true
+}
+
ensure_meilisearch() {
adopt_legacy_container "$LEGACY_MEILI_CONTAINER" "$MEILI_CONTAINER"
if container_exists "$MEILI_CONTAINER"; then
@@ -82,14 +97,27 @@ ensure_meilisearch() {
ensure_chrome() {
adopt_legacy_container "$LEGACY_CHROME_CONTAINER" "$CHROME_CONTAINER"
if container_exists "$CHROME_CONTAINER"; then
- if container_running "$CHROME_CONTAINER"; then
+ local existing_port
+ existing_port="$(chrome_host_port)"
+ if [[ "$existing_port" != "$CHROME_PORT" ]]; then
+ if [[ "$CHROME_CONTAINER_WAS_ADOPTED" != true ]]; then
+ die "Existing $CHROME_CONTAINER is mapped to host port ${existing_port:-unknown}, but port $CHROME_PORT is configured. Run pnpm dev:infra:down before changing MARKA_DEV_CHROME_PORT."
+ fi
+ info "Migrating legacy $CHROME_CONTAINER from host port ${existing_port:-unknown} to $CHROME_PORT"
+ docker rm -f "$CHROME_CONTAINER" >/dev/null || die "Failed to remove legacy $CHROME_CONTAINER container."
+ fi
+
+ if ! container_exists "$CHROME_CONTAINER"; then
+ :
+ elif container_running "$CHROME_CONTAINER"; then
info "Reusing shared Chrome on http://localhost:$CHROME_PORT"
return
+ else
+ ensure_available_port "$CHROME_PORT" "$CHROME_CONTAINER"
+ docker start "$CHROME_CONTAINER" >/dev/null || die "Failed to start existing $CHROME_CONTAINER container."
+ info "Started existing shared Chrome on http://localhost:$CHROME_PORT"
+ return
fi
- ensure_available_port "$CHROME_PORT" "$CHROME_CONTAINER"
- docker start "$CHROME_CONTAINER" >/dev/null || die "Failed to start existing $CHROME_CONTAINER container."
- info "Started existing shared Chrome on http://localhost:$CHROME_PORT"
- return
fi
ensure_available_port "$CHROME_PORT" "$CHROME_CONTAINER"
diff --git a/scripts/dev-infra.test.sh b/scripts/dev-infra.test.sh
index 7d2c19efb..ff55804b5 100644
--- a/scripts/dev-infra.test.sh
+++ b/scripts/dev-infra.test.sh
@@ -54,7 +54,11 @@ case "${1:-}" in
if [[ "${2:-}" == "-f" ]]; then
name="${4:-}"
[[ -f "$state_dir/$name" ]] || exit 1
- printf '%s\n' "$(cat "$state_dir/$name")"
+ if [[ "$3" == *"HostConfig.PortBindings"* || "$3" == *"9222/tcp"* ]]; then
+ printf '%s\n' "$(sed -n '2p' "$state_dir/$name")"
+ else
+ printf '%s\n' "$(head -n 1 "$state_dir/$name")"
+ fi
exit 0
fi
name="${2:-}"
@@ -63,7 +67,8 @@ case "${1:-}" in
start)
name="${2:?}"
[[ -f "$state_dir/$name" ]] || exit 1
- printf 'true\n' >"$state_dir/$name"
+ port="$(sed -n '2p' "$state_dir/$name")"
+ printf 'true\n%s\n' "$port" >"$state_dir/$name"
;;
run)
name=""
@@ -75,7 +80,15 @@ case "${1:-}" in
fi
done
[[ -n "$name" ]] || exit 2
- printf 'true\n' >"$state_dir/$name"
+ port=""
+ for ((i = 1; i < ${#args[@]}; i++)); do
+ if [[ "${args[$i]}" == "-p" ]]; then
+ port="${args[$((i + 1))]#*:}"
+ port="${port%%:*}"
+ break
+ fi
+ done
+ printf 'true\n%s\n' "$port" >"$state_dir/$name"
printf 'fake-container-id\n'
;;
rm)
@@ -129,17 +142,39 @@ for script in "$INFRA" "$SETUP_WORKTREE" "$START_DEV" "$STOP_DEV"; do
bash -n "$script"
done
+# Invalid Chrome ports are rejected before Docker startup.
+for invalid_port in 0 65536 abc; do
+ if MARKA_DEV_CHROME_PORT="$invalid_port" bash "$INFRA" up >"$root/invalid-$invalid_port.out" 2>&1; then
+ fail "Invalid Chrome port $invalid_port was accepted"
+ fi
+ assert_contains "$root/invalid-$invalid_port.out" "between 1 and 65535"
+done
+
# Shared infra starts exactly one stable Meilisearch and Chrome container.
bash "$INFRA" up >/dev/null
assert_contains "$FAKE_DOCKER_LOG" "marka-dev-meilisearch"
assert_contains "$FAKE_DOCKER_LOG" "127.0.0.1:7700:7700"
assert_contains "$FAKE_DOCKER_LOG" "getmeili/meilisearch:v1.41.0"
assert_contains "$FAKE_DOCKER_LOG" "marka-dev-chrome"
-assert_contains "$FAKE_DOCKER_LOG" "127.0.0.1:9222:9222"
+assert_contains "$FAKE_DOCKER_LOG" "127.0.0.1:9250:9222"
assert_contains "$FAKE_DOCKER_LOG" "ghcr.io/karakeep-app/karakeep-chrome:release"
+# A worktree can move Chrome to a different host port when another local
+# browser debugger owns the default port.
+bash "$INFRA" down >/dev/null
+: >"$FAKE_DOCKER_LOG"
+MARKA_DEV_CHROME_PORT=9251 bash "$INFRA" up >/dev/null
+assert_contains "$FAKE_DOCKER_LOG" "127.0.0.1:9251:9222"
+
+# Changing the configured port without explicitly recreating shared Chrome
+# fails instead of reporting an endpoint that does not match Docker.
+if MARKA_DEV_CHROME_PORT=9252 bash "$INFRA" up >"$root/mismatch.out" 2>&1; then
+ fail "Shared infra unexpectedly reused Chrome with a mismatched port mapping"
+fi
+assert_contains "$root/mismatch.out" "mapped to host port 9251"
+
first_run_count="$(grep -c '^run ' "$FAKE_DOCKER_LOG" || true)"
-bash "$INFRA" up >/dev/null
+MARKA_DEV_CHROME_PORT=9251 bash "$INFRA" up >/dev/null
second_run_count="$(grep -c '^run ' "$FAKE_DOCKER_LOG" || true)"
[[ "$first_run_count" == "$second_run_count" ]] || fail "Repeated infra up created duplicate containers"
@@ -154,10 +189,12 @@ assert_contains "$root/foreign.out" "Port 7700 is already in use"
# Existing pre-Marka containers are adopted without treating their ports as foreign.
: >"$FAKE_DOCKER_LOG"
printf 'true\n' >"$state_dir/karakeep-dev-meilisearch"
-printf 'true\n' >"$state_dir/karakeep-dev-chrome"
+printf 'true\n9222\n' >"$state_dir/karakeep-dev-chrome"
bash "$INFRA" up >/dev/null
assert_contains "$FAKE_DOCKER_LOG" "rename karakeep-dev-meilisearch marka-dev-meilisearch"
assert_contains "$FAKE_DOCKER_LOG" "rename karakeep-dev-chrome marka-dev-chrome"
+assert_contains "$FAKE_DOCKER_LOG" "rm -f marka-dev-chrome"
+assert_contains "$FAKE_DOCKER_LOG" "127.0.0.1:9250:9222"
[[ -e "$state_dir/marka-dev-meilisearch" ]] || fail "Meilisearch state was not renamed"
[[ -e "$state_dir/marka-dev-chrome" ]] || fail "Chrome state was not renamed"
[[ ! -e "$state_dir/karakeep-dev-meilisearch" ]] || fail "Legacy Meilisearch state remains"
@@ -179,16 +216,31 @@ BROWSERLESS_URL=https://old-browserless.example
BROWSERLESS_TOKEN=old-browserless-secret
BROWSER_CONNECT_ONDEMAND=true
EOF_ROOT_ENV
+
+for invalid_port in 0 65536 abc; do
+ if MARKA_DEV_CHROME_PORT="$invalid_port" \
+ WT_ROOT_PATH="$main_root" \
+ WT_WORKSPACE_PATH="$workspace" \
+ WT_WORKSPACE_NAME='InvalidPort' \
+ WT_PORT_BASE=7 \
+ "$SETUP_WORKTREE" >"$root/setup-invalid-$invalid_port.out" 2>&1; then
+ fail "Worktree setup accepted invalid Chrome port $invalid_port"
+ fi
+ assert_contains "$root/setup-invalid-$invalid_port.out" "between 1 and 65535"
+done
+
WT_ROOT_PATH="$main_root" \
WT_WORKSPACE_PATH="$workspace" \
WT_WORKSPACE_NAME='Issue/ABC.weird' \
WT_PORT_BASE=7 \
+MARKA_DEV_CHROME_PORT=9250 \
"$SETUP_WORKTREE" >/dev/null
assert_contains "$workspace/.env" "KARAKEEP_PORT=3007"
assert_contains "$workspace/.env" "DATA_DIR=$workspace/.data/local"
assert_contains "$workspace/.env" "MEILI_ADDR=http://localhost:7700"
assert_contains "$workspace/.env" "MEILI_MASTER_KEY="
-assert_contains "$workspace/.env" "BROWSER_WEB_URL=http://localhost:9222"
+assert_contains "$workspace/.env" "BROWSER_WEB_URL=http://localhost:9250"
+assert_contains "$workspace/.env" "MARKA_DEV_CHROME_PORT=9250"
assert_contains "$workspace/.env" "BROWSER_CONNECT_ONDEMAND=false"
assert_contains "$workspace/.env" "MEILI_INDEX_PREFIX=issue-abc-weird-7_"
assert_not_contains "$workspace/.env" "MEILI_INDEX_PREFIX=issue-abc.weird-7_"
diff --git a/scripts/setup-worktree.sh b/scripts/setup-worktree.sh
index ceda1c26a..44caf8315 100755
--- a/scripts/setup-worktree.sh
+++ b/scripts/setup-worktree.sh
@@ -11,6 +11,7 @@ workspace_data_dir="$WT_WORKSPACE_PATH/.data/local"
refresh_data="${WT_REFRESH_DATA:-false}"
data_source="${WT_DATA_SOURCE:-main}"
workspace_name="${WT_WORKSPACE_NAME:-$(basename "$WT_WORKSPACE_PATH")}"
+chrome_port="${MARKA_DEV_CHROME_PORT:-9250}"
[[ -f "$root_env" ]] || {
echo "error: missing root environment file: $root_env" >&2
@@ -24,6 +25,15 @@ case "$WT_PORT_BASE" in
;;
esac
+if ! [[ "$chrome_port" =~ ^[0-9]+$ ]]; then
+ echo "error: MARKA_DEV_CHROME_PORT must be between 1 and 65535" >&2
+ exit 1
+fi
+if ((10#$chrome_port < 1 || 10#$chrome_port > 65535)); then
+ echo "error: MARKA_DEV_CHROME_PORT must be between 1 and 65535" >&2
+ exit 1
+fi
+
workspace_slug="$(printf '%s' "$workspace_name" | tr '[:upper:]' '[:lower:]' | tr -cs '[:alnum:]_-' '-' | sed 's/^-*//; s/-*$//')"
[[ -n "$workspace_slug" ]] || workspace_slug="worktree"
web_port=$((3000 + WT_PORT_BASE))
@@ -33,7 +43,7 @@ trap 'rm -f "$tmp_env"' EXIT
while IFS= read -r line || [[ -n "$line" ]]; do
case "$line" in
- DATA_DIR=* | KARAKEEP_PORT=* | API_URL=* | NEXTAUTH_URL=* | MEILI_ADDR=* | MEILI_MASTER_KEY=* | MEILI_VECTOR_ADDR=* | MEILI_VECTOR_MASTER_KEY=* | MEILI_INDEX_PREFIX=* | BROWSER_WEB_URL=* | BROWSER_WEBSOCKET_URL=* | BROWSERLESS_URL=* | BROWSERLESS_TOKEN=* | BROWSER_CONNECT_ONDEMAND=*)
+ DATA_DIR=* | KARAKEEP_PORT=* | API_URL=* | NEXTAUTH_URL=* | MEILI_ADDR=* | MEILI_MASTER_KEY=* | MEILI_VECTOR_ADDR=* | MEILI_VECTOR_MASTER_KEY=* | MEILI_INDEX_PREFIX=* | BROWSER_WEB_URL=* | BROWSER_WEBSOCKET_URL=* | BROWSERLESS_URL=* | BROWSERLESS_TOKEN=* | BROWSER_CONNECT_ONDEMAND=* | MARKA_DEV_CHROME_PORT=*)
;;
*)
printf '%s\n' "$line" >>"$tmp_env"
@@ -49,7 +59,8 @@ NEXTAUTH_URL=http://localhost:$web_port
MEILI_ADDR=http://localhost:7700
MEILI_MASTER_KEY=
MEILI_INDEX_PREFIX=$meili_index_prefix
-BROWSER_WEB_URL=http://localhost:9222
+BROWSER_WEB_URL=http://localhost:$chrome_port
+MARKA_DEV_CHROME_PORT=$chrome_port
BROWSER_CONNECT_ONDEMAND=false
ENV
@@ -90,4 +101,4 @@ case "$data_source" in
;;
esac
-echo "Configured worktree: web $web_port, shared Meilisearch 7700, shared Chrome 9222, Meilisearch prefix $meili_index_prefix"
+echo "Configured worktree: web $web_port, shared Meilisearch 7700, shared Chrome $chrome_port, Meilisearch prefix $meili_index_prefix"
diff --git a/start-dev.sh b/start-dev.sh
index c373ec877..ec3139d89 100755
--- a/start-dev.sh
+++ b/start-dev.sh
@@ -55,13 +55,20 @@ esac
MEILI_ADDR="${MEILI_ADDR:-$(env_value MEILI_ADDR)}"
MEILI_ADDR="${MEILI_ADDR:-http://localhost:7700}"
+MARKA_DEV_CHROME_PORT="${MARKA_DEV_CHROME_PORT:-$(env_value MARKA_DEV_CHROME_PORT)}"
BROWSER_WEB_URL="${BROWSER_WEB_URL:-$(env_value BROWSER_WEB_URL)}"
-BROWSER_WEB_URL="${BROWSER_WEB_URL:-http://localhost:9222}"
+if [ -z "$BROWSER_WEB_URL" ]; then
+ BROWSER_WEB_URL="http://localhost:${MARKA_DEV_CHROME_PORT:-9250}"
+fi
+if [ -z "$MARKA_DEV_CHROME_PORT" ]; then
+ MARKA_DEV_CHROME_PORT="${BROWSER_WEB_URL##*:}"
+ MARKA_DEV_CHROME_PORT="${MARKA_DEV_CHROME_PORT%%/*}"
+fi
MEILI_INDEX_PREFIX="${MEILI_INDEX_PREFIX:-$(env_value MEILI_INDEX_PREFIX)}"
MEILI_INDEX_PREFIX="${MEILI_INDEX_PREFIX:-main_}"
unset MEILI_VECTOR_ADDR MEILI_VECTOR_MASTER_KEY
unset BROWSER_WEBSOCKET_URL BROWSERLESS_URL BROWSERLESS_TOKEN
-export MEILI_ADDR BROWSER_WEB_URL MEILI_INDEX_PREFIX
+export MEILI_ADDR BROWSER_WEB_URL MARKA_DEV_CHROME_PORT MEILI_INDEX_PREFIX
export BROWSER_CONNECT_ONDEMAND=false
bash "$SCRIPT_DIR/scripts/dev-infra.sh" up