diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e5979b41b..265c07bac 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v5.0.0 + rev: v6.0.0 hooks: - id: check-yaml exclude: "mkdocs.yml" @@ -12,7 +12,7 @@ repos: exclude: ^tests/data/ - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.12.7 + rev: v0.12.8 hooks: - id: ruff - id: ruff-format diff --git a/Taskfile.yml b/Taskfile.yml index c54c075db..5352a3ca3 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -71,6 +71,7 @@ tasks: desc: run code generators cmds: - poetry run python dev/code-generation/main.py {{ .CLI_ARGS }} + - task: docs:gen - task: py:format dev:services: diff --git a/dev/code-generation/gen_ts_types.py b/dev/code-generation/gen_ts_types.py index 408262f25..8a8932299 100644 --- a/dev/code-generation/gen_ts_types.py +++ b/dev/code-generation/gen_ts_types.py @@ -8,8 +8,8 @@ from utils import log # ============================================================ template = """// This Code is auto generated by gen_ts_types.py -{% for name in global %}import {{ name }} from "@/components/global/{{ name }}.vue"; -{% endfor %}{% for name in layout %}import {{ name }} from "@/components/layout/{{ name }}.vue"; +{% for name in global %}import type {{ name }} from "@/components/global/{{ name }}.vue"; +{% endfor %}{% for name in layout %}import type {{ name }} from "@/components/layout/{{ name }}.vue"; {% endfor %} declare module "vue" { export interface GlobalComponents { diff --git a/docker/Dockerfile b/docker/Dockerfile index e745a574d..b859a2610 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,8 @@ ############################################### # Frontend Build ############################################### -FROM node:20 AS frontend-builder +FROM node:20@sha256:572a90df10a58ebb7d3f223d661d964a6c2383a9c2b5763162b4f631c53dc56a \ + AS frontend-builder WORKDIR /frontend @@ -20,7 +21,8 @@ RUN yarn generate ############################################### # Base Image - Python ############################################### -FROM python:3.12-slim AS python-base +FROM python:3.12-slim@sha256:2267adc248a477c1f1a852a07a5a224d42abe54c28aafa572efa157dfb001bba \ + AS python-base ENV MEALIE_HOME="/app" @@ -132,7 +134,7 @@ RUN apt-get update \ gosu \ iproute2 \ libldap-common \ - libldap-2.5 \ + libldap2 \ && rm -rf /var/lib/apt/lists/* # create directory used for Docker Secrets diff --git a/docs/docs/overrides/api.html b/docs/docs/overrides/api.html index 64a6e5cf4..0dc543851 100644 --- a/docs/docs/overrides/api.html +++ b/docs/docs/overrides/api.html @@ -14,7 +14,7 @@
diff --git a/frontend/components/Domain/Cookbook/CookbookPage.vue b/frontend/components/Domain/Cookbook/CookbookPage.vue index a8cff6753..2267276cc 100644 --- a/frontend/components/Domain/Cookbook/CookbookPage.vue +++ b/frontend/components/Domain/Cookbook/CookbookPage.vue @@ -70,7 +70,7 @@ import RecipeCardSection from "@/components/Domain/Recipe/RecipeCardSection.vue" import { useCookbookStore } from "~/composables/store/use-cookbook-store"; import { useCookbook } from "~/composables/use-group-cookbooks"; import { useLoggedInState } from "~/composables/use-logged-in-state"; -import type { RecipeCookBook } from "~/lib/api/types/cookbook"; +import type { ReadCookBook } from "~/lib/api/types/cookbook"; import CookbookEditor from "~/components/Domain/Cookbook/CookbookEditor.vue"; const $auth = useMealieAuth(); @@ -100,7 +100,7 @@ const dialogStates = reactive({ edit: false, }); -const editTarget = ref
- {{ $t('user.username') }}: changeme@example.com
+ {{ $t('user.username') }}: changeme@example.com
+
- {{ $t('user.password') }}: MyPassword
+ {{ $t('user.password') }}: MyPassword
+
{{ $t('user.dont-want-to-see-this-anymore-be-sure-to-change-your-email') }}
diff --git a/frontend/pages/shopping-lists/[id].vue b/frontend/pages/shopping-lists/[id].vue
index e32f068d3..0b70ac8ec 100644
--- a/frontend/pages/shopping-lists/[id].vue
+++ b/frontend/pages/shopping-lists/[id].vue
@@ -4,7 +4,7 @@
class="md-container"
>