use free variable for native fetch (#5049)

* use free variable for native fetch

* Update packages/kit/src/runtime/client/client.js

Co-authored-by: Maurício Kishi <[email protected]>

* Update packages/kit/src/runtime/client/client.js

Co-authored-by: Maurício Kishi <[email protected]>

* Update packages/kit/src/runtime/client/client.js

Co-authored-by: Maurício Kishi <[email protected]>

* lint errors, might as well rename in fetcher

Co-authored-by: Maurício Kishi <[email protected]>
Co-authored-by: mrkishi <[email protected]>

Author: Rich-Harris

packages/kit/src/runtime/client/client.js

@@ -11,7 +11,7 @@ import {
 	notifiable_store,
 	scroll_state
 } from './utils.js';
-import * as fetcher from './fetcher.js';
+import { lock_fetch, unlock_fetch, initial_fetch, native_fetch } from './fetcher.js';
 import { parse } from './parse.js';
 
 import Root from '__GENERATED__/root.svelte';
@@ -594,7 +594,7 @@ export function create_client({ target, session, base, trailing_slash }) {
 					add_dependency(normalized);
 
 					// prerendered pages may be served from any origin, so `initial_fetch` urls shouldn't be normalized
-					return started ? fetcher.native(normalized, init) : fetcher.initial(requested, init);
+					return started ? native_fetch(normalized, init) : initial_fetch(requested, init);
 				},
 				status: status ?? null,
 				error: error ?? null
@@ -613,10 +613,10 @@ export function create_client({ target, session, base, trailing_slash }) {
 
 			if (import.meta.env.DEV) {
 				try {
-					fetcher.increment();
+					lock_fetch();
 					loaded = await module.load.call(null, load_input);
 				} finally {
-					fetcher.decrement();
+					unlock_fetch();
 				}
 			} else {
 				loaded = await module.load.call(null, load_input);
@@ -704,7 +704,7 @@ export function create_client({ target, session, base, trailing_slash }) {
 					const is_shadow_page = has_shadow && i === a.length - 1;
 
 					if (is_shadow_page) {
-						const res = await fetcher.native(
+						const res = await native_fetch(
 							`${url.pathname}${url.pathname.endsWith('/') ? '' : '/'}__data.json${url.search}`,
 							{
 								headers: {

packages/kit/src/runtime/client/fetcher.js

@@ -2,13 +2,13 @@ import { hash } from '../hash.js';
 
 let loading = 0;
 
-export const native = window.fetch;
+export const native_fetch = window.fetch;
 
-export function increment() {
+export function lock_fetch() {
 	loading += 1;
 }
 
-export function decrement() {
+export function unlock_fetch() {
 	loading -= 1;
 }
 
@@ -32,15 +32,16 @@ if (import.meta.env.DEV) {
 				`Loading ${url} using \`window.fetch\`. For best results, use the \`fetch\` that is passed to your \`load\` function: https://kit.svelte.dev/docs/loading#input-fetch`
 			);
 		}
-		return native(input, init);
+
+		return native_fetch(input, init);
 	};
 }
 
 /**
  * @param {RequestInfo} resource
  * @param {RequestInit} [opts]
  */
-export function initial(resource, opts) {
+export function initial_fetch(resource, opts) {
 	const url = JSON.stringify(typeof resource === 'string' ? resource : resource.url);
 
 	let selector = `script[sveltekit\\:data-type="data"][sveltekit\\:data-url=${url}]`;
@@ -55,5 +56,5 @@ export function initial(resource, opts) {
 		return Promise.resolve(new Response(body, init));
 	}
 
-	return native(resource, opts);
+	return native_fetch(resource, opts);
 }