diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-includes/js/dist/autop.js
--- a/wp/wp-includes/js/dist/autop.js Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-includes/js/dist/autop.js Tue Dec 15 13:49:49 2020 +0100
@@ -82,25 +82,97 @@
/******/
/******/
/******/ // Load entry module and return exports
-/******/ return __webpack_require__(__webpack_require__.s = 254);
+/******/ return __webpack_require__(__webpack_require__.s = 283);
/******/ })
/************************************************************************/
/******/ ({
-/***/ 254:
+/***/ 14:
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, "a", function() { return /* binding */ _slicedToArray; });
+
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayWithHoles.js
+var arrayWithHoles = __webpack_require__(38);
+
+// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/iterableToArrayLimit.js
+function _iterableToArrayLimit(arr, i) {
+ if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
+ var _arr = [];
+ var _n = true;
+ var _d = false;
+ var _e = undefined;
+
+ try {
+ for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+ _arr.push(_s.value);
+
+ if (i && _arr.length === i) break;
+ }
+ } catch (err) {
+ _d = true;
+ _e = err;
+ } finally {
+ try {
+ if (!_n && _i["return"] != null) _i["return"]();
+ } finally {
+ if (_d) throw _e;
+ }
+ }
+
+ return _arr;
+}
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/unsupportedIterableToArray.js
+var unsupportedIterableToArray = __webpack_require__(29);
+
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/nonIterableRest.js
+var nonIterableRest = __webpack_require__(39);
+
+// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js
+
+
+
+
+function _slicedToArray(arr, i) {
+ return Object(arrayWithHoles["a" /* default */])(arr) || _iterableToArrayLimit(arr, i) || Object(unsupportedIterableToArray["a" /* default */])(arr, i) || Object(nonIterableRest["a" /* default */])();
+}
+
+/***/ }),
+
+/***/ 26:
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return _arrayLikeToArray; });
+function _arrayLikeToArray(arr, len) {
+ if (len == null || len > arr.length) len = arr.length;
+
+ for (var i = 0, arr2 = new Array(len); i < len; i++) {
+ arr2[i] = arr[i];
+ }
+
+ return arr2;
+}
+
+/***/ }),
+
+/***/ 283:
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "autop", function() { return autop; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "removep", function() { return removep; });
-/* harmony import */ var _babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(28);
+/* harmony import */ var _babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(14);
/**
* The regular expression for an HTML element.
*
- * @type {String}
+ * @type {RegExp}
*/
var htmlSplitRegex = function () {
/* eslint-disable no-multi-spaces */
@@ -136,7 +208,7 @@
* Separate HTML elements and comments from the text.
*
* @param {string} input The text which has to be formatted.
- * @return {Array} The formatted text.
+ * @return {string[]} The formatted text.
*/
@@ -146,9 +218,16 @@
var match;
while (match = workingInput.match(htmlSplitRegex)) {
- parts.push(workingInput.slice(0, match.index));
+ // The `match` result, when invoked on a RegExp with the `g` flag (`/foo/g`) will not include `index`.
+ // If the `g` flag is omitted, `index` is included.
+ // `htmlSplitRegex` does not have the `g` flag so we can assert it will have an index number.
+ // Assert `match.index` is a number.
+ var index =
+ /** @type {number} */
+ match.index;
+ parts.push(workingInput.slice(0, index));
parts.push(match[0]);
- workingInput = workingInput.slice(match.index + match[0].length);
+ workingInput = workingInput.slice(index + match[0].length);
}
if (workingInput.length) {
@@ -160,9 +239,9 @@
/**
* Replace characters or phrases within HTML elements only.
*
- * @param {string} haystack The text which has to be formatted.
- * @param {Object} replacePairs In the form {from: 'to', ...}.
- * @return {string} The formatted text.
+ * @param {string} haystack The text which has to be formatted.
+ * @param {Record ([^<]+)<\/(div|address|form)>/g, ' $1 , unwrap it.
- text = text.replace(new RegExp(' \\s*(<\/?' + allBlocks + '[^>]*>)\\s*<\/p>', 'g'), '$1'); // In some cases , fix them.
+ text = text.replace(new RegExp(' \\s*(?' + allBlocks + '[^>]*>)\\s* , fix them.
text = text.replace(/ ( , move it inside the ');
text = text.replace(/<\/blockquote><\/p>/g, ' tag, remove it.
- text = text.replace(new RegExp(' \\s*(<\/?' + allBlocks + '[^>]*>)', 'g'), '$1'); // If an opening or closing block element tag is followed by a closing tag, remove it.
+ text = text.replace(new RegExp(' \\s*(?' + allBlocks + '[^>]*>)', 'g'), '$1'); // If an opening or closing block element tag is followed by a closing tag, remove it.
- text = text.replace(new RegExp('(<\/?' + allBlocks + '[^>]*>)\\s*<\/p>', 'g'), '$1'); // Optionally insert line breaks.
+ text = text.replace(new RegExp('(?' + allBlocks + '[^>]*>)\\s*
\s*
/g, '\n\n');
var allBlocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)'; // Add a double line break above block-level opening tags.
- text = text.replace(new RegExp('(<' + allBlocks + '[\\s\/>])', 'g'), '\n\n$1'); // Add a double line break below block-level closing tags.
+ text = text.replace(new RegExp('(<' + allBlocks + '[\\s/>])', 'g'), '\n\n$1'); // Add a double line break below block-level closing tags.
- text = text.replace(new RegExp('(<\/' + allBlocks + '>)', 'g'), '$1\n\n'); // Standardize newline characters to "\n".
+ text = text.replace(new RegExp('(' + allBlocks + '>)', 'g'), '$1\n\n'); // Standardize newline characters to "\n".
text = text.replace(/\r\n|\r/g, '\n'); // Find newlines in all elements and add placeholders.
@@ -312,16 +391,16 @@
text = text.replace(/ is wrapped with a
.
text = text.replace(/
]*)>/gi, '
'); // If an opening or closing block element tag is preceded by an opening
tag is after an opening or closing block tag, remove it.
- text = text.replace(new RegExp('(<\/?' + allBlocks + '[^>]*>)\\s*
', 'g'), '$1'); // If a
tag is before a subset of opening or closing block tags, remove it.
+ text = text.replace(new RegExp('(?' + allBlocks + '[^>]*>)\\s*
', 'g'), '$1'); // If a
tag is before a subset of opening or closing block tags, remove it.
text = text.replace(/
(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)/g, '$1');
text = text.replace(/\n<\/p>$/g, '
tags with their original content. @@ -379,6 +458,8 @@ var blocklist = 'blockquote|ul|ol|li|dl|dt|dd|table|thead|tbody|tfoot|tr|th|td|h[1-6]|fieldset|figure'; var blocklist1 = blocklist + '|div|p'; var blocklist2 = blocklist + '|pre'; + /** @type {string[]} */ + var preserve = []; var preserveLinebreaks = false; var preserveBr = false; @@ -417,7 +498,7 @@ html = html.replace(new RegExp('\\s*(' + blocklist1 + ')>\\s*', 'g'), '$1>\n'); html = html.replace(new RegExp('\\s*<((?:' + blocklist1 + ')(?: [^>]*)?)>', 'g'), '\n<$1>'); // Mark if it has any attributes. - html = html.replace(/(]+>.*?)<\/p>/g, '$1
'); // Preserve the firstinside a
. + html = html.replace(/(]+>[\s\S]*?)<\/p>/g, '$1
'); // Preserve the firstinside a
. html = html.replace(/]*)?>\s*/gi, '
\n\n'); // Remove paragraph tags. @@ -426,7 +507,7 @@ html = html.replace(/\n[\s\u00a0]+\n/g, '\n\n'); // Replace
tags with line breaks. - html = html.replace(/(\s*)
\s*/gi, function (match, space) { + html = html.replace(/(\s*)
\s*/gi, function (_, space) { if (space && space.indexOf('\n') !== -1) { return '\n\n'; } @@ -481,7 +562,10 @@ if (preserve.length) { html = html.replace(//g, function () { - return preserve.shift(); + return ( + /** @type {string} */ + preserve.shift() + ); }); } @@ -491,55 +575,25 @@ /***/ }), -/***/ 28: +/***/ 29: /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; - -// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayWithHoles.js -var arrayWithHoles = __webpack_require__(37); - -// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/iterableToArrayLimit.js -function _iterableToArrayLimit(arr, i) { - var _arr = []; - var _n = true; - var _d = false; - var _e = undefined; - - try { - for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { - _arr.push(_s.value); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return _unsupportedIterableToArray; }); +/* harmony import */ var _arrayLikeToArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(26); - if (i && _arr.length === i) break; - } - } catch (err) { - _d = true; - _e = err; - } finally { - try { - if (!_n && _i["return"] != null) _i["return"](); - } finally { - if (_d) throw _e; - } - } - - return _arr; -} -// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/nonIterableRest.js -var nonIterableRest = __webpack_require__(38); - -// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return _slicedToArray; }); - - - -function _slicedToArray(arr, i) { - return Object(arrayWithHoles["a" /* default */])(arr) || _iterableToArrayLimit(arr, i) || Object(nonIterableRest["a" /* default */])(); +function _unsupportedIterableToArray(o, minLen) { + if (!o) return; + if (typeof o === "string") return Object(_arrayLikeToArray__WEBPACK_IMPORTED_MODULE_0__[/* default */ "a"])(o, minLen); + var n = Object.prototype.toString.call(o).slice(8, -1); + if (n === "Object" && o.constructor) n = o.constructor.name; + if (n === "Map" || n === "Set") return Array.from(o); + if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return Object(_arrayLikeToArray__WEBPACK_IMPORTED_MODULE_0__[/* default */ "a"])(o, minLen); } /***/ }), -/***/ 37: +/***/ 38: /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -550,13 +604,13 @@ /***/ }), -/***/ 38: +/***/ 39: /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return _nonIterableRest; }); function _nonIterableRest() { - throw new TypeError("Invalid attempt to destructure non-iterable instance"); + throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } /***/ })