Skip to content

Commit 23949f8

Browse files
committed
Merge branch 'main' of github.com:marcelocra/devmagic
2 parents fe3837b + 41e00ca commit 23949f8

14 files changed

Lines changed: 1857 additions & 644 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,18 @@
1919
"TZ": "${localEnv:TZ:America/Sao_Paulo}",
2020
"LC_ALL": "${localEnv:LC_ALL:en_US.UTF-8}",
2121
"LANG": "${localEnv:LANG:en_US.UTF-8}",
22+
2223
// Shell history directory. You must mount have a mounted ~/.shell_histories
2324
// directory for the history to persist across containers and WSL sessions.
2425
// Otherwise, history will be lost when the container is removed.
2526
"MCRA_HISTORY_DIR": "/home/node/.shell_histories",
27+
2628
// Workspace folder for history file naming (auto-set by VS Code).
2729
"WORKSPACE_FOLDER": "${containerWorkspaceFolder}",
30+
2831
// Ollama host URL for local LLM development.
29-
"OLLAMA_HOST": "${localEnv:OLLAMA_HOST:http://host.docker.internal:11434}",
32+
// "OLLAMA_HOST": "${localEnv:OLLAMA_HOST:http://host.docker.internal:11434}",
33+
3034
// Dotfiles configuration. Override via host environment variables.
3135
// Set DEVMAGIC_DOTFILES_REPO in your ~/.bashrc or ~/.zshrc to use your own repo.
3236
// Set to empty string to disable dotfiles: export DEVMAGIC_DOTFILES_REPO=""
@@ -48,10 +52,15 @@
4852
},
4953

5054
// Debian/Ubuntu-based distributions with the apt package manager installed.
51-
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
55+
// "ghcr.io/devcontainers/features/docker-in-docker:2": {},
5256

5357
// Debian/Ubuntu-based distributions with the apt package manager installed.
54-
"ghcr.io/devcontainers/features/git-lfs:1": {},
58+
"ghcr.io/devcontainers/features/git-lfs:1": {
59+
// If you don't have git lfs in your regular workflow and in your .gitconfig,
60+
// turn this to true or remove it, but BEWARE: this might NOT work properly
61+
// if you are using pre/post commit hooks.
62+
"autoPull": false
63+
},
5564

5665
// Alpine, Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and RockyLinux distributions with the apk, apt, yum, dnf, or microdnf package manager installed.
5766
"ghcr.io/devcontainers/features/git:1": {},
@@ -91,7 +100,7 @@
91100
// - Linux/macOS: HOME (USERPROFILE is empty)
92101

93102
// Share Ollama models with host.
94-
"source=${localEnv:HOME}${localEnv:USERPROFILE}/.ollama,target=/home/node/.ollama,type=bind,consistency=cached",
103+
// "source=${localEnv:HOME}${localEnv:USERPROFILE}/.ollama,target=/home/node/.ollama,type=bind,consistency=cached",
95104

96105
// Shell history shared across all containers and WSL.
97106
// In WSL: ln -s /mnt/c/Users/{username}/OneDrive/shell_histories ~/.shell_histories
@@ -104,7 +113,15 @@
104113
"forwardPorts": [],
105114

