inertiax-core 11.0.36 → 11.0.38

package/dist/index.js

@@ -103,6 +103,9 @@ var firePrefetchingEvent = (visit) => {
 var fireFlashEvent = (flash) => {
   return fireEvent("flash", { detail: { flash } });
 };
+var fireLocationEvent = (url, versionChange) => {
+  return fireEvent("location", { cancelable: true, detail: { url, versionChange } });
+};
 
 // src/history.ts
 import { cloneDeep, isEqual } from "es-toolkit";
@@ -1544,6 +1547,8 @@ var CurrentFramePage = class {
     const viewTransitionCallback = typeof viewTransition === "boolean" ? () => null : viewTransition;
     return new Promise((resolve) => {
       const transitionResult = document.startViewTransition(() => doSwap().then(resolve));
+      transitionResult.ready.catch(() => {
+      });
       viewTransitionCallback(transitionResult);
     });
   }
@@ -1896,7 +1901,8 @@ var InitialVisit = class {
       page.setUrlHash(window.location.hash, frameId);
     }
     const visitId = uid();
-    page.set(page.get(frameId), { preserveScroll: true, preserveState: true, visitId }, frameId).then(() => {
+    const preserveScroll = frameId === "_top";
+    page.set(page.get(frameId), { preserveScroll, preserveState: true, visitId }, frameId).then(() => {
       if (navigationType.isReload()) {
         Scroll.restore(history.getScrollRegions(), frameId);
       } else {
@@ -2155,11 +2161,17 @@ function parseHeaders(xhr) {
   });
   return headers;
 }
+function isFormDataRequestBody(value) {
+  return typeof FormData !== "undefined" && value instanceof FormData;
+}
+function isRawRequestBody(value) {
+  return typeof value === "string" || isFormDataRequestBody(value) || typeof Blob !== "undefined" && value instanceof Blob || typeof ArrayBuffer !== "undefined" && value instanceof ArrayBuffer || typeof ArrayBuffer !== "undefined" && ArrayBuffer.isView(value) || typeof URLSearchParams !== "undefined" && value instanceof URLSearchParams;
+}
 function setHeaders(xhr, config2) {
   if (!config2.headers) {
     return;
   }
-  const isFormData2 = config2.data instanceof FormData;
+  const isFormData2 = isFormDataRequestBody(config2.data);
   Object.entries(config2.headers).forEach(([key, value]) => {
     if (key.toLowerCase() !== "content-type" || !isFormData2) {
       xhr.setRequestHeader(key, String(value));
@@ -2201,9 +2213,15 @@ var XhrHttpClient = class {
       if (xsrfToken) {
         xhr.setRequestHeader(this.xsrfHeaderName, xsrfToken);
       }
+      const hasRequestedWithHeader = Object.keys(config2.headers ?? {}).some(
+        (key) => key.toLowerCase() === "x-requested-with"
+      );
+      if (!hasRequestedWithHeader) {
+        xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+      }
       let body = null;
       if (config2.data !== null && config2.data !== void 0) {
-        if (config2.data instanceof FormData) {
+        if (isRawRequestBody(config2.data)) {
           body = config2.data;
         } else if (typeof config2.data === "object") {
           body = JSON.stringify(config2.data);
@@ -2398,6 +2416,9 @@ var RequestParams = class _RequestParams {
   isDeferredPropsRequest() {
     return this.params.deferredProps === true;
   }
+  isPollRequest() {
+    return this.params.poll === true;
+  }
   onCancelToken(cb) {
     this.params.onCancelToken({
       cancel: cb
@@ -2728,9 +2749,6 @@ var Response = class _Response {
    */
   locationVisit(url) {
     try {
-      SessionStorage.set(SessionStorage.locationVisitKey, {
-        preserveScroll: this.requestParams.all().preserveScroll === true
-      });
       if (typeof window === "undefined") {
         return;
       }
@@ -2738,6 +2756,17 @@ var Response = class _Response {
         window.location.reload();
         return;
       }
+      const responseVersion = this.getHeader("x-inertia-version");
+      const versionChange = !!responseVersion && responseVersion !== page.get().version;
+      if (!fireLocationEvent(url, versionChange)) {
+        return;
+      }
+      if (versionChange && this.requestParams.all().async) {
+        return;
+      }
+      SessionStorage.set(SessionStorage.locationVisitKey, {
+        preserveScroll: this.requestParams.all().preserveScroll === true
+      });
       if (isSameUrlWithoutHash(window.location, url)) {
         window.location.reload();
       } else {
@@ -3407,7 +3436,8 @@ var Router = class {
       interval,
       ({ onStart, onFinish }) => {
         const resolved = typeof requestOptions === "function" ? requestOptions() : requestOptions;
-        this.reload({
+        this.doReload({
+          poll: true,
           preserveErrors: true,
           ...resolved,
           onCancelToken: (token) => {
@@ -3974,6 +4004,12 @@ function normalizeHeaders(headers) {
   }
   return normalized;
 }
+function isBinaryRequestBody(value) {
+  return typeof Blob !== "undefined" && value instanceof Blob || typeof ArrayBuffer !== "undefined" && value instanceof ArrayBuffer || typeof ArrayBuffer !== "undefined" && ArrayBuffer.isView(value);
+}
+function hasContentTypeHeader(headers) {
+  return Object.keys(headers ?? {}).some((key) => key.toLowerCase() === "content-type");
+}
 function toHttpProgressEvent(axiosEvent) {
   return {
     progress: axiosEvent.progress,
@@ -4014,13 +4050,17 @@ var AxiosHttpClient = class {
   }
   async doRequest(config2) {
     const axios = await this.getAxios();
+    const headers = { ...config2.headers ?? {} };
+    if (isBinaryRequestBody(config2.data) && !hasContentTypeHeader(config2.headers)) {
+      headers["Content-Type"] = false;
+    }
     try {
       const response = await axios({
         method: config2.method,
         url: config2.url,
         data: config2.data,
         params: config2.params,
-        headers: config2.headers,
+        headers,
         signal: config2.signal,
         responseType: "text",
         onUploadProgress: config2.onUploadProgress ? (event) => config2.onUploadProgress(toHttpProgressEvent(event)) : void 0
@@ -4148,6 +4188,23 @@ function formDataToObject(source) {
 }
 
 // src/head.ts
+var serverHeadProviderId = "server";
+function ensureElementHasInertiaAttribute(element, index) {
+  if (element.match(/\sdata-inertia(=|\s|>)/)) {
+    return element;
+  }
+  return element.replace(/^<([a-zA-Z][^\s/>]*)/, `<$1 data-inertia="server-head-${index}"`);
+}
+function resolveServerHead(page2, serverHead) {
+  if (!serverHead) {
+    return [];
+  }
+  const elements = typeof serverHead === "function" ? serverHead(page2) : page2.props[serverHead === true ? "head" : serverHead];
+  if (!Array.isArray(elements)) {
+    return [];
+  }
+  return elements.map((element) => typeof element === "string" ? element.trim() : element).filter((element) => typeof element === "string" && element.length > 0).map(ensureElementHasInertiaAttribute);
+}
 var Renderer = {
   buildDOMElement(tag) {
     const template = document.createElement("template");
@@ -4197,8 +4254,8 @@ var Renderer = {
     });
   }, 1)
 };
-function createHeadManager(isServer3, titleCallback, onUpdate) {
-  const states = {};
+function createHeadManager(isServer3, titleCallback, onUpdate, initialServerHead = []) {
+  const states = initialServerHead.length ? { [serverHeadProviderId]: initialServerHead } : {};
   let lastProviderId = 0;
   function connect() {
     const id = lastProviderId += 1;
@@ -4223,12 +4280,22 @@ function createHeadManager(isServer3, titleCallback, onUpdate) {
     }
     commit();
   }
+  function updateServerHead(elements = []) {
+    if (elements.length) {
+      states[serverHeadProviderId] = elements;
+    } else {
+      delete states[serverHeadProviderId];
+    }
+    commit();
+  }
   function collect() {
     const title = titleCallback("");
+    const serverHead = states[serverHeadProviderId] || [];
+    const providerHead = Object.keys(states).filter((id) => id !== serverHeadProviderId).flatMap((id) => states[id]);
     const defaults = {
       ...title ? { title: `<title data-inertia="">${title}</title>` } : {}
     };
-    const elements = Object.values(states).reduce((carry, elements2) => carry.concat(elements2), []).reduce((carry, element) => {
+    const elements = serverHead.concat(providerHead).reduce((carry, element) => {
       if (element.indexOf("<") === -1) {
         return carry;
       }
@@ -4237,7 +4304,7 @@ function createHeadManager(isServer3, titleCallback, onUpdate) {
         carry.title = title2 ? `${title2[1]}${titleCallback(title2[2])}${title2[3]}` : element;
         return carry;
       }
-      const match = element.match(/ data-inertia="[^"]+"/);
+      const match = element.match(/ data-inertia=(["'])[^"']+\1/);
       if (match) {
         carry[match[0]] = element;
       } else {
@@ -4253,6 +4320,7 @@ function createHeadManager(isServer3, titleCallback, onUpdate) {
   commit();
   return {
     forceUpdate: commit,
+    updateServerHead,
     createProvider: function() {
       const id = connect();
       return {
@@ -4904,7 +4972,8 @@ function isContentEditableOrPrevented(event) {
 }
 function shouldIntercept(event) {
   const isLink = event.currentTarget.tagName.toLowerCase() === "a";
-  return !(isContentEditableOrPrevented(event) || isLink && event.altKey || isLink && event.ctrlKey || isLink && event.metaKey || isLink && event.shiftKey || isLink && "button" in event && event.button !== 0);
+  const target = isLink ? event.currentTarget.target : "";
+  return !(isContentEditableOrPrevented(event) || isLink && event.altKey || isLink && event.ctrlKey || isLink && event.metaKey || isLink && event.shiftKey || isLink && target !== "" && target !== "_self" || isLink && "button" in event && event.button !== 0);
 }
 function shouldNavigate(event) {
   const isButton = event.currentTarget.tagName.toLowerCase() === "button";
@@ -4922,17 +4991,17 @@ var settings = {
   trickle: true,
   trickleSpeed: 200,
   showSpinner: true,
-  barSelector: '[role="bar"]',
-  spinnerSelector: '[role="spinner"]',
+  barSelector: '.bar, [role="bar"]',
+  spinnerSelector: '.spinner, [role="spinner"]',
   parent: "body",
   color: "#29d",
   includeCSS: true,
   popover: null,
   template: [
-    '<div class="bar" role="bar">',
+    '<div class="bar">',
     '<div class="peg"></div>',
     "</div>",
-    '<div class="spinner" role="spinner">',
+    '<div class="spinner">',
     '<div class="spinner-icon"></div>',
     "</div>"
   ].join("")
@@ -4947,6 +5016,7 @@ var configure = (options) => {
   }
   progress2 = document.createElement("div");
   progress2.id = baseComponentSelector;
+  progress2.setAttribute("aria-hidden", "true");
   progress2.innerHTML = settings.template;
   if (usePopover) {
     progress2.popover = "manual";
@@ -5502,6 +5572,7 @@ export {
   partialReloadRequestsSomeProps,
   progress,
   resetFormFields,
+  resolveServerHead,
   resolveUrlMethodPairComponent,
   router,
   setupProgress,