We use cookies to ensure you get the best experience on our website
Home Explore Help
Register Sign In
0ct0pu5
/
immich
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix(deps): prettier 3 (#5336)

Jason Rasmussen 1 year ago
parent
87871e4df9
commit
3992119e32
11 changed files with 42 additions and 35 deletions
Split View Show Diff Stats
  1. 1 2
      web/.prettierrc
  2. 12 12
      web/package-lock.json
  3. 2 2
      web/package.json
  4. 1 1
      web/src/app.html
  5. 2 6
      web/src/lib/components/asset-viewer/album-list-item.svelte
  6. 3 1
      web/src/lib/components/memory-page/memory-viewer.svelte
  7. 3 1
      web/src/lib/components/photos-page/memory-lane.svelte
  8. 4 3
      web/src/lib/components/shared-components/album-selection-modal.svelte
  9. 6 2
      web/src/lib/components/shared-components/upload-asset-preview.svelte
  10. 4 1
      web/src/lib/stores/assets.store.ts
  11. 4 4
      web/src/routes/admin/user-management/+page.svelte

+ 1 - 2
web/.prettierrc
View File 

@@ -3,7 +3,6 @@
 
   "trailingComma": "all",
 
   "printWidth": 120,
 
   "semi": true,
 
-  "organizeImportsSkipDestructiveCodeActions": true,
 
   "plugins": ["prettier-plugin-svelte"],
 
-  "pluginSearchDirs": false
 
+  "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
 
 }

+ 12 - 12
web/package-lock.json
View File 

@@ -52,8 +52,8 @@
 
         "jest": "^29.4.3",
 
         "jest-environment-jsdom": "^29.4.3",
 
         "postcss": "^8.4.21",
 
-        "prettier": "^2.8.4",
 
-        "prettier-plugin-svelte": "^2.10.1",
 
+        "prettier": "^3.1.0",
 
+        "prettier-plugin-svelte": "^3.1.2",
 
         "svelte": "^4.0.5",
 
         "svelte-check": "^3.4.3",
 
         "svelte-jester": "^3.0.0",
 
@@ -10231,28 +10231,28 @@
 
       }
 
     },
 
     "node_modules/prettier": {
 
-      "version": "2.8.8",
 
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
 
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
 
+      "version": "3.1.0",
 
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz",
 
+      "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==",
 
       "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"
 
       }
 
     },
 
     "node_modules/prettier-plugin-svelte": {
 
-      "version": "2.10.1",
 
-      "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.10.1.tgz",
 
-      "integrity": "sha512-Wlq7Z5v2ueCubWo0TZzKc9XHcm7TDxqcuzRuGd0gcENfzfT4JZ9yDlCbEgxWgiPmLHkBjfOtpAWkcT28MCDpUQ==",
 
+      "version": "3.1.2",
 
+      "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.1.2.tgz",
 
+      "integrity": "sha512-7xfMZtwgAWHMT0iZc8jN4o65zgbAQ3+O32V6W7pXrqNvKnHnkoyQCGCbKeUyXKZLbYE0YhFRnamfxfkEGxm8qA==",
 
       "dev": true,
 
       "peerDependencies": {
 
-        "prettier": "^1.16.4 || ^2.0.0",
 
-        "svelte": "^3.2.0 || ^4.0.0-next.0"
 
+        "prettier": "^3.0.0",
 
+        "svelte": "^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0"
 
       }
 
     },
 
     "node_modules/pretty-format": {

+ 2 - 2
web/package.json
View File 

@@ -45,8 +45,8 @@
 
     "jest": "^29.4.3",
 
     "jest-environment-jsdom": "^29.4.3",
 
     "postcss": "^8.4.21",
 
-    "prettier": "^2.8.4",
 
-    "prettier-plugin-svelte": "^2.10.1",
 
+    "prettier": "^3.1.0",
 
+    "prettier-plugin-svelte": "^3.1.2",
 
     "svelte": "^4.0.5",
 
     "svelte-check": "^3.4.3",
 
     "svelte-jester": "^3.0.0",

+ 1 - 1
web/src/app.html
View File 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html>
 
+<!doctype html>
 
 <html lang="en" class="dark">
 
   <head>
 
     <meta charset="utf-8" />

+ 2 - 6
web/src/lib/components/asset-viewer/album-list-item.svelte
View File 

@@ -44,14 +44,10 @@
 
     >
 
     <span class="flex gap-1 text-sm">
 
       {#if variant === 'simple'}
 
-        <span
 
-          >{#if album.shared}Shared{/if}
 
-        </span>
 
+        <span>{album.shared ? 'Shared' : ''}</span>
 
       {:else}
 
         <span>{album.assetCount} items</span>
 
-        <span
 
-          >{#if album.shared} · Shared{/if}
 
-        </span>
 
+        <span>{album.shared ? ' · Shared' : ''} </span>
 
       {/if}
 
     </span>
 
   </div>

+ 3 - 1
web/src/lib/components/memory-page/memory-viewer.svelte
View File 

@@ -275,6 +275,8 @@
 
 
 <style>
 
   .main-view {
 
-    box-shadow: 0 4px 4px 0 rgba(0, 0, 0, 0.3), 0 8px 12px 6px rgba(0, 0, 0, 0.15);
 
+    box-shadow:
 
+      0 4px 4px 0 rgba(0, 0, 0, 0.3),
 
+      0 8px 12px 6px rgba(0, 0, 0, 0.15);
 
   }
 
 </style>

+ 3 - 1
web/src/lib/components/photos-page/memory-lane.svelte
View File 

@@ -91,6 +91,8 @@
 
 
 <style>
 
   .memory-card {
 
-    box-shadow: rgba(60, 64, 67, 0.3) 0px 1px 2px 0px, rgba(60, 64, 67, 0.15) 0px 1px 3px 1px;
 
+    box-shadow:
 
+      rgba(60, 64, 67, 0.3) 0px 1px 2px 0px,
 
+      rgba(60, 64, 67, 0.15) 0px 1px 3px 1px;
 
   }
 
 </style>

+ 4 - 3
web/src/lib/components/shared-components/album-selection-modal.svelte
View File 

@@ -52,7 +52,7 @@
 
   <svelte:fragment slot="title">
 
     <span class="flex place-items-center gap-2">
 
       <p class="font-medium">
 
-        Add to {#if shared}Shared {/if} Album
 
+        Add to {shared ? 'Shared ' : ''}Album
 
       </p>
 
     </span>
 
   </svelte:fragment>
 
@@ -88,7 +88,7 @@
 
             <Icon path={mdiPlus} size="30" />
 
           </div>
 
           <p class="">
 
-            New {#if shared}Shared {/if}Album {#if search.length > 0}<b>{search}</b>{/if}
 
+            New {shared ? 'Shared ' : ''}Album {#if search.length > 0}<b>{search}</b>{/if}
 
           </p>
 
         </button>
 
         {#if filteredAlbums.length > 0}
 
@@ -101,7 +101,8 @@
 
 
           {#if !shared}
 
             <p class="px-5 py-3 text-xs">
 
-              {#if search.length === 0}ALL {/if}ALBUMS
 
+              {#if search.length === 0}ALL
 
+              {/if}ALBUMS
 
             </p>
 
           {/if}
 
           {#each filteredAlbums as album (album.id)}

+ 6 - 2
web/src/lib/components/shared-components/upload-asset-preview.svelte
View File 

@@ -66,13 +66,17 @@
 
           <div class="h-[15px] rounded-md bg-immich-warning transition-all" style="width: 100%" />
 
           <p class="absolute top-0 h-full w-full text-center text-[10px]">
 
             Skipped
 
-            {#if uploadAsset.message} ({uploadAsset.message}){/if}
 
+            {#if uploadAsset.message}
 
+              ({uploadAsset.message})
 
+            {/if}
 
           </p>
 
         {:else if uploadAsset.state === UploadState.DONE}
 
           <div class="h-[15px] rounded-md bg-immich-success transition-all" style="width: 100%" />
 
           <p class="absolute top-0 h-full w-full text-center text-[10px]">
 
             Uploaded
 
-            {#if uploadAsset.message} ({uploadAsset.message}){/if}
 
+            {#if uploadAsset.message}
 
+              ({uploadAsset.message})
 
+            {/if}
 
           </p>
 
         {/if}
 
       </div>

+ 4 - 1
web/src/lib/stores/assets.store.ts
View File 

@@ -73,7 +73,10 @@ export class AssetStore {
 
   assets: AssetResponseDto[] = [];
 
   albumAssets: Set<string> = new Set();
 
 
-  constructor(options: AssetStoreOptions, private albumId?: string) {
 
+  constructor(
 
+    options: AssetStoreOptions,
 
+    private albumId?: string,
 
+  ) {
 
     this.options = { ...options, size: TimeBucketSize.Month };
 
     this.store$.set(this);
 
   }

+ 4 - 4
web/src/routes/admin/user-management/+page.svelte
View File 

@@ -181,8 +181,8 @@
 
                   isDeleted(user)
 
                     ? 'bg-red-300 dark:bg-red-900'
 
                     : i % 2 == 0
 
-                    ? 'bg-immich-gray dark:bg-immich-dark-gray/75'
 
-                    : 'bg-immich-bg dark:bg-immich-dark-gray/50'
 
+                      ? 'bg-immich-gray dark:bg-immich-dark-gray/75'
 
+                      : 'bg-immich-bg dark:bg-immich-dark-gray/50'
 
                 }`}
 
               >
 
                 <td class="w-4/12 text-ellipsis break-all px-2 text-sm">{user.email}</td>
 
@@ -247,8 +247,8 @@
 
                   isDeleted(user)
 
                     ? 'bg-red-300 dark:bg-red-900'
 
                     : i % 2 == 0
 
-                    ? 'bg-immich-gray dark:bg-immich-dark-gray/75'
 
-                    : 'bg-immich-bg dark:bg-immich-dark-gray/50'
 
+                      ? 'bg-immich-gray dark:bg-immich-dark-gray/75'
 
+                      : 'bg-immich-bg dark:bg-immich-dark-gray/50'
 
                 }`}
 
               >
 
                 <td class="w-1/4 text-ellipsis break-words px-2 text-sm">{user.name}</td>

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5