unpoly-rails 2.7.2.1 → 2.7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17aae8ae028ba49402b7b5544ad8498af55fae1c17d606883f522e14d84d7727
-  data.tar.gz: 6f819af3aa0339f9c3a3c63836a6dfde27d019d51a795dc8aa16800560e7082a
+  metadata.gz: 78ae8255389adf6764d3bb943b4b3f1e5a5d8a31bc7f2ad01799ba683be9ea56
+  data.tar.gz: b5c00aa016a7a178d855018db1491fa32b45316bd64457704657bf7ad2c98e59
 SHA512:
-  metadata.gz: af953dbde16013e047641a4801398595b6e9c6c1d5394ff614083bac5aa3289f70ebbf810a58f031545092672f57129736007a6aaef238d38d11f9b0c73edd8d
-  data.tar.gz: 44694a2cf5d4d5c5510f136be407d79601093d2a5dbef375b4f8500c72099c178931c5d6f33d1da86c1e5dbd648be71a0809c1b870b1b6ff49c90d63465e8840
+  metadata.gz: 30506f67b5ea32e55f66fa3a749e1aaeee0a5fbb5eb62064044288b20da573197f79aa79e6cd4a3bc542c5d9b6c0f948b57a18cc5c004cdce1fdd08b347b7109
+  data.tar.gz: 797a38f17df02e60213e95d68657f3f838c27a62a962eb6787d13770c38ddbd4e66018a53c62b0fc9db27a0faa6524ede38b54d1d2b306ee86899eaaf40877e7

data/assets/unpoly/unpoly.es6.js

@@ -111,15 +111,15 @@ up.util = (function () {
             return block;
         }
     }
