diff --git a/examples/backend-adapters/server/package.json b/examples/backend-adapters/server/package.json index fc6bfb1a21..2fe9e82605 100644 --- a/examples/backend-adapters/server/package.json +++ b/examples/backend-adapters/server/package.json @@ -12,15 +12,14 @@ "dev:effect": "NODE_ENV=development PORT=3003 tsx watch src/effect-platform.ts" }, "dependencies": { - "@effect/platform": "0.68.5", - "@effect/platform-node": "0.63.5", - "@effect/schema": "0.75.4", + "@effect/platform": "0.69.5", + "@effect/platform-node": "0.64.6", "@elysiajs/cors": "^1.1.1", "@fastify/cors": "^9.0.1", "@hono/node-server": "^1.8.2", "cors": "^2.8.5", "dotenv": "^16.4.5", - "effect": "3.9.2", + "effect": "3.10.1", "elysia": "^1.1.16", "express": "^4.18.2", "fastify": "^4.26.1", diff --git a/package.json b/package.json index 0da7643044..245bfe78b1 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@actions/github": "^6.0.0", "@changesets/changelog-github": "^0.5.0", "@changesets/cli": "^2.27.1", - "@effect/vitest": "0.12.1", + "@effect/vitest": "0.13.1", "@ianvs/prettier-plugin-sort-imports": "^4.2.1", "@manypkg/cli": "^0.21.3", "@playwright/test": "1.45.0", diff --git a/packages/shared/package.json b/packages/shared/package.json index f3ce7f7317..afed277dca 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "@uploadthing/mime-types": "workspace:*", - "effect": "3.9.2", + "effect": "3.10.1", "sqids": "^0.3.0" }, "devDependencies": { diff --git a/packages/uploadthing/package.json b/packages/uploadthing/package.json index 1c6628f4a1..1de6378e59 100644 --- a/packages/uploadthing/package.json +++ b/packages/uploadthing/package.json @@ -150,11 +150,10 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@effect/platform": "0.68.5", - "@effect/schema": "0.75.4", + "@effect/platform": "0.69.5", "@uploadthing/mime-types": "workspace:*", "@uploadthing/shared": "workspace:*", - "effect": "3.9.2" + "effect": "3.10.1" }, "devDependencies": { "@remix-run/server-runtime": "^2.12.0", diff --git a/packages/uploadthing/src/internal/config.test.ts b/packages/uploadthing/src/internal/config.test.ts index 0cced6b112..70eeeda818 100644 --- a/packages/uploadthing/src/internal/config.test.ts +++ b/packages/uploadthing/src/internal/config.test.ts @@ -1,10 +1,10 @@ import { after } from "node:test"; -import * as S from "@effect/schema/Schema"; import { it } from "@effect/vitest"; import * as Effect from "effect/Effect"; import * as Exit from "effect/Exit"; import * as Layer from "effect/Layer"; import * as Redacted from "effect/Redacted"; +import * as S from "effect/Schema"; import { afterEach, beforeEach, describe, expect } from "vitest"; import { UploadThingError } from "@uploadthing/shared"; diff --git a/packages/uploadthing/src/internal/config.ts b/packages/uploadthing/src/internal/config.ts index 6a77d311c1..73a5b0b74e 100644 --- a/packages/uploadthing/src/internal/config.ts +++ b/packages/uploadthing/src/internal/config.ts @@ -1,7 +1,7 @@ -import * as S from "@effect/schema/Schema"; import * as Config from "effect/Config"; import * as ConfigProvider from "effect/ConfigProvider"; import * as Effect from "effect/Effect"; +import * as S from "effect/Schema"; import { filterDefinedObjectValues, diff --git a/packages/uploadthing/src/internal/handler.ts b/packages/uploadthing/src/internal/handler.ts index 451ec9ed9c..c43ea03f97 100644 --- a/packages/uploadthing/src/internal/handler.ts +++ b/packages/uploadthing/src/internal/handler.ts @@ -8,12 +8,12 @@ import { HttpServerRequest, HttpServerResponse, } from "@effect/platform"; -import * as S from "@effect/schema/Schema"; import * as Config from "effect/Config"; import * as Context from "effect/Context"; import * as Effect from "effect/Effect"; import * as Match from "effect/Match"; import * as Redacted from "effect/Redacted"; +import * as S from "effect/Schema"; import { fillInputRouteConfig, diff --git a/packages/uploadthing/src/internal/jsonl.ts b/packages/uploadthing/src/internal/jsonl.ts index 99d8582fe6..5a75693b4d 100644 --- a/packages/uploadthing/src/internal/jsonl.ts +++ b/packages/uploadthing/src/internal/jsonl.ts @@ -1,5 +1,5 @@ -import * as S from "@effect/schema/Schema"; import * as Effect from "effect/Effect"; +import * as S from "effect/Schema"; import * as Stream from "effect/Stream"; export const handleJsonLineStream = diff --git a/packages/uploadthing/src/internal/route-config.ts b/packages/uploadthing/src/internal/route-config.ts index 881a68c3fb..634b23dd23 100644 --- a/packages/uploadthing/src/internal/route-config.ts +++ b/packages/uploadthing/src/internal/route-config.ts @@ -1,6 +1,6 @@ -import type * as S from "@effect/schema/Schema"; import * as Data from "effect/Data"; import * as Effect from "effect/Effect"; +import type * as S from "effect/Schema"; import type { ExpandedRouteConfig, diff --git a/packages/uploadthing/src/internal/shared-schemas.ts b/packages/uploadthing/src/internal/shared-schemas.ts index 819d7a669c..25bafdb50b 100644 --- a/packages/uploadthing/src/internal/shared-schemas.ts +++ b/packages/uploadthing/src/internal/shared-schemas.ts @@ -1,4 +1,4 @@ -import * as S from "@effect/schema/Schema"; +import * as S from "effect/Schema"; import type { Json } from "@uploadthing/shared"; import { ValidACLs, ValidContentDispositions } from "@uploadthing/shared"; diff --git a/packages/uploadthing/src/internal/types.ts b/packages/uploadthing/src/internal/types.ts index 3ea85d5c65..1f5a8224e6 100644 --- a/packages/uploadthing/src/internal/types.ts +++ b/packages/uploadthing/src/internal/types.ts @@ -1,6 +1,6 @@ -import type { Schema } from "@effect/schema/Schema"; import type * as Config from "effect/Config"; import type * as LogLevel from "effect/LogLevel"; +import type { Schema } from "effect/Schema"; import type { ErrorMessage, diff --git a/packages/uploadthing/src/sdk/index.ts b/packages/uploadthing/src/sdk/index.ts index 44e1441bef..6094c6293d 100644 --- a/packages/uploadthing/src/sdk/index.ts +++ b/packages/uploadthing/src/sdk/index.ts @@ -4,12 +4,12 @@ import { HttpClientRequest, HttpClientResponse, } from "@effect/platform"; -import * as S from "@effect/schema/Schema"; import * as Arr from "effect/Array"; import * as Effect from "effect/Effect"; import type * as ManagedRuntime from "effect/ManagedRuntime"; import * as Predicate from "effect/Predicate"; import * as Redacted from "effect/Redacted"; +import * as S from "effect/Schema"; import type { ACL, diff --git a/packages/uploadthing/test/__test-helpers.ts b/packages/uploadthing/test/__test-helpers.ts index bce9b3e7fc..99f5ef0e68 100644 --- a/packages/uploadthing/test/__test-helpers.ts +++ b/packages/uploadthing/test/__test-helpers.ts @@ -1,6 +1,6 @@ import { createHash } from "crypto"; -import * as S from "@effect/schema/Schema"; import * as Redacted from "effect/Redacted"; +import * as S from "effect/Schema"; import type { StrictRequest } from "msw"; import { http, HttpResponse } from "msw"; import { setupServer } from "msw/node"; diff --git a/packages/uploadthing/test/sdk.test.ts b/packages/uploadthing/test/sdk.test.ts index 61edb8d555..0ed59ed187 100644 --- a/packages/uploadthing/test/sdk.test.ts +++ b/packages/uploadthing/test/sdk.test.ts @@ -1,5 +1,5 @@ /* eslint-disable no-restricted-globals */ -import * as S from "@effect/schema/Schema"; +import * as S from "effect/Schema"; import { afterAll, beforeAll, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9ce536675a..c9249b990c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,8 +26,8 @@ importers: specifier: ^2.27.1 version: 2.27.1 '@effect/vitest': - specifier: 0.12.1 - version: 0.12.1(effect@3.9.2)(vitest@2.1.2(@types/node@20.16.11)(@vitest/browser@2.1.2)(happy-dom@13.10.1)(lightningcss@1.24.1)(msw@2.2.13(patch_hash=mpkjv35lscrawpqthnrnago5ai)(typescript@5.6.2))(terser@5.34.1)) + specifier: 0.13.1 + version: 0.13.1(effect@3.10.1)(vitest@2.1.2(@types/node@20.16.11)(@vitest/browser@2.1.2)(happy-dom@13.10.1)(lightningcss@1.24.1)(msw@2.2.13(patch_hash=mpkjv35lscrawpqthnrnago5ai)(typescript@5.6.2))(terser@5.34.1)) '@ianvs/prettier-plugin-sort-imports': specifier: ^4.2.1 version: 4.2.1(@vue/compiler-sfc@3.5.11)(prettier@3.3.3) @@ -345,14 +345,11 @@ importers: examples/backend-adapters/server: dependencies: '@effect/platform': - specifier: 0.68.5 - version: 0.68.5(@effect/schema@0.75.4(effect@3.9.2))(effect@3.9.2) + specifier: 0.69.5 + version: 0.69.5(effect@3.10.1) '@effect/platform-node': - specifier: 0.63.5 - version: 0.63.5(@effect/platform@0.68.5(@effect/schema@0.75.4(effect@3.9.2))(effect@3.9.2))(effect@3.9.2) - '@effect/schema': - specifier: 0.75.4 - version: 0.75.4(effect@3.9.2) + specifier: 0.64.6 + version: 0.64.6(@effect/platform@0.69.5(effect@3.10.1))(effect@3.10.1) '@elysiajs/cors': specifier: ^1.1.1 version: 1.1.1(elysia@1.1.16(@sinclair/typebox@0.27.8)(openapi-types@12.1.3)(typescript@5.6.2)) @@ -369,8 +366,8 @@ importers: specifier: ^16.4.5 version: 16.4.5 effect: - specifier: 3.9.2 - version: 3.9.2 + specifier: 3.10.1 + version: 3.10.1 elysia: specifier: ^1.1.16 version: 1.1.16(@sinclair/typebox@0.27.8)(openapi-types@12.1.3)(typescript@5.6.2) @@ -1482,8 +1479,8 @@ importers: specifier: workspace:* version: link:../mime-types effect: - specifier: 3.9.2 - version: 3.9.2 + specifier: 3.10.1 + version: 3.10.1 sqids: specifier: ^0.3.0 version: 0.3.0 @@ -1608,11 +1605,8 @@ importers: packages/uploadthing: dependencies: '@effect/platform': - specifier: 0.68.5 - version: 0.68.5(@effect/schema@0.75.4(effect@3.9.2))(effect@3.9.2) - '@effect/schema': - specifier: 0.75.4 - version: 0.75.4(effect@3.9.2) + specifier: 0.69.5 + version: 0.69.5(effect@3.10.1) '@uploadthing/mime-types': specifier: workspace:* version: link:../mime-types @@ -1620,8 +1614,8 @@ importers: specifier: workspace:* version: link:../shared effect: - specifier: 3.9.2 - version: 3.9.2 + specifier: 3.10.1 + version: 3.10.1 devDependencies: '@remix-run/server-runtime': specifier: ^2.12.0 @@ -2927,33 +2921,27 @@ packages: resolution: {integrity: sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==} engines: {node: '>=10.0.0'} - '@effect/platform-node-shared@0.18.5': - resolution: {integrity: sha512-7x+ixL7x/q2xcY1WA2e6TED0PQrjk04NbvPuNbP9rmlJmrYRrJWTiHJ+mBLCmShBqjs645qwe7bUX0MdXtI8dg==} + '@effect/platform-node-shared@0.19.5': + resolution: {integrity: sha512-+BPCoYVqdhlBxozJP0bfIIzneA8L3N+2+tjLgleNA9yHrKoYzeyEkF4DJ5/WifPa80o78FqU0TP94HQQypZDRA==} peerDependencies: - '@effect/platform': ^0.68.5 - effect: ^3.9.2 + '@effect/platform': ^0.69.5 + effect: ^3.10.1 - '@effect/platform-node@0.63.5': - resolution: {integrity: sha512-sSd37p613YEsJuvG8IOa+vGBZFKdV6IpWlxzs0/S5nDar3fj8zmq4lrdtyX0JgqLdluNnuoaxrNjirjp9ye29w==} + '@effect/platform-node@0.64.6': + resolution: {integrity: sha512-GRRBxkGhZR2lEVHuQsFoeVLhJ/c5GNKvMpKnFKMitXr/0R2pouanwRMYufnNcRlf1FpeRTvRz4QzuR8iKGeXQQ==} peerDependencies: - '@effect/platform': ^0.68.5 - effect: ^3.9.2 + '@effect/platform': ^0.69.5 + effect: ^3.10.1 - '@effect/platform@0.68.5': - resolution: {integrity: sha512-r3W8c9aTlVDHz/7L+mll8ivM/sO1JXWW3GrJGsZvL6X2jdkCBUuaAtJzOw085eVRye916dUP+uiLjlLid9mMuw==} + '@effect/platform@0.69.5': + resolution: {integrity: sha512-1CLhrXbZPyqRdtbZQc4dOzTXLnJEwwhF9BBEQoMK5aGBpp7sCtzOyF/MPbFNTVaK+7jO338YsOiY6sMX2ao3Mg==} peerDependencies: - '@effect/schema': ^0.75.4 - effect: ^3.9.2 + effect: ^3.10.1 - '@effect/schema@0.75.4': - resolution: {integrity: sha512-qpFOkkoCFgQz/r6FIeO2w3CxAD1O/K1n2ELA69VHHy9VDUskBnX+4zzYOGCi5yKAtgg61zueDIwouRwQ3dlhqw==} + '@effect/vitest@0.13.1': + resolution: {integrity: sha512-0Haoi17RqFKsz7MQMqaw9KmOqRkR8jbmKaVqYZeOtw2IgL8FbZHTBxNeVOF72wmXjlDphVSXGXnltn67ZuLAQg==} peerDependencies: - effect: ^3.9.2 - - '@effect/vitest@0.12.1': - resolution: {integrity: sha512-dUzg1CVgro8aeAVYeCEEMQlnx60CXxbztxH9KDG6/oLRZ/YixHWNytA9PGsC9UPYSgHAahjsn446HgQAnCpX4Q==} - peerDependencies: - effect: ^3.9.2 + effect: ^3.10.1 vitest: ^2.0.5 '@egjs/agent@2.4.3': @@ -8730,8 +8718,8 @@ packages: ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - effect@3.9.2: - resolution: {integrity: sha512-1sx/v1HTWHTodXfzWxAFg+SCF+ACgpJVruaAMIh/NmDVvrUsf0x9PzpXvkgJUbQ1fMdmKYK//FqxeHSQ+Zxv/Q==} + effect@3.10.1: + resolution: {integrity: sha512-Ny0I3WvGykUnlgmQVkNVbkXHE/pPTWVwmnYfpVZYyLlpe53LVyWViY9+a/7iS/Rqml0xUwJoXx5HK6ksK09Y2Q==} electron-to-chromium@1.5.28: resolution: {integrity: sha512-VufdJl+rzaKZoYVUijN13QcXVF5dWPZANeFTLNy+OSpHdDL5ynXTF35+60RSBbaQYB1ae723lQXHCrf4pyLsMw==} @@ -17549,18 +17537,18 @@ snapshots: '@discoveryjs/json-ext@0.5.7': {} - '@effect/platform-node-shared@0.18.5(@effect/platform@0.68.5(@effect/schema@0.75.4(effect@3.9.2))(effect@3.9.2))(effect@3.9.2)': + '@effect/platform-node-shared@0.19.5(@effect/platform@0.69.5(effect@3.10.1))(effect@3.10.1)': dependencies: - '@effect/platform': 0.68.5(@effect/schema@0.75.4(effect@3.9.2))(effect@3.9.2) + '@effect/platform': 0.69.5(effect@3.10.1) '@parcel/watcher': 2.4.1 - effect: 3.9.2 + effect: 3.10.1 multipasta: 0.2.5 - '@effect/platform-node@0.63.5(@effect/platform@0.68.5(@effect/schema@0.75.4(effect@3.9.2))(effect@3.9.2))(effect@3.9.2)': + '@effect/platform-node@0.64.6(@effect/platform@0.69.5(effect@3.10.1))(effect@3.10.1)': dependencies: - '@effect/platform': 0.68.5(@effect/schema@0.75.4(effect@3.9.2))(effect@3.9.2) - '@effect/platform-node-shared': 0.18.5(@effect/platform@0.68.5(@effect/schema@0.75.4(effect@3.9.2))(effect@3.9.2))(effect@3.9.2) - effect: 3.9.2 + '@effect/platform': 0.69.5(effect@3.10.1) + '@effect/platform-node-shared': 0.19.5(@effect/platform@0.69.5(effect@3.10.1))(effect@3.10.1) + effect: 3.10.1 mime: 3.0.0 undici: 6.19.8 ws: 8.18.0 @@ -17568,21 +17556,15 @@ snapshots: - bufferutil - utf-8-validate - '@effect/platform@0.68.5(@effect/schema@0.75.4(effect@3.9.2))(effect@3.9.2)': + '@effect/platform@0.69.5(effect@3.10.1)': dependencies: - '@effect/schema': 0.75.4(effect@3.9.2) - effect: 3.9.2 + effect: 3.10.1 find-my-way-ts: 0.1.5 multipasta: 0.2.5 - '@effect/schema@0.75.4(effect@3.9.2)': + '@effect/vitest@0.13.1(effect@3.10.1)(vitest@2.1.2(@types/node@20.16.11)(@vitest/browser@2.1.2)(happy-dom@13.10.1)(lightningcss@1.24.1)(msw@2.2.13(patch_hash=mpkjv35lscrawpqthnrnago5ai)(typescript@5.6.2))(terser@5.34.1))': dependencies: - effect: 3.9.2 - fast-check: 3.22.0 - - '@effect/vitest@0.12.1(effect@3.9.2)(vitest@2.1.2(@types/node@20.16.11)(@vitest/browser@2.1.2)(happy-dom@13.10.1)(lightningcss@1.24.1)(msw@2.2.13(patch_hash=mpkjv35lscrawpqthnrnago5ai)(typescript@5.6.2))(terser@5.34.1))': - dependencies: - effect: 3.9.2 + effect: 3.10.1 vitest: 2.1.2(@types/node@20.16.11)(@vitest/browser@2.1.2(@vitest/spy@2.1.2)(typescript@5.6.2)(vite@5.4.8(@types/node@20.16.11)(lightningcss@1.24.1)(terser@5.34.1))(vitest@2.1.2))(happy-dom@13.10.1)(lightningcss@1.24.1)(msw@2.2.13(patch_hash=mpkjv35lscrawpqthnrnago5ai)(typescript@5.6.2))(terser@5.34.1) '@egjs/agent@2.4.3': {} @@ -24992,7 +24974,9 @@ snapshots: ee-first@1.1.1: {} - effect@3.9.2: {} + effect@3.10.1: + dependencies: + fast-check: 3.22.0 electron-to-chromium@1.5.28: {}