Skip to content

Commit

Permalink
Merge remote-tracking branch 'fork/master' into fork-master
Browse files Browse the repository at this point in the history
  • Loading branch information
t.eitzenberger committed Jan 23, 2025
2 parents 630e21b + 8222053 commit 74b58de
Show file tree
Hide file tree
Showing 25 changed files with 3,660 additions and 1,128 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repos:
rev: 'v2.3.0'
hooks:
- id: 'codespell'
exclude: '^(package-lock.json|src/test/openutau-ustx/bulaomeng.ustx.yaml|src/test/kustomization/labels.json|src/bin/.*)$'
exclude: '^(package-lock.json|src/test/openutau-ustx/bulaomeng.ustx.yaml|src/test/kustomization/labels.json|src/test/bun-lock/bun.lock.json|src/bin/.*)$'
args:
[
'--ignore-words-list',
Expand Down
15 changes: 15 additions & 0 deletions .prettierrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,20 @@ module.exports = {
}),
},
},
{
files: 'src/test/bun-lock/bun.lock.json',
options: {
jsonRecursiveSort: false,
jsonSortOrder: JSON.stringify({
'.': 'none',
'*': 'none',
lockfileVersion: 'none',
workspaces: 'none',
'/^\\$.*/': null,
}),
bracketSameLine: true,
printWidth: 100000000000,
},
},
],
}
45 changes: 38 additions & 7 deletions src/api/json/catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,12 @@
"0.65.0": "https://json.schemastore.org/sourcehut-build-0.65.0.json"
}
},
{
"name": "bun.lock",
"description": "bun.lock file",
"fileMatch": ["bun.lock"],
"url": "https://json.schemastore.org/bun.lock.json"
},
{
"name": "bundleconfig.json",
"description": "bundleconfig.json files",
Expand Down Expand Up @@ -3513,6 +3519,12 @@
"1.6": "https://json.schemastore.org/mkdocs-1.6.json"
}
},
{
"name": "mrdocs.yml",
"description": "MrDocs configuration file",
"fileMatch": ["mrdocs.yml"],
"url": "https://raw.githubusercontent.com/cppalliance/mrdocs/refs/heads/master/docs/mrdocs.schema.json"
},
{
"name": "MLOS Configs",
"description": "Config files for the mlos_bench utility in MLOS",
Expand Down Expand Up @@ -4368,6 +4380,12 @@
"v0": "https://json.schemastore.org/radiohound-v0.json"
}
},
{
"name": "PyGTA Config",
"description": "Configuration file used by pyglotaran and pyglotaran-extras",
"fileMatch": ["pygta_config.yaml", "pygta_config.yml"],
"url": "https://pyglotaran-extras.readthedocs.io/en/latest/_static/pygta_config.schema.json"
},
{
"name": "Rancher Fleet",
"description": "Rancher Fleet fleet.yaml configuration file",
Expand Down Expand Up @@ -5205,6 +5223,16 @@
"description": "Traefik v2 Dynamic Configuration File Provider",
"url": "https://json.schemastore.org/traefik-v2-file-provider.json"
},
{
"name": "Traefik v3",
"description": "Traefik v3 YAML configuration file",
"url": "https://json.schemastore.org/traefik-v3.json"
},
{
"name": "Traefik v3 File Provider",
"description": "Traefik v3 Dynamic Configuration File Provider",
"url": "https://json.schemastore.org/traefik-v3-file-provider.json"
},
{
"name": "transcend.yml",
"description": "Define personal data in code using Transcend",
Expand Down Expand Up @@ -6060,7 +6088,7 @@
"name": "swcrc",
"description": "swc configuration files",
"fileMatch": [".swcrc"],
"url": "https://json.schemastore.org/swcrc.json"
"url": "https://swc.rs/schema.json"
},
{
"name": "OpenWeather Road Risk API",
Expand Down Expand Up @@ -7350,15 +7378,21 @@
{
"name": "Chamaleon template",
"description": "Chamaleon template",
"fileMatch": ["**/environments/cha-template.json"],
"fileMatch": ["template.chamaleon.json"],
"url": "https://raw.githubusercontent.com/gerardorodriguezdev/chamaleon/refs/heads/master/schemas/template-schema.json"
},
{
"name": "Chamaleon environment",
"description": "Chamaleon environment",
"fileMatch": ["**/environments/*-cha.json"],
"fileMatch": ["*.environment.chamaleon.json"],
"url": "https://raw.githubusercontent.com/gerardorodriguezdev/chamaleon/refs/heads/master/schemas/environment-schema.json"
},
{
"name": "Chamaleon properties",
"description": "Chamaleon properties",
"fileMatch": ["properties.chamaleon.json"],
"url": "https://raw.githubusercontent.com/gerardorodriguezdev/chamaleon/refs/heads/master/schemas/properties-schema.json"
},
{
"name": "ctfd-setup configuration file",
"description": "CTFer.io ctfd-setup utility configuration file",
Expand Down Expand Up @@ -7413,10 +7447,7 @@
{
"name": "gematik tiger test environment configuration",
"description": "A configuration file for the test environment of the gematik Tiger test platform",
"fileMatch": [
"**/tiger.yml",
"**/tiger.yaml"
],
"fileMatch": ["**/tiger.yml", "**/tiger.yaml"],
"url": "https://json.schemastore.org/gematik-tiger.json"
}
]
Expand Down
3 changes: 3 additions & 0 deletions src/schema-validation.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,9 @@
"bower.json": {
"externalSchema": ["base-04.json"]
},
"bun-lock.json": {
"unknownKeywords": ["allowTrailingCommas"]
},
"cargo-make.json": {
"unknownKeywords": ["x-taplo", "x-taplo-info", "links"]
},
Expand Down
Loading

0 comments on commit 74b58de

Please sign in to comment.