@atlaskit/adf-schema 40.9.0 → 40.9.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 40.9.2
+
+### Patch Changes
+
+- 35a84ef: [HOT-111702] Added missing marks in PM node specs due to overrides in the ADF generator
+
+## 40.9.1
+
+### Patch Changes
+
+- 3fbc24f: [ED-24525] Move mediaGroup ranking after mediaSingle in blockquote's content to fix bug where pasting external images would be converted to a mediaGroup instead of mediaSingle.
+
 ## 40.9.0
 
 ### Minor Changes

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

@@ -34,26 +34,29 @@ var blockCard = exports.blockCard = (0, _createPMSpecFactory.createPMNodeSpecFac
   draggable: true
 });
 var blockquote = exports.blockquote = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaSingle | mediaGroup)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   selectable: false,
   defining: true
 });
 var blockquoteLegacy = exports.blockquoteLegacy = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: '(paragraph | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   selectable: false,
   defining: true
 });
 var blockquoteWithoutNestedCodeblockOrMedia = exports.blockquoteWithoutNestedCodeblockOrMedia = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   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',
+  marks: 'dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {
     extensionKey: {
@@ -80,7 +83,7 @@ var bodiedExtension = exports.bodiedExtension = (0, _createPMSpecFactory.createP
   isolating: true
 });
 var bodiedExtensionWithMarks = exports.bodiedExtensionWithMarks = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  marks: 'dataConsumer fragment',
+  marks: 'dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {
     extensionKey: {
@@ -384,7 +387,7 @@ var extensionWithMarks = exports.extensionWithMarks = (0, _createPMSpecFactory.c
 });
 var extensionFrameStage0 = exports.extensionFrameStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | bodiedExtension | unsupportedBlock | blockCard | embedCard)+',
-  marks: 'dataConsumer fragment',
+  marks: 'dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   attrs: {},
   selectable: false,
   definingAsContext: false,
@@ -802,6 +805,7 @@ var mentionStage0 = exports.mentionStage0 = (0, _createPMSpecFactory.createPMNod
 });
 var multiBodiedExtensionStage0 = exports.multiBodiedExtensionStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: 'extensionFrame+',