106115
// Set custom hostname for the container.
107-
"runArgs": ["--hostname=automaton"],
116+
// tmpfs for /tmp: Creates an isolated, writable /tmp in the container to avoid
117+
// Podman rootless SELinux restrictions. This is standard and doesn't reduce security—
118+
// tmpfs is ephemeral (cleared on container stop) and isolated from the host.
119+
// mode=1777 explicitly sets world-writable + sticky bit (standard /tmp permissions).
120+
"runArgs": [
121+
"--hostname=automaton",
122+
"--tmpfs",
123+
"/tmp:rw,exec,nosuid,nodev,mode=1777"
124+
],
108125
"customizations": {
109126
"vscode": {
110127
"extensions": [

CHANGELOG.md

Lines changed: 15 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Added
1111

12+
- Add `/install/prettier` endpoint to quickly install prettier+husky+lintstaged (#61)
13+
- Add aliases to simplify getting a file
14+
- Create route.ts for a new tool endpoint
15+
- Refactor devcontainer setup script to remove AI tools
16+
- Configure git-lfs feature with autoPull setting
17+
- Comment out ollama stuff
18+
- Comment out docker-in-docker feature in devcontainer
1219
- Remove unused and unnecessary files
1320
- Remove SSH key setup from devcontainer script
1421
- Add curl/wget toggle and fix copy button visibility (#53)
@@ -37,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3744

3845
### Changed
3946

47+
- Bump the dev-dependencies group across 1 directory with 3 updates (#66)
4048
- Cleanup credential bindings in devcontainer.json; comment unused extensions
4149
- Update next.js version
4250
- Rename dotfiles installation plan file and update references
@@ -50,51 +58,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5058

5159
### Documentation
5260

53-
- Update changelog [skip ci]
54-
- Update changelog [skip ci]
55-
- Update changelog [skip ci]
56-
- Update changelog [skip ci]
57-
- Update changelog [skip ci]
58-
- Update changelog [skip ci]
59-
- Update changelog [skip ci]
60-
- Update changelog [skip ci]
61-
- Update changelog [skip ci]
62-
- Update changelog [skip ci]
63-
- Update changelog [skip ci]
64-
- Update changelog [skip ci]
65-
- Update changelog [skip ci]
66-
- Update changelog [skip ci]
6761
- Update VISUAL_IDENTITY.md to reflect current design implementation (#30)
68-
- Update changelog [skip ci]
69-
- Update changelog [skip ci]
70-
- Update changelog [skip ci]
71-
- Update changelog [skip ci]
72-
- Update changelog [skip ci]
73-
- Update changelog [skip ci]
74-
- Update changelog [skip ci]
7562
- Update documentation to clarify handling of environment variables and default values in DevMagic
76-
- Update changelog [skip ci]
7763
- Enhance Copilot instructions with current stack and best practices (#10)
78-
- Update changelog [skip ci]
79-
- Update changelog [skip ci]
8064
- Refine insights on over-engineering in AI suggestions
81-
- Update changelog [skip ci]
8265
- Add blog post on the pitfalls of over-engineering with AI suggestions
8366
- Add blog post on using containerEnv vs remoteEnv for Dev Container setup
8467
- Save outline for potential blog posts and notes on AI context files
8568
- Archive the comprehensive refactor plan for DevContainer from script to features
8669
- Update docs
8770
- Update installation flow with Mermaid diagram and synchronization notes
88-
- Update changelog [skip ci]
89-
- Update changelog [skip ci]
90-
- Update changelog [skip ci]
91-
- Update changelog [skip ci]
92-
- Update changelog [skip ci]
93-
- Update changelog [skip ci]
9471
- Update Copilot instructions with commit message guidelines and changelog automation details
9572

9673
### Fixed
9774

75+
- Make it work before full fix/refactor
76+
- Use correct file from languageicon.org (#57)
77+
- Use git as main alias for gitconfig
78+
- Use correct API
79+
- Delete incorrect tool/route.ts (pt. 2 - final)
80+
- Create route.ts for /tool in the correct place for dynamic routes (pt. 1)
81+
- Make it work without dind
9882
- Load showcase projects from www/data/showcase.yml (#33)
9983
- Button content stacking vertically instead of inline (#26)
10084
- Revert logo to previous simpler version without animation (#24)
@@ -103,119 +87,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
10387
- Update dotfiles integration with conditional automatic cloning and installation during container setup
10488
- Update changelog script to output to CHANGELOG.md instead of prepending
10589
- Comment out GitHub Releases link in ChangelogPage as we don't use releases for now
106-
## [0.2.1] - 2025-11-25
107-
108-
### Added
109-
110-
- Update devcontainer setup script to install correct AI CLI tools
111-
112-
### Fixed
113-
114-
- Devcontainer build and AI tool packages
115-
- Comment out Node.js feature in devcontainer configuration, as image already has node
116-
## [0.2.0] - 2025-11-25
117-
118-
### Added
119-
120-
- Enhance documentation with architecture details and dotfiles integration
121-
- Add dotfiles installation script execution to container setup
122-
- Update changelog and getting started pages for improved project setup instructions
123-
- Update devcontainer setup script and routes for AI CLI tools installation
124-
- Do most of the migration work (see TODO.md)
125-
- The config script is too long. reviewed and decided to refactor to use devcontainer features instead
126-
127-
### Changed
128-
129-
- Prepare v0.2.0 release
130-
- Make consumer mode the default
131-
- Reorder features and add more docs
132-
- Add pnpm workspace configuration and turbo.json for task management
133-
- Remove devcontainer.json, as it was moved to the .devcontainer folder
134-
135-
### Documentation
136-
137-
- Improve documentation
138-
## [0.1.0] - 2025-11-20
139-
140-
### Added
141-
142-
- Add devcontainer setup configuration and update setup scripts
143-
- Add Git CLI support to devcontainer configuration
144-
- Add .editorconfig, .gitignore, package.json, and pnpm-lock.yaml for project configuration (prettier only respects md formatting with 4 spaces in version 3+)
145-
- Add OpenAI ChatGPT extensions to devcontainer configuration
146-
- Add .env.example for setup configuration and update README for customization instructions
147-
- Mention quick and interactive modes in the devcontainer.json
148-
- Add showcase entries for multiple projects
149-
- Delete www/public/CNAME
150-
- Add CNAME file for custom domain
151-
- Build site in docs folder
152-
- Add logo to header, purple theme, and working dark mode toggle
153-
- Add complete DevMagic documentation website and project files
154-
- Add devmagic setup script for submodule-based development environment
155-
- Update shell history configuration for WSL and Windows in devcontainer.json
156-
- Add environment variables for shell history and workspace folder in devcontainer.json
157-
- Remove container name; remove unused ports; clean up comments
158-
- Add more extensions that I use and refactor them in devcontainer.json
159-
- Add git lfs as devcontainer feature
160-
- Restructure devcontainer setup with new Dockerfiles and configuration
161-
- Use a smaller image by default
162-
- Add Table of Contents to README
163-
- Revise README for improved clarity on usage
164-
- Add standalone usage to usage instructions
165-
- Enhance README with usage instructions (consumer/self-usage)
166-
- Add devcontainer configuration for DevMagic
167-
- Add claude code and gemini cli companion extensions
168-
- Disable mise by default. not necessary now
169-
- Improve README with DevMagic usage instructions
170-
- Add tailwind extension
171-
- Update files to latest version
172-
- Update devcontainer
173-
- Add reference devcotnainer, docker-compose and dockerfile
174-
175-
### Changed
176-
177-
- Update file download structure in setup script, along with names
178-
- Improve git check in devmagic.sh setup script
179-
- Replace submodule approach with direct file downloads
180-
- Migrate website from Astro to Next.js 16
181-
- Update LICENSE.md to include full Apache License text and formatting improvements
182-
- Update author name in about page
183-
- Update lockfile
184-
- Migrate from GitHub Pages to Vercel with dynamic routes
185-
- Deploy website for c9eb606
186-
- Deploy website for b8b5fc6
187-
- Deploy website for f15a133
188-
- Deploy website for c7751e5
189-
- Update site
190-
- Use pnpm instead of npm
191-
- Add .gitattributes to prevent merge conflicts in auto-generated docs folder
192-
- Update pnpm version to 10.9.0
193-
- Update to Node.js 22 and pnpm 10, modernize copyright
194-
- Upgrade to Tailwind CSS v4 and pnpm
195-
- Update README for clarity and consistency in usage instructions
196-
197-
### Documentation
198-
199-
- Add documentation for handling auto-generated docs folder
200-
- Improve comments for user settings and environment variables in devcontainer.json
201-
202-
### Fixed
203-
204-
- Update copyright attribution in LICENSE.md
205-
- Update author name in About page
206-
- Get tailwind to work correctly
207-
- Update customization link in devcontainer setup script
208-
- Update to version 0.1.0 and add /install@version support
209-
- Update setup script URLs to use devmagic.run for consistency
210-
- Resolve /setup route and theme toggle issues
211-
- Configure Tailwind v4 @theme to generate custom color utilities
212-
- Resolve build errors and complete Tailwind v4 migration
213-
- Correct PostgreSQL environment variable name in docker-compose.yml
214-
- Update comments and correct image version in devcontainer configuration
215-
- Remove devcontainer with invalid setting and update documentation
216-
- Update README links to use correct anchors
217-
[unreleased]: https://github.com/marcelocra/devmagic/compare/v0.2.1...HEAD
218-
[0.2.1]: https://github.com/marcelocra/devmagic/compare/v0.2.0...v0.2.1
219-
[0.2.0]: https://github.com/marcelocra/devmagic/compare/v0.1.0...v0.2.0
220-
[0.1.0]: https://github.com/marcelocra/devmagic/releases/tag/v0.1.0
22190

cliff.toml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,19 @@ conventional_commits = true
6363
filter_unconventional = true
6464
split_commits = false
6565

66+
# Skip tags to preserve manually curated history
67+
skip_tags = "v0\\.1\\.0|v0\\.2\\.0|v0\\.2\\.1"
68+
6669
# Commit parsers for grouping
6770
commit_parsers = [
71+
# Skip automated changelog update commits to prevent recursive entries
72+
{ message = "(?i)^docs.*(?:update changelog|\\[skip ci\\])", skip = true },
73+
# Skip release preparation commits
74+
{ message = "^chore\\(release\\)", skip = true },
75+
# Skip dependency update commits from Dependabot
76+
{ message = "^chore\\(deps\\)", skip = true },
77+
# Skip all CI-related commits
78+
{ message = "^ci", skip = true },
6879
{ message = "^feat", group = "Added" },
6980
{ message = "^fix", group = "Fixed" },
7081
{ message = "^doc", group = "Documentation" },
@@ -73,10 +84,7 @@ commit_parsers = [
7384
{ message = "^refactor", group = "Changed" },
7485
{ message = "^style", group = "Changed" },
7586
{ message = "^test", group = "Changed" },
76-
{ message = "^chore\\(release\\)", skip = true },
77-
{ message = "^chore\\(deps\\)", skip = true },
7887
{ message = "^chore", group = "Changed" },
79-
{ message = "^ci", skip = true },
8088
{ message = "^build", group = "Changed" },
8189
{ body = ".*security", group = "Security" },
8290
{ message = "^revert", group = "Removed" },

0 commit comments

Comments
 (0)