Merge pull request #136 from solita/renovate-fix/prettier-3.x

Update dependency prettier to v3
solita · Mar 8, 2024 · 1cda5a4 · 1cda5a4
2 parents 1317445 + 63e54d9
commit 1cda5a4
Show file tree

Hide file tree

Showing 23 changed files with 163 additions and 121 deletions.
diff --git a/.github/workflows/ci-public.yml b/.github/workflows/ci-public.yml
@@ -31,7 +31,6 @@ jobs:
           cache-dependency-path: etp-public/package-lock.json
       - run: npm ci
       - run: npm run build --if-present
-      - run: npm run check-format
 
   format:
     runs-on: ubuntu-latest

diff --git a/etp-front/.prettierrc b/etp-front/.prettierrc
@@ -1,4 +1,6 @@
 {
+  "plugins": ["prettier-plugin-svelte"],
+  "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }],
   "printWidth": 80,
   "tabWidth": 2,
   "useTabs": false,

diff --git a/etp-front/package-lock.json b/etp-front/package-lock.json
diff --git a/etp-front/package.json b/etp-front/package.json
@@ -47,8 +47,8 @@
     "postcss-load-config": "^2.1.0",
     "postcss-loader": "^3.0.0",
     "postcss-preset-env": "^6.7.0",
-    "prettier": "^2.8.6",
-    "prettier-plugin-svelte": "^2.10.0",
+    "prettier": "^3.0.0",
+    "prettier-plugin-svelte": "^3.2.2",
     "svelte": "^3.37.0",
     "svelte-loader": "^2.13.6",
     "svelte-preprocess": "^3.3.0",

diff --git a/etp-front/src/components/Button/Button.svelte b/etp-front/src/components/Button/Button.svelte
@@ -13,7 +13,9 @@
 <style type="text/postcss">
   button {
     @apply relative px-6 py-3 flex justify-center items-center rounded-full font-bold uppercase text-light tracking-xl min-w-10;
-    transition: padding-right 0.5s, padding-left 0.5s;
+    transition:
+      padding-right 0.5s,
+      padding-left 0.5s;
   }
 
   .primary {

diff --git a/etp-front/src/components/Select/Select2.svelte b/etp-front/src/components/Select/Select2.svelte
@@ -249,9 +249,12 @@
             search={true}
             on:input={evt => {
               textCancel();
-              textCancel = Future.value(value => {
-                searchText = value;
-              }, Future.after(500, Maybe.fromEmpty(R.trim(evt.target.value))));
+              textCancel = Future.value(
+                value => {
+                  searchText = value;
+                },
+                Future.after(500, Maybe.fromEmpty(R.trim(evt.target.value)))
+              );
             }} />
         </div>
       {/if}

diff --git a/etp-front/src/pages/breadcrumb/breadcrumb-utils.js b/etp-front/src/pages/breadcrumb/breadcrumb-utils.js
@@ -367,8 +367,8 @@ const folderForKayttajaRole = R.curry((i18n, whoami, kayttaja) =>
   R.eqProps('id', whoami, kayttaja)
     ? []
     : Kayttajat.isAccreditedLaatija(kayttaja)
-    ? laatijat(i18n)
-    : kayttajat(i18n)
+      ? laatijat(i18n)
+      : kayttajat(i18n)
 );
 
 export const kayttajaIdCrumb = R.curry((i18n, whoami, id) => [

diff --git a/...c/pages/energiatodistus/energiatodistus-haku/querybuilder/query-inputs/kunta-input.svelte b/...c/pages/energiatodistus/energiatodistus-haku/querybuilder/query-inputs/kunta-input.svelte
@@ -20,10 +20,13 @@
   const updateInput = label => {
     const kunta = Maybe.find(R.compose(R.equals(label), kuntaLabel), kunnat);
 
-    R.forEach(id => {
-      input.value = id;
-      input.dispatchEvent(new Event('change', { bubbles: true }));
-    }, R.map(R.prop('id'), kunta));
+    R.forEach(
+      id => {
+        input.value = id;
+        input.dispatchEvent(new Event('change', { bubbles: true }));
+      },
+      R.map(R.prop('id'), kunta)
+    );
   };
 
   $: !R.isNil(input) && updateInput(queryKuntaLabel);

diff --git a/etp-front/src/pages/energiatodistus/korvaavuus/korvattu.svelte b/etp-front/src/pages/energiatodistus/korvaavuus/korvattu.svelte
@@ -55,10 +55,10 @@
     Korvaus.isSame(korvattava, energiatodistus)
       ? Maybe.Some('is-same')
       : !Korvaus.isValidState(korvattava, energiatodistus)
-      ? Maybe.Some('invalid-tila')
-      : Korvaus.hasOtherKorvaaja(korvattava, energiatodistus)
-      ? Maybe.Some('already-replaced')
-      : Maybe.None();
+        ? Maybe.Some('invalid-tila')
+        : Korvaus.hasOtherKorvaaja(korvattava, energiatodistus)
+          ? Maybe.Some('already-replaced')
+          : Maybe.None();
 
   const fetchKorvattavaEnergiatodistus = initialDelay => id => {
     cancel = R.compose(
@@ -107,8 +107,8 @@
       ? Maybe.isNone(R.chain(parseId, query))
         ? Maybe.Some('invalid-id')
         : korvattavaEnergiatodistus.isNone()
-        ? Maybe.Some('not-found')
-        : R.chain(korvattavaETError, korvattavaEnergiatodistus)
+          ? Maybe.Some('not-found')
+          : R.chain(korvattavaETError, korvattavaEnergiatodistus)
       : Maybe.None();
 
   const searchKorvattavaEnergiatodistus = R.compose(

diff --git a/etp-front/src/pages/energiatodistus/schema.js b/etp-front/src/pages/energiatodistus/schema.js
@@ -329,8 +329,8 @@ export const assocRequired = (schema, property) => {
   const language = R.endsWith('-fi', property)
     ? 'fi'
     : R.endsWith('-sv', property)
-    ? 'sv'
-    : 'all';
+      ? 'sv'
+      : 'all';
 
   return R.unless(
     R.compose(R.isNil, R.path(path)),

diff --git a/etp-front/src/pages/energiatodistus/signing.svelte b/etp-front/src/pages/energiatodistus/signing.svelte
@@ -131,8 +131,8 @@
   const signAllPdf = Kielisyys.bilingual(energiatodistus)
     ? Future.and(signPdf('sv'), signPdf('fi'))
     : Kielisyys.onlySv(energiatodistus)
-    ? signPdf('sv')
-    : signPdf('fi');
+      ? signPdf('sv')
+      : signPdf('fi');
 
   const signingProcess = R.compose(
     Future.fork(response => {

diff --git a/etp-front/src/pages/valvonta-kaytto/osapuolet.js b/etp-front/src/pages/valvonta-kaytto/osapuolet.js
@@ -53,15 +53,15 @@ export const toimitustapaErrorKey = {
     (Maybe.isNone(yritys.ytunnus) || invalidOsoite(yritys))
       ? Maybe.Some('suomifi-yritys')
       : invalidEmail(yritys)
-      ? Maybe.Some('email')
-      : Maybe.None(),
+        ? Maybe.Some('email')
+        : Maybe.None(),
   henkilo: henkilo =>
     toimitustapa.suomifi(henkilo) &&
     (Maybe.isNone(henkilo.henkilotunnus) || invalidOsoite(henkilo))
       ? Maybe.Some('suomifi-henkilo')
       : invalidEmail(henkilo)
-      ? Maybe.Some('email')
-      : Maybe.None()
+        ? Maybe.Some('email')
+        : Maybe.None()
 };
 
 /**

diff --git a/etp-front/src/pages/valvonta-kaytto/schema.js b/etp-front/src/pages/valvonta-kaytto/schema.js
@@ -109,50 +109,64 @@ export const toimenpidePublish = (templates, toimenpide) =>
       'type-specific-data': {
         fine: addRequiredValidator(Toimenpiteet.hasFine(toimenpide)),
         'osapuoli-specific-data': osapuoliSpecificSchema =>
-          R.addIndex(R.map)((item, index) => {
-            const hasDocument = R.path(
-              [
-                'type-specific-data',
-                'osapuoli-specific-data',
-                index,
-                'document'
-              ],
-              toimenpide
-            );
+          R.addIndex(R.map)(
+            (item, index) => {
+              const hasDocument = R.path(
+                [
+                  'type-specific-data',
+                  'osapuoli-specific-data',
+                  index,
+                  'document'
+                ],
+                toimenpide
+              );
 
-            const recipientAnswered = R.path(
-              [
-                'type-specific-data',
-                'osapuoli-specific-data',
-                index,
-                'recipient-answered'
-              ],
-              toimenpide
-            );
-            return R.compose(
-              addRequiredValidatorToFieldsWhen(
-                (Toimenpiteet.isDecisionOrderActualDecision(toimenpide) ||
-                  Toimenpiteet.isPenaltyDecisionActualDecision(toimenpide)) &&
-                  recipientAnswered,
+              const recipientAnswered = R.path(
                 [
-                  'answer-commentary-sv',
-                  'answer-commentary-fi',
-                  'statement-sv',
-                  'statement-fi'
-                ]
-              ),
-              addRequiredValidatorToFieldsWhen(
-                (Toimenpiteet.isDecisionOrderActualDecision(toimenpide) ||
-                  Toimenpiteet.isPenaltyDecisionActualDecision(toimenpide)) &&
-                  hasDocument,
-                ['hallinto-oikeus-id']
-              ),
-              addRequiredValidatorToFieldsWhen(
-                Toimenpiteet.isNoticeBailiff(toimenpide) && hasDocument,
-                ['karajaoikeus-id', 'haastemies-email']
+                  'type-specific-data',
+                  'osapuoli-specific-data',
+                  index,
+                  'recipient-answered'
+                ],
+                toimenpide
+              );
+              return R.compose(
+                addRequiredValidatorToFieldsWhen(
+                  (Toimenpiteet.isDecisionOrderActualDecision(toimenpide) ||
+                    Toimenpiteet.isPenaltyDecisionActualDecision(toimenpide)) &&
+                    recipientAnswered,
+                  [
+                    'answer-commentary-sv',
+                    'answer-commentary-fi',
+                    'statement-sv',
+                    'statement-fi'
+                  ]
+                ),
+                addRequiredValidatorToFieldsWhen(
+                  (Toimenpiteet.isDecisionOrderActualDecision(toimenpide) ||
+                    Toimenpiteet.isPenaltyDecisionActualDecision(toimenpide)) &&
+                    hasDocument,
+                  ['hallinto-oikeus-id']
+                ),
+                addRequiredValidatorToFieldsWhen(
+                  Toimenpiteet.isNoticeBailiff(toimenpide) && hasDocument,
+                  ['karajaoikeus-id', 'haastemies-email']
+                )
+              )(item);
+            },
+            R.map(
+              R.always(osapuoliSpecificSchema[0]),
+              R.range(
+                0,
+                R.length(
+                  R.path(
+                    ['type-specific-data', 'osapuoli-specific-data'],
+                    toimenpide
+                  )
+                )
               )
-            )(item);
-          }, R.map(R.always(osapuoliSpecificSchema[0]), R.range(0, R.length(R.path(['type-specific-data', 'osapuoli-specific-data'], toimenpide))))),
+            )
+          ),
         'department-head-title-fi': addRequiredValidator(
           Toimenpiteet.isDecisionOrderActualDecision(toimenpide)
         ),

diff --git a/etp-front/src/pages/valvonta-kaytto/valvonnat.svelte b/etp-front/src/pages/valvonta-kaytto/valvonnat.svelte
@@ -286,9 +286,12 @@
             search={true}
             on:input={evt => {
               textCancel();
-              textCancel = Future.value(keyword => {
-                query = R.assoc('keyword', keyword, query);
-              }, Future.after(1000, Maybe.fromEmpty(R.trim(evt.target.value))));
+              textCancel = Future.value(
+                keyword => {
+                  query = R.assoc('keyword', keyword, query);
+                },
+                Future.after(1000, Maybe.fromEmpty(R.trim(evt.target.value)))
+              );
             }} />
         </div>
         <div class="md:col-span-1 col-span-4">

diff --git a/etp-front/src/pages/valvonta-oikeellisuus/valvonnat.svelte b/etp-front/src/pages/valvonta-oikeellisuus/valvonnat.svelte
@@ -243,9 +243,12 @@
               search={true}
               on:input={evt => {
                 textCancel();
-                textCancel = Future.value(keyword => {
-                  query = R.assoc('keyword', keyword, query);
-                }, Future.after(1000, Maybe.fromEmpty(R.trim(evt.target.value))));
+                textCancel = Future.value(
+                  keyword => {
+                    query = R.assoc('keyword', keyword, query);
+                  },
+                  Future.after(1000, Maybe.fromEmpty(R.trim(evt.target.value)))
+                );
               }} />
           </div>
           <div class="w-1/2 md:w-1/4">

diff --git a/etp-front/src/pages/viesti/viestit.svelte b/etp-front/src/pages/viesti/viestit.svelte
@@ -287,9 +287,12 @@
               search={true}
               on:input={evt => {
                 cancelKeywordSearch();
-                cancelKeywordSearch = Future.value(keyword => {
-                  query = R.assoc('keyword', keyword, query);
-                }, Future.after(1000, Maybe.fromEmpty(R.trim(evt.target.value))));
+                cancelKeywordSearch = Future.value(
+                  keyword => {
+                    query = R.assoc('keyword', keyword, query);
+                  },
+                  Future.after(1000, Maybe.fromEmpty(R.trim(evt.target.value)))
+                );
               }} />
           </div>
           <div class="md:w-1/2 w-full mr-4 my-4 md:my-8">

diff --git a/etp-front/src/template.html b/etp-front/src/template.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="fi">
   <head>
     <meta charset="utf-8" />

diff --git a/etp-public/.prettierrc b/etp-public/.prettierrc
@@ -1,4 +1,6 @@
 {
+  "plugins": ["prettier-plugin-svelte"],
+  "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }],
   "printWidth": 80,
   "tabWidth": 2,
   "useTabs": false,