Skip to content

Commit 9a06b42

Browse files
committed
Merge branch 'release/2.0.0-alpha.0'
2 parents 736e9ff + 33afecd commit 9a06b42

16 files changed

+1934
-1583
lines changed

.eslintrc.js

-6
This file was deleted.

.github/workflows/npm-publish.yml

+35-5
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,48 @@ on:
66
- '*.*.*'
77

88
jobs:
9-
publish:
10-
runs-on: ubuntu-latest
9+
release:
10+
runs-on: macos-latest
1111
steps:
1212
- uses: actions/checkout@v4
13-
- uses: JS-DevTools/npm-publish@v3
13+
- uses: actions/setup-node@v4
1414
with:
15-
token: ${{ secrets.NPM_TOKEN }}
16-
- uses: actions/create-release@v1
15+
node-version: 20
16+
cache: npm
17+
registry-url: https://registry.npmjs.org/
18+
19+
- run: |
20+
VERSION=${GITHUB_REF/refs\/tags\//}
21+
TAG='latest'
22+
if [[ $VERSION =~ 'alpha' || $VERSION =~ 'beta' || $VERSION =~ 'rc' ]]; then
23+
TAG='next'
24+
fi
25+
npm publish --tag $TAG
26+
env:
27+
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
28+
29+
# @see https://github.com/actions/create-release/issues/38#issuecomment-715327220
30+
# @see https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files
31+
- name: Prepare the changelog from the tag message
32+
id: prepare_changelog
33+
run: |
34+
PRERELEASE=false
35+
# Check release type
36+
if [[ $GITHUB_REF_NAME =~ 'alpha' || $GITHUB_REF_NAME =~ 'beta' || $GITHUB_REF_NAME =~ 'rc' ]]; then
37+
echo "This is a prerelease."
38+
PRERELEASE=true
39+
fi
40+
echo "is_prerelease=$PRERELEASE" >> $GITHUB_ENV
41+
42+
# @see https://github.com/actions/create-release
43+
- name: Create Release
44+
id: create_release
45+
uses: actions/create-release@v1
1746
env:
1847
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1948
with:
2049
tag_name: ${{ github.ref }}
2150
release_name: v${{ github.ref_name }}
2251
body: Please refer to [CHANGELOG.md](https://github.com/studiometa/prettier-formatter-gitlab/blob/${{ github.ref_name }}/CHANGELOG.md) for details.
2352
draft: false
53+
prerelease: ${{ env.is_prerelease }}

.prettierrc.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
module.exports = require('@studiometa/prettier-config');
1+
import config from '@studiometa/prettier-config';
2+
3+
export default config;

CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9+
## v2.0.0-alpha.0 - 2024.04.15
10+
11+
### Changed
12+
13+
- Add support for Prettier v3 ([#2](https://github.com/studiometa/prettier-formatter-gitlab/pull/2))
14+
- ⚠️ Remove support for Prettier v2 ([#2](https://github.com/studiometa/prettier-formatter-gitlab/pull/2))
15+
- ⚠️ Migrate to ESM ([165f52c](https://github.com/studiometa/prettier-formatter-gitlab/commit/165f52c))
16+
917
## v1.1.4 - 2024.03.12
1018

1119
### Fixed

README.md

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# Prettier formatter for GitLab Code Quality
22

33
[![NPM Version](https://img.shields.io/npm/v/@studiometa/prettier-formatter-gitlab.svg?style=flat-square)](https://www.npmjs.com/package/@studiometa/prettier-formatter-gitlab/)
4-
[![Dependency Status](https://img.shields.io/david/studiometa/prettier-formatter-gitlab.svg?label=deps&style=flat-square)](https://david-dm.org/studiometa/prettier-formatter-gitlab)
5-
[![devDependency Status](https://img.shields.io/david/dev/studiometa/prettier-formatter-gitlab.svg?label=devDeps&style=flat-square)](https://david-dm.org/studiometa/prettier-formatter-gitlab?type=dev)
64

75
> Send Prettier errors to Gitlab's Code Quality reports.
86
@@ -19,18 +17,18 @@ npm install -D @studiometa/prettier-formatter-gitlab
1917
Prettier does not have an option for custom reporter, this package will run a prettier CLI command for you and parse its result to generate the Code Quality report.
2018

2119
```js
22-
prettier-formatter-gitlab 'prettier -c src/'
20+
prettier-formatter-gitlab 'prettier -l src/'
2321
```
2422

2523
The report file path will be read from the `PRETTIER_CODE_QUALITY_REPORT` environment variable or from the `.gitlab-ci.yml` configuration file when using the code quality report artifacts:
2624

2725
```yaml
2826
# .gitlab-ci.yml
2927
eslint:
30-
image: node:12
28+
image: node:20
3129
script:
3230
- npm ci
33-
- prettier-formatter-gitlab 'prettier -c src/'
31+
- prettier-formatter-gitlab 'prettier -l src/'
3432
artifacts:
3533
reports:
3634
codequality: gl-codequality.json

bin/cli.js

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
#!/usr/bin/env node
2-
const { exec } = require('child_process');
3-
const prettierFormatterGitlab = require('../src/index.js');
2+
import { exec } from 'node:child_process';
3+
import { prettierFormatterGitLab } from '../src/index.js';
44

5-
const [, , cmd] = process.argv;
5+
const cmd = process.argv[2];
66

7-
exec(cmd, async (error) => {
8-
if (error) {
9-
console.log(error.message);
10-
await prettierFormatterGitlab(error);
11-
process.exit(1);
12-
}
13-
});
7+
if (cmd) {
8+
exec(cmd, async (error, stdout) => {
9+
if (error) {
10+
console.log(error.message);
11+
await prettierFormatterGitLab(stdout);
12+
process.exit(1);
13+
}
14+
});
15+
}

eslint.config.js

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { js, prettier } from '@studiometa/eslint-config';
2+
import { globals } from '@studiometa/eslint-config/utils';
3+
4+
export default [
5+
...js,
6+
...prettier,
7+
{
8+
languageOptions: {
9+
globals: globals.node,
10+
},
11+
},
12+
];

0 commit comments

Comments
 (0)