@docusaurus/theme-classic 0.0.0-4184 → 0.0.0-4192

package/lib/deps.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+declare module 'prism-react-renderer/prism' {
+  import type * as PrismNamespace from 'prismjs';
+
+  const Prism: typeof PrismNamespace;
+  export default Prism;
+}

package/lib/theme/CodeBlock/index.js

@@ -13,16 +13,14 @@ var _prismReactRenderer = _interopRequireWildcard(require("prism-react-renderer"
 
 var _copyTextToClipboard = _interopRequireDefault(require("copy-text-to-clipboard"));
 
-var _parseNumericRange = _interopRequireDefault(require("parse-numeric-range"));
+var _Translate = _interopRequireWildcard(require("@docusaurus/Translate"));
 
-var _usePrismTheme = _interopRequireDefault(require("@theme/hooks/usePrismTheme"));
+var _themeCommon = require("@docusaurus/theme-common");
 
-var _Translate = _interopRequireWildcard(require("@docusaurus/Translate"));
+var _usePrismTheme = _interopRequireDefault(require("@theme/hooks/usePrismTheme"));
 
 var _stylesModule = _interopRequireDefault(require("./styles.module.css"));
 
-var _themeCommon = require("@docusaurus/theme-common");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -35,79 +33,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-const HighlightLinesRangeRegex = /{([\d,-]+)}/;
-const HighlightLanguages = ['js', 'jsBlock', 'jsx', 'python', 'html'];
-// Supported types of highlight comments
-const HighlightComments = {
-  js: {
-    start: '\\/\\/',
-    end: ''
-  },
-  jsBlock: {
-    start: '\\/\\*',
-    end: '\\*\\/'
-  },
-  jsx: {
-    start: '\\{\\s*\\/\\*',
-    end: '\\*\\/\\s*\\}'
-  },
-  python: {
-    start: '#',
-    end: ''
-  },
-  html: {
-    start: '<!--',
-    end: '-->'
-  }
-}; // Supported highlight directives
-
-const HighlightDirectives = ['highlight-next-line', 'highlight-start', 'highlight-end'];
-
-const getHighlightDirectiveRegex = (languages = HighlightLanguages) => {
-  // to be more reliable, the opening and closing comment must match
-  const commentPattern = languages.map(lang => {
-    const {
-      start,
-      end
-    } = HighlightComments[lang];
-    return `(?:${start}\\s*(${HighlightDirectives.join('|')})\\s*${end})`;
-  }).join('|'); // white space is allowed, but otherwise it should be on it's own line
-
-  return new RegExp(`^\\s*(?:${commentPattern})\\s*$`);
-}; // select comment styles based on language
-
-
-const highlightDirectiveRegex = lang => {
-  switch (lang) {
-    case 'js':
-    case 'javascript':
-    case 'ts':
-    case 'typescript':
-      return getHighlightDirectiveRegex(['js', 'jsBlock']);
-
-    case 'jsx':
-    case 'tsx':
-      return getHighlightDirectiveRegex(['js', 'jsBlock', 'jsx']);
-
-    case 'html':
-      return getHighlightDirectiveRegex(['js', 'jsBlock', 'html']);
-
-    case 'python':
-    case 'py':
-      return getHighlightDirectiveRegex(['python']);
-
-    default:
-      // all comment types
-      return getHighlightDirectiveRegex();
-  }
-};
-
 function CodeBlock({
   children,
   className: blockClassName,
   metastring,
   title
 }) {
+  var _parseLanguage;
+
   const {
     prism
   } = (0, _themeCommon.useThemeConfig)();
@@ -127,71 +60,14 @@ function CodeBlock({
   // (note: title="xyz" => title prop still has the quotes)
 
   const codeBlockTitle = (0, _themeCommon.parseCodeBlockTitle)(metastring) || title;
-  const button = (0, _react.useRef)(null);
-  let highlightLines = [];
   const prismTheme = (0, _usePrismTheme.default)(); // In case interleaved Markdown (e.g. when using CodeBlock as standalone component).
 
   const content = Array.isArray(children) ? children.join('') : children;
-
-  if (metastring && HighlightLinesRangeRegex.test(metastring)) {
-    // Tested above
-    const highlightLinesRange = metastring.match(HighlightLinesRangeRegex)[1];
-    highlightLines = (0, _parseNumericRange.default)(highlightLinesRange).filter(n => n > 0);
-  }
-
-  const languageClassName = blockClassName === null || blockClassName === void 0 ? void 0 : blockClassName.split(' ').find(str => str.startsWith('language-'));
-  let language = languageClassName === null || languageClassName === void 0 ? void 0 : languageClassName.replace(/language-/, '');
-
-  if (!language && prism.defaultLanguage) {
-    language = prism.defaultLanguage;
-  } // only declaration OR directive highlight can be used for a block
-
-
-  let code = content.replace(/\n$/, '');
-
-  if (highlightLines.length === 0 && language !== undefined) {
-    let range = '';
-    const directiveRegex = highlightDirectiveRegex(language); // go through line by line
-
-    const lines = content.replace(/\n$/, '').split('\n');
-    let blockStart; // loop through lines
-
-    for (let index = 0; index < lines.length;) {
-      const line = lines[index]; // adjust for 0-index
-
-      const lineNumber = index + 1;
-      const match = line.match(directiveRegex);
-
-      if (match !== null) {
-        const directive = match.slice(1).reduce((final, item) => final || item, undefined);
-
-        switch (directive) {
-          case 'highlight-next-line':
-            range += `${lineNumber},`;
-            break;
-
-          case 'highlight-start':
-            blockStart = lineNumber;
-            break;
-
-          case 'highlight-end':
-            range += `${blockStart}-${lineNumber - 1},`;
-            break;
-
-          default:
-            break;
-        }
-
-        lines.splice(index, 1);
-      } else {
-        // lines without directives are unchanged
-        index += 1;
-      }
-    }
-
-    highlightLines = (0, _parseNumericRange.default)(range);
-    code = lines.join('\n');
-  }
+  const language = (_parseLanguage = (0, _themeCommon.parseLanguage)(blockClassName)) !== null && _parseLanguage !== void 0 ? _parseLanguage : prism.defaultLanguage;
+  const {
+    highlightLines,
+    code
+  } = (0, _themeCommon.parseLines)(content, metastring, language);
 
   const handleCopyCode = () => {
     (0, _copyTextToClipboard.default)(code);
@@ -206,7 +82,7 @@ function CodeBlock({
       tokens,
       getLineProps,
       getTokenProps
-    }) => <div className={(0, _clsx.default)(_stylesModule.default.codeBlockContainer, blockClassName === null || blockClassName === void 0 ? void 0 : blockClassName.replace(/language-[^ ]+/, ''))}>
+    }) => <div className={(0, _clsx.default)(_stylesModule.default.codeBlockContainer, blockClassName)}>
           {codeBlockTitle && <div style={style} className={_stylesModule.default.codeBlockTitle}>
               {codeBlockTitle}
             </div>}
@@ -225,7 +101,7 @@ function CodeBlock({
                 key: i
               });
 
-              if (highlightLines.includes(i + 1)) {
+              if (highlightLines.includes(i)) {
                 lineProps.className += ' docusaurus-highlight-code-line';
               }
 
@@ -240,7 +116,7 @@ function CodeBlock({
               </code>
             </pre>
 
-            <button ref={button} type="button" aria-label={(0, _Translate.translate)({
+            <button type="button" aria-label={(0, _Translate.translate)({
           id: 'theme.CodeBlock.copyButtonAriaLabel',
           message: 'Copy code to clipboard',
           description: 'The ARIA label for copy code blocks button'

package/lib/theme/NavbarItem/DocNavbarItem.js

@@ -17,8 +17,6 @@ var _index = require("./index");
 
 var _themeCommon = require("@docusaurus/theme-common");
 
-var _utilsCommon = require("@docusaurus/utils-common");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -55,7 +53,7 @@ function DocNavbarItem({
   } = (0, _themeCommon.useDocsPreferredVersion)(docsPluginId);
   const latestVersion = (0, _useDocs.useLatestVersion)(docsPluginId); // Versions used to look for the doc to link to, ordered + no duplicate
 
-  const versions = (0, _utilsCommon.uniq)([activeVersion, preferredVersion, latestVersion].filter(Boolean));
+  const versions = (0, _themeCommon.uniq)([activeVersion, preferredVersion, latestVersion].filter(Boolean));
   const doc = getDocInVersions(versions, docId);
   const activeDocInfimaClassName = (0, _index.getInfimaActiveClassName)(props.mobile);
   return <_DefaultNavbarItem.default exact {...props} className={(0, _clsx.default)(props.className, {