@atlaskit/adf-schema 40.2.0 → 40.3.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 40.3.0
+
+### Minor Changes
+
+- eabfb58: [ED-24167] Allow nesting codeBlock and media nodes in blockquote
+
+## 40.2.1
+
+### Patch Changes
+
+- 60c7ca6: [ED-24166] Fixed type issue where it was pulling in a type based on a PMNode into the DocNode type, which isn't compatible with the ADFEntity type which doesn't have the PM methods
+
 ## 40.2.0
 
 ### Minor Changes

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.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.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.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;
 var _createPMSpecFactory = require("../../schema/createPMSpecFactory");
 /**
  * This file was automatically generated by @atlaskit/adf-schema-generator
@@ -45,6 +45,12 @@ 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)+',
+  group: 'block',
+  selectable: false,
+  defining: true
+});
 var bodiedExtension = exports.bodiedExtension = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
   marks: 'dataConsumer fragment',

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'), _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('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], {
   // @DSLCompatibilityException
   // Block group in PM doesn't match ADF
   ignore: ['validator-spec']

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

@@ -10,6 +10,9 @@ var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
 var _list = require("./list");
 var _paragraph = require("./paragraph");
 var _unsupportedBlock = require("./unsupportedBlock");
+var _codeBlock = require("./codeBlock");
+var _mediaGroup = require("./mediaGroup");
+var _mediaSingle = require("./mediaSingle");
 var blockquote = exports.blockquote = (0, _adfSchemaGenerator.adfNode)('blockquote').define({
   defining: true,
   selectable: false,
@@ -18,4 +21,8 @@ var blockquote = exports.blockquote = (0, _adfSchemaGenerator.adfNode)('blockquo
 }).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
 });

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

@@ -26,7 +26,8 @@ var getSchemaBasedOnStage = exports.getSchemaBasedOnStage = (0, _memoizeOne.defa
       layoutSection: _nodes.layoutSectionWithSingleColumn,
       multiBodiedExtension: _nodes.multiBodiedExtension,
       extensionFrame: _nodes.extensionFrame,
-      expand: _nodes.expandWithNestedExpandStage0
+      expand: _nodes.expandWithNestedExpandStage0,
+      blockquote: _nodes.blockquoteWithNestedCodeblockOrMediaStage0
     };
   }
   return (0, _createSchema.createSchema)(defaultSchemaConfig);

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

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

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

@@ -28,6 +28,12 @@ Object.defineProperty(exports, "blockquoteWithList", {
     return _blockquote.blockquoteWithList;
   }
 });
+Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMediaStage0", {
+  enumerable: true,
+  get: function get() {
+    return _blockquote.blockquoteWithNestedCodeblockOrMediaStage0;
+  }
+});
 Object.defineProperty(exports, "bodiedExtension", {
   enumerable: true,
   get: function get() {

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_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_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_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;
 var blockCard = exports.blockCard = {
   props: {
     type: {
@@ -1074,6 +1074,30 @@ var blockquote_legacy = exports.blockquote_legacy = ['blockquote', {
     }
   }
 }];
+var mediaGroup = exports.mediaGroup = {
+  props: {
+    type: {
+      type: 'enum',
+      values: ['mediaGroup']
+    },
+    content: {
+      type: 'array',
+      items: ['media'],
+      minItems: 1,
+      allowUnsupportedBlock: true
+    }
+  }
+};
+var blockquote_with_nested_codeblock_or_media = exports.blockquote_with_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']],
+      minItems: 1,
+      allowUnsupportedBlock: true
+    }
+  }
+}];
 var decisionItem = exports.decisionItem = {
   props: {
     type: {
@@ -1265,20 +1289,6 @@ var heading_with_alignment = exports.heading_with_alignment = ['heading', {
     }
   }
 }];
-var mediaGroup = exports.mediaGroup = {
-  props: {
-    type: {
-      type: 'enum',
-      values: ['mediaGroup']
-    },
-    content: {
-      type: 'array',
-      items: ['media'],
-      minItems: 1,
-      allowUnsupportedBlock: true
-    }
-  }
-};
 var rule = exports.rule = {
   props: {
     type: {

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

@@ -39,6 +39,12 @@ export const blockquoteLegacy = createPMNodeSpecFactory({
   selectable: false,
   defining: true
 });
+export const blockquoteWithNestedCodeblockOrMediaStage0 = createPMNodeSpecFactory({
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
+  group: 'block',
+  selectable: false,
+  defining: true
+});
 export const bodiedExtension = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
   marks: 'dataConsumer fragment',

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'), 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('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], {
   // @DSLCompatibilityException
   // Block group in PM doesn't match ADF
   ignore: ['validator-spec']

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

@@ -4,6 +4,9 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 import { bulletList, orderedList } from './list';
 import { paragraph } from './paragraph';
 import { unsupportedBlock } from './unsupportedBlock';
+import { codeBlock } from './codeBlock';
+import { mediaGroup } from './mediaGroup';
+import { mediaSingle } from './mediaSingle';
 export const blockquote = adfNode('blockquote').define({
   defining: true,
   selectable: false,
@@ -12,4 +15,8 @@ export const blockquote = adfNode('blockquote').define({
 }).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
 });

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

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

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

@@ -1,18 +1,20 @@
 import { blockquote as blockquoteFactory } from '../../next-schema/generated/nodeTypes';
-import { blockquoteLegacy as blockquoteLegacyFactory } from '../../next-schema/generated/nodeTypes';
+import { blockquoteLegacy as blockquoteLegacyFactory, blockquoteWithNestedCodeblockOrMediaStage0 as blockquoteWithNestedCodeblockOrMediaStage0Factory } from '../../next-schema/generated/nodeTypes';
 
 /**
  * @name blockquote_node
  */
 
