merge: resolve pnpm-lock.yaml conflict with main

This commit is contained in:
Zack
2026-03-23 16:50:09 +00:00
12 changed files with 7006 additions and 1510 deletions
+7 -7
View File
@@ -20,11 +20,11 @@
"@eslint/compat": "^2.0.0",
"@eslint/js": "^10.0.0",
"@sveltejs/adapter-static": "^3.0.9",
"@sveltejs/kit": "^2.43.2",
"@sveltejs/vite-plugin-svelte": "^6.2.4",
"@tailwindcss/vite": "^4.1.13",
"@sveltejs/kit": "^2.55.0",
"@sveltejs/vite-plugin-svelte": "^7.0.0",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^24.12.0",
"@vitest/browser": "^3.2.4",
"@vitest/browser": "^4.1.0",
"dotenv": "^17.2.3",
"eslint": "^10.0.0",
"eslint-config-prettier": "^10.1.8",
@@ -36,11 +36,11 @@
"prettier-plugin-tailwindcss": "^0.7.2",
"svelte": "^5.39.5",
"svelte-check": "^4.3.2",
"tailwindcss": "^4.1.13",
"tailwindcss": "^4.2.2",
"typescript": "^5.9.2",
"typescript-eslint": "^8.44.1",
"vite": "^7.1.7",
"vitest": "^4.0.12",
"vite": "^8.0.0",
"vitest": "^4.1.0",
"vitest-browser-svelte": "^2.0.0"
},
"dependencies": {
+6 -6
View File
@@ -19,12 +19,12 @@
"@eslint/compat": "^2.0.0",
"@eslint/js": "^10.0.0",
"@sveltejs/adapter-static": "^3.0.9",
"@sveltejs/kit": "^2.43.2",
"@sveltejs/vite-plugin-svelte": "^6.2.4",
"@tailwindcss/vite": "^4.1.13",
"@sveltejs/kit": "^2.55.0",
"@sveltejs/vite-plugin-svelte": "^7.0.0",
"@tailwindcss/vite": "^4.2.2",
"@types/luxon": "^3.7.1",
"@types/node": "^24.12.0",
"@vitest/browser": "^3.2.4",
"@vitest/browser": "^4.1.0",
"dotenv": "^17.2.3",
"eslint": "^10.0.0",
"eslint-config-prettier": "^10.1.8",
@@ -40,10 +40,10 @@
"simple-icons": "^16.0.0",
"svelte": "^5.39.5",
"svelte-check": "^4.3.2",
"tailwindcss": "^4.1.13",
"tailwindcss": "^4.2.2",
"typescript": "^5.9.2",
"typescript-eslint": "^8.44.1",
"vite": "^7.1.7",
"vite": "^8.0.0",
"vitest": "^4.0.12",
"vitest-browser-svelte": "^2.0.0"
},
+7 -7
View File
@@ -20,11 +20,11 @@
"@eslint/compat": "^2.0.0",
"@eslint/js": "^10.0.0",
"@sveltejs/adapter-static": "^3.0.9",
"@sveltejs/kit": "^2.43.2",
"@sveltejs/vite-plugin-svelte": "^6.2.4",
"@tailwindcss/vite": "^4.1.13",
"@sveltejs/kit": "^2.55.0",
"@sveltejs/vite-plugin-svelte": "^7.0.0",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^24.12.0",
"@vitest/browser": "^3.2.4",
"@vitest/browser": "^4.1.0",
"dotenv": "^17.2.3",
"eslint": "^10.0.0",
"eslint-config-prettier": "^10.1.8",
@@ -36,11 +36,11 @@
"prettier-plugin-tailwindcss": "^0.7.2",
"svelte": "^5.39.5",
"svelte-check": "^4.3.2",
"tailwindcss": "^4.1.13",
"tailwindcss": "^4.2.2",
"typescript": "^5.9.2",
"typescript-eslint": "^8.44.1",
"vite": "^7.1.7",
"vitest": "^4.0.12",
"vite": "^8.0.0",
"vitest": "^4.1.0",
"vitest-browser-svelte": "^2.0.0"
},
"dependencies": {
@@ -10,11 +10,11 @@
"cf-typegen": "wrangler types"
},
"devDependencies": {
"@cloudflare/vitest-pool-workers": "^0.12.0",
"@cloudflare/vitest-pool-workers": "^0.13.2",
"@types/luxon": "^3.6.2",
"typescript": "^5.5.2",
"vitest": "~3.2.0",
"wrangler": "^4.18.0"
"vitest": "^4.1.0",
"wrangler": "^4.75.0"
},
"dependencies": {
"@immich/ui": "^0.65.0",
@@ -1,8 +1,8 @@
import { SELF } from 'cloudflare:test';
import { exports } from 'cloudflare:workers';
import { describe, expect, it } from 'vitest';
async function getJWTAuthHeader() {
const response = await SELF.fetch(
const response = await exports.default.fetch(
new Request('https://example.com/api/auth', {
method: 'POST',
body: JSON.stringify({ turnstileToken: 'TEST_TOKEN' }),
@@ -15,7 +15,7 @@ async function getJWTAuthHeader() {
describe('JWT Authentication', () => {
it('returns a valid JWT token', async () => {
const response = await SELF.fetch(
const response = await exports.default.fetch(
new Request('https://example.com/api/auth', {
method: 'POST',
body: JSON.stringify({ turnstileToken: 'TEST_TOKEN' }),
@@ -46,7 +46,7 @@ describe('EXIF Dataset upload API worker', () => {
}),
);
const response = await SELF.fetch(
const response = await exports.default.fetch(
new Request('https://example.com/api/exif/upload', {
method: 'PUT',
body: formData,
@@ -74,7 +74,7 @@ describe('EXIF Dataset upload API worker', () => {
}),
);
const response = await SELF.fetch(
const response = await exports.default.fetch(
new Request('https://example.com/api/exif/upload', {
method: 'PUT',
body: formData,
@@ -101,7 +101,7 @@ describe('EXIF Dataset upload API worker', () => {
}),
);
const response = await SELF.fetch(
const response = await exports.default.fetch(
new Request('https://example.com/api/exif/upload', {
method: 'PUT',
body: formData,
@@ -130,7 +130,7 @@ describe('EXIF Dataset upload API worker', () => {
}),
);
const response = await SELF.fetch(
const response = await exports.default.fetch(
new Request('https://example.com/api/exif/upload', {
method: 'PUT',
body: formData,
@@ -147,7 +147,7 @@ describe('EXIF Dataset upload API worker', () => {
const formData = new FormData();
formData.append('file', new Blob(['test1234'], { type: 'image/jpeg' }), 'test.jpg');
const response = await SELF.fetch(
const response = await exports.default.fetch(
new Request('https://example.com/api/exif/upload', {
method: 'PUT',
body: formData,
@@ -163,7 +163,7 @@ describe('EXIF Dataset upload API worker', () => {
it('rejects missing all data', async () => {
const formData = new FormData();
const response = await SELF.fetch(
const response = await exports.default.fetch(
new Request('https://example.com/api/exif/upload', {
method: 'PUT',
body: formData,
@@ -191,7 +191,7 @@ describe('EXIF Dataset upload API worker', () => {
}),
);
const response = await SELF.fetch(
const response = await exports.default.fetch(
new Request('https://example.com/api/exif/upload', {
method: 'POST',
body: formData,
@@ -218,7 +218,7 @@ describe('EXIF Dataset upload API worker', () => {
}),
);
const response = await SELF.fetch(
const response = await exports.default.fetch(
new Request('https://example.com/api/exif/upload', {
method: 'PUT',
body: formData,
@@ -246,7 +246,7 @@ describe('EXIF Dataset upload API worker', () => {
}),
);
const response = await SELF.fetch(
const response = await exports.default.fetch(
new Request('https://example.com/api/exif/upload', {
method: 'PUT',
body: formData,
@@ -270,7 +270,7 @@ describe('EXIF Dataset upload API worker', () => {
}),
);
const response = await SELF.fetch(
const response = await exports.default.fetch(
new Request('https://example.com/api/exif/upload', {
method: 'PUT',
body: formData,
@@ -297,7 +297,7 @@ describe('EXIF Dataset upload API worker', () => {
}),
);
const response = await SELF.fetch(
const response = await exports.default.fetch(
new Request('https://example.com/api/exif/upload', {
method: 'PUT',
body: formData,
@@ -1,11 +1,10 @@
import { defineWorkersConfig } from '@cloudflare/vitest-pool-workers/config';
import { cloudflareTest } from '@cloudflare/vitest-pool-workers';
import { defineConfig } from 'vitest/config';
export default defineWorkersConfig({
test: {
poolOptions: {
workers: {
wrangler: { configPath: './wrangler.jsonc' },
},
},
},
export default defineConfig({
plugins: [
cloudflareTest({
wrangler: { configPath: './wrangler.jsonc' },
}),
],
});
File diff suppressed because it is too large Load Diff
+7 -7
View File
@@ -20,11 +20,11 @@
"@eslint/compat": "^2.0.0",
"@eslint/js": "^10.0.0",
"@sveltejs/adapter-static": "^3.0.9",
"@sveltejs/kit": "^2.43.2",
"@sveltejs/vite-plugin-svelte": "^6.2.4",
"@tailwindcss/vite": "^4.1.13",
"@sveltejs/kit": "^2.55.0",
"@sveltejs/vite-plugin-svelte": "^7.0.0",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^24.12.0",
"@vitest/browser": "^3.2.4",
"@vitest/browser": "^4.1.0",
"dotenv": "^17.2.3",
"eslint": "^10.0.0",
"eslint-config-prettier": "^10.1.8",
@@ -36,11 +36,11 @@
"prettier-plugin-tailwindcss": "^0.7.2",
"svelte": "^5.39.5",
"svelte-check": "^4.3.2",
"tailwindcss": "^4.1.13",
"tailwindcss": "^4.2.2",
"typescript": "^5.9.2",
"typescript-eslint": "^8.44.1",
"vite": "^7.1.7",
"vitest": "^3.2.4",
"vite": "^8.0.0",
"vitest": "^4.1.0",
"vitest-browser-svelte": "^2.0.0"
},
"dependencies": {
+7 -7
View File
@@ -20,11 +20,11 @@
"@eslint/compat": "^2.0.0",
"@eslint/js": "^10.0.0",
"@sveltejs/adapter-static": "^3.0.9",
"@sveltejs/kit": "^2.43.2",
"@sveltejs/vite-plugin-svelte": "^6.2.4",
"@tailwindcss/vite": "^4.1.13",
"@sveltejs/kit": "^2.55.0",
"@sveltejs/vite-plugin-svelte": "^7.0.0",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^24.12.0",
"@vitest/browser": "^3.2.4",
"@vitest/browser": "^4.1.0",
"dotenv": "^17.2.3",
"eslint": "^10.0.0",
"eslint-config-prettier": "^10.1.8",
@@ -36,11 +36,11 @@
"prettier-plugin-tailwindcss": "^0.7.2",
"svelte": "^5.39.5",
"svelte-check": "^4.3.2",
"tailwindcss": "^4.1.13",
"tailwindcss": "^4.2.2",
"typescript": "^5.9.2",
"typescript-eslint": "^8.44.1",
"vite": "^7.1.7",
"vitest": "^4.0.12",
"vite": "^8.0.0",
"vitest": "^4.1.0",
"vitest-browser-svelte": "^2.0.0"
},
"dependencies": {
+7 -7
View File
@@ -20,11 +20,11 @@
"@eslint/compat": "^2.0.0",
"@eslint/js": "^10.0.0",
"@sveltejs/adapter-static": "^3.0.9",
"@sveltejs/kit": "^2.43.2",
"@sveltejs/vite-plugin-svelte": "^6.2.4",
"@tailwindcss/vite": "^4.1.13",
"@sveltejs/kit": "^2.55.0",
"@sveltejs/vite-plugin-svelte": "^7.0.0",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^24.12.0",
"@vitest/browser": "^3.2.4",
"@vitest/browser": "^4.1.0",
"dotenv": "^17.2.3",
"eslint": "^10.0.0",
"eslint-config-prettier": "^10.1.8",
@@ -36,11 +36,11 @@
"prettier-plugin-tailwindcss": "^0.7.2",
"svelte": "^5.39.5",
"svelte-check": "^4.3.2",
"tailwindcss": "^4.1.13",
"tailwindcss": "^4.2.2",
"typescript": "^5.9.2",
"typescript-eslint": "^8.44.1",
"vite": "^7.1.7",
"vitest": "^4.0.12",
"vite": "^8.0.0",
"vitest": "^4.1.0",
"vitest-browser-svelte": "^2.0.0"
},
"dependencies": {
+7 -7
View File
@@ -21,12 +21,12 @@
"@eslint/js": "^10.0.0",
"@immich/svelte-markdown-preprocess": "^0.2.1",
"@sveltejs/adapter-static": "^3.0.9",
"@sveltejs/kit": "^2.43.2",
"@sveltejs/vite-plugin-svelte": "^6.2.4",
"@tailwindcss/vite": "^4.1.13",
"@sveltejs/kit": "^2.55.0",
"@sveltejs/vite-plugin-svelte": "^7.0.0",
"@tailwindcss/vite": "^4.2.2",
"@types/luxon": "^3.7.1",
"@types/node": "^24.12.0",
"@vitest/browser": "^3.2.4",
"@vitest/browser": "^4.1.0",
"dotenv": "^17.2.3",
"eslint": "^10.0.0",
"eslint-config-prettier": "^10.1.8",
@@ -41,11 +41,11 @@
"simple-icons": "^16.0.0",
"svelte": "^5.39.5",
"svelte-check": "^4.3.2",
"tailwindcss": "^4.1.13",
"tailwindcss": "^4.2.2",
"typescript": "^5.9.2",
"typescript-eslint": "^8.44.1",
"vite": "^7.1.7",
"vitest": "^4.0.12",
"vite": "^8.0.0",
"vitest": "^4.1.0",
"vitest-browser-svelte": "^2.0.0"
},
"dependencies": {
+921 -957
View File
File diff suppressed because it is too large Load Diff