unpoly-rails 3.5.1 → 3.6.0

data/assets/unpoly/unpoly.js

@@ -5,7 +5,7 @@
 /***/ (() => {
 
 window.up = {
-    version: '3.5.1'
+    version: '3.6.0'
 };
 
 
@@ -396,7 +396,8 @@ up.util = (function () {
         return value[value.length - 1];
     }
     function contains(value, subValue) {
-        return value.indexOf(subValue) >= 0;
+        let indexOf = value.indexOf || Array.prototype.indexOf;
+        return indexOf.call(value, subValue) >= 0;
     }
     function objectContains(object, subObject) {
         const reducedValue = pick(object, Object.keys(subObject));
@@ -902,14 +903,7 @@ up.browser = (function () {
     function canJQuery() {
         return !!window.jQuery;
     }
-    const canEval = u.memoize(function () {
-        try {
-            return new Function('return true')();
-        }
-        catch {
-            return false;
-        }
-    });
+    const canHasSelector = u.memoize(() => CSS.supports('selector(:has(*))'));
     function popCookie(name) {
         let value = document.cookie.match(new RegExp(name + "=(\\w+)"))?.[1];
         if (value) {
@@ -928,9 +922,9 @@ up.browser = (function () {
         submitForm,
         canPushState,
         canJQuery,
-        canEval,
         assertConfirmed,
         popCookie,
+        canHasSelector,
     };
 })();
 
@@ -1207,12 +1201,8 @@ up.element = (function () {
     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;
+    function fixParserDamage(scriptish) {
+        let clone = createFromHTML(scriptish.outerHTML);
         scriptish.replaceWith(clone);
     }
     function createFromHTML(html) {
@@ -1453,16 +1443,12 @@ up.element = (function () {
             jQuery(element).remove();
         }
     }
-    function filteredQuery(parent, includeSelectors, excludeSelectors) {
-        let fullIncludeSelector = includeSelectors.join();
-        let fullExcludeSelector = excludeSelectors.join();
-        let elements = parent.querySelectorAll(fullIncludeSelector);
-        let isExcluded = (element) => element.matches(fullExcludeSelector);
-        return u.reject(elements, isExcluded);
-    }
     function isEmpty(element) {
         return !element.children.length > 0 && !element.innerText.trim();
     }
+    function crossOriginSelector(attr) {
+        return `[${attr}*="//"]:not([${attr}*="//${location.host}/"])`;
+    }
     return {
         subtree,
         contains,
@@ -1486,7 +1472,7 @@ up.element = (function () {
         attrSelector,
         tagName: elementTagName,
         createBrokenDocumentFromHTML,
-        fixScriptish,
+        fixParserDamage,
         createFromHTML,
         get root() { return getRoot(); },
         paint,
@@ -1517,8 +1503,8 @@ up.element = (function () {
         setTemporaryAttr,
         cleanJQuery,
         parseSelector,
-        filteredQuery,
         isEmpty,
+        crossOriginSelector,
     };
 })();
 
@@ -1630,14 +1616,30 @@ up.Record = class Record {
 /* 17 */
 /***/ (() => {
 
+const u = up.util;
 up.Config = class Config {
     constructor(blueprintFn = (() => ({}))) {
         this._blueprintFn = blueprintFn;
         this.reset();
+        document.addEventListener('up:framework:reset', () => this.reset());
     }
     reset() {
         Object.assign(this, this._blueprintFn());
     }
+    matches(element, prop) {
+        return element.matches(this.selector(prop));
+    }
+    selector(prop) {
+        let includes = this[prop];
+        let excludes = this['no' + u.upperCaseFirst(prop)];
+        let selector = `:is(${includes.join()})`;
+        if (u.isPresent(excludes))
+            selector += `:not(${excludes.join()})`;
+        return selector;
+    }
+    selectorFn(prop) {
+        return () => this.selector(prop);
+    }
 };
 
 
@@ -2220,6 +2222,7 @@ up.Change.OpenLayer = class OpenLayer extends up.Change.Addition {
     _renderOverlayContent() {
         this._handleHistory();
         this.handleLayerChangeRequests();
+        this.responseDoc.commitElement(this._content);
         this.layer.setContent(this._content);
         this.setReloadAttrs({ newElement: this._content, source: this.options.source });
         this.responseDoc.finalizeElement(this._content);
@@ -2526,8 +2529,9 @@ up.Change.UpdateSteps = class UpdateSteps extends up.Change.Addition {
                             up.fragment.markAsDestroying(step.oldElement);
                         },
                         afterInsert: () => {
-                            this.responseDoc.finalizeElement(step.newElement);
                             this._restoreKeepables(step);
+                            this.responseDoc.finalizeElement(step.newElement);
+                            this._unmarkKeepables(step);
                             up.hello(step.newElement, step);
                             this._addToResult(step.newElement);
                         },
@@ -2616,6 +2620,8 @@ up.Change.UpdateSteps = class UpdateSteps extends up.Change.Addition {
                 if (keepPlan) {
                     const keepableClone = keepable.cloneNode(true);
                     keepable.insertAdjacentElement('beforebegin', keepableClone);
+                    keepable.classList.add('up-keeping');
+                    up.script.disableSubtree(keepPlan.newElement);
                     let viewports = up.viewport.subtree(keepPlan.oldElement);
                     keepPlan.revivers = viewports.map(function (viewport) {
                         let cursorProps = up.viewport.copyCursorProps(viewport);
@@ -2641,6 +2647,11 @@ up.Change.UpdateSteps = class UpdateSteps extends up.Change.Addition {
             }
         }
     }
+    _unmarkKeepables(step) {
+        for (let keepPlan of step.keepPlans) {
+            keepPlan.oldElement.classList.remove('up-keeping');
+        }
+    }
     _willChangeElement(element) {
         return u.some(this._steps, (step) => step.oldElement.contains(element));
     }
@@ -3876,7 +3887,7 @@ up.FormValidator = class FormValidator {
         options.failOptions = false;
         options.params = up.Params.merge(options.params, ...u.map(dirtyRenderOptionsList, 'params'));
         options.headers = u.merge(...u.map(dirtyRenderOptionsList, 'headers'));
-        options.headers[up.protocol.headerize('validate')] = dirtyNames.join(' ') || ':unknown';
+        this._addValidateHeader(options.headers, dirtyNames);
         options.guardEvent = up.event.build('up:form:validate', {
             fields: dirtyFields,
             log: 'Validating form',
@@ -3901,6 +3912,13 @@ up.FormValidator = class FormValidator {
             this._renderDirtySolutions();
         }
     }
+    _addValidateHeader(headers, names) {
+        let key = up.protocol.headerize('validate');
+        let value = names.join(' ');
+        if (!value || value.length > up.protocol.config.maxHeaderSize)
+            value = ':unknown';
+        headers[key] = value;
+    }
     _buildDataMap(solutions) {
         let dataMap = {};
         for (let solution of solutions) {
@@ -4040,7 +4058,7 @@ up.FragmentFinder = class FragmentFinder {
         }
     }
     _findInRegion() {
-        if (this._match === 'region' && this._origin?.isConnected) {
+        if (this._match === 'region' && !up.fragment.containsMainPseudo(this._selector) && this._origin?.isConnected) {
             return this._findClosest() || this._findDescendantInRegion();
         }
     }
@@ -5465,25 +5483,19 @@ up.NonceableCallback = class NonceableCallback {
         return new this(match[3], match[2]);
     }
     toFunction(...argNames) {
-        if (up.browser.canEval()) {
-            return new Function(...argNames, this.script);
-        }
-        else if (this.nonce) {
+        if (this.nonce) {
             let callbackThis = this;
             return function (...args) {
                 return callbackThis._runAsNoncedFunction(this, argNames, args);
             };
         }
         else {
-            return this._cannotRun.bind(this);
+            return new Function(...argNames, this.script);
         }
     }
     toString() {
         return `nonce-${this.nonce} ${this.script}`;
     }
-    _cannotRun() {
-        throw new Error(`Your Content Security Policy disallows inline JavaScript (${this.script}). See https://unpoly.com/csp for solutions.`);
-    }
     _runAsNoncedFunction(thisArg, argNames, args) {
         let wrappedScript = `
       try {
@@ -6808,7 +6820,7 @@ up.Response = class Response extends up.Record {
         return this.header('Content-Type');
     }
     get cspNonces() {
-        return up.protocol.cspNoncesFromHeader(this.header('Content-Security-Policy'));
+        return up.protocol.cspNoncesFromHeader(this.header('Content-Security-Policy') || this.header('Content-Security-Policy-Report-Only'));
     }
     get lastModified() {
         let header = this.header('Last-Modified');
@@ -6854,9 +6866,6 @@ up.ResponseDoc = (_a = class ResponseDoc {
             else {
                 this._parseContent(content || '', target);
             }
-            if (!up.fragment.config.runScripts) {
-                this._document.querySelectorAll('script').forEach((e) => e.remove());
-            }
             this._cspNonces = cspNonces;
             if (origin) {
                 let originSelector = up.fragment.tryToTarget(origin);
@@ -6868,7 +6877,7 @@ up.ResponseDoc = (_a = class ResponseDoc {
         }
         _parseDocument(document) {
             document = this._parse(document, e.createBrokenDocumentFromHTML);
-            this._scriptishNeedFix = true;
+            this._isDocumentBroken = true;
             this._useParseResult(document);
         }
         _parseFragment(fragment) {
@@ -6944,12 +6953,7 @@ up.ResponseDoc = (_a = class ResponseDoc {
             });
         }
         commitSteps(steps) {
-            return steps.filter((step) => {
-                if (this._document.contains(step.newElement)) {
-                    step.newElement.remove();
-                    return true;
-                }
-            });
+            return steps.filter((step) => this.commitElement(step.newElement));
         }
         _trySelectStep(step) {
             if (step.newElement) {
@@ -6976,10 +6980,20 @@ up.ResponseDoc = (_a = class ResponseDoc {
                 throw new up.CannotMatch();
             }
         }
+        commitElement(element) {
+            if (this._document.contains(element)) {
+                if (!up.fragment.config.runScripts) {
+                    up.script.disableSubtree(element);
+                }
+                element.remove();
+                return true;
+            }
+        }
         finalizeElement(element) {
             up.NonceableCallback.adoptNonces(element, this._cspNonces);
-            if (this._scriptishNeedFix) {
-                element.querySelectorAll('noscript, script').forEach(e.fixScriptish);
+            if (this._isDocumentBroken) {
+                let brokenElements = e.subtree(element, ':is(noscript,script,audio,video):not(.up-keeping, .up-keeping *)');
+                u.each(brokenElements, e.fixParserDamage);
             }
         }
     },
@@ -7008,8 +7022,8 @@ up.RevealMotion = class RevealMotion {
         this._padding = this._options.padding ?? this._options.revealPadding ?? viewportConfig.revealPadding;
         this._top = this._options.top ?? this._options.revealTop ?? viewportConfig.revealTop;
         this._max = this._options.max ?? this._options.revealMax ?? viewportConfig.revealMax;
-        this._topObstructions = viewportConfig.fixedTopSelectors;
-        this._bottomObstructions = viewportConfig.fixedBottomSelectors;
+        this._topObstructionSelector = viewportConfig.selector('fixedTopSelectors');
+        this._bottomObstructionSelector = viewportConfig.selector('fixedBottomSelectors');
     }
     start() {
         const viewportRect = this._getViewportRect(this._viewport);
@@ -7061,12 +7075,12 @@ up.RevealMotion = class RevealMotion {
         elementRect.top -= this._padding;
         elementRect.height += 2 * this._padding;
     }
-    _selectObstructions(selectors) {
-        let elements = up.fragment.all(selectors.join(), { layer: this._obstructionsLayer });
+    _selectObstructions(selector) {
+        let elements = up.fragment.all(selector, { layer: this._obstructionsLayer });
         return u.filter(elements, e.isVisible);
     }
     _substractObstructions(viewportRect) {
-        for (let obstruction of this._selectObstructions(this._topObstructions)) {
+        for (let obstruction of this._selectObstructions(this._topObstructionSelector)) {
             let obstructionRect = up.Rect.fromElement(obstruction);
             let diff = obstructionRect.bottom - viewportRect.top;
             if (diff > 0) {
@@ -7074,7 +7088,7 @@ up.RevealMotion = class RevealMotion {
                 viewportRect.height -= diff;
             }
         }
-        for (let obstruction of this._selectObstructions(this._bottomObstructions)) {
+        for (let obstruction of this._selectObstructions(this._bottomObstructionSelector)) {
             let obstructionRect = up.Rect.fromElement(obstruction);
             let diff = viewportRect.bottom - obstructionRect.top;
             if (diff > 0) {
@@ -7112,10 +7126,12 @@ up.Selector = class Selector {
         }
         let expandedTargets = up.fragment.expandTargets(selector, { ...options, layer: expandTargetLayer });
         this._selectors = expandedTargets.map((target) => {
-            target = target.replace(CSS_HAS_SUFFIX_PATTERN, (match, descendantSelector) => {
-                this._filters.push(element => element.querySelector(descendantSelector));
-                return '';
-            });
+            if (!up.browser.canHasSelector()) {
+                target = target.replace(CSS_HAS_SUFFIX_PATTERN, (match, descendantSelector) => {
+                    this._filters.push(element => element.querySelector(descendantSelector));
+                    return '';
+                });
+            }
             return target || '*';
         });
         this._unionSelector = this._selectors.join() || 'match-none';
@@ -7605,6 +7621,7 @@ up.protocol = (function () {
         csrfToken() { return e.metaContent('csrf-token'); },
         cspNonce() { return e.metaContent('csp-nonce'); },
         csrfHeader: 'X-CSRF-Token',
+        maxHeaderSize: 2048,
     }));
     function csrfHeader() {
         return u.evalOption(config.csrfHeader);
@@ -7638,13 +7655,8 @@ up.protocol = (function () {
         params.add(config.methodParam, method);
         return 'POST';
     }
-    function reset() {
-        config.reset();
-    }
-    up.on('up:framework:reset', reset);
     return {
         config,
-        reset,
         locationFromXHR,
         titleFromXHR,
         targetFromXHR,
@@ -7675,9 +7687,6 @@ up.protocol = (function () {
 up.log = (function () {
     const u = up.util;
     const config = new up.LogConfig();
-    function reset() {
-        config.reset();
-    }
     function printToStandard(...args) {
         if (config.enabled) {
             printToStream('log', ...args);
@@ -7732,7 +7741,6 @@ up.log = (function () {
         }
     }
     up.on('up:framework:boot', printBanner);
-    up.on('up:framework:reset', reset);
     function enable() {
         config.enabled = true;
     }
@@ -7779,6 +7787,12 @@ up.script = (function () {
             'up-on-error',
             'up-on-offline',
         ],
+        scriptSelectors: [
+            'script'
+        ],
+        noScriptSelectors: [
+            'script[type="application/ld+json"]'
+        ]
     }));
     const SYSTEM_MACRO_PRIORITIES = {
         '[up-back]': -100,
@@ -7906,7 +7920,7 @@ up.script = (function () {
         };
     }
     function findAssets(head = document.head) {
-        return e.filteredQuery(head, config.assetSelectors, config.noAssetSelectors);
+        return head.querySelectorAll(config.selector('assetSelectors'));
     }
     function assertAssetsOK(newAssets, renderOptions) {
         let oldAssets = findAssets();
@@ -7916,10 +7930,16 @@ up.script = (function () {
             up.event.assertEmitted('up:assets:changed', { oldAssets, newAssets, renderOptions });
         }
     }
+    function disableScript(scriptElement) {
+        scriptElement.type = 'up-disabled-script';
+    }
+    function disableScriptsInSubtree(root) {
+        let selector = config.selector('scriptSelectors');
+        u.each(e.subtree(root, selector), disableScript);
+    }
     function reset() {
         registeredCompilers = u.filter(registeredCompilers, 'isDefault');
         registeredMacros = u.filter(registeredMacros, 'isDefault');
-        config.reset();
     }
     up.on('up:framework:reset', reset);
     return {
@@ -7932,6 +7952,7 @@ up.script = (function () {
         data: readData,
         findAssets,
         assertAssetsOK,
+        disableSubtree: disableScriptsInSubtree,
     };
 })();
 up.compiler = up.script.compiler;
@@ -7958,6 +7979,7 @@ up.history = (function () {
             'link[rel=canonical]',
             'link[rel=icon]',
             '[up-meta]',
+            'script[type="application/ld+json"]',
         ],
         noMetaTagSelectors: [
             'meta[http-equiv]',
@@ -7968,7 +7990,6 @@ up.history = (function () {
     let previousLocation;
     let nextPreviousLocation;
     function reset() {
-        config.reset();
         previousLocation = undefined;
         nextPreviousLocation = undefined;
         trackCurrentLocation();
@@ -8069,7 +8090,7 @@ up.history = (function () {
         }
     });
     function findMetaTags(head = document.head) {
-        return e.filteredQuery(head, config.metaTagSelectors, config.noMetaTagSelectors);
+        return head.querySelectorAll(config.selector('metaTagSelectors'));
     }
     function updateMetaTags(newMetaTags) {
         let oldMetaTags = findMetaTags();
@@ -8163,9 +8184,6 @@ up.fragment = (function () {
         skipResponse: defaultSkipResponse
     }));
     u.delegate(config, ['mainTargets'], () => up.layer.config.any);
-    function reset() {
-        config.reset();
-    }
     function defaultSkipResponse({ response, expiredResponse }) {
         return !response.text || response.text === expiredResponse?.text;
     }
@@ -8426,18 +8444,11 @@ up.fragment = (function () {
         let isGood = (klass) => !u.some(config.badTargetClasses, (badTargetClass) => matchesPattern(badTargetClass, klass));
         return u.filter(element.classList, isGood);
     }
-    function modernResolveOrigin(target, { origin } = {}) {
-        return target.replace(/:origin\b/, function (match) {
-            if (origin) {
-                return toTarget(origin);
-            }
-            else {
-                up.fail('Missing { origin } element to resolve "%s" reference (found in %s)', match, target);
-            }
-        });
-    }
-    function resolveOrigin(...args) {
-        return (up.migrate.resolveOrigin || modernResolveOrigin)(...args);
+    const MAIN_PSEUDO = /:main\b/;
+    const LAYER_PSEUDO = /:layer\b/;
+    const ORIGIN_PSEUDO = /:origin\b/;
+    function containsMainPseudo(target) {
+        return MAIN_PSEUDO.test(target);
     }
     function expandTargets(targets, options = {}) {
         const { layer } = options;
@@ -8447,21 +8458,19 @@ up.fragment = (function () {
         targets = u.copy(u.wrapList(targets));
         const expanded = [];
         while (targets.length) {
-            const target = targets.shift();
-            if (target === ':main' || target === true) {
-                let mode;
-                if (layer === 'new') {
-                    mode = options.mode || up.fail('Must pass a { mode } option together with { layer: "new" }');
-                }
-                else {
-                    mode = layer.mode;
-                }
-                targets.unshift(...up.layer.mainTargets(mode));
-            }
-            else if (target === ':layer') {
-                if (layer !== 'new' && !layer.opening) {
-                    targets.unshift(layer.getFirstSwappableElement());
-                }
+            let target = targets.shift();
+            if (target === true)
+                target = ':main';
+            if (containsMainPseudo(target)) {
+                let mode = resolveMode(options);
+                let replaced = up.layer.mainTargets(mode).map((mainTarget) => target.replace(MAIN_PSEUDO, mainTarget));
+                targets.unshift(...replaced);
+            }
+            else if (LAYER_PSEUDO.test(target)) {
+                if (layer === 'new' || layer.opening)
+                    continue;
+                let firstSwappableTarget = toTarget(layer.getFirstSwappableElement(), options);
+                targets.unshift(target.replace(LAYER_PSEUDO, firstSwappableTarget));
             }
             else if (u.isElementish(target)) {
                 expanded.push(toTarget(target, options));
@@ -8469,11 +8478,30 @@ up.fragment = (function () {
             else if (u.isString(target)) {
                 expanded.push(resolveOrigin(target, options));
             }
-            else {
-            }
         }
         return u.uniq(expanded);
     }
+    function resolveMode({ layer, mode }) {
+        if (layer === 'new') {
+            return mode || up.fail('Must pass a { mode } option together with { layer: "new" }');
+        }
+        else {
+            return layer.mode;
+        }
+    }
+    function modernResolveOrigin(target, { origin } = {}) {
+        return target.replace(ORIGIN_PSEUDO, function (match) {
+            if (origin) {
+                return toTarget(origin);
+            }
+            else {
+                up.fail('Missing { origin } element to resolve "%s" reference (found in %s)', match, target);
+            }
+        });
+    }
+    function resolveOrigin(...args) {
+        return (up.migrate.resolveOrigin || modernResolveOrigin)(...args);
+    }
     function splitTarget(target) {
         return u.parseTokens(target, { separator: 'comma' });
     }
@@ -8584,7 +8612,6 @@ up.fragment = (function () {
             return up.warn('Cannot push history changes. Next fragment update will load in a new page.');
         }
     });
-    up.on('up:framework:reset', reset);
     return {
         config,
         reload,
@@ -8623,6 +8650,7 @@ up.fragment = (function () {
         isNotDestroying,
         targetForSteps,
         compressNestedSteps,
+        containsMainPseudo,
     };
 })();
 up.reload = up.fragment.reload;
@@ -8662,13 +8690,7 @@ up.viewport = (function () {
         revealMax() { return 0.5 * window.innerHeight; },
     }));
     const bodyShifter = new up.BodyShifter();
-    function reset() {
-        config.reset();
-    }
-    function fullAnchoredRightSelector() {
-        return config.anchoredRightSelectors.join();
-    }
-    up.compiler(fullAnchoredRightSelector, function (element) {
+    up.compiler(config.selectorFn('anchoredRightSelectors'), function (element) {
         return bodyShifter.onAnchoredElementInserted(element);
     });
     function reveal(element, options) {
@@ -8934,7 +8956,6 @@ up.viewport = (function () {
         });
     });
     up.on(window, 'hashchange', () => revealHash());
-    up.on('up:framework:reset', reset);
     return {
         reveal,
         revealHash,
@@ -8999,7 +9020,6 @@ up.motion = (function () {
         motionController.reset();
         namedAnimations = pickDefault(namedAnimations);
         namedTransitions = pickDefault(namedTransitions);
-        config.reset();
     }
     function isEnabled() {
         return config.enabled;
@@ -9274,7 +9294,6 @@ up.network = (function () {
     function reset() {
         abortRequests();
         queue.reset();
-        config.reset();
         cache.reset();
         progressBar?.destroy();
         progressBar = null;
@@ -9543,7 +9562,6 @@ up.layer = (function () {
         return e.callbackAttr(link, attr, { exposedKeys: ['layer', 'value', 'response'] });
     }
     function reset() {
-        config.reset();
         stack.reset();
         handlers = u.filter(handlers, 'isDefault');
     }
@@ -9578,7 +9596,7 @@ up.layer = (function () {
         }
     }
     function isWithinForeignOverlay(element) {
-        let selector = config.foreignOverlaySelectors.join();
+        let selector = config.selector('foreignOverlaySelectors');
         return !!(selector && element.closest(selector));
     }
     up.on('up:fragment:destroyed', function () {
@@ -9663,7 +9681,7 @@ up.link = (function () {
     }
     const config = new up.Config(() => ({
         followSelectors: combineFollowableSelectors(LINKS_WITH_REMOTE_HTML, ATTRIBUTES_SUGGESTING_FOLLOW).concat(LINKS_WITH_LOCAL_HTML),
-        noFollowSelectors: ['[up-follow=false]', 'a[download]', 'a[target]', 'a[href^="#"]:not([up-content]):not([up-fragment]):not([up-document])', 'a[href^="javascript:"]'],
+        noFollowSelectors: ['[up-follow=false]', 'a[download]', 'a[target]', 'a[href^="#"]:not([up-content]):not([up-fragment]):not([up-document])', 'a[href^="javascript:"]', 'a[href^="mailto:"]', e.crossOriginSelector('href'), e.crossOriginSelector('up-href')],
         instantSelectors: ['[up-instant]'],
         noInstantSelectors: ['[up-instant=false]', '[onclick]'],
         preloadSelectors: combineFollowableSelectors(LINKS_WITH_REMOTE_HTML, ['[up-preload]']),
@@ -9671,26 +9689,8 @@ up.link = (function () {
         clickableSelectors: LINKS_WITH_LOCAL_HTML.concat(['[up-emit]', '[up-accept]', '[up-dismiss]', '[up-clickable]']),
         preloadDelay: 90,
     }));
-    function fullFollowSelector() {
-        return config.followSelectors.join();
-    }
-    function fullPreloadSelector() {
-        return config.preloadSelectors.join();
-    }
-    function fullInstantSelector() {
-        return config.instantSelectors.join();
-    }
-    function fullClickableSelector() {
-        return config.clickableSelectors.join();
-    }
-    function isFollowDisabled(link) {
-        return link.matches(config.noFollowSelectors.join()) || u.isCrossOrigin(link);
-    }
     function isPreloadDisabled(link) {
-        return !up.browser.canPushState() ||
-            link.matches(config.noPreloadSelectors.join()) ||
-            isFollowDisabled(link) ||
-            !willCache(link);
+        return !up.browser.canPushState() || !isFollowable(link) || !willCache(link);
     }
     function willCache(link) {
         const options = parseRequestOptions(link);
@@ -9703,12 +9703,8 @@ up.link = (function () {
             return request.willCache();
         }
     }
-    function isInstantDisabled(link) {
-        return link.matches(config.noInstantSelectors.join()) || isFollowDisabled(link);
-    }
     function reset() {
         lastMousedownTarget = null;
-        config.reset();
         linkPreloader.reset();
     }
     const follow = up.mockable(function (link, options) {
@@ -9823,7 +9819,7 @@ up.link = (function () {
     }
     function isFollowable(link) {
         link = up.fragment.get(link);
-        return link.matches(fullFollowSelector()) && !isFollowDisabled(link);
+        return config.matches(link, 'followSelectors');
     }
     function makeFollowable(link) {
         if (!isFollowable(link)) {
@@ -9845,9 +9841,9 @@ up.link = (function () {
             }
         });
     }
-    up.macro(fullClickableSelector, makeClickable);
+    up.macro(config.selectorFn('clickableSelectors'), makeClickable);
     function shouldFollowEvent(event, link) {
-        if (event.defaultPrevented || isFollowDisabled(link)) {
+        if (event.defaultPrevented) {
             return false;
         }
         const betterTargetSelector = `a, [up-href], ${up.form.fieldSelector()}`;
@@ -9855,9 +9851,12 @@ up.link = (function () {
         return !betterTarget || (betterTarget === link);
     }
     function isInstant(linkOrDescendant) {
-        const element = linkOrDescendant.closest(fullInstantSelector());
+        const element = linkOrDescendant.closest(config.selector('instantSelectors'));
         return element && !isInstantDisabled(element);
     }
+    function isInstantDisabled(link) {
+        return config.matches(link, 'noInstantSelectors') || config.matches(link, 'noFollowSelectors');
+    }
     function convertClicks(layer) {
         layer.on('click', function (event, element) {
             if (!up.event.isUnmodified(event)) {
@@ -9893,7 +9892,7 @@ up.link = (function () {
         const method = followMethod(link);
         return up.network.isSafeMethod(method);
     }
-    up.on('up:click', fullFollowSelector, function (event, link) {
+    up.on('up:click', config.selectorFn('followSelectors'), function (event, link) {
         if (shouldFollowEvent(event, link)) {
             up.event.halt(event, { log: true });
             up.focus(link, { preventScroll: true });
@@ -9912,7 +9911,7 @@ up.link = (function () {
             makeFollowable(area);
         }
     });
-    up.compiler(fullPreloadSelector, function (link) {
+    up.compiler(config.selectorFn('preloadSelectors'), function (link) {
         if (!isPreloadDisabled(link)) {
             linkPreloader.watchLink(link);
         }
@@ -9931,8 +9930,6 @@ up.link = (function () {
         convertClicks,
         config,
         combineFollowableSelectors,
-        preloadSelector: fullPreloadSelector,
-        followSelector: fullFollowSelector,
         preloadIssue,
     };
 })();
@@ -9960,18 +9957,12 @@ up.form = (function () {
         groupSelectors: ['[up-form-group]', 'fieldset', 'label', 'form'],
         fieldSelectors: ['select', 'input:not([type=submit]):not([type=image])', 'button[type]:not([type=submit])', 'textarea'],
         submitSelectors: up.link.combineFollowableSelectors(['form'], ATTRIBUTES_SUGGESTING_SUBMIT),
-        noSubmitSelectors: ['[up-submit=false]', '[target]'],
+        noSubmitSelectors: ['[up-submit=false]', '[target]', e.crossOriginSelector('action')],
         submitButtonSelectors: ['input[type=submit]', 'input[type=image]', 'button[type=submit]', 'button:not([type])'],
         watchInputEvents: ['input', 'change'],
         watchInputDelay: 0,
         watchChangeEvents: ['change'],
     }));
-    function fullSubmitSelector() {
-        return config.submitSelectors.join();
-    }
-    function reset() {
-        config.reset();
-    }
     function fieldSelector(suffix = '') {
         return config.fieldSelectors.map(field => field + suffix).join();
     }
@@ -10003,7 +9994,7 @@ up.form = (function () {
         return e.get(form, selector);
     }
     function submitButtonSelector() {
-        return config.submitButtonSelectors.join();
+        return config.selector('submitButtonSelectors');
     }
     const submit = up.mockable((form, options) => {
         return up.render(submitOptions(form, options));
@@ -10281,15 +10272,11 @@ up.form = (function () {
     }
     function isSubmittable(form) {
         form = up.fragment.get(form);
-        return form.matches(fullSubmitSelector()) && !isSubmitDisabled(form);
+        return config.matches(form, 'submitSelectors');
     }
-    function isSubmitDisabled(form) {
-        return form.matches(config.noSubmitSelectors.join());
-    }
-    up.on('submit', fullSubmitSelector, function (event, form) {
-        if (event.defaultPrevented || isSubmitDisabled(form)) {
+    up.on('submit', config.selectorFn('submitSelectors'), function (event, form) {
+        if (event.defaultPrevented)
             return;
-        }
         up.event.halt(event, { log: true });
         up.error.muteUncriticalRejection(submit(form));
     });
@@ -10311,7 +10298,6 @@ up.form = (function () {
     });
     up.compiler('[up-watch]', (formOrField) => watch(formOrField));
     up.compiler('[up-autosubmit]', (formOrField) => autosubmit(formOrField));
-    up.on('up:framework:reset', reset);
     return {
         config,
         submit,
@@ -10354,14 +10340,13 @@ up.feedback = (function () {
         navSelectors: ['[up-nav]', 'nav'],
     }));
     function reset() {
-        config.reset();
         up.layer.root.feedbackLocation = null;
     }
     const CLASS_ACTIVE = 'up-active';
     const CLASS_LOADING = 'up-loading';
     const SELECTOR_LINK = 'a, [up-href]';
     function navSelector() {
-        return config.navSelectors.join();
+        return config.selector('navSelectors');
     }
     function normalizeURL(url) {
         if (url) {
@@ -10469,15 +10454,12 @@ up.radio = (function () {
         hungrySelectors: ['[up-hungry]'],
         pollInterval: 30000,
     }));
-    function reset() {
-        config.reset();
-    }
     function hungrySteps(renderOptions) {
         let { useHungry, origin, layer: renderLayer } = renderOptions;
         let steps = { current: [], other: [] };
         if (!useHungry)
             return steps;
-        let hungrySelector = config.hungrySelectors.join();
+        let hungrySelector = config.selector('hungrySelectors');
         const layerPreference = [renderLayer, ...renderLayer.ancestors, ...renderLayer.descendants];
         for (let elementLayer of layerPreference) {
             let hungries = up.fragment.all(elementLayer.element, hungrySelector, { layer: elementLayer });
@@ -10541,7 +10523,6 @@ up.radio = (function () {
                 event.preventDefault();
         });
     });
-    up.on('up:framework:reset', reset);
     return {
         config,
         hungrySteps,