From d73938aaff9e8d529da6dba3027ac61895c07d95 Mon Sep 17 00:00:00 2001 From: Taku Kodma <79110363+risu729@users.noreply.github.com> Date: Thu, 28 May 2026 05:39:16 +1000 Subject: [PATCH 1/6] chore: use aube for root dependencies --- .vscode/settings.json | 1 + aube-lock.yaml | 59 +++++++++++++++++++++++++++++++++++++++++++ bun.lock | 26 ------------------- bunfig.toml | 5 ---- lychee.toml | 2 +- mise.toml | 6 ++--- 6 files changed, 64 insertions(+), 35 deletions(-) create mode 100644 aube-lock.yaml delete mode 100644 bun.lock delete mode 100644 bunfig.toml diff --git a/.vscode/settings.json b/.vscode/settings.json index 8935f8563..702e51e53 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -35,6 +35,7 @@ "files.readonlyInclude": { // auto-generated "**/.gitignore": true, + "**/aube-lock.yaml": true, "**/bun.lock": true }, diff --git a/aube-lock.yaml b/aube-lock.yaml new file mode 100644 index 000000000..244a94307 --- /dev/null +++ b/aube-lock.yaml @@ -0,0 +1,59 @@ +lockfileVersion: '9.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +importers: + + .: + devDependencies: + '@risu729/tsconfigs': + specifier: 3.0.0 + version: 3.0.0 + '@types/bun': + specifier: 1.3.14 + version: 1.3.14 + +packages: + + '@risu729/tsconfigs@3.0.0': + resolution: {integrity: sha512-FAYLBHC4KQ9TPSksm2Q8blZPSI08bedKOEE9dMbhbcQmj1I54ZPzqz4i8gqINQubcp4gkLE8kFeX5ZXudVl/9Q==} + peerDependencies: + typescript: ^6.0.0 + + '@types/bun@1.3.14': + resolution: {integrity: sha512-h1hFqFVcvAvD9j9K7ZW7vd82aSA+rTdznZa+5bwvCwqSB1jmmfLcbIWhOLx1/+boy/xmjgCs/OMUL8hRJSmnPw==} + + '@types/node@25.8.0': + resolution: {integrity: sha512-TCFSk8IZh+iLX1xtksoBVtdmgL+1IX0fC9BeU4QqFSuNdN/K+HUlhqOzEmSYYpZUVsLYcPqc9KX+60iDuninSQ==} + + bun-types@1.3.14: + resolution: {integrity: sha512-4N0ig0fEomHt5R0KCFWjovxow98rIoRwKolrYdCcknNwMekCXRnWEUvgu5soYV8QXtVsrUD8B95MBOZGPvr6KQ==} + + typescript@6.0.3: + resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==} + hasBin: true + + undici-types@7.24.6: + resolution: {integrity: sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==} + +snapshots: + + '@risu729/tsconfigs@3.0.0': {} + + '@types/bun@1.3.14': + dependencies: + bun-types: 1.3.14 + + '@types/node@25.8.0': + dependencies: + undici-types: 7.24.6 + + bun-types@1.3.14: + dependencies: + '@types/node': 25.8.0 + + typescript@6.0.3: {} + + undici-types@7.24.6: {} diff --git a/bun.lock b/bun.lock deleted file mode 100644 index 7ae5e326c..000000000 --- a/bun.lock +++ /dev/null @@ -1,26 +0,0 @@ -{ - "lockfileVersion": 1, - "configVersion": 1, - "workspaces": { - "": { - "name": "@risu729/dotfiles", - "devDependencies": { - "@risu729/tsconfigs": "3.0.0", - "@types/bun": "1.3.14", - }, - }, - }, - "packages": { - "@risu729/tsconfigs": ["@risu729/tsconfigs@3.0.0", "", { "peerDependencies": { "typescript": "^6.0.0" } }, "sha512-FAYLBHC4KQ9TPSksm2Q8blZPSI08bedKOEE9dMbhbcQmj1I54ZPzqz4i8gqINQubcp4gkLE8kFeX5ZXudVl/9Q=="], - - "@types/bun": ["@types/bun@1.3.14", "", { "dependencies": { "bun-types": "1.3.14" } }, "sha512-h1hFqFVcvAvD9j9K7ZW7vd82aSA+rTdznZa+5bwvCwqSB1jmmfLcbIWhOLx1/+boy/xmjgCs/OMUL8hRJSmnPw=="], - - "@types/node": ["@types/node@25.8.0", "", { "dependencies": { "undici-types": ">=7.24.0 <7.24.7" } }, "sha512-TCFSk8IZh+iLX1xtksoBVtdmgL+1IX0fC9BeU4QqFSuNdN/K+HUlhqOzEmSYYpZUVsLYcPqc9KX+60iDuninSQ=="], - - "bun-types": ["bun-types@1.3.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-4N0ig0fEomHt5R0KCFWjovxow98rIoRwKolrYdCcknNwMekCXRnWEUvgu5soYV8QXtVsrUD8B95MBOZGPvr6KQ=="], - - "typescript": ["typescript@6.0.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw=="], - - "undici-types": ["undici-types@7.24.6", "", {}, "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg=="], - } -} diff --git a/bunfig.toml b/bunfig.toml deleted file mode 100644 index 392891abe..000000000 --- a/bunfig.toml +++ /dev/null @@ -1,5 +0,0 @@ -# ref: https://bun.sh/docs/runtime/bunfig - -[install] -exact = true -auto = "disable" diff --git a/lychee.toml b/lychee.toml index 76965acd1..5d4f645e0 100644 --- a/lychee.toml +++ b/lychee.toml @@ -22,7 +22,7 @@ exclude_path = [ ".lycheecache", # ignore autogenerated files ".gitignore", "wsl/home/.config/git/.gitignore", - "bun.lock", + "aube-lock.yaml", "worker/bun.lock", # ignore binaries "win/powertoys", diff --git a/mise.toml b/mise.toml index 0b4c7b1f9..a895b4dbb 100644 --- a/mise.toml +++ b/mise.toml @@ -43,11 +43,11 @@ experimental = true [settings.npm] package_manager = "aube" -[deps.bun] +[deps.aube] auto = true -sources = ["package.json", "bun.lock"] +sources = ["package.json", "aube-lock.yaml"] outputs = ["node_modules"] -run = "bun install --frozen-lockfile" +run = "aube install --frozen-lockfile" [deps.bun-worker] auto = true From 31db1edecb43f16693c06f65841bc777eeb5c351 Mon Sep 17 00:00:00 2001 From: Taku Kodma <79110363+risu729@users.noreply.github.com> Date: Thu, 28 May 2026 05:43:56 +1000 Subject: [PATCH 2/6] fix: skip root aube install without lockfile --- mise.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mise.toml b/mise.toml index a895b4dbb..085417573 100644 --- a/mise.toml +++ b/mise.toml @@ -47,7 +47,11 @@ package_manager = "aube" auto = true sources = ["package.json", "aube-lock.yaml"] outputs = ["node_modules"] -run = "aube install --frozen-lockfile" +run = """ +if [ -f aube-lock.yaml ]; then + aube install --frozen-lockfile +fi +""" [deps.bun-worker] auto = true From 6061a6eb1624da8d14a7c8392b8b621418b0dc07 Mon Sep 17 00:00:00 2001 From: Taku Kodma <79110363+risu729@users.noreply.github.com> Date: Thu, 28 May 2026 05:46:15 +1000 Subject: [PATCH 3/6] fix: add root typescript dependency --- aube-lock.yaml | 9 +++++++-- package.json | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/aube-lock.yaml b/aube-lock.yaml index 244a94307..8cac04b18 100644 --- a/aube-lock.yaml +++ b/aube-lock.yaml @@ -10,10 +10,13 @@ importers: devDependencies: '@risu729/tsconfigs': specifier: 3.0.0 - version: 3.0.0 + version: 3.0.0(typescript@6.0.3) '@types/bun': specifier: 1.3.14 version: 1.3.14 + typescript: + specifier: 6.0.3 + version: 6.0.3 packages: @@ -40,7 +43,9 @@ packages: snapshots: - '@risu729/tsconfigs@3.0.0': {} + '@risu729/tsconfigs@3.0.0(typescript@6.0.3)': + dependencies: + typescript: 6.0.3 '@types/bun@1.3.14': dependencies: diff --git a/package.json b/package.json index 11a44b9f9..862da0b10 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "name": "@risu729/dotfiles", "devDependencies": { "@risu729/tsconfigs": "3.0.0", - "@types/bun": "1.3.14" + "@types/bun": "1.3.14", + "typescript": "6.0.3" } } From c73c6fb16006ad098f3eca00e500e70cd0e17698 Mon Sep 17 00:00:00 2001 From: Taku Kodma <79110363+risu729@users.noreply.github.com> Date: Thu, 28 May 2026 05:50:07 +1000 Subject: [PATCH 4/6] fix: keep worker preview bun-only --- mise.toml | 2 +- worker/docker/entrypoint.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mise.toml b/mise.toml index 085417573..1424ab2ad 100644 --- a/mise.toml +++ b/mise.toml @@ -48,7 +48,7 @@ auto = true sources = ["package.json", "aube-lock.yaml"] outputs = ["node_modules"] run = """ -if [ -f aube-lock.yaml ]; then +if [ "${DOTFILES_SKIP_ROOT_AUBE_INSTALL:-}" != "1" ]; then aube install --frozen-lockfile fi """ diff --git a/worker/docker/entrypoint.sh b/worker/docker/entrypoint.sh index a8ce583b7..ebd911512 100644 --- a/worker/docker/entrypoint.sh +++ b/worker/docker/entrypoint.sh @@ -56,5 +56,7 @@ echo "==> Successfully sparse-cloned and checked out commit ${GIT_COMMIT_SHA}." sed --in-place '/^min_version/d' mise.toml echo "==> Removed min_version from mise.toml." +# Worker preview should only install worker dependencies with Bun. +export DOTFILES_SKIP_ROOT_AUBE_INSTALL=1 # --host required to be accessible from other containers exec /bin/bash -c "mise run worker:preview --host" From 5e7570ddc2124518e5cab0790c1c11a7445cfad0 Mon Sep 17 00:00:00 2001 From: Taku Kodma <79110363+risu729@users.noreply.github.com> Date: Thu, 28 May 2026 06:03:05 +1000 Subject: [PATCH 5/6] chore: remove ts --- aube-lock.yaml | 7 ++++--- package.json | 13 ++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/aube-lock.yaml b/aube-lock.yaml index 8cac04b18..bd633c504 100644 --- a/aube-lock.yaml +++ b/aube-lock.yaml @@ -7,6 +7,10 @@ settings: importers: .: + dependencies: + typescript: + specifier: ^6.0.0 + version: 6.0.3 devDependencies: '@risu729/tsconfigs': specifier: 3.0.0 @@ -14,9 +18,6 @@ importers: '@types/bun': specifier: 1.3.14 version: 1.3.14 - typescript: - specifier: 6.0.3 - version: 6.0.3 packages: diff --git a/package.json b/package.json index 862da0b10..2a8795712 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,8 @@ { - "$schema": "https://json.schemastore.org/package.json", - "name": "@risu729/dotfiles", - "devDependencies": { - "@risu729/tsconfigs": "3.0.0", - "@types/bun": "1.3.14", - "typescript": "6.0.3" - } + "$schema": "https://json.schemastore.org/package.json", + "name": "@risu729/dotfiles", + "devDependencies": { + "@risu729/tsconfigs": "3.0.0", + "@types/bun": "1.3.14" + } } From d6aea151c1f65ae1fcf91452bc5252d1c161777f Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Wed, 27 May 2026 20:04:24 +0000 Subject: [PATCH 6/6] style: apply automated fixes --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 2a8795712..11a44b9f9 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "$schema": "https://json.schemastore.org/package.json", - "name": "@risu729/dotfiles", - "devDependencies": { - "@risu729/tsconfigs": "3.0.0", - "@types/bun": "1.3.14" - } + "$schema": "https://json.schemastore.org/package.json", + "name": "@risu729/dotfiles", + "devDependencies": { + "@risu729/tsconfigs": "3.0.0", + "@types/bun": "1.3.14" + } }