Skip to content

Commit f629a03

Browse files
authored
fix: revert breaking change preventing use in non-kit projects (#97)
1 parent c891caa commit f629a03

File tree

4 files changed

+11
-18
lines changed

4 files changed

+11
-18
lines changed

docs/src/docs/installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To install Svelte Cloudinary, you can use your favorite package manager includin
3434
Next, you need to setup the environment variable. Insert the following variable into your `.env.local` or `.env` file:
3535

3636
<Code>
37-
PUBLIC_CLOUDINARY_CLOUD_NAME="[Your Cloud Name]"
37+
VITE_PUBLIC_CLOUDINARY_CLOUD_NAME="[Your Cloud Name]"
3838
</Code>
3939

4040
<Callout>Don't have a Cloudinary account? <a href="https://cloudinary.com/users/register_free?utm_campaign=devx_sveltecloudinary&utm_medium=referral&utm_source=sveltecloudinary">Sign up for free</a> on cloudinary.com!</Callout>

svelte-cloudinary/src/lib/components/CldUploadWidget.svelte

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import { onMount } from 'svelte';
33
import { triggerOnIdle, loadCloudinary } from '$lib/util.js';
44
import { checkCloudinaryCloudName } from '$lib/cloudinary.js';
5-
import { env } from '$env/dynamic/public';
65
import type {
76
CldUploadWidgetProps,
87
CldUploadWidgetInstanceMethods,
@@ -46,15 +45,14 @@
4645
};
4746
4847
// Validation
49-
const cloudName = env.PUBLIC_CLOUDINARY_CLOUD_NAME || import.meta.env.VITE_PUBLIC_CLOUDINARY_CLOUD_NAME;
50-
checkCloudinaryCloudName(cloudName);
48+
checkCloudinaryCloudName(import.meta.env.VITE_PUBLIC_CLOUDINARY_CLOUD_NAME);
5149
5250
// State
5351
let isLoading = true;
5452
const uploadOptions = {
55-
cloudName,
56-
uploadPreset: uploadPreset || env.PUBLIC_CLOUDINARY_UPLOAD_PRESET || import.meta.env.PUBLIC_CLOUDINARY_UPLOAD_PRESET,
57-
apiKey: env.PUBLIC_CLOUDINARY_API_KEY || import.meta.env.VITE_PUBLIC_CLOUDINARY_API_KEY,
53+
cloudName: import.meta.env.VITE_PUBLIC_CLOUDINARY_CLOUD_NAME,
54+
uploadPreset: uploadPreset || import.meta.env.PUBLIC_CLOUDINARY_UPLOAD_PRESET,
55+
apiKey: import.meta.env.VITE_PUBLIC_CLOUDINARY_API_KEY,
5856
...options
5957
};
6058

svelte-cloudinary/src/lib/components/CldVideoPlayer.svelte

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import { loadCloudinary } from '$lib/util.js';
4646
import { checkCloudinaryCloudName } from '$lib/cloudinary.js';
4747
import { onMount } from 'svelte';
48-
import { env } from '$env/dynamic/public';
4948
5049
const idRef = Math.ceil(Math.random() * 100000);
5150
type $$Props = CldVideoPlayerProps;
@@ -147,13 +146,11 @@
147146
}
148147
149148
// Validation
150-
const cloudName = env.PUBLIC_CLOUDINARY_CLOUD_NAME || import.meta.env.VITE_PUBLIC_CLOUDINARY_CLOUD_NAME;
151-
152-
checkCloudinaryCloudName(cloudName);
149+
checkCloudinaryCloudName(import.meta.env.VITE_PUBLIC_CLOUDINARY_CLOUD_NAME);
153150
154151
let playerOptions: CloudinaryVideoPlayerOptions = {
155152
autoplayMode: autoPlay,
156-
cloud_name: cloudName,
153+
cloud_name: import.meta.env.VITE_PUBLIC_CLOUDINARY_CLOUD_NAME,
157154
controls,
158155
fontFace: fontFace || '',
159156
loop,

svelte-cloudinary/src/lib/helpers/getCldImageUrl.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { constructCloudinaryUrl } from '@cloudinary-util/url-loader';
22
import { checkCloudinaryCloudName } from '../cloudinary.js';
33
import type { ImageOptions, ConfigOptions, AnalyticsOptions } from '@cloudinary-util/url-loader';
4-
import { env } from '$env/dynamic/public';
54

65
import {
76
SVELTE_CLOUDINARY_ANALYTICS_ID,
@@ -23,8 +22,8 @@ export interface GetCldImageUrl {
2322
}
2423

2524
/**
26-
* Generates the Cloudinary url for the assets
27-
* based on the configuration passed to the function
25+
* Generates the Cloudinary url for the assets
26+
* based on the configuration passed to the function
2827
* @returns string
2928
*/
3029
export function getCldImageUrl(
@@ -33,16 +32,15 @@ export function getCldImageUrl(
3332
analytics?: AnalyticsOptions
3433
) {
3534

36-
const cloudName = env.PUBLIC_CLOUDINARY_CLOUD_NAME || import.meta.env.VITE_PUBLIC_CLOUDINARY_CLOUD_NAME;
3735
// Validation
38-
checkCloudinaryCloudName(cloudName);
36+
checkCloudinaryCloudName(import.meta.env.VITE_PUBLIC_CLOUDINARY_CLOUD_NAME);
3937

4038
return constructCloudinaryUrl({
4139
options,
4240
config: Object.assign(
4341
{
4442
cloud: {
45-
cloudName: cloudName
43+
cloudName: import.meta.env.VITE_PUBLIC_CLOUDINARY_CLOUD_NAME
4644
}
4745
},
4846
config

0 commit comments

Comments
 (0)