fix: Fixes Netlify URL (#84)

# Description

<!-- Include a summary of the change made and also list the dependencies
that are required if any -->

## Issue Ticket Number

<!-- Specifiy which issue this fixes by referencing the issue number
(`#11`) or issue URL. -->
<!-- Example: Fixes
#1 -->

Fixes #83 

## Type of change

<!-- Please select all options that are applicable. -->

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] This change requires a documentation update


# Checklist

<!-- These must all be followed and checked. -->

- [ ] I have followed the contributing guidelines of this project as
mentioned in [CONTRIBUTING.md](/CONTRIBUTING.md)
- [ ] I have created an
[issue](https://github.com/colbyfayock/netlify-plugin-cloudinary/issues)
ticket for this PR
- [ ] I have checked to ensure there aren't other open [Pull
Requests](https://github.com/colbyfayock/netlify-plugin-cloudinary/pulls)
for the same update/change?
- [ ] I have performed a self-review of my own code
- [ ] I have run tests locally to ensure they all pass
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes needed to the documentation

Author: colbyfayock

netlify-plugin-cloudinary/src/index.ts

@@ -126,10 +126,11 @@ export async function onBuild({
 }: OnBuildParams) {
   console.log('[Cloudinary] Creating redirects...');
 
-  const isProduction = process.env.CONTEXT === 'production';
-  const host = isProduction
-    ? process.env.NETLIFY_HOST
-    : process.env.DEPLOY_PRIME_URL;
+  let host = process.env.URL;
+
+  if ( process.env.CONTEXT === 'branch-deploy' || process.env.CONTEXT === 'deploy-preview' ) {
+    host = process.env.DEPLOY_PRIME_URL || ''
+  }
 
   console.log(`[Cloudinary] Using host: ${host}`);
 
@@ -316,10 +317,12 @@ export async function onPostBuild({
 }: OnPostBuildParams) {
   console.log('[Cloudinary] Replacing on-page images with Cloudinary URLs...');
 
-  const isProduction = process.env.CONTEXT === 'production';
-  const host = isProduction
-    ? process.env.NETLIFY_HOST
-    : process.env.DEPLOY_PRIME_URL;
+  let host = process.env.URL;
+
+  if ( process.env.CONTEXT === 'branch-deploy' || process.env.CONTEXT === 'deploy-preview' ) {
+    host = process.env.DEPLOY_PRIME_URL || ''
+  }
+
 
   console.log(`[Cloudinary] Using host: ${host}`);
 

netlify-plugin-cloudinary/tests/on-build.test.js

@@ -68,7 +68,7 @@ describe('onBuild', () => {
       fs.readdir.mockResolvedValue([imagesFunctionName]);
 
       process.env.CONTEXT = 'production';
-      process.env.NETLIFY_HOST = 'https://netlify-plugin-cloudinary.netlify.app';
+      process.env.URL = 'https://netlify-plugin-cloudinary.netlify.app';
 
       // Tests to ensure that delivery type of fetch works without API Key and Secret as it should
 
@@ -101,7 +101,7 @@ describe('onBuild', () => {
       });
       expect(redirects[0]).toEqual({
         from: `${imagesPath}/*`,
-        to: `https://res.cloudinary.com/${process.env.CLOUDINARY_CLOUD_NAME}/image/${deliveryType}/f_auto,q_auto/${process.env.NETLIFY_HOST}/cld-assets${imagesPath}/:splat`,
+        to: `https://res.cloudinary.com/${process.env.CLOUDINARY_CLOUD_NAME}/image/${deliveryType}/f_auto,q_auto/${process.env.URL}/cld-assets${imagesPath}/:splat`,
         status: 302,
         force: true
       });

netlify.toml

@@ -14,5 +14,5 @@
 
   [plugins.inputs]
   cloudName = "netlify-cloudinary"
-  deliveryType = "upload"
+  # deliveryType = "upload"
   imagesPath = [ "images", "screenshots" ]