-export const blockquote = blockquoteLegacyFactory({
+const nodeSpecOptions = {
   parseDOM: [{
     tag: 'blockquote'
   }],
   toDOM() {
     return ['blockquote', 0];
   }
-});
+};
+export const blockquote = blockquoteLegacyFactory(nodeSpecOptions);
+export const blockquoteWithNestedCodeblockOrMediaStage0 = blockquoteWithNestedCodeblockOrMediaStage0Factory(nodeSpecOptions);
 
 /**
  * @name blockquote_with_list_node

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

@@ -3,8 +3,7 @@ export { confluenceJiraIssue } from './confluence-jira-issue';
 export { confluenceUnsupportedBlock } from './confluence-unsupported-block';
 export { confluenceUnsupportedInline } from './confluence-unsupported-inline';
 export { doc } from './doc';
-export { blockquote } from './blockquote';
-export { blockquoteWithList } from './blockquote';
+export { blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0 } from './blockquote';
 export { bulletList, bulletListSelector } from './bullet-list';
 export { codeBlock, toJSON as codeBlockToJSON } from './code-block';
 export { hardBreak } from './hard-break';

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

@@ -1068,6 +1068,30 @@ export const blockquote_legacy = ['blockquote', {
     }
   }
 }];
+export const mediaGroup = {
+  props: {
+    type: {
+      type: 'enum',
+      values: ['mediaGroup']
+    },
+    content: {
+      type: 'array',
+      items: ['media'],
+      minItems: 1,
+      allowUnsupportedBlock: true
+    }
+  }
+};
+export const blockquote_with_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']],
+      minItems: 1,
+      allowUnsupportedBlock: true
+    }
+  }
+}];
 export const decisionItem = {
   props: {
     type: {
@@ -1259,20 +1283,6 @@ export const heading_with_alignment = ['heading', {
     }
   }
 }];
-export const mediaGroup = {
-  props: {
-    type: {
-      type: 'enum',
-      values: ['mediaGroup']
-    },
-    content: {
-      type: 'array',
-      items: ['media'],
-      minItems: 1,
-      allowUnsupportedBlock: true
-    }
-  }
-};
 export const rule = {
   props: {
     type: {

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

@@ -39,6 +39,12 @@ export var blockquoteLegacy = createPMNodeSpecFactory({
   selectable: false,
   defining: true
 });
+export var blockquoteWithNestedCodeblockOrMediaStage0 = createPMNodeSpecFactory({
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
+  group: 'block',
+  selectable: false,
+  defining: true
+});
 export var bodiedExtension = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
   marks: 'dataConsumer fragment',

package/dist/esm/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 var 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'), 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 var 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], {
   // @DSLCompatibilityException
   // Block group in PM doesn't match ADF
   ignore: ['validator-spec']

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

@@ -4,6 +4,9 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 import { bulletList, orderedList } from './list';
 import { paragraph } from './paragraph';
 import { unsupportedBlock } from './unsupportedBlock';
+import { codeBlock } from './codeBlock';
+import { mediaGroup } from './mediaGroup';
+import { mediaSingle } from './mediaSingle';
 export var blockquote = adfNode('blockquote').define({
   defining: true,
   selectable: false,
@@ -12,4 +15,8 @@ export var blockquote = adfNode('blockquote').define({
 }).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
 });

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

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpandStage0 } from './nodes';
+import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpandStage0, blockquoteWithNestedCodeblockOrMediaStage0 } from './nodes';
 import { createSchema } from './create-schema';
 var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
   var defaultSchemaConfig = {
@@ -19,7 +19,8 @@ export var getSchemaBasedOnStage = memoizeOne(function () {
       layoutSection: layoutSectionWithSingleColumn,
       multiBodiedExtension: multiBodiedExtension,
       extensionFrame: extensionFrame,
-      expand: expandWithNestedExpandStage0
+      expand: expandWithNestedExpandStage0,
+      blockquote: blockquoteWithNestedCodeblockOrMediaStage0
     };
   }
   return createSchema(defaultSchemaConfig);

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

@@ -1,18 +1,20 @@
 import { blockquote as blockquoteFactory } from '../../next-schema/generated/nodeTypes';
-import { blockquoteLegacy as blockquoteLegacyFactory } from '../../next-schema/generated/nodeTypes';
+import { blockquoteLegacy as blockquoteLegacyFactory, blockquoteWithNestedCodeblockOrMediaStage0 as blockquoteWithNestedCodeblockOrMediaStage0Factory } from '../../next-schema/generated/nodeTypes';
 
 /**
  * @name blockquote_node
  */
 
