Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Adammatthiesen committed Dec 5, 2024
2 parents 36c9b46 + 8b2bbe8 commit 25bfbd6
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 72 deletions.
20 changes: 10 additions & 10 deletions .changeset /config.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$schema": "../node_modules/@changesets/config/schema.json",
"changelog": ["@changesets/changelog-github", { "repo": "withstudiocms/project-template" }],
"commit": false,
"fixed": [],
"linked": [],
"access": "public",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": ["playground"]
}
"$schema": "../node_modules/@changesets/config/schema.json",
"changelog": ["@changesets/changelog-github", { "repo": "withstudiocms/project-template" }],
"commit": false,
"fixed": [],
"linked": [],
"access": "public",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": ["playground"]
}
10 changes: 7 additions & 3 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"recommendations": ["astro-build.astro-vscode", "biomejs.biome", "streetsidesoftware.code-spell-checker"],
"unwantedRecommendations": []
}
"recommendations": [
"astro-build.astro-vscode",
"biomejs.biome",
"streetsidesoftware.code-spell-checker"
],
"unwantedRecommendations": []
}
21 changes: 9 additions & 12 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
{
"typescript.tsdk": "node_modules/typescript/lib",
"editor.codeActionsOnSave": {
"quickfix.biome": "explicit",
"source.organizeImports.biome": "explicit"
},
"editor.defaultFormatter": "biomejs.biome",
"editor.gotoLocation.multipleDefinitions": "goto",
"cSpell.words": [
"studiocms",
"withstudiocms"
]
}
"typescript.tsdk": "node_modules/typescript/lib",
"editor.codeActionsOnSave": {
"quickfix.biome": "explicit",
"source.organizeImports.biome": "explicit"
},
"editor.defaultFormatter": "biomejs.biome",
"editor.gotoLocation.multipleDefinitions": "goto",
"cSpell.words": ["studiocms", "withstudiocms"]
}
94 changes: 47 additions & 47 deletions biome.json
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
{
"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
"vcs": {
"enabled": true,
"clientKind": "git",
"useIgnoreFile": true,
"defaultBranch": "main"
},
"files": {
"ignoreUnknown": true,
"ignore": ["**/.astro/**", "**/package.json", "**/dist/**"]
},
"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
"vcs": {
"enabled": true,
"clientKind": "git",
"useIgnoreFile": true,
"defaultBranch": "main"
},
"files": {
"ignoreUnknown": true,
"ignore": ["**/.astro/**", "**/package.json", "**/dist/**"]
},
"formatter": {
"lineWidth": 100,
"lineEnding": "lf"
},
"javascript": {
"formatter": {
"lineWidth": 100,
"lineEnding": "lf"
},
"javascript": {
"formatter": {
"quoteStyle": "single",
"trailingCommas": "es5"
}
},
"json": {
"formatter": {
"indentStyle": "space"
}
},
"organizeImports": {
"enabled": true
},
"linter": {
"enabled": true,
"rules": {
"recommended": true,
"suspicious": {
"noExplicitAny": "warn"
}
"quoteStyle": "single",
"trailingCommas": "es5"
}
},
"json": {
"formatter": {
"indentStyle": "space"
}
},
"organizeImports": {
"enabled": true
},
"linter": {
"enabled": true,
"rules": {
"recommended": true,
"suspicious": {
"noExplicitAny": "warn"
}
},
"overrides": [
{
"include": ["*.astro"],
"linter": {
"rules": {
"style": {
"useConst": "off",
"useImportType": "off"
}
}
},
"overrides": [
{
"include": ["*.astro"],
"linter": {
"rules": {
"style": {
"useConst": "off",
"useImportType": "off"
}
}
}
]
}
}
]
}

0 comments on commit 25bfbd6

Please sign in to comment.