fix: resolve merge conflicts with main, add missing @testing-library/dom#1721
Merged
pethers merged 17 commits intodependabot/npm_and_yarn/eslint-10.1.0from Mar 24, 2026
Merged
Conversation
- Update package.json: rename to blacktrigram, add npm metadata, exports, peerDependencies, publishConfig - Add tsconfig.lib.json for TypeScript declaration generation - Add vite.lib.config.ts for Vite library mode bundling - Add .npmignore to control npm package contents - Add build:lib script for library build - Add publish job to release.yml workflow (following EP MCP Server pattern) - Update .gitignore to exclude lib/ build output - Update eslint.config.js to ignore lib/ directory - Update tsconfig.node.json to include vite.lib.config.ts Co-authored-by: pethers <1726836+pethers@users.noreply.github.com> Agent-Logs-Url: https://github.com/Hack23/blacktrigram/sessions/d41b4334-7914-41a8-85e3-7cabc868f149
…d fix npm pack verification Co-authored-by: pethers <1726836+pethers@users.noreply.github.com> Agent-Logs-Url: https://github.com/Hack23/blacktrigram/sessions/d41b4334-7914-41a8-85e3-7cabc868f149
…hing - Update typedoc.json sidebarLinks to match riksdagsmonitor pattern with all architecture docs (Architecture, Security Architecture, Threat Model, Data Model, Flowchart, State Diagram, Mindmap, SWOT, Future Architecture, Future Security) and ISMS references (Secure Dev Policy, Open Source Policy) - Update typedoc.json navigationLinks with npm Package and ISMS links - Update release-drafter.yml with npm package section, provenance verification, architecture documentation links, correct API docs URL (blacktrigram.com/api/), and additional resources section Co-authored-by: pethers <1726836+pethers@users.noreply.github.com> Agent-Logs-Url: https://github.com/Hack23/blacktrigram/sessions/91ac18bc-ace4-465e-84b2-b7f3c5bd47ef
- Remove rm -rf lib/assets from build:lib to preserve CSS/assets for consumers - Move React/Three.js/R3F/Drei from dependencies to devDependencies (keep as peerDependencies for library consumers) - Fix peerDependencies.three from ^0.170.0 to ^0.183.0 to match actual version - Remove non-existent CHANGELOG.md from files array Co-authored-by: pethers <1726836+pethers@users.noreply.github.com> Agent-Logs-Url: https://github.com/Hack23/blacktrigram/sessions/e51be5d8-c054-4b7e-94fb-63212a02eae3
…fix publish ref, clean npmignore - Add @react-three/postprocessing and postprocessing to peerDependencies (and peerDependenciesMeta as optional) - Fix publish job checkout ref to use release tag instead of 'main' for deterministic npm publishes - Remove non-existent CHANGELOG.md from .npmignore allowlist - Verified README.md, LICENSE, SECURITY.md are tracked in git and not in .gitignore Co-authored-by: pethers <1726836+pethers@users.noreply.github.com> Agent-Logs-Url: https://github.com/Hack23/blacktrigram/sessions/db64837b-0e92-4ef2-9a83-dd935b1f1950
… three/* externals, ignore-scripts publish Co-authored-by: pethers <1726836+pethers@users.noreply.github.com> Agent-Logs-Url: https://github.com/Hack23/blacktrigram/sessions/c76756d9-5a5f-4fb1-96fb-e97463bfd9af
Co-authored-by: pethers <1726836+pethers@users.noreply.github.com> Agent-Logs-Url: https://github.com/Hack23/blacktrigram/sessions/c76756d9-5a5f-4fb1-96fb-e97463bfd9af
…jectable asset base path Co-authored-by: pethers <1726836+pethers@users.noreply.github.com> Agent-Logs-Url: https://github.com/Hack23/blacktrigram/sessions/6c449b1b-7c23-4d3b-bbbb-744832c7eb3e
Co-authored-by: pethers <1726836+pethers@users.noreply.github.com> Agent-Logs-Url: https://github.com/Hack23/blacktrigram/sessions/6c449b1b-7c23-4d3b-bbbb-744832c7eb3e
Co-authored-by: pethers <1726836+pethers@users.noreply.github.com> Agent-Logs-Url: https://github.com/Hack23/blacktrigram/sessions/b18c2fb5-f387-4de6-aec0-3ca2bcd27d95
…lse positive Co-authored-by: pethers <1726836+pethers@users.noreply.github.com> Agent-Logs-Url: https://github.com/Hack23/blacktrigram/sessions/b18c2fb5-f387-4de6-aec0-3ca2bcd27d95
…add missing-slash test Co-authored-by: pethers <1726836+pethers@users.noreply.github.com> Agent-Logs-Url: https://github.com/Hack23/blacktrigram/sessions/1ac44a25-578b-473e-bb56-9be7afc3df34
…dy caches) Co-authored-by: pethers <1726836+pethers@users.noreply.github.com> Agent-Logs-Url: https://github.com/Hack23/blacktrigram/sessions/2ade8cfc-d557-4081-8d63-c77ab822a848
…hing feat: add npm package publishing support with typedoc and release-drafter improvements
Contributor
Dependency ReviewThe following issues were found:
|
# Conflicts: # package-lock.json # package.json
Copilot
AI
changed the title
[WIP] Chore: Bump eslint from 9.39.2 to 10.1.0
fix: resolve merge conflicts with main, add missing @testing-library/dom
Mar 24, 2026
a3df7c0
into
dependabot/npm_and_yarn/eslint-10.1.0
4 of 5 checks passed
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.
ESLint 10 migration branch conflicted with main after PR #1718 (npm publishing setup) landed.
Merge conflict resolution
@eslint/js: ^10.0.0from ESLint 10 branch, merged in@react-three/{drei,fiber,postprocessing}devDependencies from mainnpm installMissing peer dependency fix
@testing-library/domexplicitly to devDependencies — it's a peer dep of@testing-library/reactthat doesn't auto-install under--legacy-peer-deps(required foreslint-plugin-react-hooksESLint 10 compat). Without it, 210 test files fail withCannot find module '@testing-library/dom'.💡 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.