Merge branch 'main' into dependabot/github_actions/peter-evans/create-pull-request-7.0.9

Author: CommanderStorm

.github/workflows/build-docs.yml

@@ -12,7 +12,7 @@ jobs:
   build-test-deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with: { persist-credentials: false }
     - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
       with:

.github/workflows/bundle-size.yml

@@ -13,7 +13,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Setup Node.js
         uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0

.github/workflows/create-bumb-version-pr.yml

@@ -17,7 +17,7 @@ jobs:
         shell: bash
     steps:
 
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 0
           ref: main

.github/workflows/publish-style-spec.yml

@@ -13,7 +13,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 0
           ref: main
@@ -44,7 +44,7 @@ jobs:
     if: ${{ needs.release-check.outputs.publish == 'true' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 0
           persist-credentials: false

.github/workflows/test-all.yml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with: { persist-credentials: false }
       - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
@@ -29,7 +29,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with: { persist-credentials: false }
       - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
@@ -53,7 +53,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with: { persist-credentials: false }
       - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:

.oxfmtrc.jsonc

@@ -0,0 +1,7 @@
+{
+  "$schema": "./node_modules/oxfmt/configuration_schema.json",
+  "tabWidth": 4,
+  "singleQuote": true,
+  "bracketSpacing": false,
+  "trailingComma": "none"
+}

README.md

@@ -5,7 +5,7 @@
 
 # MapLibre Style Specification & Utilities
 
-[![NPM Version](https://badge.fury.io/js/@maplibre%2Fmaplibre-gl-style-spec.svg)](https://npmjs.org/package/@maplibre/maplibre-gl-style-spec) 
+[![NPM Version](https://badge.fury.io/js/@maplibre%2Fmaplibre-gl-style-spec.svg)](https://npmjs.org/package/@maplibre/maplibre-gl-style-spec)
 [![License](https://img.shields.io/badge/License-BSD_3--Clause-blue.svg?style=flat)](LICENSE.txt) [![PRs](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)](https://opensource.org/licenses/BSD-3-Clause) [![codecov](https://codecov.io/gh/maplibre/maplibre-style-spec/branch/main/graph/badge.svg)](https://codecov.io/gh/maplibre/maplibre-style-spec)
 
 This repository contains code and reference files that define the MapLibre style specification and provides some utilities for working with MapLibre styles.
@@ -16,46 +16,54 @@ The style specification is used in MapLibre GL JS and in MapLibre Native. Our lo
 
 If you want to contribute to the style specification, please open an issue with a design proposal. Once your design proposal has been accepted, you can open a pull request and implement your changes.
 
-We aim to avoid breaking changes in the MapLibre style specification, because it makes life easier for our users.
+We aim to avoid breaking changes in the MapLibre style specification because it makes life easier for our users.
 
 ## Documentation
 
-The [documentation](https://maplibre.org/maplibre-style-spec) of the style specification also lives in this repository. We use [MkDocs](https://www.mkdocs.org/) with the [Material for MkDocs](https://squidfunk.github.io/mkdocs-material) theme. 
+The [documentation](https://maplibre.org/maplibre-style-spec) of the style specification also lives in this repository.
+We use [MkDocs](https://www.mkdocs.org/) with the [Material for MkDocs](https://squidfunk.github.io/mkdocs-material) theme.
 
-To work on the documentation locally, you need to have Docker installed and running. Start MkDocs with
+To work on the documentation locally, you need to have Docker installed and running.
+Start MkDocs with
 
-```
+```bash
 npm run mkdocs
 ```
 
-Most of the documentation is generated (from e.g. `v8.json`). In another terminal, run:
+Most of the documentation is generated (from e.g. `v8.json`).
+In another terminal, run:
 
-```
+```bash
 WATCH=1 npm run generate-docs
 ```
 
 This will re-run the generation script when needed.
 
-Note that generated files should not be checked in and they are excluded in `.gitignore`. Make sure to keep this file up-to-date and ignore generated files while making sure static Markdown files are not ignored.
+Note that generated files should not be checked in, and they are excluded in `.gitignore`.
+Make sure to keep this file up to date and ignore generated files while making sure static Markdown files are not ignored.
 
 ## NPM Package
 
 
 The MapLibre style specification and utilities are published as a separate npm
 package so that they can be installed without the bulk of GL JS.
 
-    npm install @maplibre/maplibre-gl-style-spec
+```bash
+npm install @maplibre/maplibre-gl-style-spec
+```
 
 ## CLI Tools
 
 If you install this package globally, you will have access to several CLI tools.
 
-    npm install @maplibre/maplibre-gl-style-spec --global
+```bash
+npm install @maplibre/maplibre-gl-style-spec --global
+```
 
 ### `gl-style-migrate`
 
-This repo contains scripts for migrating GL styles of any version to the latest version
-(currently v8). Migrate a style like this:
+This repo contains scripts for migrating GL styles of any version to the latest version (currently v8).
+You can migrate a style like this:
 
 ```bash
 $ gl-style-migrate bright-v7.json > bright-v8.json
@@ -82,5 +90,5 @@ Will format the given style JSON to use standard indentation and sorted object k
 $ gl-style-validate style.json
 ```
 
-Will validate the given style JSON and print errors to stdout. Provide a
-`--json` flag to get JSON output.
+Will validate the given style JSON and print errors to stdout.
+Provide a `--json` flag to get JSON output.

bin/gl-style-migrate.ts

@@ -16,4 +16,3 @@ function help() {
     console.log('usage:');
     console.log('  gl-style-migrate style-v7.json > style-v8.json');
 }
-

bin/gl-style-validate.ts

@@ -5,7 +5,7 @@ import rw from 'rw';
 import {validateStyle as validate} from '../src/validate_style';
 
 const argv = minimist(process.argv.slice(2), {
-    boolean: 'json',
+    boolean: 'json'
 });
 
 if (argv.help || argv.h || (!argv._.length && process.stdin.isTTY)) {

build/bump-version-changelog.js

@@ -13,7 +13,8 @@ const changelogPath = 'CHANGELOG.md';
 let changelog = readFileSync(changelogPath, 'utf8');
 changelog = changelog.replace('## main', `## ${process.argv[2]}`);
 changelog = changelog.replaceAll('- _...Add new stuff here..._\n', '');
-changelog = `## main
+changelog =
+    `## main
 
 ### ✨ Features and improvements
 - _...Add new stuff here..._