Skip to content

Commit

Permalink
Merge pull request #1849 from RobAndrewHurst/prettier
Browse files Browse the repository at this point in the history
prettier formatting
  • Loading branch information
RobAndrewHurst authored Jan 29, 2025
2 parents bf284a5 + 5b9e856 commit bd850f6
Show file tree
Hide file tree
Showing 281 changed files with 9,666 additions and 9,577 deletions.
31 changes: 18 additions & 13 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,30 @@
## Description

Please include a summary of the changes requested, and/or the steps to reproduce the issue.
If applicable, add screenshots to help explain.
If applicable, add screenshots to help explain.

## Technical Information

Please delete options that are not relevant.

### Desktop
- OS: [e.g. Windows, iOS, Linux]
- Browser [e.g. chrome, safari]
- Version [e.g. v4.7.1]
### Smartphone
- Device: [e.g. iPhone12]
- OS: [e.g. iOS15.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

## Type of Issue
Please delete options that are not relevant, and select all options that apply.

- OS: [e.g. Windows, iOS, Linux]
- Browser [e.g. chrome, safari]
- Version [e.g. v4.7.1]

### Smartphone

- Device: [e.g. iPhone12]
- OS: [e.g. iOS15.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

## Type of Issue

Please delete options that are not relevant, and select all options that apply.

- ✅ Bug
- ✅ New Feature
- ✅ Documentation
- ✅ Testing
- ✅ Testing
20 changes: 12 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,37 @@ Please include a summary of the changes, and the motivation for the change.

## GitHub Issue

Provide the link to the relevant GitHub issue it addresses.
Provide the link to the relevant GitHub issue it addresses.

## Type of Change
Please delete options that are not relevant, and select all options that apply.

Please delete options that are not relevant, and select all options that apply.

- ✅ Bug fix (non-breaking change which fixes an issue)
- ✅ New feature (non-breaking change which adds functionality)
- ✅ Breaking change (fix or feature that would cause existing functionality to not work as expected)
- ✅ Documentation
- ✅ Testing

## How have you tested this?
Please describe how to test this change and how you verified it worked.
## How have you tested this?

Please describe how to test this change and how you verified it worked.

## Testing Checklist
Please delete options that are not relevant, and select all options that apply.
## Testing Checklist

Please delete options that are not relevant, and select all options that apply.

- ✅ Existing Tests still pass
- ✅ Updated Existing Tests
- ✅ New Tests Added
- ✅ Ran locally on my machine

## Code Quality Checklist
Please delete options that are not relevant, and select all options that apply.

Please delete options that are not relevant, and select all options that apply.

- ✅ My code follows the guidelines of XYZ
- ✅ My code has been commented
- ✅ Documentation has been updated
- ✅ New and existing unit tests pass locally with my changes
- ✅ Main has been merged into this PR
- ✅ Main has been merged into this PR
63 changes: 31 additions & 32 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"
name: 'CodeQL'

on:
push:
branches: [ "main", "major", "minor", "patch" ]
branches: ['main', 'major', 'minor', 'patch']
pull_request:
# The branches below must be a subset of the branches above
branches: [ "main", "major", "minor", "patch" ]
branches: ['main', 'major', 'minor', 'patch']
schedule:
- cron: '40 1 * * 2'

Expand All @@ -33,45 +33,44 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
language: ['javascript']
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
# Use only 'java' to analyze code written in Java, Kotlin or both
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{matrix.language}}"
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: '/language:${{matrix.language}}'
4 changes: 2 additions & 2 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Deploy static content to Pages
on:
# Runs on pushes targeting the default branch
push:
branches: [ "main" ]
branches: ['main']

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -18,7 +18,7 @@ permissions:
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
group: 'pages'
cancel-in-progress: false

jobs:
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ name: ESLint

on:
push:
branches: [ "main", "major", "minor", "patch" ]
branches: ['main', 'major', 'minor', 'patch']
pull_request:
branches: [ "main", "major", "minor", "patch" ]
branches: ['main', 'major', 'minor', 'patch']

jobs:
eslint:
name: Run ESLint
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '20'
- name: Install dependencies
run: npm install
- name: Run ESLint
run: npx eslint . --max-warnings=0
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '20'

- name: Install dependencies
run: npm install

- name: Run ESLint
run: npx eslint . --max-warnings=0
4 changes: 2 additions & 2 deletions .github/workflows/patch-minor-merge.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: patch-merge
name: patch-merge
on:
push:
branches:
Expand All @@ -20,4 +20,4 @@ jobs:
type: now
target_branch: minor
message: Merge patch into minor
github_token: ${{ secrets.PAT_TOKEN }}
github_token: ${{ secrets.PAT_TOKEN }}
22 changes: 11 additions & 11 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ name: Codi unit tests

on:
push:
branches: [ "main", "major", "minor", "patch" ]
branches: ['main', 'major', 'minor', 'patch']
pull_request:
branches: [ "main", "major", "minor", "patch" ]
branches: ['main', 'major', 'minor', 'patch']

jobs:
build:
name: Build & Run Tests
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '18'

- name: Install Dependencies
run: npm install
- name: Install Dependencies
run: npm install

- name: Install Dependencies
run: npm install bun -g
- name: Install Dependencies
run: npm install bun -g

- name: Run tests
run: bun run test
- name: Run tests
run: bun run test
26 changes: 13 additions & 13 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ appearance, race, religion, or sexual identity and orientation.
Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
- The use of sexualized language or imagery and unwelcome sexual attention or
advances
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or electronic
address, without explicit permission
- Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Expand Down
24 changes: 12 additions & 12 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,31 +39,31 @@ Before working on a pull request, create an issue explaining what you want to co

Your pull request must:

* Follow XYZ/MAPP's coding style.
- Follow XYZ/MAPP's coding style.

* Address a single issue or add a single item of functionality.
- Address a single issue or add a single item of functionality.

* Contain a clean history of small, incremental, logically separate commits,
with no merge commits.
- Contain a clean history of small, incremental, logically separate commits,
with no merge commits.

* Use clear commit messages.
- Use clear commit messages.

* Be possible to merge automatically.
- Be possible to merge automatically.

### Address a single issue or add a single item of functionality

Please submit separate pull requests for separate issues. This allows each to
Please submit separate pull requests for separate issues. This allows each to
be reviewed on its own merits.

### Contain a clean history of small, incremental, logically separate commits, with no merge commits

The commit history explains to the reviewer the series of modifications to the
code that you have made and breaks the overall contribution into a series of
easily-understandable chunks. Any individual commit should not add more than
one new class or one new function. Do not submit commits that change thousands
of lines or that contain more than one distinct logical change. Trivial
easily-understandable chunks. Any individual commit should not add more than
one new class or one new function. Do not submit commits that change thousands
of lines or that contain more than one distinct logical change. Trivial
commits, e.g. to fix lint errors, should be merged into the commit that
introduced the error. See the [Atomic Commit Convention on Wikipedia](https://en.wikipedia.org/wiki/Atomic_commit#Atomic_Commit_Convention) for more detail.
introduced the error. See the [Atomic Commit Convention on Wikipedia](https://en.wikipedia.org/wiki/Atomic_commit#Atomic_Commit_Convention) for more detail.

`git apply --patch` and `git rebase` can help you create a clean commit
history.
Expand Down Expand Up @@ -98,6 +98,6 @@ Please keep the header line short, no more than 50 characters.
### Be possible to merge automatically

Occasionally other changes to `main` might mean that your pull request cannot
be merged automatically. In this case you may need to rebase your branch on a
be merged automatically. In this case you may need to rebase your branch on a
more recent `main`, resolve any conflicts, and `git push --force` to update
your branch so that it can be merged automatically.
6 changes: 4 additions & 2 deletions DOCUMENTATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,10 @@ The deprectaed mapp.layer.Style() method will warn if use and return the feature
*/

function Style(layer) {
console.warn(`The mapp.layer.Style() method has been superseeded by the mapp.layer.featureStyle() method.`)
return featureStyle(layer)
console.warn(
`The mapp.layer.Style() method has been superseeded by the mapp.layer.featureStyle() method.`,
);
return featureStyle(layer);
}
```

Expand Down
Loading

0 comments on commit bd850f6

Please sign in to comment.