Skip to content

Commit

Permalink
feat: drop prettier 2 support
Browse files Browse the repository at this point in the history
  • Loading branch information
@Airkro
Airkro committed Dec 16, 2023
1 parent cd458a4 commit f609599
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 201 deletions.
9 changes: 4 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prettier-plugin-groovy",
"version": "0.1.1",
"version": "0.2.0",
"description": "A Prettier plugin for Groovy files",
"license": "MIT",
"author": {
Expand Down Expand Up @@ -46,20 +46,19 @@
"garou": "^0.6.19",
"groovy-beautify": "~0.0.17",
"prettier": "^3.1.0",
"prettier-2": "npm:prettier@2.8.8",
"string-replace-loader": "^3.1.0"
},
"peerDependencies": {
"prettier": "^2.8.8 || ^3.0.0"
"prettier": "^3.0.0"
},
"engines": {
"node": "^16.15.0 || ^18.12.0 || ^20.0.0"
"node": "^18.12.0 || ^20.0.0"
},
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org/"
},
"packageManager": "pnpm@8.8.0",
"packageManager": "pnpm@8.11.0",
"eslintConfig": {
"extends": "@nice-move/eslint-config-base"
},
Expand Down
9 changes: 0 additions & 9 deletions pnpm-lock.yaml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

