Merge branch 'master' into Updated-both-metricshub-schemas-to-match-s…

…oftware-changes

.editorconfig

@@ -23,3 +23,6 @@ trim_trailing_whitespace = false
 [*.cshtml]
 indent_style = space
 indent_size = 4
+
+[*.sh]
+indent_style = tab

.git-blame-ignore-revs

@@ -29,3 +29,9 @@
 
 # style: Format YAML files at project root
 d7eacc4d28028b906e505d21101ec904d8a3ceb8
+
+# Deindent standalone functions (in Gruntfile)
+36a6cccf396db9ac67937b4d0720548aa1868f7f
+
+# Unindent Grunt task functions
+ec2eff2d4485dff86239bd32cb5fc7f5acc76a4e

.github/CODEOWNERS

@@ -18,6 +18,3 @@ src/negative_test/zuul/ @ssbarnea
 src/schemas/json/circleciconfig.json @CircleCI-Public/developer-experience
 src/test/circleciconfig/ @CircleCI-Public/developer-experience
 src/negative_test/circleciconfig/ @CircleCI-Public/developer-experience
-
-# For testing purposes
-editor-features.md @hyperupcall

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -55,7 +55,7 @@ body:
       description: Who will make the PR?
       multiple: false
       options:
-        - Yes, I will create a PR.
         - No, someone else must create the PR.
+        - Yes, I will create a PR.
     validations:
       required: true

.github/ISSUE_TEMPLATE/feature_request_new_schema.yml

@@ -25,7 +25,7 @@ body:
       description: Who will make the PR?
       multiple: false
       options:
-        - Yes, I will create a PR.
         - No, someone else must create the PR.
+        - Yes, I will create a PR.
     validations:
       required: true

.github/ISSUE_TEMPLATE/feature_request_website.yml

@@ -18,7 +18,7 @@ body:
       description: Who will make the PR?
       multiple: false
       options:
-        - Yes, I will create a PR.
         - No, someone else must create the PR.
+        - Yes, I will create a PR.
     validations:
       required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,12 +1,6 @@
 <!--
 Thank you for submitting a pull request to SchemaStore.
 
-Before continuing, please read the guidelines:
+Before continuing, please read the contributing guidelines:
 https://github.com/SchemaStore/schemastore/blob/master/CONTRIBUTING.md
-
-Adding a JSON schema file to the catalog is required.
-Add tests files. (.json, .yml, .yaml or .toml)
-Use the most recent JSON Schema version that's well supported by editors and IDEs, currently draft-07.
-JSON formatted according to the .editorconfig settings.
-
 -->

.github/labeler.yml

@@ -1,72 +1,51 @@
-# Asp.Net files must not be updated.
-WARNING_AspNetFiles:
+# Changes to continuous integration.
+ci:
   - changed-files:
       - any-glob-to-any-file:
-          - 'src/bin/**/*'
-          - 'src/css/**/*'
-          - 'src/img/**/*'
-          - 'src/js/**/*'
-          - '**/*.sln'
-          - '**/*.cshtml'
-          - '**/*.config'
-          - '**/*.webinfo'
-          - '**/*.ico'
-          - '**/*.txt'
+          - '.github/**/*'
 
-# code change
-gruntfile:
+# Changes to JavaScript. This label used to have the name of "Gruntfile.js".
+# This label also supersedes the old "NodeJS" label, which was too broad.
+'cli.js':
   - changed-files:
       - any-glob-to-any-file:
-          - 'src/Gruntfile.cjs'
+          - 'cli.js'
+          - 'package.json'
 
-# schema setting change
-schema-validation.json:
+# Changes to configuration.
+'config:editorconfig':
   - changed-files:
       - any-glob-to-any-file:
-          - 'src/schema-validation.json'
-
-# possible code change
-ci:
+          - '.editorconfig'
+'config:eslintrcjson':
   - changed-files:
       - any-glob-to-any-file:
-          - '.github/**/*'
-
-# possible code change
-NodeJS:
+          - 'src/.eslintrc.json'
+'config:gitignore':
   - changed-files:
       - any-glob-to-any-file:
-          - '.github/**/*'
-          - 'src/package.json'
-          - 'src/package-lock.json'
+          - '.gitignore'
+          - '.gitattributes'
 
-# possible URL change
+# Changes to documentation.
 documentation:
   - changed-files:
       - any-glob-to-any-file:
           - '**/*.md'
 
-# formatting change
-editorconfig:
-  - changed-files:
-      - any-glob-to-any-file:
-          - '.editorconfig'
-
-# lint change
-eslintrcjson:
-  - changed-files:
-      - any-glob-to-any-file:
-          - 'src/.eslintrc.json'
-
-# .gitignore change
-gitignore:
+# Changes to Asp.Net files. Generally, they must NOT be updated.
+WARNING_AspNetFiles:
   - changed-files:
       - any-glob-to-any-file:
-          - '.gitignore'
-          - '.gitattributes'
-# Do not add "api", "schema" and "test" directories.
-# Those are the usual commit. No need for extra attention.
-# src/api/**/*
-# src/schema/*
-# src/test/**/*
-# src/negative_test/**/*
-
+          - 'src/bin/**/*'
+          - 'src/css/**/*'
+          - 'src/img/**/*'
+          - 'src/js/**/*'
+          - '**/*.sln'
+          - '**/*.cshtml'
+          - '**/*.config'
+          - '**/*.webinfo'
+          - '**/*.ico'
+          - '**/*.txt'
+# Do not add "src/{api,schemas,test}", etc. directories;
+# they are not special.

