mirror of
https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend
synced 2025-12-28 22:42:11 +01:00
Merge branch 'refactor/convert-buildable-libs-to-non-buildable' into develop
Resolved conflicts: - .gitignore: Added .claude to ignored files - nx.json: Kept HEAD version with extra eslint.config.js exclusion - package.json: Merged dependencies, updated vitest to v3.1.1 for compatibility - eslint config files: Fixed merge conflicts and accepted conversion from .mjs to .js - Removed deleted files from refactor branch - Regenerated package-lock.json with --legacy-peer-deps Build and tests pass successfully.
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -58,6 +58,7 @@ libs/swagger/src/lib/*
|
||||
.nx/cache
|
||||
.nx/workspace-data
|
||||
.angular
|
||||
.claude
|
||||
|
||||
|
||||
storybook-static
|
||||
@@ -68,4 +69,4 @@ storybook-static
|
||||
.github/instructions/nx.instructions.md
|
||||
|
||||
vite.config.*.timestamp*
|
||||
vitest.config.*.timestamp*
|
||||
vitest.config.*.timestamp*
|
||||
|
||||
Reference in New Issue
Block a user