Merge pull request #96 from Digital-Alchemy-TS/dev

Dev -> Main

Author: chrisdrackett

.devcontainer/devcontainer.json

@@ -3,6 +3,7 @@ root = true
 
 [*]
 charset = utf-8
+end_of_line = lf
 indent_style = space
 indent_size = 2
 insert_final_newline = true

.editorconfig

@@ -0,0 +1,56 @@
+# GitHub Actions Workflows
+
+## Build Home Assistant Addon
+
+The `docker-build.yml` workflow automatically builds and publishes multi-architecture Docker images for the Code Glue Home Assistant addon.
+
+### Triggers
+
+- **Push to `main` branch**: Builds and publishes as `:latest` tag
+- **Push to `dev` branch**: Builds and publishes as `:dev` tag with modified config
+- **Tag push (`v*`)**: Builds and publishes versioned releases
+- **Manual trigger**: Via workflow_dispatch
+
+### What it does
+
+1. **Main branch builds**:
+   - Uses `config.yaml` as-is
+   - Publishes to `ghcr.io/digital-alchemy-ts/code-glue:latest`
+   - Suitable for production Home Assistant installations
+
+2. **Dev branch builds**:
+   - Automatically modifies `config.yaml` during build to:
+     - Change name to "Code Glue (Dev)"
+     - Set slug to `code_glue_dev` (allows side-by-side installation with production)
+     - Set version to "dev"
+     - Change icon to outline variant
+     - Update port to 3790
+     - Point image to `:dev` tag
+   - Publishes to `ghcr.io/digital-alchemy-ts/code-glue:dev`
+   - Can be installed alongside the production addon
+
+3. **Multi-architecture support**:
+   - Builds for: `linux/amd64`, `linux/arm64`, `linux/arm/v7`
+   - Covers all Home Assistant supported architectures
+
+### Installing the Addon
+
+#### Production Version (from `main` branch)
+1. Add repository to Home Assistant: `https://github.com/Digital-Alchemy-TS/code-glue`
+2. Install "Code Glue" addon
+3. Home Assistant will pull the `:latest` image
+
+#### Development Version (from `dev` branch)
+1. Add repository to Home Assistant: `https://github.com/Digital-Alchemy-TS/code-glue`
+2. Install "Code Glue (Dev)" addon
+3. Home Assistant will pull the `:dev` image
+4. Uses separate slug `code_glue_dev` - can run alongside production
+
+### Development Workflow
+
+Since the workflow handles config modifications automatically, you don't need to maintain separate config files:
+
+1. Make changes on your branch
+2. Merge to `dev` for testing → workflow builds `:dev` image
+3. Test in Home Assistant with the dev addon
+4. Merge to `main` for release → workflow builds `:latest` image

.github/workflows/README.md

@@ -3,30 +3,23 @@ name: Pull Request Checks
 on:
   pull_request:
     branches:
-      - stage
-      - prod
-      - develop
-  push:
-    branches:
-      - stage
-      - prod
-      - develop
+      - dev
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint-and-build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '22'
+          node-version: "22"
+          cache: "yarn"
       - run: corepack enable
       - run: yarn config set enableImmutableInstalls false
       - run: yarn install
-      - run: yarn server:build
-      - run: yarn server:lint
-      - run: yarn server:test
-      # - name: Upload coverage reports to Codecov
-      #   uses: codecov/codecov-action@v4.6.0
-      #   with:
-      #     token: ${{ secrets.CODECOV_TOKEN }}
-      - run: yarn client:lint
+      - run: yarn lint
+      - run: yarn test

.github/workflows/check.yml

@@ -1,13 +1,18 @@
-name: Build and Push Docker Image
+name: Build Home Assistant Addon
 
 on:
   push:
     branches:
       - main
+      - dev
     tags:
       - "v*"
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
@@ -25,23 +30,6 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "22"
-
-      - name: Enable Corepack
-        run: corepack enable
-
-      - name: Configure Yarn
-        run: yarn config set enableImmutableInstalls false
-
-      - name: Install dependencies
-        run: yarn install
-
-      - name: Build client and server
-        run: yarn build
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
@@ -55,25 +43,31 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract metadata (tags, labels)
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
+      - name: Determine Docker tags
+        id: tags
+        run: |
+          # Convert repository name to lowercase for Docker
+          IMAGE_NAME_LOWER=$(echo "${{ env.IMAGE_NAME }}" | tr '[:upper:]' '[:lower:]')
+          
+          if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
+            echo "tags=${{ env.REGISTRY }}/${IMAGE_NAME_LOWER}:latest" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
+            echo "tags=${{ env.REGISTRY }}/${IMAGE_NAME_LOWER}:dev" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.ref }}" == refs/tags/v* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/v}
+            echo "tags=${{ env.REGISTRY }}/${IMAGE_NAME_LOWER}:${VERSION},${{ env.REGISTRY }}/${IMAGE_NAME_LOWER}:latest" >> $GITHUB_OUTPUT
+          else
+            echo "tags=${{ env.REGISTRY }}/${IMAGE_NAME_LOWER}:${{ github.sha }}" >> $GITHUB_OUTPUT
+          fi
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
+          tags: ${{ steps.tags.outputs.tags }}
+          cache-from: |
+            type=gha
+            type=registry,ref=${{ env.REGISTRY }}/${{ github.repository }}:buildcache
           cache-to: type=gha,mode=max

.github/workflows/docker-build.yml

