refactor: update "effect" & switch to alias imports (#775)

Co-authored-by: juliusmarminge <julius0216@outlook.com>
pingdotgg · Apr 29, 2024 · 0abfa03 · 0abfa03
1 parent 6906254
commit 0abfa03
Show file tree

Hide file tree

Showing 28 changed files with 1,082 additions and 201 deletions.
diff --git a/.changeset/old-pans-wink.md b/.changeset/old-pans-wink.md
@@ -0,0 +1,6 @@
+---
+"uploadthing": patch
+"@uploadthing/shared": patch
+---
+
+update "effect" & switch to alias imports
diff --git a/packages/dropzone/package.json b/packages/dropzone/package.json
@@ -119,8 +119,19 @@
         "error",
         {
           "patterns": [
-            "@uploadthing/dropzone",
-            "@uploadthing/dropzone/*"
+            {
+              "group": [
+                "@uploadthing/dropzone",
+                "@uploadthing/dropzone/*"
+              ],
+              "message": "Use relative src imports instead"
+            }
+          ],
+          "paths": [
+            {
+              "name": "effect",
+              "message": "Use alias imports instead (import * as X from \"effect/X\")"
+            }
           ]
         }
       ]

diff --git a/packages/mime-types/package.json b/packages/mime-types/package.json
@@ -47,8 +47,19 @@
         "error",
         {
           "patterns": [
-            "@uploadthing/mime-types",
-            "@uploadthing/mime-types/*"
+            {
+              "group": [
+                "@uploadthing/mime-types",
+                "@uploadthing/mime-types/*"
+              ],
+              "message": "Use relative src imports instead"
+            }
+          ],
+          "paths": [
+            {
+              "name": "effect",
+              "message": "Use alias imports instead (import * as X from \"effect/X\")"
+            }
           ]
         }
       ]

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
@@ -51,7 +51,27 @@
       "@uploadthing/eslint-config/base"
     ],
     "rules": {
-      "@typescript-eslint/no-unused-vars": "off"
+      "@typescript-eslint/no-unused-vars": "off",
+      "no-restricted-imports": [
+        "error",
+        {
+          "patterns": [
+            {
+              "group": [
+                "@uploadthing/nuxt",
+                "@uploadthing/nuxt/*"
+              ],
+              "message": "Use relative src imports instead"
+            }
+          ],
+          "paths": [
+            {
+              "name": "effect",
+              "message": "Use alias imports instead (import * as X from \"effect/X\")"
+            }
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -100,8 +100,19 @@
         "error",
         {
           "patterns": [
-            "@uploadthing/react",
-            "@uploadthing/react/*"
+            {
+              "group": [
+                "@uploadthing/react",
+                "@uploadthing/react/*"
+              ],
+              "message": "Use relative src imports instead"
+            }
+          ],
+          "paths": [
+            {
+              "name": "effect",
+              "message": "Use alias imports instead (import * as X from \"effect/X\")"
+            }
           ]
         }
       ]

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -34,8 +34,8 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@effect/schema": "^0.66.0",
-    "effect": "^3.0.0",
+    "@effect/schema": "^0.66.10",
+    "effect": "^3.0.7",
     "std-env": "^3.7.0"
   },
   "devDependencies": {
@@ -61,19 +61,30 @@
   },
   "eslintConfig": {
     "root": true,
+    "extends": [
+      "@uploadthing/eslint-config/base"
+    ],
     "rules": {
       "no-restricted-imports": [
         "error",
         {
           "patterns": [
-            "@uploadthing/shared",
-            "@uploadthing/shared/*"
+            {
+              "group": [
+                "@uploadthing/shared",
+                "@uploadthing/shared/*"
+              ],
+              "message": "Use relative src imports instead"
+            }
+          ],
+          "paths": [
+            {
+              "name": "effect",
+              "message": "Use alias imports instead (import * as X from \"effect/X\")"
+            }
           ]
         }
       ]
-    },
-    "extends": [
-      "@uploadthing/eslint-config/base"
-    ]
+    }
   }
 }
diff --git a/packages/shared/src/effect.ts b/packages/shared/src/effect.ts
@@ -1,6 +1,10 @@
 import type { ParseError } from "@effect/schema/ParseResult";
 import * as S from "@effect/schema/Schema";
