next-cloudinary 7.0.0-beta.4 → 7.0.0-beta.6

package/README.md

@@ -204,6 +204,7 @@ pnpm test
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/DevRish"><img src="https://avatars.githubusercontent.com/u/78094670?v=4?s=100" width="100px;" alt="Rishav Chattopadhyay"/><br /><sub><b>Rishav Chattopadhyay</b></sub></a><br /><a href="https://github.com/cloudinary-community/next-cloudinary/commits?author=DevRish" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Prathamesh010"><img src="https://avatars.githubusercontent.com/u/41731424?v=4?s=100" width="100px;" alt="Prathamesh Gawas"/><br /><sub><b>Prathamesh Gawas</b></sub></a><br /><a href="https://github.com/cloudinary-community/next-cloudinary/commits?author=Prathamesh010" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://victory-nwani.dev"><img src="https://avatars.githubusercontent.com/u/29664439?v=4?s=100" width="100px;" alt="Nwani Victory"/><br /><sub><b>Nwani Victory</b></sub></a><br /><a href="https://github.com/cloudinary-community/next-cloudinary/commits?author=vickywane" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://neilblaze.live"><img src="https://avatars.githubusercontent.com/u/48355572?v=4?s=100" width="100px;" alt="Pratyay Banerjee"/><br /><sub><b>Pratyay Banerjee</b></sub></a><br /><a href="https://github.com/cloudinary-community/next-cloudinary/commits?author=Neilblaze" title="Documentation">📖</a></td>
     </tr>
   </tbody>
 </table>

package/dist/{CldImage-ee84a50c.cjs.js → CldImage-5499491b.cjs.js}

@@ -7,9 +7,9 @@ var react = require('react');
 var Image = require('next/image');
 var util = require('@cloudinary-util/util');
 var urlLoader = require('@cloudinary-util/url-loader');
-var cloudinaryLoader = require('./cloudinary-loader-8cbd9bdd.cjs.js');
+var cloudinaryLoader = require('./cloudinary-loader-701d6a88.cjs.js');
 var jsxRuntime = require('react/jsx-runtime');
-require('./cloudinary-e2b6966d.cjs.js');
+require('./cloudinary-0ed42370.cjs.js');
 require('next/package.json');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
