@atlaskit/adf-schema 40.4.0 → 40.6.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 40.6.0
+
+### Minor Changes
+
+- cc19189: [ED-24187 promoting to full schema - Nested Expands in Expands
+
+## 40.5.0
+
+### Minor Changes
+
+- 401d96d: [ED-24188] Promoting to full schema - Codeblock & Media in Quotes
+
 ## 40.4.0
 
 ### Minor Changes

package/dist/cjs/index.js

@@ -351,10 +351,10 @@ Object.defineProperty(exports, "blockquoteWithList", {
     return _schema.blockquoteWithList;
   }
 });
-Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMediaStage0", {
+Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMedia", {
   enumerable: true,
   get: function get() {
-    return _schema.blockquoteWithNestedCodeblockOrMediaStage0;
+    return _schema.blockquoteWithNestedCodeblockOrMedia;
   }
 });
 Object.defineProperty(exports, "bodiedExtension", {
@@ -561,10 +561,10 @@ Object.defineProperty(exports, "expandToJSON", {
     return _schema.expandToJSON;
   }
 });
-Object.defineProperty(exports, "expandWithNestedExpandStage0", {
+Object.defineProperty(exports, "expandWithNestedExpand", {
   enumerable: true,
   get: function get() {
-    return _schema.expandWithNestedExpandStage0;
+    return _schema.expandWithNestedExpand;
   }
 });
 Object.defineProperty(exports, "extendedPanel", {

package/dist/cjs/next-schema/generated/nodeTypes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unsupportedInline = exports.unsupportedBlock = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelLegacy = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItemWithNestedDecisionStage0 = exports.listItemLegacy = exports.listItem = exports.layoutSectionWithSingleColumnStage0 = exports.layoutSectionFull = exports.layoutSection = exports.layoutColumn = exports.inlineExtensionWithMarks = exports.inlineExtension = exports.inlineCardStage0 = exports.inlineCard = exports.image = exports.headingWithNoMarks = exports.headingWithIndentation = exports.headingWithAlignment = exports.heading = exports.hardBreak = exports.extensionWithMarks = exports.extensionFrameStage0 = exports.extension = exports.expandWithNoMark = exports.expandWithNestedExpandStage0 = exports.expand = exports.emojiStage0 = exports.emoji = exports.embedCard = exports.doc = exports.decisionList = exports.decisionItem = exports.dateStage0 = exports.date = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.codeBlockWithNoMarks = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteWithNestedCodeblockOrMediaStage0 = exports.blockquoteLegacy = exports.blockquote = exports.blockCard = void 0;
+exports.unsupportedInline = exports.unsupportedBlock = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelLegacy = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItemWithNestedDecisionStage0 = exports.listItemLegacy = exports.listItem = exports.layoutSectionWithSingleColumnStage0 = exports.layoutSectionFull = exports.layoutSection = exports.layoutColumn = exports.inlineExtensionWithMarks = exports.inlineExtension = exports.inlineCardStage0 = exports.inlineCard = exports.image = exports.headingWithNoMarks = exports.headingWithIndentation = exports.headingWithAlignment = exports.heading = exports.hardBreak = exports.extensionWithMarks = exports.extensionFrameStage0 = exports.extension = exports.expandWithoutNestedExpand = exports.expandWithNoMark = exports.expand = exports.emojiStage0 = exports.emoji = exports.embedCard = exports.doc = exports.decisionList = exports.decisionItem = exports.dateStage0 = exports.date = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.codeBlockWithNoMarks = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteWithoutNestedCodeblockOrMedia = exports.blockquoteLegacy = exports.blockquote = exports.blockCard = void 0;
 var _createPMSpecFactory = require("../../schema/createPMSpecFactory");
 /**
  * This file was automatically generated by @atlaskit/adf-schema-generator
@@ -34,7 +34,7 @@ var blockCard = exports.blockCard = (0, _createPMSpecFactory.createPMNodeSpecFac
   draggable: true
 });
 var blockquote = exports.blockquote = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
   group: 'block',
   selectable: false,
   defining: true
@@ -45,8 +45,8 @@ var blockquoteLegacy = exports.blockquoteLegacy = (0, _createPMSpecFactory.creat
   selectable: false,
   defining: true
 });
-var blockquoteWithNestedCodeblockOrMediaStage0 = exports.blockquoteWithNestedCodeblockOrMediaStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
+var blockquoteWithoutNestedCodeblockOrMedia = exports.blockquoteWithoutNestedCodeblockOrMedia = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
   group: 'block',
   selectable: false,
   defining: true
@@ -290,7 +290,7 @@ var emojiStage0 = exports.emojiStage0 = (0, _createPMSpecFactory.createPMNodeSpe
   selectable: true
 });
 var expand = exports.expand = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
   group: 'block',
   attrs: {
@@ -304,9 +304,7 @@ var expand = exports.expand = (0, _createPMSpecFactory.createPMNodeSpecFactory)(
   selectable: true,
   isolating: true
 });
-var expandWithNestedExpandStage0 = exports.expandWithNestedExpandStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
+var expandWithNoMark = exports.expandWithNoMark = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   group: 'block',
   attrs: {
     title: {
@@ -319,7 +317,9 @@ var expandWithNestedExpandStage0 = exports.expandWithNestedExpandStage0 = (0, _c
   selectable: true,
   isolating: true
 });
-var expandWithNoMark = exports.expandWithNoMark = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
+var expandWithoutNestedExpand = exports.expandWithoutNestedExpand = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
   group: 'block',
   attrs: {
     title: {

package/dist/cjs/next-schema/groups/blockGroup.js

@@ -24,7 +24,7 @@ var _rule = require("../nodes/rule");
 var _table = require("../nodes/table");
 var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
-var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _blockquote.blockquote.use('with_nested_codeblock_or_media'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _panel.panel.use('legacy'), _table.table, _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _expand.expand.use('with_no_mark'), _expand.expand.use('with_breakout_mark'), _expand.expand.use('with_nested_expand'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
+var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _blockquote.blockquote.use('without_nested_codeblock_or_media'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _panel.panel.use('legacy'), _table.table, _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _expand.expand.use('with_no_mark'), _expand.expand.use('with_breakout_mark'), _expand.expand.use('without_nested_expand'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   // @DSLCompatibilityException
   // Block group in PM doesn't match ADF
   ignore: ['validator-spec']

package/dist/cjs/next-schema/nodes/blockquote.js

@@ -17,12 +17,11 @@ var blockquote = exports.blockquote = (0, _adfSchemaGenerator.adfNode)('blockquo
   defining: true,
   selectable: false,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _list.orderedList, _list.bulletList, _unsupportedBlock.unsupportedBlock))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _list.orderedList, _list.bulletList, _unsupportedBlock.unsupportedBlock, _codeBlock.codeBlock.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full')))]
 }).variant('legacy', {
   ignore: ['json-schema', 'validator-spec'],
   content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph, _unsupportedBlock.unsupportedBlock))]
-}).variant('with_nested_codeblock_or_media', {
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _list.orderedList, _list.bulletList, _unsupportedBlock.unsupportedBlock, _codeBlock.codeBlock.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full')))],
-  noExtend: true,
-  stage0: true
+}).variant('without_nested_codeblock_or_media', {
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _list.orderedList, _list.bulletList, _unsupportedBlock.unsupportedBlock))],
+  ignore: ['json-schema', 'validator-spec']
 });

package/dist/cjs/next-schema/nodes/expand.js

@@ -27,7 +27,7 @@ var expand = exports.expand = (0, _adfSchemaGenerator.adfNode)('expand').define(
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup))],
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup, _nestedExpand.nestedExpand.use('with_no_marks')))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.attrs.optional': {
@@ -36,10 +36,9 @@ var expand = exports.expand = (0, _adfSchemaGenerator.adfNode)('expand').define(
       }
     }
   }
-}).variant('with_nested_expand', {
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup, _nestedExpand.nestedExpand.use('with_no_marks')))],
-  noExtend: true,
-  stage0: true
+}).variant('without_nested_expand', {
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup))],
+  ignore: ['json-schema', 'validator-spec']
 }).variant('with_breakout_mark', {
   marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   content: [],

package/dist/cjs/schema/create-schema.js

@@ -88,7 +88,7 @@ var nodesInOrder = [{
   spec: _nodes.heading
 }, {
   name: 'blockquote',
-  spec: _nodes.blockquoteWithList
+  spec: _nodes.blockquoteWithNestedCodeblockOrMedia
 }, {
   name: 'codeBlock',
   spec: _nodes.codeBlock
@@ -175,7 +175,7 @@ var nodesInOrder = [{
   spec: _nodes.status
 }, {
   name: 'expand',
-  spec: _nodes.expand
+  spec: _nodes.expandWithNestedExpand
 }, {
   name: 'nestedExpand',
   spec: _nodes.nestedExpand

package/dist/cjs/schema/default-schema.js

@@ -26,8 +26,8 @@ var getSchemaBasedOnStage = exports.getSchemaBasedOnStage = (0, _memoizeOne.defa
       layoutSection: _nodes.layoutSectionWithSingleColumn,
       multiBodiedExtension: _nodes.multiBodiedExtension,
       extensionFrame: _nodes.extensionFrame,
-      expand: _nodes.expandWithNestedExpandStage0,
-      blockquote: _nodes.blockquoteWithNestedCodeblockOrMediaStage0,
+      expand: _nodes.expandWithNestedExpand,
+      blockquote: _nodes.blockquoteWithNestedCodeblockOrMedia,
       listItem: _nodes.listItemWithDecisionStage0
     };
   }

package/dist/cjs/schema/index.js

@@ -69,10 +69,10 @@ Object.defineProperty(exports, "blockquoteWithList", {
     return _nodes.blockquoteWithList;
   }
 });
-Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMediaStage0", {
+Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMedia", {
   enumerable: true,
   get: function get() {
-    return _nodes.blockquoteWithNestedCodeblockOrMediaStage0;
+    return _nodes.blockquoteWithNestedCodeblockOrMedia;
   }
 });
 Object.defineProperty(exports, "bodiedExtension", {
@@ -273,10 +273,10 @@ Object.defineProperty(exports, "expandToJSON", {
     return _nodes.expandToJSON;
   }
 });
-Object.defineProperty(exports, "expandWithNestedExpandStage0", {
+Object.defineProperty(exports, "expandWithNestedExpand", {
   enumerable: true,
   get: function get() {
-    return _nodes.expandWithNestedExpandStage0;
+    return _nodes.expandWithNestedExpand;
   }
 });
 Object.defineProperty(exports, "extendedPanel", {

package/dist/cjs/schema/nodes/blockquote.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.blockquoteWithNestedCodeblockOrMediaStage0 = exports.blockquoteWithList = exports.blockquote = void 0;
+exports.blockquoteWithNestedCodeblockOrMedia = exports.blockquoteWithList = exports.blockquote = void 0;
 var _nodeTypes = require("../../next-schema/generated/nodeTypes");
 /**
  * @name blockquote_node
@@ -18,12 +18,12 @@ var nodeSpecOptions = {
   }
 };
 var blockquote = exports.blockquote = (0, _nodeTypes.blockquoteLegacy)(nodeSpecOptions);
-var blockquoteWithNestedCodeblockOrMediaStage0 = exports.blockquoteWithNestedCodeblockOrMediaStage0 = (0, _nodeTypes.blockquoteWithNestedCodeblockOrMediaStage0)(nodeSpecOptions);
+var blockquoteWithNestedCodeblockOrMedia = exports.blockquoteWithNestedCodeblockOrMedia = (0, _nodeTypes.blockquote)(nodeSpecOptions);
 
 /**
  * @name blockquote_with_list_node
  */
-var blockquoteWithList = exports.blockquoteWithList = (0, _nodeTypes.blockquote)({
+var blockquoteWithList = exports.blockquoteWithList = (0, _nodeTypes.blockquoteWithoutNestedCodeblockOrMedia)({
   parseDOM: [{
     tag: 'blockquote'
   }],

package/dist/cjs/schema/nodes/expand.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toJSON = exports.expandWithNestedExpandStage0 = exports.expand = void 0;
+exports.toJSON = exports.expandWithNestedExpand = exports.expand = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _nodeTypes = require("../../next-schema/generated/nodeTypes");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -60,8 +60,8 @@ var nodeSpecOptions = {
     return ['div', attrs, 0];
   }
 };
-var expand = exports.expand = (0, _nodeTypes.expand)(nodeSpecOptions);
-var expandWithNestedExpandStage0 = exports.expandWithNestedExpandStage0 = (0, _nodeTypes.expandWithNestedExpandStage0)(nodeSpecOptions);
+var expand = exports.expand = (0, _nodeTypes.expandWithoutNestedExpand)(nodeSpecOptions);
+var expandWithNestedExpand = exports.expandWithNestedExpand = (0, _nodeTypes.expand)(nodeSpecOptions);
 var toJSON = exports.toJSON = function toJSON(node) {
   return {
     attrs: Object.keys(node.attrs).filter(function (key) {

package/dist/cjs/schema/nodes/index.js

@@ -28,10 +28,10 @@ Object.defineProperty(exports, "blockquoteWithList", {
     return _blockquote.blockquoteWithList;
   }
 });
-Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMediaStage0", {
+Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMedia", {
   enumerable: true,
   get: function get() {
-    return _blockquote.blockquoteWithNestedCodeblockOrMediaStage0;
+    return _blockquote.blockquoteWithNestedCodeblockOrMedia;
   }
 });
 Object.defineProperty(exports, "bodiedExtension", {
@@ -148,10 +148,10 @@ Object.defineProperty(exports, "expandToJSON", {
     return _expand.toJSON;
   }
 });
-Object.defineProperty(exports, "expandWithNestedExpandStage0", {
+Object.defineProperty(exports, "expandWithNestedExpand", {
   enumerable: true,
   get: function get() {
-    return _expand.expandWithNestedExpandStage0;
+    return _expand.expandWithNestedExpand;
   }
 });
 Object.defineProperty(exports, "extendedPanel", {

package/dist/cjs/validator-schema/generated/validatorSpec.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unsupportedInline = exports.unsupportedBlock = exports.underline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell_content = exports.tableCell = exports.table = exports.subsup = exports.strong = exports.strike = exports.status = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_alignment = exports.paragraph = exports.panel_legacy = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_no_marks = exports.nestedExpand_content = exports.nestedExpand = exports.multiBodiedExtension = exports.mention = exports.mediaSingle_width_type = exports.mediaSingle_full = exports.mediaSingle_caption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem_with_nested_decision = exports.listItem_legacy = exports.listItem = exports.link_text_inline = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_comment_marker = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.inline = exports.indentation = exports.image = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.formatted_text_inline = exports.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_with_no_mark = exports.expand_with_nested_expand = exports.expand_with_breakout_mark = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.code_inline = exports.codeBlock_with_no_marks = exports.codeBlock_with_marks = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote_with_nested_codeblock_or_media = exports.blockquote_legacy = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.atomic_inline = exports.annotation = exports.alignment = void 0;
+exports.unsupportedInline = exports.unsupportedBlock = exports.underline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell_content = exports.tableCell = exports.table = exports.subsup = exports.strong = exports.strike = exports.status = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_alignment = exports.paragraph = exports.panel_legacy = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_no_marks = exports.nestedExpand_content = exports.nestedExpand = exports.multiBodiedExtension = exports.mention = exports.mediaSingle_width_type = exports.mediaSingle_full = exports.mediaSingle_caption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem_with_nested_decision = exports.listItem_legacy = exports.listItem = exports.link_text_inline = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_comment_marker = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.inline = exports.indentation = exports.image = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.formatted_text_inline = exports.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_without_nested_expand = exports.expand_with_no_mark = exports.expand_with_breakout_mark = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.code_inline = exports.codeBlock_with_no_marks = exports.codeBlock_with_marks = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote_without_nested_codeblock_or_media = exports.blockquote_legacy = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.atomic_inline = exports.annotation = exports.alignment = void 0;
 var blockCard = exports.blockCard = {
   props: {
     type: {
@@ -1106,49 +1106,49 @@ var orderedList = exports.orderedList = {
     }
   }
 };
-var blockquote = exports.blockquote = {
+var mediaGroup = exports.mediaGroup = {
   props: {
     type: {
       type: 'enum',
-      values: ['blockquote']
+      values: ['mediaGroup']
     },
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList']],
+      items: ['media'],
       minItems: 1,
       allowUnsupportedBlock: true
     }
   }
 };
-var blockquote_legacy = exports.blockquote_legacy = ['blockquote', {
+var blockquote = exports.blockquote = {
   props: {
+    type: {
+      type: 'enum',
+      values: ['blockquote']
+    },
     content: {
       type: 'array',
-      items: ['paragraph'],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
   }
-}];
-var mediaGroup = exports.mediaGroup = {
+};
+var blockquote_legacy = exports.blockquote_legacy = ['blockquote', {
   props: {
-    type: {
-      type: 'enum',
-      values: ['mediaGroup']
-    },
     content: {
       type: 'array',
-      items: ['media'],
+      items: ['paragraph'],
       minItems: 1,
       allowUnsupportedBlock: true
     }
   }
-};
-var blockquote_with_nested_codeblock_or_media = exports.blockquote_with_nested_codeblock_or_media = ['blockquote', {
+}];
+var blockquote_without_nested_codeblock_or_media = exports.blockquote_without_nested_codeblock_or_media = ['blockquote', {
   props: {
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full']],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1669,7 +1669,7 @@ var expand = exports.expand = {
     },
     content: {
       type: 'array',
-      items: ['non_nestable_block_content'],
+      items: [['non_nestable_block_content', 'nestedExpand_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
     },
@@ -1699,11 +1699,11 @@ var expand_with_breakout_mark = exports.expand_with_breakout_mark = ['expand', {
     }
   }
 }];
-var expand_with_nested_expand = exports.expand_with_nested_expand = ['expand', {
+var expand_without_nested_expand = exports.expand_without_nested_expand = ['expand', {
   props: {
     content: {
       type: 'array',
-      items: [['non_nestable_block_content', 'nestedExpand_with_no_marks']],
+      items: ['non_nestable_block_content'],
       minItems: 1,
       allowUnsupportedBlock: true
     }

package/dist/es2019/index.js

@@ -1,5 +1,5 @@
-export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
-colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandWithNestedExpandStage0, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette } from './schema';
+export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
+colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandWithNestedExpand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette } from './schema';
 export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, linkify, linkifyMatch, normalizeHexColor, normalizeUrl, rgbToHex, uuid, getDarkModeLCHColor } from './utils';
 
 // ADF createPMSpecFactory

package/dist/es2019/next-schema/generated/nodeTypes.js

@@ -28,7 +28,7 @@ export const blockCard = createPMNodeSpecFactory({
   draggable: true
 });
 export const blockquote = createPMNodeSpecFactory({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
   group: 'block',
   selectable: false,
   defining: true
@@ -39,8 +39,8 @@ export const blockquoteLegacy = createPMNodeSpecFactory({
   selectable: false,
   defining: true
 });
-export const blockquoteWithNestedCodeblockOrMediaStage0 = createPMNodeSpecFactory({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
+export const blockquoteWithoutNestedCodeblockOrMedia = createPMNodeSpecFactory({
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
   group: 'block',
   selectable: false,
   defining: true
@@ -284,7 +284,7 @@ export const emojiStage0 = createPMNodeSpecFactory({
   selectable: true
 });
 export const expand = createPMNodeSpecFactory({
-  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
   group: 'block',
   attrs: {
@@ -298,9 +298,7 @@ export const expand = createPMNodeSpecFactory({
   selectable: true,
   isolating: true
 });
-export const expandWithNestedExpandStage0 = createPMNodeSpecFactory({
-  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
+export const expandWithNoMark = createPMNodeSpecFactory({
   group: 'block',
   attrs: {
     title: {
@@ -313,7 +311,9 @@ export const expandWithNestedExpandStage0 = createPMNodeSpecFactory({
   selectable: true,
   isolating: true
 });
-export const expandWithNoMark = createPMNodeSpecFactory({
+export const expandWithoutNestedExpand = createPMNodeSpecFactory({
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
   group: 'block',
   attrs: {
     title: {

package/dist/es2019/next-schema/groups/blockGroup.js

@@ -18,7 +18,7 @@ import { rule } from '../nodes/rule';
 import { table } from '../nodes/table';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('with_nested_codeblock_or_media'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('legacy'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), expand.use('with_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
+export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('legacy'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), expand.use('without_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
   // @DSLCompatibilityException
   // Block group in PM doesn't match ADF
   ignore: ['validator-spec']

package/dist/es2019/next-schema/nodes/blockquote.js

@@ -11,12 +11,11 @@ export const blockquote = adfNode('blockquote').define({
   defining: true,
   selectable: false,
   marks: [unsupportedMark, unsupportedNodeAttribute],
-  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock))]
+  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full')))]
 }).variant('legacy', {
   ignore: ['json-schema', 'validator-spec'],
   content: [$onePlus($or(paragraph, unsupportedBlock))]
-}).variant('with_nested_codeblock_or_media', {
-  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full')))],
-  noExtend: true,
-  stage0: true
+}).variant('without_nested_codeblock_or_media', {
+  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock))],
+  ignore: ['json-schema', 'validator-spec']
 });

package/dist/es2019/next-schema/nodes/expand.js

@@ -21,7 +21,7 @@ export const expand = adfNode('expand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(nonNestableBlockContentGroup))],
+  content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks')))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.attrs.optional': {
@@ -30,10 +30,9 @@ export const expand = adfNode('expand').define({
       }
     }
   }
-}).variant('with_nested_expand', {
-  content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks')))],
-  noExtend: true,
-  stage0: true
+}).variant('without_nested_expand', {
+  content: [$onePlus($or(nonNestableBlockContentGroup))],
+  ignore: ['json-schema', 'validator-spec']
 }).variant('with_breakout_mark', {
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
   content: [],

package/dist/es2019/schema/create-schema.js

@@ -1,7 +1,7 @@
 import { Schema } from '@atlaskit/editor-prosemirror/model';
 import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
 import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer, fragment, border, backgroundColor } from './marks';
-import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItemWithTask, heading, blockquoteWithList, codeBlock, extendedPanel, rule, image, mention, media, mediaInline, mediaSingleFull, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, multiBodiedExtension, extensionFrame, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
+import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItemWithTask, heading, blockquoteWithNestedCodeblockOrMedia, codeBlock, extendedPanel, rule, image, mention, media, mediaInline, mediaSingleFull, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, multiBodiedExtension, extensionFrame, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expandWithNestedExpand, nestedExpand, embedCard, caption } from './nodes';
 function addItems(builtInItems, config, customSpecs = {}) {
   if (!config) {
     return {};
@@ -72,7 +72,7 @@ const nodesInOrder = [{
   spec: heading
 }, {
   name: 'blockquote',
-  spec: blockquoteWithList
+  spec: blockquoteWithNestedCodeblockOrMedia
 }, {
   name: 'codeBlock',
   spec: codeBlock
@@ -159,7 +159,7 @@ const nodesInOrder = [{
   spec: status
 }, {
   name: 'expand',
-  spec: expand
+  spec: expandWithNestedExpand
 }, {
   name: 'nestedExpand',
   spec: nestedExpand

package/dist/es2019/schema/default-schema.js

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpandStage0, blockquoteWithNestedCodeblockOrMediaStage0, listItemWithDecisionStage0 } from './nodes';
+import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, blockquoteWithNestedCodeblockOrMedia, listItemWithDecisionStage0 } from './nodes';
 import { createSchema } from './create-schema';
 const getDefaultSchemaConfig = () => {
   const defaultSchemaConfig = {
@@ -18,8 +18,8 @@ export const getSchemaBasedOnStage = memoizeOne((stage = 'final') => {
       layoutSection: layoutSectionWithSingleColumn,
       multiBodiedExtension: multiBodiedExtension,
       extensionFrame: extensionFrame,
-      expand: expandWithNestedExpandStage0,
-      blockquote: blockquoteWithNestedCodeblockOrMediaStage0,
+      expand: expandWithNestedExpand,
+      blockquote: blockquoteWithNestedCodeblockOrMedia,
       listItem: listItemWithDecisionStage0
     };
   }

package/dist/es2019/schema/index.js

@@ -1,4 +1,4 @@
-export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpandStage0, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension } from './nodes';
+export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension } from './nodes';
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
 colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, backgroundColor, backgroundColorPalette } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';

package/dist/es2019/schema/nodes/blockquote.js

@@ -1,5 +1,5 @@
 import { blockquote as blockquoteFactory } from '../../next-schema/generated/nodeTypes';
-import { blockquoteLegacy as blockquoteLegacyFactory, blockquoteWithNestedCodeblockOrMediaStage0 as blockquoteWithNestedCodeblockOrMediaStage0Factory } from '../../next-schema/generated/nodeTypes';
+import { blockquoteLegacy as blockquoteLegacyFactory, blockquoteWithoutNestedCodeblockOrMedia as blockquoteWithoutNestedCodeblockOrMediaFactory } from '../../next-schema/generated/nodeTypes';
 
 /**
  * @name blockquote_node
@@ -14,12 +14,12 @@ const nodeSpecOptions = {
   }
 };
 export const blockquote = blockquoteLegacyFactory(nodeSpecOptions);
-export const blockquoteWithNestedCodeblockOrMediaStage0 = blockquoteWithNestedCodeblockOrMediaStage0Factory(nodeSpecOptions);
+export const blockquoteWithNestedCodeblockOrMedia = blockquoteFactory(nodeSpecOptions);
 
 /**
  * @name blockquote_with_list_node
  */
-export const blockquoteWithList = blockquoteFactory({
+export const blockquoteWithList = blockquoteWithoutNestedCodeblockOrMediaFactory({
   parseDOM: [{
     tag: 'blockquote'
   }],

package/dist/es2019/schema/nodes/expand.js

@@ -1,4 +1,4 @@
-import { expand as expandFactory, expandWithNestedExpandStage0 as expandWithNestedExpandStage0Factory } from '../../next-schema/generated/nodeTypes';
+import { expandWithoutNestedExpand as expandWithoutNestedExpandFactory, expand as expandFactory } from '../../next-schema/generated/nodeTypes';
 
 /**
  * @name expand_node
@@ -51,8 +51,8 @@ const nodeSpecOptions = {
     return ['div', attrs, 0];
   }
 };
-export const expand = expandFactory(nodeSpecOptions);
-export const expandWithNestedExpandStage0 = expandWithNestedExpandStage0Factory(nodeSpecOptions);
+export const expand = expandWithoutNestedExpandFactory(nodeSpecOptions);
+export const expandWithNestedExpand = expandFactory(nodeSpecOptions);
 export const toJSON = node => ({
   attrs: Object.keys(node.attrs).filter(key => !key.startsWith('__')).reduce((obj, key) => {
     return {