feat: bump @uploadcare/file-uploader to v1

uploadcare · Aug 1, 2024 · 671457a · 671457a
1 parent 7a9d2bf
commit 671457a
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 55 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/react-uploader/README.md b/packages/react-uploader/README.md
@@ -101,7 +101,7 @@ import "@uploadcare/react-uploader/core.css";
 ```
 
 ```css
-.fileUploaderWrapper lr-file-uploader-regular {
+.fileUploaderWrapper uc-file-uploader-regular {
 }
 ```
 

diff --git a/packages/react-uploader/package.json b/packages/react-uploader/package.json
@@ -27,7 +27,7 @@
     "@types/react": "17 || 18"
   },
   "dependencies": {
-    "@uploadcare/blocks": "^0.46.3",
+    "@uploadcare/file-uploader": "^1.2.0",
     "@uploadcare/react-adapter": "^0.3.0"
   },
   "repository": {

diff --git a/packages/react-uploader/src/Uploader/Inline/FileUploaderInline.tsx b/packages/react-uploader/src/Uploader/Inline/FileUploaderInline.tsx
@@ -1,20 +1,23 @@
 import React, { type FC, useMemo } from "react";
-import * as LR from "@uploadcare/blocks";
-import "@uploadcare/blocks/web/lr-file-uploader-inline.min.css";
+import * as UC from "@uploadcare/file-uploader";
+import "@uploadcare/file-uploader/web/uc-file-uploader-inline.min.css";
 import { customElementToReactComponent } from "@uploadcare/react-adapter";
 import { AdapterConfig } from "../core/AdapterConfig";
 import { AdapterUploadCtxProvider } from "../core/AdapterUploadCtxProvider";
 import type { TProps } from "../types";
 import { getCalcPropertyOfProps } from "../../utils/getCalcPropertyOfProps";
 import { getUserAgentIntegration } from "../../utils/getUserAgentIntegration";
-import { ConditionalSuspense, useIsBrowser } from "../../SSR/ConditionalSuspense";
+import {
+  ConditionalSuspense,
+  useIsBrowser,
+} from "../../SSR/ConditionalSuspense";
 
-LR.registerBlocks(LR);
+UC.defineComponents(UC);
 
 const AdapterFileUploaderInline = customElementToReactComponent({
   react: React,
-  tag: "lr-file-uploader-inline",
-  elClass: LR.FileUploaderMinimal,
+  tag: "uc-file-uploader-inline",
+  elClass: UC.FileUploaderMinimal,
 });
 
 export const FileUploaderInline: FC<TProps> = ({
@@ -25,7 +28,7 @@ export const FileUploaderInline: FC<TProps> = ({
   fallback,
   ...props
 }) => {
-  const CTX_NAME = useMemo(() => ctxName ?? LR.UID.generate(), [ctxName]);
+  const CTX_NAME = useMemo(() => ctxName ?? UC.UID.generate(), [ctxName]);
 
   const { eventHandlers, config } = useMemo(
     () => getCalcPropertyOfProps<TProps>(props),
@@ -35,7 +38,7 @@ export const FileUploaderInline: FC<TProps> = ({
   const isBrowser = useIsBrowser();
 
   return (
-    <ConditionalSuspense condition={isBrowser} fallback={fallback} >
+    <ConditionalSuspense condition={isBrowser} fallback={fallback}>
       <div className={className}>
         {/* @ts-ignore */}
         <AdapterConfig userAgentIntegration={getUserAgentIntegration()} ctx-name={CTX_NAME} {...config} />

diff --git a/packages/react-uploader/src/Uploader/Minimal/FileUploaderMinimal.tsx b/packages/react-uploader/src/Uploader/Minimal/FileUploaderMinimal.tsx
@@ -1,23 +1,25 @@
 import React, { type FC, useMemo } from "react";
-import * as LR from "@uploadcare/blocks";
-import "@uploadcare/blocks/web/lr-file-uploader-minimal.min.css"
+import * as UC from "@uploadcare/file-uploader";
+import "@uploadcare/file-uploader/web/uc-file-uploader-minimal.min.css";
 import { customElementToReactComponent } from "@uploadcare/react-adapter";
 import { AdapterConfig } from "../core/AdapterConfig";
 import { AdapterUploadCtxProvider } from "../core/AdapterUploadCtxProvider";
 import type { TProps } from "../types";
 import { getCalcPropertyOfProps } from "../../utils/getCalcPropertyOfProps";
 import { getUserAgentIntegration } from "../../utils/getUserAgentIntegration";
-import { ConditionalSuspense, useIsBrowser } from "../../SSR/ConditionalSuspense";
+import {
+  ConditionalSuspense,
+  useIsBrowser,
+} from "../../SSR/ConditionalSuspense";
 
-LR.registerBlocks(LR);
+UC.defineComponents(UC);
 
 const AdapterFileUploaderMinimal = customElementToReactComponent({
   react: React,
-  tag: "lr-file-uploader-minimal",
-  elClass: LR.FileUploaderMinimal,
+  tag: "uc-file-uploader-minimal",
+  elClass: UC.FileUploaderMinimal,
 });
 
-
 export const FileUploaderMinimal: FC<TProps> = ({
   ctxName,
   className,
@@ -26,7 +28,7 @@ export const FileUploaderMinimal: FC<TProps> = ({
   fallback,
   ...props
 }) => {
-  const CTX_NAME = useMemo(() => ctxName ?? LR.UID.generate(), [ctxName]);
+  const CTX_NAME = useMemo(() => ctxName ?? UC.UID.generate(), [ctxName]);
 
   const { eventHandlers, config } = useMemo(
     () => getCalcPropertyOfProps<TProps>(props),
@@ -36,7 +38,7 @@ export const FileUploaderMinimal: FC<TProps> = ({
   const isBrowser = useIsBrowser();
 
   return (
-    <ConditionalSuspense condition={isBrowser} fallback={fallback} >
+    <ConditionalSuspense condition={isBrowser} fallback={fallback}>
       <div className={className}>
         {/* @ts-ignore */}
         <AdapterConfig userAgentIntegration={getUserAgentIntegration()} ctx-name={CTX_NAME} {...config} />

diff --git a/packages/react-uploader/src/Uploader/Regular/FileUploaderRegular.tsx b/packages/react-uploader/src/Uploader/Regular/FileUploaderRegular.tsx
@@ -1,21 +1,24 @@
 import React, { type FC, useMemo } from "react";
-import * as LR from "@uploadcare/blocks";
-import "@uploadcare/blocks/web/lr-file-uploader-regular.min.css";
+import * as UC from "@uploadcare/file-uploader";
+import "@uploadcare/file-uploader/web/uc-file-uploader-regular.min.css";
 import { customElementToReactComponent } from "@uploadcare/react-adapter";
 import { AdapterConfig } from "../core/AdapterConfig";
 import { AdapterUploadCtxProvider } from "../core/AdapterUploadCtxProvider";
 import type { TProps } from "../types";
 
 import { getCalcPropertyOfProps } from "../../utils/getCalcPropertyOfProps";
 import { getUserAgentIntegration } from "../../utils/getUserAgentIntegration";
-import { ConditionalSuspense, useIsBrowser } from "../../SSR/ConditionalSuspense";
+import {
+  ConditionalSuspense,
+  useIsBrowser,
+} from "../../SSR/ConditionalSuspense";
 
-LR.registerBlocks(LR);
+UC.defineComponents(UC);
 
 const AdapterFileUploaderRegular = customElementToReactComponent({
   react: React,
-  tag: "lr-file-uploader-regular",
-  elClass: LR.FileUploaderRegular,
+  tag: "uc-file-uploader-regular",
+  elClass: UC.FileUploaderRegular,
 });
 
 export const FileUploaderRegular: FC<TProps> = ({
@@ -26,7 +29,7 @@ export const FileUploaderRegular: FC<TProps> = ({
   fallback,
   ...props
 }) => {
-  const CTX_NAME = useMemo(() => ctxName ?? LR.UID.generate(), [ctxName]);
+  const CTX_NAME = useMemo(() => ctxName ?? UC.UID.generate(), [ctxName]);
 
   const { eventHandlers, config } = useMemo(
     () => getCalcPropertyOfProps<TProps>(props),
@@ -49,6 +52,6 @@ export const FileUploaderRegular: FC<TProps> = ({
         {/* @ts-ignore */}
         <AdapterFileUploaderRegular class={classNameUploader} ctx-name={CTX_NAME} />
       </div>
-    </ConditionalSuspense >
+    </ConditionalSuspense>
   );
 };
diff --git a/packages/react-uploader/src/Uploader/core/AdapterConfig/AdapterConfig.tsx b/packages/react-uploader/src/Uploader/core/AdapterConfig/AdapterConfig.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { customElementToReactComponent } from "@uploadcare/react-adapter";
-import * as LR from "@uploadcare/blocks";
+import * as UC from "@uploadcare/file-uploader";
 
 export const AdapterConfig = customElementToReactComponent({
   react: React,
-  tag: "lr-config",
-  elClass: LR.Config,
+  tag: "uc-config",
+  elClass: UC.Config,
 });
diff --git a/...es/react-uploader/src/Uploader/core/AdapterUploadCtxProvider/AdapterUploadCtxProvider.tsx b/...es/react-uploader/src/Uploader/core/AdapterUploadCtxProvider/AdapterUploadCtxProvider.tsx
@@ -1,10 +1,10 @@
 import React from "react";
 import { customElementToReactComponent } from "@uploadcare/react-adapter";
-import * as LR from "@uploadcare/blocks";
+import * as UC from "@uploadcare/file-uploader";
 
 export const AdapterUploadCtxProvider = customElementToReactComponent({
   react: React,
-  tag: "lr-upload-ctx-provider",
-  elClass: LR.UploadCtxProvider,
-  schemaEvents: LR.UploadCtxProvider.EventType,
+  tag: "uc-upload-ctx-provider",
+  elClass: UC.UploadCtxProvider,
+  schemaEvents: UC.UploadCtxProvider.EventType,
 });
diff --git a/packages/react-uploader/src/Uploader/types.ts b/packages/react-uploader/src/Uploader/types.ts
@@ -1,13 +1,10 @@
-
 import type { Ref } from "react";
 import type {
   ConfigType,
   UploadCtxProvider,
   EventMap,
-} from "@uploadcare/blocks";
-import type {
-  TProps as TPropsConditionalSuspense
-} from "../SSR/ConditionalSuspense"
+} from "@uploadcare/file-uploader";
+import type { TProps as TPropsConditionalSuspense } from "../SSR/ConditionalSuspense";
 
 type TToCamelCase<S extends string> = S extends `${infer Head}-${infer Tail}`
   ? `${Lowercase<Head>}${Capitalize<TToCamelCase<Tail>>}`
@@ -42,4 +39,4 @@ export type TProps = TDefaultProps &
   TPropsWithEvents &
   TPropsWithConfig;
 
-export { UploadCtxProvider } from "@uploadcare/blocks";
+export { UploadCtxProvider } from "@uploadcare/file-uploader";
diff --git a/packages/react-uploader/src/libs.ts b/packages/react-uploader/src/libs.ts
@@ -3,7 +3,7 @@ export { FileUploaderMinimal } from "./Uploader/Minimal/FileUploaderMinimal";
 export { FileUploaderInline } from "./Uploader/Inline/FileUploaderInline";
 
 export { type TProps, UploadCtxProvider } from "./Uploader/types";
-export { type TEventsSchema } from './Uploader/types'
+export { type TEventsSchema } from "./Uploader/types";
 
-export { defineLocale } from "@uploadcare/blocks"
-export * from '@uploadcare/blocks/types/index.js'
+export { defineLocale } from "@uploadcare/file-uploader";
+export * from "@uploadcare/file-uploader/types/index.js";
diff --git a/packages/react-uploader/vite.config.js b/packages/react-uploader/vite.config.js
@@ -7,25 +7,21 @@ export default defineConfig({
   build: {
     cssCodeSplit: true,
     lib: {
-      entry: [
-        resolve(__dirname, "src/libs.ts"),
-      ],
+      entry: [resolve(__dirname, "src/libs.ts")],
       name: "@uploadcare/react-uploader",
 
       formats: ["es", "cjs"],
 
       fileName: "react-uploader",
     },
     rollupOptions: {
-      external: ["react", "@uploadcare/blocks"],
+      external: ["react", "@uploadcare/file-uploader"],
       output: {
         globals: {
           react: "React",
         },
       },
     },
   },
-  plugins: [
-    dts({ rollupTypes: true, insertTypesEntry: true }),
-  ],
+  plugins: [dts({ rollupTypes: true, insertTypesEntry: true })],
 });