@@ -23,26 +23,7 @@ const CldImage = /*#__PURE__*/react.forwardRef(function CldImage(props, ref) {
   // Cloudinary URL construction to avoid them being forwarded
   // to the DOM
 
-  const CLD_OPTIONS = ['assetType', 'config', 'deliveryType', 'strictTransformations'];
-
-  // Loop through all of the props available on the transformation plugins and verify
-  // that we're not accientally applying the same prop twice
-
-  // We're also using those props to push into CLD_OPTIONS which helps us filter what
-  // props are applied to the underlaying Image component vs what's being sent
-  // to Cloudinary URL construction
-
-  urlLoader.transformationPlugins.forEach(({
-    props
-  }) => {
-    const pluginProps = Object.keys(props);
-    pluginProps.forEach(prop => {
-      if (CLD_OPTIONS.includes(prop)) {
-        throw new Error(`Option ${prop} already exists!`);
-      }
-      CLD_OPTIONS.push(prop);
-    });
-  });
+  const CLD_OPTIONS = ['assetType', 'config', 'deliveryType', 'strictTransformations', ...urlLoader.cloudinaryPluginKeys];
 
   // Construct the base Image component props by filtering out Cloudinary-specific props
 
@@ -54,17 +35,6 @@ const CldImage = /*#__PURE__*/react.forwardRef(function CldImage(props, ref) {
   const defaultImgKey = Object.keys(imageProps).map(key => `${key}:${imageProps[key]}`).join(';');
   const [imgKey, setImgKey] = react.useState(defaultImgKey);
 
-  // Construct Cloudinary-specific props by looking for values for any of the supported prop keys
-
-  const cldOptions = {};
-  CLD_OPTIONS.forEach(key => {
-    const prop = props[key];
-    if (prop) {
-      // @ts-expect-error
-      cldOptions[key] = prop;
-    }
-  });
-
   // The unoptimized flag is intended to remove all optimizations including quality, format, and sizing
   // via responsive sizing. When passing this in, it also prevents the `loader` from running, thus
   // breaking this component. This rewrites the `src` to construct a fully formed Cloudinary URL
@@ -74,7 +44,7 @@ const CldImage = /*#__PURE__*/react.forwardRef(function CldImage(props, ref) {
   const IMAGE_OPTIONS = process.env.__NEXT_IMAGE_OPTS || {};
   if (props.unoptimized === true || IMAGE_OPTIONS?.unoptimized === true) {
     imageProps.src = cloudinaryLoader.getCldImageUrl({
-      ...cldOptions,
+      ...props,
       width: imageProps.width,
       height: imageProps.height,
       src: imageProps.src,
@@ -138,7 +108,7 @@ const CldImage = /*#__PURE__*/react.forwardRef(function CldImage(props, ref) {
     loader: loaderOptions => cloudinaryLoader.cloudinaryLoader({
       loaderOptions,
       imageProps,
-      cldOptions,
+      cldOptions: props,
       cldConfig: props.config
     }),
     onError: handleOnError,

package/dist/{CldImage-6cada7b1.esm.js → CldImage-ca122eb3.esm.js}

@@ -2,10 +2,10 @@
 import { forwardRef, useState, useCallback } from 'react';
 import Image from 'next/image';
 import { pollForProcessingImage } from '@cloudinary-util/util';
-import { transformationPlugins } from '@cloudinary-util/url-loader';
-import { g as getCldImageUrl, c as cloudinaryLoader } from './cloudinary-loader-6ba37e36.esm.js';
+import { cloudinaryPluginKeys } from '@cloudinary-util/url-loader';
+import { g as getCldImageUrl, c as cloudinaryLoader } from './cloudinary-loader-34d35ba3.esm.js';
 import { jsx } from 'react/jsx-runtime';
-import './cloudinary-4e704764.esm.js';
+import './cloudinary-a06f445a.esm.js';
 import 'next/package.json';
 
 const CldImage = /*#__PURE__*/forwardRef(function CldImage(props, ref) {
@@ -15,26 +15,7 @@ const CldImage = /*#__PURE__*/forwardRef(function CldImage(props, ref) {
   // Cloudinary URL construction to avoid them being forwarded
   // to the DOM
 
-  const CLD_OPTIONS = ['assetType', 'config', 'deliveryType', 'strictTransformations'];
-
-  // Loop through all of the props available on the transformation plugins and verify
-  // that we're not accientally applying the same prop twice
-
-  // We're also using those props to push into CLD_OPTIONS which helps us filter what
-  // props are applied to the underlaying Image component vs what's being sent
-  // to Cloudinary URL construction
-
-  transformationPlugins.forEach(({
-    props
-  }) => {
-    const pluginProps = Object.keys(props);
-    pluginProps.forEach(prop => {
-      if (CLD_OPTIONS.includes(prop)) {
-        throw new Error(`Option ${prop} already exists!`);
-      }
-      CLD_OPTIONS.push(prop);
-    });
-  });
+  const CLD_OPTIONS = ['assetType', 'config', 'deliveryType', 'strictTransformations', ...cloudinaryPluginKeys];
 
   // Construct the base Image component props by filtering out Cloudinary-specific props
 
@@ -46,17 +27,6 @@ const CldImage = /*#__PURE__*/forwardRef(function CldImage(props, ref) {
   const defaultImgKey = Object.keys(imageProps).map(key => `${key}:${imageProps[key]}`).join(';');
   const [imgKey, setImgKey] = useState(defaultImgKey);
 
-  // Construct Cloudinary-specific props by looking for values for any of the supported prop keys
-
-  const cldOptions = {};
-  CLD_OPTIONS.forEach(key => {
-    const prop = props[key];
-    if (prop) {
-      // @ts-expect-error
-      cldOptions[key] = prop;
-    }
-  });
-
   // The unoptimized flag is intended to remove all optimizations including quality, format, and sizing
   // via responsive sizing. When passing this in, it also prevents the `loader` from running, thus
   // breaking this component. This rewrites the `src` to construct a fully formed Cloudinary URL
@@ -66,7 +36,7 @@ const CldImage = /*#__PURE__*/forwardRef(function CldImage(props, ref) {
   const IMAGE_OPTIONS = process.env.__NEXT_IMAGE_OPTS || {};
   if (props.unoptimized === true || IMAGE_OPTIONS?.unoptimized === true) {
     imageProps.src = getCldImageUrl({
-      ...cldOptions,
+      ...props,
       width: imageProps.width,
       height: imageProps.height,
       src: imageProps.src,
@@ -130,7 +100,7 @@ const CldImage = /*#__PURE__*/forwardRef(function CldImage(props, ref) {
     loader: loaderOptions => cloudinaryLoader({
       loaderOptions,
       imageProps,
-      cldOptions,
+      cldOptions: props,
       cldConfig: props.config
     }),
     onError: handleOnError,

package/dist/CldUploadButton-196b419b.esm.js

@@ -1,6 +1,6 @@
 'use client';
 import 'react';
-import CldUploadWidget from './CldUploadWidget-ad9e977a.esm.js';
+import CldUploadWidget from './CldUploadWidget-e20936ff.esm.js';
 import { jsx, Fragment } from 'react/jsx-runtime';
 
 const CldUploadButton = ({

package/dist/CldUploadButton-db9b095b.cjs.js

@@ -4,7 +4,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('react');
-var CldUploadWidget = require('./CldUploadWidget-e4bba6fd.cjs.js');
+var CldUploadWidget = require('./CldUploadWidget-4ed02ca2.cjs.js');
 var jsxRuntime = require('react/jsx-runtime');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }

package/dist/{CldUploadWidget-e4bba6fd.cjs.js → CldUploadWidget-4ed02ca2.cjs.js}

@@ -6,7 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var react = require('react');
 var Script = require('next/script');
 var urlLoader = require('@cloudinary-util/url-loader');
-var cloudinary = require('./cloudinary-e2b6966d.cjs.js');
+var cloudinary = require('./cloudinary-0ed42370.cjs.js');
 var jsxRuntime = require('react/jsx-runtime');
 require('next/package.json');
 

package/dist/{CldUploadWidget-ad9e977a.esm.js → CldUploadWidget-e20936ff.esm.js}

@@ -2,7 +2,7 @@
 import { useRef, useState, useEffect } from 'react';
 import Script from 'next/script';
 import { generateSignatureCallback, getUploadWidgetOptions, generateUploadWidgetResultCallback, UPLOAD_WIDGET_EVENTS } from '@cloudinary-util/url-loader';
-import { g as getCloudinaryConfig } from './cloudinary-4e704764.esm.js';
+import { g as getCloudinaryConfig } from './cloudinary-a06f445a.esm.js';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import 'next/package.json';
 

package/dist/{CldVideoPlayer-0612b757.cjs.js → CldVideoPlayer-0148d38a.cjs.js}

@@ -7,7 +7,7 @@ var react = require('react');
 var Script = require('next/script');
 var Head = require('next/head');
 var urlLoader = require('@cloudinary-util/url-loader');
-var cloudinary = require('./cloudinary-e2b6966d.cjs.js');
+var cloudinary = require('./cloudinary-0ed42370.cjs.js');
 var jsxRuntime = require('react/jsx-runtime');
 require('next/package.json');
 

package/dist/{CldVideoPlayer-e4b7babc.esm.js → CldVideoPlayer-6f274d98.esm.js}

@@ -3,7 +3,7 @@ import { useId, useRef, useEffect } from 'react';
 import Script from 'next/script';
 import Head from 'next/head';
 import { getVideoPlayerOptions } from '@cloudinary-util/url-loader';
-import { g as getCloudinaryConfig } from './cloudinary-4e704764.esm.js';
+import { g as getCloudinaryConfig } from './cloudinary-a06f445a.esm.js';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import 'next/package.json';
 

package/dist/{cloudinary-e2b6966d.cjs.js → cloudinary-0ed42370.cjs.js}

@@ -8,7 +8,7 @@ var nextPkg__default = /*#__PURE__*/_interopDefault(nextPkg);
 
 var pkg = {
 	name: "next-cloudinary",
-	version: "7.0.0-beta.4",
+	version: "7.0.0-beta.6",
 	license: "MIT",
 	main: "dist/next-cloudinary.cjs.js",
 	module: "dist/next-cloudinary.esm.js",
@@ -44,9 +44,9 @@ var pkg = {
 		"test:watch": "vitest"
 	},
 	dependencies: {
-		"@cloudinary-util/types": "1.5.10",
-		"@cloudinary-util/url-loader": "5.10.4",
-		"@cloudinary-util/util": "4.0.0"
+		"@cloudinary-util/types": "2.0.0-beta.2",
+		"@cloudinary-util/url-loader": "6.0.0-beta.5",
+		"@cloudinary-util/util": "5.0.0-beta.1"
 	},
 	devDependencies: {
 		"@babel/core": "^7.25.2",

package/dist/{cloudinary-4e704764.esm.js → cloudinary-a06f445a.esm.js}

@@ -2,7 +2,7 @@ import nextPkg from 'next/package.json';
 
 var pkg = {
 	name: "next-cloudinary",
-	version: "7.0.0-beta.4",
+	version: "7.0.0-beta.6",
 	license: "MIT",
 	main: "dist/next-cloudinary.cjs.js",
 	module: "dist/next-cloudinary.esm.js",
@@ -38,9 +38,9 @@ var pkg = {
 		"test:watch": "vitest"
 	},
 	dependencies: {
-		"@cloudinary-util/types": "1.5.10",
-		"@cloudinary-util/url-loader": "5.10.4",
-		"@cloudinary-util/util": "4.0.0"
+		"@cloudinary-util/types": "2.0.0-beta.2",
+		"@cloudinary-util/url-loader": "6.0.0-beta.5",
+		"@cloudinary-util/util": "5.0.0-beta.1"
 	},
 	devDependencies: {
 		"@babel/core": "^7.25.2",

package/dist/{cloudinary-loader-6ba37e36.esm.js → cloudinary-loader-34d35ba3.esm.js}

@@ -1,5 +1,5 @@
 import { constructCloudinaryUrl } from '@cloudinary-util/url-loader';
-import { g as getCloudinaryConfig, a as getCloudinaryAnalytics } from './cloudinary-4e704764.esm.js';
+import { g as getCloudinaryConfig, a as getCloudinaryAnalytics } from './cloudinary-a06f445a.esm.js';
 
 /**
  * getCldImageUrl

package/dist/{cloudinary-loader-8cbd9bdd.cjs.js → cloudinary-loader-701d6a88.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var urlLoader = require('@cloudinary-util/url-loader');
-var cloudinary = require('./cloudinary-e2b6966d.cjs.js');
+var cloudinary = require('./cloudinary-0ed42370.cjs.js');
 
 /**
  * getCldImageUrl

package/dist/declarations/src/components/CldImage/CldImage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CldImage.d.ts","sourceRoot":"../../../../../src/components/CldImage","sources":["CldImage.tsx"],"names":[],"mappings":"AAEA,OAAc,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAM/E,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS,CAAC,GAAG,YAAY,GAAG;IAC/E,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,QAAA,MAAM,QAAQ;aALH,aAAa;SACjB,MAAM;kBACG,OAAO;oDAmJrB,CAAC;AAEH,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"CldImage.d.ts","sourceRoot":"../../../../../src/components/CldImage","sources":["CldImage.tsx"],"names":[],"mappings":"AAEA,OAAc,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAM/E,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS,CAAC,GAAG,YAAY,GAAG;IAC/E,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,QAAA,MAAM,QAAQ;aALH,aAAa;SACjB,MAAM;kBACG,OAAO;oDAqHrB,CAAC;AAEH,eAAe,QAAQ,CAAC"}

package/dist/next-cloudinary.cjs.js

@@ -2,15 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var CldImage = require('./CldImage-ee84a50c.cjs.js');
+var CldImage = require('./CldImage-5499491b.cjs.js');
 var Head = require('next/head');
-var cloudinaryLoader = require('./cloudinary-loader-8cbd9bdd.cjs.js');
+var cloudinaryLoader = require('./cloudinary-loader-701d6a88.cjs.js');
 var jsxRuntime = require('react/jsx-runtime');
 var CldUploadButton = require('./CldUploadButton-db9b095b.cjs.js');
-var CldUploadWidget = require('./CldUploadWidget-e4bba6fd.cjs.js');
-var CldVideoPlayer = require('./CldVideoPlayer-0612b757.cjs.js');
+var CldUploadWidget = require('./CldUploadWidget-4ed02ca2.cjs.js');
+var CldVideoPlayer = require('./CldVideoPlayer-0148d38a.cjs.js');
 var urlLoader = require('@cloudinary-util/url-loader');
-var cloudinary = require('./cloudinary-e2b6966d.cjs.js');
+var cloudinary = require('./cloudinary-0ed42370.cjs.js');
 require('next/package.json');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }

package/dist/next-cloudinary.esm.js

@@ -1,13 +1,13 @@
-export { default as CldImage } from './CldImage-6cada7b1.esm.js';
+export { default as CldImage } from './CldImage-ca122eb3.esm.js';
 import Head from 'next/head';
-import { g as getCldImageUrl } from './cloudinary-loader-6ba37e36.esm.js';
-export { c as cloudinaryLoader, g as getCldImageUrl } from './cloudinary-loader-6ba37e36.esm.js';
+import { g as getCldImageUrl } from './cloudinary-loader-34d35ba3.esm.js';
+export { c as cloudinaryLoader, g as getCldImageUrl } from './cloudinary-loader-34d35ba3.esm.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 export { default as CldUploadButton } from './CldUploadButton-196b419b.esm.js';
-export { default as CldUploadWidget } from './CldUploadWidget-ad9e977a.esm.js';
-export { default as CldVideoPlayer } from './CldVideoPlayer-e4b7babc.esm.js';
+export { default as CldUploadWidget } from './CldUploadWidget-e20936ff.esm.js';
+export { default as CldVideoPlayer } from './CldVideoPlayer-6f274d98.esm.js';
 import { constructCloudinaryUrl } from '@cloudinary-util/url-loader';
-import { g as getCloudinaryConfig, a as getCloudinaryAnalytics } from './cloudinary-4e704764.esm.js';
+import { g as getCloudinaryConfig, a as getCloudinaryAnalytics } from './cloudinary-a06f445a.esm.js';
 import 'next/package.json';
 
 const OG_IMAGE_WIDTH = 1200;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-cloudinary",
-  "version": "7.0.0-beta.4",
+  "version": "7.0.0-beta.6",
   "license": "MIT",
   "main": "dist/next-cloudinary.cjs.js",
   "module": "dist/next-cloudinary.esm.js",
@@ -27,9 +27,9 @@
     "dist"
   ],
   "dependencies": {
-    "@cloudinary-util/types": "1.5.10",
-    "@cloudinary-util/url-loader": "5.10.4",
-    "@cloudinary-util/util": "4.0.0"
+    "@cloudinary-util/types": "2.0.0-beta.2",
+    "@cloudinary-util/url-loader": "6.0.0-beta.5",
+    "@cloudinary-util/util": "5.0.0-beta.1"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",