@@ -1,31 +1,58 @@
-.expo/
-/dist
-/build
-/tmp
-/backup
-/out-tsc
-**/node_modules
-npm-debug.log
-yarn-error.log
-.ds_store
-apps/server/cache
-thumbs.db
-.yarn/
+# Node/Yarn
+node_modules/
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+# Builds & caches
+dist/
+build/
+coverage/
+*.tsbuildinfo
+out-tsc/
+.eslintcache
+
+# Vite/others
+.vite/
+tmp/
+temp/
+backup/
 .transform_cache
+
+# Project specific
+apps/server/cache/
+**/synapse_storage.db
+tagui-web.css
+.tamagui
 .schemas
-.env
-.code_glue
 .cli
 .VSCodeCounter
-coverage
 
-**/synapse_storage.db
+# Environment & secrets
+.env
+.env.*
+!.env.example
+.code_glue
 
-tamagui-web.css
-.tamagui
+# Logs
+npm-debug.log*
+yarn-error.log*
+yarn-debug.log*
+
+# VSCode
+.vscode/*
+!.vscode/extensions.json
+!.vscode/settings.json
+!.vscode/launch.json
+!.vscode/tasks.json
 
 # macOS
 .DS_Store
-/.eslintcache
-apps/server/cache/
-/apps/client/dist
+.ds_store
+thumbs.db
+
+*storybook.log
+storybook-static

.gitignore

@@ -1,3 +0,0 @@
-[submodule "packages/paradigm"]
-	path = packages/paradigm
-	url = https://github.com/tiltshift/paradigm.git

.gitmodules

@@ -0,0 +1,8 @@
+{
+  "recommendations": [
+    "biomejs.biome",
+    "dbaeumer.vscode-eslint",
+    "esbenp.prettier-vscode",
+    "editorconfig.editorconfig"
+  ]
+}

.vscode/extensions.json

@@ -1,10 +1,14 @@
 {
 	"explorer.fileNesting.enabled": true,
 	"explorer.fileNesting.patterns": {
-		"package.json": "package-lock.json, yarn.lock, .yarnrc.yml",
+		"package.json": "package-lock.json, yarn.lock, .yarnrc.yml, cspell.config.yaml, .yarnrc.yml",
 		"*.js": "${capture}.js.map, ${capture}.d.ts, ${capture}.d.ts.map",
-		"*.ts": "$(capture).test.ts, $(capture).test.tsx, $(capture).test.node.ts, $(capture).test.node.tsx, $(capture).test.native.ts, $(capture).test.native.tsx, $(capture).test.ios.ts, $(capture).test.ios.tsx, $(capture).test.web.ts, $(capture).test.web.tsx, $(capture).test.android.ts, $(capture).test.android.tsx, ${capture}.native.tsx, ${capture}.ios.tsx, ${capture}.android.tsx, ${capture}.web.tsx, ${capture}.native.ts, ${capture}.ios.ts, ${capture}.android.ts, ${capture}.web.ts, ${capture}.native.js, ${capture}.ios.js, ${capture}.android.js, ${capture}.web.js, ${capture}.native.jsx, ${capture}.ios.jsx, ${capture}.android.jsx, ${capture}.web.jsx, ${capture}.stories.tsx, ${capture}.stories.ts, ${capture}.stories.jsx, ${capture}.stories.js",
+		"*.ts": "$(capture).test.ts, $(capture).test.tsx, $(capture).test.node.ts, $(capture).test.node.tsx, $(capture).test.native.ts, $(capture).test.native.tsx, $(capture).test.ios.ts, $(capture).test.ios.tsx, $(capture).test.web.ts, $(capture).test.web.tsx, $(capture).test.android.ts, $(capture).test.android.tsx, ${capture}.native.tsx, ${capture}.ios.tsx, ${capture}.android.tsx, ${capture}.web.tsx, ${capture}.native.ts, ${capture}.ios.ts, ${capture}.android.ts, ${capture}.web.ts, ${capture}.native.js, ${capture}.ios.js, ${capture}.android.js, ${capture}.web.js, ${capture}.native.jsx, ${capture}.ios.jsx, ${capture}.android.jsx, ${capture}.web.jsx, ${capture}.stories.tsx, ${capture}.story.tsx, ${capture}.stories.ts, ${capture}.stories.jsx, ${capture}.stories.js",
 		"*.tsx": "$(capture).test.ts, $(capture).test.tsx, $(capture).test.node.ts, $(capture).test.node.tsx, $(capture).test.native.ts, $(capture).test.native.tsx, $(capture).test.ios.ts, $(capture).test.ios.tsx, $(capture).test.web.ts, $(capture).test.web.tsx, $(capture).test.android.ts, $(capture).test.android.tsx, ${capture}.native.tsx, ${capture}.ios.tsx, ${capture}.android.tsx, ${capture}.web.tsx, ${capture}.native.ts, ${capture}.ios.ts, ${capture}.android.ts, ${capture}.web.ts, ${capture}.native.js, ${capture}.ios.js, ${capture}.android.js, ${capture}.web.js, ${capture}.native.jsx, ${capture}.ios.jsx, ${capture}.android.jsx, ${capture}.web.jsx, ${capture}.stories.tsx, ${capture}.stories.ts, ${capture}.stories.jsx, ${capture}.stories.js"
 	},
-	"typescript.tsdk": "node_modules/typescript/lib"
+	"typescript.tsdk": "node_modules/typescript/lib",
+	"eslint.workingDirectories": [
+		"apps/server"
+	],
+	"biome.requireConfiguration": true
 }