Merge pull request #111 from zero-one-group/chore/housekeeping

Housekeeping

Author: riipandi

.moon/tasks.yml

@@ -20,26 +20,15 @@ tasks:
       outputStyle: stream
       envFile: '.env'
 
-  # docker-build:
-  #   command: >
-  #     docker build -f $projectRoot/Dockerfile . -t $IMAGE_NAME:$APP_VERSION
-  #     && docker image list --filter reference=$APP_PREFIX-\\*
-  #   options:
-  #     mergeEnv: replace
-  #     runFromWorkspaceRoot: true
-  #     interactive: false
-  #     outputStyle: buffer-only-failure
-  #     runInCI: false
-  #     cache: false
-  #     shell: true
-
   docker-images:
-    command: 'docker image list --filter reference=$APP_PREFIX-\\*'
+    script: |
+      IMAGE_PREFIX="$(jq -r .name <$workspaceRoot'/package.json')" \
+      && docker image list --filter reference=$IMAGE_PREFIX-$project\*
     options:
       mergeEnv: replace
       runFromWorkspaceRoot: true
       interactive: false
-      outputStyle: none
+      outputStyle: buffer-only-failure
       runInCI: false
       cache: false
       shell: true

.moon/toolchain.yml

@@ -21,7 +21,7 @@ node:
   # dependencyVersionFormat: link         # Uses link:../relative/path and symlinks package contents.
   dependencyVersionFormat: workspace      # Uses workspace:*, which resolves to "1.2.3". Requires package workspaces.
   pnpm:
-    version: '10.17.1'                     # The version of the package manager to use.
+    version: '10.18.0'                     # The version of the package manager to use.
 
 # Configures Go within the toolchain.
 # unstable_go:

.moon/workspace.yml

@@ -11,6 +11,7 @@ vcs:
     pre-commit:
       - 'moon run :format --affected --status=all'
       - 'moon run :lint --affected --status=staged'
+  syncHooks: false
 
 hasher:
   optimization: performance
@@ -28,7 +29,7 @@ docker:
     deleteVendorDirectories: false
 
 # Require a specific version of moon while running commands, otherwise fail.
-# versionConstraint: '>=1.0.0'
+versionConstraint: '>=1.41.1'
 
 # Extend and inherit an external configuration file. Must be a valid HTTPS URL or file system path.
 # extends: './shared/workspace.yml'
@@ -51,23 +52,23 @@ telemetry: false
 # @see: https://moonrepo.dev/docs/config/workspace#templates
 generator:
   templates:
-    - 'https://oss.zero-one-group.com/monorepo/templates/ansible.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/astro.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/fastapi-ai.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/gitlab-cicd.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/go-modular.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/golang.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/load-balancer.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/monitoring.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/nextjs.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/phoenix.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/postgresql.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/react-app.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/react-ssr.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/shared-ui.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/squidproxy.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/strapi.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/swarm.zip'
-    - 'https://oss.zero-one-group.com/monorepo/templates/terragrunt.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/ansible.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/astro.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/fastapi-ai.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/gitlab-cicd.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/go-clean.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/go-modular.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/load-balancer.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/monitoring.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/nextjs.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/phoenix.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/postgresql.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/react-app.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/react-ssr.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/shared-ui.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/squidproxy.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/strapi.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/swarm.zip'
+    # - 'https://oss.zero-one-group.com/monorepo/templates/terragrunt.zip'
     # Uncomment to enable local templates or debug custom templates.
-    # - './templates'
+    - './templates'

.vscode/settings.json

@@ -20,9 +20,7 @@
         "**/.output": true,
         "**/.next": true,
         "**/build": true,
-        "**/dist": true,
-        "**/docs": true,
-        "/templates/": true
+        "**/dist": true
     },
     "tailwindCSS.experimental.classRegex": [
         // @ref: https://www.tailwind-variants.org/docs/getting-started
@@ -31,6 +29,9 @@
         ["classList={{([^;]*)}}", "\\s*?[\"'`]([^\"'`]*).*?:"]
     ],
     "tailwindCSS.files.exclude": ["**/.github/**", "**/*.{md,js,ts,json}"],
+    "[astro]": {
+        "editor.defaultFormatter": "biomejs.biome"
+    },
     "[css]": {
         "editor.defaultFormatter": "biomejs.biome"
     },

apps/astro-web/.env.example

@@ -0,0 +1,2 @@
+STRAPI_BASE_URL=http://localhost:1337
+STRAPI_API_TOKEN=your_api_token_here

apps/astro-web/Dockerfile

@@ -4,8 +4,8 @@
 ARG PLATFORM=linux/amd64
 ARG NODE_VERSION=22
 
-FROM busybox:1.37-glibc as glibc
-FROM joseluisq/static-web-server:2 as httpd
+FROM busybox:1.37-glibc AS glibc
+FROM joseluisq/static-web-server:2 AS httpd
 
 # -----------------------------------------------------------------------------
 # Base image with pnpm package manager.
@@ -36,7 +36,7 @@ RUN moon docker scaffold astro-web
 FROM base AS builder
 
 # Copy workspace skeleton
-COPY --from=skeleton /root/.proto /root/.proto
+# COPY --from=skeleton /root/.proto /root/.proto
 COPY --from=skeleton /srv/.moon/docker/workspace .
 
 # Install toolchain and dependencies
@@ -51,7 +51,7 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store moon run astro-web:build
 # -----------------------------------------------------------------------------
 # Production image, copy build output files and run the application (runner).
 # -----------------------------------------------------------------------------
-FROM --platform=${PLATFORM} gcr.io/distroless/base-nossl-debian12 as runner
+FROM --platform=${PLATFORM} gcr.io/distroless/base-nossl-debian12 AS runner
 
 # ----- Read application environment variables --------------------------------
 

