unpoly-rails 3.0.0.rc1 → 3.0.0.rc3

data/assets/unpoly/unpoly.js

@@ -5,7 +5,7 @@
 /***/ (() => {
 
 window.up = {
-    version: '3.0.0-rc1'
+    version: '3.0.0-rc3'
 };
 
 
@@ -14,13 +14,18 @@ window.up = {
 /***/ (() => {
 
 up.mockable = function (originalFn) {
-    let spy;
-    const mockableFn = function () {
-        return (spy || originalFn).apply(null, arguments);
-    };
-    mockableFn.mock = () => spy = jasmine.createSpy('mockable', originalFn);
-    document.addEventListener('up:framework:reset', () => spy = null);
-    return mockableFn;
+    if (window.jasmine) {
+        let name = originalFn.name;
+        let obj = { [name]: originalFn };
+        let mockableFn = function () {
+            return obj[name].apply(this, arguments);
+        };
+        mockableFn.mock = () => spyOn(obj, name);
+        return mockableFn;
+    }
+    else {
+        return originalFn;
+    }
 };
 
 
@@ -106,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;
     }
@@ -126,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) {
@@ -303,10 +309,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;
             }
@@ -315,8 +322,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;
             }
@@ -488,7 +496,7 @@ up.util = (function () {
     function flatMap(array, block) {
         return flatten(map(array, block));
     }
-    function always(promise, callback) {
+    function always(promise, callback = identity) {
         return promise.then(callback, callback);
     }
     function newDeferred() {
@@ -590,7 +598,7 @@ up.util = (function () {
         Object.defineProperty(object, prop, { get });
     }
     function defineDelegates(object, props, targetProvider) {
-        wrapList(props).forEach(function (prop) {
+        for (let prop of props) {
             Object.defineProperty(object, prop, {
                 get() {
                     const target = targetProvider.call(this);
@@ -605,7 +613,7 @@ up.util = (function () {
                     target[prop] = newValue;
                 }
             });
-        });
+        }
     }
     function stringifyArg(arg) {
         let string;
@@ -700,6 +708,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,
@@ -795,7 +811,8 @@ up.util = (function () {
         sprintf,
         renameKeys,
         negate,
-        memoizeMethod
+        memoizeMethod,
+        safeStringifyJSON,
     };
 })();
 
@@ -869,12 +886,6 @@ up.browser = (function () {
             return value;
         }
     }
-    const getJQuery = function () {
-        if (!canJQuery()) {
-            up.fail('jQuery must be published as window.jQuery');
-        }
-        return jQuery;
-    };
     function assertConfirmed(options) {
         const confirmed = !options.confirm || window.confirm(options.confirm);
         if (!confirmed) {
@@ -889,7 +900,6 @@ up.browser = (function () {
         canEval,
         assertConfirmed,
         popCookie,
-        get jQuery() { return getJQuery(); },
     };
 })();
 
@@ -1161,9 +1171,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);
@@ -1425,7 +1443,8 @@ up.element = (function () {
         isSingleton,
         attrSelector,
         tagName: elementTagName,
-        createDocumentFromHTML,
+        createBrokenDocumentFromHTML,
+        fixScriptish,
         createFromHTML,
         get root() { return getRoot(); },
         paint,
@@ -1625,82 +1644,26 @@ up.LogConfig = class LogConfig extends up.Config {
 /***/ (() => {
 
 const u = up.util;
-up.Cache = class Cache {
-    constructor(config = {}) {
-        this.config = config;
+up.FIFOCache = class FIFOCache {
+    constructor({ capacity = 10, normalizeKey = u.identity } = {}) {
         this.map = new Map();
+        this.capacity = capacity;
+        this.normalizeKey = normalizeKey;
     }
-    size() {
-        return this.map.size;
-    }
-    maxSize() {
-        return u.evalOption(this.config.size);
-    }
-    evictAge() {
-        return u.evalOption(this.config.evictAge);
-    }
-    normalizeStoreKey(key) {
-        return key;
-    }
-    isDisabled() {
-        return this.maxSize() === 0 || this.evictAge() === 0;
-    }
-    evict() {
-        this.map.clear();
-    }
-    records() {
-        return this.map.values();
-    }
-    makeRoomForAnotherRecord() {
-        const maxSize = this.maxSize();
-        const currentSize = this.size();
-        if (!maxSize || currentSize < maxSize)
-            return;
-        let records = Array.from(this.records());
-        records.sort((a, b) => b.createdAt - a.createdAt);
-        const overflow = currentSize - maxSize + 1;
-        for (let i = 0; i < overflow; i++) {
-            let key = records.pop().key;
-            this.map.delete(key);
-        }
-    }
-    alias(oldKey, newKey) {
-        const value = this.get(oldKey);
-        if (u.isDefined(value)) {
-            this.set(newKey, value);
-        }
+    get(key) {
+        key = this.normalizeKey(key);
+        return this.map.get(key);
     }
     set(key, value) {
-        if (this.isDisabled())
-            return;
-        this.makeRoomForAnotherRecord();
-        key = this.normalizeStoreKey(key);
-        const createdAt = new Date();
-        const record = { key, value, createdAt };
-        this.map.set(key, record);
-    }
-    remove(key) {
-        key = this.normalizeStoreKey(key);
-        this.map.delete(key);
-    }
-    isUsable(record) {
-        const evictAge = this.evictAge();
-        if (!evictAge)
-            return true;
-        const age = new Date() - record.createdAt;
-        return age < evictAge;
-    }
-    get(key) {
-        const storeKey = this.normalizeStoreKey(key);
-        let record = this.map.get(storeKey);
-        if (record) {
-            if (this.isUsable(record)) {
-                return record.value;
-            }
-            else {
-                this.remove(key);
-            }
+        if (this.map.size === this.capacity) {
+            let oldestKey = this.map.keys().next().value;
+            this.map.delete(oldestKey);
         }
+        key = this.normalizeKey(key);
+        this.map.set(key, value);
+    }
+    clear() {
+        this.map.clear();
     }
 };
 
@@ -1874,7 +1837,7 @@ up.Change.Addition = class Addition extends up.Change {
     setETag({ newElement, etag }) {
         e.setMissingAttr(newElement, 'up-etag', etag || false);
     }
-    setMeta(options) {
+    setReloadAttrs(options) {
         this.setSource(options);
         this.setTime(options);
         this.setETag(options);
@@ -2082,9 +2045,9 @@ up.Change.OpenLayer = class OpenLayer extends up.Change.Addition {
         this.layer.createElements(this.content);
         this.layer.setupHandlers();
         this.handleHistory();
-        this.setMeta({ newElement: this.content, source: this.options.source });
+        this.setReloadAttrs({ newElement: this.content, source: this.options.source });
         responseDoc.finalizeElement(this.content);
-        up.hello(this.layer.element, { layer: this.layer, origin: this.origin });
+        up.hello(this.layer.element, { ...this.options, layer: this.layer });
         this.handleLayerChangeRequests();
         this.handleScroll();
         let renderResult = new up.RenderResult({
@@ -2244,7 +2207,7 @@ up.Change.UpdateLayer = (_a = class UpdateLayer extends up.Change.Addition {
             this.renderResult.fragments.unshift(...newFragments);
         }
         executeStep(step) {
-            this.setMeta(step);
+            this.setReloadAttrs(step);
             switch (step.placement) {
                 case 'swap': {
                     let keepPlan = this.findKeepPlan(step);
@@ -2749,19 +2712,12 @@ up.Change.FromURL = (_a = class FromURL extends up.Change {
         }
         onRequestSettledWithResponse(response) {
             this.response = response;
-            const expiredResponse = this.options.expiredResponse;
-            const eventProps = {
-                response: this.response,
-                renderOptions: this.options,
-                revalidating: !!expiredResponse,
-                expiredResponse,
-            };
-            if (up.fragment.config.skipResponse(eventProps)) {
+            if (up.fragment.config.skipResponse(this.loadedEventProps())) {
                 this.skip();
             }
             else {
                 this.request.assertEmitted('up:fragment:loaded', {
-                    ...eventProps,
+                    ...this.loadedEventProps(),
                     callback: this.options.onLoaded,
                     log: ['Loaded fragment from %s', this.response.description],
                     skip: () => this.skip()
@@ -2773,6 +2729,22 @@ up.Change.FromURL = (_a = class FromURL extends up.Change {
             }
             return this.updateContentFromResponse(this.options);
         }
+        compilerPassMeta() {
+            return u.pick(this.loadedEventProps(), [
+                'revalidating',
+                'response'
+            ]);
+        }
+        loadedEventProps() {
+            const { expiredResponse } = this.options;
+            return {
+                request: this.request,
+                response: this.response,
+                renderOptions: this.options,
+                revalidating: !!expiredResponse,
+                expiredResponse,
+            };
+        }
         onRequestSettledWithError(error) {
             if (error instanceof up.Offline) {
                 this.request.emit('up:fragment:offline', {
@@ -2795,6 +2767,7 @@ up.Change.FromURL = (_a = class FromURL extends up.Change {
                 up.puts('up.render()', 'Rendering failed response using fail-prefixed options (https://unpoly.com/failed-responses)');
             }
             this.augmentOptionsFromResponse(finalRenderOptions);
+            finalRenderOptions.meta = this.compilerPassMeta();
             let result = new up.Change.FromContent(finalRenderOptions).execute();
             result.finished = this.finish(result, finalRenderOptions);
             return result;
@@ -2870,6 +2843,7 @@ up.Change.FromURL = (_a = class FromURL extends up.Change {
     (() => {
         u.memoizeMethod(_a.prototype, [
             'getRequestAttrs',
+            'loadedEventProps',
         ]);
     })(),
     _a);
@@ -2881,12 +2855,14 @@ up.Change.FromURL = (_a = class FromURL extends up.Change {
 
 const u = up.util;
 up.CompilerPass = class CompilerPass {
-    constructor(root, compilers, { layer, data, dataMap } = {}) {
+    constructor(root, compilers, { layer, data, dataMap, meta }) {
+        layer || (layer = up.layer.get(root) || up.layer.current);
         this.root = root;
         this.compilers = compilers;
-        this.layer = layer || up.layer.get(this.root) || up.layer.current;
+        this.layer = layer;
         this.data = data;
         this.dataMap = dataMap;
+        this.meta = { layer, ...meta };
         this.errors = [];
     }
     run() {
@@ -2931,11 +2907,10 @@ up.CompilerPass = class CompilerPass {
         return up.migrate.postCompile?.(matches, compiler);
     }
     compileOneElement(compiler, element) {
-        const elementArg = compiler.jQuery ? up.browser.jQuery(element) : element;
-        const compileArgs = [elementArg];
+        const compileArgs = [element];
         if (compiler.length !== 1) {
             const data = up.syntax.data(element);
-            compileArgs.push(data);
+            compileArgs.push(data, this.meta);
         }
         const result = this.applyCompilerFunction(compiler, element, compileArgs);
         let destructorOrDestructors = this.destructorPresence(result);
@@ -2944,11 +2919,10 @@ up.CompilerPass = class CompilerPass {
         }
     }
     compileBatch(compiler, elements) {
-        const elementsArgs = compiler.jQuery ? up.browser.jQuery(elements) : elements;
-        const compileArgs = [elementsArgs];
+        const compileArgs = [elements];
         if (compiler.length !== 1) {
             const dataList = u.map(elements, up.syntax.data);
-            compileArgs.push(dataList);
+            compileArgs.push(dataList, this.meta);
         }
         const result = this.applyCompilerFunction(compiler, elements, compileArgs);
         if (this.destructorPresence(result)) {
@@ -3250,7 +3224,6 @@ up.EventListener = class EventListener extends up.Record {
             'eventType',
             'selector',
             'callback',
-            'jQuery',
             'guard',
             'baseLayer',
             'passive',
@@ -3297,8 +3270,7 @@ up.EventListener = class EventListener extends up.Record {
             return;
         }
         if (element) {
-            const elementArg = this.jQuery ? up.browser.jQuery(element) : element;
-            const args = [event, elementArg];
+            const args = [event, element];
             const expectedArgCount = this.callback.length;
             if (expectedArgCount !== 1 && expectedArgCount !== 2) {
                 const data = up.syntax.data(element);
@@ -3354,7 +3326,6 @@ up.EventListenerGroup = class EventListenerGroup extends up.Record {
             'eventTypes',
             'selector',
             'callback',
-            'jQuery',
             'guard',
             'baseLayer',
             'passive',
@@ -4092,44 +4063,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 {
@@ -4276,12 +4209,12 @@ up.Layer = class Layer extends up.Record {
         return this.stack.asCurrent(this, fn);
     }
     updateHistory(options) {
-        if (u.isString(options.title)) {
-            this.title = options.title;
-        }
         if (u.isString(options.location)) {
             this.location = options.location;
         }
+        if (u.isString(options.title)) {
+            this.title = options.title;
+        }
     }
     isHistoryVisible() {
         return this.history && (this.isRoot() || this.parent.isHistoryVisible());
@@ -4314,12 +4247,14 @@ up.Layer = class Layer extends up.Record {
     set location(location) {
         const previousLocation = this.location;
         location = up.history.normalizeURL(location);
-        if (previousLocation !== location) {
+        if (previousLocation !== location || this.opening) {
             this.savedLocation = location;
-            this.emit('up:layer:location:changed', { location, log: false });
             if (this.showsLiveHistory()) {
                 up.history.push(location);
             }
+            if (!this.opening) {
+                this.emit('up:layer:location:changed', { location });
+            }
         }
     }
     selector(part) {
@@ -4341,11 +4276,14 @@ up.Layer = class Layer extends up.Record {
         let focusedElement = document.activeElement;
         return focusedElement !== document.body && this.element.contains(focusedElement);
     }
+    reset() {
+        Object.assign(this, this.defaults());
+    }
 };
 
 
 /***/ }),
-/* 49 */
+/* 48 */
 /***/ (() => {
 
 const e = up.element;
@@ -4620,7 +4558,7 @@ up.Layer.Overlay = class Overlay extends up.Layer {
 
 
 /***/ }),
-/* 50 */
+/* 49 */
 /***/ (() => {
 
 up.Layer.OverlayWithTether = class OverlayWithTether extends up.Layer.Overlay {
@@ -4657,7 +4595,7 @@ up.Layer.OverlayWithTether = class OverlayWithTether extends up.Layer.Overlay {
 
 
 /***/ }),
-/* 51 */
+/* 50 */
 /***/ (() => {
 
 var _a;
@@ -4695,7 +4633,7 @@ up.Layer.OverlayWithViewport = (_a = class OverlayWithViewport extends up.Layer.
 
 
 /***/ }),
-/* 52 */
+/* 51 */
 /***/ (() => {
 
 var _a;
@@ -4732,9 +4670,6 @@ up.Layer.Root = (_a = class Root extends up.Layer {
         cannotCloseRoot() {
             up.fail('Cannot close the root layer');
         }
-        reset() {
-            Object.assign(this, this.defaults());
-        }
         toString() {
             return "root layer";
         }
@@ -4744,7 +4679,7 @@ up.Layer.Root = (_a = class Root extends up.Layer {
 
 
 /***/ }),
-/* 53 */
+/* 52 */
 /***/ (() => {
 
 var _a;
@@ -4755,7 +4690,7 @@ up.Layer.Modal = (_a = class Modal extends up.Layer.OverlayWithViewport {
 
 
 /***/ }),
-/* 54 */
+/* 53 */
 /***/ (() => {
 
 var _a;
@@ -4766,7 +4701,7 @@ up.Layer.Popup = (_a = class Popup extends up.Layer.OverlayWithTether {
 
 
 /***/ }),
-/* 55 */
+/* 54 */
 /***/ (() => {
 
 var _a;
@@ -4777,7 +4712,7 @@ up.Layer.Drawer = (_a = class Drawer extends up.Layer.OverlayWithViewport {
 
 
 /***/ }),
-/* 56 */
+/* 55 */
 /***/ (() => {
 
 var _a;
@@ -4788,7 +4723,7 @@ up.Layer.Cover = (_a = class Cover extends up.Layer.OverlayWithViewport {
 
 
 /***/ }),
-/* 57 */
+/* 56 */
 /***/ (() => {
 
 const u = up.util;
@@ -4878,7 +4813,7 @@ up.LayerLookup = class LayerLookup {
 
 
 /***/ }),
-/* 58 */
+/* 57 */
 /***/ (() => {
 
 const u = up.util;
@@ -4991,7 +4926,7 @@ up.LayerStack = class LayerStack extends Array {
 
 
 /***/ }),
-/* 59 */
+/* 58 */
 /***/ (() => {
 
 up.LinkFeedbackURLs = class LinkFeedbackURLs {
@@ -5022,7 +4957,7 @@ up.LinkFeedbackURLs = class LinkFeedbackURLs {
 
 
 /***/ }),
-/* 60 */
+/* 59 */
 /***/ (() => {
 
 const u = up.util;
@@ -5090,7 +5025,7 @@ up.LinkPreloader = class LinkPreloader {
 
 
 /***/ }),
-/* 61 */
+/* 60 */
 /***/ (() => {
 
 const u = up.util;
@@ -5186,7 +5121,7 @@ up.MotionController = class MotionController {
 
 
 /***/ }),
-/* 62 */
+/* 61 */
 /***/ (() => {
 
 const u = up.util;
@@ -5278,7 +5213,7 @@ up.NonceableCallback = class NonceableCallback {
 
 
 /***/ }),
-/* 63 */
+/* 62 */
 /***/ (() => {
 
 const u = up.util;
@@ -5355,7 +5290,7 @@ up.OptionsParser = class OptionsParser {
 
 
 /***/ }),
-/* 64 */
+/* 63 */
 /***/ (() => {
 
 const e = up.element;
@@ -5423,7 +5358,7 @@ up.OverlayFocus = class OverlayFocus {
 
 
 /***/ }),
-/* 65 */
+/* 64 */
 /***/ (() => {
 
 const u = up.util;
@@ -5654,7 +5589,7 @@ up.Params = class Params {
 
 
 /***/ }),
-/* 66 */
+/* 65 */
 /***/ (() => {
 
 const e = up.element;
@@ -5704,7 +5639,7 @@ up.ProgressBar = class ProgressBar {
 
 
 /***/ }),
-/* 67 */
+/* 66 */
 /***/ (() => {
 
 const u = up.util;
@@ -5750,7 +5685,7 @@ up.RenderOptions = (function () {
         'history',
         'source',
         'saveScroll',
-        'navigate'
+        'navigate',
     ]);
     const CONTENT_KEYS = [
         'url',
@@ -5828,7 +5763,7 @@ up.RenderOptions = (function () {
 
 
 /***/ }),
-/* 68 */
+/* 67 */
 /***/ (() => {
 
 up.RenderResult = class RenderResult extends up.Record {
@@ -5856,7 +5791,7 @@ up.RenderResult = class RenderResult extends up.Record {
 
 
 /***/ }),
-/* 69 */
+/* 68 */
 /***/ (() => {
 
 var _a;
@@ -5868,7 +5803,7 @@ up.Request = (_a = class Request extends up.Record {
             if (this.wrapMethod == null) {
                 this.wrapMethod = up.network.config.wrapMethod;
             }
-            this.normalizeForCaching();
+            this.normalize();
             if ((this.target || this.layer || this.origin) && !options.basic) {
                 const layerLookupOptions = { origin: this.origin };
                 this.layer = up.layer.get(this.layer, layerLookupOptions);
@@ -5880,6 +5815,7 @@ up.Request = (_a = class Request extends up.Record {
             }
             this.deferred = u.newDeferred();
             this.badResponseTime ?? (this.badResponseTime = u.evalOption(up.network.config.badResponseTime, this));
+            this.addAutoHeaders();
         }
         keys() {
             return [
@@ -5891,7 +5827,6 @@ up.Request = (_a = class Request extends up.Record {
                 'failTarget',
                 'headers',
                 'timeout',
-                'preload',
                 'background',
                 'cache',
                 'expireCache',
@@ -5904,11 +5839,12 @@ up.Request = (_a = class Request extends up.Record {
                 'failContext',
                 'origin',
                 'fragments',
-                'queuedAt',
+                'builtAt',
                 'wrapMethod',
                 'contentType',
                 'payload',
                 'onQueued',
+                'onLoading',
                 'fail',
                 'abortable',
                 'badResponseTime',
@@ -5919,7 +5855,8 @@ up.Request = (_a = class Request extends up.Record {
                 state: 'new',
                 abortable: true,
                 headers: {},
-                timeout: up.network.config.timeout
+                timeout: up.network.config.timeout,
+                builtAt: new Date(),
             };
         }
         get xhr() {
@@ -5940,10 +5877,7 @@ up.Request = (_a = class Request extends up.Record {
         get fragment() {
             return this.fragments?.[0];
         }
-        followState(sourceRequest) {
-            u.delegate(this, ['deferred', 'state', 'preload', 'expired'], () => sourceRequest);
-        }
-        normalizeForCaching() {
+        normalize() {
             this.method = u.normalizeMethod(this.method);
             this.extractHashFromURL();
             this.transferParamsToURL();
@@ -5990,14 +5924,26 @@ up.Request = (_a = class Request extends up.Record {
         load() {
             if (this.state !== 'new')
                 return;
-            this.state = 'loading';
-            this.expired = false;
-            new up.Request.XHRRenderer(this).buildAndSend({
-                onload: () => this.onXHRLoad(),
-                onerror: () => this.onXHRError(),
-                ontimeout: () => this.onXHRTimeout(),
-                onabort: () => this.onXHRAbort()
-            });
+            if (this.emitLoad()) {
+                this.state = 'loading';
+                this.normalize();
+                this.onLoading?.();
+                this.expired = false;
+                new up.Request.XHRRenderer(this).buildAndSend({
+                    onload: () => this.onXHRLoad(),
+                    onerror: () => this.onXHRError(),
+                    ontimeout: () => this.onXHRTimeout(),
+                    onabort: () => this.onXHRAbort()
+                });
+                return true;
+            }
+            else {
+                this.abort({ reason: 'Prevented by event listener' });
+            }
+        }
+        emitLoad() {
+            let event = this.emit('up:request:load', { log: ['Loading %s', this.description] });
+            return !event.defaultPrevented;
         }
         loadPage() {
             up.network.abort();
@@ -6041,18 +5987,19 @@ up.Request = (_a = class Request extends up.Record {
             this.emit('up:request:offline', { log: message });
         }
         respondWith(response) {
-            if (this.state !== 'loading')
+            this.response = response;
+            if (this.isSettled())
                 return;
             this.state = 'loaded';
             if (response.ok) {
-                return this.deferred.resolve(response);
+                this.deferred.resolve(response);
             }
             else {
-                return this.deferred.reject(response);
+                this.deferred.reject(response);
             }
         }
         isSettled() {
-            return (this.state !== 'new') && (this.state !== 'loading');
+            return (this.state !== 'new') && (this.state !== 'loading') && (this.state !== 'tracking');
         }
         csrfHeader() {
             return up.protocol.csrfHeader();
@@ -6099,24 +6046,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,
@@ -6142,9 +6071,27 @@ up.Request = (_a = class Request extends up.Record {
                 return u.some(subtreeElements, (subtreeElement) => subtreeElement.contains(fragment));
             });
         }
-        get queueAge() {
-            const now = new Date();
-            return now - this.queuedAt;
+        get age() {
+            return new Date() - this.builtAt;
+        }
+        header(name) {
+            return this.headers[name];
+        }
+        addAutoHeaders() {
+            for (let key of ['target', 'failTarget', 'mode', 'failMode', 'context', 'failContext']) {
+                this.addAutoHeader(up.protocol.headerize(key), this[key]);
+            }
+            let csrfHeader, csrfToken;
+            if ((csrfHeader = this.csrfHeader()) && (csrfToken = this.csrfToken())) {
+                this.addAutoHeader(csrfHeader, csrfToken);
+            }
+            this.addAutoHeader(up.protocol.headerize('version'), up.version);
+        }
+        addAutoHeader(name, value) {
+            if (u.isOptions(value) || u.isArray(value)) {
+                value = u.safeStringifyJSON(value);
+            }
+            this.headers[name] = value;
         }
         static tester(condition, { except } = {}) {
             let testFn;
@@ -6162,8 +6109,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.willHaveSameResponse(request, except) && testFn(request);
             }
             else {
                 return testFn;
@@ -6177,39 +6123,144 @@ up.Request = (_a = class Request extends up.Record {
 
 
 /***/ }),
-/* 70 */
+/* 69 */
 /***/ (() => {
 
-let u = up.util;
-up.Request.Cache = class Cache extends up.Cache {
-    maxSize() {
+const u = up.util;
+up.Request.Cache = class Cache {
+    constructor() {
+        this.reset();
+    }
+    reset() {
+        this.varyInfo = {};
+        this.map = new Map();
+    }
+    cacheKey(request) {
+        let influencingHeaders = this.getPreviousInfluencingHeaders(request);
+        let varyPart = u.flatMap(influencingHeaders, (headerName) => [headerName, request.header(headerName)]);
+        return [request.description, ...varyPart].join(':');
+    }
+    getPreviousInfluencingHeaders(request) {
+        var _a, _b;
+        return ((_a = this.varyInfo)[_b = request.description] || (_a[_b] = new Set()));
+    }
+    get(request) {
+        request = this.wrap(request);
+        let cacheKey = this.cacheKey(request);
+        let cachedRequest = this.map.get(cacheKey);
+        if (cachedRequest) {
+            if (this.isUsable(cachedRequest)) {
+                return cachedRequest;
+            }
+            else {
+                this.map.delete(cacheKey);
+            }
+        }
+    }
+    get capacity() {
         return up.network.config.cacheSize;
     }
-    evictAge() {
-        return up.network.config.cacheEvictAge;
+    isUsable(request) {
+        return request.age < up.network.config.cacheEvictAge;
+    }
+    async put(request) {
+        request = this.wrap(request);
+        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 (oldKey !== newKey && this.map.has(oldKey)) {
+            this.map.set(newKey, this.map.get(oldKey));
+            this.map.delete(oldKey);
+        }
+    }
+    mergePreviousHeaderNames(request, response) {
+        let headersInfluencingResponse = response.ownInfluncingHeaders;
+        if (headersInfluencingResponse.length) {
+            let previousInfluencingHeaders = this.getPreviousInfluencingHeaders(request);
+            for (let headerName of headersInfluencingResponse) {
+                previousInfluencingHeaders.add(headerName);
+            }
+        }
+    }
+    alias(existingCachedRequest, newRequest) {
+        existingCachedRequest = this.wrap(existingCachedRequest);
+        newRequest = this.wrap(newRequest);
+        this.track(existingCachedRequest, newRequest, { force: true });
+        this.put(newRequest);
+        return newRequest;
+    }
+    async track(existingRequest, newRequest, options = {}) {
+        newRequest.trackedRequest = existingRequest;
+        newRequest.state = 'tracking';
+        let value = await u.always(existingRequest);
+        if (value instanceof up.Response) {
+            if (options.force || this.isCacheCompatible(existingRequest, newRequest)) {
+                newRequest.fromCache = true;
+                newRequest.respondWith(value);
+                u.delegate(newRequest, ['expired', 'state'], () => existingRequest);
+            }
+            else {
+                delete newRequest.trackedRequest;
+                newRequest.state = 'new';
+                options.onIncompatible?.(newRequest);
+            }
+        }
+        else {
+            newRequest.state = existingRequest.state;
+            newRequest.deferred.reject(value);
+        }
+    }
+    willHaveSameResponse(existingRequest, newRequest) {
+        return existingRequest === newRequest || existingRequest === newRequest.trackedRequest;
     }
-    normalizeStoreKey(request) {
-        return u.wrapValue(up.Request, request).cacheKey();
+    delete(request) {
+        request = this.wrap(request);
+        let cacheKey = this.cacheKey(request);
+        this.map.delete(cacheKey);
     }
     evict(condition = true, testerOptions) {
-        this.eachMatch(condition, testerOptions, ({ key }) => this.map.delete(key));
+        this.eachMatch(condition, testerOptions, (request) => this.delete(request));
     }
     expire(condition = true, testerOptions) {
-        this.eachMatch(condition, testerOptions, ({ value: request }) => request.expired = true);
+        this.eachMatch(condition, testerOptions, (request) => request.expired = true);
+    }
+    makeRoom() {
+        while (this.map.size >= this.capacity) {
+            let oldestKey = this.map.keys().next().value;
+            this.map.delete(oldestKey);
+        }
     }
     eachMatch(condition = true, testerOptions, fn) {
         let tester = up.Request.tester(condition, testerOptions);
-        for (let record of this.records()) {
-            if (tester(record.value)) {
-                fn(record);
-            }
-        }
+        let results = u.filter(this.map.values(), tester);
+        u.each(results, fn);
+    }
+    isCacheCompatible(request1, request2) {
+        return this.cacheKey(request1) === this.cacheKey(request2);
+    }
+    wrap(requestOrOptions) {
+        return u.wrapValue(up.Request, requestOrOptions);
     }
 };
 
 
 /***/ }),
-/* 71 */
+/* 70 */
 /***/ (() => {
 
 const u = up.util;
@@ -6228,7 +6279,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());
@@ -6240,7 +6290,7 @@ up.Request.Queue = class Queue {
         }
     }
     scheduleSlowTimer(request) {
-        let timeUntilLate = Math.max(request.badResponseTime - request.queueAge, 0);
+        let timeUntilLate = Math.max(request.badResponseTime - request.age, 0);
         u.timer(timeUntilLate, () => this.checkLate());
     }
     getMaxConcurrency() {
@@ -6262,13 +6312,8 @@ up.Request.Queue = class Queue {
         return u.remove(this.queuedRequests, request);
     }
     sendRequestNow(request) {
-        if (request.emit('up:request:load', { log: ['Loading %s %s', request.method, request.url] }).defaultPrevented) {
-            request.abort({ reason: 'Prevented by event listener' });
-        }
-        else {
-            request.normalizeForCaching();
+        if (request.load()) {
             this.currentRequests.push(request);
-            request.load();
         }
     }
     onRequestSettled(request, responseOrError) {
@@ -6317,13 +6362,13 @@ up.Request.Queue = class Queue {
     isLate() {
         const allForegroundRequests = u.reject(this.allRequests, 'background');
         const timerTolerance = 1;
-        return u.some(allForegroundRequests, request => request.queueAge >= (request.badResponseTime - timerTolerance));
+        return u.some(allForegroundRequests, (request) => request.age >= (request.badResponseTime - timerTolerance));
     }
 };
 
 
 /***/ }),
-/* 72 */
+/* 71 */
 /***/ (() => {
 
 const u = up.util;
@@ -6362,7 +6407,7 @@ up.Request.FormRenderer = class FormRenderer {
 
 
 /***/ }),
-/* 73 */
+/* 72 */
 /***/ (() => {
 
 var _a;
@@ -6380,21 +6425,13 @@ 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]);
-            }
-            let csrfHeader, csrfToken;
-            if ((csrfHeader = this.request.csrfHeader()) && (csrfToken = this.request.csrfToken())) {
-                this.addHeader(xhr, csrfHeader, csrfToken);
-            }
-            this.addHeader(xhr, up.protocol.headerize('version'), up.version);
             let contentType = this.getContentType();
             if (contentType) {
-                this.addHeader(xhr, 'Content-Type', contentType);
+                xhr.setRequestHeader('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());
@@ -6416,12 +6453,6 @@ up.Request.XHRRenderer = (_a = class XHRRenderer {
             this.finalizePayload();
             return this.payload;
         }
-        addHeader(xhr, header, value) {
-            if (u.isOptions(value) || u.isArray(value)) {
-                value = JSON.stringify(value);
-            }
-            xhr.setRequestHeader(header, value);
-        }
         finalizePayload() {
             this.payload = this.request.payload;
             this.contentType = this.request.contentType;
@@ -6448,7 +6479,7 @@ up.Request.XHRRenderer = (_a = class XHRRenderer {
 
 
 /***/ }),
-/* 74 */
+/* 73 */
 /***/ (() => {
 
 const u = up.util;
@@ -6483,23 +6514,27 @@ up.Response = class Response extends up.Record {
     get ok() {
         return !u.evalOption(this.fail ?? up.network.config.fail, this);
     }
-    getHeader(name) {
+    header(name) {
         return this.headers[name] || this.xhr?.getResponseHeader(name);
     }
+    get ownInfluncingHeaders() {
+        let influencingHeaders = up.protocol.influencingHeadersFromResponse(this);
+        return u.filter(influencingHeaders, (headerName) => this.request.header(headerName));
+    }
     get contentType() {
-        return this.getHeader('Content-Type');
+        return this.header('Content-Type');
     }
     get cspNonces() {
-        return up.protocol.cspNoncesFromHeader(this.getHeader('Content-Security-Policy'));
+        return up.protocol.cspNoncesFromHeader(this.header('Content-Security-Policy'));
     }
     get lastModified() {
-        let header = this.getHeader('Last-Modified');
+        let header = this.header('Last-Modified');
         if (header) {
             return new Date(header);
         }
     }
     get etag() {
-        return this.getHeader('ETag');
+        return this.header('ETag');
     }
     get json() {
         return this.parsedJSON || (this.parsedJSON = JSON.parse(this.text));
@@ -6509,7 +6544,8 @@ up.Response = class Response extends up.Record {
         return now - this.loadedAt;
     }
     get expired() {
-        return this.age > up.network.config.cacheExpireAge || this.request.expired;
+        return this.age > up.network.config.cacheExpireAge ||
+            this.request.expired;
     }
     get description() {
         return `HTTP ${this.status} response to ${this.request.description}`;
@@ -6518,7 +6554,7 @@ up.Response = class Response extends up.Record {
 
 
 /***/ }),
-/* 75 */
+/* 74 */
 /***/ (() => {
 
 var _a;
@@ -6526,12 +6562,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);
@@ -6541,7 +6578,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 || '';
@@ -6549,7 +6590,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 {
@@ -6562,7 +6602,6 @@ up.ResponseDoc = (_a = class ResponseDoc {
         }
         parse(value, parseFn = e.createFromHTML) {
             if (u.isString(value)) {
-                value = this.wrapHTML(value);
                 value = parseFn(value);
             }
             return value;
@@ -6570,18 +6609,8 @@ 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() {
-            return this.root.querySelector("head title")?.textContent;
+            return this.root.querySelector('head title')?.textContent;
         }
         select(selector) {
             let finder = new up.FragmentFinder({
@@ -6592,9 +6621,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);
+            }
         }
     },
     (() => {
@@ -6604,7 +6634,7 @@ up.ResponseDoc = (_a = class ResponseDoc {
 
 
 /***/ }),
-/* 76 */
+/* 75 */
 /***/ (() => {
 
 const e = up.element;
@@ -6698,7 +6728,7 @@ up.RevealMotion = class RevealMotion {
 
 
 /***/ }),
-/* 77 */
+/* 76 */
 /***/ (() => {
 
 const u = up.util;
@@ -6739,7 +6769,7 @@ up.Selector = class Selector {
 
 
 /***/ }),
-/* 78 */
+/* 77 */
 /***/ (() => {
 
 const u = up.util;
@@ -6859,7 +6889,7 @@ up.Tether = class Tether {
 
 
 /***/ }),
-/* 79 */
+/* 78 */
 /***/ (() => {
 
 const u = up.util;
@@ -6939,7 +6969,7 @@ up.URLPattern = class URLPattern {
 
 
 /***/ }),
-/* 80 */
+/* 79 */
 /***/ (() => {
 
 up.framework = (function () {
@@ -6957,6 +6987,7 @@ up.framework = (function () {
             readyState = 'booting';
             up.emit('up:framework:boot', { log: false });
             readyState = 'booted';
+            up.emit('up:framework:booted', { log: false });
         }
         else {
             console.error("Unpoly cannot boot: %s", issue);
@@ -7022,7 +7053,7 @@ up.boot = up.framework.boot;
 
 
 /***/ }),
-/* 81 */
+/* 80 */
 /***/ (() => {
 
 up.event = (function () {
@@ -7038,9 +7069,6 @@ up.event = (function () {
     function on(...args) {
         return buildListenerGroup(args).bind();
     }
-    function $on(...args) {
-        return buildListenerGroup(args, { jQuery: true }).bind();
-    }
     function off(...args) {
         return buildListenerGroup(args).unbind();
     }
@@ -7111,7 +7139,6 @@ up.event = (function () {
     on('up:framework:reset', reset);
     return {
         on,
-        $on,
         off,
         build,
         emit,
@@ -7124,14 +7151,12 @@ up.event = (function () {
     };
 })();
 up.on = up.event.on;
-up.$on = up.event.$on;
 up.off = up.event.off;
-up.$off = up.event.off;
 up.emit = up.event.emit;
 
 
 /***/ }),
-/* 82 */
+/* 81 */
 /***/ (() => {
 
 up.protocol = (function () {
@@ -7147,6 +7172,9 @@ up.protocol = (function () {
             return parseFn(value);
         }
     };
+    function targetFromXHR(xhr) {
+        return extractHeader(xhr, 'target');
+    }
     function parseModifyCacheValue(value) {
         if (value === 'false') {
             return false;
@@ -7167,6 +7195,9 @@ up.protocol = (function () {
     function methodFromXHR(xhr) {
         return extractHeader(xhr, 'method', u.normalizeMethod);
     }
+    function titleFromXHR(xhr) {
+        return up.migrate.titleFromXHR?.(xhr) ?? extractHeader(xhr, 'title', JSON.parse);
+    }
     function eventPlansFromXHR(xhr) {
         return extractHeader(xhr, 'events', JSON.parse);
     }
@@ -7182,11 +7213,9 @@ up.protocol = (function () {
     function locationFromXHR(xhr) {
         return extractHeader(xhr, 'location') || xhr.responseURL;
     }
-    function titleFromXHR(xhr) {
-        return extractHeader(xhr, 'title');
-    }
-    function targetFromXHR(xhr) {
-        return extractHeader(xhr, 'target');
+    function influencingHeadersFromResponse(response) {
+        let varyHeaderValue = response.header('Vary');
+        return u.parseTokens(varyHeaderValue, { separator: 'comma' });
     }
     const config = new up.Config(() => ({
         methodParam: '_method',
@@ -7262,12 +7291,13 @@ up.protocol = (function () {
         headerize,
         wrapMethod,
         cspNoncesFromHeader,
+        influencingHeadersFromResponse,
     };
 })();
 
 
 /***/ }),
-/* 83 */
+/* 82 */
 /***/ (() => {
 
 up.log = (function () {
@@ -7353,7 +7383,7 @@ up.warn = up.log.warn;
 
 
 /***/ }),
-/* 84 */
+/* 83 */
 /***/ (() => {
 
 up.syntax = (function () {
@@ -7377,9 +7407,6 @@ up.syntax = (function () {
         const compiler = buildCompiler(args);
         return insertCompiler(registeredCompilers, compiler);
     }
-    function registerJQueryCompiler(...args) {
-        registerCompiler(...args, { jQuery: true });
-    }
     function registerMacro(...args) {
         const macro = buildCompiler(args);
         if (up.framework.evaling) {
@@ -7388,9 +7415,6 @@ up.syntax = (function () {
         }
         return insertCompiler(registeredMacros, macro);
     }
-    function registerJQueryMacro(...args) {
-        registerMacro(...args, { jQuery: true });
-    }
     function detectSystemMacroPriority(macroSelector) {
         macroSelector = u.evalOption(macroSelector);
         for (let substr in SYSTEM_MACRO_PRIORITIES) {
@@ -7414,7 +7438,6 @@ up.syntax = (function () {
             isDefault: up.framework.evaling,
             priority: 0,
             batch: false,
-            jQuery: false
         });
         return Object.assign(callback, options);
     }
@@ -7456,10 +7479,10 @@ up.syntax = (function () {
             destructors.push(destructor);
         }
     }
-    function hello(element, { layer, data, dataMap } = {}) {
-        element = up.fragment.get(element);
+    function hello(element, options = {}) {
+        element = up.fragment.get(element, options);
         up.puts('up.hello()', "Compiling fragment %o", element);
-        compile(element, { layer, data, dataMap });
+        compile(element, options);
         up.fragment.emitInserted(element);
         return element;
     }
@@ -7496,8 +7519,6 @@ up.syntax = (function () {
     return {
         compiler: registerCompiler,
         macro: registerMacro,
-        $compiler: registerJQueryCompiler,
-        $macro: registerJQueryMacro,
         destructor: registerDestructor,
         hello,
         clean,
@@ -7505,16 +7526,14 @@ up.syntax = (function () {
     };
 })();
 up.compiler = up.syntax.compiler;
-up.$compiler = up.syntax.$compiler;
 up.destructor = up.syntax.destructor;
 up.macro = up.syntax.macro;
-up.$macro = up.syntax.$macro;
 up.data = up.syntax.data;
 up.hello = up.syntax.hello;
 
 
 /***/ }),
-/* 85 */
+/* 84 */
 /***/ (() => {
 
 up.history = (function () {
@@ -7583,7 +7602,7 @@ up.history = (function () {
     }
     function restoreStateOnPop(state) {
         if (!state?.up) {
-            up.puts('pop', 'Ignoring a history state not owned by Unpoly');
+            up.puts('popstate', 'Ignoring a history state not owned by Unpoly');
             return;
         }
         let location = currentLocation();
@@ -7650,10 +7669,10 @@ up.history = (function () {
 
 
 /***/ }),
-/* 86 */
+/* 85 */
 /***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
 
-__webpack_require__(87);
+__webpack_require__(86);
 const u = up.util;
 const e = up.element;
 up.fragment = (function () {
@@ -7704,7 +7723,7 @@ up.fragment = (function () {
         autoRevalidate: (response) => response.expired,
         skipResponse: defaultSkipResponse
     }));
-    u.delegate(config, 'mainTargets', () => up.layer.config.any);
+    u.delegate(config, ['mainTargets'], () => up.layer.config.any);
     function reset() {
         config.reset();
     }
@@ -8170,11 +8189,11 @@ up.destroy = up.fragment.destroy;
 up.render = up.fragment.render;
 up.navigate = up.fragment.navigate;
 up.visit = up.fragment.visit;
-u.delegate(up, 'context', () => up.layer.current);
+u.delegate(up, ['context'], () => up.layer.current);
 
 
 /***/ }),
-/* 87 */
+/* 86 */
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -8183,10 +8202,10 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /***/ }),
-/* 88 */
+/* 87 */
 /***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
 
-__webpack_require__(89);
+__webpack_require__(88);
 up.viewport = (function () {
     const u = up.util;
     const e = up.element;
@@ -8368,7 +8387,7 @@ up.viewport = (function () {
         }
     }
     function newStateCache() {
-        return new up.Cache({ size: 30, key: up.history.normalizeURL });
+        return new up.FIFOCache({ capacity: 30, normalizeKey: up.history.normalizeURL });
     }
     function parseOptions(args) {
         const options = u.copy(u.extractOptions(args));
@@ -8506,7 +8525,7 @@ up.reveal = up.viewport.reveal;
 
 
 /***/ }),
-/* 89 */
+/* 88 */
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -8515,7 +8534,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /***/ }),
-/* 90 */
+/* 89 */
 /***/ (() => {
 
 up.motion = (function () {
@@ -8770,10 +8789,10 @@ up.animate = up.motion.animate;
 
 
 /***/ }),
-/* 91 */
+/* 90 */
 /***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
 
-__webpack_require__(92);
+__webpack_require__(91);
 const u = up.util;
 up.network = (function () {
     const config = new up.Config(() => ({
@@ -8789,7 +8808,6 @@ 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,
     }));
@@ -8800,14 +8818,14 @@ up.network = (function () {
         abortRequests();
         queue.reset();
         config.reset();
-        cache.evict();
+        cache.reset();
         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) {
@@ -8818,31 +8836,31 @@ up.network = (function () {
         up.migrate.handleRequestOptions?.(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', newRequest.description);
+            if (!newRequest.background) {
                 queue.promoteToForeground(cachedRequest);
             }
-            request.followState(cachedRequest);
-            request.fromCache = true;
+            cache.track(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);
+            request.onLoading = () => cache.put(request);
         }
-        return u.always(request, function (response) {
+        u.always(request, function (response) {
             let expireCache = response.expireCache ?? request.expireCache ?? u.evalOption(config.expireCache, request, response);
             if (expireCache) {
                 cache.expire(expireCache, { except: request });
@@ -8852,7 +8870,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);
@@ -8917,7 +8935,7 @@ up.cache = up.network.cache;
 
 
 /***/ }),
-/* 92 */
+/* 91 */
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -8926,10 +8944,10 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /***/ }),
-/* 93 */
+/* 92 */
 /***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
 
-__webpack_require__(94);
+__webpack_require__(93);
 const u = up.util;
 const e = up.element;
 up.layer = (function () {
@@ -9062,6 +9080,7 @@ up.layer = (function () {
         if (handleDeprecatedConfig) {
             configs.forEach(handleDeprecatedConfig);
         }
+        options.openAnimation ?? (options.openAnimation = u.pluckKey(options, 'animation'));
         options = u.mergeDefined(...configs, { mode, stack }, options);
         if (beforeNew) {
             options = beforeNew(options);
@@ -9169,7 +9188,7 @@ up.layer = (function () {
 
 
 /***/ }),
-/* 94 */
+/* 93 */
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -9178,10 +9197,10 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /***/ }),
-/* 95 */
+/* 94 */
 /***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
 
-__webpack_require__(96);
+__webpack_require__(95);
 up.link = (function () {
     const u = up.util;
     const e = up.element;
@@ -9329,8 +9348,9 @@ 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, {
@@ -9340,10 +9360,15 @@ up.link = (function () {
             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'));
     }
@@ -9470,7 +9495,7 @@ up.follow = up.link.follow;
 
 
 /***/ }),
-/* 96 */
+/* 95 */
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -9479,7 +9504,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /***/ }),
-/* 97 */
+/* 96 */
 /***/ (() => {
 
 up.form = (function () {
@@ -9877,7 +9902,7 @@ up.validate = up.form.validate;
 
 
 /***/ }),
-/* 98 */
+/* 97 */
 /***/ (() => {
 
 up.feedback = (function () {
@@ -9994,7 +10019,7 @@ up.feedback = (function () {
 
 
 /***/ }),
-/* 99 */
+/* 98 */
 /***/ (() => {
 
 up.radio = (function () {
@@ -10071,7 +10096,7 @@ up.radio = (function () {
 
 
 /***/ }),
-/* 100 */
+/* 99 */
 /***/ (() => {
 
 (function () {
@@ -10220,16 +10245,15 @@ __webpack_require__(82);
 __webpack_require__(83);
 __webpack_require__(84);
 __webpack_require__(85);
-__webpack_require__(86);
-__webpack_require__(88);
+__webpack_require__(87);
+__webpack_require__(89);
 __webpack_require__(90);
-__webpack_require__(91);
-__webpack_require__(93);
-__webpack_require__(95);
+__webpack_require__(92);
+__webpack_require__(94);
+__webpack_require__(96);
 __webpack_require__(97);
 __webpack_require__(98);
 __webpack_require__(99);
-__webpack_require__(100);
 up.framework.onEvaled();
 
 })();