-import { Context, Duration, Effect, pipe, Schedule } from "effect";
+import * as Context from "effect/Context";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import { pipe } from "effect/Function";
+import * as Schedule from "effect/Schedule";
 
 import { FetchError } from "./tagged-errors";
 import type { FetchEsque, ResponseEsque } from "./types";

diff --git a/packages/shared/src/utils.ts b/packages/shared/src/utils.ts
@@ -1,4 +1,5 @@
-import { Effect, Unify } from "effect";
+import * as Effect from "effect/Effect";
+import * as Unify from "effect/Unify";
 import { process } from "std-env";
 
 import { lookup } from "@uploadthing/mime-types";

diff --git a/packages/solid/package.json b/packages/solid/package.json
@@ -139,8 +139,19 @@
         "error",
         {
           "patterns": [
-            "@uploadthing/solid",
-            "@uploadthing/solid/*"
+            {
+              "group": [
+                "@uploadthing/solid",
+                "@uploadthing/solid/*"
+              ],
+              "message": "Use relative src imports instead"
+            }
+          ],
+          "paths": [
+            {
+              "name": "effect",
+              "message": "Use alias imports instead (import * as X from \"effect/X\")"
+            }
           ]
         }
       ]

diff --git a/packages/svelte/package.json b/packages/svelte/package.json
@@ -64,6 +64,28 @@
     ],
     "ignorePatterns": [
       "*.config.*"
-    ]
+    ],
+    "rules": {
+      "no-restricted-imports": [
+        "error",
+        {
+          "patterns": [
+            {
+              "group": [
+                "@uploadthing/svelte",
+                "@uploadthing/svelte/*"
+              ],
+              "message": "Use relative src imports instead"
+            }
+          ],
+          "paths": [
+            {
+              "name": "effect",
+              "message": "Use alias imports instead (import * as X from \"effect/X\")"
+            }
+          ]
+        }
+      ]
+    }
   }
 }
diff --git a/packages/uploadthing/package.json b/packages/uploadthing/package.json
@@ -127,11 +127,11 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@effect/schema": "^0.66.0",
+    "@effect/schema": "^0.66.10",
     "@uploadthing/mime-types": "workspace:*",
     "@uploadthing/shared": "workspace:*",
     "consola": "^3.2.3",
-    "effect": "^3.0.0",
+    "effect": "^3.0.7",
     "std-env": "^3.7.0"
   },
   "devDependencies": {
@@ -204,8 +204,19 @@
         "error",
         {
           "patterns": [
-            "uploadthing",
-            "uploadthing/*"
+            {
+              "group": [
+                "uploadthing",
+                "uploadthing/*"
+              ],
+              "message": "Use relative src imports instead"
+            }
+          ],
+          "paths": [
+            {
+              "name": "effect",
+              "message": "Use alias imports instead (import * as X from \"effect/X\")"
+            }
           ]
         }
       ]

diff --git a/packages/uploadthing/src/client.ts b/packages/uploadthing/src/client.ts
@@ -2,7 +2,8 @@
 
 import type { ParseError } from "@effect/schema/ParseResult";
 import * as S from "@effect/schema/Schema";