-export var blockquote = blockquoteLegacyFactory({
+var nodeSpecOptions = {
   parseDOM: [{
     tag: 'blockquote'
   }],
   toDOM: function toDOM() {
     return ['blockquote', 0];
   }
-});
+};
+export var blockquote = blockquoteLegacyFactory(nodeSpecOptions);
+export var blockquoteWithNestedCodeblockOrMediaStage0 = blockquoteWithNestedCodeblockOrMediaStage0Factory(nodeSpecOptions);
 
 /**
  * @name blockquote_with_list_node

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

@@ -3,8 +3,7 @@ export { confluenceJiraIssue } from './confluence-jira-issue';
 export { confluenceUnsupportedBlock } from './confluence-unsupported-block';
 export { confluenceUnsupportedInline } from './confluence-unsupported-inline';
 export { doc } from './doc';
-export { blockquote } from './blockquote';
-export { blockquoteWithList } from './blockquote';
+export { blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0 } from './blockquote';
 export { bulletList, bulletListSelector } from './bullet-list';
 export { codeBlock, toJSON as codeBlockToJSON } from './code-block';
 export { hardBreak } from './hard-break';

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

@@ -1068,6 +1068,30 @@ export var blockquote_legacy = ['blockquote', {
     }
   }
 }];
+export var mediaGroup = {
+  props: {
+    type: {
+      type: 'enum',
+      values: ['mediaGroup']
+    },
+    content: {
+      type: 'array',
+      items: ['media'],
+      minItems: 1,
+      allowUnsupportedBlock: true
+    }
+  }
+};
+export var blockquote_with_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']],
+      minItems: 1,
+      allowUnsupportedBlock: true
+    }
+  }
+}];
 export var decisionItem = {
   props: {
     type: {
@@ -1259,20 +1283,6 @@ export var heading_with_alignment = ['heading', {
     }
   }
 }];
-export var mediaGroup = {
-  props: {
-    type: {
-      type: 'enum',
-      values: ['mediaGroup']
-    },
-    content: {
-      type: 'array',
-      items: ['media'],
-      minItems: 1,
-      allowUnsupportedBlock: true
-    }
-  }
-};
 export var rule = {
   props: {
     type: {

package/dist/json-schema/v1/full.json

@@ -1421,6 +1421,23 @@
       "additionalProperties": false,
       "required": ["type", "content"]
     },
+    "mediaGroup_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["mediaGroup"]
+        },
+        "content": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/media_node"
+          },
+          "minItems": 1
+        }
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
+    },
     "decisionItem_node": {
       "type": "object",
       "properties": {
@@ -1673,23 +1690,6 @@
         }
       ]
     },
-    "mediaGroup_node": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "enum": ["mediaGroup"]
-        },
-        "content": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/media_node"
-          },
-          "minItems": 1
-        }
-      },
-      "additionalProperties": false,
-      "required": ["type", "content"]
-    },
     "rule_node": {
       "type": "object",
       "properties": {

package/dist/json-schema/v1/stage-0.json

@@ -1451,6 +1451,62 @@
       "additionalProperties": false,
       "required": ["type", "content"]
     },
+    "mediaGroup_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["mediaGroup"]
+        },
+        "content": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/media_node"
+          },
+          "minItems": 1
+        }
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
+    },
+    "blockquote_with_nested_codeblock_or_media_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["blockquote"]
+        },
+        "content": {
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/paragraph_with_no_marks_node"
+              },
+              {
+                "$ref": "#/definitions/orderedList_node"
+              },
+              {
+                "$ref": "#/definitions/bulletList_node"
+              },
+              {
+                "$ref": "#/definitions/codeBlock_with_no_marks_node"
+              },
+              {
+                "$ref": "#/definitions/mediaGroup_node"
+              },
+              {
+                "$ref": "#/definitions/mediaSingle_caption_node"
+              },
+              {
+                "$ref": "#/definitions/mediaSingle_full_node"
+              }
+            ]
+          },
+          "minItems": 1
+        }
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
+    },
     "decisionItem_node": {
       "type": "object",
       "properties": {
@@ -1703,23 +1759,6 @@
         }
       ]
     },
-    "mediaGroup_node": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "enum": ["mediaGroup"]
-        },
-        "content": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/media_node"
-          },
-          "minItems": 1
-        }
-      },
-      "additionalProperties": false,
-      "required": ["type", "content"]
-    },
     "rule_node": {
       "type": "object",
       "properties": {
@@ -2371,6 +2410,9 @@
         {
           "$ref": "#/definitions/blockquote_node"
         },
+        {
+          "$ref": "#/definitions/blockquote_with_nested_codeblock_or_media_node"
+        },
         {
           "$ref": "#/definitions/decisionList_node"
         },
@@ -2701,6 +2743,9 @@
               {
                 "$ref": "#/definitions/blockquote_node"
               },
+              {
+                "$ref": "#/definitions/blockquote_with_nested_codeblock_or_media_node"
+              },
               {
                 "$ref": "#/definitions/decisionList_node"
               },

package/dist/types/next-schema/generated/nodeGroupTypes.d.ts

@@ -3,8 +3,8 @@
  * DO NOT MODIFY IT BY HAND. Instead, modify the source files in "packages/adf-schema/src/next-schema" ,
  * and run "yarn workspace @atlaskit/adf-schema build:schema:all" to regenerate this file.
  */
