@readme/markdown 6.49.0 → 6.52.0

package/components/Anchor.jsx

@@ -6,29 +6,33 @@ const BaseUrlContext = require('../contexts/BaseUrl');
 // Nabbed from here:
 // https://github.com/readmeio/api-explorer/blob/0dedafcf71102feedaa4145040d3f57d79d95752/packages/api-explorer/src/lib/markdown/renderer.js#L52
 function getHref(href, baseUrl) {
+  const [path, hash] = href.split('#');
+  const hashStr = hash ? `#${hash}` : '';
+
   const base = baseUrl === '/' ? '' : baseUrl;
-  const doc = href.match(/^doc:([-_a-zA-Z0-9#]*)$/);
+  const doc = path.match(/^doc:([-_a-zA-Z0-9#]*)$/);
+
   if (doc) {
-    return `${base}/docs/${doc[1]}`;
+    return `${base}/docs/${doc[1]}${hashStr}`;
   }
 
-  const ref = href.match(/^ref:([-_a-zA-Z0-9#]*)$/);
+  const ref = path.match(/^ref:([-_a-zA-Z0-9#]*)$/);
   if (ref) {
-    return `${base}/reference-link/${ref[1]}`;
+    return `${base}/reference-link/${ref[1]}${hashStr}`;
   }
 
   // we need to perform two matches for changelogs in case
   // of legacy links that use 'blog' instead of 'changelog'
-  const blog = href.match(/^blog:([-_a-zA-Z0-9#]*)$/);
-  const changelog = href.match(/^changelog:([-_a-zA-Z0-9#]*)$/);
+  const blog = path.match(/^blog:([-_a-zA-Z0-9#]*)$/);
+  const changelog = path.match(/^changelog:([-_a-zA-Z0-9#]*)$/);
   const changelogMatch = blog || changelog;
   if (changelogMatch) {
-    return `${base}/changelog/${changelogMatch[1]}`;
+    return `${base}/changelog/${changelogMatch[1]}${hashStr}`;
   }
 
-  const custompage = href.match(/^page:([-_a-zA-Z0-9#]*)$/);
+  const custompage = path.match(/^page:([-_a-zA-Z0-9#]*)$/);
   if (custompage) {
-    return `${base}/page/${custompage[1]}`;
+    return `${base}/page/${custompage[1]}${hashStr}`;
   }
 
   return href;

package/dist/main.js

@@ -9094,6 +9094,8 @@ var _extends = __webpack_require__(7154);
 
 var _objectWithoutProperties = __webpack_require__(6479);
 
+var _slicedToArray = __webpack_require__(3038);
+
 var _excluded = ["baseUrl", "children", "href", "target", "title"];
 
 var React = __webpack_require__(4466);
@@ -9105,33 +9107,39 @@ var BaseUrlContext = __webpack_require__(6785); // Nabbed from here:
 
 
 function getHref(href, baseUrl) {
+  var _href$split = href.split('#'),
+      _href$split2 = _slicedToArray(_href$split, 2),
+      path = _href$split2[0],
+      hash = _href$split2[1];
+
+  var hashStr = hash ? "#".concat(hash) : '';
   var base = baseUrl === '/' ? '' : baseUrl;
-  var doc = href.match(/^doc:([-_a-zA-Z0-9#]*)$/);
+  var doc = path.match(/^doc:([-_a-zA-Z0-9#]*)$/);
 
   if (doc) {
-    return "".concat(base, "/docs/").concat(doc[1]);
+    return "".concat(base, "/docs/").concat(doc[1]).concat(hashStr);
   }
 
-  var ref = href.match(/^ref:([-_a-zA-Z0-9#]*)$/);
+  var ref = path.match(/^ref:([-_a-zA-Z0-9#]*)$/);
 
   if (ref) {
-    return "".concat(base, "/reference-link/").concat(ref[1]);
+    return "".concat(base, "/reference-link/").concat(ref[1]).concat(hashStr);
   } // we need to perform two matches for changelogs in case
   // of legacy links that use 'blog' instead of 'changelog'
 
 
-  var blog = href.match(/^blog:([-_a-zA-Z0-9#]*)$/);
-  var changelog = href.match(/^changelog:([-_a-zA-Z0-9#]*)$/);
+  var blog = path.match(/^blog:([-_a-zA-Z0-9#]*)$/);
+  var changelog = path.match(/^changelog:([-_a-zA-Z0-9#]*)$/);
   var changelogMatch = blog || changelog;
 
   if (changelogMatch) {
-    return "".concat(base, "/changelog/").concat(changelogMatch[1]);
+    return "".concat(base, "/changelog/").concat(changelogMatch[1]).concat(hashStr);
   }
 
-  var custompage = href.match(/^page:([-_a-zA-Z0-9#]*)$/);
+  var custompage = path.match(/^page:([-_a-zA-Z0-9#]*)$/);
 
   if (custompage) {
-    return "".concat(base, "/page/").concat(custompage[1]);
+    return "".concat(base, "/page/").concat(custompage[1]).concat(hashStr);
   }
 
   return href;
@@ -27941,6 +27949,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0,_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var options = {
+  alwaysThrow: false,
   compatibilityMode: false,
   copyButtons: true,
   correctnewlines: false,
@@ -27951,8 +27960,7 @@ var options = {
     ruleSpaces: false,
     listItemIndent: '1',
     spacedTable: true,
-    paddedTable: true,
-    setext: true
+    paddedTable: true
   },
   normalize: true,
   safeMode: false,
@@ -28137,12 +28145,16 @@ var _require = __webpack_require__(7589),
     imgSizeByWidth = _require.imgSizeByWidth;
 
 var compileImage = function compileImage(image) {
+  var _ref = image.data.hProperties || {},
+      className = _ref.className,
+      width = _ref.width;
+
   var img = _objectSpread(_objectSpread({
     image: [image.url, image.title, image.alt]
-  }, image.data.hProperties.width && {
-    sizing: imgSizeByWidth[image.data.hProperties.width]
-  }), image.border && {
-    border: image.border
+  }, width && {
+    sizing: imgSizeByWidth[width]
+  }), className === 'border' && {
+    border: true
   });
 
   return img;
@@ -28230,15 +28242,21 @@ module.exports = function ImageCompiler() {
   var originalImageCompiler = visitors.image;
 
   visitors.image = function compile(node) {
-    var _node$data, _node$data$hPropertie, _node$data2, _node$data2$hProperti, _visitors$figure;
+    var _node$data, _node$data$hPropertie, _node$data2, _visitors$figure;
+
+    if (((_node$data = node.data) === null || _node$data === void 0 ? void 0 : (_node$data$hPropertie = _node$data.hProperties) === null || _node$data$hPropertie === void 0 ? void 0 : _node$data$hPropertie.className) === 'emoji') return node.title; // Use magic block instead of markdown when there are certain defined properties we can't store in markdown
 
-    if (((_node$data = node.data) === null || _node$data === void 0 ? void 0 : (_node$data$hPropertie = _node$data.hProperties) === null || _node$data$hPropertie === void 0 ? void 0 : _node$data$hPropertie.className) === 'emoji') return node.title;
+    var _ref = ((_node$data2 = node.data) === null || _node$data2 === void 0 ? void 0 : _node$data2.hProperties) || {},
+        className = _ref.className,
+        width = _ref.width;
+
+    var useMagicBlock = Boolean(width) || (className === null || className === void 0 ? void 0 : className.length);
 
     for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
       args[_key - 1] = arguments[_key];
     }
 
-    if ((_node$data2 = node.data) !== null && _node$data2 !== void 0 && (_node$data2$hProperti = _node$data2.hProperties) !== null && _node$data2$hProperti !== void 0 && _node$data2$hProperti.width) return (_visitors$figure = visitors.figure).call.apply(_visitors$figure, [this, node].concat(args));
+    if (useMagicBlock) return (_visitors$figure = visitors.figure).call.apply(_visitors$figure, [this, node].concat(args));
     return originalImageCompiler.call.apply(originalImageCompiler, [this, node].concat(args));
   };
 };
@@ -28483,8 +28501,8 @@ var emojiRegex = __webpack_require__(809);
 var rgx = new RegExp("^> ?(".concat(emojiRegex().source, ")(?: +(.+)?)?\n((?:>(?: .*)?\n)*)"));
 var themes = {
   "\uD83D\uDCD8": 'info',
-  "\u26A0\uFE0F": 'warn',
   "\uD83D\uDEA7": 'warn',
+  "\u26A0\uFE0F": 'warn',
   "\uD83D\uDC4D": 'okay',
   "\u2705": 'okay',
   "\u2757": 'error',
@@ -28905,6 +28923,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var RGXP = /^\[block:(.*)\]([^]+?)\[\/block\]/;
 var compatibilityMode;
 var safeMode;
+var alwaysThrow;
 
 var WrapPinnedBlocks = function WrapPinnedBlocks(node, json) {
   if (!json.sidebar) return node;
@@ -28953,6 +28972,10 @@ function tokenize(eat, value) {
     json = {}; // eslint-disable-next-line no-console
 
     console.error('Invalid Magic Block JSON:', err);
+
+    if (alwaysThrow) {
+      throw new Error('Invalid Magic Block JSON');
+    }
   }
 
   if (Object.keys(json).length < 1) return eat(match);
@@ -29209,6 +29232,7 @@ function parser() {
   var methods = Parser.prototype.blockMethods;
   if (this.data('compatibilityMode')) compatibilityMode = true;
   if (this.data('safeMode')) safeMode = true;
+  if (this.data('alwaysThrow')) alwaysThrow = true;
   tokenizers.magicBlocks = tokenize;
   methods.splice(methods.indexOf('newline'), 0, 'magicBlocks');
 }
@@ -52263,7 +52287,7 @@ function processor() {
   opts = _setup2[1];
   var _opts = opts,
       sanitize = _opts.sanitize;
-  return unified().use(remarkParse, opts.markdownOptions).use(remarkFrontmatter, ['yaml', 'toml']).data('settings', opts.settings).data('compatibilityMode', opts.compatibilityMode).use(!opts.correctnewlines ? remarkBreaks : function () {}).use(CustomParsers.map(function (parser) {
+  return unified().use(remarkParse, opts.markdownOptions).use(remarkFrontmatter, ['yaml', 'toml']).data('settings', opts.settings).data('compatibilityMode', opts.compatibilityMode).data('alwaysThrow', opts.alwaysThrow).use(!opts.correctnewlines ? remarkBreaks : function () {}).use(CustomParsers.map(function (parser) {
     return parser.sanitize(sanitize);
   })).use(remarkSlug).use(remarkDisableTokenizers, opts.disableTokenizers).use(remarkRehype, {
     allowDangerousHtml: true

package/dist/main.node.js

@@ -9094,6 +9094,8 @@ var _extends = __webpack_require__(7154);
 
 var _objectWithoutProperties = __webpack_require__(6479);
 
+var _slicedToArray = __webpack_require__(3038);
+
 var _excluded = ["baseUrl", "children", "href", "target", "title"];
 
 var React = __webpack_require__(4466);
@@ -9105,33 +9107,39 @@ var BaseUrlContext = __webpack_require__(6785); // Nabbed from here:
 
 
 function getHref(href, baseUrl) {
+  var _href$split = href.split('#'),
+      _href$split2 = _slicedToArray(_href$split, 2),
+      path = _href$split2[0],
+      hash = _href$split2[1];
+
+  var hashStr = hash ? "#".concat(hash) : '';
   var base = baseUrl === '/' ? '' : baseUrl;
-  var doc = href.match(/^doc:([-_a-zA-Z0-9#]*)$/);
+  var doc = path.match(/^doc:([-_a-zA-Z0-9#]*)$/);
 
   if (doc) {
-    return "".concat(base, "/docs/").concat(doc[1]);
+    return "".concat(base, "/docs/").concat(doc[1]).concat(hashStr);
   }
 
-  var ref = href.match(/^ref:([-_a-zA-Z0-9#]*)$/);
+  var ref = path.match(/^ref:([-_a-zA-Z0-9#]*)$/);
 
   if (ref) {
-    return "".concat(base, "/reference-link/").concat(ref[1]);
+    return "".concat(base, "/reference-link/").concat(ref[1]).concat(hashStr);
   } // we need to perform two matches for changelogs in case
   // of legacy links that use 'blog' instead of 'changelog'
 
 
-  var blog = href.match(/^blog:([-_a-zA-Z0-9#]*)$/);
-  var changelog = href.match(/^changelog:([-_a-zA-Z0-9#]*)$/);
+  var blog = path.match(/^blog:([-_a-zA-Z0-9#]*)$/);
+  var changelog = path.match(/^changelog:([-_a-zA-Z0-9#]*)$/);
   var changelogMatch = blog || changelog;
 
   if (changelogMatch) {
-    return "".concat(base, "/changelog/").concat(changelogMatch[1]);
+    return "".concat(base, "/changelog/").concat(changelogMatch[1]).concat(hashStr);
   }
 
-  var custompage = href.match(/^page:([-_a-zA-Z0-9#]*)$/);
+  var custompage = path.match(/^page:([-_a-zA-Z0-9#]*)$/);
 
   if (custompage) {
-    return "".concat(base, "/page/").concat(custompage[1]);
+    return "".concat(base, "/page/").concat(custompage[1]).concat(hashStr);
   }
 
   return href;
@@ -10763,6 +10771,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var options = {
+  alwaysThrow: false,
   compatibilityMode: false,
   copyButtons: true,
   correctnewlines: false,
@@ -10773,8 +10782,7 @@ var options = {
     ruleSpaces: false,
     listItemIndent: '1',
     spacedTable: true,
-    paddedTable: true,
-    setext: true
+    paddedTable: true
   },
   normalize: true,
   safeMode: false,
@@ -10959,12 +10967,16 @@ var _require = __webpack_require__(7589),
     imgSizeByWidth = _require.imgSizeByWidth;
 
 var compileImage = function compileImage(image) {
+  var _ref = image.data.hProperties || {},
+      className = _ref.className,
+      width = _ref.width;
+
   var img = _objectSpread(_objectSpread({
     image: [image.url, image.title, image.alt]
-  }, image.data.hProperties.width && {
-    sizing: imgSizeByWidth[image.data.hProperties.width]
-  }), image.border && {
-    border: image.border
+  }, width && {
+    sizing: imgSizeByWidth[width]
+  }), className === 'border' && {
+    border: true
   });
 
   return img;
@@ -11052,15 +11064,21 @@ module.exports = function ImageCompiler() {
   var originalImageCompiler = visitors.image;
 
   visitors.image = function compile(node) {
-    var _node$data, _node$data$hPropertie, _node$data2, _node$data2$hProperti, _visitors$figure;
+    var _node$data, _node$data$hPropertie, _node$data2, _visitors$figure;
+
+    if (((_node$data = node.data) === null || _node$data === void 0 ? void 0 : (_node$data$hPropertie = _node$data.hProperties) === null || _node$data$hPropertie === void 0 ? void 0 : _node$data$hPropertie.className) === 'emoji') return node.title; // Use magic block instead of markdown when there are certain defined properties we can't store in markdown
 
-    if (((_node$data = node.data) === null || _node$data === void 0 ? void 0 : (_node$data$hPropertie = _node$data.hProperties) === null || _node$data$hPropertie === void 0 ? void 0 : _node$data$hPropertie.className) === 'emoji') return node.title;
+    var _ref = ((_node$data2 = node.data) === null || _node$data2 === void 0 ? void 0 : _node$data2.hProperties) || {},
+        className = _ref.className,
+        width = _ref.width;
+
+    var useMagicBlock = Boolean(width) || (className === null || className === void 0 ? void 0 : className.length);
 
     for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
       args[_key - 1] = arguments[_key];
     }
 
-    if ((_node$data2 = node.data) !== null && _node$data2 !== void 0 && (_node$data2$hProperti = _node$data2.hProperties) !== null && _node$data2$hProperti !== void 0 && _node$data2$hProperti.width) return (_visitors$figure = visitors.figure).call.apply(_visitors$figure, [this, node].concat(args));
+    if (useMagicBlock) return (_visitors$figure = visitors.figure).call.apply(_visitors$figure, [this, node].concat(args));
     return originalImageCompiler.call.apply(originalImageCompiler, [this, node].concat(args));
   };
 };
@@ -11305,8 +11323,8 @@ var emojiRegex = __webpack_require__(809);
 var rgx = new RegExp("^> ?(".concat(emojiRegex().source, ")(?: +(.+)?)?\n((?:>(?: .*)?\n)*)"));
 var themes = {
   "\uD83D\uDCD8": 'info',
-  "\u26A0\uFE0F": 'warn',
   "\uD83D\uDEA7": 'warn',
+  "\u26A0\uFE0F": 'warn',
   "\uD83D\uDC4D": 'okay',
   "\u2705": 'okay',
   "\u2757": 'error',
@@ -11727,6 +11745,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var RGXP = /^\[block:(.*)\]([^]+?)\[\/block\]/;
 var compatibilityMode;
 var safeMode;
+var alwaysThrow;
 
 var WrapPinnedBlocks = function WrapPinnedBlocks(node, json) {
   if (!json.sidebar) return node;
@@ -11775,6 +11794,10 @@ function tokenize(eat, value) {
     json = {}; // eslint-disable-next-line no-console
 
     console.error('Invalid Magic Block JSON:', err);
+
+    if (alwaysThrow) {
+      throw new Error('Invalid Magic Block JSON');
+    }
   }
 
   if (Object.keys(json).length < 1) return eat(match);
@@ -12031,6 +12054,7 @@ function parser() {
   var methods = Parser.prototype.blockMethods;
   if (this.data('compatibilityMode')) compatibilityMode = true;
   if (this.data('safeMode')) safeMode = true;
+  if (this.data('alwaysThrow')) alwaysThrow = true;
   tokenizers.magicBlocks = tokenize;
   methods.splice(methods.indexOf('newline'), 0, 'magicBlocks');
 }
@@ -34608,7 +34632,7 @@ function processor() {
   opts = _setup2[1];
   var _opts = opts,
       sanitize = _opts.sanitize;
-  return unified().use(remarkParse, opts.markdownOptions).use(remarkFrontmatter, ['yaml', 'toml']).data('settings', opts.settings).data('compatibilityMode', opts.compatibilityMode).use(!opts.correctnewlines ? remarkBreaks : function () {}).use(CustomParsers.map(function (parser) {
+  return unified().use(remarkParse, opts.markdownOptions).use(remarkFrontmatter, ['yaml', 'toml']).data('settings', opts.settings).data('compatibilityMode', opts.compatibilityMode).data('alwaysThrow', opts.alwaysThrow).use(!opts.correctnewlines ? remarkBreaks : function () {}).use(CustomParsers.map(function (parser) {
     return parser.sanitize(sanitize);
   })).use(remarkSlug).use(remarkDisableTokenizers, opts.disableTokenizers).use(remarkRehype, {
     allowDangerousHtml: true

package/package.json

@@ -2,7 +2,7 @@
   "name": "@readme/markdown",
   "description": "ReadMe's React-based Markdown parser",
   "author": "Rafe Goldberg <rafe@readme.io>",
-  "version": "6.49.0",
+  "version": "6.52.0",
   "main": "dist/main.node.js",
   "browser": "dist/main.js",
   "files": [