175 changes: 0 additions & 175 deletions test/snapshots/test.mjs.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,6 @@ Generated by [AVA](https://avajs.dev).

## format by filename-0

> prettier 2
`def bumpVersion(String target, String version_type, Boolean reset = false) {␊
def versionMap = ['major': 0, 'minor': 1, 'patch': 2]␊
def versionArray = target.findAll(/\\d+\\.\\d+\\.\\d+/)[0].tokenize('.')␊
try {␊
def index = versionMap.get(version_type);␊
versionArray[index] = versionArray[index].toInteger() + 1␊
if (reset)␊
{␊
for (int i = 2; i > index; i--) {␊
versionArray[i] = 0␊
}␊
}␊
} catch (Exception e) {␊
println("Unrecognized version type \\"version_type\\" (should be major, minor or patch)")␊
}␊
return versionArray.join('.')␊
}␊
println(bumpVersion('1.2.3', 'minor', true))`

> prettier 3
`def bumpVersion(String target, String version_type, Boolean reset = false) {␊
Expand All @@ -50,27 +29,6 @@ Generated by [AVA](https://avajs.dev).

## format by filename-1

> prettier 2
`def bumpVersion(String target, String version_type, Boolean reset = false) {␊
def versionMap = ['major': 0, 'minor': 1, 'patch': 2]␊
def versionArray = target.findAll(/\\d+\\.\\d+\\.\\d+/)[0].tokenize('.')␊
try {␊
def index = versionMap.get(version_type);␊
versionArray[index] = versionArray[index].toInteger() + 1␊
if (reset)␊
{␊
for (int i = 2; i > index; i--) {␊
versionArray[i] = 0␊
}␊
}␊
} catch (Exception e) {␊
println("Unrecognized version type \\"version_type\\" (should be major, minor or patch)")␊
}␊
return versionArray.join('.')␊
}␊
println(bumpVersion('1.2.3', 'minor', true))`

> prettier 3
`def bumpVersion(String target, String version_type, Boolean reset = false) {␊
Expand All @@ -94,27 +52,6 @@ Generated by [AVA](https://avajs.dev).

## format by filename-2

> prettier 2
`def bumpVersion(String target, String version_type, Boolean reset = false) {␊
def versionMap = ['major': 0, 'minor': 1, 'patch': 2]␊
def versionArray = target.findAll(/\\d+\\.\\d+\\.\\d+/)[0].tokenize('.')␊
try {␊
def index = versionMap.get(version_type);␊
versionArray[index] = versionArray[index].toInteger() + 1␊
if (reset)␊
{␊
for (int i = 2; i > index; i--) {␊
versionArray[i] = 0␊
}␊
}␊
} catch (Exception e) {␊
println("Unrecognized version type \\"version_type\\" (should be major, minor or patch)")␊
}␊
return versionArray.join('.')␊
}␊
println(bumpVersion('1.2.3', 'minor', true))`

> prettier 3
`def bumpVersion(String target, String version_type, Boolean reset = false) {␊
Expand All @@ -138,27 +75,6 @@ Generated by [AVA](https://avajs.dev).

## format by filename-3

> prettier 2
`def bumpVersion(String target, String version_type, Boolean reset = false) {␊
def versionMap = ['major': 0, 'minor': 1, 'patch': 2]␊
def versionArray = target.findAll(/\\d+\\.\\d+\\.\\d+/)[0].tokenize('.')␊
try {␊
def index = versionMap.get(version_type);␊
versionArray[index] = versionArray[index].toInteger() + 1␊
if (reset)␊
{␊
for (int i = 2; i > index; i--) {␊
versionArray[i] = 0␊
}␊
}␊
} catch (Exception e) {␊
println("Unrecognized version type \\"version_type\\" (should be major, minor or patch)")␊
}␊
return versionArray.join('.')␊
}␊
println(bumpVersion('1.2.3', 'minor', true))`

> prettier 3
`def bumpVersion(String target, String version_type, Boolean reset = false) {␊
Expand All @@ -182,27 +98,6 @@ Generated by [AVA](https://avajs.dev).

## format by filename-4

> prettier 2
`def bumpVersion(String target, String version_type, Boolean reset = false) {␊
def versionMap = ['major': 0, 'minor': 1, 'patch': 2]␊
def versionArray = target.findAll(/\\d+\\.\\d+\\.\\d+/)[0].tokenize('.')␊
try {␊
def index = versionMap.get(version_type);␊
versionArray[index] = versionArray[index].toInteger() + 1␊
if (reset)␊
{␊
for (int i = 2; i > index; i--) {␊
versionArray[i] = 0␊
}␊
}␊
} catch (Exception e) {␊
println("Unrecognized version type \\"version_type\\" (should be major, minor or patch)")␊
}␊
return versionArray.join('.')␊
}␊
println(bumpVersion('1.2.3', 'minor', true))`

> prettier 3
`def bumpVersion(String target, String version_type, Boolean reset = false) {␊
Expand All @@ -226,31 +121,6 @@ Generated by [AVA](https://avajs.dev).

## format by parser

> prettier 2
`def bumpVersion(String target, String version_type, Boolean reset ␊
= false) {␊
def versionMap = ['major': 0, 'minor': 1, 'patch': 2]␊
def versionArray = target.findAll(/\\d+\\.\\d+\\.\\d+/)[0].tokenize('.')␊
try {␊
def index = versionMap.get(version_type);␊
versionArray[index] ␊
= versionArray[index].toInteger() ␊
+ 1␊
if (reset)␊
{␊
for (int i = 2; i > index; i--) {␊
versionArray[i] ␊
= 0␊
}␊
}␊
} catch (Exception e) {␊
println("Unrecognized version type \\"version_type\\" (should be major, minor or patch)")␊
}␊
return versionArray.join('.')␊
}␊
println(bumpVersion('1.2.3', 'minor', true))`

> prettier 3
`def bumpVersion(String target, String version_type, Boolean reset ␊
Expand Down Expand Up @@ -278,51 +148,6 @@ Generated by [AVA](https://avajs.dev).

## format in markdown

> prettier 2
`\`\`\`groovy␊
def bumpVersion(String target, String version_type, Boolean reset = false) {␊
def versionMap = ['major': 0, 'minor': 1, 'patch': 2]␊
def versionArray = target.findAll(/\\d+\\.\\d+\\.\\d+/)[0].tokenize('.')␊
try {␊
def index = versionMap.get(version_type);␊
versionArray[index] = versionArray[index].toInteger() + 1␊
if (reset)␊
{␊
for (int i = 2; i > index; i--) {␊
versionArray[i] = 0␊
}␊
}␊
} catch (Exception e) {␊
println("Unrecognized version type \\"version_type\\" (should be major, minor or patch)")␊
}␊
return versionArray.join('.')␊
}␊
println(bumpVersion('1.2.3', 'minor', true))␊
\`\`\`␊
␊
\`\`\`jenkinsfile␊
def bumpVersion(String target, String version_type, Boolean reset = false) {␊
def versionMap = ['major': 0, 'minor': 1, 'patch': 2]␊
def versionArray = target.findAll(/\\d+\\.\\d+\\.\\d+/)[0].tokenize('.')␊
try {␊
def index = versionMap.get(version_type);␊
versionArray[index] = versionArray[index].toInteger() + 1␊
if (reset)␊
{␊
for (int i = 2; i > index; i--) {␊
versionArray[i] = 0␊
}␊
}␊
} catch (Exception e) {␊
println("Unrecognized version type \\"version_type\\" (should be major, minor or patch)")␊
}␊
return versionArray.join('.')␊
}␊
println(bumpVersion('1.2.3', 'minor', true))␊
\`\`\`␊
`

> prettier 3
`\`\`\`groovy␊
Expand Down
Binary file modified test/snapshots/test.mjs.snap
View file
Binary file not shown.
14 changes: 2 additions & 12 deletions test/test.mjs
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,15 @@
import test from 'ava';
import { format } from 'prettier';
import prettier2 from 'prettier-2';

import plugin from '../dist/index.cjs';

async function pretty(t, string, options) {
const result2 = await prettier2.format(string, {
const result = await format(string, {
plugins: [plugin],
...options,
});

t.snapshot(result2, 'prettier 2');

const result3 = await format(string, {
plugins: [plugin],
...options,
});

t.snapshot(result3, 'prettier 3');

t.is(result2, result3);
t.snapshot(result, 'prettier 3');
}

const source = `
Expand Down

0 comments on commit f609599

Please sign in to comment.