.github/workflows/codeowners-merge.yml

@@ -1,4 +1,4 @@
-name: 'Codeowners merging'
+name: 'Maintenance: Codeowners Detection and Mention'
 on:
   pull_request_target: { types: [opened] }
   issue_comment: { types: [created] }
@@ -8,10 +8,11 @@ jobs:
   codeowners-merge:
     if: "github.repository == 'SchemaStore/schemastore' && github.event.pull_request.draft == false"
     runs-on: ubuntu-latest
+    permissions: 'write-all'
     steps:
       - uses: 'actions/checkout@v4'
-      - name: 'Run Codeowners merge check'
-        uses: 'fox-forks/code-owner-self-merge@hyperupcall-feat-ownernopings'
+      - name: 'Run Codeowners check'
+        uses: 'OSS-Docs-Tools/code-owner-self-merge@3d0e2871b850d624a5a433fb7143fe4522ba5486'
         env:
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
         with:

.github/workflows/labeler.yml

@@ -1,4 +1,4 @@
-name: 'Pull Request Labeler'
+name: 'Maintenance: Label Pull Requests'
 on:
   - pull_request_target
 

.github/workflows/lint.yml

@@ -1,4 +1,4 @@
-name: Lint
+name: 'Maintenance: Lint'
 
 on: [push, pull_request]
 

.github/workflows/nodejs.yml

@@ -1,24 +1,19 @@
-name: Node.js CI
+name: 'Validate JSON Schemas'
 
 on: [push, pull_request]
 
 jobs:
-  build:
+  check:
     runs-on: ubuntu-latest
     timeout-minutes: 10
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          cache: 'npm'
           node-version: '18'
-          cache-dependency-path: src/package-lock.json
-      - name: npm ci
-        run: |
-          cd src
-          npm ci
-      - name: npm run build
-        run: |
-          cd src
-          npm run build
+          cache: 'npm'
+          cache-dependency-path: './package-lock.json'
+      - run: 'npm clean-install'
+      - run: 'npm run eslint'
+      - run: 'npm run check'

.github/workflows/stale.yml

@@ -1,4 +1,4 @@
-name: 'Close stale PRs'
+name: 'Maintenance: Close Stale PRs'
 on:
   schedule:
     - cron: '30 1 * * *'

.gitignore

@@ -1,13 +1,8 @@
-#################
-## Prettier
-#################
 # This ignore file is shared with Prettier. It seems .git/ must be ignored manually now.
 .git/
 
-#################
-## Visual Studio
-#################
-
+# Project files
+temp
 test.json
 *.webinfo
 .vs/
@@ -24,9 +19,9 @@ test.json
 *.publishproj
 *.pubxml
 node_modules/
+.venv/
 
 # Build results
-
 packages/
 [Oo]bj/
 
@@ -109,10 +104,6 @@ publish/
 *.Publish.xml
 *.pubxml
 
-# NuGet Packages Directory
-## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
-
 # Windows Azure Build Output
 csx
 *.build.csdef
@@ -132,7 +123,6 @@ ClientBin/
 *.pfx
 *.publishsettings
 .DS_Store
-src/temp
 
 # RIA/Silverlight projects
 Generated_Code/

.pre-commit-config.yaml

@@ -1,22 +1,23 @@
 ---
 repos:
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: 'v3.1.0'
+  - repo: 'https://github.com/rbubley/mirrors-prettier'
+    rev: 'v3.3.3'
     hooks:
-      - id: prettier
-        types_or: [yaml, json, javascript, css, markdown]
+      - id: 'prettier'
+        types_or: ['yaml', 'json', 'javascript', 'css', 'markdown']
         always_run: true
         additional_dependencies:
-          - 'prettier@3.1.0'
-          - 'prettier-plugin-sort-json@3.1.0'
+          - 'prettier@3.2.5'
+          - 'prettier-plugin-sort-json@4.0.0'
         pass_filenames: true
-        entry: ./src/scripts/pre-commit-script.sh
-  - repo: https://github.com/codespell-project/codespell
-    rev: 'v2.2.6'
+        args: ['--no-color', '--log-level=warn', '--write']
+  - repo: 'https://github.com/codespell-project/codespell'
+    rev: 'v2.3.0'
     hooks:
-      - id: codespell
-        exclude: '^src/(package-lock.json|test/openutau-ustx/bulaomeng.ustx.yaml|test/kustomization/labels.json|bin/.*)$'
+      - id: 'codespell'
+        exclude: '^(package-lock.json|src/test/openutau-ustx/bulaomeng.ustx.yaml|src/test/kustomization/labels.json|src/bin/.*)$'
         args:
           [
-            '-Lcrate,ninjs,ans,specif,seh,specifid,deriver,isnt,tye,forin,dependees,rouge,interm,fo,wast,nome,statics,ue,aack,gost,inout,provId,handels,bu,testng,ags,edn,aks,te,decorder,provid,branche,alse,nd,mape,wil,clude,wit',
+            '--ignore-words-list',
+            'crate,ninjs,ans,specif,seh,specifid,deriver,isnt,tye,forin,dependees,rouge,interm,fo,wast,nome,statics,ue,aack,gost,inout,provId,handels,bu,testng,ags,edn,aks,te,decorder,provid,branche,alse,nd,mape,wil,clude,wit,flate,omlet,THIRDPARTY,NotIn,notIn,CopyIn',
           ]