From e8215d7bbb54f6a95309a597ebc809d7d15d87bb Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 14 Jul 2025 10:12:53 +0000 Subject: [PATCH 01/11] Copier --- .copier-answers.yml | 2 +- .devcontainer/devcontainer.json | 2 +- .devcontainer/install-ci-tooling.py | 2 +- .pre-commit-config.yaml | 10 +++++++--- extensions/context.py | 4 ++-- pyproject.toml | 2 +- ruff.toml | 1 + template/ruff.toml | 1 + uv.lock | 8 ++++---- 9 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 2ef592f05..2a3274abc 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v0.0.56 +_commit: v0.0.56-3-g742a171 _src_path: gh:LabAutomationAndScreening/copier-base-template.git description: A web app that is hosted within a local intranet. Nuxt frontend, python backend, docker-compose diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0feacef58..e8fee6f2e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -61,5 +61,5 @@ "initializeCommand": "sh .devcontainer/initialize-command.sh", "onCreateCommand": "sh .devcontainer/on-create-command.sh", "postStartCommand": "sh .devcontainer/post-start-command.sh" - // Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): b4089c49 # spellchecker:disable-line + // Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): d6cdbe9d # spellchecker:disable-line } diff --git a/.devcontainer/install-ci-tooling.py b/.devcontainer/install-ci-tooling.py index 0d0af8cdb..1e96d67c5 100644 --- a/.devcontainer/install-ci-tooling.py +++ b/.devcontainer/install-ci-tooling.py @@ -8,7 +8,7 @@ from pathlib import Path UV_VERSION = "0.7.12" -PNPM_VERSION = "10.12.4" +PNPM_VERSION = "10.13.1" COPIER_VERSION = "9.7.1" COPIER_TEMPLATES_EXTENSION_VERSION = "0.3.1" PRE_COMMIT_VERSION = "4.2.0" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 073509a34..7e1d36b1a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -42,7 +42,7 @@ repos: # Reformatting (should generally come before any file format or other checks, because reformatting can change things) - repo: https://github.com/crate-ci/typos - rev: 0f0ccba9ed1df83948f0c15026e4f5ccfce46109 # frozen: v1.32.0 + rev: 3d97dc5b9833a60a62e70d5b56af2cc7ddd522f6 # frozen: v1 hooks: - id: typos exclude: @@ -89,12 +89,13 @@ repos: args: [--autofix, --no-sort-keys] - repo: https://github.com/biomejs/pre-commit - rev: 748e40d32e076a6aaaf3353a2564c8fe43764f79 # frozen: v2.0.0-beta.1 + rev: a450e9c04887b1305951c298db5999cd30155f74 # frozen: v2.1.1 hooks: - id: biome-check exclude: | (?x)^( .*generated/graphql.ts| + .*/schema.graphql| )$ - repo: https://github.com/pre-commit/mirrors-prettier # TODO: switch to a different approach...this was archived in 2024 @@ -109,6 +110,7 @@ repos: .*devcontainer.json| .*pyrightconfig.json| .*tsconfig.json| + .*/__snapshots__/.*| .*.min.js| .*.min.css| .*.umd.js| @@ -116,6 +118,8 @@ repos: .*.yml| .*.md| .*/vendor_files/.*| + .*/schema.graphql| + .*generated/graphql.ts| )$ files: (.*.json)|(.*.ts)|(.*.jsx)|(.*.tsx)|(.*.yaml)|(.*.yml)|(.*.md)|(.*.html)|(.*.css)|(.*.scss)|(.*.less)|(.*.vue)|(.*.graphql)|(.*.gql) @@ -214,7 +218,7 @@ repos: description: Runs hadolint to lint Dockerfiles - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 24e02b24b8ab2b7c76225602d13fa60e12d114e6 # frozen: v0.11.9 + rev: 3d44372123ca5e8617fdb65d9f11facd159b9e95 # frozen: v0.12.3 hooks: - id: ruff name: ruff-src diff --git a/extensions/context.py b/extensions/context.py index 60420a040..d800526df 100644 --- a/extensions/context.py +++ b/extensions/context.py @@ -11,9 +11,9 @@ class ContextUpdater(ContextHook): @override def hook(self, context: dict[Any, Any]) -> dict[Any, Any]: context["uv_version"] = "0.7.12" - context["pnpm_version"] = "10.12.4" + context["pnpm_version"] = "10.13.1" context["pre_commit_version"] = "4.2.0" - context["pyright_version"] = "1.1.402" + context["pyright_version"] = "1.1.403" context["pytest_version"] = "8.4.0" context["pytest_randomly_version"] = "3.16.0" context["pytest_cov_version"] = "6.2.1" diff --git a/pyproject.toml b/pyproject.toml index 23d00375c..ad77fd20a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ dependencies = [ "pytest>=8.4.0", "pytest-cov>=6.2.1", "pytest-randomly>=3.16.0", - "pyright[nodejs]>=1.1.402", + "pyright[nodejs]>=1.1.403", "copier>=9.7.1", "copier-templates-extensions>=0.3.1" diff --git a/ruff.toml b/ruff.toml index c76d77bac..087bc3661 100644 --- a/ruff.toml +++ b/ruff.toml @@ -61,6 +61,7 @@ ignore = [ "TD002", # Adding author names to TODOs erodes shared ownership of codebase. Git history provides information about who originally created the TODO if that information is vitally needed "TD003", # Up to the author's judgement whether a TODO requires a link to an issue or not "TID252", # Sometimes it makes sense to use relative imports, that's a judgement call for us, not ruff + "TC006", # Adding quotes around classes unnecessarily confuses the IDE for automatic refactoring ] # Allow fix for all enabled rules (when `--fix`) is provided. diff --git a/template/ruff.toml b/template/ruff.toml index edaca5d5d..06d0cbae6 100644 --- a/template/ruff.toml +++ b/template/ruff.toml @@ -61,6 +61,7 @@ ignore = [ "TD002", # Adding author names to TODOs erodes shared ownership of codebase. Git history provides information about who originally created the TODO if that information is vitally needed "TD003", # Up to the author's judgement whether a TODO requires a link to an issue or not "TID252", # Sometimes it makes sense to use relative imports, that's a judgement call for us, not ruff + "TC006", # Adding quotes around classes unnecessarily confuses the IDE for automatic refactoring ] # Allow fix for all enabled rules (when `--fix`) is provided. diff --git a/uv.lock b/uv.lock index 573262b61..7824ba7d8 100644 --- a/uv.lock +++ b/uv.lock @@ -61,7 +61,7 @@ dependencies = [ requires-dist = [ { name = "copier", specifier = ">=9.7.1" }, { name = "copier-templates-extensions", specifier = ">=0.3.1" }, - { name = "pyright", extras = ["nodejs"], specifier = ">=1.1.402" }, + { name = "pyright", extras = ["nodejs"], specifier = ">=1.1.403" }, { name = "pytest", specifier = ">=8.4.0" }, { name = "pytest-cov", specifier = ">=6.2.1" }, { name = "pytest-randomly", specifier = ">=3.16.0" }, @@ -360,15 +360,15 @@ wheels = [ [[package]] name = "pyright" -version = "1.1.402" +version = "1.1.403" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "nodeenv" }, { name = "typing-extensions" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/aa/04/ce0c132d00e20f2d2fb3b3e7c125264ca8b909e693841210534b1ea1752f/pyright-1.1.402.tar.gz", hash = "sha256:85a33c2d40cd4439c66aa946fd4ce71ab2f3f5b8c22ce36a623f59ac22937683", size = 3888207, upload-time = "2025-06-11T08:48:35.759Z" } +sdist = { url = "https://files.pythonhosted.org/packages/fe/f6/35f885264ff08c960b23d1542038d8da86971c5d8c955cfab195a4f672d7/pyright-1.1.403.tar.gz", hash = "sha256:3ab69b9f41c67fb5bbb4d7a36243256f0d549ed3608678d381d5f51863921104", size = 3913526, upload-time = "2025-07-09T07:15:52.882Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/fe/37/1a1c62d955e82adae588be8e374c7f77b165b6cb4203f7d581269959abbc/pyright-1.1.402-py3-none-any.whl", hash = "sha256:2c721f11869baac1884e846232800fe021c33f1b4acb3929cff321f7ea4e2982", size = 5624004, upload-time = "2025-06-11T08:48:33.998Z" }, + { url = "https://files.pythonhosted.org/packages/49/b6/b04e5c2f41a5ccad74a1a4759da41adb20b4bc9d59a5e08d29ba60084d07/pyright-1.1.403-py3-none-any.whl", hash = "sha256:c0eeca5aa76cbef3fcc271259bbd785753c7ad7bcac99a9162b4c4c7daed23b3", size = 5684504, upload-time = "2025-07-09T07:15:50.958Z" }, ] [package.optional-dependencies] From fa7339912d19646aef43944f7f84757ec78f2ee4 Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 14 Jul 2025 10:14:01 +0000 Subject: [PATCH 02/11] biome --- .copier-answers.yml | 2 +- .devcontainer/devcontainer.json | 2 +- .pre-commit-config.yaml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 2a3274abc..8436bf1f8 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v0.0.56-3-g742a171 +_commit: v0.0.56-5-g110abdd _src_path: gh:LabAutomationAndScreening/copier-base-template.git description: A web app that is hosted within a local intranet. Nuxt frontend, python backend, docker-compose diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e8fee6f2e..ed3b7a492 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -61,5 +61,5 @@ "initializeCommand": "sh .devcontainer/initialize-command.sh", "onCreateCommand": "sh .devcontainer/on-create-command.sh", "postStartCommand": "sh .devcontainer/post-start-command.sh" - // Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): d6cdbe9d # spellchecker:disable-line + // Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): 73b9c7f8 # spellchecker:disable-line } diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7e1d36b1a..8a4c738f7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -42,7 +42,7 @@ repos: # Reformatting (should generally come before any file format or other checks, because reformatting can change things) - repo: https://github.com/crate-ci/typos - rev: 3d97dc5b9833a60a62e70d5b56af2cc7ddd522f6 # frozen: v1 + rev: 392b78fe18a52790c53f42456e46124f77346842 # frozen: v1.34.0 hooks: - id: typos exclude: @@ -96,6 +96,7 @@ repos: (?x)^( .*generated/graphql.ts| .*/schema.graphql| + pyrightconfig\.json| )$ - repo: https://github.com/pre-commit/mirrors-prettier # TODO: switch to a different approach...this was archived in 2024 From 9ca5c749f7c62abc146050343d24ff4c53f94c78 Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 14 Jul 2025 10:32:44 +0000 Subject: [PATCH 03/11] line --- template/.pre-commit-config.yaml.jinja | 37 +++++++++++++++++++++----- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/template/.pre-commit-config.yaml.jinja b/template/.pre-commit-config.yaml.jinja index 724f00951..190a94763 100644 --- a/template/.pre-commit-config.yaml.jinja +++ b/template/.pre-commit-config.yaml.jinja @@ -41,13 +41,25 @@ repos: # Reformatting (should generally come before any file format or other checks, because reformatting can change things) - repo: https://github.com/crate-ci/typos - rev: 2300ad1b6b5c37da54bcafb1a06211196503eac9 # frozen: v1 + rev: 392b78fe18a52790c53f42456e46124f77346842 # frozen: v1.34.0 hooks: - id: typos + exclude: + | + (?x)^( + .*\.min.js| + .*\.min.css| + .*\.umd.js| + )$ - repo: https://github.com/pre-commit/pre-commit-hooks rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # frozen: v5.0.0 hooks: - id: trailing-whitespace + exclude: + | + (?x)^( + .*/vendor_files/.*| + )$ - id: end-of-file-fixer # the XML formatter hook doesn't leave a blank line at the end, so excluding XML files from this hook to avoid conflicts exclude: @@ -71,11 +83,12 @@ repos: .*devcontainer.json| .*pyrightconfig.json| .*tsconfig.json| + .*/vendor_files/.*| )$ args: [--autofix, --no-sort-keys] - repo: https://github.com/biomejs/pre-commit - rev: 748e40d32e076a6aaaf3353a2564c8fe43764f79 # frozen: v2.0.0-beta.1 + rev: a450e9c04887b1305951c298db5999cd30155f74 # frozen: v2.1.1 hooks: - id: biome-check # exclude generated files from codegen and strawberry @@ -83,6 +96,7 @@ repos: (?x)^( .*generated/graphql.ts| .*/schema.graphql| + pyrightconfig\.json| )$ - repo: https://github.com/pre-commit/mirrors-prettier # TODO: switch to a different approach...this was archived in 2024 @@ -97,18 +111,22 @@ repos: .*devcontainer.json| .*pyrightconfig.json| .*tsconfig.json| + .*/__snapshots__/.*| .*.min.js| .*.min.css| .*.umd.js| .*.yaml| .*.yml| .*.md| + .*/vendor_files/.*| .*/schema.graphql| + .*generated/graphql.ts| )$ + files: (.*.json)|(.*.ts)|(.*.jsx)|(.*.tsx)|(.*.yaml)|(.*.yml)|(.*.md)|(.*.html)|(.*.css)|(.*.scss)|(.*.less)|(.*.vue)|(.*.graphql)|(.*.gql) - repo: https://github.com/myint/docformatter # black seems to be working on formatting docstrings, but use this for now - rev: eb1df347edd128b30cd3368dddc3aa65edcfac38 # tip of main that is compatible with pre-commit v4 + rev: e73b8ba0c1316be565983236c72e653ad44e6b66 # frozen: v1.7.7 hooks: - id: docformatter exclude: (tests*)|(exceptions\.py)|(warnings\.py) @@ -145,7 +163,13 @@ repos: .*tsconfig.json| )$ - id: check-yaml - exclude: .copier-answers.yml # This is an autogenerated YAML file by Copier that throws 'found unhashable key' errors + # .copier-answers.yml is an autogenerated YAML file by Copier that throws 'found unhashable key' errors + # Helm charts contain other non-YAML markers that cause errors here. they should be checked with helm-lint instead + exclude: | + (?x)^( + .copier-answers.yml| + (.*/helm/.*)| + )$ - id: check-xml - id: check-merge-conflict - id: check-case-conflict @@ -219,10 +243,11 @@ repos: hooks: - id: hadolint-docker name: Lint Dockerfiles + exclude: .*\.jinja$ description: Runs hadolint to lint Dockerfiles - repo: https://github.com/astral-sh/ruff-pre-commit - rev: e84319e627902e1b348574ecf3238dc511933dc7 # frozen: v0.11.7 + rev: 3d44372123ca5e8617fdb65d9f11facd159b9e95 # frozen: v0.12.3 hooks: - id: ruff name: ruff-src @@ -235,7 +260,7 @@ repos: - id: ruff-format{% endraw %}{% if has_backend %}{% raw %} - repo: https://github.com/pylint-dev/pylint - rev: 7ac5a4d4f77576df3a00e63f86ca86e0e1780b47 # frozen: v3.3.6 + rev: f798a4a3508bcbb8ad0773ae14bf32d28dcfdcbe # frozen: v3.3.7 hooks: - id: pylint name: pylint From 85df5febf5d7a17f7b40ed924b6012353ddb0177 Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 14 Jul 2025 10:36:19 +0000 Subject: [PATCH 04/11] cop biome --- .copier-answers.yml | 2 +- .devcontainer/devcontainer.json | 2 +- .pre-commit-config.yaml | 3 +++ biome.json | 8 -------- biome.jsonc | 11 +++++++++++ template/.pre-commit-config.yaml.jinja | 1 + template/biome.json | 8 -------- template/biome.jsonc | 11 +++++++++++ 8 files changed, 28 insertions(+), 18 deletions(-) delete mode 100644 biome.json create mode 100644 biome.jsonc delete mode 100644 template/biome.json create mode 100644 template/biome.jsonc diff --git a/.copier-answers.yml b/.copier-answers.yml index 8436bf1f8..1836b7104 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v0.0.56-5-g110abdd +_commit: v0.0.56-7-g761cc09 _src_path: gh:LabAutomationAndScreening/copier-base-template.git description: A web app that is hosted within a local intranet. Nuxt frontend, python backend, docker-compose diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ed3b7a492..1ecb845ae 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -61,5 +61,5 @@ "initializeCommand": "sh .devcontainer/initialize-command.sh", "onCreateCommand": "sh .devcontainer/on-create-command.sh", "postStartCommand": "sh .devcontainer/post-start-command.sh" - // Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): 73b9c7f8 # spellchecker:disable-line + // Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): 1fbce8a0 # spellchecker:disable-line } diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8a4c738f7..d8d52f9a5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -84,6 +84,7 @@ repos: .*devcontainer.json| .*pyrightconfig.json| .*tsconfig.json| + .*biome.jsonc| .*/vendor_files/.*| )$ args: [--autofix, --no-sort-keys] @@ -92,6 +93,7 @@ repos: rev: a450e9c04887b1305951c298db5999cd30155f74 # frozen: v2.1.1 hooks: - id: biome-check + # exclude generated files from codegen and strawberry exclude: | (?x)^( .*generated/graphql.ts| @@ -118,6 +120,7 @@ repos: .*.yaml| .*.yml| .*.md| + .*.jsonc| .*/vendor_files/.*| .*/schema.graphql| .*generated/graphql.ts| diff --git a/biome.json b/biome.json deleted file mode 100644 index 7dbe4e1eb..000000000 --- a/biome.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "formatter": { - "enabled": false - }, - "linter": { - "enabled": false - } -} diff --git a/biome.jsonc b/biome.jsonc new file mode 100644 index 000000000..8e75cc4a4 --- /dev/null +++ b/biome.jsonc @@ -0,0 +1,11 @@ +{ + "formatter": { + "enabled": false, + }, + "linter": { + "enabled": false, + }, + "files": { + "includes": ["**", "!template/template/biome.jsonc", "!template/biome.jsonc"], + }, +} diff --git a/template/.pre-commit-config.yaml.jinja b/template/.pre-commit-config.yaml.jinja index 190a94763..1e646f705 100644 --- a/template/.pre-commit-config.yaml.jinja +++ b/template/.pre-commit-config.yaml.jinja @@ -83,6 +83,7 @@ repos: .*devcontainer.json| .*pyrightconfig.json| .*tsconfig.json| + .*biome.jsonc| .*/vendor_files/.*| )$ args: [--autofix, --no-sort-keys] diff --git a/template/biome.json b/template/biome.json deleted file mode 100644 index 7dbe4e1eb..000000000 --- a/template/biome.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "formatter": { - "enabled": false - }, - "linter": { - "enabled": false - } -} diff --git a/template/biome.jsonc b/template/biome.jsonc new file mode 100644 index 000000000..8e75cc4a4 --- /dev/null +++ b/template/biome.jsonc @@ -0,0 +1,11 @@ +{ + "formatter": { + "enabled": false, + }, + "linter": { + "enabled": false, + }, + "files": { + "includes": ["**", "!template/template/biome.jsonc", "!template/biome.jsonc"], + }, +} From b696da2dc64583ea1446e7d31f38fdd90897c1ee Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 14 Jul 2025 10:39:53 +0000 Subject: [PATCH 05/11] ig --- .copier-answers.yml | 2 +- .devcontainer/devcontainer.json | 2 +- .pre-commit-config.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 1836b7104..d6baa75ae 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v0.0.56-7-g761cc09 +_commit: v0.0.56-9-g146eaf2 _src_path: gh:LabAutomationAndScreening/copier-base-template.git description: A web app that is hosted within a local intranet. Nuxt frontend, python backend, docker-compose diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1ecb845ae..1df2d9de3 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -61,5 +61,5 @@ "initializeCommand": "sh .devcontainer/initialize-command.sh", "onCreateCommand": "sh .devcontainer/on-create-command.sh", "postStartCommand": "sh .devcontainer/post-start-command.sh" - // Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): 1fbce8a0 # spellchecker:disable-line + // Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): afe5e8f8 # spellchecker:disable-line } diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d8d52f9a5..9d834bade 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -98,7 +98,7 @@ repos: (?x)^( .*generated/graphql.ts| .*/schema.graphql| - pyrightconfig\.json| + .*pyrightconfig\.json| )$ - repo: https://github.com/pre-commit/mirrors-prettier # TODO: switch to a different approach...this was archived in 2024 From 0d57fe0e98b91becc14b7a7212bfbbb38e4fa35c Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 14 Jul 2025 10:42:06 +0000 Subject: [PATCH 06/11] nginx --- ...as_executable %}default.conf.template{% endif %}.jinja | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/template/frontend/{% if not deploy_as_executable %}default.conf.template{% endif %}.jinja b/template/frontend/{% if not deploy_as_executable %}default.conf.template{% endif %}.jinja index e71b82f53..ac79c4e50 100644 --- a/template/frontend/{% if not deploy_as_executable %}default.conf.template{% endif %}.jinja +++ b/template/frontend/{% if not deploy_as_executable %}default.conf.template{% endif %}.jinja @@ -10,8 +10,14 @@ try_files $uri $uri/ /index.html; } - # Proxy API calls to a dynamic host:port + # Pass API requests to the backend location /api/ { + client_max_body_size 1m; + try_files $uri @proxy; + } + + # Named location with shared proxy configuration + location @proxy { proxy_pass http://${BACKEND_HOST}:${BACKEND_PORT}; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; From a090802e0d0339e9b5678e5e031213df51e71a3f Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 14 Jul 2025 10:47:11 +0000 Subject: [PATCH 07/11] css --- .copier-answers.yml | 2 +- biome.jsonc | 13 +++++++++---- template/biome.jsonc | 13 +++++++++---- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index d6baa75ae..115691a41 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v0.0.56-9-g146eaf2 +_commit: v0.0.56-10-g6fd0083 _src_path: gh:LabAutomationAndScreening/copier-base-template.git description: A web app that is hosted within a local intranet. Nuxt frontend, python backend, docker-compose diff --git a/biome.jsonc b/biome.jsonc index 8e75cc4a4..59afa9a2f 100644 --- a/biome.jsonc +++ b/biome.jsonc @@ -1,11 +1,16 @@ { "formatter": { - "enabled": false, + "enabled": false }, "linter": { - "enabled": false, + "enabled": false }, "files": { - "includes": ["**", "!template/template/biome.jsonc", "!template/biome.jsonc"], - }, + "includes": [ + "**", + "!template/template/biome.jsonc", + "!template/biome.jsonc", + "!*.css" // still too many false positives, so we exclude CSS files + ] + } } diff --git a/template/biome.jsonc b/template/biome.jsonc index 8e75cc4a4..59afa9a2f 100644 --- a/template/biome.jsonc +++ b/template/biome.jsonc @@ -1,11 +1,16 @@ { "formatter": { - "enabled": false, + "enabled": false }, "linter": { - "enabled": false, + "enabled": false }, "files": { - "includes": ["**", "!template/template/biome.jsonc", "!template/biome.jsonc"], - }, + "includes": [ + "**", + "!template/template/biome.jsonc", + "!template/biome.jsonc", + "!*.css" // still too many false positives, so we exclude CSS files + ] + } } From 4539cbc4363ca00e10e5f633bf081452e88e3424 Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 14 Jul 2025 10:50:00 +0000 Subject: [PATCH 08/11] more css --- .copier-answers.yml | 2 +- biome.jsonc | 2 +- template/biome.jsonc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 115691a41..b48afba3b 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v0.0.56-10-g6fd0083 +_commit: v0.0.56-11-g7db037a _src_path: gh:LabAutomationAndScreening/copier-base-template.git description: A web app that is hosted within a local intranet. Nuxt frontend, python backend, docker-compose diff --git a/biome.jsonc b/biome.jsonc index 59afa9a2f..8eb5334de 100644 --- a/biome.jsonc +++ b/biome.jsonc @@ -10,7 +10,7 @@ "**", "!template/template/biome.jsonc", "!template/biome.jsonc", - "!*.css" // still too many false positives, so we exclude CSS files + "!**/*.css" // still too many false positives, so we exclude CSS files ] } } diff --git a/template/biome.jsonc b/template/biome.jsonc index 59afa9a2f..8eb5334de 100644 --- a/template/biome.jsonc +++ b/template/biome.jsonc @@ -10,7 +10,7 @@ "**", "!template/template/biome.jsonc", "!template/biome.jsonc", - "!*.css" // still too many false positives, so we exclude CSS files + "!**/*.css" // still too many false positives, so we exclude CSS files ] } } From 9888dc3eec50a7133ce37a7b43f8f1dc7402b563 Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 14 Jul 2025 10:55:25 +0000 Subject: [PATCH 09/11] json --- .copier-answers.yml | 2 +- biome.jsonc | 6 +++--- template/biome.jsonc | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index b48afba3b..9c4e83be9 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v0.0.56-11-g7db037a +_commit: v0.0.56-12-g5b765f3 _src_path: gh:LabAutomationAndScreening/copier-base-template.git description: A web app that is hosted within a local intranet. Nuxt frontend, python backend, docker-compose diff --git a/biome.jsonc b/biome.jsonc index 8eb5334de..3b5673241 100644 --- a/biome.jsonc +++ b/biome.jsonc @@ -10,7 +10,7 @@ "**", "!template/template/biome.jsonc", "!template/biome.jsonc", - "!**/*.css" // still too many false positives, so we exclude CSS files - ] - } + "!**/*.css", // still too many false positives, so we exclude CSS files + ], + }, } diff --git a/template/biome.jsonc b/template/biome.jsonc index 8eb5334de..3b5673241 100644 --- a/template/biome.jsonc +++ b/template/biome.jsonc @@ -10,7 +10,7 @@ "**", "!template/template/biome.jsonc", "!template/biome.jsonc", - "!**/*.css" // still too many false positives, so we exclude CSS files - ] - } + "!**/*.css", // still too many false positives, so we exclude CSS files + ], + }, } From 0c431424a041ebe6465e17aad45ad526523b2466 Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 14 Jul 2025 11:02:54 +0000 Subject: [PATCH 10/11] more commas --- .copier-answers.yml | 2 +- biome.jsonc | 4 ++-- template/biome.jsonc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 9c4e83be9..5ea7728c3 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v0.0.56-12-g5b765f3 +_commit: v0.0.56-13-g0060cb6 _src_path: gh:LabAutomationAndScreening/copier-base-template.git description: A web app that is hosted within a local intranet. Nuxt frontend, python backend, docker-compose diff --git a/biome.jsonc b/biome.jsonc index 3b5673241..e0ea5856c 100644 --- a/biome.jsonc +++ b/biome.jsonc @@ -1,9 +1,9 @@ { "formatter": { - "enabled": false + "enabled": false, }, "linter": { - "enabled": false + "enabled": false, }, "files": { "includes": [ diff --git a/template/biome.jsonc b/template/biome.jsonc index 3b5673241..e0ea5856c 100644 --- a/template/biome.jsonc +++ b/template/biome.jsonc @@ -1,9 +1,9 @@ { "formatter": { - "enabled": false + "enabled": false, }, "linter": { - "enabled": false + "enabled": false, }, "files": { "includes": [ From 829543cace1e48639d9a363e6aabf0b56ba51136 Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 14 Jul 2025 11:08:21 +0000 Subject: [PATCH 11/11] tag --- .copier-answers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 5ea7728c3..e7b6067a0 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v0.0.56-13-g0060cb6 +_commit: v0.0.57 _src_path: gh:LabAutomationAndScreening/copier-base-template.git description: A web app that is hosted within a local intranet. Nuxt frontend, python backend, docker-compose