diff --git a/package-lock.json b/package-lock.json index c1f3f6f..54e882a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -63,12 +63,12 @@ "create-stylelint": "^0.5.0", "eslint": "8.57", "eslint-config-prettier": "^7.2.0", - "eslint-plugin-prettier": "^3.3.1", + "eslint-plugin-prettier": "^5.4.0", "husky": "^9.1.7", "kill-port": "^1.6.1", "mocha": "^10.4.0", "mri": "^1.2.0", - "prettier": "^2.2.1", + "prettier": "^3.5.3", "stylelint": "^16.10.0", "stylelint-config-standard": "^36.0.1", "ts-loader": "^8.0.14", @@ -855,6 +855,18 @@ "node": ">=14" } }, + "node_modules/@pkgr/core": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.4.tgz", + "integrity": "sha512-ROFF39F6ZrnzSUEmQQZUar0Jt4xVoP9WnDRdWwF4NNcXs3xBTLgBUDoOwW141y1jP+S8nahIbdxbFC7IShw9Iw==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/pkgr" + } + }, "node_modules/@playwright/test": { "version": "1.44.1", "dev": true, @@ -983,6 +995,20 @@ "version": "0.5.3", "license": "ISC" }, + "node_modules/@sealcode/jdd/node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/@sealcode/sealcodemirror": { "version": "5.70.0-beta5", "resolved": "https://registry.npmjs.org/@sealcode/sealcodemirror/-/sealcodemirror-5.70.0-beta5.tgz", @@ -1032,6 +1058,20 @@ "version": "0.4.3", "license": "ISC" }, + "node_modules/@sealcode/sealgen/node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/@sealcode/simplemde": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/@sealcode/simplemde/-/simplemde-1.12.1.tgz", @@ -4486,20 +4526,30 @@ } }, "node_modules/eslint-plugin-prettier": { - "version": "3.4.1", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.4.0.tgz", + "integrity": "sha512-BvQOvUhkVQM1i63iMETK9Hjud9QhqBnbtT1Zc642p9ynzBuCe5pybkOnvqZIBypXmMlsGcnU4HZ8sCTPfpAexA==", "dev": true, - "license": "MIT", "dependencies": { - "prettier-linter-helpers": "^1.0.0" + "prettier-linter-helpers": "^1.0.0", + "synckit": "^0.11.0" }, "engines": { - "node": ">=6.0.0" + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint-plugin-prettier" }, "peerDependencies": { - "eslint": ">=5.0.0", - "prettier": ">=1.13.0" + "@types/eslint": ">=8.0.0", + "eslint": ">=8.0.0", + "eslint-config-prettier": ">= 7.0.0 <10.0.0 || >=10.1.0", + "prettier": ">=3.0.0" }, "peerDependenciesMeta": { + "@types/eslint": { + "optional": true + }, "eslint-config-prettier": { "optional": true } @@ -10256,13 +10306,15 @@ } }, "node_modules/prettier": { - "version": "2.8.8", - "license": "MIT", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz", + "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==", + "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" @@ -12281,6 +12333,21 @@ "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==", "dev": true }, + "node_modules/synckit": { + "version": "0.11.6", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.6.tgz", + "integrity": "sha512-2pR2ubZSV64f/vqm9eLPz/KOvR9Dm+Co/5ChLgeHl0yEDRc6h5hXHoxEQH8Y5Ljycozd3p1k5TTSVdzYGkPvLw==", + "dev": true, + "dependencies": { + "@pkgr/core": "^0.2.4" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/synckit" + } + }, "node_modules/table": { "version": "6.8.2", "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz", diff --git a/package.json b/package.json index 446972a..9b7b2fa 100644 --- a/package.json +++ b/package.json @@ -124,12 +124,12 @@ "create-stylelint": "^0.5.0", "eslint": "8.57", "eslint-config-prettier": "^7.2.0", - "eslint-plugin-prettier": "^3.3.1", + "eslint-plugin-prettier": "^5.4.0", "husky": "^9.1.7", "kill-port": "^1.6.1", "mocha": "^10.4.0", "mri": "^1.2.0", - "prettier": "^2.2.1", + "prettier": "^3.5.3", "stylelint": "^16.10.0", "stylelint-config-standard": "^36.0.1", "ts-loader": "^8.0.14", diff --git a/src/back/app.ts b/src/back/app.ts index 8ee629a..4d83af2 100644 --- a/src/back/app.ts +++ b/src/back/app.ts @@ -95,7 +95,7 @@ export default class TheApp extends App { port: MAILCATCHER_SMTP_PORT, user: "any", password: "any", - }) + }) : new LoggerMailer(); async start() { diff --git a/src/back/collections/password-reset-intents.ts b/src/back/collections/password-reset-intents.ts index 2a93292..ca4ec0d 100644 --- a/src/back/collections/password-reset-intents.ts +++ b/src/back/collections/password-reset-intents.ts @@ -28,7 +28,7 @@ export default class PasswordResetIntents extends Collection { async ([, intent]: [ Context, CollectionItem, - unknown + unknown, ]) => { const intent_as_super = await intent.fetchAs(new app.SuperContext()); const message = await PasswordResetTemplate(app, { diff --git a/src/back/defaultHead.tsx b/src/back/defaultHead.tsx index 9fc07b7..4c72d19 100644 --- a/src/back/defaultHead.tsx +++ b/src/back/defaultHead.tsx @@ -65,13 +65,14 @@ export function defaultHead({ ...(ctx.url.includes("/dowodzenie/") ? ["admin"] : []), ...css_clumps, ].map( - (clump_name) => /* HTML */ `` + (clump_name) => + /* HTML */ `` )} ${canonicalPath diff --git a/src/back/jdd-components/autoscrolling-images/autoscrolling-images.jdd.tsx b/src/back/jdd-components/autoscrolling-images/autoscrolling-images.jdd.tsx index 8af1b6d..2030490 100644 --- a/src/back/jdd-components/autoscrolling-images/autoscrolling-images.jdd.tsx +++ b/src/back/jdd-components/autoscrolling-images/autoscrolling-images.jdd.tsx @@ -234,7 +234,7 @@ export class AutoscrollingImages extends Component { render_image, mode: "looping-tail", background_mode, - }) + }) : ""} diff --git a/src/back/jdd-components/dynamic-grid/dynamic-grid.jdd.tsx b/src/back/jdd-components/dynamic-grid/dynamic-grid.jdd.tsx index 9db1e52..b83710f 100644 --- a/src/back/jdd-components/dynamic-grid/dynamic-grid.jdd.tsx +++ b/src/back/jdd-components/dynamic-grid/dynamic-grid.jdd.tsx @@ -107,7 +107,7 @@ export class DynamicGrid extends Component { }, crop: this.image_sizes[shape], imgStyle: "display: none;", - })} + })} ))} diff --git a/src/back/policy-types/roles.ts b/src/back/policy-types/roles.ts index 297e8cf..5e11d4d 100644 --- a/src/back/policy-types/roles.ts +++ b/src/back/policy-types/roles.ts @@ -58,10 +58,10 @@ export class Roles extends Policy { context.app.i18n("policy_roles_allow", [ this.allowed_roles.join(", "), ]) - ) + ) : Policy.deny( context.app.i18n("policy_roles_deny", [this.allowed_roles.join(", ")]) - ); + ); } } export function CRUDRoles( diff --git a/src/back/routes/admin/pages/index.list.tsx b/src/back/routes/admin/pages/index.list.tsx index df48664..ce58c8e 100644 --- a/src/back/routes/admin/pages/index.list.tsx +++ b/src/back/routes/admin/pages/index.list.tsx @@ -45,7 +45,7 @@ const displayFields = [ container: { width: 45, height: 45 }, crop: { width: 45, height: 45 }, alt: "", - }) + }) : ""; }, }, diff --git a/src/back/routes/common/show-first-row/show-first-row.tsx b/src/back/routes/common/show-first-row/show-first-row.tsx index df754c2..d323f23 100644 --- a/src/back/routes/common/show-first-row/show-first-row.tsx +++ b/src/back/routes/common/show-first-row/show-first-row.tsx @@ -79,9 +79,9 @@ export async function showFirstRow({ .show-first-row--id-${id} { &:not( :has( - .show-first-row__items - > *:nth-child(${columns * rows + 1}) - ) + .show-first-row__items + > *:nth-child(${columns * rows + 1}) + ) ) { .show-first-row__button { display: none; diff --git a/src/back/routes/middlewares/customUrlView.tsx b/src/back/routes/middlewares/customUrlView.tsx index 27d5707..eb8b057 100644 --- a/src/back/routes/middlewares/customUrlView.tsx +++ b/src/back/routes/middlewares/customUrlView.tsx @@ -75,7 +75,7 @@ export const customUrlView = 400, "jpeg", false - ) + ) : "", }); }