Fetched template changes (#16)

.copier-answers.yaml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 0.7.3
+_commit: 0.9.0
 _src_path: gh:radio-aktywne/template-meta
 accountname: radio-aktywne
 description: React app template ⚛️

.github/workflows/lint.yaml

@@ -38,21 +38,21 @@ jobs:
           origin
           ${{ github.event.pull_request.base.ref }}
       - name: Setup Nix cache
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.0.1
         id: cache-nix
         with:
           path: ${{ env.NIX_CACHE_DIR }}
           key: lint-nix
       - name: Setup Trunk cache
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.0.1
         with:
           path: ${{ env.TRUNK_CACHE_DIR }}
           key: lint-trunk
       - name: Install Nix
-        uses: cachix/install-nix-action@v24
+        uses: cachix/install-nix-action@v26
         with:
           github_access_token: ${{ github.token }}
-          install_url: https://releases.nixos.org/nix/nix-2.19.2/install
+          install_url: https://releases.nixos.org/nix/nix-2.20.5/install
       # See: https://github.com/cachix/install-nix-action/issues/56
       - name: Import Nix store cache
         if: steps.cache-nix.outputs.cache-hit == 'true'

.github/workflows/test.yaml

@@ -48,21 +48,21 @@ jobs:
       - name: Checkout code
         uses: actions/[email protected]
       - name: Setup Nix cache
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.0.1
         id: cache-nix
         with:
           path: ${{ env.NIX_CACHE_DIR }}
           key: test-nix
       - name: Setup Trunk cache
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.0.1
         with:
           path: ${{ env.TRUNK_CACHE_DIR }}
           key: test-trunk
       - name: Install Nix
-        uses: cachix/install-nix-action@v24
+        uses: cachix/install-nix-action@v26
         with:
           github_access_token: ${{ github.token }}
-          install_url: https://releases.nixos.org/nix/nix-2.19.2/install
+          install_url: https://releases.nixos.org/nix/nix-2.20.5/install
       # See: https://github.com/cachix/install-nix-action/issues/56
       - name: Import Nix store cache
         if: steps.cache-nix.outputs.cache-hit == 'true'

.trunk/trunk.yaml

@@ -1,19 +1,19 @@
 version: 0.1
 cli:
-  version: 1.18.0
+  version: 1.20.1
 plugins:
   sources:
     - id: trunk
-      ref: v1.4.0
+      ref: v1.4.4
       uri: https://github.com/trunk-io/plugins
 runtimes:
   enabled:
     # Needed for gitleaks, shfmt
-    - go@1.21.5
+    - go@1.22.1
     # Needed for markdownlint, prettier, svgo
-    - node@20.9.0
+    - node@21.7.1
     # Needed for black, ruff, yamllint
-    - [email protected].1
+    - [email protected].6
 lint:
   ignore:
     - linters: [ALL]
@@ -59,32 +59,32 @@ lint:
           success_codes: [0, 1]
   enabled:
     # GitHub Actions linting
-    - [email protected].26
+    - [email protected].27
     # Python formatting
-    - black@23.11.0
+    - black@24.2.0
     # Check for whitespace errors
     - git-diff-check
     # Check for secrets in the code
-    - [email protected].1
+    - [email protected].2
     # Dockerfile linting
     - [email protected]
     # Markdown linting
-    - markdownlint@0.37.0
+    - markdownlint@0.39.0
     # Nix formatting check
     - nix-fmt-check@SYSTEM
     # Nix flake check
     - nix-flake-check@SYSTEM
     # JS, JSON, YAML, Markdown formatting
     - [email protected]
     # Python linting
-    - ruff@0.1.7
+    - ruff@0.3.2
     # Shell linting
-    - shellcheck@0.9.0
+    - shellcheck@0.10.0
     # Shell formatting
-    - shfmt@3.7.0
+    - shfmt@3.8.0
     # SVG formatting
-    - svgo@3.0.5
+    - svgo@3.2.0
     # TOML formatting
     - [email protected]
     # YAML linting
-    - yamllint@1.33.0
+    - yamllint@1.35.1

LICENSE

@@ -1,6 +1,6 @@
 MIT No Attribution
 
-Copyright (c) 2023 radio-aktywne
+Copyright (c) 2024 radio-aktywne
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software

Taskfile.dist.yaml

@@ -57,7 +57,6 @@ tasks:
         build/
   shallow-build:
     desc: Build the project without initializing git
-    internal: true
     env:
       GIT_CONFIG_GLOBAL: ""
       GIT_CONFIG_SYSTEM: ""
@@ -86,10 +85,6 @@ tasks:
         --defaults
         --vcs-ref
         HEAD
-        --data
-        'appname=foo'
-        --data
-        'description=Example app'
         {{ .CLI_ARGS }}
         ./
         build/
@@ -144,6 +139,13 @@ tasks:
     desc: Build the project
     cmds:
       - task: shallow-build
+        vars:
+          CLI_ARGS: >-
+            --data
+            'appname=foo'
+            --data
+            'description=Example app'
+            {{ .CLI_ARGS }}
       - task: init-build
       - task: add-build-changes
   test:

flake.nix

@@ -1,7 +1,7 @@
 {
   inputs = {
     nixpkgs = {
-      url = "github:NixOS/nixpkgs/nixos-unstable";
+      url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     };
 
     flake-parts = {
@@ -35,7 +35,7 @@
         system,
         ...
       }: let
-        pytest = pkgs.python3.withPackages (ps: [ps.pytest ps.plumbum]);
+        python = pkgs.python311.withPackages (ps: [ps.pytest ps.plumbum]);
         nil = pkgs.nil;
         task = pkgs.go-task;
         coreutils = pkgs.coreutils;
@@ -64,7 +64,7 @@
             name = "dev";
 
             packages = [
-              pytest
+              python
               nil
               task
               coreutils
@@ -109,7 +109,7 @@
             name = "test";
 
             packages = [
-              pytest
+              python
               task
               coreutils
               copier

src/Dockerfile.jinja

@@ -1,5 +1,5 @@
 # Use generic base image with Nix installed
-FROM nixos/nix:2.19.2 AS base-env
+FROM nixos/nix:2.20.5 AS base-env
 
 # Configure Nix
 RUN echo "extra-experimental-features = nix-command flakes" >> /etc/nix/nix.conf
@@ -48,7 +48,7 @@ WORKDIR /build/
 
 # Setup entrypoint for RUN commands
 COPY scripts/shell.sh scripts/shell.sh
-SHELL ["./scripts/shell.sh"]
+SHELL ["/build/scripts/shell.sh"]
 
 # Copy package files
 COPY package.json package-lock.json ./
@@ -82,12 +82,15 @@ RUN useradd --create-home app
 
 # Setup entrypoint for RUN commands
 COPY scripts/shell.sh scripts/shell.sh
-SHELL ["./scripts/shell.sh"]
+SHELL ["/app/scripts/shell.sh"]
 
 # Copy static files from build
 COPY --from=build /build/build/ build/
 
 # Setup main entrypoint
 COPY scripts/entrypoint.sh scripts/entrypoint.sh
-ENTRYPOINT ["./scripts/entrypoint.sh", "caddy", "file-server", "--root", "build/", "--listen", ":{{ port }}", "--access-log"]
+ENTRYPOINT ["/app/scripts/entrypoint.sh", "caddy", "file-server", "--root", "build/", "--listen", ":{{ port }}", "--access-log"]
 CMD []
+
+# Setup ownership
+RUN chown -R app: /app/

src/LICENSE.jinja

@@ -1,6 +1,6 @@
 MIT No Attribution
 
-Copyright (c) 2023 {{ accountname }}
+Copyright (c) 2024 {{ accountname }}
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software