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:
11
package.json
11
package.json
@@ -58,11 +58,12 @@
|
||||
"zone.js": "~0.15.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@analogjs/vite-plugin-angular": "~1.10.0",
|
||||
"@analogjs/vitest-angular": "~1.10.0",
|
||||
"@analogjs/vite-plugin-angular": "~1.17.1",
|
||||
"@analogjs/vitest-angular": "~1.17.1",
|
||||
"@angular-devkit/build-angular": "20.0.3",
|
||||
"@angular-devkit/core": "20.0.2",
|
||||
"@angular-devkit/schematics": "20.0.2",
|
||||
"@angular/build": "20.0.3",
|
||||
"@angular/cli": "~20.0.0",
|
||||
"@angular/compiler-cli": "20.0.3",
|
||||
"@angular/language-service": "20.0.3",
|
||||
@@ -89,8 +90,8 @@
|
||||
"@types/node": "18.16.9",
|
||||
"@types/uuid": "^10.0.0",
|
||||
"@typescript-eslint/utils": "^8.33.1",
|
||||
"@vitest/coverage-v8": "^1.0.4",
|
||||
"@vitest/ui": "^1.3.1",
|
||||
"@vitest/coverage-v8": "^3.1.1",
|
||||
"@vitest/ui": "^3.1.1",
|
||||
"angular-eslint": "20.1.1",
|
||||
"autoprefixer": "^10.4.20",
|
||||
"eslint": "^9.28.0",
|
||||
@@ -119,7 +120,7 @@
|
||||
"typescript": "5.8.3",
|
||||
"typescript-eslint": "^8.33.1",
|
||||
"vite": "6.3.5",
|
||||
"vitest": "^1.3.1"
|
||||
"vitest": "^3.1.1"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"@esbuild/linux-x64": "^0.25.5"
|
||||
|
||||
Reference in New Issue
Block a user