Skip to content

Commit

Permalink
Update to Prettier 3
Browse files Browse the repository at this point in the history
- Prettier 3 is async, so related functions were made async.
- Code was reformatted using Prettier.
- Prettier now ships their own types, so `@types/prettier` was removed.
- Prettier was moved to `dependencies`. `optionalDependencies` is for
  dependencies that have a `install` script that may fail. This isn’t
  the case for Prettier.
- `eslint-plugin-prettier` was updated as well.
  • Loading branch information
remcohaszing committed Apr 26, 2024
1 parent dfccc6f commit 6dd6e31
Show file tree
Hide file tree
Showing 34 changed files with 273 additions and 241 deletions.
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/a_question.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ about: Usage question or discussion about the YAML Language Server
title: ''
labels: 'kind/question'
assignees: ''

---

## Summary

## Relevant information

<!-- Provide as much useful information as you can -->
9 changes: 7 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ about: Report a bug found in the YAML Language Server
title: ''
labels: 'kind/bug'
assignees: ''

---

## Describe the bug

<!--- Provide a summary of the issue.
If this is an issue with a schema and you have not set a schema yourself then please file the issue on https://github.com/SchemaStore/schemastore.
Expand All @@ -19,18 +19,23 @@ may be relevant.
-->

## Expected Behavior

<!--- What should happen -->

## Current Behavior

<!--- What happens instead of the expected behavior -->

## Steps to Reproduce

<!--- What steps can be done to reproduce -->

1.
2.
3.
3.

## Environment

- [ ] Windows
- [ ] Mac
- [ ] Linux
Expand Down
8 changes: 6 additions & 2 deletions .github/ISSUE_TEMPLATE/enhancement.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,20 @@ about: Suggest an enhancement for the YAML Language Server
title: ''
labels: 'kind/enhancement'
assignees: ''

---

### Is your enhancement related to a problem? Please describe.

<!-- A clear and concise description of what the problem is. Ex. I am always frustrated when [...] -->

### Describe the solution you would like

<!-- A clear and concise description of what you want to happen. -->

### Describe alternatives you have considered

<!--A clear and concise description of any alternative solutions or features you have considered. -->

### Additional context
<!-- Add any other context or screenshots about the enhancement here. -->

<!-- Add any other context or screenshots about the enhancement here. -->
3 changes: 1 addition & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
### What does this PR do?


### What issues does this PR fix or reference?


### Is it tested? How?

<!-- Please provide instructions here how reviewer can test your changes if applicable -->
11 changes: 5 additions & 6 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@ on:
branches: [main]

permissions:
contents: read

contents: read

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
permissions:
checks: write ## for coveralls
checks: write ## for coveralls
contents: read ## for docker-push
security-events: write ## for upload-sarif
# The type of runner that the job will run on
Expand All @@ -38,7 +37,7 @@ jobs:
uses: actions/setup-node@7c12f8017d5436eb855f1ed4399f037a36fbd9e8 # v2.5.2
with:
node-version: 16
registry-url: "https://registry.npmjs.org"
registry-url: 'https://registry.npmjs.org'

# Run install dependencies
- name: Install dependencies
Expand Down Expand Up @@ -84,7 +83,7 @@ jobs:
- name: Set up QEMU
if: ${{ success() && runner.os == 'Linux' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.2.0

# Setup DockerBuildx as requirement for docker
- name: Set up Docker Buildx
if: ${{ success() && runner.os == 'Linux' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
Expand All @@ -93,7 +92,7 @@ jobs:
# Login to Quay
- name: Login to Quay
if: ${{ success() && runner.os == 'Linux' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
with:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
Expand Down
102 changes: 51 additions & 51 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,63 +20,63 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v2

# Set up Node
- name: Use Node 16
uses: actions/setup-node@v1
with:
node-version: 16
registry-url: 'https://registry.npmjs.org'
# Set up Node
- name: Use Node 16
uses: actions/setup-node@v1
with:
node-version: 16
registry-url: 'https://registry.npmjs.org'

# Run install dependencies
- name: Install dependencies
run: yarn
# Run install dependencies
- name: Install dependencies
run: yarn

# Build extension
- name: Run build
run: yarn build
# Build extension
- name: Run build
run: yarn build

# Run tests
- name: Run Test
run: yarn test
# Run tests
- name: Run Test
run: yarn test

# Publish to npm
- run: |
yarn check-dependencies
yarn publish --access public
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
# Publish to npm
- run: |
yarn check-dependencies
yarn publish --access public
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
# Get the current package.json version so we can tag the image correctly
- name: Get current package.json version
id: package-version
uses: martinbeentjes/npm-get-version-action@7aa1d82604bb2dbe377a64ca35e692e6fe333c9c #master
# Get the current package.json version so we can tag the image correctly
- name: Get current package.json version
id: package-version
uses: martinbeentjes/npm-get-version-action@7aa1d82604bb2dbe377a64ca35e692e6fe333c9c #master

# Setup QEMU as requirement for docker
- name: Set up QEMU
uses: docker/setup-qemu-action@v1

# Setup DockerBuildx as requirement for docker
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
# Setup QEMU as requirement for docker
- name: Set up QEMU
uses: docker/setup-qemu-action@v1

# Login to Quay
- name: Login to Quay
uses: docker/login-action@v1
with:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_TOKEN }}
# Setup DockerBuildx as requirement for docker
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

# Build and push the latest version of yaml language server image
- name: Build and push
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile
platforms: linux/amd64
push: true
tags: |
quay.io/redhat-developer/yaml-language-server:latest
quay.io/redhat-developer/yaml-language-server:${{ steps.package-version.outputs.current-version}}
# Login to Quay
- name: Login to Quay
uses: docker/login-action@v1
with:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_TOKEN }}

# Build and push the latest version of yaml language server image
- name: Build and push
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile
platforms: linux/amd64
push: true
tags: |
quay.io/redhat-developer/yaml-language-server:latest
quay.io/redhat-developer/yaml-language-server:${{ steps.package-version.outputs.current-version}}
4 changes: 2 additions & 2 deletions .mocharc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"timeout": "5000",
"ui": "bdd",
"ui": "bdd",
"extension": ["ts"],
"package": "./package.json",
"reporter": "spec",
"watch-files": ["./test/*.test.ts"],
"spec": ["./test/*.test.ts"]
"spec": ["./test/*.test.ts"]
}
Loading

0 comments on commit 6dd6e31

Please sign in to comment.