From f6095998ee4434ee2c9e2e50c1e0d0de80311ed2 Mon Sep 17 00:00:00 2001 From: Eric Chen Date: Sat, 16 Dec 2023 20:52:17 +0800 Subject: [PATCH] feat: drop prettier 2 support --- package.json | 9 +- pnpm-lock.yaml | 9 -- test/snapshots/test.mjs.md | 175 ----------------------------------- test/snapshots/test.mjs.snap | Bin 699 -> 625 bytes test/test.mjs | 14 +-- 5 files changed, 6 insertions(+), 201 deletions(-) diff --git a/package.json b/package.json index b3ddf80..34d9e9e 100644 --- a/package.json +++ b/package.json @@ -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": { @@ -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" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6974987..2022989 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -38,9 +38,6 @@ devDependencies: prettier: specifier: ^3.1.0 version: 3.1.0 - prettier-2: - specifier: npm:prettier@2.8.8 - version: /prettier@2.8.8 string-replace-loader: specifier: ^3.1.0 version: 3.1.0(webpack@5.89.0) @@ -3223,12 +3220,6 @@ packages: prettier: 3.1.0 dev: true - /prettier@2.8.8: - resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} - engines: {node: '>=10.13.0'} - hasBin: true - dev: true - /prettier@3.1.0: resolution: {integrity: sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==} engines: {node: '>=14'} diff --git a/test/snapshots/test.mjs.md b/test/snapshots/test.mjs.md index 4a9eb08..9add189 100644 --- a/test/snapshots/test.mjs.md +++ b/test/snapshots/test.mjs.md @@ -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) {␊ @@ -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) {␊ @@ -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) {␊ @@ -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) {␊ @@ -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) {␊ @@ -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 ␊ @@ -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␊ diff --git a/test/snapshots/test.mjs.snap b/test/snapshots/test.mjs.snap index d73e39e68a92d547950747ec293f61b3239b0e90..e8265024c6f3c1c04a330602d98ff7ba344cbe48 100644 GIT binary patch literal 625 zcmV-%0*?JbRzV zh@qK^NqeY{m)qO-dYzGn=Taub1Qg|@F+{|YoLqdgfWlp+{EB55Vq~XmA(efOjt4vC zqI~aqursD-bNd{<$)VkaQf!T3m4Y8}5nd#Tb2bi7$No;7xued+*K$dMe;~*9ZPx;{ zT9;XD{c#b}HHNi({Ft;;uf-jd+V#kz(rj{TSO4m3`BG?#NjWY~(Jifc1gC6;TOPLw z0FhL1xX|DjqBj7?vu#QP@OInX>-`wM2;HgfHr7sVFe~~6=f(AmGR>s`?R;d43!Mn3 z^+qU~$+&1qxbuplPK;aivd1kr`CP7&5K}@qAP?niAQj5NxUHg^BC;aAQsN*J~i|jdXIwM?3Uh)shreL$o+ai?w3D6u7!UU-U^@JGh8YDHI(-k_z$U871dlI zWojA9D{+_W=Hmmd8_ggHVkPC}+A_P@?B@HU*b0KcD#U`sl8e0fjW7rr1n(QcJKOX- LIUr*(;}rk^DH}Nh literal 699 zcmV;s0z~~mRzVkOeP=`{j zn1<;FLLQ-DE9~}oB3PVUNS%DR2?D0so96az<6a~E+-Wr)G(|JO5T@%@{2EolrEp$q z#l;*nQ*+cEC|)n~)wg;RV+Wo}86gv(FhLEEA!Jd4F1)t@(r|_G3l^KTp}k@Ysq9D4 z>wvxDBAfTkJZ5@!Vdnn$(C=I+wlSW030}xWa2`d@=_oiEdF62G4trxy%Owi_4jtRG zT@yvCO;$x7&p6_>3AC@rGXb6IUfi?Hx|(^IxsCUJ)n84<=R)HgmE*z*^fPZBf|DJE zo4w`*0GNh=!-WQJV)PGe zJ<^eI+OLGdnVhFb5|mLP-6xFN)oqX3;212{Q2fdIRR0HO6hHyGb)E)N3UU ziu4wei~P{HR++s@k=^%vZ(#2_-Z8CNqw8YCrWh?^6H{|k;1iaFW&N-m91+z%i7L@s zYkEmk3CkK{c}!G&5>=wN*7TC75|%Z@@|dU&NK}d5TGLCSN?6tq%VVPYkVKW}tu?(Q zs)S_?u`ES3-ivC?RD$XUg8KP@+)uxOT(h}<6y5@#Uo%`7{xOty3-BLN?Gv(u?B9iK zDa5J}VlGTIY8l8Y@x2tc?jLa7XiX-Qxsvj7W6^bjt`oOMv1P!s(qVyO$wiX>AtM9{ h!P`dgXBPkxN}{wrl#);qf;AJ$!B-{n`8%>I004D-OO5~l diff --git a/test/test.mjs b/test/test.mjs index 4828557..4abc425 100644 --- a/test/test.mjs +++ b/test/test.mjs @@ -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 = `