Skip to content

Commit 6631200

Browse files
authored
Bump dependencies with Vite 5 & prevent some more type errors (#2238)
1 parent 40591a1 commit 6631200

File tree

14 files changed

+382
-193
lines changed

14 files changed

+382
-193
lines changed

app/Actions/Diagnostics/Pipes/Checks/IniSettingsCheck.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function handle(array &$data, \Closure $next): array
6969
if (extension_loaded('xdebug')) {
7070
// @codeCoverageIgnoreStart
7171
$msg = config('app.debug') !== true
72-
? 'Errror: xdebug is enabled although Lychee is not in debug mode. Outside of debugging, xdebug will generate significant slowdown on your application.'
72+
? 'Error: xdebug is enabled although Lychee is not in debug mode. Outside of debugging, xdebug will generate significant slowdown on your application.'
7373
: 'Warning: xdebug is enabled. This will generate significant slowdown on your application.';
7474
$data[] = $msg;
7575
// @codeCoverageIgnoreEnd

package-lock.json

Lines changed: 361 additions & 171 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@lychee-org/leaflet.photo": "^1.0.0",
13-
"@types/alpinejs": "^3.13.5",
13+
"@types/alpinejs": "^3.13.6",
1414
"@types/leaflet": "^1.9.8",
1515
"@types/leaflet-rotatedmarker": "^0.2.5",
1616
"@types/leaflet.markercluster": "^1.5.4",
@@ -21,23 +21,23 @@
2121
"dependencies": {
2222
"@fortawesome/fontawesome-free": "^6.5.1",
2323
"@types/justified-layout": "^4.1.4",
24-
"autoprefixer": "^10.4.16",
24+
"autoprefixer": "^10.4.17",
2525
"justified-layout": "^4.1.0",
26-
"laravel-vite-plugin": "^0.8.1",
26+
"laravel-vite-plugin": "^1.0.1",
2727
"lazysizes": "^5.3.2",
2828
"leaflet": "^1.9.4",
2929
"leaflet-gpx": "^1.7.0",
3030
"leaflet-rotatedmarker": "^0.2.0",
31-
"leaflet.markercluster": "^1.4.1",
32-
"postcss": "^8.4.32",
33-
"prettier": "^3.1.1",
31+
"leaflet.markercluster": "^1.5.3",
32+
"postcss": "^8.4.33",
33+
"prettier": "^3.2.4",
3434
"qrcode": "^1.5.3",
35-
"tailwindcss": "^3.3.6",
35+
"tailwindcss": "^3.4.1",
3636
"ts-loader": "^9.5.1",
3737
"typescript": "^5.3.3",
38-
"vite": "^4.5.2",
38+
"vite": "^5.0.12",
3939
"vite-plugin-checker": "^0.6.2",
40-
"vite-plugin-commonjs": "^0.10.0"
40+
"vite-plugin-commonjs": "^0.10.1"
4141
},
4242
"browserslist": [
4343
"defaults and fully supports es6-module"

postcss.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/** @type {import('postcss-load-config').Config} */
12
export default {
23
plugins: {
34
tailwindcss: {},

resources/js/data/panel/photoListingPanel.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import Selection from "@/lycheeOrg/actions/selection";
33
import { Photo } from "@/lycheeOrg/backend";
44

55
export type PhotoListingPanel = AlpineComponent<{
6-
select: Selection;
76
photos: Photo[];
7+
select: Selection;
88
}>;
99

1010
/**
@@ -14,7 +14,6 @@ export type PhotoListingPanel = AlpineComponent<{
1414
export const photoListingPanel = (Alpine: Alpine) =>
1515
Alpine.data(
1616
"photoListingPanel",
17-
// @ts-expect-error
1817
(photos: Photo[], select: Selection): PhotoListingPanel => ({
1918
photos: photos,
2019
select: select,

resources/js/data/panel/searchPanel.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export type SearchPanel = AlpineComponent<{
1313
export const searchPanel = (Alpine: Alpine) =>
1414
Alpine.data(
1515
"searchPanel",
16-
// @ts-expect-error
1716
(searchQuery: string, minLength: number, select: Selection): SearchPanel => ({
1817
searchQuery: searchQuery,
1918
hideMessage: false,

resources/js/data/views/albumView.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import PhotoLayout from "@/lycheeOrg/layouts/PhotoLayout";
1111
export const albumView = (Alpine: Alpine) =>
1212
Alpine.data(
1313
"albumView",
14-
// @ts-expect-error
1514
(
1615
base_url: string,
1716
nsfwAlbumsVisible: boolean,
@@ -87,14 +86,17 @@ export const albumView = (Alpine: Alpine) =>
8786
},
8887

8988
handleContextPhoto(event: MouseEvent) {
89+
// @ts-expect-error
9090
this.actions.handleContextPhoto(event, this);
9191
},
9292

9393
handleClickPhoto(event: MouseEvent) {
94+
// @ts-expect-error
9495
this.actions.handleClickPhoto(event, this);
9596
},
9697

9798
handleContextAlbum(event: MouseEvent) {
99+
// @ts-expect-error
98100
this.actions.handleContextAlbum(event, this);
99101
},
100102

@@ -121,6 +123,7 @@ export const albumView = (Alpine: Alpine) =>
121123
// [l] login
122124
// [?] keybinds
123125
// [esc] back
126+
// @ts-expect-error
124127
if (this.keybinds.handleGlobalKeydown(event, this)) {
125128
return;
126129
}
@@ -135,6 +138,7 @@ export const albumView = (Alpine: Alpine) =>
135138
// [s] Star
136139
// [ctrl + ->] rotate CW
137140
// [ctrl + <-] rotate CCW
141+
// @ts-expect-error
138142
if (this.photo_id !== null && this.keybinds.handlePhotoKeyDown(event, this)) {
139143
return;
140144
}
@@ -152,6 +156,7 @@ export const albumView = (Alpine: Alpine) =>
152156
// [i] info
153157
// [m] move (without select)
154158
// [r] rename (without select)
159+
// @ts-expect-error
155160
this.keybinds.handleAlbumKeydown(event, this);
156161
},
157162

resources/js/data/views/dropboxView.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ type DropboxFile = {
1515
export const dropboxView = (Alpine: Alpine) =>
1616
Alpine.data(
1717
"dropboxView",
18-
// @ts-expect-error
1918
(urlArea_: string, progress_: string): DropboxView => ({
2019
urlArea: urlArea_,
2120
progress: progress_,

resources/js/data/views/photoView.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ export type PhotoView = AlpineComponent<{
2727
export const photoView = (Alpine: Alpine) =>
2828
Alpine.data(
2929
"photoView",
30-
// @ts-expect-error
3130
(
3231
// photo_id: string,
3332
photoFlags: PhotoFlagsView,
@@ -42,7 +41,6 @@ export const photoView = (Alpine: Alpine) =>
4241
mode: 0,
4342

4443
init() {
45-
// @ts-expect-errror
4644
console.log("init photoView!");
4745

4846
const photo = Alpine.store("photo") as Photo | undefined;

resources/js/data/views/uploadView.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { UploadView, Livewire, UploadEvent } from "./types";
44
export const uploadView = (Alpine: Alpine) =>
55
Alpine.data(
66
"upload",
7-
// @ts-expect-error
87
(chunkSize_val: number, parallelism_val: number = 3): UploadView => ({
98
isDropping: false,
109
chunkSize: chunkSize_val,

0 commit comments

Comments
 (0)