Skip to content

Commit

Permalink
Merge branch 'color-issues' into space-warning
Browse files Browse the repository at this point in the history
* color-issues:
  sveltekit does not support vite v5 yet
  pin back stylelint for now
  Automated dependency upgrades
  Automated dependency upgrades
  Bump @adobe/css-tools from 4.3.1 to 4.3.2
  • Loading branch information
jgerigmeyer committed Dec 13, 2023
2 parents 3170b67 + 003f1f4 commit e477922
Show file tree
Hide file tree
Showing 3 changed files with 193 additions and 190 deletions.
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"editor.bracketPairColorization.enabled": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
Expand Down Expand Up @@ -40,7 +40,7 @@
"[scss]": {
"editor.rulers": [80],
"editor.codeActionsOnSave": {
"source.fixAll.stylelint": true
"source.fixAll.stylelint": "explicit"
}
},
"files.exclude": {
Expand Down
33 changes: 18 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,50 +42,53 @@
},
"devDependencies": {
"@sveltejs/adapter-auto": "^2.1.1",
"@sveltejs/kit": "^1.27.6",
"@testing-library/jest-dom": "^6.1.4",
"@sveltejs/kit": "^1.28.0",
"@testing-library/jest-dom": "^6.1.5",
"@testing-library/svelte": "^4.0.5",
"@types/jest": "^29.5.10",
"@types/jest": "^29.5.11",
"@types/lodash": "^4.14.202",
"@types/node": "*",
"@typescript-eslint/eslint-plugin": "^6.12.0",
"@typescript-eslint/parser": "^6.12.0",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"@vitest/coverage-v8": "^0.34.6",
"chokidar-cli": "^3.0.0",
"eslint": "^8.54.0",
"eslint-config-prettier": "^9.0.0",
"eslint": "^8.55.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-jest": "^27.6.0",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-svelte": "^2.35.1",
"jsdom": "^23.0.0",
"jsdom": "^23.0.1",
"lodash": "^4.17.21",
"mocha": "^10.2.0",
"mockdate": "^3.0.5",
"npm-run-all": "^4.1.5",
"postcss": "^8.4.31",
"prettier": "^3.1.0",
"postcss": "^8.4.32",
"prettier": "^3.1.1",
"prettier-plugin-svelte": "^3.1.2",
"sass": "^1.69.5",
"sass-true": "^7.0.0",
"sassdoc": "^2.7.4",
"sassdoc-theme-herman": "^5.0.1",
"stylelint": "^15.11.0",
"stylelint-config-standard-scss": "^11.1.0",
"svelte": "^4.2.7",
"svelte": "^4.2.8",
"svelte-check": "^3.6.2",
"ts-node": "^10.9.1",
"typescript": "^5.3.2",
"vite": "^5.0.2",
"ts-node": "^10.9.2",
"typescript": "^5.3.3",
"vite": "^4.5.1",
"vitest": "^0.34.6"
},
"resolutions": {
"vite": "<5"
},
"yarn-upgrade-all": {
"ignore": [
"@types/node"
"@types/node",
"@vitest/coverage-v8",
"vite",
"vitest"
]
},
"packageManager": "[email protected]"
Expand Down
Loading

0 comments on commit e477922

Please sign in to comment.