@lonik/oh-image 3.0.0 → 3.2.0

package/dist/cloudflare.d.ts

@@ -1,5 +1,5 @@
 import { n as ImageLoaderOptions } from "./types-BEgZ3W30.js";
-import "./index-DMKCdFsX.js";
+import "./index-C-1t5-gk.js";
 import { n as BaseLoaderOptions, t as BaseGlobalLoaderOptions } from "./base-loader-options-DCLkYppY.js";
 import * as react_jsx_runtime5 from "react/jsx-runtime";
 

package/dist/cloudflare.js

@@ -1,4 +1,4 @@
-import { t as loaderFactory } from "./loader-factory-6EOKnqj1.js";
+import { t as loaderFactory } from "./loader-factory-B9kl_kUR.js";
 
 //#region src/loaders/cloudflare/cloudflare-loader.tsx
 const { useLoaderContext: useCloudflareContext, LoaderProvider: CloudflareLoaderProvider, useLoader: useCloudflareLoader } = loaderFactory({

package/dist/cloudinary.d.ts

@@ -1,5 +1,5 @@
 import { n as ImageLoaderOptions } from "./types-BEgZ3W30.js";
-import * as react_jsx_runtime0 from "react/jsx-runtime";
+import * as react_jsx_runtime7 from "react/jsx-runtime";
 import { Cloudinary, CloudinaryImage } from "@cloudinary/url-gen";
 
 //#region src/loaders/cloudinary/cloudinary-options.d.ts
@@ -34,7 +34,7 @@ declare function CloudinaryLoaderProvider({
   children: React.ReactNode;
   transforms?: CloudinaryTransforms;
   placeholder?: CloudinaryTransforms;
-}): react_jsx_runtime0.JSX.Element;
+}): react_jsx_runtime7.JSX.Element;
 declare function useCloudinaryLoader(options?: CloudinaryLoaderHookOptions | CloudinaryTransforms): (imageOptions: ImageLoaderOptions) => string;
 declare const useCloudinaryContext: () => CloudinaryLoaderContext;
 //#endregion

package/dist/contentful.d.ts

@@ -1,7 +1,7 @@
 import { n as ImageLoaderOptions } from "./types-BEgZ3W30.js";
-import "./index-DMKCdFsX.js";
+import "./index-C-1t5-gk.js";
 import { n as BaseLoaderOptions, t as BaseGlobalLoaderOptions } from "./base-loader-options-DCLkYppY.js";
-import * as react_jsx_runtime1 from "react/jsx-runtime";
+import * as react_jsx_runtime0 from "react/jsx-runtime";
 
 //#region src/loaders/contentful/contentful-options.d.ts
 type ContentfulTransforms = Partial<{
@@ -39,6 +39,6 @@ declare const useContentfulContext: () => ContentfulGlobalOptions, ContentfulLoa
     ...props
   }: {
     children: React.ReactNode;
-  } & Partial<ContentfulGlobalOptions>) => react_jsx_runtime1.JSX.Element, useContentfulLoader: (options?: ContentfulGlobalOptions | undefined) => (() => undefined) | ((imageOptions: ImageLoaderOptions) => string);
+  } & Partial<ContentfulGlobalOptions>) => react_jsx_runtime0.JSX.Element, useContentfulLoader: (options?: ContentfulGlobalOptions | undefined) => (() => undefined) | ((imageOptions: ImageLoaderOptions) => string);
 //#endregion
 export { ContentfulGlobalOptions, ContentfulLoaderProvider, ContentfulOptions, ContentfulTransforms, useContentfulContext, useContentfulLoader };

package/dist/contentful.js