+  marks: 'unsupportedNodeAttribute unsupportedMark',
   group: 'blockRootOnly',
   attrs: {
     extensionKey: {

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

@@ -16,8 +16,10 @@ var _mediaSingle = require("./mediaSingle");
 var blockquote = exports.blockquote = (0, _adfSchemaGenerator.adfNode)('blockquote').define({
   defining: true,
   selectable: false,
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
-  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')))]
+  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'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup))]
 }).variant('legacy', {
   ignore: ['json-schema', 'validator-spec'],
   content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph, _unsupportedBlock.unsupportedBlock))]

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

@@ -14,6 +14,8 @@ var bodiedExtension = exports.bodiedExtension = (0, _adfSchemaGenerator.adfNode)
   defining: true,
   selectable: true,
   isolating: true,
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {

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

@@ -13,6 +13,8 @@ var _unsupportedInline = require("./unsupportedInline");
 var codeBlock = exports.codeBlock = (0, _adfSchemaGenerator.adfNode)('codeBlock').define({
   code: true,
   defining: true,
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {

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

@@ -32,6 +32,8 @@ var extensionFrame = exports.extensionFrame = (0, _adfSchemaGenerator.adfNode)('
   definingAsContext: false,
   definingForContent: true,
   selectable: false,
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [_dataConsumer.dataConsumer, _fragment.fragment, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   attrs: {},
   content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('caption'), _decisionList.decisionList, _task.taskList, _table.table, _extension.extension.use('with_marks'), _bodiedExtension.bodiedExtension.use('with_marks'), _unsupportedBlock.unsupportedBlock, _blockCard.blockCard, _embedCard.embedCard))],

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

@@ -13,7 +13,9 @@ var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
 var heading = exports.heading = (0, _adfSchemaGenerator.adfNode)('heading').define({
   defining: true,
   selectable: false,
-  marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
+  // marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {
     level: {

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

@@ -12,6 +12,8 @@ var multiBodiedExtension = exports.multiBodiedExtension = (0, _adfSchemaGenerato
   stage0: true,
   definingAsContext: true,
   selectable: true,
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
   hasEmptyMarks: true,
   attrs: {

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

@@ -1129,7 +1129,7 @@ var blockquote = exports.blockquote = {
     },
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full']],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup']],
       minItems: 1,
       allowUnsupportedBlock: true
     }

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

@@ -28,26 +28,29 @@ export const blockCard = createPMNodeSpecFactory({
   draggable: true
 });
 export const blockquote = createPMNodeSpecFactory({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaSingle | mediaGroup)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   selectable: false,
   defining: true
 });
 export const blockquoteLegacy = createPMNodeSpecFactory({
   content: '(paragraph | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   selectable: false,
   defining: true
 });
 export const blockquoteWithoutNestedCodeblockOrMedia = createPMNodeSpecFactory({
   content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   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',
+  marks: 'dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {
     extensionKey: {
@@ -74,7 +77,7 @@ export const bodiedExtension = createPMNodeSpecFactory({
   isolating: true
 });
 export const bodiedExtensionWithMarks = createPMNodeSpecFactory({
-  marks: 'dataConsumer fragment',
+  marks: 'dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {
     extensionKey: {
@@ -378,7 +381,7 @@ export const extensionWithMarks = createPMNodeSpecFactory({
 });
 export const extensionFrameStage0 = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | bodiedExtension | unsupportedBlock | blockCard | embedCard)+',
-  marks: 'dataConsumer fragment',
+  marks: 'dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   attrs: {},
   selectable: false,
   definingAsContext: false,
@@ -796,6 +799,7 @@ export const mentionStage0 = createPMNodeSpecFactory({
 });
 export const multiBodiedExtensionStage0 = createPMNodeSpecFactory({
   content: 'extensionFrame+',
+  marks: 'unsupportedNodeAttribute unsupportedMark',
   group: 'blockRootOnly',
   attrs: {
     extensionKey: {

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

@@ -10,8 +10,10 @@ import { mediaSingle } from './mediaSingle';
 export const blockquote = adfNode('blockquote').define({
   defining: true,
   selectable: false,
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [unsupportedMark, unsupportedNodeAttribute],
-  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full')))]
+  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup))]
 }).variant('legacy', {
   ignore: ['json-schema', 'validator-spec'],
   content: [$onePlus($or(paragraph, unsupportedBlock))]

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

@@ -8,6 +8,8 @@ export const bodiedExtension = adfNode('bodiedExtension').define({
   defining: true,
   selectable: true,
   isolating: true,
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {

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

@@ -7,6 +7,8 @@ import { unsupportedInline } from './unsupportedInline';
 export const codeBlock = adfNode('codeBlock').define({
   code: true,
   defining: true,
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {

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

@@ -26,6 +26,8 @@ export const extensionFrame = adfNode('extensionFrame').define({
   definingAsContext: false,
   definingForContent: true,
   selectable: false,
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute],
   attrs: {},
   content: [$onePlus($or(paragraph.use('with_no_marks'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table, extension.use('with_marks'), bodiedExtension.use('with_marks'), unsupportedBlock, blockCard, embedCard))],

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

@@ -7,7 +7,9 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export const heading = adfNode('heading').define({
   defining: true,
   selectable: false,
-  marks: [unsupportedMark, unsupportedNodeAttribute],
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
+  // marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {
     level: {

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

@@ -6,6 +6,8 @@ export const multiBodiedExtension = adfNode('multiBodiedExtension').define({
   stage0: true,
   definingAsContext: true,
   selectable: true,
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [unsupportedNodeAttribute, unsupportedMark],
   hasEmptyMarks: true,
   attrs: {

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

@@ -1122,7 +1122,7 @@ export const blockquote = {
     },
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full']],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup']],
       minItems: 1,
       allowUnsupportedBlock: true
     }

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

@@ -28,26 +28,29 @@ export var blockCard = createPMNodeSpecFactory({
   draggable: true
 });
 export var blockquote = createPMNodeSpecFactory({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaSingle | mediaGroup)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   selectable: false,
   defining: true
 });
 export var blockquoteLegacy = createPMNodeSpecFactory({
   content: '(paragraph | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   selectable: false,
   defining: true
 });
 export var blockquoteWithoutNestedCodeblockOrMedia = createPMNodeSpecFactory({
   content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   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',
+  marks: 'dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {
     extensionKey: {
@@ -74,7 +77,7 @@ export var bodiedExtension = createPMNodeSpecFactory({
   isolating: true
 });
 export var bodiedExtensionWithMarks = createPMNodeSpecFactory({
-  marks: 'dataConsumer fragment',
+  marks: 'dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {
     extensionKey: {
@@ -378,7 +381,7 @@ export var extensionWithMarks = createPMNodeSpecFactory({
 });
 export var extensionFrameStage0 = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | bodiedExtension | unsupportedBlock | blockCard | embedCard)+',
-  marks: 'dataConsumer fragment',
+  marks: 'dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   attrs: {},
   selectable: false,
   definingAsContext: false,
@@ -796,6 +799,7 @@ export var mentionStage0 = createPMNodeSpecFactory({
 });
 export var multiBodiedExtensionStage0 = createPMNodeSpecFactory({
   content: 'extensionFrame+',
+  marks: 'unsupportedNodeAttribute unsupportedMark',
   group: 'blockRootOnly',
   attrs: {
     extensionKey: {

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

@@ -10,8 +10,10 @@ import { mediaSingle } from './mediaSingle';
 export var blockquote = adfNode('blockquote').define({
   defining: true,
   selectable: false,
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [unsupportedMark, unsupportedNodeAttribute],
-  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full')))]
+  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup))]
 }).variant('legacy', {
   ignore: ['json-schema', 'validator-spec'],
   content: [$onePlus($or(paragraph, unsupportedBlock))]

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

@@ -8,6 +8,8 @@ export var bodiedExtension = adfNode('bodiedExtension').define({
   defining: true,
   selectable: true,
   isolating: true,
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {

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

@@ -7,6 +7,8 @@ import { unsupportedInline } from './unsupportedInline';
 export var codeBlock = adfNode('codeBlock').define({
   code: true,
   defining: true,
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {

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

@@ -26,6 +26,8 @@ export var extensionFrame = adfNode('extensionFrame').define({
   definingAsContext: false,
   definingForContent: true,
   selectable: false,
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute],
   attrs: {},
   content: [$onePlus($or(paragraph.use('with_no_marks'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table, extension.use('with_marks'), bodiedExtension.use('with_marks'), unsupportedBlock, blockCard, embedCard))],

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

@@ -7,7 +7,9 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var heading = adfNode('heading').define({
   defining: true,
   selectable: false,
-  marks: [unsupportedMark, unsupportedNodeAttribute],
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
+  // marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {
     level: {

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

@@ -6,6 +6,8 @@ export var multiBodiedExtension = adfNode('multiBodiedExtension').define({
   stage0: true,
   definingAsContext: true,
   selectable: true,
+  // Marks don't make it into the PM node spec, as they get overridden by the marks in
+  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [unsupportedNodeAttribute, unsupportedMark],
   hasEmptyMarks: true,
   attrs: {

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

@@ -1122,7 +1122,7 @@ export var blockquote = {
     },
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full']],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup']],
       minItems: 1,
       allowUnsupportedBlock: true
     }

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

@@ -1489,14 +1489,14 @@
               {
                 "$ref": "#/definitions/codeBlock_with_no_marks_node"
               },
-              {
-                "$ref": "#/definitions/mediaGroup_node"
-              },
               {
                 "$ref": "#/definitions/mediaSingle_caption_node"
               },
               {
                 "$ref": "#/definitions/mediaSingle_full_node"
+              },
+              {
+                "$ref": "#/definitions/mediaGroup_node"
               }
             ]
           },

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

@@ -1596,14 +1596,14 @@
               {
                 "$ref": "#/definitions/codeBlock_with_no_marks_node"
               },
-              {
-                "$ref": "#/definitions/mediaGroup_node"
-              },
               {
                 "$ref": "#/definitions/mediaSingle_caption_node"
               },
               {
                 "$ref": "#/definitions/mediaSingle_full_node"
+              },
+              {
+                "$ref": "#/definitions/mediaGroup_node"
               }
             ]
           },

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

@@ -295,7 +295,6 @@ export declare const hardBreak: ({ parseDOM, toDOM, toDebugString }: import("../
 export interface HeadingDefinition {
     type: 'heading';
     content: Array<InlineDefinition>;
-    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         level: number;
         localId?: string;

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

@@ -54,11 +54,6 @@ export declare const nonNestableBlockContent: (import("@atlaskit/adf-schema-gene
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
 } & {
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
-    /**
-     * @DSLCompatibilityException
-     *
-     * Pseudo group used to match existing validator and json schema specs.
-     */
     ignore: ("json-schema" | "validator-spec")[];
 }> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy", "with_nested_blockquote"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];

package/json-schema/v1/full.json

@@ -1489,14 +1489,14 @@
               {
                 "$ref": "#/definitions/codeBlock_with_no_marks_node"
               },
-              {
-                "$ref": "#/definitions/mediaGroup_node"
-              },
               {
                 "$ref": "#/definitions/mediaSingle_caption_node"
               },
               {
                 "$ref": "#/definitions/mediaSingle_full_node"
+              },
+              {
+                "$ref": "#/definitions/mediaGroup_node"
               }
             ]
           },

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

@@ -1596,14 +1596,14 @@
               {
                 "$ref": "#/definitions/codeBlock_with_no_marks_node"
               },
-              {
-                "$ref": "#/definitions/mediaGroup_node"
-              },
               {
                 "$ref": "#/definitions/mediaSingle_caption_node"
               },
               {
                 "$ref": "#/definitions/mediaSingle_full_node"
+              },
+              {
+                "$ref": "#/definitions/mediaGroup_node"
               }
             ]
           },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "40.9.0",
+  "version": "40.9.2",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -48,7 +48,7 @@
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.22.0",
     "@atlassian/feature-flags-test-utils": "^0.2.0",
-    "@atlaskit/adf-schema-generator": "^1.31.0",
+    "@atlaskit/adf-schema-generator": "^1.31.1",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",