@atlaskit/adf-schema 48.0.0 → 49.0.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-schema
 
+## 49.0.0
+
+### Major Changes
+
+- bf5cbd4: BREAKING CHANGE: EDITOR-616 Remove unused variations of blockquote, listItem, nestedExpand, and panel
+
 ## 48.0.0
 
 ### Major Changes

package/dist/cjs/index.js

@@ -345,24 +345,6 @@ Object.defineProperty(exports, "blockquote", {
     return _schema.blockquote;
   }
 });
-Object.defineProperty(exports, "blockquoteWithList", {
-  enumerable: true,
-  get: function get() {
-    return _schema.blockquoteWithList;
-  }
-});
-Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMedia", {
-  enumerable: true,
-  get: function get() {
-    return _schema.blockquoteWithNestedCodeblockOrMedia;
-  }
-});
-Object.defineProperty(exports, "blockquoteWithoutNonBodiedMacros", {
-  enumerable: true,
-  get: function get() {
-    return _schema.blockquoteWithoutNonBodiedMacros;
-  }
-});
 Object.defineProperty(exports, "bodiedExtension", {
   enumerable: true,
   get: function get() {
@@ -759,18 +741,6 @@ Object.defineProperty(exports, "listItemWithDecisionStage0", {
     return _schema.listItemWithDecisionStage0;
   }
 });
-Object.defineProperty(exports, "listItemWithTask", {
-  enumerable: true,
-  get: function get() {
-    return _schema.listItemWithTask;
-  }
-});
-Object.defineProperty(exports, "listItemWithoutNonBodiedMacros", {
-  enumerable: true,
-  get: function get() {
-    return _schema.listItemWithoutNonBodiedMacros;
-  }
-});
 Object.defineProperty(exports, "media", {
   enumerable: true,
   get: function get() {
@@ -855,12 +825,6 @@ Object.defineProperty(exports, "nestedExpand", {
     return _schema.nestedExpand;
   }
 });
-Object.defineProperty(exports, "nestedExpandWithoutNonBodiedMacros", {
-  enumerable: true,
-  get: function get() {
-    return _schema.nestedExpandWithoutNonBodiedMacros;
-  }
-});
 Object.defineProperty(exports, "normalizeHexColor", {
   enumerable: true,
   get: function get() {
@@ -891,12 +855,6 @@ Object.defineProperty(exports, "orderedListWithOrder", {
     return _schema.orderedListWithOrder;
   }
 });
-Object.defineProperty(exports, "panelWithoutNestedNonBodiedMacros", {
-  enumerable: true,
-  get: function get() {
-    return _schema.panelWithoutNestedNonBodiedMacros;
-  }
-});
 Object.defineProperty(exports, "paragraph", {
   enumerable: true,
   get: function get() {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unsupportedInline = exports.unsupportedBlock = exports.textWithNoMarks = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableWithNestedTable = exports.tableRowWithNestedTable = exports.tableRow = exports.tableHeaderWithNestedTable = exports.tableHeader = exports.tableCellWithNestedTable = exports.tableCell = exports.table = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelWithoutNestedNonBodiedMacros = exports.panel = exports.orderedList = exports.nestedExpandWithoutNonBodiedMacros = 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.listItemWithoutNonBodiedMacros = exports.listItemWithNestedDecisionStage0 = 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.expandRootOnly = 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.codeBlockRootOnly = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteWithoutNonBodiedMacros = exports.blockquoteWithoutNestedCodeblockOrMedia = exports.blockquoteLegacy = exports.blockquote = exports.blockCard = void 0;
+exports.unsupportedInline = exports.unsupportedBlock = exports.textWithNoMarks = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableWithNestedTable = exports.tableRowWithNestedTable = exports.tableRow = exports.tableHeaderWithNestedTable = exports.tableHeader = exports.tableCellWithNestedTable = exports.tableCell = exports.table = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = 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.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.expandRootOnly = 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.codeBlockRootOnly = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteLegacy = exports.blockquote = exports.blockCard = void 0;
 var _createPMSpecFactory = require("../../schema/createPMSpecFactory");
 /**
  * This file was automatically generated by @atlaskit/adf-schema-generator
@@ -47,20 +47,6 @@ var blockquoteLegacy = exports.blockquoteLegacy = (0, _createPMSpecFactory.creat
   selectable: true,
   defining: true
 });
-var blockquoteWithoutNestedCodeblockOrMedia = exports.blockquoteWithoutNestedCodeblockOrMedia = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
-  selectable: true,
-  defining: true
-});
-var blockquoteWithoutNonBodiedMacros = exports.blockquoteWithoutNonBodiedMacros = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaSingle | mediaGroup)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
-  selectable: true,
-  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 unsupportedMark unsupportedNodeAttribute',
@@ -583,12 +569,6 @@ var listItemWithNestedDecisionStage0 = exports.listItemWithNestedDecisionStage0
   selectable: false,
   defining: true
 });
-var listItemWithoutNonBodiedMacros = exports.listItemWithoutNonBodiedMacros = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | mediaSingle | codeBlock | unsupportedBlock) (paragraph | bulletList | orderedList | taskList | mediaSingle | codeBlock | unsupportedBlock)*',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  selectable: false,
-  defining: true
-});
 var media = exports.media = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   attrs: {
     type: {
@@ -861,20 +841,6 @@ var nestedExpandWithNoMarks = exports.nestedExpandWithNoMarks = (0, _createPMSpe
   selectable: true,
   isolating: true
 });
-var nestedExpandWithoutNonBodiedMacros = exports.nestedExpandWithoutNonBodiedMacros = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  attrs: {
-    title: {
-      default: ''
-    },
-    __expanded: {
-      default: true
-    }
-  },
-  selectable: true,
-  isolating: true
-});
 var orderedList = exports.orderedList = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: 'listItem+',
   marks: 'unsupportedMark unsupportedNodeAttribute',
@@ -909,29 +875,6 @@ var panel = exports.panel = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   },
   selectable: true
 });
-var panelWithoutNestedNonBodiedMacros = exports.panelWithoutNestedNonBodiedMacros = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
-  attrs: {
-    panelType: {
-      default: 'info'
-    },
-    panelIcon: {
-      default: null
-    },
-    panelIconId: {
-      default: null
-    },
-    panelIconText: {
-      default: null
-    },
-    panelColor: {
-      default: null
-    }
-  },
-  selectable: true
-});
 var paragraph = exports.paragraph = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: 'inline*',
   marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',

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

@@ -35,7 +35,7 @@ var _unsupportedBlock = require("../nodes/unsupportedBlock");
  * - no base mediaSingle
  * - no base heading
  */
-var blockContentGroup = exports.blockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block_content', [_blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _panel.panel.use('without_nested_non_bodied_macros'), _blockquote.blockquote, _blockquote.blockquote.use('without_nested_codeblock_or_media'), _blockquote.blockquote.use('without_non_bodied_macros'), _extension.extension.use('with_marks'), _embedCard.embedCard, _tableNodes.table,
+var blockContentGroup = exports.blockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block_content', [_blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _tableNodes.table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 _tableNodes.table.use('with_nested_table'), _expand.expand, _bodiedExtension.bodiedExtension.use('with_marks'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   ignore: ['pm-spec']

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

@@ -24,7 +24,7 @@ var _rule = require("../nodes/rule");
 var _tableNodes = require("../nodes/tableNodes");
 var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
-var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _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'), _blockquote.blockquote.use('without_non_bodied_macros'), _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('without_nested_non_bodied_macros'), _tableNodes.table,
+var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _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, _tableNodes.table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 _tableNodes.table.use('with_nested_table'), _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   // @DSLCompatibilityException

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

@@ -21,7 +21,7 @@ var _paragraph = require("../nodes/paragraph");
 var _rule = require("../nodes/rule");
 var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
-var tableCellContentNodes = exports.tableCellContentNodes = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _decisionList.decisionList, _task.taskList, _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _nestedExpand.nestedExpand.use('content'), _nestedExpand.nestedExpand.use('with_no_marks'), _nestedExpand.nestedExpand.use('without_non_bodied_macros')];
+var tableCellContentNodes = exports.tableCellContentNodes = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _decisionList.decisionList, _task.taskList, _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _nestedExpand.nestedExpand.use('content'), _nestedExpand.nestedExpand.use('with_no_marks')];
 
 // This is not an actual group, but a collection of nodes
 // @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it

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

@@ -23,12 +23,4 @@ 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('without_non_bodied_macros', {
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _list.orderedList, _list.bulletList, _unsupportedBlock.unsupportedBlock, _codeBlock.codeBlock, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup))],
-  ignore: ['json-schema', 'validator-spec']
-})
-// TODO: Clean up this variant
-.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

@@ -26,7 +26,7 @@ var expand = exports.expand = (0, _adfSchemaGenerator.adfNode)('expand').define(
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup, _nestedExpand.nestedExpand.use('with_no_marks'), _nestedExpand.nestedExpand.use('without_non_bodied_macros')))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup, _nestedExpand.nestedExpand.use('with_no_marks')))]
 }).variant('root_only', {
   marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   noMarks: false,

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

@@ -26,10 +26,6 @@ var listItem = (0, _adfSchemaGenerator.adfNode)('listItem').define({
   content: [(0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _unsupportedBlock.unsupportedBlock, _decisionList.decisionList, _extension.extension.use('with_marks')), (0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), bulletList, orderedList, _task.taskList, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _unsupportedBlock.unsupportedBlock, _decisionList.decisionList, _extension.extension.use('with_marks')))],
   noExtend: true,
   stage0: true
-}).variant('without_non_bodied_macros', {
-  content: [(0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _unsupportedBlock.unsupportedBlock), (0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), bulletList, orderedList, _task.taskList, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _unsupportedBlock.unsupportedBlock))],
-  noExtend: true,
-  ignore: ['json-schema', 'validator-spec']
 });
 orderedList.define({
   selectable: false,
@@ -42,10 +38,10 @@ orderedList.define({
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem, listItem.use('with_nested_decision'), listItem.use('without_non_bodied_macros')))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem, listItem.use('with_nested_decision')))]
 });
 bulletList.define({
   selectable: false,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem, listItem.use('with_nested_decision'), listItem.use('without_non_bodied_macros')))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem, listItem.use('with_nested_decision')))]
 });

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