-import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, CodeBlockWithNoMarksDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DateStage0Definition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, EmojiStage0Definition, ExpandDefinition, ExpandWithNestedExpandStage0Definition, ExpandWithNoMarkDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HardBreakDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, ImageDefinition, InlineCardDefinition, InlineCardStage0Definition, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, MediaGroupDefinition, MediaInlineDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, MentionDefinition, MentionStage0Definition, MultiBodiedExtensionStage0Definition, OrderedListDefinition, PanelDefinition, PanelLegacyDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StatusStage0Definition, TableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
-export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | CodeBlockWithNoMarksDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | PanelLegacyDefinition | TableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | ExpandWithNoMarkDefinition | ExpandWithNestedExpandStage0Definition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BlockquoteWithNestedCodeblockOrMediaStage0Definition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, CodeBlockWithNoMarksDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DateStage0Definition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, EmojiStage0Definition, ExpandDefinition, ExpandWithNestedExpandStage0Definition, ExpandWithNoMarkDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HardBreakDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, ImageDefinition, InlineCardDefinition, InlineCardStage0Definition, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, MediaGroupDefinition, MediaInlineDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, MentionDefinition, MentionStage0Definition, MultiBodiedExtensionStage0Definition, OrderedListDefinition, PanelDefinition, PanelLegacyDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StatusStage0Definition, TableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
+export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | CodeBlockWithNoMarksDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | BlockquoteWithNestedCodeblockOrMediaStage0Definition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | PanelLegacyDefinition | TableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | ExpandWithNoMarkDefinition | ExpandWithNestedExpandStage0Definition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
 export type BlockRootOnlyDefinition = Array<MultiBodiedExtensionStage0Definition>;
 export type InlineDefinition = Array<TextDefinition | TextFormattedDefinition | TextCodeInlineDefinition | DateDefinition | DateStage0Definition | EmojiDefinition | EmojiStage0Definition | HardBreakDefinition | InlineCardDefinition | InlineCardStage0Definition | MentionDefinition | MentionStage0Definition | PlaceholderDefinition | StatusDefinition | StatusStage0Definition | InlineExtensionDefinition | InlineExtensionWithMarksDefinition | MediaInlineDefinition | ImageDefinition | ConfluenceJiraIssueDefinition | ConfluenceUnsupportedInlineDefinition | UnsupportedInlineDefinition>;
 export type NonNestableBlockContentDefinition = Array<ParagraphWithNoMarksDefinition | PanelDefinition | BlockquoteDefinition | OrderedListDefinition | BulletListDefinition | RuleDefinition | HeadingWithNoMarksDefinition | CodeBlockWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | DecisionListDefinition | TaskListDefinition | TableDefinition | BlockCardDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | UnsupportedBlockDefinition>;

package/dist/types/next-schema/generated/nodeTypes.d.ts

@@ -39,6 +39,13 @@ export interface BlockquoteLegacyDefinition {
 }
 export type BlockquoteLegacyNode = PMNode & BlockquoteLegacyDefinition;
 export declare const blockquoteLegacy: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<BlockquoteLegacyNode>) => import("prosemirror-model").NodeSpec;
+export interface BlockquoteWithNestedCodeblockOrMediaStage0Definition {
+    type: 'blockquote';
+    content: Array<BulletListDefinition | CodeBlockWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | ParagraphWithNoMarksDefinition | UnsupportedBlockDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
+}
+export type BlockquoteWithNestedCodeblockOrMediaStage0Node = PMNode & BlockquoteWithNestedCodeblockOrMediaStage0Definition;
+export declare const blockquoteWithNestedCodeblockOrMediaStage0: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<BlockquoteWithNestedCodeblockOrMediaStage0Node>) => import("prosemirror-model").NodeSpec;
 export interface BodiedExtensionDefinition {
     type: 'bodiedExtension';
     content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;

package/dist/types/next-schema/groups/nonNestableBlockContentGroup.d.ts

@@ -49,9 +49,16 @@ export declare const nonNestableBlockContent: (import("@atlaskit/adf-schema-gene
             };
         };
     };
