unpoly-rails 2.7.2.2 → 3.0.0.rc1

data/assets/unpoly/unpoly.es6.js

@@ -5,7 +5,7 @@
 /***/ (() => {
 
 window.up = {
-    version: '3.0.0-rc2'
+    version: '3.0.0-rc1'
 };
 
 
@@ -14,18 +14,13 @@ window.up = {
 /***/ (() => {
 
 up.mockable = function (originalFn) {
-    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;
-    }
+    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;
 };
 
 
@@ -111,15 +106,15 @@ up.util = (function () {
             return block;
         }
     }
-    function map(list, block) {
-        if (list.length === 0) {
+    function map(array, block) {
+        if (array.length === 0) {
             return [];
         }
         block = iteratee(block);
         let mapped = [];
-        let i = 0;
-        for (let item of list) {
-            mapped.push(block(item, i++));
+        for (let i = 0; i < array.length; i++) {
+            let element = array[i];
+            mapped.push(block(element, i));
         }
         return mapped;
     }
@@ -131,9 +126,8 @@ up.util = (function () {
         return map(array, pairer).reduce(merger, {});
     }
     function each(array, block) {
-        let i = 0;
-        for (let item of array) {
-            block(item, i++);
+        for (let i = 0; i < array.length; i++) {
+            block(array[i], i);
         }
     }
     function isNull(object) {
@@ -310,11 +304,10 @@ up.util = (function () {
     function some(list, tester) {
         return !!findResult(list, tester);
     }
-    function findResult(list, tester) {
+    function findResult(array, tester) {
         tester = iteratee(tester);
-        let i = 0;
-        for (let item of list) {
-            const result = tester(item, i++);
+        for (let i = 0; i < array.length; i++) {
+            const result = tester(array[i], i);
             if (result) {
                 return result;
             }
@@ -323,9 +316,8 @@ up.util = (function () {
     function every(list, tester) {
         tester = iteratee(tester);
         let match = true;
-        let i = 0;
-        for (let item of list) {
-            if (!tester(item, i++)) {
+        for (let i = 0; i < list.length; i++) {
+            if (!tester(list[i], i)) {
                 match = false;
                 break;
             }
@@ -709,14 +701,6 @@ 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,
@@ -812,8 +796,7 @@ up.util = (function () {
         sprintf,
         renameKeys,
         negate,
-        memoizeMethod,
-        safeStringifyJSON,
+        memoizeMethod
     };
 })();
 
@@ -888,6 +871,12 @@ 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) {
@@ -902,6 +891,7 @@ up.browser = (function () {
         canEval,
         assertConfirmed,
         popCookie,
+        get jQuery() { return getJQuery(); },
     };
 })();
 
@@ -1174,17 +1164,9 @@ up.element = (function () {
         klass = klass.replace(/:/g, '\\:');
         return `.${klass}`;
     }
-    function createBrokenDocumentFromHTML(html) {
+    function createDocumentFromHTML(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);
@@ -1447,8 +1429,7 @@ up.element = (function () {
         isSingleton,
         attrSelector,
         tagName: elementTagName,
-        createBrokenDocumentFromHTML,
-        fixScriptish,
+        createDocumentFromHTML,
         createFromHTML,
         get root() { return getRoot(); },
         paint,
@@ -1895,7 +1876,7 @@ up.Change.Addition = class Addition extends up.Change {
     setETag({ newElement, etag }) {
         e.setMissingAttr(newElement, 'up-etag', etag || false);
     }
-    setReloadAttrs(options) {
+    setMeta(options) {
         this.setSource(options);
         this.setTime(options);
         this.setETag(options);
@@ -2138,9 +2119,9 @@ up.Change.OpenLayer = class OpenLayer extends up.Change.Addition {
         this.layer.createElements(this.content);
         this.layer.setupHandlers();
         this.handleHistory();
-        this.setReloadAttrs({ newElement: this.content, source: this.options.source });
+        this.setMeta({ newElement: this.content, source: this.options.source });
         responseDoc.finalizeElement(this.content);
-        up.hello(this.layer.element, Object.assign(Object.assign({}, this.options), { layer: this.layer }));
+        up.hello(this.layer.element, { layer: this.layer, origin: this.origin });
         this.handleLayerChangeRequests();
         this.handleScroll();
         let renderResult = new up.RenderResult({
@@ -2309,7 +2290,7 @@ up.Change.UpdateLayer = (_a = class UpdateLayer extends up.Change.Addition {
             this.renderResult.fragments.unshift(...newFragments);
         }
         executeStep(step) {
-            this.setReloadAttrs(step);
+            this.setMeta(step);
             switch (step.placement) {
                 case 'swap': {
                     let keepPlan = this.findKeepPlan(step);
@@ -2800,11 +2781,18 @@ up.Change.FromURL = (_a = class FromURL extends up.Change {
         onRequestSettledWithResponse(response) {
             var _a;
             this.response = response;
-            if (up.fragment.config.skipResponse(this.loadedEventProps())) {
+            const expiredResponse = this.options.expiredResponse;
+            const eventProps = {
+                response: this.response,
+                renderOptions: this.options,
+                revalidating: !!expiredResponse,
+                expiredResponse,
+            };
+            if (up.fragment.config.skipResponse(eventProps)) {
                 this.skip();
             }
             else {
-                this.request.assertEmitted('up:fragment:loaded', Object.assign(Object.assign({}, this.loadedEventProps()), { callback: this.options.onLoaded, log: ['Loaded fragment from %s', this.response.description], skip: () => this.skip() }));
+                this.request.assertEmitted('up:fragment:loaded', Object.assign(Object.assign({}, eventProps), { callback: this.options.onLoaded, log: ['Loaded fragment from %s', this.response.description], skip: () => this.skip() }));
             }
             let fail = (_a = u.evalOption(this.options.fail, this.response)) !== null && _a !== void 0 ? _a : !response.ok;
             if (fail) {
@@ -2812,22 +2800,6 @@ 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', {
@@ -2850,7 +2822,6 @@ 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;
@@ -2919,7 +2890,6 @@ up.Change.FromURL = (_a = class FromURL extends up.Change {
     (() => {
         u.memoizeMethod(_a.prototype, [
             'getRequestAttrs',
-            'loadedEventProps',
         ]);
     })(),
     _a);
@@ -2931,14 +2901,12 @@ up.Change.FromURL = (_a = class FromURL extends up.Change {
 
 const u = up.util;
 up.CompilerPass = class CompilerPass {
-    constructor(root, compilers, { layer, data, dataMap, meta }) {
-        layer || (layer = up.layer.get(root) || up.layer.current);
+    constructor(root, compilers, { layer, data, dataMap } = {}) {
         this.root = root;
         this.compilers = compilers;
-        this.layer = layer;
+        this.layer = layer || up.layer.get(this.root) || up.layer.current;
         this.data = data;
         this.dataMap = dataMap;
-        this.meta = Object.assign({ layer }, meta);
         this.errors = [];
     }
     run() {
@@ -2984,10 +2952,11 @@ up.CompilerPass = class CompilerPass {
         return (_b = (_a = up.migrate).postCompile) === null || _b === void 0 ? void 0 : _b.call(_a, matches, compiler);
     }
     compileOneElement(compiler, element) {
-        const compileArgs = [element];
+        const elementArg = compiler.jQuery ? up.browser.jQuery(element) : element;
+        const compileArgs = [elementArg];
         if (compiler.length !== 1) {
             const data = up.syntax.data(element);
-            compileArgs.push(data, this.meta);
+            compileArgs.push(data);
         }
         const result = this.applyCompilerFunction(compiler, element, compileArgs);
         let destructorOrDestructors = this.destructorPresence(result);
@@ -2996,10 +2965,11 @@ up.CompilerPass = class CompilerPass {
         }
     }
     compileBatch(compiler, elements) {
-        const compileArgs = [elements];
+        const elementsArgs = compiler.jQuery ? up.browser.jQuery(elements) : elements;
+        const compileArgs = [elementsArgs];
         if (compiler.length !== 1) {
             const dataList = u.map(elements, up.syntax.data);
-            compileArgs.push(dataList, this.meta);
+            compileArgs.push(dataList);
         }
         const result = this.applyCompilerFunction(compiler, elements, compileArgs);
         if (this.destructorPresence(result)) {
@@ -3305,6 +3275,7 @@ up.EventListener = class EventListener extends up.Record {
             'eventType',
             'selector',
             'callback',
+            'jQuery',
             'guard',
             'baseLayer',
             'passive',
@@ -3352,7 +3323,8 @@ up.EventListener = class EventListener extends up.Record {
             return;
         }
         if (element) {
-            const args = [event, element];
+            const elementArg = this.jQuery ? up.browser.jQuery(element) : element;
+            const args = [event, elementArg];
             const expectedArgCount = this.callback.length;
             if (expectedArgCount !== 1 && expectedArgCount !== 2) {
                 const data = up.syntax.data(element);
@@ -3408,6 +3380,7 @@ up.EventListenerGroup = class EventListenerGroup extends up.Record {
             'eventTypes',
             'selector',
             'callback',
+            'jQuery',
             'guard',
             'baseLayer',
             'passive',
@@ -4182,6 +4155,44 @@ 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 {
@@ -4328,12 +4339,12 @@ up.Layer = class Layer extends up.Record {
         return this.stack.asCurrent(this, fn);
     }
     updateHistory(options) {
-        if (u.isString(options.location)) {
-            this.location = options.location;
-        }
         if (u.isString(options.title)) {
             this.title = options.title;
         }
+        if (u.isString(options.location)) {
+            this.location = options.location;
+        }
     }
     isHistoryVisible() {
         return this.history && (this.isRoot() || this.parent.isHistoryVisible());
@@ -4366,14 +4377,12 @@ up.Layer = class Layer extends up.Record {
     set location(location) {
         const previousLocation = this.location;
         location = up.history.normalizeURL(location);
-        if (previousLocation !== location || this.opening) {
+        if (previousLocation !== location) {
             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) {
@@ -4399,7 +4408,7 @@ up.Layer = class Layer extends up.Record {
 
 
 /***/ }),
-/* 48 */
+/* 49 */
 /***/ (() => {
 
 const e = up.element;
@@ -4679,7 +4688,7 @@ up.Layer.Overlay = class Overlay extends up.Layer {
 
 
 /***/ }),
-/* 49 */
+/* 50 */
 /***/ (() => {
 
 up.Layer.OverlayWithTether = class OverlayWithTether extends up.Layer.Overlay {
@@ -4716,7 +4725,7 @@ up.Layer.OverlayWithTether = class OverlayWithTether extends up.Layer.Overlay {
 
 
 /***/ }),
-/* 50 */
+/* 51 */
 /***/ (() => {
 
 var _a;
@@ -4754,7 +4763,7 @@ up.Layer.OverlayWithViewport = (_a = class OverlayWithViewport extends up.Layer.
 
 
 /***/ }),
-/* 51 */
+/* 52 */
 /***/ (() => {
 
 var _a;
@@ -4803,7 +4812,7 @@ up.Layer.Root = (_a = class Root extends up.Layer {
 
 
 /***/ }),
-/* 52 */
+/* 53 */
 /***/ (() => {
 
 var _a;
@@ -4814,7 +4823,7 @@ up.Layer.Modal = (_a = class Modal extends up.Layer.OverlayWithViewport {
 
 
 /***/ }),
-/* 53 */
+/* 54 */
 /***/ (() => {
 
 var _a;
@@ -4825,7 +4834,7 @@ up.Layer.Popup = (_a = class Popup extends up.Layer.OverlayWithTether {
 
 
 /***/ }),
-/* 54 */
+/* 55 */
 /***/ (() => {
 
 var _a;
@@ -4836,7 +4845,7 @@ up.Layer.Drawer = (_a = class Drawer extends up.Layer.OverlayWithViewport {
 
 
 /***/ }),
-/* 55 */
+/* 56 */
 /***/ (() => {
 
 var _a;
@@ -4847,7 +4856,7 @@ up.Layer.Cover = (_a = class Cover extends up.Layer.OverlayWithViewport {
 
 
 /***/ }),
-/* 56 */
+/* 57 */
 /***/ (() => {
 
 const u = up.util;
@@ -4937,7 +4946,7 @@ up.LayerLookup = class LayerLookup {
 
 
 /***/ }),
-/* 57 */
+/* 58 */
 /***/ (() => {
 
 const u = up.util;
@@ -5050,7 +5059,7 @@ up.LayerStack = class LayerStack extends Array {
 
 
 /***/ }),
-/* 58 */
+/* 59 */
 /***/ (() => {
 
 up.LinkFeedbackURLs = class LinkFeedbackURLs {
@@ -5081,7 +5090,7 @@ up.LinkFeedbackURLs = class LinkFeedbackURLs {
 
 
 /***/ }),
-/* 59 */
+/* 60 */
 /***/ (() => {
 
 const u = up.util;
@@ -5151,7 +5160,7 @@ up.LinkPreloader = class LinkPreloader {
 
 
 /***/ }),
-/* 60 */
+/* 61 */
 /***/ (function() {
 
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -5260,7 +5269,7 @@ up.MotionController = class MotionController {
 
 
 /***/ }),
-/* 61 */
+/* 62 */
 /***/ (() => {
 
 const u = up.util;
@@ -5352,7 +5361,7 @@ up.NonceableCallback = class NonceableCallback {
 
 
 /***/ }),
-/* 62 */
+/* 63 */
 /***/ (() => {
 
 const u = up.util;
@@ -5430,7 +5439,7 @@ up.OptionsParser = class OptionsParser {
 
 
 /***/ }),
-/* 63 */
+/* 64 */
 /***/ (() => {
 
 const e = up.element;
@@ -5498,7 +5507,7 @@ up.OverlayFocus = class OverlayFocus {
 
 
 /***/ }),
-/* 64 */
+/* 65 */
 /***/ (() => {
 
 const u = up.util;
@@ -5729,7 +5738,7 @@ up.Params = class Params {
 
 
 /***/ }),
-/* 65 */
+/* 66 */
 /***/ (() => {
 
 const e = up.element;
@@ -5779,7 +5788,7 @@ up.ProgressBar = class ProgressBar {
 
 
 /***/ }),
-/* 66 */
+/* 67 */
 /***/ (() => {
 
 const u = up.util;
@@ -5825,7 +5834,7 @@ up.RenderOptions = (function () {
         'history',
         'source',
         'saveScroll',
-        'navigate',
+        'navigate'
     ]);
     const CONTENT_KEYS = [
         'url',
@@ -5896,7 +5905,7 @@ up.RenderOptions = (function () {
 
 
 /***/ }),
-/* 67 */
+/* 68 */
 /***/ (() => {
 
 up.RenderResult = class RenderResult extends up.Record {
@@ -5924,7 +5933,7 @@ up.RenderResult = class RenderResult extends up.Record {
 
 
 /***/ }),
-/* 68 */
+/* 69 */
 /***/ (() => {
 
 var _a;
@@ -5949,7 +5958,6 @@ 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 [
@@ -6012,6 +6020,9 @@ 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();
@@ -6055,12 +6066,10 @@ 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';
@@ -6114,18 +6123,14 @@ up.Request = (_a = class Request extends up.Record {
             this.emit('up:request:offline', { log: message });
         }
         respondWith(response) {
-            this.response = response;
-            console.debug("[request] respondWith() at state %o / uid %o", this.state, this.uid);
-            if (this.isSettled())
+            if (this.state !== 'loading')
                 return;
             this.state = 'loaded';
             if (response.ok) {
-                console.debug("[request] fulfilling deferred of %o with response", this.uid);
-                this.deferred.resolve(response);
+                return this.deferred.resolve(response);
             }
             else {
-                console.debug("[request] rejecting deferred of %o with response", this.uid);
-                this.deferred.reject(response);
+                return this.deferred.reject(response);
             }
         }
         isSettled() {
@@ -6176,6 +6181,24 @@ 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,
@@ -6205,9 +6228,6 @@ 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)) {
@@ -6224,7 +6244,8 @@ up.Request = (_a = class Request extends up.Record {
                 testFn = (_request) => condition;
             }
             if (except) {
-                return (request) => !up.cache.isCacheCompatible(except, request) && testFn(request);
+                let exceptCacheKey = except.cacheKey();
+                return (request) => (request.cacheKey() !== exceptCacheKey) && testFn(request);
             }
             else {
                 return testFn;
@@ -6238,7 +6259,7 @@ up.Request = (_a = class Request extends up.Record {
 
 
 /***/ }),
-/* 69 */
+/* 70 */
 /***/ (() => {
 
 let u = up.util;
@@ -6269,151 +6290,6 @@ 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 */
 /***/ (() => {
@@ -6434,6 +6310,7 @@ 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());
@@ -6586,8 +6463,12 @@ up.Request.XHRRenderer = (_a = class XHRRenderer {
                 xhr.timeout = this.request.timeout;
             }
             xhr.open(this.getMethod(), this.request.url);
-            for (let key of ['target', 'failTarget', 'mode', 'failMode', 'context', 'failContext']) {
-                this.addHeader(xhr, up.protocol.headerize(key), this.request[key]);
+            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())) {
@@ -6598,10 +6479,6 @@ 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());
         }
@@ -6622,11 +6499,11 @@ up.Request.XHRRenderer = (_a = class XHRRenderer {
             this.finalizePayload();
             return this.payload;
         }
-        addHeader(xhr, name, value) {
+        addHeader(xhr, header, value) {
             if (u.isOptions(value) || u.isArray(value)) {
-                value = u.safeStringifyJSON(value);
+                value = JSON.stringify(value);
             }
-            this.request.headers[name] = value;
+            xhr.setRequestHeader(header, value);
         }
         finalizePayload() {
             this.payload = this.request.payload;
@@ -6690,29 +6567,24 @@ up.Response = class Response extends up.Record {
         var _a;
         return !u.evalOption((_a = this.fail) !== null && _a !== void 0 ? _a : up.network.config.fail, this);
     }
-    header(name) {
+    getHeader(name) {
         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');
+        return this.getHeader('Content-Type');
     }
     get cspNonces() {
-        return up.protocol.cspNoncesFromHeader(this.header('Content-Security-Policy'));
+        return up.protocol.cspNoncesFromHeader(this.getHeader('Content-Security-Policy'));
     }
     get lastModified() {
-        let header = this.header('Last-Modified');
+        let header = this.getHeader('Last-Modified');
         if (header) {
             return new Date(header);
         }
     }
     get etag() {
-        return this.header('ETag');
+        return this.getHeader('ETag');
     }
     get json() {
         return this.parsedJSON || (this.parsedJSON = JSON.parse(this.text));
@@ -6722,8 +6594,7 @@ 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}`;
@@ -6740,13 +6611,12 @@ 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);
@@ -6756,11 +6626,7 @@ up.ResponseDoc = (_a = class ResponseDoc {
             }
         }
         parseDocument(options) {
-            let document = this.parse(options.document, e.createBrokenDocumentFromHTML);
-            if (document) {
-                this.scriptishNeedFix = true;
-                return document;
-            }
+            return this.parse(options.document, e.createDocumentFromHTML);
         }
         parseContent(options) {
             let content = options.content || '';
@@ -6768,6 +6634,7 @@ 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 {
@@ -6780,6 +6647,7 @@ up.ResponseDoc = (_a = class ResponseDoc {
         }
         parse(value, parseFn = e.createFromHTML) {
             if (u.isString(value)) {
+                value = this.wrapHTML(value);
                 value = parseFn(value);
             }
             return value;
@@ -6787,9 +6655,19 @@ 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({
@@ -6800,10 +6678,9 @@ up.ResponseDoc = (_a = class ResponseDoc {
             return finder.find();
         }
         finalizeElement(element) {
+            this.noscriptWrapper.unwrap(element);
             up.NonceableCallback.adoptNonces(element, this.cspNonces);
-            if (this.scriptishNeedFix) {
-                element.querySelectorAll('noscript, script').forEach(e.fixScriptish);
-            }
+            this.scriptWrapper.unwrap(element);
         }
     },
     (() => {
@@ -7169,7 +7046,6 @@ 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);
@@ -7251,6 +7127,9 @@ 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();
     }
@@ -7321,6 +7200,7 @@ up.event = (function () {
     on('up:framework:reset', reset);
     return {
         on,
+        $on,
         off,
         build,
         emit,
@@ -7333,7 +7213,9 @@ 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;
 
 
@@ -7391,8 +7273,7 @@ up.protocol = (function () {
         return extractHeader(xhr, 'location') || xhr.responseURL;
     }
     function titleFromXHR(xhr) {
-        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);
+        return extractHeader(xhr, 'title');
     }
     function targetFromXHR(xhr) {
         return extractHeader(xhr, 'target');
@@ -7586,6 +7467,9 @@ 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) {
@@ -7594,6 +7478,9 @@ 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) {
@@ -7617,6 +7504,7 @@ up.syntax = (function () {
             isDefault: up.framework.evaling,
             priority: 0,
             batch: false,
+            jQuery: false
         });
         return Object.assign(callback, options);
     }
@@ -7658,10 +7546,10 @@ up.syntax = (function () {
             destructors.push(destructor);
         }
     }
-    function hello(element, options = {}) {
-        element = up.fragment.get(element, options);
+    function hello(element, { layer, data, dataMap } = {}) {
+        element = up.fragment.get(element);
         up.puts('up.hello()', "Compiling fragment %o", element);
-        compile(element, options);
+        compile(element, { layer, data, dataMap });
         up.fragment.emitInserted(element);
         return element;
     }
@@ -7694,6 +7582,8 @@ up.syntax = (function () {
     return {
         compiler: registerCompiler,
         macro: registerMacro,
+        $compiler: registerJQueryCompiler,
+        $macro: registerJQueryMacro,
         destructor: registerDestructor,
         hello,
         clean,
@@ -7701,8 +7591,10 @@ 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;
 
@@ -8992,24 +8884,25 @@ 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.Cache3();
+    const cache = new up.Request.Cache();
     let progressBar = null;
     function reset() {
         abortRequests();
         queue.reset();
         config.reset();
-        cache.reset();
+        cache.evict();
         progressBar === null || progressBar === void 0 ? void 0 : progressBar.destroy();
         progressBar = null;
     }
     function makeRequest(...args) {
         const options = parseRequestOptions(args);
         const request = new up.Request(options);
-        processRequest(request);
+        useCachedRequest(request) || queueRequest(request);
         return request;
     }
     function parseRequestOptions(args) {
@@ -9021,30 +8914,31 @@ up.network = (function () {
         (_b = (_a = up.migrate).handleRequestOptions) === null || _b === void 0 ? void 0 : _b.call(_a, options);
         return options;
     }
-    function processRequest(request) {
-        useCachedRequest(request) || queueRequest(request);
-    }
-    function useCachedRequest(newRequest) {
+    function useCachedRequest(request) {
         let cachedRequest;
-        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) {
+        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) {
                 queue.promoteToForeground(cachedRequest);
             }
-            cache.connect(cachedRequest, newRequest, { onIncompatible: processRequest });
+            request.followState(cachedRequest);
+            request.fromCache = true;
             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.put(request);
+            cache.set(request, request);
         }
-        u.always(request, function (response) {
+        return 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) {
@@ -9055,7 +8949,7 @@ up.network = (function () {
                 cache.evict(evictCache, { except: request });
             }
             if (cache.get(request)) {
-                cache.put(request);
+                cache.set(request, request);
             }
             if (!response.ok) {
                 cache.evict(request);
@@ -9266,7 +9160,6 @@ up.layer = (function () {
         options.baseLayer = stack.get('current', Object.assign(Object.assign({}, options), { normalizeLayerOptions: false }));
     }
     function build(options, beforeNew) {
-        var _a;
         const { mode } = options;
         const { Class } = config[mode];
         const configs = u.reverse(modeConfigs(mode));
@@ -9274,7 +9167,6 @@ up.layer = (function () {
         if (handleDeprecatedConfig) {
             configs.forEach(handleDeprecatedConfig);
         }
-        (_a = options.openAnimation) !== null && _a !== void 0 ? _a : (options.openAnimation = u.pluckKey(options, 'animation'));
         options = u.mergeDefined(...configs, { mode, stack }, options);
         if (beforeNew) {
             options = beforeNew(options);
@@ -9538,22 +9430,16 @@ up.link = (function () {
     }
     function preload(link, options) {
         link = up.fragment.get(link);
-        let issue = preloadIssue(link);
-        if (issue) {
-            return Promise.reject(new up.Error(issue));
+        if (!shouldPreload()) {
+            return Promise.reject(new up.Error('Link preloading is disabled'));
         }
         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 preloadIssue(link) {
-        if (!u.evalAutoOption(config.preloadEnabled, autoPreloadEnabled, link)) {
-            return 'Preloading is disabled';
-        }
-        else if (!isSafe(link)) {
-            return 'Will not preload an unsafe link';
-        }
+    function shouldPreload() {
+        let goodConnection = u.negate(up.network.shouldReduceRequests);
+        return u.evalAutoOption(config.preloadEnabled, goodConnection);
     }
-    const autoPreloadEnabled = u.negate(up.network.shouldReduceRequests);
     function followMethod(link, options = {}) {
         return u.normalizeMethod(options.method || link.getAttribute('up-method') || link.getAttribute('data-method'));
     }