-import { Effect, Layer } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
 
 import type { FetchContextTag, FetchError } from "@uploadthing/shared";
 import {
@@ -34,11 +35,11 @@ import type {
 } from "./types";
 
 export {
-  /** @public */
-  generateMimeTypes,
   /** @public */
   generateClientDropzoneAccept,
   /** @public */
+  generateMimeTypes,
+  /** @public */
   generatePermittedFileTypes,
 } from "@uploadthing/shared";
 

diff --git a/packages/uploadthing/src/express.ts b/packages/uploadthing/src/express.ts
@@ -1,9 +1,9 @@
-import { Effect } from "effect";
-import { Router as ExpressRouter } from "express";
+import * as Effect from "effect/Effect";
 import type {
   Request as ExpressRequest,
   Response as ExpressResponse,
 } from "express";
+import { Router as ExpressRouter } from "express";
 
 import type { Json } from "@uploadthing/shared";
 import { getStatusCodeFromError, UploadThingError } from "@uploadthing/shared";
@@ -22,8 +22,8 @@ import type { FileRouter, RouteHandlerOptions } from "./internal/types";
 import type { CreateBuilderOptions } from "./internal/upload-builder";
 import { createBuilder } from "./internal/upload-builder";
 
-export type { FileRouter };
 export { UTFiles } from "./internal/types";
+export type { FileRouter };
 
 type MiddlewareArgs = {
   req: ExpressRequest;

diff --git a/packages/uploadthing/src/internal/dev-hook.ts b/packages/uploadthing/src/internal/dev-hook.ts
@@ -1,4 +1,4 @@
-import { Effect } from "effect";
+import * as Effect from "effect/Effect";
 
 import {
   exponentialBackoff,

diff --git a/packages/uploadthing/src/internal/handler.ts b/packages/uploadthing/src/internal/handler.ts
@@ -1,5 +1,6 @@
 import * as S from "@effect/schema/Schema";
-import { Effect, Layer } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
 import { isDevelopment } from "std-env";
 
 import {

diff --git a/packages/uploadthing/src/internal/multi-part.browser.ts b/packages/uploadthing/src/internal/multi-part.browser.ts
@@ -1,5 +1,6 @@
 import * as S from "@effect/schema/Schema";
-import { Cause, Effect } from "effect";
+import * as Cause from "effect/Cause";
+import * as Effect from "effect/Effect";
 import { isTest } from "std-env";
 
 import {

diff --git a/packages/uploadthing/src/internal/multi-part.server.ts b/packages/uploadthing/src/internal/multi-part.server.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema";
-import { Effect } from "effect";
+import * as Effect from "effect/Effect";
 
 import {
   contentDisposition,

diff --git a/packages/uploadthing/src/internal/presigned-post.browser.ts b/packages/uploadthing/src/internal/presigned-post.browser.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema";
-import { Effect } from "effect";
+import * as Effect from "effect/Effect";
 
 import type { FetchContextTag, UploadThingError } from "@uploadthing/shared";
 

diff --git a/packages/uploadthing/src/internal/presigned-post.server.ts b/packages/uploadthing/src/internal/presigned-post.server.ts
@@ -1,4 +1,4 @@
-import { Effect } from "effect";
+import * as Effect from "effect/Effect";
 
 import {
   fetchEff,

diff --git a/packages/uploadthing/src/internal/resolve-url.ts b/packages/uploadthing/src/internal/resolve-url.ts
@@ -1,4 +1,4 @@
-import { Effect } from "effect";
+import * as Effect from "effect/Effect";
 import { process } from "std-env";
 
 import { getFullApiUrl } from "@uploadthing/shared";

diff --git a/packages/uploadthing/src/internal/to-web-request.ts b/packages/uploadthing/src/internal/to-web-request.ts
@@ -1,5 +1,5 @@
-import { Effect } from "effect";
 import { TaggedError } from "effect/Data";
+import * as Effect from "effect/Effect";
 import { process } from "std-env";
 
 import { filterObjectValues, UploadThingError } from "@uploadthing/shared";

diff --git 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 S from "@effect/schema/Schema";
-import type { Effect } from "effect";
+import type * as Effect from "effect/Effect";
 
 import type {
   ErrorMessage,

diff --git a/packages/uploadthing/src/internal/ut-reporter.ts b/packages/uploadthing/src/internal/ut-reporter.ts
@@ -1,5 +1,5 @@
 import type * as S from "@effect/schema/Schema";
-import { Effect } from "effect";
+import * as Effect from "effect/Effect";
 
 import type { FetchContextTag, MaybePromise } from "@uploadthing/shared";
 import { fetchEffJson, UploadThingError } from "@uploadthing/shared";

diff --git a/packages/uploadthing/src/internal/validate-request-input.ts b/packages/uploadthing/src/internal/validate-request-input.ts
@@ -1,6 +1,6 @@
 import type * as S from "@effect/schema/Schema";
-import { Effect } from "effect";
 import { TaggedError } from "effect/Data";
+import * as Effect from "effect/Effect";
 
 import type {
   ExpandedRouteConfig,

diff --git a/packages/uploadthing/src/sdk/index.ts b/packages/uploadthing/src/sdk/index.ts
@@ -1,5 +1,6 @@
 import * as S from "@effect/schema/Schema";
-import { Effect, Layer } from "effect";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
 
 import type {
   ACL,

diff --git a/packages/uploadthing/src/sdk/utils.ts b/packages/uploadthing/src/sdk/utils.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema";
-import { Effect } from "effect";
+import * as Effect from "effect/Effect";
 
 import {
   exponentialBackoff,