Merge main: Preserve security features while adopting type improvements#1
Open
Merge main: Preserve security features while adopting type improvements#1
Conversation
Co-authored-by: alexandrehebert <6586266+alexandrehebert@users.noreply.github.com>
Co-authored-by: alexandrehebert <6586266+alexandrehebert@users.noreply.github.com>
Co-authored-by: alexandrehebert <6586266+alexandrehebert@users.noreply.github.com>
Co-authored-by: alexandrehebert <6586266+alexandrehebert@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Check for potential vulnerabilities
Add XSS protection and SRI to external scripts
Feb 13, 2026
Co-authored-by: alexandrehebert <6586266+alexandrehebert@users.noreply.github.com>
Copilot
AI
changed the title
Add XSS protection and SRI to external scripts
Fix: Use pnpm instead of npm for dependency installation
Feb 13, 2026
Co-authored-by: alexandrehebert <6586266+alexandrehebert@users.noreply.github.com>
Copilot
AI
changed the title
Fix: Use pnpm instead of npm for dependency installation
Add @astrojs/check for type checking support
Feb 13, 2026
- Kept security enhancements: DOMPurify sanitization and SRI hash - Adopted type definitions from main (Experience, Education, CvData interfaces) - Merged conditional rendering improvements for skills - Added html2pdf type declaration - Regenerated pnpm-lock.yaml with all dependencies - Build successful, type check passes with 0 errors
Copilot
AI
changed the title
Add @astrojs/check for type checking support
Merge main: Preserve security features while adopting type improvements
Feb 13, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merged main branch (unrelated histories) into feature branch, resolving conflicts to preserve XSS protections while adopting TypeScript type definitions.
Conflict Resolution Strategy
src/lib/cv.ts- Combined both branches:Experience,Education,CvDatainterface definitionssrc/components/CvPage.astro- Merged approaches:declare const html2pdf: anyfor type safetyexperience.skills!.length)package.json- Merged dependencies:isomorphic-dompurify@^3.0.0-rc.2(XSS protection)@astrojs/check@^0.9.6,typescript@^5.8.3(from main)pnpm-lock.yaml- Regenerated with--no-frozen-lockfileKey Technical Decision
The cv.ts merge required combining two different approaches to the same file. Main branch added proper TypeScript interfaces for type safety, while feature branch added security hardening. Both were necessary, so the resolution layers them:
Warning
Firewall rules blocked me from connecting to one or more addresses (expand for details)
I tried to connect to the following addresses, but was blocked by firewall rules:
telemetry.astro.build/home/REDACTED/work/_temp/ghcca-node/node/bin/node node /home/REDACTED/work/cv/cv/node_modules/.bin/../astro/astro.js build(dns block)If you need me to access, download, or install something from one of these locations, you can either:
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.