apps/astro-web/biome.json

@@ -1,5 +1,5 @@
 {
-	"$schema": "https://biomejs.dev/schemas/2.2.3/schema.json",
+	"$schema": "https://biomejs.dev/schemas/2.2.5/schema.json",
 	"extends": ["./biome.json"],
 	"root": false,
 	"overrides": [

apps/astro-web/moon.yml

@@ -12,12 +12,7 @@ id: 'astro-web'
 
 project:
   name: astro-web
-  description: 'Frontend application'
-
-env:
-  APP_PREFIX: "$(jq -r .name <$workspaceRoot'/package.json')"
-  APP_VERSION: '$(jq -r .version <$workspaceRoot''/package.json'')'
-  IMAGE_NAME: '$APP_PREFIX-$project'
+  description: '_CHANGE_ME_DESCRIPTION_'
 
 # Uncomment to use shared UI library
 # dependsOn:
@@ -40,30 +35,47 @@ tasks:
       envFile: '.env'
       cache: true
 
-  update-deps:
-    command: 'pnpm -s exec npm-check-updates --configFileName .ncurc.json'
+  docker-build:
+    script: |
+      DOCKER_IMAGE="$(jq -r .name <$workspaceRoot'/package.json')-$project" \
+      DOCKER_IMAGE_VERSION="$(jq -r .version <$workspaceRoot'/package.json')" \
+      && docker build -f $projectRoot/Dockerfile . -t $DOCKER_IMAGE:$DOCKER_IMAGE_VERSION \
+      && docker image list --filter reference=$DOCKER_IMAGE\*
     options:
-      interactive: true
+      mergeEnv: replace
+      runFromWorkspaceRoot: true
+      interactive: false
+      outputStyle: buffer-only-failure
+      runInCI: false
       cache: false
+      shell: true
 
   docker-run:
-    command: 'docker run --network=host --rm -it --env-file .env --name $IMAGE_NAME $IMAGE_NAME:$APP_VERSION'
+    script: |
+      DOCKER_IMAGE="$(jq -r .name <$workspaceRoot'/package.json')-$project" \
+      DOCKER_IMAGE_VERSION="$(jq -r .version <$workspaceRoot'/package.json')" \
+      && docker run --network=host --rm -it --env-file $projectRoot/.env \
+        --name $DOCKER_IMAGE $DOCKER_IMAGE:$DOCKER_IMAGE_VERSION
     options:
       mergeEnv: replace
+      outputStyle: buffer-only-failure
       runFromWorkspaceRoot: true
       interactive: false
-      outputStyle: buffer-only-failure
       runInCI: false
       cache: false
       shell: true
 
   docker-shell:
-    command: 'docker run --network=host --rm -it --env-file .env --entrypoint /bin/sh $IMAGE_NAME:$APP_VERSION'
+    script: |
+      DOCKER_IMAGE="$(jq -r .name <$workspaceRoot'/package.json')-$project" \
+      DOCKER_IMAGE_VERSION="$(jq -r .version <$workspaceRoot'/package.json')" \
+      && docker run --network=host --rm -it --env-file $projectRoot/.env \
+        --entrypoint /bin/sh $DOCKER_IMAGE:$DOCKER_IMAGE_VERSION
     options:
       mergeEnv: replace
       runFromWorkspaceRoot: true
-      interactive: false
       outputStyle: buffer-only-failure
+      interactive: false
       runInCI: false
       cache: false
       shell: true

apps/astro-web/package.json

@@ -1,5 +1,6 @@
 {
 	"name": "astro-web",
+	"description": "_CHANGE_ME_DESCRIPTION_",
 	"type": "module",
 	"private": true,
 	"scripts": {
@@ -8,19 +9,20 @@
 		"preview": "astro preview",
 		"start": "pnpm dlx serve dist -l 4321 -n -C",
 		"cleanup": "pnpm dlx rimraf node_modules dist .astro",
+		"update-deps": "npm-check-updates --configFileName .ncurc.json",
 		"lint": "biome lint . --write",
 		"check": "biome check . --write",
 		"astro": "astro"
 	},
 	"dependencies": {
-		"astro": "^5.14.0",
+		"astro": "^5.14.1",
 		"lucide-astro": "^0.544.0"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "catalog:",
-		"@tailwindcss/vite": "^4.1.13",
+		"@tailwindcss/vite": "^4.1.14",
 		"npm-check-updates": "catalog:",
 		"tailwindcss-motion": "^1.1.1",
-		"tailwindcss": "^4.1.13"
+		"tailwindcss": "^4.1.14"
 	}
 }

apps/astro-web/template.yml

@@ -0,0 +1,33 @@
+# https://moonrepo.dev/docs/config/template
+# yaml-language-server: $schema=https://moonrepo.dev/schemas/template.json
+$schema: 'https://moonrepo.dev/schemas/template.json'
+
+# REQUIRED: Name of the template in a human readable format.
+title: 'Astro Website'
+
+# REQUIRED: Description of what the template is for and other relevant information.
+description: 'Astro website with Tailwind CSS'
+
+# Destination path for the package.
+destination: 'apps/[package_name]'
+
+# Mapping of variables that will be interpolated and rendered within template files.
+# Users will be prompted to provide a value when running the generator.
+variables:
+  package_name:
+    type: 'string'
+    default: 'website'
+    prompt: 'Package name (identifier)?'
+    required: true
+
+  package_description:
+    type: 'string'
+    default: 'My Astro website'
+    prompt: 'Package description?'
+    required: true
+
+  port_number:
+    type: 'number'
+    default: 4321
+    prompt: 'Port number?'
+    required: true