@@ -1,4 +1,4 @@
-import { t as loaderFactory } from "./loader-factory-6EOKnqj1.js";
+import { t as loaderFactory } from "./loader-factory-B9kl_kUR.js";
 
 //#region src/loaders/contentful/contentful-loader.tsx
 const { useLoaderContext: useContentfulContext, LoaderProvider: ContentfulLoaderProvider, useLoader: useContentfulLoader } = loaderFactory({

package/dist/imgproxy.d.ts

@@ -1,7 +1,7 @@
 import { n as ImageLoaderOptions } from "./types-BEgZ3W30.js";
-import "./index-DMKCdFsX.js";
+import "./index-C-1t5-gk.js";
 import { n as BaseLoaderOptions, t as BaseGlobalLoaderOptions } from "./base-loader-options-DCLkYppY.js";
-import * as react_jsx_runtime2 from "react/jsx-runtime";
+import * as react_jsx_runtime3 from "react/jsx-runtime";
 
 //#region src/loaders/imgproxy/imgproxy-options.d.ts
 type ResizeType = "fit" | "fill" | "fill-down" | "force" | "auto";
@@ -376,7 +376,14 @@ type ImgproxyTransforms = Partial<{
   watermark_shadow: number;
 }>;
 type ImgproxyOptions = BaseLoaderOptions<ImgproxyTransforms>;
-type ImgproxyGlobalOptions = BaseGlobalLoaderOptions<ImgproxyTransforms>;
+interface ImgproxyGlobalOptions extends BaseGlobalLoaderOptions<ImgproxyOptions> {
+  /**
+   * If \`undefined\`, won't set anything (this is for backward compatibility and will be removed in future versions, where by default it will be "insecure").
+   * - \`"insecure"\` sets it to insecure
+   * - \`string\` sets the custom signature
+   */
+  signature?: "insecure" | (string & {}) | undefined;
+}
 //#endregion
 //#region src/loaders/imgproxy/imgproxy-loader.d.ts
 declare const useImgproxyContext: () => ImgproxyGlobalOptions, ImgproxyLoaderProvider: ({
@@ -384,6 +391,6 @@ declare const useImgproxyContext: () => ImgproxyGlobalOptions, ImgproxyLoaderPro
     ...props
   }: {
     children: React.ReactNode;
-  } & Partial<ImgproxyGlobalOptions>) => react_jsx_runtime2.JSX.Element, useImgproxyLoader: (options?: ImgproxyGlobalOptions | undefined) => (() => undefined) | ((imageOptions: ImageLoaderOptions) => string);
+  } & Partial<ImgproxyGlobalOptions>) => react_jsx_runtime3.JSX.Element, useImgproxyLoader: (options?: ImgproxyGlobalOptions | undefined) => (() => undefined) | ((imageOptions: ImageLoaderOptions) => string);
 //#endregion
 export { ImgproxyGlobalOptions, ImgproxyLoaderProvider, ImgproxyOptions, ImgproxyTransforms, useImgproxyContext, useImgproxyLoader };

package/dist/imgproxy.js

@@ -1,4 +1,4 @@
-import { t as loaderFactory } from "./loader-factory-6EOKnqj1.js";
+import { t as loaderFactory } from "./loader-factory-B9kl_kUR.js";
 
 //#region src/loaders/imgproxy/imgproxy-loader.tsx
 const { useLoaderContext: useImgproxyContext, LoaderProvider: ImgproxyLoaderProvider, useLoader: useImgproxyLoader } = loaderFactory({
@@ -129,7 +129,10 @@ const { useLoaderContext: useImgproxyContext, LoaderProvider: ImgproxyLoaderProv
 		] },
 		zoom: { orders: ["x", "y"] }
 	}
-}, ({ path, params, imageOptions }) => `${path}/${params}/plain/${imageOptions.src}`);
+}, ({ path, params, imageOptions, options }) => {
+	if (options.signature !== void 0) return `${path}/${options.signature}/${params}/plain/${imageOptions.src}`;
+	return `${path}/${params}/plain/${imageOptions.src}`;
+});
 
 //#endregion
 export { ImgproxyLoaderProvider, useImgproxyContext, useImgproxyLoader };

package/dist/{index-DMKCdFsX.d.ts → index-C-1t5-gk.d.ts}

@@ -1,11 +1,11 @@
 import { r as ImageProps, t as ImageLoader } from "./types-BEgZ3W30.js";
-import * as react_jsx_runtime7 from "react/jsx-runtime";
+import * as react_jsx_runtime6 from "react/jsx-runtime";
 
 //#region src/react/image.d.ts
-declare function Image(props: ImageProps): react_jsx_runtime7.JSX.Element;
+declare function Image(props: ImageProps): react_jsx_runtime6.JSX.Element;
 //#endregion
 //#region src/react/image-factory.d.ts
