Merge branch 'main' into next

Author: KaneFreeman

lerna.json

@@ -1,4 +1,4 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.4.1"
+  "version": "3.4.2"
 }

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@staticcms/app",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "license": "MIT",
   "description": "Static CMS application.",
   "repository": "https://github.com/StaticJsCMS/static-cms",
@@ -39,7 +39,7 @@
   "dependencies": {
     "@babel/eslint-parser": "7.22.15",
     "@babel/runtime": "7.23.1",
-    "@staticcms/core": "^3.4.1",
+    "@staticcms/core": "^3.4.2",
     "buffer": "6.0.3",
     "react": "18.2.0",
     "react-dom": "18.2.0",

packages/core/dev-test/config.yml

@@ -71,7 +71,7 @@ collections:
       - label: Body
         name: body
         widget: markdown
-        hint: Main content goes here.
+        hint: "*Main* __content__ __*goes*__ [here](example.com)."
   - name: faq
     label: FAQ
     folder: _faqs

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@staticcms/core",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "license": "MIT",
   "description": "Static CMS core application.",
   "repository": "https://github.com/StaticJsCMS/static-cms",
@@ -139,6 +139,7 @@
     "react-dom": "18.2.0",
     "react-frame-component": "5.2.6",
     "react-is": "18.2.0",
+    "react-markdown": "8.0.7",
     "react-polyglot": "0.7.2",
     "react-redux": "8.1.3",
     "react-resizable-panels": "0.0.55",
@@ -148,6 +149,7 @@
     "react-virtualized-auto-sizer": "1.0.20",
     "react-waypoint": "10.3.0",
     "react-window": "1.8.9",
+    "remark-gfm": "4.0.0",
     "remark-html": "15.0.2",
     "remark-mdx": "2.3.0",
     "remark-parse": "10.0.1",

packages/core/src/__mocks__/react-markdown.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+
+import type { FC, PropsWithChildren } from 'react';
+
+const ReactMarkdown: FC<PropsWithChildren> = ({ children }) => {
+  return React.createElement('div', {}, [children]);
+};
+
+export default ReactMarkdown;

packages/core/src/components/common/field/Hint.css

@@ -1,15 +1,21 @@
 .CMS_Hint_root {
   @apply w-full
-    flex
-    text-xs
-    italic;
+    text-xs;
 
   &:not(.CMS_Hint_inline) {
     @apply px-3
       pt-1;
   }
 }
 
+.CMS_Hint_link {
+  color: inherit;
+
+  &:hover {
+    @apply underline;
+  }
+}
+
 .CMS_Hint_cursor-pointer {
   @apply cursor-pointer;
 }

packages/core/src/components/common/field/Hint.tsx

@@ -1,4 +1,6 @@
 import React from 'react';
+import ReactMarkdown from 'react-markdown';
+import gfm from 'remark-gfm';
 
 import useCursor from '@staticcms/core/lib/hooks/useCursor';
 import classNames from '@staticcms/core/lib/util/classNames.util';
@@ -14,6 +16,7 @@ export const classes = generateClassNames('Hint', [
   'cursor-pointer',
   'cursor-text',
   'cursor-default',
+  'link',
 ]);
 
 export interface HintProps {
@@ -46,7 +49,18 @@ const Hint: FC<HintProps> = ({
         className,
       )}
     >
-      {children}
+      <ReactMarkdown
+        remarkPlugins={[gfm]}
+        allowedElements={['a', 'strong', 'em', 'del']}
+        unwrapDisallowed={true}
+        components={{
+          a: ({ node: _node, ...props }) => (
+            <a {...props} target="_blank" rel="noopener noreferrer" className={classes.link} />
+          ),
+        }}
+      >
+        {children}
+      </ReactMarkdown>
     </div>
   );
 };

packages/docs/content/releases.json

@@ -1,5 +1,10 @@
 {
   "releases": [
+    {
+      "date": "2023-10-27T10:00:00.000Z",
+      "version": "v3.4.2",
+      "type": "patch"
+    },
     {
       "date": "2023-10-26T10:00:00.000Z",
       "version": "v3.4.1",