-    function map(array, block) {
-        if (array.length === 0) {
+    function map(list, block) {
+        if (list.length === 0) {
             return [];
         }
         block = iteratee(block);
         let mapped = [];
-        for (let i = 0; i < array.length; i++) {
-            let element = array[i];
-            mapped.push(block(element, i));
+        let i = 0;
+        for (let item of list) {
+            mapped.push(block(item, i++));
         }
         return mapped;
     }
@@ -131,8 +131,9 @@ up.util = (function () {
         return map(array, pairer).reduce(merger, {});
     }
     function each(array, block) {
-        for (let i = 0; i < array.length; i++) {
-            block(array[i], i);
+        let i = 0;
+        for (let item of array) {
+            block(item, i++);
         }
     }
     function isNull(object) {
@@ -309,10 +310,11 @@ up.util = (function () {
     function some(list, tester) {
         return !!findResult(list, tester);
     }
-    function findResult(array, tester) {
+    function findResult(list, tester) {
         tester = iteratee(tester);
-        for (let i = 0; i < array.length; i++) {
-            const result = tester(array[i], i);
+        let i = 0;
+        for (let item of list) {
+            const result = tester(item, i++);
             if (result) {
                 return result;
             }
@@ -321,8 +323,9 @@ up.util = (function () {
     function every(list, tester) {
         tester = iteratee(tester);
         let match = true;
-        for (let i = 0; i < list.length; i++) {
-            if (!tester(list[i], i)) {
+        let i = 0;
+        for (let item of list) {
+            if (!tester(item, i++)) {
                 match = false;
                 break;
             }
@@ -706,6 +709,14 @@ up.util = (function () {
             };
         }
     }
+    function safeStringifyJSON(value) {
+        let json = JSON.stringify(value);
+        return escapeHighASCII(json);
+    }
+    function escapeHighASCII(string) {
+        let unicodeEscape = (char) => "\\u" + char.charCodeAt(0).toString(16).padStart(4, '0');
+        return string.replace(/[^\x00-\x7F]/g, unicodeEscape);
+    }
     return {
         parseURL,
         normalizeURL,
@@ -801,7 +812,8 @@ up.util = (function () {
         sprintf,
         renameKeys,
         negate,
-        memoizeMethod
+        memoizeMethod,
+        safeStringifyJSON,
     };
 })();
 
@@ -1162,9 +1174,17 @@ up.element = (function () {
         klass = klass.replace(/:/g, '\\:');
         return `.${klass}`;
     }
-    function createDocumentFromHTML(html) {
+    function createBrokenDocumentFromHTML(html) {
         return new DOMParser().parseFromString(html, 'text/html');
     }
+    function fixScriptish(scriptish) {
+        let clone = document.createElement(scriptish.tagName);
+        for (let { name, value } of scriptish.attributes) {
+            clone.setAttribute(name, value);
+        }
+        clone.textContent = scriptish.innerHTML;
+        scriptish.replaceWith(clone);
+    }
     function createFromHTML(html) {
         const range = document.createRange();
         range.setStart(document.body, 0);
@@ -1427,7 +1447,8 @@ up.element = (function () {
         isSingleton,
         attrSelector,
         tagName: elementTagName,
-        createDocumentFromHTML,
+        createBrokenDocumentFromHTML,
+        fixScriptish,
         createFromHTML,
         get root() { return getRoot(); },
         paint,
@@ -4161,44 +4182,6 @@ up.FragmentScrolling = class FragmentScrolling extends up.FragmentProcessor {
 /* 47 */
 /***/ (() => {
 
-const u = up.util;
-const e = up.element;
-up.HTMLWrapper = class HTMLWrapper {
-    constructor(tagName) {
-        this.tagName = tagName;
-        const openTag = `<${this.tagName}[^>]*>`;
-        const closeTag = `</${this.tagName}>`;
-        const innerHTML = "(.|\\s)*?";
-        this.pattern = new RegExp(openTag + innerHTML + closeTag, 'ig');
-        this.attrName = `up-wrapped-${this.tagName}`;
-    }
-    strip(html) {
-        return html.replace(this.pattern, '');
-    }
-    wrap(html) {
-        return html.replace(this.pattern, this.wrapMatch.bind(this));
-    }
-    wrapMatch(match) {
-        this.didWrap = true;
-        return '<meta name="' + this.attrName + '" value="' + u.escapeHTML(match) + '">';
-    }
-    unwrap(element) {
-        if (!this.didWrap) {
-            return;
-        }
-        for (let wrappedChild of element.querySelectorAll(`meta[name='${this.attrName}']`)) {
-            const originalHTML = wrappedChild.getAttribute('value');
-            const restoredElement = e.createFromHTML(originalHTML);
-            wrappedChild.replaceWith(restoredElement);
-        }
-    }
-};
-
-
-/***/ }),
-/* 48 */
-/***/ (() => {
-
 const e = up.element;
 const u = up.util;
 up.Layer = class Layer extends up.Record {
@@ -4416,7 +4399,7 @@ up.Layer = class Layer extends up.Record {
 
 
 /***/ }),
-/* 49 */
+/* 48 */
 /***/ (() => {
 
 const e = up.element;
@@ -4696,7 +4679,7 @@ up.Layer.Overlay = class Overlay extends up.Layer {
 
 
 /***/ }),
-/* 50 */
+/* 49 */
 /***/ (() => {
 
 up.Layer.OverlayWithTether = class OverlayWithTether extends up.Layer.Overlay {
@@ -4733,7 +4716,7 @@ up.Layer.OverlayWithTether = class OverlayWithTether extends up.Layer.Overlay {
 
 
 /***/ }),
-/* 51 */
+/* 50 */
 /***/ (() => {
 
 var _a;
@@ -4771,7 +4754,7 @@ up.Layer.OverlayWithViewport = (_a = class OverlayWithViewport extends up.Layer.
 
 
 /***/ }),
-/* 52 */
+/* 51 */
 /***/ (() => {
 
 var _a;
@@ -4820,7 +4803,7 @@ up.Layer.Root = (_a = class Root extends up.Layer {
 
 
 /***/ }),
-/* 53 */
+/* 52 */
 /***/ (() => {
 
 var _a;
@@ -4831,7 +4814,7 @@ up.Layer.Modal = (_a = class Modal extends up.Layer.OverlayWithViewport {
 
 
 /***/ }),
-/* 54 */
+/* 53 */
 /***/ (() => {
 
 var _a;
@@ -4842,7 +4825,7 @@ up.Layer.Popup = (_a = class Popup extends up.Layer.OverlayWithTether {
 
 
 /***/ }),
-/* 55 */
+/* 54 */
 /***/ (() => {
 
 var _a;
@@ -4853,7 +4836,7 @@ up.Layer.Drawer = (_a = class Drawer extends up.Layer.OverlayWithViewport {
 
 
 /***/ }),
-/* 56 */
+/* 55 */
 /***/ (() => {
 
 var _a;
@@ -4864,7 +4847,7 @@ up.Layer.Cover = (_a = class Cover extends up.Layer.OverlayWithViewport {
 
 
 /***/ }),
-/* 57 */
+/* 56 */
 /***/ (() => {
 
 const u = up.util;
@@ -4954,7 +4937,7 @@ up.LayerLookup = class LayerLookup {
 
 
 /***/ }),
-/* 58 */
+/* 57 */
 /***/ (() => {
 
 const u = up.util;
@@ -5067,7 +5050,7 @@ up.LayerStack = class LayerStack extends Array {
 
 
 /***/ }),
-/* 59 */
+/* 58 */
 /***/ (() => {
 
 up.LinkFeedbackURLs = class LinkFeedbackURLs {
@@ -5098,7 +5081,7 @@ up.LinkFeedbackURLs = class LinkFeedbackURLs {
 
 
 /***/ }),
-/* 60 */
+/* 59 */
 /***/ (() => {
 
 const u = up.util;
@@ -5168,7 +5151,7 @@ up.LinkPreloader = class LinkPreloader {
 
 
 /***/ }),
-/* 61 */
+/* 60 */
 /***/ (function() {
 
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -5277,7 +5260,7 @@ up.MotionController = class MotionController {
 
 
 /***/ }),
-/* 62 */
+/* 61 */
 /***/ (() => {
 
 const u = up.util;
@@ -5369,7 +5352,7 @@ up.NonceableCallback = class NonceableCallback {
 
 
 /***/ }),
-/* 63 */
+/* 62 */
 /***/ (() => {
 
 const u = up.util;
@@ -5447,7 +5430,7 @@ up.OptionsParser = class OptionsParser {
 
 
 /***/ }),
-/* 64 */
+/* 63 */
 /***/ (() => {
 
 const e = up.element;
@@ -5515,7 +5498,7 @@ up.OverlayFocus = class OverlayFocus {
 
 
 /***/ }),
-/* 65 */
+/* 64 */
 /***/ (() => {
 
 const u = up.util;
@@ -5746,7 +5729,7 @@ up.Params = class Params {
 
 
 /***/ }),
-/* 66 */
+/* 65 */
 /***/ (() => {
 
 const e = up.element;
@@ -5796,7 +5779,7 @@ up.ProgressBar = class ProgressBar {
 
 
 /***/ }),
-/* 67 */
+/* 66 */
 /***/ (() => {
 
 const u = up.util;
@@ -5913,7 +5896,7 @@ up.RenderOptions = (function () {
 
 
 /***/ }),
-/* 68 */
+/* 67 */
 /***/ (() => {
 
 up.RenderResult = class RenderResult extends up.Record {
@@ -5941,7 +5924,7 @@ up.RenderResult = class RenderResult extends up.Record {
 
 
 /***/ }),
-/* 69 */
+/* 68 */
 /***/ (() => {
 
 var _a;
@@ -5966,6 +5949,7 @@ up.Request = (_a = class Request extends up.Record {
             }
             this.deferred = u.newDeferred();
             (_a = this.badResponseTime) !== null && _a !== void 0 ? _a : (this.badResponseTime = u.evalOption(up.network.config.badResponseTime, this));
+            this.uid = u.uid();
         }
         keys() {
             return [
@@ -6028,9 +6012,6 @@ up.Request = (_a = class Request extends up.Record {
             var _a;
             return (_a = this.fragments) === null || _a === void 0 ? void 0 : _a[0];
         }
-        followState(sourceRequest) {
-            u.delegate(this, ['deferred', 'state', 'preload', 'expired'], () => sourceRequest);
-        }
         normalizeForCaching() {
             this.method = u.normalizeMethod(this.method);
             this.extractHashFromURL();
@@ -6074,10 +6055,12 @@ up.Request = (_a = class Request extends up.Record {
         }
         runQueuedCallbacks() {
             var _a;
+            this.queuedAt = new Date();
             u.always(this, () => this.evictExpensiveAttrs());
             (_a = this.onQueued) === null || _a === void 0 ? void 0 : _a.call(this, this);
         }
         load() {
+            console.debug("[request] calling load() on %o", this.description);
             if (this.state !== 'new')
                 return;
             this.state = 'loading';
@@ -6131,14 +6114,18 @@ up.Request = (_a = class Request extends up.Record {
             this.emit('up:request:offline', { log: message });
         }
         respondWith(response) {
-            if (this.state !== 'loading')
+            this.response = response;
+            console.debug("[request] respondWith() at state %o / uid %o", this.state, this.uid);
+            if (this.isSettled())
                 return;
             this.state = 'loaded';
             if (response.ok) {
-                return this.deferred.resolve(response);
+                console.debug("[request] fulfilling deferred of %o with response", this.uid);
+                this.deferred.resolve(response);
             }
             else {
-                return this.deferred.reject(response);
+                console.debug("[request] rejecting deferred of %o with response", this.uid);
+                this.deferred.reject(response);
             }
         }
         isSettled() {
@@ -6189,24 +6176,6 @@ up.Request = (_a = class Request extends up.Record {
             }
             return new up.Response(responseAttrs);
         }
-        cacheKey() {
-            return JSON.stringify([
-                this.method,
-                this.url,
-                this.params.toQuery(),
-                this.metaProps()
-            ]);
-        }
-        metaProps() {
-            const props = {};
-            for (let key of u.evalOption(up.network.config.requestMetaKeys, this)) {
-                const value = this[key];
-                if (u.isGiven(value)) {
-                    props[key] = value;
-                }
-            }
-            return props;
-        }
         buildEventEmitter(args) {
             return up.EventEmitter.fromEmitArgs(args, {
                 layer: this.layer,
@@ -6236,6 +6205,9 @@ up.Request = (_a = class Request extends up.Record {
             const now = new Date();
             return now - this.queuedAt;
         }
+        header(name) {
+            return this.headers[name];
+        }
         static tester(condition, { except } = {}) {
             let testFn;
             if (u.isFunction(condition)) {
@@ -6252,8 +6224,7 @@ up.Request = (_a = class Request extends up.Record {
                 testFn = (_request) => condition;
             }
             if (except) {
-                let exceptCacheKey = except.cacheKey();
-                return (request) => (request.cacheKey() !== exceptCacheKey) && testFn(request);
+                return (request) => !up.cache.isCacheCompatible(except, request) && testFn(request);
             }
             else {
                 return testFn;
@@ -6267,7 +6238,7 @@ up.Request = (_a = class Request extends up.Record {
 
 
 /***/ }),
-/* 70 */
+/* 69 */
 /***/ (() => {
 
 let u = up.util;
@@ -6298,6 +6269,151 @@ up.Request.Cache = class Cache extends up.Cache {
 };
 
 
+/***/ }),
+/* 70 */
+/***/ (function() {
+
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+const u = up.util;
+up.Request.Cache3 = class Cache3 {
+    constructor() {
+        this.reset();
+    }
+    reset() {
+        this.varyInfo = {};
+        this.map = new Map();
+    }
+    cacheKey(request) {
+        let varyHeaderNames = this.getPreviousVaryHeaderNames(request);
+        let varyPart = u.flatMap(varyHeaderNames, (headerName) => [headerName, request.header(headerName)]);
+        return [request.description, ...varyPart].join(':');
+    }
+    getPreviousVaryHeaderNames(request) {
+        var _a, _b;
+        return ((_a = this.varyInfo)[_b = request.description] || (_a[_b] = new Set()));
+    }
+    get(request) {
+        console.debug("[cache] get() called with %o", request.description);
+        let cacheKey = this.cacheKey(request);
+        let cachedRequest = this.map.get(cacheKey);
+        console.debug("[cache] cache hit is %o", cachedRequest);
+        if (cachedRequest) {
+            if (this.isUsable(cachedRequest)) {
+                return cachedRequest;
+            }
+            else {
+                this.map.delete(cacheKey);
+            }
+        }
+    }
+    get maxSize() {
+        return up.network.config.cacheSize;
+    }
+    isUsable(request) {
+        const evictAge = up.network.config.cacheEvictAge;
+        const age = new Date() - request.queuedAt;
+        return age < evictAge;
+    }
+    put(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            console.debug("[cache] put() called for %o", request.description);
+            this.makeRoom();
+            let cacheKey = this.updateCacheKey(request);
+            this.map.set(cacheKey, request);
+        });
+    }
+    updateCacheKey(request) {
+        let oldCacheKey = this.cacheKey(request);
+        let { response } = request;
+        if (response) {
+            this.mergePreviousHeaderNames(request, response);
+            let newCacheKey = this.cacheKey(request);
+            this.renameMapKey(oldCacheKey, newCacheKey);
+            return newCacheKey;
+        }
+        else {
+            return oldCacheKey;
+        }
+    }
+    renameMapKey(oldKey, newKey) {
+        if (this.map.has(oldKey)) {
+            this.map.set(newKey, this.map.get(oldKey));
+            this.map.delete(oldKey);
+        }
+    }
+    mergePreviousHeaderNames(request, response) {
+        let responseVaryHeaderNames = response.ownVaryHeaderNames;
+        if (responseVaryHeaderNames.length) {
+            let previousVaryHeaderNames = this.getPreviousVaryHeaderNames(request);
+            for (let varyHeaderName of responseVaryHeaderNames) {
+                previousVaryHeaderNames.add(varyHeaderName);
+            }
+        }
+    }
+    alias(existingCachedRequest, newRequest) {
+        this.connect(existingCachedRequest, newRequest, { force: true });
+        this.put(newRequest);
+    }
+    connect(existingCachedRequest, newRequest, options = {}) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            let value = yield u.always(existingCachedRequest);
+            if (value instanceof up.Response) {
+                console.debug("[cache] connect settles to response %o", value.text);
+                if (options.force || this.isCacheCompatible(existingCachedRequest, newRequest)) {
+                    console.debug("[cache] they are compatible");
+                    newRequest.fromCache = true;
+                    newRequest.respondWith(value);
+                    u.delegate(newRequest, ['expired', 'state'], () => existingCachedRequest);
+                }
+                else {
+                    console.debug("[cache] they are incompatible");
+                    (_a = options.onIncompatible) === null || _a === void 0 ? void 0 : _a.call(options, newRequest);
+                }
+            }
+            else {
+                newRequest.deferred.reject(value);
+            }
+        });
+    }
+    delete(request) {
+        let cacheKey = this.cacheKey(request);
+        this.map.delete(cacheKey);
+    }
+    evict(condition = true, testerOptions) {
+        this.eachMatch(condition, testerOptions, (request) => this.delete(request));
+    }
+    expire(condition = true, testerOptions) {
+        this.eachMatch(condition, testerOptions, (request) => request.expired = true);
+    }
+    makeRoom() {
+        if (this.maxSize === 0) {
+            throw "Disabling the cache with maxSize 0 is no longer supported. Use up.network.config.autoCache = false instead.";
+        }
+        while (this.map.size >= this.maxSize) {
+            let oldestKey = this.map.keys().next().value;
+            this.map.delete(oldestKey);
+        }
+    }
+    eachMatch(condition = true, testerOptions, fn) {
+        let tester = up.Request.tester(condition, testerOptions);
+        let results = u.filter(this.map.values(), tester);
+        u.each(results, fn);
+    }
+    isCacheCompatible(request1, request2) {
+        return this.cacheKey(request1) === this.cacheKey(request2);
+    }
+};
+
+
 /***/ }),
 /* 71 */
 /***/ (() => {
@@ -6318,7 +6434,6 @@ up.Request.Queue = class Queue {
     asap(request) {
         request.runQueuedCallbacks();
         u.always(request, responseOrError => this.onRequestSettled(request, responseOrError));
-        request.queuedAt = new Date();
         this.scheduleSlowTimer(request);
         this.queueRequest(request);
         u.microtask(() => this.poke());
@@ -6471,12 +6586,8 @@ up.Request.XHRRenderer = (_a = class XHRRenderer {
                 xhr.timeout = this.request.timeout;
             }
             xhr.open(this.getMethod(), this.request.url);
-            const metaProps = this.request.metaProps();
-            for (let key in metaProps) {
-                this.addHeader(xhr, up.protocol.headerize(key), metaProps[key]);
-            }
-            for (let header in this.request.headers) {
-                this.addHeader(xhr, header, this.request.headers[header]);
+            for (let key of ['target', 'failTarget', 'mode', 'failMode', 'context', 'failContext']) {
+                this.addHeader(xhr, up.protocol.headerize(key), this.request[key]);
             }
             let csrfHeader, csrfToken;
             if ((csrfHeader = this.request.csrfHeader()) && (csrfToken = this.request.csrfToken())) {
@@ -6487,6 +6598,10 @@ up.Request.XHRRenderer = (_a = class XHRRenderer {
             if (contentType) {
                 this.addHeader(xhr, 'Content-Type', contentType);
             }
+            for (let headerName in this.request.headers) {
+                let headerValue = this.request.headers[headerName];
+                xhr.setRequestHeader(headerName, headerValue);
+            }
             Object.assign(xhr, handlers);
             xhr.send(this.getPayload());
         }
@@ -6507,11 +6622,11 @@ up.Request.XHRRenderer = (_a = class XHRRenderer {
             this.finalizePayload();
             return this.payload;
         }
-        addHeader(xhr, header, value) {
+        addHeader(xhr, name, value) {
             if (u.isOptions(value) || u.isArray(value)) {
-                value = JSON.stringify(value);
+                value = u.safeStringifyJSON(value);
             }
-            xhr.setRequestHeader(header, value);
+            this.request.headers[name] = value;
         }
         finalizePayload() {
             this.payload = this.request.payload;
@@ -6579,6 +6694,11 @@ up.Response = class Response extends up.Record {
         var _a;
         return this.headers[name] || ((_a = this.xhr) === null || _a === void 0 ? void 0 : _a.getResponseHeader(name));
     }
+    get ownVaryHeaderNames() {
+        let varyHeaderValue = this.header('Vary');
+        let varyHeaderNames = u.parseTokens(varyHeaderValue, { separator: 'comma' });
+        return u.filter(varyHeaderNames, (headerName) => this.request.header(headerName));
+    }
     get contentType() {
         return this.header('Content-Type');
     }
@@ -6620,12 +6740,13 @@ const u = up.util;
 const e = up.element;
 up.ResponseDoc = (_a = class ResponseDoc {
         constructor(options) {
-            this.noscriptWrapper = new up.HTMLWrapper('noscript');
-            this.scriptWrapper = new up.HTMLWrapper('script');
             this.root =
                 this.parseDocument(options) ||
                     this.parseFragment(options) ||
                     this.parseContent(options);
+            if (!up.fragment.config.runScripts) {
+                this.root.querySelectorAll('script').forEach((e) => e.remove());
+            }
             this.cspNonces = options.cspNonces;
             if (options.origin) {
                 let originSelector = up.fragment.tryToTarget(options.origin);
@@ -6635,7 +6756,11 @@ up.ResponseDoc = (_a = class ResponseDoc {
             }
         }
         parseDocument(options) {
-            return this.parse(options.document, e.createDocumentFromHTML);
+            let document = this.parse(options.document, e.createBrokenDocumentFromHTML);
+            if (document) {
+                this.scriptishNeedFix = true;
+                return document;
+            }
         }
         parseContent(options) {
             let content = options.content || '';
@@ -6643,7 +6768,6 @@ up.ResponseDoc = (_a = class ResponseDoc {
             target = u.map(up.fragment.parseTargetSteps(target), 'selector').join(',');
             const matchingElement = e.createFromSelector(target);
             if (u.isString(content)) {
-                content = this.wrapHTML(content);
                 matchingElement.innerHTML = content;
             }
             else {
@@ -6656,7 +6780,6 @@ up.ResponseDoc = (_a = class ResponseDoc {
         }
         parse(value, parseFn = e.createFromHTML) {
             if (u.isString(value)) {
-                value = this.wrapHTML(value);
                 value = parseFn(value);
             }
             return value;
@@ -6664,19 +6787,9 @@ up.ResponseDoc = (_a = class ResponseDoc {
         rootSelector() {
             return up.fragment.toTarget(this.root);
         }
-        wrapHTML(html) {
-            html = this.noscriptWrapper.wrap(html);
-            if (up.fragment.config.runScripts) {
-                html = this.scriptWrapper.wrap(html);
-            }
-            else {
-                html = this.scriptWrapper.strip(html);
-            }
-            return html;
-        }
         getTitle() {
             var _a;
-            return (_a = this.root.querySelector("head title")) === null || _a === void 0 ? void 0 : _a.textContent;
+            return (_a = this.root.querySelector('head title')) === null || _a === void 0 ? void 0 : _a.textContent;
         }
         select(selector) {
             let finder = new up.FragmentFinder({
@@ -6687,9 +6800,10 @@ up.ResponseDoc = (_a = class ResponseDoc {
             return finder.find();
         }
         finalizeElement(element) {
-            this.noscriptWrapper.unwrap(element);
             up.NonceableCallback.adoptNonces(element, this.cspNonces);
-            this.scriptWrapper.unwrap(element);
+            if (this.scriptishNeedFix) {
+                element.querySelectorAll('noscript, script').forEach(e.fixScriptish);
+            }
         }
     },
     (() => {
@@ -7277,7 +7391,8 @@ up.protocol = (function () {
         return extractHeader(xhr, 'location') || xhr.responseURL;
     }
     function titleFromXHR(xhr) {
-        return extractHeader(xhr, 'title');
+        var _a, _b, _c;
+        return (_c = (_b = (_a = up.migrate).titleFromXHR) === null || _b === void 0 ? void 0 : _b.call(_a, xhr)) !== null && _c !== void 0 ? _c : extractHeader(xhr, 'title', JSON.parse);
     }
     function targetFromXHR(xhr) {
         return extractHeader(xhr, 'target');
@@ -8877,25 +8992,24 @@ up.network = (function () {
         autoCache(request) { return request.isSafe(); },
         expireCache(request, _response) { return !request.isSafe(); },
         evictCache: false,
-        requestMetaKeys: ['target', 'failTarget', 'mode', 'failMode', 'context', 'failContext'],
         progressBar: true,
         timeout: 90000,
     }));
     const queue = new up.Request.Queue();
-    const cache = new up.Request.Cache();
+    const cache = new up.Request.Cache3();
     let progressBar = null;
     function reset() {
         abortRequests();
         queue.reset();
         config.reset();
-        cache.evict();
+        cache.reset();
         progressBar === null || progressBar === void 0 ? void 0 : progressBar.destroy();
         progressBar = null;
     }
     function makeRequest(...args) {
         const options = parseRequestOptions(args);
         const request = new up.Request(options);
-        useCachedRequest(request) || queueRequest(request);
+        processRequest(request);
         return request;
     }
     function parseRequestOptions(args) {
@@ -8907,31 +9021,30 @@ up.network = (function () {
         (_b = (_a = up.migrate).handleRequestOptions) === null || _b === void 0 ? void 0 : _b.call(_a, options);
         return options;
     }
-    function useCachedRequest(request) {
+    function processRequest(request) {
+        useCachedRequest(request) || queueRequest(request);
+    }
+    function useCachedRequest(newRequest) {
         let cachedRequest;
-        if (request.willCache() && (cachedRequest = cache.get(request))) {
-            up.puts('up.request()', 'Re-using previous request to %s %s', request.method, request.url);
-            if (!request.preload) {
+        if (newRequest.willCache() && (cachedRequest = cache.get(newRequest))) {
+            up.puts('up.request()', 'Re-using previous request to %s %s', newRequest.method, newRequest.url);
+            if (!newRequest.background) {
                 queue.promoteToForeground(cachedRequest);
             }
-            request.followState(cachedRequest);
-            request.fromCache = true;
+            cache.connect(cachedRequest, newRequest, { onIncompatible: processRequest });
             return true;
         }
     }
     function queueRequest(request) {
-        if (request.preload && !request.isSafe()) {
-            up.fail('Will not preload request to %s', request.description);
-        }
         handleCaching(request);
         queue.asap(request);
         return true;
     }
     function handleCaching(request) {
         if (request.willCache()) {
-            cache.set(request, request);
+            cache.put(request);
         }
-        return u.always(request, function (response) {
+        u.always(request, function (response) {
             var _a, _b, _c, _d;
             let expireCache = (_b = (_a = response.expireCache) !== null && _a !== void 0 ? _a : request.expireCache) !== null && _b !== void 0 ? _b : u.evalOption(config.expireCache, request, response);
             if (expireCache) {
@@ -8942,7 +9055,7 @@ up.network = (function () {
                 cache.evict(evictCache, { except: request });
             }
             if (cache.get(request)) {
-                cache.set(request, request);
+                cache.put(request);
             }
             if (!response.ok) {
                 cache.evict(request);
@@ -9425,16 +9538,22 @@ up.link = (function () {
     }
     function preload(link, options) {
         link = up.fragment.get(link);
-        if (!shouldPreload()) {
-            return Promise.reject(new up.Error('Link preloading is disabled'));
+        let issue = preloadIssue(link);
+        if (issue) {
+            return Promise.reject(new up.Error(issue));
         }
         const guardEvent = up.event.build('up:link:preload', { log: ['Preloading link %o', link] });
         return follow(link, Object.assign(Object.assign({ abortable: false }, options), { guardEvent, preload: true }));
     }
-    function shouldPreload() {
-        let goodConnection = u.negate(up.network.shouldReduceRequests);
-        return u.evalAutoOption(config.preloadEnabled, goodConnection);
+    function preloadIssue(link) {
+        if (!u.evalAutoOption(config.preloadEnabled, autoPreloadEnabled, link)) {
+            return 'Preloading is disabled';
+        }
+        else if (!isSafe(link)) {
+            return 'Will not preload an unsafe link';
+        }
     }
+    const autoPreloadEnabled = u.negate(up.network.shouldReduceRequests);
     function followMethod(link, options = {}) {
         return u.normalizeMethod(options.method || link.getAttribute('up-method') || link.getAttribute('data-method'));
     }

data/lib/unpoly/rails/request_echo_headers.rb

@@ -18,9 +18,13 @@ module Unpoly
       end
 
       private
-      
+
       def set_up_request_echo_headers
-        response.headers['X-Up-Location'] = up.request_url_without_up_params
+        request_url_without_up_params = up.request_url_without_up_params
+        unless request_url_without_up_params == request.original_url
+          response.headers['X-Up-Location'] = up.request_url_without_up_params
+        end
+
         response.headers['X-Up-Method'] = request.method
       end
 

data/lib/unpoly/rails/version.rb

@@ -4,6 +4,6 @@ module Unpoly
     # The current version of the unpoly-rails gem.
     # This version number is also used for releases of the Unpoly
     # frontend code.
-    VERSION = '2.7.2.1'
+    VERSION = '2.7.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unpoly-rails
 version: !ruby/object:Gem::Version
-  version: 2.7.2.1
+  version: 2.7.2.2
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties