Skip to content

update package dependencies#2

Merged
mabiede merged 8 commits into
masterfrom
maintenance-2601
Jan 8, 2026
Merged

update package dependencies#2
mabiede merged 8 commits into
masterfrom
maintenance-2601

Conversation

@mabiede

@mabiede mabiede commented Jan 8, 2026

Copy link
Copy Markdown

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This pull request modernizes the project's build infrastructure and dependency management by updating package dependencies, simplifying the installation process, removing the Cstruct dependency in favor of direct string operations, and upgrading the dune language version.

Key changes include:

  • Migration from Cstruct to native string operations for CSRF token handling
  • Addition of pin-depends for opium, rock, and letters packages
  • Removal of .opam.locked files in favor of simpler dependency management
  • Update of dune language from 2.7 to 3.0 for improved formatting consistency
  • Removal of unused Node.js from the main devcontainer (kept in template)
  • Upgrade to OCaml 5.x (5.3 in CI, 5.4 in Dockerfiles) and opam 2.3

Reviewed changes

Copilot reviewed 36 out of 36 changed files in this pull request and generated 5 comments.

Show a summary per file
File Description
sihl/src/web_csrf.ml Replaced Cstruct-based token handling with native string operations
sihl/test/web_csrf.ml Updated tests to use string-based token operations instead of Cstruct
sihl/src/dune Removed cstruct dependency and reformatted libraries multiline
sihl/test/dune Reformatted executables and libraries multiline for consistency
sihl.opam Added alphabetically sorted dependencies, removed cstruct, added dev-setup tools
sihl.opam.template Added pin-depends for opium and rock packages
sihl.opam.locked Removed locked file in favor of flexible dependency resolution
sihl-*/test/dune Reformatted all test dune files for consistency
sihl-*.opam Alphabetically sorted dependencies and added dev-setup tools across all packages
sihl-*.opam.locked Removed all locked files
sihl-email.opam.template Added pin-depends for letters package
dune-project Updated dune language to 3.0 and reformatted dependencies alphabetically
.devcontainer/Dockerfile Removed Node.js dependencies, updated to OCaml 5.4 and opam 2.3
.devcontainer/devcontainer.json Updated VS Code settings structure and OCaml sandbox configuration
.devcontainer/postCreate.sh Simplified installation using new opam flags
.devcontainer/docker-compose.yml Removed node_modules volume
template/.devcontainer/* Updated template devcontainer to OCaml 5.4, kept Node.js for template usage
default.nix Removed yarn from nix shell dependencies
Makefile Simplified deps target to single opam command
.github/workflows/ci.yml Added OCaml 5.3 to CI test matrix

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread .devcontainer/devcontainer.json
Comment thread .devcontainer/Dockerfile Outdated
Comment thread .github/workflows/ci.yml
Comment thread sihl-email.opam.template
Comment thread sihl-email.opam

@PossessedC0bra PossessedC0bra left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@mabiede
mabiede merged commit 2c4978a into master Jan 8, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants