Add better workaraound

Author: AlexandrHoroshih

packages/core/src/fetch/__tests__/lib.test.ts

@@ -1,6 +1,6 @@
 import { describe, test, expect } from 'vitest';
 
-import { mergeRecords, splitUrl } from '../lib';
+import { mergeRecords } from '../lib';
 
 describe('mergeRecords', () => {
   test('empty to empty object', () => {
@@ -41,21 +41,3 @@ describe('mergeRecords', () => {
     });
   });
 });
-
-describe('Safari 14.0 bug', () => {
-  test('splitUrl', () => {
-    const url = 'https://example.com/api?foo=bar';
-
-    const split = splitUrl(url);
-
-    expect(split).toEqual({
-      base: 'https://example.com',
-      path: '/api?foo=bar',
-    });
-
-    const url1 = new URL(url);
-    const url2 = new URL(split.path, split.base);
-
-    expect(url1.href).toBe(url2.href);
-  });
-});

packages/core/src/fetch/lib.ts

@@ -93,30 +93,15 @@ export function formatUrl(
     urlString = `${url}?${queryString}`;
   }
 
+  /**
+   * Workararound for Safari 14.0
+   * @see https://github.com/igorkamyshev/farfetched/issues/528
+   */
+  const urlArgs = [urlString, urlBase].filter(Boolean) as [string, string];
+
   try {
-    return new URL(urlString, urlBase);
+    return new URL(...urlArgs);
   } catch (e) {
-    if (!urlBase) {
-      try {
-        /**
-         * Fallback branch for Safari 14.0
-         * @see https://github.com/igorkamyshev/farfetched/issues/528
-         *
-         * If url is full path, but we're in Safari 14.0, we will have a TypeError for new URL(urlString, undefined)
-         *
-         * So we have to manually split url into base and path parts first
-         */
-        const { base, path } = splitUrl(urlString);
-
-        return new URL(path, base);
-      } catch (_e) {
-        throw configurationError({
-          reason: 'Invalid URL',
-          validationErrors: [`"${urlString}" is not valid URL`],
-        });
-      }
-    }
-
     throw configurationError({
       reason: 'Invalid URL',
       validationErrors: [`"${urlString}" is not valid URL`],
@@ -150,19 +135,3 @@ function clearValue(
 
   return value ?? null;
 }
-
-/**
- *  @see https://github.com/igorkamyshev/farfetched/issues/528
- */
-export function splitUrl(urlString: string): { base: string; path: string } {
-  const urlPattern = /^(https?:\/\/[^\/]+)(\/.*)?$/;
-  const match = urlString.match(urlPattern);
-
-  if (!match) {
-    throw new Error(`Invalid URL: ${urlString}`);
-  }
-
-  const base = match[1];
-  const path = match[2] || '';
-  return { base, path };
-}