-}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
+}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy", "with_nested_codeblock_or_media"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
     ignore: ("json-schema" | "validator-spec")[];
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
+} & {
+    content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
+    noExtend: true;
+    stage0: true;
+}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
+    content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
+    ignore: ("json-schema" | "validator-spec")[];
 }> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<any, import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
     marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
     ignore: any[];

package/dist/types/next-schema/nodes/blockquote.d.ts

@@ -1,4 +1,8 @@
-export declare const blockquote: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
+export declare const blockquote: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy", "with_nested_codeblock_or_media"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
     ignore: ("json-schema" | "validator-spec")[];
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
+} & {
+    content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
+    noExtend: true;
+    stage0: true;
 }>;

package/dist/types/schema/nodes/blockquote.d.ts

@@ -1,6 +1,9 @@
 import { ParagraphDefinition as Paragraph } from './paragraph';
 import { OrderedListDefinition as OrderedList } from './types/list';
 import { BulletListDefinition as BulletList } from './types/list';
+import { CodeBlockDefinition as CodeBlock } from './code-block';
+import { MediaGroupDefinition as MediaGroup } from './media-group';
+import { MediaSingleDefinition as MediaSingle } from './media-single';
 /**
  * @name blockquote_node
  */
@@ -10,9 +13,10 @@ export interface BlockQuoteDefinition {
      * @minItems 1
      * @allowUnsupportedBlock true
      */
-    content: Array<Paragraph | OrderedList | BulletList>;
+    content: Array<Paragraph | OrderedList | BulletList | CodeBlock | MediaGroup | MediaSingle>;
 }
 export declare const blockquote: import("prosemirror-model").NodeSpec;
+export declare const blockquoteWithNestedCodeblockOrMediaStage0: import("prosemirror-model").NodeSpec;
 /**
  * @name blockquote_with_list_node
  */

package/dist/types/schema/nodes/expand.d.ts

@@ -2,7 +2,7 @@ import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { BreakoutMarkDefinition } from '../marks';
 import { MarksObject, NoMark } from './types/mark';
 import { NonNestableBlockContent } from './types/non-nestable-block-content';
-import { NestedExpandWithNoMarksNode } from '../../next-schema/generated/nodeTypes';
+import { NestedExpandDefinition } from './nested-expand';
 /**
  * @name expand_node
  */
