From dcf630fdb51bad7a1c9d600b1872bdb0919e6f11 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Thu, 17 Aug 2023 07:54:05 -0400 Subject: [PATCH 1/2] Upgrade prettier and prettier-plugin-ember-template-tag --- files/__addonLocation__/package.json | 4 ++-- files/package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/files/__addonLocation__/package.json b/files/__addonLocation__/package.json index 8a9a4072..fed2e061 100644 --- a/files/__addonLocation__/package.json +++ b/files/__addonLocation__/package.json @@ -76,8 +76,8 @@ "eslint-plugin-ember": "^11.10.0", "eslint-plugin-n": "^16.0.0", "eslint-plugin-prettier": "^4.0.0", - "prettier": "^2.5.1", - "prettier-plugin-ember-template-tag": "^0.3.2", + "prettier": "^3.0.3", + "prettier-plugin-ember-template-tag": "^1.1.0", "rollup": "^3.21.8"<% if (!isExistingMonorepo) { %>, "rollup-plugin-copy": "^3.4.0"<% } %><% if (typescript) { %>, "typescript": "^5.0.4"<% } %> diff --git a/files/package.json b/files/package.json index 94f81720..3c24ad02 100644 --- a/files/package.json +++ b/files/package.json @@ -6,8 +6,8 @@ "scripts": {}, "devDependencies": { "concurrently": "^8.2.0", - "prettier": "^2.5.1", - "prettier-plugin-ember-template-tag": "^0.3.2" + "prettier": "^3.0.3", + "prettier-plugin-ember-template-tag": "^1.1.0" }, "workspaces": [ "<%= addonInfo.location %>", From 6f3e23fa78a408a4d236dd92121085d8d376419d Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Thu, 17 Aug 2023 08:02:06 -0400 Subject: [PATCH 2/2] Also upgrade eslint-plugin-prettier and eslint-config-prettier because it is required with the prettier v3 jump --- files/__addonLocation__/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/__addonLocation__/package.json b/files/__addonLocation__/package.json index fed2e061..0c0deda3 100644 --- a/files/__addonLocation__/package.json +++ b/files/__addonLocation__/package.json @@ -72,10 +72,10 @@ "concurrently": "^8.0.1", "ember-template-lint": "^5.11.2", "eslint": "^8.33.0", - "eslint-config-prettier": "^8.3.0", - "eslint-plugin-ember": "^11.10.0", + "eslint-config-prettier": "^9.0.0", + "eslint-plugin-ember": "^11.11.1", "eslint-plugin-n": "^16.0.0", - "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-prettier": "^5.0.0", "prettier": "^3.0.3", "prettier-plugin-ember-template-tag": "^1.1.0", "rollup": "^3.21.8"<% if (!isExistingMonorepo) { %>,