@@ -60,10 +60,4 @@ var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nest
   marks: [],
   content: [],
   noMarks: true
-}).variant('without_non_bodied_macros', {
-  marks: [],
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, nestedExpandContent))],
-  noMarks: true,
-  noExtend: true,
-  ignore: ['json-schema', 'validator-spec']
 });

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

@@ -51,8 +51,4 @@ var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
     }
   },
   content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks')])))]
-}).variant('without_nested_non_bodied_macros', {
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent))],
-  noExtend: true,
-  ignore: ['json-schema', 'validator-spec']
 });

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

@@ -77,7 +77,7 @@ var nodesInOrder = [{
   spec: _nodes.orderedListWithOrder
 }, {
   name: 'listItem',
-  spec: _nodes.listItemWithTask
+  spec: _nodes.listItem
 }, {
   name: 'heading',
   spec: _nodes.heading

package/dist/cjs/schema/index.js

@@ -63,24 +63,6 @@ Object.defineProperty(exports, "blockquote", {
     return _nodes.blockquote;
   }
 });
-Object.defineProperty(exports, "blockquoteWithList", {
-  enumerable: true,
-  get: function get() {
-    return _nodes.blockquoteWithList;
-  }
-});
-Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMedia", {
-  enumerable: true,
-  get: function get() {
-    return _nodes.blockquoteWithNestedCodeblockOrMedia;
-  }
-});
-Object.defineProperty(exports, "blockquoteWithoutNonBodiedMacros", {
-  enumerable: true,
-  get: function get() {
-    return _nodes.blockquoteWithoutNonBodiedMacros;
-  }
-});
 Object.defineProperty(exports, "bodiedExtension", {
   enumerable: true,
   get: function get() {
@@ -411,18 +393,6 @@ Object.defineProperty(exports, "listItemWithDecisionStage0", {
     return _nodes.listItemWithDecisionStage0;
   }
 });
-Object.defineProperty(exports, "listItemWithTask", {
-  enumerable: true,
-  get: function get() {
-    return _nodes.listItemWithTask;
-  }
-});
-Object.defineProperty(exports, "listItemWithoutNonBodiedMacros", {
-  enumerable: true,
-  get: function get() {
-    return _nodes.listItemWithoutNonBodiedMacros;
-  }
-});
 Object.defineProperty(exports, "media", {
   enumerable: true,
   get: function get() {
@@ -507,12 +477,6 @@ Object.defineProperty(exports, "nestedExpand", {
     return _nodes.nestedExpand;
   }
 });
-Object.defineProperty(exports, "nestedExpandWithoutNonBodiedMacros", {
-  enumerable: true,
-  get: function get() {
-    return _nodes.nestedExpandWithoutNonBodiedMacros;
-  }
-});
 Object.defineProperty(exports, "orderedList", {
   enumerable: true,
   get: function get() {
@@ -531,12 +495,6 @@ Object.defineProperty(exports, "orderedListWithOrder", {
     return _nodes.orderedListWithOrder;
   }
 });
-Object.defineProperty(exports, "panelWithoutNestedNonBodiedMacros", {
-  enumerable: true,
-  get: function get() {
-    return _nodes.panelWithoutNestedNonBodiedMacros;
-  }
-});
 Object.defineProperty(exports, "paragraph", {
   enumerable: true,
   get: function get() {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.extendedBlockquote = exports.blockquoteWithoutNonBodiedMacros = exports.blockquoteWithNestedCodeblockOrMedia = exports.blockquoteWithList = exports.blockquote = void 0;
+exports.extendedBlockquote = exports.blockquote = void 0;
 var _nodeTypes = require("../../next-schema/generated/nodeTypes");
 /**
  * @name blockquote_node
@@ -19,40 +19,8 @@ var nodeSpecOptions = {
 };
 var blockquote = exports.blockquote = (0, _nodeTypes.blockquoteLegacy)(nodeSpecOptions);
 
-/**
- * @name blockquoteWithNestedCodeblockOrMedia
- * @deprecated use extentedBlockquote instead
- */
-var blockquoteWithNestedCodeblockOrMedia = exports.blockquoteWithNestedCodeblockOrMedia = (0, _nodeTypes.blockquoteWithoutNonBodiedMacros)(nodeSpecOptions);
-
 /**
  * @name extentedBlockquote
  * @description the block quote node with nested code block, media, and extension
  */
-var extendedBlockquote = exports.extendedBlockquote = (0, _nodeTypes.blockquote)(nodeSpecOptions);
-
-/**
- * @name blockquote_with_list_node
- * @deprecated use extentedBlockquote instead
- * TODO: remove this node in the next major version
- */
-var blockquoteWithList = exports.blockquoteWithList = (0, _nodeTypes.blockquoteWithoutNestedCodeblockOrMedia)({
-  parseDOM: [{
-    tag: 'blockquote'
-  }],
-  toDOM: function toDOM() {
-    return ['blockquote', 0];
-  }
-});
-
-/**
- * @name blockquote_without_non_bodied_macros_node
- */
-var blockquoteWithoutNonBodiedMacros = exports.blockquoteWithoutNonBodiedMacros = (0, _nodeTypes.blockquoteWithoutNonBodiedMacros)({
-  parseDOM: [{
-    tag: 'blockquote'
-  }],
-  toDOM: function toDOM() {
-    return ['blockquote', 0];
-  }
-});
+var extendedBlockquote = exports.extendedBlockquote = (0, _nodeTypes.blockquote)(nodeSpecOptions);

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

@@ -22,24 +22,6 @@ Object.defineProperty(exports, "blockquote", {
     return _blockquote.blockquote;
   }
 });
-Object.defineProperty(exports, "blockquoteWithList", {
-  enumerable: true,
-  get: function get() {
-    return _blockquote.blockquoteWithList;
-  }
-});
-Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMedia", {
-  enumerable: true,
-  get: function get() {
-    return _blockquote.blockquoteWithNestedCodeblockOrMedia;
-  }
-});
-Object.defineProperty(exports, "blockquoteWithoutNonBodiedMacros", {
-  enumerable: true,
-  get: function get() {
-    return _blockquote.blockquoteWithoutNonBodiedMacros;
-  }
-});
 Object.defineProperty(exports, "bodiedExtension", {
   enumerable: true,
   get: function get() {
@@ -250,18 +232,6 @@ Object.defineProperty(exports, "listItemWithDecisionStage0", {
     return _listItem.listItemWithDecisionStage0;
   }
 });
-Object.defineProperty(exports, "listItemWithTask", {
-  enumerable: true,
-  get: function get() {
-    return _listItem.listItemWithTask;
-  }
-});
-Object.defineProperty(exports, "listItemWithoutNonBodiedMacros", {
-  enumerable: true,
-  get: function get() {
-    return _listItem.listItemWithoutNonBodiedMacros;
-  }
-});
 Object.defineProperty(exports, "media", {
   enumerable: true,
   get: function get() {
@@ -346,12 +316,6 @@ Object.defineProperty(exports, "nestedExpand", {
     return _nestedExpand.nestedExpand;
   }
 });
-Object.defineProperty(exports, "nestedExpandWithoutNonBodiedMacros", {
-  enumerable: true,
-  get: function get() {
-    return _nestedExpand.nestedExpandWithoutNonBodiedMacros;
-  }
-});
 Object.defineProperty(exports, "orderedList", {
   enumerable: true,
   get: function get() {
@@ -370,12 +334,6 @@ Object.defineProperty(exports, "orderedListWithOrder", {
     return _orderedList.orderedListWithOrder;
   }
 });
-Object.defineProperty(exports, "panelWithoutNestedNonBodiedMacros", {
-  enumerable: true,
-  get: function get() {
-    return _panel.panelWithoutNestedNonBodiedMacros;
-  }
-});
 Object.defineProperty(exports, "paragraph", {
   enumerable: true,
   get: function get() {

package/dist/cjs/schema/nodes/list-item.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.listItemWithoutNonBodiedMacros = exports.listItemWithTask = exports.listItemWithDecisionStage0 = exports.listItem = void 0;
+exports.listItemWithDecisionStage0 = exports.listItem = void 0;
 var _nodeTypes = require("../../next-schema/generated/nodeTypes");
 /**
  * @name list_item
@@ -18,12 +18,6 @@ var listItem = exports.listItem = (0, _nodeTypes.listItem)({
   }
 });
 
-/**
- * @name list_item_with_task
- * @description this node allows task-list to be nested inside list-item
- */
-var listItemWithTask = exports.listItemWithTask = listItem;
-
 /**
  * @name list_item_with_decision_stage0
  * @description this node allows decisions to be nested inside list-item
@@ -35,16 +29,4 @@ var listItemWithDecisionStage0 = exports.listItemWithDecisionStage0 = (0, _nodeT
   toDOM: function toDOM() {
     return ['li', 0];
   }
-});
-/**
- * @name list_item_without_non_bodied_macros
- * @description this node does not allow extension inside list-item
- */
-var listItemWithoutNonBodiedMacros = exports.listItemWithoutNonBodiedMacros = (0, _nodeTypes.listItemWithoutNonBodiedMacros)({
-  parseDOM: [{
-    tag: 'li'
-  }],
-  toDOM: function toDOM() {
-    return ['li', 0];
-  }
 });

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.nestedExpandWithoutNonBodiedMacros = exports.nestedExpand = void 0;
+exports.nestedExpand = void 0;
 var _nodeTypes = require("../../next-schema/generated/nodeTypes");
 /**
  * @name nestedExpand_content
@@ -50,39 +50,9 @@ var nestedExpandFactoryOptions = {
     return ['div', attrs, 0];
   }
 };
-var nestedExpandWithoutNonBodiedMacrosFactoryOptions = {
-  parseDOM: [{
-    context: 'nestedExpand//',
-    tag: '[data-node-type="nestedExpand"]',
-    getAttrs: getExpandAttrs
-  }, {
-    tag: '[data-node-type="nestedExpand"] button',
-    ignore: true
-  }, {
-    tag: '[data-node-type="expand"] button',
-    ignore: true
-  }, {
-    tag: 'div[data-node-type="nestedExpand"]',
-    getAttrs: getExpandAttrs
-  }],
-  toDOM: function toDOM(node) {
-    var attrs = {
-      'data-node-type': 'nestedExpand',
-      'data-title': node.attrs.title,
-      'data-expanded': node.attrs.__expanded
-    };
-    return ['div', attrs, 0];
-  }
-};
 
 /**
  * @name nestedExpand
  * @description an expand that can be nested (eg. inside table, layout).
  */
-var nestedExpand = exports.nestedExpand = (0, _nodeTypes.nestedExpand)(nestedExpandFactoryOptions);
-
-/**
- * @name nestedExpandWithNonBodiedMacros
- * @description an expand that can be nested (eg. inside table, layout).
- */
-var nestedExpandWithoutNonBodiedMacros = exports.nestedExpandWithoutNonBodiedMacros = (0, _nodeTypes.nestedExpandWithoutNonBodiedMacros)(nestedExpandWithoutNonBodiedMacrosFactoryOptions);
+var nestedExpand = exports.nestedExpand = (0, _nodeTypes.nestedExpand)(nestedExpandFactoryOptions);

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.panelWithoutNestedNonBodiedMacros = exports.extendedPanel = exports.PanelType = void 0;
+exports.extendedPanel = exports.PanelType = 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; }
@@ -74,7 +74,4 @@ var createPanelNodeSpecOptions = function createPanelNodeSpecOptions(allowCustom
  */
 var extendedPanel = exports.extendedPanel = function extendedPanel(allowCustomPanel) {
   return (0, _nodeTypes.panel)(createPanelNodeSpecOptions(allowCustomPanel));
-};
-var panelWithoutNestedNonBodiedMacros = exports.panelWithoutNestedNonBodiedMacros = function panelWithoutNestedNonBodiedMacros(allowCustomPanel) {
-  return (0, _nodeTypes.panelWithoutNestedNonBodiedMacros)(createPanelNodeSpecOptions(allowCustomPanel));
 };

package/dist/es2019/index.js

@@ -1,5 +1,5 @@
-export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, extendedBlockquote, blockquoteWithoutNonBodiedMacros, 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, expandWithNestedExpand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, listItemWithDecisionStage0, listItemWithoutNonBodiedMacros, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithoutNonBodiedMacros, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithoutNestedNonBodiedMacros, 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, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable } from './schema';
+export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, extendedBlockquote, 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, expandWithNestedExpand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, 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, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable } 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