mirror of
https://github.com/johndoe6345789/metabuilder.git
synced 2026-04-24 13:54:57 +00:00
Merge main branch - resolve dependency conflicts
Resolved merge conflicts between dependabot dependency updates and main branch: - frontends/dbal/package.json: Keep Next.js 16.1.5, use eslint-config-next 16.1.4 - frontends/dbal/package-lock.json: Updated to match package.json changes - pcbgenerator/requirements-dev.txt: Use fonttools 4.60.2 from main (newer) All other dependency updates from dependabot PR are preserved.
This commit is contained in:
791
frontends/dbal/package-lock.json
generated
791
frontends/dbal/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -30,7 +30,7 @@
|
||||
"@types/react-dom": "19.2.3",
|
||||
"autoprefixer": "10.4.23",
|
||||
"eslint": "^9.39.2",
|
||||
"eslint-config-next": "16.1.2",
|
||||
"eslint-config-next": "16.1.4",
|
||||
"postcss": "8.5.6",
|
||||
"tailwindcss": "^4.1.18",
|
||||
"typescript": "~5.9.3"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
freetype-py==2.5.1
|
||||
svg.path==7.0
|
||||
fonttools==4.59.0
|
||||
fonttools==4.60.2
|
||||
pytest==8.4.1
|
||||
pytest-timeout==2.4.0
|
||||
cairosvg==2.8.2
|
||||
|
||||
Reference in New Issue
Block a user