-declare function __imageFactory(defaultProps: any): (props: any) => react_jsx_runtime7.JSX.Element;
+declare function __imageFactory(defaultProps: any): (props: any) => react_jsx_runtime6.JSX.Element;
 //#endregion
 //#region src/react/use-img-loaded.d.ts
 /**
@@ -47,6 +47,6 @@ declare function ImageProvider({
   ...props
 }: {
   children: React.ReactNode;
-} & Partial<ImageContextValue>): react_jsx_runtime7.JSX.Element;
+} & Partial<ImageContextValue>): react_jsx_runtime6.JSX.Element;
 //#endregion
 export { Image as a, __imageFactory as i, useImageContext as n, useImgLoaded as r, ImageProvider as t };

package/dist/kontent.d.ts

@@ -1,7 +1,7 @@
 import { n as ImageLoaderOptions } from "./types-BEgZ3W30.js";
-import "./index-DMKCdFsX.js";
+import "./index-C-1t5-gk.js";
 import { n as BaseLoaderOptions, t as BaseGlobalLoaderOptions } from "./base-loader-options-DCLkYppY.js";
-import * as react_jsx_runtime3 from "react/jsx-runtime";
+import * as react_jsx_runtime1 from "react/jsx-runtime";
 
 //#region src/loaders/kontent/kontent-options.d.ts
 type KontentTransforms = Partial<{
@@ -44,6 +44,6 @@ declare const useKontentContext: () => KontentGlobalOptions, KontentLoaderProvid
     ...props
   }: {
     children: React.ReactNode;
-  } & Partial<KontentGlobalOptions>) => react_jsx_runtime3.JSX.Element, useKontentLoader: (options?: KontentGlobalOptions | undefined) => (() => undefined) | ((imageOptions: ImageLoaderOptions) => string);
+  } & Partial<KontentGlobalOptions>) => react_jsx_runtime1.JSX.Element, useKontentLoader: (options?: KontentGlobalOptions | undefined) => (() => undefined) | ((imageOptions: ImageLoaderOptions) => string);
 //#endregion
 export { KontentGlobalOptions, KontentLoaderProvider, KontentOptions, KontentTransforms, useKontentContext, useKontentLoader };

package/dist/kontent.js

@@ -1,4 +1,4 @@
-import { t as loaderFactory } from "./loader-factory-6EOKnqj1.js";
+import { t as loaderFactory } from "./loader-factory-B9kl_kUR.js";
 
 //#region src/loaders/kontent/kontent-loader.tsx
 const { useLoaderContext: useKontentContext, LoaderProvider: KontentLoaderProvider, useLoader: useKontentLoader } = loaderFactory({

package/dist/{loader-factory-6EOKnqj1.js → loader-factory-B9kl_kUR.js}

@@ -83,6 +83,10 @@ function loaderFactory(defaults, config, urlResolver) {
 			console.warn("Path is not provided");
 			return () => void 0;
 		}
+		const mergedOptions = {
+			...context,
+			...options
+		};
 		return (imageOptions) => {
 			const defaultTransform = imageOptions.isPlaceholder ? context.placeholder : context.transforms;
 			const optionTransforms = imageOptions.isPlaceholder ? options?.placeholder : options?.transforms;
@@ -104,7 +108,8 @@ function loaderFactory(defaults, config, urlResolver) {
 			return urlResolver({
 				imageOptions,
 				params: [...params, ...resolvedTransforms].join(config.paramSeparator),
-				path
+				path,
+				options: mergedOptions
 			});
 		};
 	};

package/dist/netlify.d.ts

@@ -1,7 +1,7 @@
 import { n as ImageLoaderOptions } from "./types-BEgZ3W30.js";
-import "./index-DMKCdFsX.js";
+import "./index-C-1t5-gk.js";
 import { n as BaseLoaderOptions, t as BaseGlobalLoaderOptions } from "./base-loader-options-DCLkYppY.js";
-import * as react_jsx_runtime4 from "react/jsx-runtime";
+import * as react_jsx_runtime2 from "react/jsx-runtime";
 
 //#region src/loaders/netlify/netlify-options.d.ts
 type NetlifyTransforms = Partial<{
@@ -21,6 +21,6 @@ declare const useNetlifyContext: () => NetlifyGlobalOptions, NetlifyLoaderProvid
     ...props
   }: {
     children: React.ReactNode;
-  } & Partial<NetlifyGlobalOptions>) => react_jsx_runtime4.JSX.Element, useNetlifyLoader: (options?: NetlifyGlobalOptions | undefined) => (() => undefined) | ((imageOptions: ImageLoaderOptions) => string);
+  } & Partial<NetlifyGlobalOptions>) => react_jsx_runtime2.JSX.Element, useNetlifyLoader: (options?: NetlifyGlobalOptions | undefined) => (() => undefined) | ((imageOptions: ImageLoaderOptions) => string);
 //#endregion
 export { NetlifyGlobalOptions, NetlifyLoaderProvider, NetlifyOptions, NetlifyTransforms, useNetlifyContext, useNetlifyLoader };

package/dist/netlify.js

@@ -1,4 +1,4 @@
-import { t as loaderFactory } from "./loader-factory-6EOKnqj1.js";
+import { t as loaderFactory } from "./loader-factory-B9kl_kUR.js";
 
 //#region src/loaders/netlify/netlify-loader.tsx
 const { useLoaderContext: useNetlifyContext, LoaderProvider: NetlifyLoaderProvider, useLoader: useNetlifyLoader } = loaderFactory({

package/dist/plugin.d.ts

@@ -44,6 +44,7 @@ type PluginTransforms = Omit<ImageTransforms, "breakpoints">;
 type PluginPlaceholderTransforms = Omit<PlaceholderTransforms, "pl_show">;
 interface PluginConfig {
   distDir: string;
+  outDir?: string;
   transforms?: PluginTransforms;
   placeholder?: PluginPlaceholderTransforms;
   breakpoints?: number[];

package/dist/plugin.js

@@ -263,7 +263,7 @@ function ohImage(options) {
 			cacheDir = join(viteConfig.cacheDir, DEV_DIR);
 			isBuild = viteConfig.command === "build";
 			assetsDir = viteConfig.build.assetsDir;
-			outDir = join(viteConfig.root, viteConfig.build.outDir);
+			outDir = config.outDir ? join(viteConfig.root, config.outDir) : join(viteConfig.root, viteConfig.build.outDir);
 		},
 		enforce: "pre",
 		configureServer(server) {

package/dist/react.d.ts

@@ -1,3 +1,3 @@
 import { n as ImageLoaderOptions, r as ImageProps, t as ImageLoader } from "./types-BEgZ3W30.js";
-import { a as Image, i as __imageFactory, n as useImageContext, r as useImgLoaded, t as ImageProvider } from "./index-DMKCdFsX.js";
+import { a as Image, i as __imageFactory, n as useImageContext, r as useImgLoaded, t as ImageProvider } from "./index-C-1t5-gk.js";
 export { Image, ImageLoader, ImageLoaderOptions, ImageProps, ImageProvider, __imageFactory, useImageContext, useImgLoaded };

package/dist/wordpress.d.ts

@@ -1,5 +1,5 @@
 import { n as ImageLoaderOptions } from "./types-BEgZ3W30.js";
-import "./index-DMKCdFsX.js";
+import "./index-C-1t5-gk.js";
 import { n as BaseLoaderOptions, t as BaseGlobalLoaderOptions } from "./base-loader-options-DCLkYppY.js";
 import * as react_jsx_runtime0 from "react/jsx-runtime";
 

package/dist/wordpress.js

@@ -1,4 +1,4 @@
-import { t as loaderFactory } from "./loader-factory-6EOKnqj1.js";
+import { t as loaderFactory } from "./loader-factory-B9kl_kUR.js";
 
 //#region src/loaders/wordpress/wordpress-loader.tsx
 const { useLoaderContext: useWordpressContext, LoaderProvider: WordpressLoaderProvider, useLoader: useWordpressLoader } = loaderFactory({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lonik/oh-image",
   "type": "module",
-  "version": "3.0.0",
+  "version": "3.2.0",
   "description": "A React component library for optimized image handling.",
   "author": "Luka Onikadze <lukonik@gmail.com>",
   "license": "MIT",