@@ -15,7 +15,7 @@ export interface ExpandBaseDefinition {
      * @minItems 1
      * @allowUnsupportedBlock true
      */
-    content: Array<NonNestableBlockContent | NestedExpandWithNoMarksNode>;
+    content: Array<NonNestableBlockContent | NestedExpandDefinition>;
     marks?: Array<any>;
 }
 /**

package/dist/types/schema/nodes/index.d.ts

@@ -5,8 +5,7 @@ export { confluenceUnsupportedBlock } from './confluence-unsupported-block';
 export { confluenceUnsupportedInline } from './confluence-unsupported-inline';
 export { doc } from './doc';
 export type { DocNode } from './doc';
-export { blockquote } from './blockquote';
-export { blockquoteWithList } from './blockquote';
+export { blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0, } from './blockquote';
 export type { BlockQuoteDefinition } from './blockquote';
 export { bulletList, bulletListSelector } from './bullet-list';
 export type { BulletListDefinition } from './types/list';

package/dist/types/validator-schema/generated/validatorSpec.d.ts

@@ -1087,6 +1087,30 @@ export declare const blockquote_legacy: (string | {
         };
     };
 })[];
+export declare const mediaGroup: {
+    props: {
+        type: {
+            type: string;
+            values: string[];
+        };
+        content: {
+            type: string;
+            items: string[];
+            minItems: number;
+            allowUnsupportedBlock: boolean;
+        };
+    };
+};
+export declare const blockquote_with_nested_codeblock_or_media: (string | {
+    props: {
+        content: {
+            type: string;
+            items: string[][];
+            minItems: number;
+            allowUnsupportedBlock: boolean;
+        };
+    };
+})[];
 export declare const decisionItem: {
     props: {
         type: {
@@ -1278,20 +1302,6 @@ export declare const heading_with_alignment: (string | {
         };
     };
 })[];
-export declare const mediaGroup: {
-    props: {
-        type: {
-            type: string;
-            values: string[];
-        };
-        content: {
-            type: string;
-            items: string[];
-            minItems: number;
-            allowUnsupportedBlock: boolean;
-        };
-    };
-};
 export declare const rule: {
     props: {
         type: {

package/json-schema/v1/full.json

@@ -1421,6 +1421,23 @@
       "additionalProperties": false,
       "required": ["type", "content"]
     },
+    "mediaGroup_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["mediaGroup"]
+        },
+        "content": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/media_node"
+          },
+          "minItems": 1
+        }
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
+    },
     "decisionItem_node": {
       "type": "object",
       "properties": {
@@ -1673,23 +1690,6 @@
         }
       ]
     },
-    "mediaGroup_node": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "enum": ["mediaGroup"]
-        },
-        "content": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/media_node"
-          },
-          "minItems": 1
-        }
-      },
-      "additionalProperties": false,
-      "required": ["type", "content"]
-    },
     "rule_node": {
       "type": "object",
       "properties": {

package/json-schema/v1/stage-0.json

@@ -1451,6 +1451,62 @@
       "additionalProperties": false,
       "required": ["type", "content"]
     },
+    "mediaGroup_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["mediaGroup"]
+        },
+        "content": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/media_node"
+          },
+          "minItems": 1
+        }
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
+    },
+    "blockquote_with_nested_codeblock_or_media_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["blockquote"]
+        },
+        "content": {
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/paragraph_with_no_marks_node"
+              },
+              {
+                "$ref": "#/definitions/orderedList_node"
+              },
+              {
+                "$ref": "#/definitions/bulletList_node"
+              },
+              {
+                "$ref": "#/definitions/codeBlock_with_no_marks_node"
+              },
+              {
+                "$ref": "#/definitions/mediaGroup_node"
+              },
+              {
+                "$ref": "#/definitions/mediaSingle_caption_node"
+              },
+              {
+                "$ref": "#/definitions/mediaSingle_full_node"
+              }
+            ]
+          },
+          "minItems": 1
+        }
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
+    },
     "decisionItem_node": {
       "type": "object",
       "properties": {
@@ -1703,23 +1759,6 @@
         }
       ]
     },
-    "mediaGroup_node": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "enum": ["mediaGroup"]
-        },
-        "content": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/media_node"
-          },
-          "minItems": 1
-        }
-      },
-      "additionalProperties": false,
-      "required": ["type", "content"]
-    },
     "rule_node": {
       "type": "object",
       "properties": {
@@ -2371,6 +2410,9 @@
         {
           "$ref": "#/definitions/blockquote_node"
         },
+        {
+          "$ref": "#/definitions/blockquote_with_nested_codeblock_or_media_node"
+        },
         {
           "$ref": "#/definitions/decisionList_node"
         },
@@ -2701,6 +2743,9 @@
               {
                 "$ref": "#/definitions/blockquote_node"
               },
+              {
+                "$ref": "#/definitions/blockquote_with_nested_codeblock_or_media_node"
+              },
               {
                 "$ref": "#/definitions/decisionList_node"
               },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "40.2.0",
+  "version": "40.3.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
     "memoize-one": "^6.0.0"
   },
   "devDependencies": {
-    "@atlassian/adf-schema-json": "^1.17.0",
+    "@atlassian/adf-schema-json": "^1.18.0",
     "@atlassian/feature-flags-test-utils": "^0.2.0",
     "@atlaskit/adf-schema-generator": "^1.30.0",
     "@atlaskit/codemod-utils": "^4.2.4",