@atlaskit/editor-plugin-code-block-advanced 12.0.31 → 12.1.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-plugin-code-block-advanced
 
+## 12.1.0
+
+### Minor Changes
+
+- [`6891ca32d94cc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6891ca32d94cc) -
+  Add `Mermaid` as a selectable language in the code block language picker, behind the
+  `platform_editor_code_block_mermaid_language` feature gate. When the gate is enabled, Mermaid
+  appears in the picker and the advanced (CodeMirror) code block provides Mermaid syntax
+  highlighting via `codemirror-lang-mermaid`. The language is intentionally kept out of the shared
+  `@atlaskit/code` supported-languages list so it is fully gated and does not leak into other
+  consumers.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 12.0.32
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 12.0.31
 
 ### Patch Changes

package/dist/cjs/nodeviews/languages/getLanguageName.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.DEFAULT_LANGUAGES = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _constants = require("@atlaskit/code/constants");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 // We expect alias[0] to be used for the ADF attribute, see ED-2813
 var DEFAULT_LANGUAGES = exports.DEFAULT_LANGUAGES = [{
   name: '(None)',
@@ -17,6 +18,11 @@ var getLanguageName = function getLanguageName(languageValue) {
   if (!languageValue) {
     return undefined;
   }
+
+  // mermaid is gated out of the shared SUPPORTED_LANGUAGES list, so resolve it here
+  if (languageValue === 'mermaid' && (0, _platformFeatureFlags.fg)('platform_editor_code_block_mermaid_language')) {
+    return 'Mermaid';
+  }
   var language = _constants.SUPPORTED_LANGUAGES.find(function (l) {
     return l.value === languageValue || l.alias && l.alias.includes(languageValue);
   });

package/dist/cjs/nodeviews/languages/languageMap.js

@@ -8,12 +8,35 @@ exports.mapLanguageToCodeMirror = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _language = require("@codemirror/language");
 var _languageData = require("@codemirror/language-data");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 // getLanguageIdentifier defines `language.alias[0]`
 var mapLanguageToCodeMirror = exports.mapLanguageToCodeMirror = function mapLanguageToCodeMirror(language) {
   if (!language || language === 'none') {
     return undefined;
   }
+  // mermaid is gated out of the shared SUPPORTED_LANGUAGES list; load its grammar only when the gate is on
+  if (language === 'mermaid') {
+    if (!(0, _platformFeatureFlags.fg)('platform_editor_code_block_mermaid_language')) {
+      return undefined;
+    }
+    return _language.LanguageDescription.of({
+      name: 'Mermaid',
+      load: function load() {
+        return Promise.resolve().then(function () {
+          return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlaskit/editor-plugin-code-block-advanced-lang-mermaid" */
+          'codemirror-lang-mermaid'));
+        }).then(function (m) {
+          return (
+            // Construct locally (like the Handlebars case) to avoid a type clash between
+            // this package's `@codemirror/language` and the copy codemirror-lang-mermaid
+            // bundles; equivalent to the package's own `mermaid()`.
+            new _language.LanguageSupport(m.mermaidLanguage)
+          );
+        });
+      }
+    });
+  }
   switch (language) {
     case 'markdown':
       return _language.LanguageDescription.of({

package/dist/es2019/nodeviews/languages/getLanguageName.js

@@ -1,4 +1,5 @@
 import { SUPPORTED_LANGUAGES } from '@atlaskit/code/constants';
+import { fg } from '@atlaskit/platform-feature-flags';
 
 // We expect alias[0] to be used for the ADF attribute, see ED-2813
 export const DEFAULT_LANGUAGES = [{
@@ -10,6 +11,11 @@ const getLanguageName = languageValue => {
   if (!languageValue) {
     return undefined;
   }
+
+  // mermaid is gated out of the shared SUPPORTED_LANGUAGES list, so resolve it here
+  if (languageValue === 'mermaid' && fg('platform_editor_code_block_mermaid_language')) {
+    return 'Mermaid';
+  }
   const language = SUPPORTED_LANGUAGES.find(l => {
     return l.value === languageValue || l.alias && l.alias.includes(languageValue);
   });

package/dist/es2019/nodeviews/languages/languageMap.js

@@ -1,10 +1,28 @@
 import { LanguageDescription, LanguageSupport } from '@codemirror/language';
 import { languages } from '@codemirror/language-data';
+import { fg } from '@atlaskit/platform-feature-flags';
 // getLanguageIdentifier defines `language.alias[0]`
 export const mapLanguageToCodeMirror = language => {
   if (!language || language === 'none') {
     return undefined;
   }
+  // mermaid is gated out of the shared SUPPORTED_LANGUAGES list; load its grammar only when the gate is on
+  if (language === 'mermaid') {
+    if (!fg('platform_editor_code_block_mermaid_language')) {
+      return undefined;
+    }
+    return LanguageDescription.of({
+      name: 'Mermaid',
+      load() {
+        return import( /* webpackChunkName: "@atlaskit-internal_@atlaskit/editor-plugin-code-block-advanced-lang-mermaid" */
+        'codemirror-lang-mermaid').then(m =>
+        // Construct locally (like the Handlebars case) to avoid a type clash between
+        // this package's `@codemirror/language` and the copy codemirror-lang-mermaid
+        // bundles; equivalent to the package's own `mermaid()`.
+        new LanguageSupport(m.mermaidLanguage));
+      }
+    });
+  }
   switch (language) {
     case 'markdown':
       return LanguageDescription.of({

package/dist/esm/nodeviews/languages/getLanguageName.js

@@ -1,5 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { SUPPORTED_LANGUAGES } from '@atlaskit/code/constants';
+import { fg } from '@atlaskit/platform-feature-flags';
 
 // We expect alias[0] to be used for the ADF attribute, see ED-2813
 export var DEFAULT_LANGUAGES = [{
@@ -11,6 +12,11 @@ var getLanguageName = function getLanguageName(languageValue) {
   if (!languageValue) {
     return undefined;
   }
+
+  // mermaid is gated out of the shared SUPPORTED_LANGUAGES list, so resolve it here
+  if (languageValue === 'mermaid' && fg('platform_editor_code_block_mermaid_language')) {
+    return 'Mermaid';
+  }
   var language = SUPPORTED_LANGUAGES.find(function (l) {
     return l.value === languageValue || l.alias && l.alias.includes(languageValue);
   });

package/dist/esm/nodeviews/languages/languageMap.js

@@ -1,10 +1,31 @@
 import { LanguageDescription, LanguageSupport } from '@codemirror/language';
 import { languages } from '@codemirror/language-data';
+import { fg } from '@atlaskit/platform-feature-flags';
 // getLanguageIdentifier defines `language.alias[0]`
 export var mapLanguageToCodeMirror = function mapLanguageToCodeMirror(language) {
   if (!language || language === 'none') {
     return undefined;
   }
+  // mermaid is gated out of the shared SUPPORTED_LANGUAGES list; load its grammar only when the gate is on
+  if (language === 'mermaid') {
+    if (!fg('platform_editor_code_block_mermaid_language')) {
+      return undefined;
+    }
+    return LanguageDescription.of({
+      name: 'Mermaid',
+      load: function load() {
+        return import( /* webpackChunkName: "@atlaskit-internal_@atlaskit/editor-plugin-code-block-advanced-lang-mermaid" */
+        'codemirror-lang-mermaid').then(function (m) {
+          return (
+            // Construct locally (like the Handlebars case) to avoid a type clash between
+            // this package's `@codemirror/language` and the copy codemirror-lang-mermaid
+            // bundles; equivalent to the package's own `mermaid()`.
+            new LanguageSupport(m.mermaidLanguage)
+          );
+        });
+      }
+    });
+  }
   switch (language) {
     case 'markdown':
       return LanguageDescription.of({

package/dist/types/nodeviews/languages/getLanguageName.d.ts

@@ -1,93 +1,92 @@
 export declare const DEFAULT_LANGUAGES: ({
-    readonly name: 'PHP';
     readonly alias: readonly ['php', 'php3', 'php4', 'php5'];
+    readonly name: 'PHP';
     readonly value: 'php';
 } | {
-    readonly name: 'Java';
     readonly alias: readonly ['java'];
+    readonly name: 'Java';
     readonly value: 'java';
 } | {
-    readonly name: 'CSharp';
     readonly alias: readonly ['csharp', 'c#'];
+    readonly name: 'CSharp';
     readonly value: 'cs';
 } | {
-    readonly name: 'Python';
     readonly alias: readonly ['python', 'py'];
+    readonly name: 'Python';
     readonly value: 'python';
 } | {
-    readonly name: 'JavaScript';
     readonly alias: readonly ['javascript', 'js'];
+    readonly name: 'JavaScript';
     readonly value: 'javascript';
 } | {
-    readonly name: 'Html';
     readonly alias: readonly ['html'];
+    readonly name: 'Html';
     readonly value: 'xml';
 } | {
-    readonly name: 'C++';
     readonly alias: readonly ['c++', 'cpp', 'clike'];
+    readonly name: 'C++';
     readonly value: 'cpp';
 } | {
-    readonly name: 'Ruby';
     readonly alias: readonly ['ruby', 'rb', 'duby'];
+    readonly name: 'Ruby';
     readonly value: 'ruby';
 } | {
-    readonly name: 'Objective-C';
     readonly alias: readonly ['objective-c', 'objectivec', 'obj-c', 'objc'];
+    readonly name: 'Objective-C';
     readonly value: 'objectivec';
 } | {
-    readonly name: 'C';
     readonly alias: readonly ['c'];
+    readonly name: 'C';
     readonly value: 'cpp';
 } | {
-    readonly name: 'Swift';
     readonly alias: readonly ['swift'];
+    readonly name: 'Swift';
     readonly value: 'swift';
 } | {
-    readonly name: 'TeX';
     readonly alias: readonly ['tex', 'latex'];
+    readonly name: 'TeX';
     readonly value: 'tex';
 } | {
-    readonly name: 'Shell';
     readonly alias: readonly ['shell', 'bash', 'sh', 'ksh', 'zsh'];
+    readonly name: 'Shell';
     readonly value: 'shell';
 } | {
-    readonly name: 'Scala';
     readonly alias: readonly ['scala'];
+    readonly name: 'Scala';
     readonly value: 'scala';
 } | {
-    readonly name: 'Go';
     readonly alias: readonly ['go'];
+    readonly name: 'Go';
     readonly value: 'go';
 } | {
-    readonly name: 'ActionScript';
     readonly alias: readonly ['actionscript', 'actionscript3', 'as'];
+    readonly name: 'ActionScript';
     readonly value: 'actionscript';
 } | {
-    readonly name: 'ColdFusion';
     readonly alias: readonly ['coldfusion'];
+    readonly name: 'ColdFusion';
     readonly value: 'xml';
 } | {
-    readonly name: 'JavaFX';
     readonly alias: readonly ['javafx', 'jfx'];
+    readonly name: 'JavaFX';
     readonly value: 'java';
 } | {
-    readonly name: 'VbNet';
     readonly alias: readonly ['vbnet', 'vb.net', 'vfp', 'clipper', 'xbase'];
+    readonly name: 'VbNet';
     readonly value: 'vbnet';
 } | {
-    readonly name: 'JSON';
     readonly alias: readonly ['json'];
+    readonly name: 'JSON';
     readonly value: 'json';
 } | {
-    readonly name: 'MATLAB';
     readonly alias: readonly ['matlab'];
+    readonly name: 'MATLAB';
     readonly value: 'matlab';
 } | {
-    readonly name: 'Groovy';
     readonly alias: readonly ['groovy'];
+    readonly name: 'Groovy';
     readonly value: 'groovy';
 } | {
-    readonly name: 'SQL';
     readonly alias: readonly [
         'sql',
         'postgresql',
@@ -101,258 +100,259 @@ export declare const DEFAULT_LANGUAGES: ({
         'mysql',
         'sqlite'
     ];
+    readonly name: 'SQL';
     readonly value: 'sql';
 } | {
-    readonly name: 'R';
     readonly alias: readonly ['r'];
+    readonly name: 'R';
     readonly value: 'r';
 } | {
-    readonly name: 'Perl';
     readonly alias: readonly ['perl', 'pl'];
+    readonly name: 'Perl';
     readonly value: 'perl';
 } | {
-    readonly name: 'Lua';
     readonly alias: readonly ['lua'];
+    readonly name: 'Lua';
     readonly value: 'lua';
 } | {
-    readonly name: 'Pascal';
     readonly alias: readonly ['pas', 'pascal', 'objectpascal', 'delphi'];
+    readonly name: 'Pascal';
     readonly value: 'pascal';
 } | {
-    readonly name: 'XML';
     readonly alias: readonly ['xml'];
+    readonly name: 'XML';
     readonly value: 'xml';
 } | {
-    readonly name: 'TypeScript';
     readonly alias: readonly ['typescript', 'ts'];
+    readonly name: 'TypeScript';
     readonly value: 'typescript';
 } | {
-    readonly name: 'CoffeeScript';
     readonly alias: readonly ['coffeescript', 'coffee-script', 'coffee'];
+    readonly name: 'CoffeeScript';
     readonly value: 'coffeescript';
 } | {
-    readonly name: 'Haskell';
     readonly alias: readonly ['haskell', 'hs'];
+    readonly name: 'Haskell';
     readonly value: 'haskell';
 } | {
-    readonly name: 'Puppet';
     readonly alias: readonly ['puppet'];
+    readonly name: 'Puppet';
     readonly value: 'puppet';
 } | {
-    readonly name: 'Arduino';
     readonly alias: readonly ['arduino'];
+    readonly name: 'Arduino';
     readonly value: 'arduino';
 } | {
-    readonly name: 'Fortran';
     readonly alias: readonly ['fortran'];
+    readonly name: 'Fortran';
     readonly value: 'fortran';
 } | {
-    readonly name: 'Erlang';
     readonly alias: readonly ['erlang', 'erl'];
+    readonly name: 'Erlang';
     readonly value: 'erlang';
 } | {
-    readonly name: 'PowerShell';
     readonly alias: readonly ['powershell', 'posh', 'ps1', 'psm1'];
+    readonly name: 'PowerShell';
     readonly value: 'powershell';
 } | {
-    readonly name: 'Haxe';
     readonly alias: readonly ['haxe', 'hx', 'hxsl'];
+    readonly name: 'Haxe';
     readonly value: 'haxe';
 } | {
-    readonly name: 'Elixir';
     readonly alias: readonly ['elixir', 'ex', 'exs'];
+    readonly name: 'Elixir';
     readonly value: 'elixir';
 } | {
-    readonly name: 'Verilog';
     readonly alias: readonly ['verilog', 'v'];
+    readonly name: 'Verilog';
     readonly value: 'verilog';
 } | {
-    readonly name: 'Rust';
     readonly alias: readonly ['rust'];
+    readonly name: 'Rust';
     readonly value: 'rust';
 } | {
-    readonly name: 'VHDL';
     readonly alias: readonly ['vhdl'];
+    readonly name: 'VHDL';
     readonly value: 'vhdl';
 } | {
-    readonly name: 'Sass';
     readonly alias: readonly ['sass'];
+    readonly name: 'Sass';
     readonly value: 'less';
 } | {
-    readonly name: 'OCaml';
     readonly alias: readonly ['ocaml'];
+    readonly name: 'OCaml';
     readonly value: 'ocaml';
 } | {
-    readonly name: 'Dart';
     readonly alias: readonly ['dart'];
+    readonly name: 'Dart';
     readonly value: 'dart';
 } | {
-    readonly name: 'CSS';
     readonly alias: readonly ['css'];
+    readonly name: 'CSS';
     readonly value: 'css';
 } | {
-    readonly name: 'reStructuredText';
     readonly alias: readonly ['restructuredtext', 'rst', 'rest'];
+    readonly name: 'reStructuredText';
     readonly value: 'rest';
 } | {
-    readonly name: 'Kotlin';
     readonly alias: readonly ['kotlin'];
+    readonly name: 'Kotlin';
     readonly value: 'kotlin';
 } | {
-    readonly name: 'D';
     readonly alias: readonly ['d'];
+    readonly name: 'D';
     readonly value: 'd';
 } | {
-    readonly name: 'Octave';
     readonly alias: readonly ['octave'];
+    readonly name: 'Octave';
     readonly value: 'matlab';
 } | {
-    readonly name: 'QML';
     readonly alias: readonly ['qbs', 'qml'];
+    readonly name: 'QML';
     readonly value: 'qml';
 } | {
-    readonly name: 'Prolog';
     readonly alias: readonly ['prolog'];
+    readonly name: 'Prolog';
     readonly value: 'prolog';
 } | {
-    readonly name: 'FoxPro';
     readonly alias: readonly ['foxpro', 'purebasic'];
+    readonly name: 'FoxPro';
     readonly value: 'purebasic';
 } | {
-    readonly name: 'Scheme';
     readonly alias: readonly ['scheme', 'scm'];
+    readonly name: 'Scheme';
     readonly value: 'scheme';
 } | {
-    readonly name: 'CUDA';
     readonly alias: readonly ['cuda', 'cu'];
+    readonly name: 'CUDA';
     readonly value: 'cpp';
 } | {
-    readonly name: 'Julia';
     readonly alias: readonly ['julia', 'jl'];
+    readonly name: 'Julia';
     readonly value: 'julia';
 } | {
-    readonly name: 'Racket';
     readonly alias: readonly ['racket', 'rkt'];
+    readonly name: 'Racket';
     readonly value: 'lisp';
 } | {
-    readonly name: 'Ada';
     readonly alias: readonly ['ada', 'ada95', 'ada2005'];
+    readonly name: 'Ada';
     readonly value: 'ada';
 } | {
-    readonly name: 'Tcl';
     readonly alias: readonly ['tcl'];
+    readonly name: 'Tcl';
     readonly value: 'tcl';
 } | {
-    readonly name: 'Mathematica';
     readonly alias: readonly ['mathematica', 'mma', 'nb'];
+    readonly name: 'Mathematica';
     readonly value: 'mathematica';
 } | {
-    readonly name: 'Autoit';
     readonly alias: readonly ['autoit'];
+    readonly name: 'Autoit';
     readonly value: 'autoit';
 } | {
-    readonly name: 'StandardML';
     readonly alias: readonly ['standardmL', 'sml', 'standardml'];
+    readonly name: 'StandardML';
     readonly value: 'sml';
 } | {
-    readonly name: 'Objective-J';
     readonly alias: readonly ['objective-j', 'objectivej', 'obj-j', 'objj'];
+    readonly name: 'Objective-J';
     readonly value: 'objectivec';
 } | {
-    readonly name: 'Smalltalk';
     readonly alias: readonly ['smalltalk', 'squeak', 'st'];
+    readonly name: 'Smalltalk';
     readonly value: 'smalltalk';
 } | {
-    readonly name: 'Vala';
     readonly alias: readonly ['vala', 'vapi'];
+    readonly name: 'Vala';
     readonly value: 'vala';
 } | {
-    readonly name: 'LiveScript';
     readonly alias: readonly ['livescript', 'live-script'];
+    readonly name: 'LiveScript';
     readonly value: 'livescript';
 } | {
-    readonly name: 'XQuery';
     readonly alias: readonly ['xquery', 'xqy', 'xq', 'xql', 'xqm'];
+    readonly name: 'XQuery';
     readonly value: 'xquery';
 } | {
-    readonly name: 'PlainText';
     readonly alias: readonly ['text', 'plaintext'];
+    readonly name: 'PlainText';
     readonly value: 'text';
 } | {
-    readonly name: 'Yaml';
     readonly alias: readonly ['yaml', 'yml'];
+    readonly name: 'Yaml';
     readonly value: 'yaml';
 } | {
-    readonly name: 'GraphQL';
     readonly alias: readonly ['graphql'];
+    readonly name: 'GraphQL';
     readonly value: 'graphql';
 } | {
-    readonly name: 'AppleScript';
     readonly alias: readonly ['applescript'];
+    readonly name: 'AppleScript';
     readonly value: 'applescript';
 } | {
-    readonly name: 'Clojure';
     readonly alias: readonly ['clojure'];
+    readonly name: 'Clojure';
     readonly value: 'clojure';
 } | {
-    readonly name: 'Diff';
     readonly alias: readonly ['diff'];
+    readonly name: 'Diff';
     readonly value: 'diff';
 } | {
-    readonly name: 'VisualBasic';
     readonly alias: readonly ['visualbasic'];
+    readonly name: 'VisualBasic';
     readonly value: 'visual-basic';
 } | {
-    readonly name: 'JSX';
     readonly alias: readonly ['jsx'];
+    readonly name: 'JSX';
     readonly value: 'jsx';
 } | {
-    readonly name: 'TSX';
     readonly alias: readonly ['tsx'];
+    readonly name: 'TSX';
     readonly value: 'tsx';
 } | {
-    readonly name: 'SplunkSPL';
     readonly alias: readonly ['splunk-spl'];
+    readonly name: 'SplunkSPL';
     readonly value: 'splunk-spl';
 } | {
-    readonly name: 'Dockerfile';
     readonly alias: readonly ['docker', 'dockerfile'];
+    readonly name: 'Dockerfile';
     readonly value: 'dockerfile';
 } | {
-    readonly name: 'HCL';
     readonly alias: readonly ['hcl', 'terraform'];
+    readonly name: 'HCL';
     readonly value: 'hcl';
 } | {
-    readonly name: 'NGINX';
     readonly alias: readonly ['nginx'];
+    readonly name: 'NGINX';
     readonly value: 'nginx';
 } | {
-    readonly name: 'Protocol Buffers';
     readonly alias: readonly ['protobuf', 'proto'];
+    readonly name: 'Protocol Buffers';
     readonly value: 'protobuf';
 } | {
-    readonly name: 'TOML';
     readonly alias: readonly ['toml'];
+    readonly name: 'TOML';
     readonly value: 'toml';
 } | {
-    readonly name: 'Handlebars';
     readonly alias: readonly ['handlebars', 'mustache'];
+    readonly name: 'Handlebars';
     readonly value: 'handlebars';
 } | {
-    readonly name: 'Gherkin';
     readonly alias: readonly ['gherkin', 'cucumber'];
+    readonly name: 'Gherkin';
     readonly value: 'gherkin';
 } | {
-    readonly name: 'ABAP';
     readonly alias: readonly ['abap'];
+    readonly name: 'ABAP';
     readonly value: 'abap';
 } | {
-    readonly name: 'Markdown';
     readonly alias: readonly ['markdown'];
+    readonly name: 'Markdown';
     readonly value: 'markdown';
 } | {
-    name: string;
     alias: string[];
+    name: string;
     value: string;
 })[];
 export type Language = (typeof DEFAULT_LANGUAGES)[number];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block-advanced",
-	"version": "12.0.31",
+	"version": "12.1.0",
 	"description": "CodeBlockAdvanced plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -23,7 +23,7 @@
 		"@atlaskit/adf-schema": "^56.1.0",
 		"@atlaskit/code": "^18.2.0",
 		"@atlaskit/editor-plugin-analytics": "^12.0.0",
-		"@atlaskit/editor-plugin-code-block": "^14.1.0",
+		"@atlaskit/editor-plugin-code-block": "^14.2.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^12.0.0",
 		"@atlaskit/editor-plugin-find-replace": "^12.0.0",
 		"@atlaskit/editor-plugin-selection": "^12.0.0",
@@ -31,7 +31,7 @@
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
 		"@atlaskit/prosemirror-history": "^1.0.0",
-		"@atlaskit/tmp-editor-statsig": "^131.0.0",
+		"@atlaskit/tmp-editor-statsig": "^132.2.0",
 		"@atlaskit/tokens": "^16.2.0",
 		"@babel/runtime": "^7.0.0",
 		"@codemirror/autocomplete": "6.18.4",
@@ -46,7 +46,8 @@
 		"@xiechao/codemirror-lang-handlebars": "^1.0.4",
 		"bind-event-listener": "^3.0.0",
 		"cm6-graphql": "0.2.0",
-		"codemirror-lang-elixir": "4.0.0"
+		"codemirror-lang-elixir": "4.0.0",
+		"codemirror-lang-mermaid": "0.4.0"
 	},
 	"peerDependencies": {
 		"@atlaskit/editor-common": "^116.35.0",
@@ -98,6 +99,9 @@
 		},
 		"platform_editor_code_block_folding_analytics": {
 			"type": "boolean"
+		},
+		"platform_editor_code_block_mermaid_language": {
+			"type": "boolean"
 		}
 	},
 	"devDependencies": {

package/src/nodeviews/languages/getLanguageName.ts

@@ -1,119 +1,119 @@
 import { SUPPORTED_LANGUAGES } from '@atlaskit/code/constants';
+import { fg } from '@atlaskit/platform-feature-flags';
 
 // We expect alias[0] to be used for the ADF attribute, see ED-2813
 export const DEFAULT_LANGUAGES: (
 	| {
-			readonly name: 'PHP';
 			readonly alias: readonly ['php', 'php3', 'php4', 'php5'];
+			readonly name: 'PHP';
 			readonly value: 'php';
 	  }
 	| {
-			readonly name: 'Java';
 			readonly alias: readonly ['java'];
+			readonly name: 'Java';
 			readonly value: 'java';
 	  }
 	| {
-			readonly name: 'CSharp';
 			readonly alias: readonly ['csharp', 'c#'];
+			readonly name: 'CSharp';
 			readonly value: 'cs';
 	  }
 	| {
-			readonly name: 'Python';
 			readonly alias: readonly ['python', 'py'];
+			readonly name: 'Python';
 			readonly value: 'python';
 	  }
 	| {
-			readonly name: 'JavaScript';
 			readonly alias: readonly ['javascript', 'js'];
+			readonly name: 'JavaScript';
 			readonly value: 'javascript';
 	  }
 	| {
-			readonly name: 'Html';
 			readonly alias: readonly ['html'];
+			readonly name: 'Html';
 			readonly value: 'xml';
 	  }
 	| {
-			readonly name: 'C++';
 			readonly alias: readonly ['c++', 'cpp', 'clike'];
+			readonly name: 'C++';
 			readonly value: 'cpp';
 	  }
 	| {
-			readonly name: 'Ruby';
 			readonly alias: readonly ['ruby', 'rb', 'duby'];
+			readonly name: 'Ruby';
 			readonly value: 'ruby';
 	  }
 	| {
-			readonly name: 'Objective-C';
 			readonly alias: readonly ['objective-c', 'objectivec', 'obj-c', 'objc'];
+			readonly name: 'Objective-C';
 			readonly value: 'objectivec';
 	  }
 	| {
-			readonly name: 'C';
 			readonly alias: readonly ['c'];
+			readonly name: 'C';
 			readonly value: 'cpp';
 	  }
 	| {
-			readonly name: 'Swift';
 			readonly alias: readonly ['swift'];
+			readonly name: 'Swift';
 			readonly value: 'swift';
 	  }
 	| {
-			readonly name: 'TeX';
 			readonly alias: readonly ['tex', 'latex'];
+			readonly name: 'TeX';
 			readonly value: 'tex';
 	  }
 	| {
-			readonly name: 'Shell';
 			readonly alias: readonly ['shell', 'bash', 'sh', 'ksh', 'zsh'];
+			readonly name: 'Shell';
 			readonly value: 'shell';
 	  }
 	| {
-			readonly name: 'Scala';
 			readonly alias: readonly ['scala'];
+			readonly name: 'Scala';
 			readonly value: 'scala';
 	  }
 	| {
-			readonly name: 'Go';
 			readonly alias: readonly ['go'];
+			readonly name: 'Go';
 			readonly value: 'go';
 	  }
 	| {
-			readonly name: 'ActionScript';
 			readonly alias: readonly ['actionscript', 'actionscript3', 'as'];
+			readonly name: 'ActionScript';
 			readonly value: 'actionscript';
 	  }
 	| {
-			readonly name: 'ColdFusion';
 			readonly alias: readonly ['coldfusion'];
+			readonly name: 'ColdFusion';
 			readonly value: 'xml';
 	  }
 	| {
-			readonly name: 'JavaFX';
 			readonly alias: readonly ['javafx', 'jfx'];
+			readonly name: 'JavaFX';
 			readonly value: 'java';
 	  }
 	| {
-			readonly name: 'VbNet';
 			readonly alias: readonly ['vbnet', 'vb.net', 'vfp', 'clipper', 'xbase'];
+			readonly name: 'VbNet';
 			readonly value: 'vbnet';
 	  }
 	| {
-			readonly name: 'JSON';
 			readonly alias: readonly ['json'];
+			readonly name: 'JSON';
 			readonly value: 'json';
 	  }
 	| {
-			readonly name: 'MATLAB';
 			readonly alias: readonly ['matlab'];
+			readonly name: 'MATLAB';
 			readonly value: 'matlab';
 	  }
 	| {
-			readonly name: 'Groovy';
 			readonly alias: readonly ['groovy'];
+			readonly name: 'Groovy';
 			readonly value: 'groovy';
 	  }
 	| {
-			readonly name: 'SQL';
 			readonly alias: readonly [
 				'sql',
 				'postgresql',
@@ -127,321 +127,322 @@ export const DEFAULT_LANGUAGES: (
 				'mysql',
 				'sqlite',
 			];
+			readonly name: 'SQL';
 			readonly value: 'sql';
 	  }
 	| {
-			readonly name: 'R';
 			readonly alias: readonly ['r'];
+			readonly name: 'R';
 			readonly value: 'r';
 	  }
 	| {
-			readonly name: 'Perl';
 			readonly alias: readonly ['perl', 'pl'];
+			readonly name: 'Perl';
 			readonly value: 'perl';
 	  }
 	| {
-			readonly name: 'Lua';
 			readonly alias: readonly ['lua'];
+			readonly name: 'Lua';
 			readonly value: 'lua';
 	  }
 	| {
-			readonly name: 'Pascal';
 			readonly alias: readonly ['pas', 'pascal', 'objectpascal', 'delphi'];
+			readonly name: 'Pascal';
 			readonly value: 'pascal';
 	  }
 	| {
-			readonly name: 'XML';
 			readonly alias: readonly ['xml'];
+			readonly name: 'XML';
 			readonly value: 'xml';
 	  }
 	| {
-			readonly name: 'TypeScript';
 			readonly alias: readonly ['typescript', 'ts'];
+			readonly name: 'TypeScript';
 			readonly value: 'typescript';
 	  }
 	| {
-			readonly name: 'CoffeeScript';
 			readonly alias: readonly ['coffeescript', 'coffee-script', 'coffee'];
+			readonly name: 'CoffeeScript';
 			readonly value: 'coffeescript';
 	  }
 	| {
-			readonly name: 'Haskell';
 			readonly alias: readonly ['haskell', 'hs'];
+			readonly name: 'Haskell';
 			readonly value: 'haskell';
 	  }
 	| {
-			readonly name: 'Puppet';
 			readonly alias: readonly ['puppet'];
+			readonly name: 'Puppet';
 			readonly value: 'puppet';
 	  }
 	| {
-			readonly name: 'Arduino';
 			readonly alias: readonly ['arduino'];
+			readonly name: 'Arduino';
 			readonly value: 'arduino';
 	  }
 	| {
-			readonly name: 'Fortran';
 			readonly alias: readonly ['fortran'];
+			readonly name: 'Fortran';
 			readonly value: 'fortran';
 	  }
 	| {
-			readonly name: 'Erlang';
 			readonly alias: readonly ['erlang', 'erl'];
+			readonly name: 'Erlang';
 			readonly value: 'erlang';
 	  }
 	| {
-			readonly name: 'PowerShell';
 			readonly alias: readonly ['powershell', 'posh', 'ps1', 'psm1'];
+			readonly name: 'PowerShell';
 			readonly value: 'powershell';
 	  }
 	| {
-			readonly name: 'Haxe';
 			readonly alias: readonly ['haxe', 'hx', 'hxsl'];
+			readonly name: 'Haxe';
 			readonly value: 'haxe';
 	  }
 	| {
-			readonly name: 'Elixir';
 			readonly alias: readonly ['elixir', 'ex', 'exs'];
+			readonly name: 'Elixir';
 			readonly value: 'elixir';
 	  }
 	| {
-			readonly name: 'Verilog';
 			readonly alias: readonly ['verilog', 'v'];
+			readonly name: 'Verilog';
 			readonly value: 'verilog';
 	  }
 	| {
-			readonly name: 'Rust';
 			readonly alias: readonly ['rust'];
+			readonly name: 'Rust';
 			readonly value: 'rust';
 	  }
 	| {
-			readonly name: 'VHDL';
 			readonly alias: readonly ['vhdl'];
+			readonly name: 'VHDL';
 			readonly value: 'vhdl';
 	  }
 	| {
-			readonly name: 'Sass';
 			readonly alias: readonly ['sass'];
+			readonly name: 'Sass';
 			readonly value: 'less';
 	  }
 	| {
-			readonly name: 'OCaml';
 			readonly alias: readonly ['ocaml'];
+			readonly name: 'OCaml';
 			readonly value: 'ocaml';
 	  }
 	| {
-			readonly name: 'Dart';
 			readonly alias: readonly ['dart'];
+			readonly name: 'Dart';
 			readonly value: 'dart';
 	  }
 	| {
-			readonly name: 'CSS';
 			readonly alias: readonly ['css'];
+			readonly name: 'CSS';
 			readonly value: 'css';
 	  }
 	| {
-			readonly name: 'reStructuredText';
 			readonly alias: readonly ['restructuredtext', 'rst', 'rest'];
+			readonly name: 'reStructuredText';
 			readonly value: 'rest';
 	  }
 	| {
-			readonly name: 'Kotlin';
 			readonly alias: readonly ['kotlin'];
+			readonly name: 'Kotlin';
 			readonly value: 'kotlin';
 	  }
 	| {
-			readonly name: 'D';
 			readonly alias: readonly ['d'];
+			readonly name: 'D';
 			readonly value: 'd';
 	  }
 	| {
-			readonly name: 'Octave';
 			readonly alias: readonly ['octave'];
+			readonly name: 'Octave';
 			readonly value: 'matlab';
 	  }
 	| {
-			readonly name: 'QML';
 			readonly alias: readonly ['qbs', 'qml'];
+			readonly name: 'QML';
 			readonly value: 'qml';
 	  }
 	| {
-			readonly name: 'Prolog';
 			readonly alias: readonly ['prolog'];
+			readonly name: 'Prolog';
 			readonly value: 'prolog';
 	  }
 	| {
-			readonly name: 'FoxPro';
 			readonly alias: readonly ['foxpro', 'purebasic'];
+			readonly name: 'FoxPro';
 			readonly value: 'purebasic';
 	  }
 	| {
-			readonly name: 'Scheme';
 			readonly alias: readonly ['scheme', 'scm'];
+			readonly name: 'Scheme';
 			readonly value: 'scheme';
 	  }
 	| {
-			readonly name: 'CUDA';
 			readonly alias: readonly ['cuda', 'cu'];
+			readonly name: 'CUDA';
 			readonly value: 'cpp';
 	  }
 	| {
-			readonly name: 'Julia';
 			readonly alias: readonly ['julia', 'jl'];
+			readonly name: 'Julia';
 			readonly value: 'julia';
 	  }
 	| {
-			readonly name: 'Racket';
 			readonly alias: readonly ['racket', 'rkt'];
+			readonly name: 'Racket';
 			readonly value: 'lisp';
 	  }
 	| {
-			readonly name: 'Ada';
 			readonly alias: readonly ['ada', 'ada95', 'ada2005'];
+			readonly name: 'Ada';
 			readonly value: 'ada';
 	  }
 	| {
-			readonly name: 'Tcl';
 			readonly alias: readonly ['tcl'];
+			readonly name: 'Tcl';
 			readonly value: 'tcl';
 	  }
 	| {
-			readonly name: 'Mathematica';
 			readonly alias: readonly ['mathematica', 'mma', 'nb'];
+			readonly name: 'Mathematica';
 			readonly value: 'mathematica';
 	  }
 	| {
-			readonly name: 'Autoit';
 			readonly alias: readonly ['autoit'];
+			readonly name: 'Autoit';
 			readonly value: 'autoit';
 	  }
 	| {
-			readonly name: 'StandardML';
 			readonly alias: readonly ['standardmL', 'sml', 'standardml'];
+			readonly name: 'StandardML';
 			readonly value: 'sml';
 	  }
 	| {
-			readonly name: 'Objective-J';
 			readonly alias: readonly ['objective-j', 'objectivej', 'obj-j', 'objj'];
+			readonly name: 'Objective-J';
 			readonly value: 'objectivec';
 	  }
 	| {
-			readonly name: 'Smalltalk';
 			readonly alias: readonly ['smalltalk', 'squeak', 'st'];
+			readonly name: 'Smalltalk';
 			readonly value: 'smalltalk';
 	  }
 	| {
-			readonly name: 'Vala';
 			readonly alias: readonly ['vala', 'vapi'];
+			readonly name: 'Vala';
 			readonly value: 'vala';
 	  }
 	| {
-			readonly name: 'LiveScript';
 			readonly alias: readonly ['livescript', 'live-script'];
+			readonly name: 'LiveScript';
 			readonly value: 'livescript';
 	  }
 	| {
-			readonly name: 'XQuery';
 			readonly alias: readonly ['xquery', 'xqy', 'xq', 'xql', 'xqm'];
+			readonly name: 'XQuery';
 			readonly value: 'xquery';
 	  }
 	| {
-			readonly name: 'PlainText';
 			readonly alias: readonly ['text', 'plaintext'];
+			readonly name: 'PlainText';
 			readonly value: 'text';
 	  }
 	| {
-			readonly name: 'Yaml';
 			readonly alias: readonly ['yaml', 'yml'];
+			readonly name: 'Yaml';
 			readonly value: 'yaml';
 	  }
 	| {
-			readonly name: 'GraphQL';
 			readonly alias: readonly ['graphql'];
+			readonly name: 'GraphQL';
 			readonly value: 'graphql';
 	  }
 	| {
-			readonly name: 'AppleScript';
 			readonly alias: readonly ['applescript'];
+			readonly name: 'AppleScript';
 			readonly value: 'applescript';
 	  }
 	| {
-			readonly name: 'Clojure';
 			readonly alias: readonly ['clojure'];
+			readonly name: 'Clojure';
 			readonly value: 'clojure';
 	  }
 	| {
-			readonly name: 'Diff';
 			readonly alias: readonly ['diff'];
+			readonly name: 'Diff';
 			readonly value: 'diff';
 	  }
 	| {
-			readonly name: 'VisualBasic';
 			readonly alias: readonly ['visualbasic'];
+			readonly name: 'VisualBasic';
 			readonly value: 'visual-basic';
 	  }
 	| {
-			readonly name: 'JSX';
 			readonly alias: readonly ['jsx'];
+			readonly name: 'JSX';
 			readonly value: 'jsx';
 	  }
 	| {
-			readonly name: 'TSX';
 			readonly alias: readonly ['tsx'];
+			readonly name: 'TSX';
 			readonly value: 'tsx';
 	  }
 	| {
-			readonly name: 'SplunkSPL';
 			readonly alias: readonly ['splunk-spl'];
+			readonly name: 'SplunkSPL';
 			readonly value: 'splunk-spl';
 	  }
 	| {
-			readonly name: 'Dockerfile';
 			readonly alias: readonly ['docker', 'dockerfile'];
+			readonly name: 'Dockerfile';
 			readonly value: 'dockerfile';
 	  }
 	| {
-			readonly name: 'HCL';
 			readonly alias: readonly ['hcl', 'terraform'];
+			readonly name: 'HCL';
 			readonly value: 'hcl';
 	  }
 	| {
-			readonly name: 'NGINX';
 			readonly alias: readonly ['nginx'];
+			readonly name: 'NGINX';
 			readonly value: 'nginx';
 	  }
 	| {
-			readonly name: 'Protocol Buffers';
 			readonly alias: readonly ['protobuf', 'proto'];
+			readonly name: 'Protocol Buffers';
 			readonly value: 'protobuf';
 	  }
 	| {
-			readonly name: 'TOML';
 			readonly alias: readonly ['toml'];
+			readonly name: 'TOML';
 			readonly value: 'toml';
 	  }
 	| {
-			readonly name: 'Handlebars';
 			readonly alias: readonly ['handlebars', 'mustache'];
+			readonly name: 'Handlebars';
 			readonly value: 'handlebars';
 	  }
 	| {
-			readonly name: 'Gherkin';
 			readonly alias: readonly ['gherkin', 'cucumber'];
+			readonly name: 'Gherkin';
 			readonly value: 'gherkin';
 	  }
 	| {
-			readonly name: 'ABAP';
 			readonly alias: readonly ['abap'];
+			readonly name: 'ABAP';
 			readonly value: 'abap';
 	  }
 	| {
-			readonly name: 'Markdown';
 			readonly alias: readonly ['markdown'];
+			readonly name: 'Markdown';
 			readonly value: 'markdown';
 	  }
 	| {
-			name: string;
 			alias: string[];
+			name: string;
 			value: string;
 	  }
 )[] = [{ name: '(None)', alias: ['none'], value: 'none' }, ...SUPPORTED_LANGUAGES];
@@ -453,6 +454,11 @@ const getLanguageName = (languageValue: string): string | undefined => {
 		return undefined;
 	}
 
+	// mermaid is gated out of the shared SUPPORTED_LANGUAGES list, so resolve it here
+	if (languageValue === 'mermaid' && fg('platform_editor_code_block_mermaid_language')) {
+		return 'Mermaid';
+	}
+
 	const language = (SUPPORTED_LANGUAGES as readonly Language[]).find((l) => {
 		return l.value === languageValue || (l.alias && (l.alias as string[]).includes(languageValue));
 	});

package/src/nodeviews/languages/languageMap.ts

@@ -2,6 +2,7 @@ import { LanguageDescription, LanguageSupport } from '@codemirror/language';
 import { languages } from '@codemirror/language-data';
 
 import type { LanguageAlias } from '@atlaskit/code';
+import { fg } from '@atlaskit/platform-feature-flags';
 
 type LanguageAliasValue = LanguageAlias[0];
 
@@ -12,6 +13,27 @@ export const mapLanguageToCodeMirror = (
 	if (!language || language === 'none') {
 		return undefined;
 	}
+	// mermaid is gated out of the shared SUPPORTED_LANGUAGES list; load its grammar only when the gate is on
+	if (language === 'mermaid') {
+		if (!fg('platform_editor_code_block_mermaid_language')) {
+			return undefined;
+		}
+		return LanguageDescription.of({
+			name: 'Mermaid',
+			load() {
+				return import(
+					/* webpackChunkName: "@atlaskit-internal_@atlaskit/editor-plugin-code-block-advanced-lang-mermaid" */
+					'codemirror-lang-mermaid'
+				).then(
+					(m) =>
+						// Construct locally (like the Handlebars case) to avoid a type clash between
+						// this package's `@codemirror/language` and the copy codemirror-lang-mermaid
+						// bundles; equivalent to the package's own `mermaid()`.
+						new LanguageSupport(m.mermaidLanguage),
+				);
+			},
+		});
+	}
 	switch (language) {
 		case 'markdown':
 			return LanguageDescription.of({