Skip to content

Commit

Permalink
Merge branch 'main' into renovate/all-minor-patch
Browse files Browse the repository at this point in the history
  • Loading branch information
shuuji3 authored Feb 3, 2025
2 parents 26e6ffa + 76bf8cf commit 451efaf
Show file tree
Hide file tree
Showing 4 changed files with 423 additions and 634 deletions.
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ WORKDIR /elk
FROM base AS builder

# Prepare pnpm https://pnpm.io/installation#using-corepack
RUN corepack enable
# workaround for npm registry key change
# ref. `[email protected]` / `[email protected]` cannot be installed due to key id mismatch · Issue #612 · nodejs/corepack
# - https://github.com/nodejs/corepack/issues/612#issuecomment-2629496091
RUN npm i -g corepack@latest && corepack enable

# Prepare deps
RUN apk update
Expand Down
2 changes: 1 addition & 1 deletion composables/masto/status.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export function useStatusActions(props: StatusActionsProps) {
if (isCancel && countField && prevCount === newStatus[countField])
newStatus[countField] -= 1

Object.assign(status, newStatus)
Object.assign(status.value, newStatus)
cacheStatus(newStatus, undefined, true)
}).finally(() => {
isLoading.value[action] = false
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@
"page-lifecycle": "^0.1.2",
"pinia": "^2.2.6",
"postcss-nested": "^7.0.0",
"prosemirror-highlight": "^0.11.0",
"prosemirror-highlight": "^0.12.0",
"rollup-plugin-node-polyfills": "^0.2.1",
"shiki": "^1.22.2",
"simple-git": "^3.19.1",
"slimeform": "^0.10.0",
"stale-dep": "^0.7.0",
"stale-dep": "^0.8.0",
"std-env": "^3.7.0",
"string-length": "^5.0.1",
"tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log",
Expand All @@ -115,8 +115,8 @@
},
"devDependencies": {
"@antfu/eslint-config": "^3.14.0",
"@antfu/ni": "^0.23.2",
"@types/chroma-js": "^2.4.5",
"@antfu/ni": "^23.3.1",
"@types/chroma-js": "^3.1.1",
"@types/file-saver": "^2.0.7",
"@types/fnando__sparkline": "^0.3.7",
"@types/fs-extra": "^11.0.4",
Expand All @@ -126,7 +126,7 @@
"@unlazy/nuxt": "^0.12.1",
"@unocss/eslint-config": "^65.4.3",
"@vue/test-utils": "2.4.6",
"bumpp": "^9.10.2",
"bumpp": "^10.0.1",
"consola": "^3.4.0",
"eslint": "^9.18.0",
"eslint-plugin-format": "^1.0.1",
Expand All @@ -140,7 +140,7 @@
"simple-git-hooks": "^2.11.1",
"tsx": "^4.19.2",
"typescript": "^5.4.4",
"vitest": "2.1.8",
"vitest": "3.0.4",
"vue-tsc": "^2.1.6"
},
"pnpm": {
Expand All @@ -151,7 +151,7 @@
"resolutions": {
"nuxt-component-meta": "0.10.0",
"unstorage": "^1.14.4",
"vitest": "2.1.8",
"vitest": "3.0.4",
"vue": "^3.5.4"
},
"simple-git-hooks": {
Expand Down
Loading

0 comments on commit 451efaf

Please sign in to comment.